Fix newly introduced warnings

Change-Id: I0b9cf3496d536e1173fbd6587e5b491305eb876c
Reviewed-by: Christian Stenger <[email protected]>
Reviewed-by: <[email protected]>

8 files changed, 12 insertions, 180 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index f6e036b1d68..8a795780519 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -573,7 +573,7 @@ void AndroidDeviceManager::setupDevicesWatcher()
             []() { qCDebug(androidDeviceLog) << "ADB device watcher finished."; });
 
     connect(m_adbDeviceWatcherProcess.get(), &Utils::QtcProcess::errorOccurred, this,
-            [this](QProcess::ProcessError error) {
+            [this](QProcess::ProcessError) {
         qCDebug(androidDeviceLog) << "ADB device watcher encountered an error:"
                                   << m_adbDeviceWatcherProcess->errorString();
         if (!m_adbDeviceWatcherProcess->isRunning()) {
diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp
index c5ef478e595..eebf8097bc0 100644
--- a/src/plugins/imageviewer/imageview.cpp
+++ b/src/plugins/imageviewer/imageview.cpp
@@ -276,8 +276,6 @@ void ImageView::doScale(qreal factor)
 void ImageView::wheelEvent(QWheelEvent *event)
 {
     qreal factor = qPow(Constants::DEFAULT_SCALE_FACTOR, event->angleDelta().y() / 240.0);
-    qreal currentScale = transform().m11();
-    qreal newScale = currentScale * factor;
     // cap to 0.001 - 1000
     qreal actualFactor = qBound(0.001, factor, 1000.0);
     doScale(actualFactor);
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 6b52b475cb0..a563a3828a3 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -57,15 +57,6 @@ namespace McuKitManager {
 
 static const int KIT_VERSION = 9; // Bumps up whenever details in Kit creation change
 
-static FilePath qulDocsDir()
-{
-    const FilePath qulDir = McuSupportOptions::qulDirFromSettings();
-    if (qulDir.isEmpty() || !qulDir.exists())
-        return {};
-    const FilePath docsDir = qulDir.pathAppended("docs");
-    return docsDir.exists() ? docsDir : FilePath();
-}
-
 static void setKitToolchains(Kit *k, const McuToolChainPackage *tcPackage)
 {
     switch (tcPackage->toolchainType()) {
@@ -168,11 +159,6 @@ static void setKitDevice(Kit *k, const McuTarget *mcuTarget)
     DeviceTypeKitAspect::setDeviceTypeId(k, Constants::DEVICE_TYPE);
 }
 
-static bool expectsCmakeVars(const McuTarget *mcuTarget)
-{
-    return mcuTarget->qulVersion() >= QVersionNumber{2, 0};
-}
-
 static void setKitDependencies(Kit *k,
                                const McuTarget *mcuTarget,
                                const McuAbstractPackage *qtForMCUsSdkPackage)
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index 197389515aa..f4ca09355e4 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -63,10 +63,10 @@ McuPackage::McuPackage(const QString &label,
     , m_detectionPath(detectionPath)
     , m_settingsKey(settingsKey)
     , m_versionDetector(versionDetector)
+    , m_relativePathModifier(relativePathModifier)
     , m_environmentVariableName(envVarName)
     , m_downloadUrl(downloadUrl)
     , m_addToSystemPath(addToSystemPath)
-    , m_relativePathModifier(relativePathModifier)
 {
     m_path = Sdk::packagePathFromSettings(settingsKey, QSettings::UserScope, m_defaultPath);
 }
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index cc61de078a4..df06b96767e 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -163,73 +163,6 @@ void McuSupportOptions::remapQul2xCmakeVars(Kit *kit, const EnvironmentItems &en
     CMakeConfigurationKitAspect::setConfiguration(kit, config);
 }
 
-static void setKitToolchains(Kit *k, const McuToolChainPackage *tcPackage)
-{
-    switch (tcPackage->toolchainType()) {
-    case McuToolChainPackage::ToolChainType::Unsupported:
-        return;
-
-    case McuToolChainPackage::ToolChainType::GHS:
-    case McuToolChainPackage::ToolChainType::GHSArm:
-        return; // No Green Hills toolchain, because support for it is missing.
-
-    case McuToolChainPackage::ToolChainType::IAR:
-    case McuToolChainPackage::ToolChainType::KEIL:
-    case McuToolChainPackage::ToolChainType::MSVC:
-    case McuToolChainPackage::ToolChainType::GCC:
-    case McuToolChainPackage::ToolChainType::ArmGcc:
-        ToolChainKitAspect::setToolChain(k,
-                                         tcPackage->toolChain(
-                                             ProjectExplorer::Constants::C_LANGUAGE_ID));
-        ToolChainKitAspect::setToolChain(k,
-                                         tcPackage->toolChain(
-                                             ProjectExplorer::Constants::CXX_LANGUAGE_ID));
-        return;
-
-    default:
-        Q_UNREACHABLE();
-    }
-}
-
-static void setKitDebugger(Kit *k, const McuToolChainPackage *tcPackage)
-{
-    if (tcPackage->isDesktopToolchain()) {
-        // Qt Creator seems to be smart enough to deduce the right Kit debugger from the ToolChain
-        return;
-    }
-
-    switch (tcPackage->toolchainType()) {
-    case McuToolChainPackage::ToolChainType::Unsupported:
-    case McuToolChainPackage::ToolChainType::GHS:
-    case McuToolChainPackage::ToolChainType::GHSArm:
-    case McuToolChainPackage::ToolChainType::IAR:
-        return; // No Green Hills and IAR debugger, because support for it is missing.
-
-    case McuToolChainPackage::ToolChainType::KEIL:
-    case McuToolChainPackage::ToolChainType::MSVC:
-    case McuToolChainPackage::ToolChainType::GCC:
-    case McuToolChainPackage::ToolChainType::ArmGcc: {
-        const QVariant debuggerId = tcPackage->debuggerId();
-        if (debuggerId.isValid()) {
-            Debugger::DebuggerKitAspect::setDebugger(k, debuggerId);
-        }
-        return;
-    }
-
-    default:
-        Q_UNREACHABLE();
-    }
-}
-
-static void setKitDevice(Kit *k, const McuTarget *mcuTarget)
-{
-    // "Device Type" Desktop is the default. We use that for the Qt for MCUs Desktop Kit
-    if (mcuTarget->toolChainPackage()->isDesktopToolchain())
-        return;
-
-    DeviceTypeKitAspect::setDeviceTypeId(k, Constants::DEVICE_TYPE);
-}
-
 static bool expectsCmakeVars(const McuTarget *mcuTarget)
 {
     return mcuTarget->qulVersion() >= QVersionNumber{2, 0};
@@ -270,28 +203,6 @@ void McuSupportOptions::setKitEnvironment(Kit *k,
     EnvironmentKitAspect::setEnvironmentChanges(k, changes);
 }
 
-static void setKitDependencies(Kit *k,
-                               const McuTarget *mcuTarget,
-                               const McuAbstractPackage *qtForMCUsSdkPackage)
-{
-    NameValueItems dependencies;
-
-    auto processPackage = [&dependencies](const McuAbstractPackage *package) {
-        if (!package->environmentVariableName().isEmpty())
-            dependencies.append({package->environmentVariableName(),
-                                 package->detectionPath().toUserOutput()});
-    };
-    for (auto package : mcuTarget->packages())
-        processPackage(package);
-    processPackage(qtForMCUsSdkPackage);
-
-    McuDependenciesKitAspect::setDependencies(k, dependencies);
-
-    auto irrelevant = k->irrelevantAspects();
-    irrelevant.insert(McuDependenciesKitAspect::id());
-    k->setIrrelevantAspects(irrelevant);
-}
-
 void McuSupportOptions::updateKitEnvironment(Kit *k, const McuTarget *mcuTarget)
 {
     EnvironmentItems changes = EnvironmentKitAspect::environmentChanges(k);
@@ -318,76 +229,6 @@ void McuSupportOptions::updateKitEnvironment(Kit *k, const McuTarget *mcuTarget)
     EnvironmentKitAspect::setEnvironmentChanges(k, changes);
 }
 
-static void setKitCMakeOptions(Kit *k, const McuTarget *mcuTarget, const FilePath &qulDir)
-{
-    using namespace CMakeProjectManager;
-
-    CMakeConfig config = CMakeConfigurationKitAspect::configuration(k);
-    // CMake ToolChain file for ghs handles CMAKE_*_COMPILER autonomously
-    if (mcuTarget->toolChainPackage()->toolchainType() != McuToolChainPackage::ToolChainType::GHS
-        && mcuTarget->toolChainPackage()->toolchainType() != McuToolChainPackage::ToolChainType::GHSArm) {
-        config.append(CMakeConfigItem("CMAKE_CXX_COMPILER", "%{Compiler:Executable:Cxx}"));
-        config.append(CMakeConfigItem("CMAKE_C_COMPILER", "%{Compiler:Executable:C}"));
-    }
-
-    if (!mcuTarget->toolChainPackage()->isDesktopToolchain()) {
-        const FilePath cMakeToolchainFile = qulDir.pathAppended(
-            "lib/cmake/Qul/toolchain/" + mcuTarget->toolChainPackage()->cmakeToolChainFileName());
-
-        config.append(
-            CMakeConfigItem("CMAKE_TOOLCHAIN_FILE", cMakeToolchainFile.toString().toUtf8()));
-        if (!cMakeToolchainFile.exists()) {
-            printMessage(McuTarget::tr(
-                             "Warning for target %1: missing CMake toolchain file expected at %2.")
-                             .arg(McuKitManager::kitName(mcuTarget),
-                                  cMakeToolchainFile.toUserOutput()),
-                         false);
-        }
-    }
-
-    const FilePath generatorsPath = qulDir.pathAppended("/lib/cmake/Qul/QulGenerators.cmake");
-    config.append(CMakeConfigItem("QUL_GENERATORS", generatorsPath.toString().toUtf8()));
-    if (!generatorsPath.exists()) {
-        printMessage(McuTarget::tr("Warning for target %1: missing QulGenerators expected at %2.")
-                         .arg(McuKitManager::kitName(mcuTarget), generatorsPath.toUserOutput()),
-                     false);
-    }
-
-    config.append(CMakeConfigItem("QUL_PLATFORM", mcuTarget->platform().name.toUtf8()));
-
-    if (mcuTarget->colorDepth() != McuTarget::UnspecifiedColorDepth)
-        config.append(CMakeConfigItem("QUL_COLOR_DEPTH",
-                                      QString::number(mcuTarget->colorDepth()).toLatin1()));
-    if (McuSupportOptions::kitsNeedQtVersion())
-        config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}"));
-    CMakeConfigurationKitAspect::setConfiguration(k, config);
-
-    if (HostOsInfo::isWindowsHost()) {
-        auto type = mcuTarget->toolChainPackage()->toolchainType();
-        if (type == McuToolChainPackage::ToolChainType::GHS || type == McuToolChainPackage::ToolChainType::GHSArm) {
-            // See https://bugreports.qt.io/browse/UL-4247?focusedCommentId=565802&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-565802
-            // and https://bugreports.qt.io/browse/UL-4247?focusedCommentId=565803&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-565803
-            CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM");
-        }
-    }
-}
-
-static void setKitQtVersionOptions(Kit *k)
-{
-    if (!McuSupportOptions::kitsNeedQtVersion())
-        QtSupport::QtKitAspect::setQtVersion(k, nullptr);
-    // else: auto-select a Qt version
-}
-
-static FilePath kitDependencyPath(const Kit *kit, const QString &variableName)
-{
-    for (const NameValueItem &nameValueItem : EnvironmentKitAspect::environmentChanges(kit)) {
-        if (nameValueItem.name == variableName)
-            return FilePath::fromUserInput(nameValueItem.value);
-    }
-    return FilePath();
-}
-
 McuKitManager::UpgradeOption McuSupportOptions::askForKitUpgrades()
 {
     QMessageBox upgradePopup(Core::ICore::dialogParent());
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 95d92e68fe9..4146b066489 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -2246,6 +2246,9 @@ void FormEditor3dPreview::paint(QPainter *painter,
                                 const QStyleOptionGraphicsItem *option,
                                 QWidget *widget)
 {
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
+
     if (!painter->isActive())
         return;
 
diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp
index 06d37a39317..cb7018bf3d9 100644
--- a/src/plugins/studiowelcome/examplecheckout.cpp
+++ b/src/plugins/studiowelcome/examplecheckout.cpp
@@ -106,7 +106,7 @@ void FileDownloader::start()
                                emit progressChanged();
                            });
 
-    QNetworkReply::connect(reply, &QNetworkReply::redirected, [reply](const QUrl &url) {
+    QNetworkReply::connect(reply, &QNetworkReply::redirected, [reply](const QUrl &) {
         emit reply->redirectAllowed();
     });
 
@@ -188,7 +188,7 @@ void FileDownloader::probeUrl()
                          QNetworkRequest::UserVerifiedRedirectPolicy);
     QNetworkReply *reply = Utils::NetworkAccessManager::instance()->head(request);
 
-    QNetworkReply::connect(reply, &QNetworkReply::redirected, [reply](const QUrl &url) {
+    QNetworkReply::connect(reply, &QNetworkReply::redirected, [reply](const QUrl &) {
         emit reply->redirectAllowed();
     });
 
@@ -217,7 +217,7 @@ void FileDownloader::probeUrl()
     QNetworkReply::connect(reply,
                            &QNetworkReply::errorOccurred,
                            this,
-                           [this, reply](QNetworkReply::NetworkError code) {
+                           [this, reply](QNetworkReply::NetworkError) {
                                QQmlData *data = QQmlData::get(this, false);
                                if (!data) {
                                    qDebug() << Q_FUNC_INFO << "FileDownloader is nullptr.";
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index ab4cf65f19c..c3204c0142b 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -274,6 +274,10 @@ public:
                                  const QString &tempFile,
                                  const QString &completeBaseName)
     {
+        Q_UNUSED(url)
+        Q_UNUSED(explicitQmlproject)
+        Q_UNUSED(tempFile)
+        Q_UNUSED(completeBaseName)
         const Utils::FilePath projectFile = Core::ICore::resourcePath("examples")
                                             / example / example + ".qmlproject";
         ProjectExplorer::ProjectExplorerPlugin::openProjectWelcomePage(projectFile.toString());