Commit 984cfcac authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Astyle kdelibs

parent 84df3af0
......@@ -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;
......
......@@ -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"));
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "filteractionmissingaccountdialog.h"
#include "filter/kmfilteraccountlist.h"
#include "util/mailutil.h"
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#ifndef FILTERACTIONMISSINGACCOUNTDIALOG_H
#define FILTERACTIONMISSINGACCOUNTDIALOG_H
......
......@@ -86,6 +86,5 @@ private:
QPushButton *mOkButton;
};
#endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "filteractionmissingidentitydialog.h"
#include "kernel/mailkernel.h"
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#ifndef FILTERACTIONMISSINGIDENTITYDIALOG_H
#define FILTERACTIONMISSINGIDENTITYDIALOG_H
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "filteractionmissingtagdialog.h"
#include <KLocalizedString>
#include <KSharedConfig>
......
......@@ -22,7 +22,8 @@
#include <QDialog>
class QListWidget;
namespace MailCommon {
namespace MailCommon
{
class FilterActionMissingTagDialog : public QDialog
{
Q_OBJECT
......
......@@ -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);
......
......@@ -23,7 +23,8 @@
#include <QDialog>
class KComboBox;
namespace MailCommon {
namespace MailCommon
{
class FilterActionMissingTemplateDialog : public QDialog
{
Q_OBJECT
......
......@@ -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
......
......@@ -50,7 +50,6 @@ public:
void execute() Q_DECL_OVERRIDE;
void kill() Q_DECL_OVERRIDE;
private:
void slotDoWork();
void slotExpireDone(KJob *job);
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment