From 2a8bd5308c5082820a5428a614101482892163ff Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 24 Mar 2020 07:01:29 +0100 Subject: [PATCH] Fix cppcheck warning --- agents/archivemailagent/archivemailwidget.cpp | 4 ++-- agents/unifiedmailboxagent/unifiedmailboxagent.cpp | 6 +++--- .../kmailplugineditorconverttextmanagerinterface.cpp | 4 ++-- .../plugininterface/kmailplugineditormanagerinterface.cpp | 4 ++-- src/kmcommands.cpp | 4 ++-- src/kmreadermainwin.cpp | 3 --- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/agents/archivemailagent/archivemailwidget.cpp b/agents/archivemailagent/archivemailwidget.cpp index 73ff45d5b..82ba5377b 100644 --- a/agents/archivemailagent/archivemailwidget.cpp +++ b/agents/archivemailagent/archivemailwidget.cpp @@ -161,8 +161,8 @@ void ArchiveMailWidget::load() const QStringList collectionList = config()->groupList().filter(QRegularExpression(archiveMailCollectionPattern())); const int numberOfCollection = collectionList.count(); for (int i = 0; i < numberOfCollection; ++i) { - KConfigGroup group = config()->group(collectionList.at(i)); - ArchiveMailInfo *info = new ArchiveMailInfo(group); + KConfigGroup collectionGroup = config()->group(collectionList.at(i)); + ArchiveMailInfo *info = new ArchiveMailInfo(collectionGroup); if (info->isValid()) { createOrUpdateItem(info); } else { diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp index 7369851d4..aeffa515f 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.cpp +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.cpp @@ -147,9 +147,9 @@ void UnifiedMailboxAgent::retrieveCollections() topLevel.setParentCollection(Akonadi::Collection::root()); topLevel.setContentMimeTypes({Akonadi::Collection::mimeType()}); topLevel.setRights(Akonadi::Collection::ReadOnly); - auto displayAttr = topLevel.attribute(Akonadi::Collection::AddIfMissing); - displayAttr->setDisplayName(i18n("Unified Mailboxes")); - displayAttr->setActiveIconName(QStringLiteral("globe")); + auto topLevelDisplayAttr = topLevel.attribute(Akonadi::Collection::AddIfMissing); + topLevelDisplayAttr->setDisplayName(i18n("Unified Mailboxes")); + topLevelDisplayAttr->setActiveIconName(QStringLiteral("globe")); collections.push_back(topLevel); for (const auto &boxIt : mBoxManager) { diff --git a/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp b/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp index 4d507064a..0bf70e1f1 100644 --- a/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp +++ b/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp @@ -165,7 +165,7 @@ QHash > KMailPluginEdi if (interface->plugin()->hasPopupMenuSupport()) { type = MessageComposer::PluginActionType::PopupMenu; if (currentAction) { - QList lst = mActionHash.value(type); + lst = mActionHash.value(type); if (!lst.isEmpty()) { QAction *act = new QAction(this); act->setSeparator(true); @@ -178,7 +178,7 @@ QHash > KMailPluginEdi } if (interface->plugin()->hasToolBarSupport()) { type = MessageComposer::PluginActionType::ToolBar; - QList lst = mActionHash.value(type); + lst = mActionHash.value(type); if (!lst.isEmpty()) { QAction *act = new QAction(this); act->setSeparator(true); diff --git a/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp b/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp index 53a70eb99..cdeeb0d09 100644 --- a/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp +++ b/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp @@ -167,7 +167,7 @@ QHash > KMailPluginEdi } if (interface->plugin()->hasPopupMenuSupport()) { type = MessageComposer::PluginActionType::PopupMenu; - QList lst = mActionHash.value(type); + lst = mActionHash.value(type); if (!lst.isEmpty()) { QAction *act = new QAction(this); act->setSeparator(true); @@ -179,7 +179,7 @@ QHash > KMailPluginEdi } if (interface->plugin()->hasToolBarSupport()) { type = MessageComposer::PluginActionType::ToolBar; - QList lst = mActionHash.value(type); + lst = mActionHash.value(type); if (!lst.isEmpty()) { QAction *act = new QAction(this); act->setSeparator(true); diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp index dc6f706f6..bdb3fdd31 100644 --- a/src/kmcommands.cpp +++ b/src/kmcommands.cpp @@ -1296,8 +1296,8 @@ void KMSetTagCommand::setTags() KConfigGroup tag(KMKernel::self()->config(), "MessageListView"); const QString oldTagList = tag.readEntry("TagSelected"); QStringList lst = oldTagList.split(QLatin1Char(',')); - for (const Akonadi::Tag &tag : qAsConst(mCreatedTags)) { - const QString url = tag.url().url(); + for (const Akonadi::Tag &createdTag : qAsConst(mCreatedTags)) { + const QString url = createdTag.url().url(); if (!lst.contains(url)) { lst.append(url); } diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp index 0c82a2a29..d56ea5ad8 100644 --- a/src/kmreadermainwin.cpp +++ b/src/kmreadermainwin.cpp @@ -769,9 +769,6 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url menu->addAction(mReaderWin->toggleMimePartTreeAction()); } } - if (msg.isValid()) { - menu->addAction(mMsgActions->addFollowupReminderAction()); - } if (msg.isValid()) { menu->addSeparator(); menu->addAction(mMsgActions->addFollowupReminderAction());