From bb97a99451e1775e1e9982a98cef6675667c1e42 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 7 Jan 2019 13:59:33 +0100 Subject: [PATCH] Fix some warning found by clazy --- agents/archivemailagent/archivemailkernel.h | 1 + agents/mailfilteragent/dummykernel.h | 1 + agents/sendlateragent/autotests/sendlaterinfotest.cpp | 3 ++- agents/sendlateragent/autotests/sendlaterinfotest.h | 2 +- agents/unifiedmailboxagent/unifiedmailbox.cpp | 4 ++-- src/autotests/displaymessageformatactionmenutest.cpp | 3 ++- src/autotests/displaymessageformatactionmenutest.h | 2 +- src/editor/kmcomposerwin.cpp | 2 +- src/identity/identitydialog.cpp | 2 +- src/kmreaderwin.cpp | 6 +++--- src/kontactplugin/summary/kcmkontactsummary.cpp | 1 + src/kontactplugin/summary/summaryview_part.cpp | 2 +- src/searchdialog/incompleteindexdialog.cpp | 2 +- src/sieveimapinterface/kmailsieveimapinstanceinterface.h | 2 ++ 14 files changed, 20 insertions(+), 13 deletions(-) diff --git a/agents/archivemailagent/archivemailkernel.h b/agents/archivemailagent/archivemailkernel.h index f0f2e03f3..7de35912a 100644 --- a/agents/archivemailagent/archivemailkernel.h +++ b/agents/archivemailagent/archivemailkernel.h @@ -34,6 +34,7 @@ class JobScheduler; class ArchiveMailKernel : public QObject, public MailCommon::IKernel, public MailCommon::ISettings { + Q_OBJECT public: explicit ArchiveMailKernel(QObject *parent = nullptr); diff --git a/agents/mailfilteragent/dummykernel.h b/agents/mailfilteragent/dummykernel.h index 8ab1a440a..bd886ff65 100644 --- a/agents/mailfilteragent/dummykernel.h +++ b/agents/mailfilteragent/dummykernel.h @@ -14,6 +14,7 @@ class FolderCollectionMonitor; class DummyKernel : public QObject, public MailCommon::IKernel, public MailCommon::ISettings { + Q_OBJECT public: explicit DummyKernel(QObject *parent = nullptr); diff --git a/agents/sendlateragent/autotests/sendlaterinfotest.cpp b/agents/sendlateragent/autotests/sendlaterinfotest.cpp index 6ffbb85de..e91c5a39f 100644 --- a/agents/sendlateragent/autotests/sendlaterinfotest.cpp +++ b/agents/sendlateragent/autotests/sendlaterinfotest.cpp @@ -25,7 +25,8 @@ #include #include -SendLaterInfoTest::SendLaterInfoTest() +SendLaterInfoTest::SendLaterInfoTest(QObject *parent) + : QObject(parent) { QStandardPaths::setTestModeEnabled(true); } diff --git a/agents/sendlateragent/autotests/sendlaterinfotest.h b/agents/sendlateragent/autotests/sendlaterinfotest.h index 8f345ee5c..b36bb8af4 100644 --- a/agents/sendlateragent/autotests/sendlaterinfotest.h +++ b/agents/sendlateragent/autotests/sendlaterinfotest.h @@ -26,7 +26,7 @@ class SendLaterInfoTest : public QObject { Q_OBJECT public: - SendLaterInfoTest(); + explicit SendLaterInfoTest(QObject *parent = nullptr); private Q_SLOTS: void shouldHaveDefaultValue(); diff --git a/agents/unifiedmailboxagent/unifiedmailbox.cpp b/agents/unifiedmailboxagent/unifiedmailbox.cpp index 7b5513dfb..0b4a00838 100644 --- a/agents/unifiedmailboxagent/unifiedmailbox.cpp +++ b/agents/unifiedmailboxagent/unifiedmailbox.cpp @@ -137,12 +137,12 @@ void UnifiedMailbox::attachManager(UnifiedMailboxManager *manager) if (mManager != manager) { if (manager) { // Force that we start monitoring all the collections - for (auto source : mSources) { + for (const auto source : qAsConst(mSources)) { manager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}); manager->mSourceToBoxMap.insert({ source, this }); } } else { - for (auto source : mSources) { + for (const auto source : qAsConst(mSources)) { mManager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}, false); mManager->mSourceToBoxMap.erase(source); } diff --git a/src/autotests/displaymessageformatactionmenutest.cpp b/src/autotests/displaymessageformatactionmenutest.cpp index 52ce3ade5..f82dea40a 100644 --- a/src/autotests/displaymessageformatactionmenutest.cpp +++ b/src/autotests/displaymessageformatactionmenutest.cpp @@ -23,7 +23,8 @@ #include #include Q_DECLARE_METATYPE(MessageViewer::Viewer::DisplayFormatMessage) -DisplayMessageFormatActionMenuTest::DisplayMessageFormatActionMenuTest() +DisplayMessageFormatActionMenuTest::DisplayMessageFormatActionMenuTest(QObject *parent) + : QObject(parent) { qRegisterMetaType(); } diff --git a/src/autotests/displaymessageformatactionmenutest.h b/src/autotests/displaymessageformatactionmenutest.h index a910892f7..de6727343 100644 --- a/src/autotests/displaymessageformatactionmenutest.h +++ b/src/autotests/displaymessageformatactionmenutest.h @@ -24,7 +24,7 @@ class DisplayMessageFormatActionMenuTest : public QObject { Q_OBJECT public: - DisplayMessageFormatActionMenuTest(); + explicit DisplayMessageFormatActionMenuTest(QObject *parent = nullptr); private Q_SLOTS: void shouldHaveDefaultValue(); void shouldEmitSignalWhenClickOnSubMenu(); diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index bb4fe7bcb..e0d12e6ed 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -362,7 +362,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState mRichTextEditorwidget = new KPIMTextEdit::RichTextEditorWidget(composerEditorNg, mCryptoStateIndicatorWidget); //Don't use new connect api here. It crashs - connect(composerEditorNg, SIGNAL(textChanged()), this, SLOT(slotEditorTextChanged())); + connect(composerEditorNg, &QTextEdit::textChanged, this, &KMComposerWin::slotEditorTextChanged); connect(composerEditorNg, &KMComposerEditorNg::selectionChanged, this, &KMComposerWin::slotSelectionChanged); //connect(editor, &KMComposerEditor::textChanged, this, &KMComposeWin::slotEditorTextChanged); mComposerBase->setEditor(composerEditorNg); diff --git a/src/identity/identitydialog.cpp b/src/identity/identitydialog.cpp index 7f788fdee..b1912a39d 100644 --- a/src/identity/identitydialog.cpp +++ b/src/identity/identitydialog.cpp @@ -975,7 +975,7 @@ void IdentityDialog::unregisterSpecialCollection(qint64 colId) // resource set as well. auto fetch = new Akonadi::CollectionFetchJob(Akonadi::Collection(colId), Akonadi::CollectionFetchJob::Base, this); connect(fetch, &Akonadi::CollectionFetchJob::collectionsReceived, - this, [this](const Akonadi::Collection::List &cols) { + this, [](const Akonadi::Collection::List &cols) { if (cols.count() != 1) { return; } diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp index 860fbf247..4938656fc 100644 --- a/src/kmreaderwin.cpp +++ b/src/kmreaderwin.cpp @@ -290,13 +290,13 @@ QString KMReaderWin::newFeaturesMD5() void KMReaderWin::displaySplashPage(const QString &templateName, const QVariantHash &_data) { QVariantHash data = _data; - if (!data.contains(QLatin1String("icon"))) { + if (!data.contains(QStringLiteral("icon"))) { data[QStringLiteral("icon")] = QStringLiteral("kmail"); } - if (!data.contains(QLatin1String("name"))) { + if (!data.contains(QStringLiteral("name"))) { data[QStringLiteral("name")] = i18n("KMail"); } - if (!data.contains(QLatin1String("subtitle"))) { + if (!data.contains(QStringLiteral("subtitle"))) { data[QStringLiteral("subtitle")] = i18n("The KDE Mail Client"); } diff --git a/src/kontactplugin/summary/kcmkontactsummary.cpp b/src/kontactplugin/summary/kcmkontactsummary.cpp index ce9df99bd..1ea8cf5bd 100644 --- a/src/kontactplugin/summary/kcmkontactsummary.cpp +++ b/src/kontactplugin/summary/kcmkontactsummary.cpp @@ -76,6 +76,7 @@ public: } private: + Q_DISABLE_COPY(PluginItem) KPluginInfo mInfo; }; diff --git a/src/kontactplugin/summary/summaryview_part.cpp b/src/kontactplugin/summary/summaryview_part.cpp index c1b144294..737250a81 100644 --- a/src/kontactplugin/summary/summaryview_part.cpp +++ b/src/kontactplugin/summary/summaryview_part.cpp @@ -435,7 +435,7 @@ void SummaryViewPart::slotConfigure() dlg->setModal(true); QStringList modules = configModules(); - modules.prepend(QLatin1String("kcmkontactsummary.desktop")); + modules.prepend(QStringLiteral("kcmkontactsummary.desktop")); connect(dlg.data(), QOverload<>::of(&KCMultiDialog::configCommitted), this, &SummaryViewPart::updateWidgets); diff --git a/src/searchdialog/incompleteindexdialog.cpp b/src/searchdialog/incompleteindexdialog.cpp index 8189da2ac..f1609977d 100644 --- a/src/searchdialog/incompleteindexdialog.cpp +++ b/src/searchdialog/incompleteindexdialog.cpp @@ -203,7 +203,7 @@ QList IncompleteIndexDialog::collectionsToReindex() const void IncompleteIndexDialog::waitForIndexer() { - mIndexer = new QDBusInterface(PimCommon::MailUtil::indexerServiceName(), QLatin1String("/"), + mIndexer = new QDBusInterface(PimCommon::MailUtil::indexerServiceName(), QStringLiteral("/"), QStringLiteral("org.freedesktop.Akonadi.Indexer"), QDBusConnection::sessionBus(), this); diff --git a/src/sieveimapinterface/kmailsieveimapinstanceinterface.h b/src/sieveimapinterface/kmailsieveimapinstanceinterface.h index cf9151760..863a3cf12 100644 --- a/src/sieveimapinterface/kmailsieveimapinstanceinterface.h +++ b/src/sieveimapinterface/kmailsieveimapinstanceinterface.h @@ -29,6 +29,8 @@ public: ~KMailSieveImapInstanceInterface() override = default; QVector sieveImapInstances() override; +private: + Q_DISABLE_COPY(KMailSieveImapInstanceInterface) }; #endif // KMAILSIEVEIMAPINSTANCEINTERFACE_H