From ec306ff72c08e2b8db9f341b5c31031f578e9ff8 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <abbapoh@gmail.com>
Date: Tue, 28 Jan 2020 21:36:26 +0100
Subject: Fix clang-tidy errors

Change-Id: I2abc42456bfa618860ca58736f4d28e8bf56a1c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/app/qbs-setup-toolchains/sdccprobe.cpp                 | 10 +++++-----
 src/app/qbs-setup-toolchains/sdccprobe.h                   |  2 +-
 src/lib/corelib/tools/visualstudioversioninfo.cpp          |  2 +-
 src/plugins/generator/iarew/iarewsettingspropertygroup.cpp |  5 ++---
 src/plugins/generator/iarew/iarewsettingspropertygroup.h   |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp
index 559492280..3eb37cfd3 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp
@@ -116,8 +116,8 @@ static std::vector<Profile> createSdccProfileHelper(
         if (actualArch != QString::fromLatin1(knownArch))
             continue;
 
-        QString fullProfileName = profileName;
-        if (fullProfileName.isEmpty()) {
+        QString fullProfileName;
+        if (profileName.isEmpty()) {
             // Create a full profile name in case we is
             // in auto-detecting mode.
             if (!info.compilerVersion.isValid()) {
@@ -133,7 +133,7 @@ static std::vector<Profile> createSdccProfileHelper(
             // Append the detected actual architecture name
             // to the proposed profile name.
             fullProfileName = QStringLiteral("%1-%2").arg(
-                        fullProfileName, actualArch);
+                        profileName, actualArch);
         }
 
         Profile profile(fullProfileName, settings);
@@ -252,10 +252,10 @@ bool isSdccCompiler(const QString &compilerName)
 }
 
 void createSdccProfile(const QFileInfo &compiler, Settings *settings,
-                       QString profileName)
+                       const QString &profileName)
 {
     const ToolchainInstallInfo info = {compiler, Version{}};
-    createSdccProfileHelper(info, settings, std::move(profileName));
+    createSdccProfileHelper(info, settings, profileName);
 }
 
 void sdccProbe(Settings *settings, std::vector<Profile> &profiles)
diff --git a/src/app/qbs-setup-toolchains/sdccprobe.h b/src/app/qbs-setup-toolchains/sdccprobe.h
index 3d26583d9..4c913ddeb 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.h
+++ b/src/app/qbs-setup-toolchains/sdccprobe.h
@@ -68,7 +68,7 @@ inline bool operator==(const SdccInstallInfo &lhs, const SdccInstallInfo &rhs)
 bool isSdccCompiler(const QString &compilerName);
 
 void createSdccProfile(const QFileInfo &compiler, qbs::Settings *settings,
-                       QString profileName);
+                       const QString &profileName);
 
 void sdccProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp
index 02e5ef495..b5ee3e719 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.cpp
+++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp
@@ -174,7 +174,7 @@ QString VisualStudioVersionInfo::platformToolsetVersion() const
         {16, QStringLiteral("v142")},             // VS 2019
         {15, QStringLiteral("v141")}              // VS 2017
     };
-    for (auto p : table) {
+    for (const auto &p : table) {
         if (p.first == m_version.majorVersion())
             return p.second;
     }
diff --git a/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp b/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp
index 811d74576..a07d59e0f 100644
--- a/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp
+++ b/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp
@@ -96,12 +96,11 @@ void IarewSettingsPropertyGroup::setDataDebugInfo(int debugInfo)
 }
 
 void IarewSettingsPropertyGroup::addOptionsGroup(
-        QByteArray name,
+        const QByteArray &name,
         QVariantList states,
         int version)
 {
-    m_dataPropertyGroup->appendChild<IarewOptionPropertyGroup>(
-                std::move(name), std::move(states), version);
+    m_dataPropertyGroup->appendChild<IarewOptionPropertyGroup>(name, std::move(states), version);
 }
 
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/iarewsettingspropertygroup.h b/src/plugins/generator/iarew/iarewsettingspropertygroup.h
index fcd7f9685..b1feebcc7 100644
--- a/src/plugins/generator/iarew/iarewsettingspropertygroup.h
+++ b/src/plugins/generator/iarew/iarewsettingspropertygroup.h
@@ -50,7 +50,7 @@ protected:
     void setDataVersion(int dataVersion);
     void setDataDebugInfo(int debugInfo);
 
-    void addOptionsGroup(QByteArray name, QVariantList states,
+    void addOptionsGroup(const QByteArray &name, QVariantList states,
                          int version = -1);
 
 private:
-- 
cgit v1.2.3