summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-17 05:32:20 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-17 05:32:20 (GMT)
commit984cfcac26054c91e2a5418d0be95ff8ac0c77dc (patch)
tree4b5b33abc9de3f884b596d1542c44f4e186b7058
parent84df3af022cc04d045c104dc10fa646b18dc2e4c (diff)
Astyle kdelibs
-rw-r--r--autotests/foldertreewidgettest.cpp10
-rw-r--r--src/filter/autotests/filteractionmissingsoundurldialogtest.cpp2
-rw-r--r--src/filter/dialog/filteractionmissingaccountdialog.cpp1
-rw-r--r--src/filter/dialog/filteractionmissingaccountdialog.h1
-rw-r--r--src/filter/dialog/filteractionmissingargumentdialog.h1
-rw-r--r--src/filter/dialog/filteractionmissingidentitydialog.cpp1
-rw-r--r--src/filter/dialog/filteractionmissingidentitydialog.h1
-rw-r--r--src/filter/dialog/filteractionmissingtagdialog.cpp1
-rw-r--r--src/filter/dialog/filteractionmissingtagdialog.h3
-rw-r--r--src/filter/dialog/filteractionmissingtemplatedialog.cpp1
-rw-r--r--src/filter/dialog/filteractionmissingtemplatedialog.h3
-rw-r--r--src/folder/foldercollection.cpp2
-rw-r--r--src/job/expirejob.h1
-rw-r--r--src/tag/addtagdialog.cpp1
14 files changed, 10 insertions, 19 deletions
diff --git a/autotests/foldertreewidgettest.cpp b/autotests/foldertreewidgettest.cpp
index 0f3709e..11841d7 100644
--- a/autotests/foldertreewidgettest.cpp
+++ b/autotests/foldertreewidgettest.cpp
@@ -150,7 +150,7 @@ private Q_SLOTS:
// Create resources
const int numResources = numFolders.count();
- for (int i = 1 /*first one already created*/ ; i < numResources ; ++i ) {
+ for (int i = 1 /*first one already created*/; i < numResources; ++i) {
AgentInstanceCreateJob *agentCreateJob = new AgentInstanceCreateJob(agentType);
AKVERIFYEXEC(agentCreateJob);
const QString identifier = agentCreateJob->instance().identifier();
@@ -163,14 +163,14 @@ private Q_SLOTS:
topLevelCollections.append(topLevelCollection);
// Now create some folders
- for (int number = 0 ; number < numFolders[i] ; ++number) {
+ for (int number = 0; number < numFolders[i]; ++number) {
Collection mailCollection;
mailCollection.setParentCollection(topLevelCollection);
mailCollection.setName(QStringLiteral("mailCollection_%1_%2").arg(i).arg(number));
CollectionCreateJob *collCreateJob = new CollectionCreateJob(mailCollection);
AKVERIFYEXEC(collCreateJob);
}
- const int resourceRow = collectNames(mTopModel).indexOf("res" + QString::number(i+1));
+ const int resourceRow = collectNames(mTopModel).indexOf("res" + QString::number(i + 1));
QModelIndex parent = mTopModel->index(resourceRow, 0);
QTRY_COMPARE(mTopModel->rowCount(parent), numFolders[i]);
@@ -211,7 +211,6 @@ private:
}
}
-
static QStringList collectNames(QAbstractItemModel *model);
EntityMimeTypeFilterModel *mCollectionModel;
QAbstractItemModel *mTopModel;
@@ -219,11 +218,10 @@ private:
QStringList mFolderNames;
};
-
QStringList FolderTreeWidgetTest::collectNames(QAbstractItemModel *model)
{
QStringList ret;
- for (int row = 0 ; row < model->rowCount() ; ++row) {
+ for (int row = 0; row < model->rowCount(); ++row) {
ret.append(model->index(row, 0).data().toString());
}
return ret;
diff --git a/src/filter/autotests/filteractionmissingsoundurldialogtest.cpp b/src/filter/autotests/filteractionmissingsoundurldialogtest.cpp
index 617a4de..758d5b2 100644
--- a/src/filter/autotests/filteractionmissingsoundurldialogtest.cpp
+++ b/src/filter/autotests/filteractionmissingsoundurldialogtest.cpp
@@ -38,7 +38,7 @@ FilterActionMissingSoundUrlDialogTest::~FilterActionMissingSoundUrlDialogTest()
void FilterActionMissingSoundUrlDialogTest::shouldHaveDefaultValue()
{
- MailCommon::FilterActionMissingSoundUrlDialog dlg(QStringLiteral("filename"),QStringLiteral("arg"));
+ MailCommon::FilterActionMissingSoundUrlDialog dlg(QStringLiteral("filename"), QStringLiteral("arg"));
QVERIFY(!dlg.windowTitle().isEmpty());
QDialogButtonBox *buttonBox = dlg.findChild<QDialogButtonBox *>(QStringLiteral("buttonbox"));
diff --git a/src/filter/dialog/filteractionmissingaccountdialog.cpp b/src/filter/dialog/filteractionmissingaccountdialog.cpp
index 5e9cab6..c7c8c21 100644
--- a/src/filter/dialog/filteractionmissingaccountdialog.cpp
+++ b/src/filter/dialog/filteractionmissingaccountdialog.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "filteractionmissingaccountdialog.h"
#include "filter/kmfilteraccountlist.h"
#include "util/mailutil.h"
diff --git a/src/filter/dialog/filteractionmissingaccountdialog.h b/src/filter/dialog/filteractionmissingaccountdialog.h
index a1bcaaf..41df994 100644
--- a/src/filter/dialog/filteractionmissingaccountdialog.h
+++ b/src/filter/dialog/filteractionmissingaccountdialog.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef FILTERACTIONMISSINGACCOUNTDIALOG_H
#define FILTERACTIONMISSINGACCOUNTDIALOG_H
diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h
index 5ea28b2..3978937 100644
--- a/src/filter/dialog/filteractionmissingargumentdialog.h
+++ b/src/filter/dialog/filteractionmissingargumentdialog.h
@@ -86,6 +86,5 @@ private:
QPushButton *mOkButton;
};
-
#endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */
diff --git a/src/filter/dialog/filteractionmissingidentitydialog.cpp b/src/filter/dialog/filteractionmissingidentitydialog.cpp
index 8f8824e..cd60b54 100644
--- a/src/filter/dialog/filteractionmissingidentitydialog.cpp
+++ b/src/filter/dialog/filteractionmissingidentitydialog.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "filteractionmissingidentitydialog.h"
#include "kernel/mailkernel.h"
diff --git a/src/filter/dialog/filteractionmissingidentitydialog.h b/src/filter/dialog/filteractionmissingidentitydialog.h
index 9de1110..9fe364a 100644
--- a/src/filter/dialog/filteractionmissingidentitydialog.h
+++ b/src/filter/dialog/filteractionmissingidentitydialog.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef FILTERACTIONMISSINGIDENTITYDIALOG_H
#define FILTERACTIONMISSINGIDENTITYDIALOG_H
diff --git a/src/filter/dialog/filteractionmissingtagdialog.cpp b/src/filter/dialog/filteractionmissingtagdialog.cpp
index 93b0f65..3bdbc20 100644
--- a/src/filter/dialog/filteractionmissingtagdialog.cpp
+++ b/src/filter/dialog/filteractionmissingtagdialog.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "filteractionmissingtagdialog.h"
#include <KLocalizedString>
#include <KSharedConfig>
diff --git a/src/filter/dialog/filteractionmissingtagdialog.h b/src/filter/dialog/filteractionmissingtagdialog.h
index 96a9261..6bb235b 100644
--- a/src/filter/dialog/filteractionmissingtagdialog.h
+++ b/src/filter/dialog/filteractionmissingtagdialog.h
@@ -22,7 +22,8 @@
#include <QDialog>
class QListWidget;
-namespace MailCommon {
+namespace MailCommon
+{
class FilterActionMissingTagDialog : public QDialog
{
Q_OBJECT
diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.cpp b/src/filter/dialog/filteractionmissingtemplatedialog.cpp
index 5bc6f63..7fcdb56 100644
--- a/src/filter/dialog/filteractionmissingtemplatedialog.cpp
+++ b/src/filter/dialog/filteractionmissingtemplatedialog.cpp
@@ -52,7 +52,6 @@ FilterActionMissingTemplateDialog::FilterActionMissingTemplateDialog(
mComboBoxTemplate->addItems(templateList);
mainLayout->addWidget(mComboBoxTemplate);
-
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
buttonBox->setObjectName(QStringLiteral("buttonbox"));
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.h b/src/filter/dialog/filteractionmissingtemplatedialog.h
index a839929..75b4939 100644
--- a/src/filter/dialog/filteractionmissingtemplatedialog.h
+++ b/src/filter/dialog/filteractionmissingtemplatedialog.h
@@ -23,7 +23,8 @@
#include <QDialog>
class KComboBox;
-namespace MailCommon {
+namespace MailCommon
+{
class FilterActionMissingTemplateDialog : public QDialog
{
Q_OBJECT
diff --git a/src/folder/foldercollection.cpp b/src/folder/foldercollection.cpp
index c591c95..3939508 100644
--- a/src/folder/foldercollection.cpp
+++ b/src/folder/foldercollection.cpp
@@ -228,7 +228,7 @@ void FolderCollection::readConfig()
}
mFormatMessage = static_cast<MessageViewer::Viewer::DisplayFormatMessage>(configGroup.readEntry("displayFormatOverride",
- static_cast<int>(MessageViewer::Viewer::UseGlobalSetting)));
+ static_cast<int>(MessageViewer::Viewer::UseGlobalSetting)));
}
bool FolderCollection::isValid() const
diff --git a/src/job/expirejob.h b/src/job/expirejob.h
index 8648286..00ca478 100644
--- a/src/job/expirejob.h
+++ b/src/job/expirejob.h
@@ -50,7 +50,6 @@ public:
void execute() Q_DECL_OVERRIDE;
void kill() Q_DECL_OVERRIDE;
-
private:
void slotDoWork();
void slotExpireDone(KJob *job);
diff --git a/src/tag/addtagdialog.cpp b/src/tag/addtagdialog.cpp
index 0031fd7..b3f8d27 100644
--- a/src/tag/addtagdialog.cpp
+++ b/src/tag/addtagdialog.cpp
@@ -56,7 +56,6 @@ AddTagDialog::AddTagDialog(const QList<KActionCollection *> &actions, QWidget *p
setWindowTitle(i18n("Add Tag"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
-
d->mTagWidget = new MailCommon::TagWidget(actions, this);
mainLayout->addWidget(d->mTagWidget);