Astyle kdelibs

wilder
Montel Laurent 10 years ago
parent 84df3af022
commit 984cfcac26
  1. 10
      autotests/foldertreewidgettest.cpp
  2. 2
      src/filter/autotests/filteractionmissingsoundurldialogtest.cpp
  3. 1
      src/filter/dialog/filteractionmissingaccountdialog.cpp
  4. 1
      src/filter/dialog/filteractionmissingaccountdialog.h
  5. 1
      src/filter/dialog/filteractionmissingargumentdialog.h
  6. 1
      src/filter/dialog/filteractionmissingidentitydialog.cpp
  7. 1
      src/filter/dialog/filteractionmissingidentitydialog.h
  8. 1
      src/filter/dialog/filteractionmissingtagdialog.cpp
  9. 3
      src/filter/dialog/filteractionmissingtagdialog.h
  10. 1
      src/filter/dialog/filteractionmissingtemplatedialog.cpp
  11. 3
      src/filter/dialog/filteractionmissingtemplatedialog.h
  12. 2
      src/folder/foldercollection.cpp
  13. 1
      src/job/expirejob.h
  14. 1
      src/tag/addtagdialog.cpp

@ -150,7 +150,7 @@ private Q_SLOTS:
// Create resources // Create resources
const int numResources = numFolders.count(); 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); AgentInstanceCreateJob *agentCreateJob = new AgentInstanceCreateJob(agentType);
AKVERIFYEXEC(agentCreateJob); AKVERIFYEXEC(agentCreateJob);
const QString identifier = agentCreateJob->instance().identifier(); const QString identifier = agentCreateJob->instance().identifier();
@ -163,14 +163,14 @@ private Q_SLOTS:
topLevelCollections.append(topLevelCollection); topLevelCollections.append(topLevelCollection);
// Now create some folders // Now create some folders
for (int number = 0 ; number < numFolders[i] ; ++number) { for (int number = 0; number < numFolders[i]; ++number) {
Collection mailCollection; Collection mailCollection;
mailCollection.setParentCollection(topLevelCollection); mailCollection.setParentCollection(topLevelCollection);
mailCollection.setName(QStringLiteral("mailCollection_%1_%2").arg(i).arg(number)); mailCollection.setName(QStringLiteral("mailCollection_%1_%2").arg(i).arg(number));
CollectionCreateJob *collCreateJob = new CollectionCreateJob(mailCollection); CollectionCreateJob *collCreateJob = new CollectionCreateJob(mailCollection);
AKVERIFYEXEC(collCreateJob); 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); QModelIndex parent = mTopModel->index(resourceRow, 0);
QTRY_COMPARE(mTopModel->rowCount(parent), numFolders[i]); QTRY_COMPARE(mTopModel->rowCount(parent), numFolders[i]);
@ -211,7 +211,6 @@ private:
} }
} }
static QStringList collectNames(QAbstractItemModel *model); static QStringList collectNames(QAbstractItemModel *model);
EntityMimeTypeFilterModel *mCollectionModel; EntityMimeTypeFilterModel *mCollectionModel;
QAbstractItemModel *mTopModel; QAbstractItemModel *mTopModel;
@ -219,11 +218,10 @@ private:
QStringList mFolderNames; QStringList mFolderNames;
}; };
QStringList FolderTreeWidgetTest::collectNames(QAbstractItemModel *model) QStringList FolderTreeWidgetTest::collectNames(QAbstractItemModel *model)
{ {
QStringList ret; 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()); ret.append(model->index(row, 0).data().toString());
} }
return ret; return ret;

@ -38,7 +38,7 @@ FilterActionMissingSoundUrlDialogTest::~FilterActionMissingSoundUrlDialogTest()
void FilterActionMissingSoundUrlDialogTest::shouldHaveDefaultValue() void FilterActionMissingSoundUrlDialogTest::shouldHaveDefaultValue()
{ {
MailCommon::FilterActionMissingSoundUrlDialog dlg(QStringLiteral("filename"),QStringLiteral("arg")); MailCommon::FilterActionMissingSoundUrlDialog dlg(QStringLiteral("filename"), QStringLiteral("arg"));
QVERIFY(!dlg.windowTitle().isEmpty()); QVERIFY(!dlg.windowTitle().isEmpty());
QDialogButtonBox *buttonBox = dlg.findChild<QDialogButtonBox *>(QStringLiteral("buttonbox")); QDialogButtonBox *buttonBox = dlg.findChild<QDialogButtonBox *>(QStringLiteral("buttonbox"));

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "filteractionmissingaccountdialog.h" #include "filteractionmissingaccountdialog.h"
#include "filter/kmfilteraccountlist.h" #include "filter/kmfilteraccountlist.h"
#include "util/mailutil.h" #include "util/mailutil.h"

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef FILTERACTIONMISSINGACCOUNTDIALOG_H #ifndef FILTERACTIONMISSINGACCOUNTDIALOG_H
#define FILTERACTIONMISSINGACCOUNTDIALOG_H #define FILTERACTIONMISSINGACCOUNTDIALOG_H

@ -86,6 +86,5 @@ private:
QPushButton *mOkButton; QPushButton *mOkButton;
}; };
#endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */ #endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "filteractionmissingidentitydialog.h" #include "filteractionmissingidentitydialog.h"
#include "kernel/mailkernel.h" #include "kernel/mailkernel.h"

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef FILTERACTIONMISSINGIDENTITYDIALOG_H #ifndef FILTERACTIONMISSINGIDENTITYDIALOG_H
#define FILTERACTIONMISSINGIDENTITYDIALOG_H #define FILTERACTIONMISSINGIDENTITYDIALOG_H

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "filteractionmissingtagdialog.h" #include "filteractionmissingtagdialog.h"
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig> #include <KSharedConfig>

@ -22,7 +22,8 @@
#include <QDialog> #include <QDialog>
class QListWidget; class QListWidget;
namespace MailCommon { namespace MailCommon
{
class FilterActionMissingTagDialog : public QDialog class FilterActionMissingTagDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

@ -52,7 +52,6 @@ FilterActionMissingTemplateDialog::FilterActionMissingTemplateDialog(
mComboBoxTemplate->addItems(templateList); mComboBoxTemplate->addItems(templateList);
mainLayout->addWidget(mComboBoxTemplate); mainLayout->addWidget(mComboBoxTemplate);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
buttonBox->setObjectName(QStringLiteral("buttonbox")); buttonBox->setObjectName(QStringLiteral("buttonbox"));
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);

@ -23,7 +23,8 @@
#include <QDialog> #include <QDialog>
class KComboBox; class KComboBox;
namespace MailCommon { namespace MailCommon
{
class FilterActionMissingTemplateDialog : public QDialog class FilterActionMissingTemplateDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

@ -228,7 +228,7 @@ void FolderCollection::readConfig()
} }
mFormatMessage = static_cast<MessageViewer::Viewer::DisplayFormatMessage>(configGroup.readEntry("displayFormatOverride", 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 bool FolderCollection::isValid() const

@ -50,7 +50,6 @@ public:
void execute() Q_DECL_OVERRIDE; void execute() Q_DECL_OVERRIDE;
void kill() Q_DECL_OVERRIDE; void kill() Q_DECL_OVERRIDE;
private: private:
void slotDoWork(); void slotDoWork();
void slotExpireDone(KJob *job); void slotExpireDone(KJob *job);

@ -56,7 +56,6 @@ AddTagDialog::AddTagDialog(const QList<KActionCollection *> &actions, QWidget *p
setWindowTitle(i18n("Add Tag")); setWindowTitle(i18n("Add Tag"));
QVBoxLayout *mainLayout = new QVBoxLayout(this); QVBoxLayout *mainLayout = new QVBoxLayout(this);
d->mTagWidget = new MailCommon::TagWidget(actions, this); d->mTagWidget = new MailCommon::TagWidget(actions, this);
mainLayout->addWidget(d->mTagWidget); mainLayout->addWidget(d->mTagWidget);

Loading…
Cancel
Save