From 9cbcbfff3354564dd81e7207d46e53fef96580f5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 8 Dec 2020 13:38:19 +0100 Subject: [PATCH] Fix various clang warnings Unused variables & functions, unneeded copies in range-for loops, missing overrides. Change-Id: I27b60e7c92a6ca425a84c89b537d5c3815449a94 Reviewed-by: Christian Stenger --- src/plugins/android/androidconfigurations.cpp | 18 ++++++++---------- src/plugins/incredibuild/commandbuilder.cpp | 1 - src/plugins/projectexplorer/makestep.cpp | 1 - .../connectioneditor/bindingmodel.cpp | 2 +- .../connectioneditor/connectionmodel.cpp | 2 +- .../dynamicpropertiesmodel.cpp | 2 +- .../imagecache/imagecachestorage.h | 2 +- .../designercore/model/qmlitemnode.cpp | 4 ++-- src/plugins/qtsupport/profilereader.cpp | 10 ---------- 9 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 13dd6f8a7de..4c7a5183684 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1450,16 +1450,14 @@ AndroidConfigurations::~AndroidConfigurations() = default; static Utils::FilePath androidStudioPath() { - if (Utils::HostOsInfo::isWindowsHost()) { - const QLatin1String registryKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio"); - const QLatin1String valueName("Path"); - #if defined(Q_OS_WIN) - const QSettings settings64(registryKey, QSettings::Registry64Format); - const QSettings settings32(registryKey, QSettings::Registry32Format); - return Utils::FilePath::fromUserInput( - settings64.value(valueName, settings32.value(valueName).toString()).toString()); - #endif - } +#if defined(Q_OS_WIN) + const QLatin1String registryKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio"); + const QLatin1String valueName("Path"); + const QSettings settings64(registryKey, QSettings::Registry64Format); + const QSettings settings32(registryKey, QSettings::Registry32Format); + return Utils::FilePath::fromUserInput( + settings64.value(valueName, settings32.value(valueName).toString()).toString()); +#endif return {}; // TODO non-Windows } diff --git a/src/plugins/incredibuild/commandbuilder.cpp b/src/plugins/incredibuild/commandbuilder.cpp index 4e46ab8d009..b7ae39a2664 100644 --- a/src/plugins/incredibuild/commandbuilder.cpp +++ b/src/plugins/incredibuild/commandbuilder.cpp @@ -31,7 +31,6 @@ namespace Internal { namespace Constants { const QLatin1String CUSTOMCOMMANDBUILDER_COMMAND("IncrediBuild.BuildConsole.%1.Command"); const QLatin1String CUSTOMCOMMANDBUILDER_ARGS("IncrediBuild.BuildConsole.%1.Arguments"); -const QLatin1String CUSTOMCOMMANDBUILDER_ARGSSET("IncrediBuild.BuildConsole.%1.ArgumentsSet"); } // namespace Constants void CommandBuilder::fromMap(const QVariantMap &map) diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 5bdf0d5f982..560cc177828 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -59,7 +59,6 @@ using namespace Utils; const char BUILD_TARGETS_SUFFIX[] = ".BuildTargets"; const char MAKE_ARGUMENTS_SUFFIX[] = ".MakeArguments"; const char MAKE_COMMAND_SUFFIX[] = ".MakeCommand"; -const char CLEAN_SUFFIX[] = ".Clean"; const char OVERRIDE_MAKEFLAGS_SUFFIX[] = ".OverrideMakeflags"; const char JOBCOUNT_SUFFIX[] = ".JobCount"; diff --git a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp index f14acc16396..3fc86c480b8 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp @@ -57,7 +57,7 @@ void BindingModel::resetModel() QStringList({tr("Item"), tr("Property"), tr("Source Item"), tr("Source Property")})); if (connectionView()->isAttached()) { - for (const ModelNode modelNode : connectionView()->selectedModelNodes()) + for (const ModelNode &modelNode : connectionView()->selectedModelNodes()) addModelNode(modelNode); } diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 643f7462210..e8226d6632e 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -49,7 +49,7 @@ namespace { QStringList propertyNameListToStringList(const QmlDesigner::PropertyNameList &propertyNameList) { QStringList stringList; - for (const QmlDesigner::PropertyName propertyName : propertyNameList) { + for (const QmlDesigner::PropertyName &propertyName : propertyNameList) { stringList << QString::fromUtf8(propertyName); } stringList.removeDuplicates(); diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index f0ddc6e3e58..db81f1bb7d8 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -134,7 +134,7 @@ void DynamicPropertiesModel::resetModel() QStringList({tr("Item"), tr("Property"), tr("Property Type"), tr("Property Value")})); if (connectionView()->isAttached()) { - for (const ModelNode modelNode : connectionView()->selectedModelNodes()) + for (const ModelNode &modelNode : connectionView()->selectedModelNodes()) addModelNode(modelNode); } diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachestorage.h b/src/plugins/qmldesigner/designercore/imagecache/imagecachestorage.h index 90900cf19e0..74fc5d933b4 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachestorage.h +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachestorage.h @@ -126,7 +126,7 @@ public: } } - void walCheckpointFull() + void walCheckpointFull() override { try { database.walCheckpointFull(); diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 814d5494806..462b44a9157 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -837,7 +837,7 @@ ModelNode QmlFlowItemNode::decisionNodeForTransition(const ModelNode &transition } QmlFlowViewNode flowView(transition.view()->rootModelNode()); if (flowView.isValid()) { - for (const ModelNode target : flowView.decicions()) { + for (const ModelNode &target : flowView.decicions()) { if (target.hasBindingProperty("targets") && target.bindingProperty("targets").resolveToModelNodeList().contains(transition)) return target; @@ -853,7 +853,7 @@ ModelNode QmlFlowTargetNode::findSourceForDecisionNode() const if (!isFlowDecision()) return {}; - for (const ModelNode transition : flowView().transitionsForTarget(modelNode())) { + for (const ModelNode &transition : flowView().transitionsForTarget(modelNode())) { if (transition.hasBindingProperty("from")) { const ModelNode source = transition.bindingProperty("from").resolveToModelNode(); if (source.isValid()) { diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp index 0e6e8179c5a..7730ab95540 100644 --- a/src/plugins/qtsupport/profilereader.cpp +++ b/src/plugins/qtsupport/profilereader.cpp @@ -34,16 +34,6 @@ using namespace ProjectExplorer; using namespace QtSupport; -static QString format(const QString &fileName, int lineNo, const QString &msg) -{ - if (lineNo > 0) - return QString::fromLatin1("%1(%2): %3").arg(fileName, QString::number(lineNo), msg); - else if (lineNo) - return QString::fromLatin1("%1: %3").arg(fileName, msg); - else - return msg; -} - ProMessageHandler::ProMessageHandler(bool verbose, bool exact) : m_verbose(verbose) , m_exact(exact)