From 517cf1336e094321913a6a1815d2220d12d627a9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 21 Oct 2020 08:06:28 +0200 Subject: [PATCH] GIT_SILENT: coding style --- .../autotests/unifiedmailboxmanagertest.cpp | 6 +++--- agents/unifiedmailboxagent/unifiedmailbox.cpp | 10 +++++----- .../unifiedmailboxmanager.cpp | 8 ++++---- .../refreshsettingscleanuppage.cpp | 8 ++++---- src/collectionpage/collectiontemplatespage.cpp | 1 - src/collectionpage/collectionviewpage.cpp | 1 - src/editor/kmcomposerwin.cpp | 2 -- src/job/opencomposerjob.cpp | 1 - src/kmcommands.cpp | 4 ++-- src/kmkernel.cpp | 4 ++-- src/kmreadermainwin.cpp | 2 -- src/manageshowcollectionproperties.cpp | 18 +++++++++--------- src/messageactions.cpp | 1 - src/tag/tagmonitormanager.cpp | 1 - src/tag/tagmonitormanager.h | 1 - 15 files changed, 29 insertions(+), 39 deletions(-) diff --git a/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp b/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp index c96e0a3e3..d2274872d 100644 --- a/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp +++ b/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp @@ -366,7 +366,7 @@ private Q_SLOTS: Akonadi::Item item; item.setMimeType(QStringLiteral("application/octet-stream")); item.setParentCollection(inboxSourceCol); - item.setPayload(QByteArray{"Hello world!"}); + item.setPayload(QByteArray {"Hello world!"}); auto createItem = new Akonadi::ItemCreateJob(item, inboxSourceCol, this); AKVERIFYEXEC(createItem); item = createItem->item(); @@ -426,7 +426,7 @@ private Q_SLOTS: Akonadi::Item item; item.setMimeType(QStringLiteral("application/octet-stream")); item.setParentCollection(inboxSourceCol); - item.setPayload(QByteArray{"Hello world!"}); + item.setPayload(QByteArray {"Hello world!"}); auto createItem = new Akonadi::ItemCreateJob(item, inboxSourceCol, this); AKVERIFYEXEC(createItem); item = createItem->item(); @@ -500,7 +500,7 @@ private Q_SLOTS: Akonadi::Item item; item.setMimeType(QStringLiteral("application/octet-stream")); item.setParentCollection(inboxSourceCol); - item.setPayload(QByteArray{"Hello world!"}); + item.setPayload(QByteArray {"Hello world!"}); auto createItem = new Akonadi::ItemCreateJob(item, inboxSourceCol, this); AKVERIFYEXEC(createItem); item = createItem->item(); diff --git a/agents/unifiedmailboxagent/unifiedmailbox.cpp b/agents/unifiedmailboxagent/unifiedmailbox.cpp index 899ba43c8..9dcc4e8af 100644 --- a/agents/unifiedmailboxagent/unifiedmailbox.cpp +++ b/agents/unifiedmailboxagent/unifiedmailbox.cpp @@ -21,7 +21,7 @@ void UnifiedMailbox::load(const KConfigGroup &group) mId = group.name(); mName = group.readEntry("name"); mIcon = group.readEntry("icon", QStringLiteral("folder-mail")); - mSources = listToSet(group.readEntry("sources", QList{})); + mSources = listToSet(group.readEntry("sources", QList {})); // This is not authoritative, we will do collection discovery anyway mCollectionId = group.readEntry("collectionId", -1ll); } @@ -86,7 +86,7 @@ void UnifiedMailbox::addSourceCollection(qint64 source) { mSources.insert(source); if (mManager) { - mManager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}); + mManager->mMonitor.setCollectionMonitored(Akonadi::Collection {source}); mManager->mSourceToBoxMap.insert({ source, this }); } } @@ -95,7 +95,7 @@ void UnifiedMailbox::removeSourceCollection(qint64 source) { mSources.remove(source); if (mManager) { - mManager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}, false); + mManager->mMonitor.setCollectionMonitored(Akonadi::Collection {source}, false); mManager->mSourceToBoxMap.erase(source); } } @@ -121,12 +121,12 @@ void UnifiedMailbox::attachManager(UnifiedMailboxManager *manager) if (manager) { // Force that we start monitoring all the collections for (const auto source : qAsConst(mSources)) { - manager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}); + manager->mMonitor.setCollectionMonitored(Akonadi::Collection {source}); manager->mSourceToBoxMap.insert({ source, this }); } } else { for (const auto &source : qAsConst(mSources)) { - mManager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}, false); + mManager->mMonitor.setCollectionMonitored(Akonadi::Collection {source}, false); mManager->mSourceToBoxMap.erase(source); } } diff --git a/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp b/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp index 573dc6f1d..00dd1dd44 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp +++ b/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp @@ -87,7 +87,7 @@ UnifiedMailboxManager::UnifiedMailboxManager(const KSharedConfigPtr &config, QOb return; } - new Akonadi::LinkJob(Akonadi::Collection{box->collectionId()}, {item}, this); + new Akonadi::LinkJob(Akonadi::Collection {box->collectionId()}, {item}, this); }); connect(&mMonitor, &Akonadi::Monitor::itemsRemoved, this, [this](const Akonadi::Item::List &items) { @@ -110,7 +110,7 @@ UnifiedMailboxManager::UnifiedMailboxManager(const KSharedConfigPtr &config, QOb return; } - new Akonadi::UnlinkJob(Akonadi::Collection{box->collectionId()}, items, this); + new Akonadi::UnlinkJob(Akonadi::Collection {box->collectionId()}, items, this); }); connect(&mMonitor, &Akonadi::Monitor::itemsMoved, this, [this](const Akonadi::Item::List &items, const Akonadi::Collection &srcCollection, @@ -119,11 +119,11 @@ UnifiedMailboxManager::UnifiedMailboxManager(const KSharedConfigPtr &config, QOb if (const auto srcBox = unifiedMailboxForSource(srcCollection.id())) { // Move source collection was our source, unlink the Item from a box - new Akonadi::UnlinkJob(Akonadi::Collection{srcBox->collectionId()}, items, this); + new Akonadi::UnlinkJob(Akonadi::Collection {srcBox->collectionId()}, items, this); } if (const auto dstBox = unifiedMailboxForSource(dstCollection.id())) { // Move destination collection is our source, link the Item into a box - new Akonadi::LinkJob(Akonadi::Collection{dstBox->collectionId()}, items, this); + new Akonadi::LinkJob(Akonadi::Collection {dstBox->collectionId()}, items, this); } }); diff --git a/kmail-refresh-settings/refreshsettingscleanuppage.cpp b/kmail-refresh-settings/refreshsettingscleanuppage.cpp index d9a0378c1..f09dfd380 100644 --- a/kmail-refresh-settings/refreshsettingscleanuppage.cpp +++ b/kmail-refresh-settings/refreshsettingscleanuppage.cpp @@ -137,10 +137,10 @@ void RefreshSettingsCleanupPage::initCleanupDialogSettings(const QString &config QStringLiteral("MailSourceWebEngineViewer"), QStringLiteral("SelectAddressBookDialog"), QStringLiteral("VCardViewer"), - QStringLiteral("MailSourceWebEngineViewer"), - QStringLiteral("ConfigurePluginsWidget"), - QStringLiteral("ConfigureAgentsWidget"), - QStringLiteral("AuditLogViewer")}; + QStringLiteral("MailSourceWebEngineViewer"), + QStringLiteral("ConfigurePluginsWidget"), + QStringLiteral("ConfigureAgentsWidget"), + QStringLiteral("AuditLogViewer")}; for (const QString &str : dialogListName) { KConfigGroup oldGroup = settingsrc->group(str); cleanupFolderSettings(oldGroup); diff --git a/src/collectionpage/collectiontemplatespage.cpp b/src/collectionpage/collectiontemplatespage.cpp index e60b1979c..56ef19f07 100644 --- a/src/collectionpage/collectiontemplatespage.cpp +++ b/src/collectionpage/collectiontemplatespage.cpp @@ -53,4 +53,3 @@ void CollectionTemplatesPage::save(Collection &col) { mCollectionTemplateWidget->save(col); } - diff --git a/src/collectionpage/collectionviewpage.cpp b/src/collectionpage/collectionviewpage.cpp index cb147e242..014ed9598 100644 --- a/src/collectionpage/collectionviewpage.cpp +++ b/src/collectionpage/collectionviewpage.cpp @@ -107,7 +107,6 @@ void CollectionViewPage::slotChangeIcon(const QString &icon) mUnreadIconButton->setIcon(icon); } - void CollectionViewPage::load(const Akonadi::Collection &col) { init(col); diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 83c9546d0..ae9887c15 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -74,7 +74,6 @@ #include #include - #include #include @@ -120,7 +119,6 @@ #include #include - #include #include diff --git a/src/job/opencomposerjob.cpp b/src/job/opencomposerjob.cpp index d1a29ed46..5dfc506f1 100644 --- a/src/job/opencomposerjob.cpp +++ b/src/job/opencomposerjob.cpp @@ -71,7 +71,6 @@ void OpenComposerJob::start() mMsg->inReplyTo()->fromUnicodeString(mOpenComposerSettings.mInReplyTo, "utf-8"); } - if (!mOpenComposerSettings.mMessageFile.isEmpty() && QFile::exists(mOpenComposerSettings.mMessageFile)) { QFile f(mOpenComposerSettings.mMessageFile); QByteArray str; diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp index ea2a68edf..d3d25f323 100644 --- a/src/kmcommands.cpp +++ b/src/kmcommands.cpp @@ -1418,7 +1418,7 @@ KMCopyDecryptedCommand::KMCopyDecryptedCommand(const Akonadi::Collection &destFo } KMCopyDecryptedCommand::KMCopyDecryptedCommand(const Akonadi::Collection &destFolder, const Akonadi::Item &msg) - : KMCopyDecryptedCommand(destFolder, Akonadi::Item::List{ msg }) + : KMCopyDecryptedCommand(destFolder, Akonadi::Item::List { msg }) { } @@ -1604,7 +1604,7 @@ KMTrashMsgCommand::TrashOperation KMTrashMsgCommand::operation() const } KMTrashMsgCommand::KMTrashMsgCommand(const Akonadi::Collection &srcFolder, const Akonadi::Item &msg, MessageList::Core::MessageItemSetReference ref) - : KMTrashMsgCommand(srcFolder, Akonadi::Item::List{msg}, ref) + : KMTrashMsgCommand(srcFolder, Akonadi::Item::List {msg}, ref) { } diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp index 94b884208..ad7aaf15d 100644 --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -1663,7 +1663,7 @@ void KMKernel::updatedTemplates() void KMKernel::cleanupTemporaryFiles() { QDir dir(QDir::tempPath()); - const QStringList lst = dir.entryList(QStringList{QStringLiteral("messageviewer_*")}); + const QStringList lst = dir.entryList(QStringList {QStringLiteral("messageviewer_*")}); qCDebug(KMAIL_LOG) << " list file to delete " << lst; for (const QString &file : lst) { QFile tempFile(QDir::tempPath() + QLatin1Char('/') + file); @@ -1673,7 +1673,7 @@ void KMKernel::cleanupTemporaryFiles() fprintf(stderr, "%s was removed .\n", qPrintable(tempFile.fileName())); } } - const QStringList lstRepo = dir.entryList(QStringList{QStringLiteral("messageviewer_*.index.*")}); + const QStringList lstRepo = dir.entryList(QStringList {QStringLiteral("messageviewer_*.index.*")}); qCDebug(KMAIL_LOG) << " list repo to delete " << lstRepo; for (const QString &file : lstRepo) { QDir tempDir(QDir::tempPath() + QLatin1Char('/') + file); diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp index ee287a5c0..0195a4d20 100644 --- a/src/kmreadermainwin.cpp +++ b/src/kmreadermainwin.cpp @@ -442,7 +442,6 @@ void KMReaderMainWin::initializeAkonadiStandardAction() mAkonadiStandardActionManager->interceptAction(mailAction); connect(act, &QAction::triggered, this, &KMReaderMainWin::slotMarkMailAs); } - } void KMReaderMainWin::slotMarkMailAs() @@ -450,7 +449,6 @@ void KMReaderMainWin::slotMarkMailAs() const QAction *action = qobject_cast(sender()); Q_ASSERT(action); - const QByteArray typeStr = action->data().toByteArray(); mAkonadiStandardActionManager->markItemsAs(typeStr, {mMsgActions->currentItem()}, false); diff --git a/src/manageshowcollectionproperties.cpp b/src/manageshowcollectionproperties.cpp index 22a88f54a..c68b6dd68 100644 --- a/src/manageshowcollectionproperties.cpp +++ b/src/manageshowcollectionproperties.cpp @@ -24,15 +24,15 @@ ManageShowCollectionProperties::ManageShowCollectionProperties(KMMainWidget *mai : QObject(parent) , mMainWidget(mainWidget) , mPages({QStringLiteral("MailCommon::CollectionGeneralPage") - , QStringLiteral("KMail::CollectionViewPage") - , QStringLiteral("Akonadi::CachePolicyPage") - , QStringLiteral("KMail::CollectionTemplatesPage") - , QStringLiteral("MailCommon::CollectionExpiryPage") - , QStringLiteral("PimCommon::CollectionAclPage") - , QStringLiteral("KMail::CollectionMailingListPage") - , QStringLiteral("KMail::CollectionQuotaPage") - , QStringLiteral("KMail::CollectionShortcutPage") - , QStringLiteral("Akonadi::CollectionMaintenancePage")}) + , QStringLiteral("KMail::CollectionViewPage") + , QStringLiteral("Akonadi::CachePolicyPage") + , QStringLiteral("KMail::CollectionTemplatesPage") + , QStringLiteral("MailCommon::CollectionExpiryPage") + , QStringLiteral("PimCommon::CollectionAclPage") + , QStringLiteral("KMail::CollectionMailingListPage") + , QStringLiteral("KMail::CollectionQuotaPage") + , QStringLiteral("KMail::CollectionShortcutPage") + , QStringLiteral("Akonadi::CollectionMaintenancePage")}) { } diff --git a/src/messageactions.cpp b/src/messageactions.cpp index b8c23f4f7..98166cd55 100644 --- a/src/messageactions.cpp +++ b/src/messageactions.cpp @@ -101,7 +101,6 @@ MessageActions::MessageActions(KActionCollection *ac, QWidget *parent) mStatusMenu = new KActionMenu(i18n("Mar&k Message"), this); ac->addAction(QStringLiteral("set_status"), mStatusMenu); - mAnnotateAction = new QAction(QIcon::fromTheme(QStringLiteral("view-pim-notes")), i18n("Add Note..."), this); ac->addAction(QStringLiteral("annotate"), mAnnotateAction); connect(mAnnotateAction, &QAction::triggered, this, &MessageActions::annotateMessage); diff --git a/src/tag/tagmonitormanager.cpp b/src/tag/tagmonitormanager.cpp index defe94baf..b0ed96fb7 100644 --- a/src/tag/tagmonitormanager.cpp +++ b/src/tag/tagmonitormanager.cpp @@ -27,7 +27,6 @@ TagMonitorManager::TagMonitorManager(QObject *parent) TagMonitorManager::~TagMonitorManager() { - } TagMonitorManager *TagMonitorManager::self() diff --git a/src/tag/tagmonitormanager.h b/src/tag/tagmonitormanager.h index c4a490eea..b60353117 100644 --- a/src/tag/tagmonitormanager.h +++ b/src/tag/tagmonitormanager.h @@ -24,7 +24,6 @@ public: static TagMonitorManager *self(); - Q_REQUIRED_RESULT QVector tags() const; Q_SIGNALS: