[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Astyle kdelibs
From: Montel Laurent <montel () kde ! org>
Date: 2015-07-01 5:51:25
Message-ID: E1ZAAvd-000571-Op () scm ! kde ! org
[Download RAW message or body]
Git commit 706155192fd6a7c0d3105c7d7fa87ef581d74dd1 by Montel Laurent.
Committed on 01/07/2015 at 05:48.
Pushed by mlaurent into branch 'master'.
Astyle kdelibs
M +1 -1 akonadiconsole/notificationmodel.cpp
M +1 -1 korganizer/akonadicollectionview.h
M +0 -1 korganizer/prefs/koprefsdialog.cpp
M +3 -3 korganizer/views/collectionview/reparentingmodel.h
M +5 -4 pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp
M +0 -1 pimcommon/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
M +5 -4 pimcommon/texteditor/richtexteditor/richtexteditor.cpp
M +2 -2 pimcommon/util/pimutil.cpp
M +2 -1 templateparser/templatessyntaxhighlighterrules.h
M +1 -2 templateparser/templatestexteditor.cpp
http://commits.kde.org/kdepim/706155192fd6a7c0d3105c7d7fa87ef581d74dd1
diff --git a/akonadiconsole/notificationmodel.cpp \
b/akonadiconsole/notificationmodel.cpp index f13e2b4..a05f2e6 100644
--- a/akonadiconsole/notificationmodel.cpp
+++ b/akonadiconsole/notificationmodel.cpp
@@ -340,7 +340,7 @@ void NotificationModel::slotNotify(const QVector<QByteArray> \
&data) Protocol::ChangeNotification::List ntfs;
ntfs.reserve(data.size());
Q_FOREACH (const QByteArray &d, data) {
- QBuffer buffer(const_cast<QByteArray*>(&d));
+ QBuffer buffer(const_cast<QByteArray *>(&d));
buffer.open(QIODevice::ReadOnly);
ntfs << Protocol::deserialize(&buffer);
}
diff --git a/korganizer/akonadicollectionview.h b/korganizer/akonadicollectionview.h
index c41d56e..5828e9f 100644
--- a/korganizer/akonadicollectionview.h
+++ b/korganizer/akonadicollectionview.h
@@ -109,7 +109,7 @@ private Q_SLOTS:
void disableColor();
void setDefaultCalendar();
void onSearchIsActive(bool);
- void onAction(const QModelIndex &index, int action);
+ void onAction(const QModelIndex &index, int action);
void slotServerSideSubscription();
private:
Akonadi::EntityTreeModel *entityTreeModel() const;
diff --git a/korganizer/prefs/koprefsdialog.cpp b/korganizer/prefs/koprefsdialog.cpp
index d7c69ba..4986abc 100644
--- a/korganizer/prefs/koprefsdialog.cpp
+++ b/korganizer/prefs/koprefsdialog.cpp
@@ -158,7 +158,6 @@ KOPrefsDialogMain::KOPrefsDialogMain(QWidget *parent)
autoExportInterval->spinBox()->setEnabled(autoExportHTML->checkBox()->isChecked());
autoExportInterval->label()->setEnabled(autoExportHTML->checkBox()->isChecked());
-
saveLayout->addWidget(destinationItem->groupBox());
saveLayout->addStretch(1);
diff --git a/korganizer/views/collectionview/reparentingmodel.h \
b/korganizer/views/collectionview/reparentingmodel.h index bcd9612..72784fb 100644
--- a/korganizer/views/collectionview/reparentingmodel.h
+++ b/korganizer/views/collectionview/reparentingmodel.h
@@ -115,9 +115,9 @@ public:
private Q_SLOTS:
void onSourceRowsAboutToBeInserted(const QModelIndex &, int, int);
void onSourceRowsInserted(const QModelIndex &, int, int);
- void onSourceRowsAboutToBeRemoved(const QModelIndex&, int, int);
- void onSourceRowsRemoved(const QModelIndex&, int, int);
- void onSourceRowsAboutToBeMoved(const QModelIndex &, int, int, const \
QModelIndex&, int); + void onSourceRowsAboutToBeRemoved(const QModelIndex &, int, \
int); + void onSourceRowsRemoved(const QModelIndex &, int, int);
+ void onSourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex \
&, int);
void onSourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
void onSourceDataChanged(const QModelIndex &, const QModelIndex &);
void onSourceLayoutAboutToBeChanged();
diff --git a/pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp \
b/pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp index 547c780..58cdc22 \
100644
--- a/pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp
+++ b/pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp
@@ -345,7 +345,7 @@ void PlainTextEditor::slotCheckSpelling()
backgroundSpellCheck->changeLanguage(d->spellCheckingLanguage);
}
if (!d->ignoreSpellCheckingWords.isEmpty()) {
- Q_FOREACH(const QString &word, d->ignoreSpellCheckingWords) {
+ Q_FOREACH (const QString &word, d->ignoreSpellCheckingWords) {
backgroundSpellCheck->speller().addToSession(word);
}
}
@@ -639,11 +639,12 @@ Sonnet::SpellCheckDecorator \
*PlainTextEditor::createSpellCheckDecorator()
void PlainTextEditor::addIgnoreWordsToHighLighter()
{
- if (d->ignoreSpellCheckingWords.isEmpty())
+ if (d->ignoreSpellCheckingWords.isEmpty()) {
return;
+ }
if (d->richTextDecorator) {
- Sonnet::Highlighter * _highlighter = d->richTextDecorator->highlighter();
- Q_FOREACH(const QString &word, d->ignoreSpellCheckingWords) {
+ Sonnet::Highlighter *_highlighter = d->richTextDecorator->highlighter();
+ Q_FOREACH (const QString &word, d->ignoreSpellCheckingWords) {
_highlighter->ignoreWord(word);
}
}
diff --git a/pimcommon/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp \
b/pimcommon/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp \
index cd55484..0c4e07d 100644
--- a/pimcommon/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
+++ b/pimcommon/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
@@ -45,7 +45,6 @@ PlainTextSyntaxSpellCheckingHighlighter::PlainTextSyntaxSpellCheckingHighlighter
setAutomatic(false);
}
-
PlainTextSyntaxSpellCheckingHighlighter::~PlainTextSyntaxSpellCheckingHighlighter()
{
delete d;
diff --git a/pimcommon/texteditor/richtexteditor/richtexteditor.cpp \
b/pimcommon/texteditor/richtexteditor/richtexteditor.cpp index b069646..5201149 \
100644
--- a/pimcommon/texteditor/richtexteditor/richtexteditor.cpp
+++ b/pimcommon/texteditor/richtexteditor/richtexteditor.cpp
@@ -407,7 +407,7 @@ void RichTextEditor::checkSpelling(bool force)
backgroundSpellCheck->changeLanguage(d->spellCheckingLanguage);
}
if (!d->ignoreSpellCheckingWords.isEmpty()) {
- Q_FOREACH(const QString &word, d->ignoreSpellCheckingWords) {
+ Q_FOREACH (const QString &word, d->ignoreSpellCheckingWords) {
backgroundSpellCheck->speller().addToSession(word);
}
}
@@ -505,11 +505,12 @@ Sonnet::SpellCheckDecorator \
*RichTextEditor::createSpellCheckDecorator()
void RichTextEditor::addIgnoreWordsToHighLighter()
{
- if (d->ignoreSpellCheckingWords.isEmpty())
+ if (d->ignoreSpellCheckingWords.isEmpty()) {
return;
+ }
if (d->richTextDecorator) {
- Sonnet::Highlighter * _highlighter = d->richTextDecorator->highlighter();
- Q_FOREACH(const QString &word, d->ignoreSpellCheckingWords) {
+ Sonnet::Highlighter *_highlighter = d->richTextDecorator->highlighter();
+ Q_FOREACH (const QString &word, d->ignoreSpellCheckingWords) {
_highlighter->ignoreWord(word);
}
}
diff --git a/pimcommon/util/pimutil.cpp b/pimcommon/util/pimutil.cpp
index 5a4a33c..86cd2f4 100644
--- a/pimcommon/util/pimutil.cpp
+++ b/pimcommon/util/pimutil.cpp
@@ -56,8 +56,8 @@ OrgKdeAkonadiImapSettingsInterface \
*PimCommon::Util::createImapSettingsInterface {
if (isImapResource(ident)) {
return
- new OrgKdeAkonadiImapSettingsInterface(
- QLatin1String("org.freedesktop.Akonadi.Resource.") + ident, \
QStringLiteral("/Settings"), QDBusConnection::sessionBus()); + new \
OrgKdeAkonadiImapSettingsInterface( + \
QLatin1String("org.freedesktop.Akonadi.Resource.") + ident, \
QStringLiteral("/Settings"), QDBusConnection::sessionBus()); } else {
return Q_NULLPTR;
}
diff --git a/templateparser/templatessyntaxhighlighterrules.h \
b/templateparser/templatessyntaxhighlighterrules.h index 77e084a..49796e3 100644
--- a/templateparser/templatessyntaxhighlighterrules.h
+++ b/templateparser/templatessyntaxhighlighterrules.h
@@ -24,7 +24,8 @@ namespace KPIMTextEdit
class Rule;
}
-namespace TemplateParser {
+namespace TemplateParser
+{
class TemplatesSyntaxHighlighterRules
{
public:
diff --git a/templateparser/templatestexteditor.cpp \
b/templateparser/templatestexteditor.cpp index 60c4624..9d52042 100644
--- a/templateparser/templatestexteditor.cpp
+++ b/templateparser/templatestexteditor.cpp
@@ -38,7 +38,7 @@ TemplatesTextEditor::TemplatesTextEditor(QWidget *parent)
const QFont f = QFontDatabase::systemFont(QFontDatabase::FixedFont);
setFont(f);
QStringList excludeKeyWord;
- Q_FOREACH(QString str, TemplateParser::Util::keywords()) {
+ Q_FOREACH (QString str, TemplateParser::Util::keywords()) {
excludeKeyWord << str.remove(QLatin1Char('%'));
}
addIgnoreWords(excludeKeyWord);
@@ -75,7 +75,6 @@ void TemplatesTextEditor::createHighlighter()
setHighlighter(highlighter);
}
-
void TemplatesTextEditor::initCompleter()
{
QStringList listWord;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic