From 91ba57399c902a431025171d5cc82b48fe1ab90d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 12 Jun 2019 18:12:04 +0200
Subject: [PATCH] Boot2Qt: Simplify QdbUtils

Change-Id: Ief211d00812284828197f34bc2aaf4a72bdffda4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/boot2qt/qdbdevice.cpp |  2 +-
 src/plugins/boot2qt/qdbplugin.cpp |  9 +++++++++
 src/plugins/boot2qt/qdbutils.cpp  | 28 +---------------------------
 src/plugins/boot2qt/qdbutils.h    | 11 +----------
 4 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 8eb55f19836..a5b898d3cd7 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -143,7 +143,7 @@ QdbDevice::QdbDevice()
     }});
 
     addDeviceAction({tr("Restore Default App"), [](const IDevice::Ptr &device, QWidget *) {
-        CommandLine cmd{FilePath::fromString(appControllerFilePath()), {"--remove-default"}};
+        CommandLine cmd{FilePath::fromString("appcontroller"), {"--remove-default"}};
         (void) new DeviceApplicationObserver(device, cmd);
     }});
 }
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index e726118eb10..ee0911c02f0 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -78,6 +78,15 @@ static void startFlashingWizard()
     showMessage(message.arg(filePath), true);
 }
 
+static bool isFlashActionDisabled()
+{
+    QSettings * const settings = Core::ICore::settings();
+    settings->beginGroup(settingsGroupKey());
+    bool disabled = settings->value("flashActionDisabled", false).toBool();
+    settings->endGroup();
+    return disabled;
+}
+
 void registerFlashAction(QObject *parentForAction)
 {
     if (isFlashActionDisabled())
diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp
index 8ba78928e0f..b4880fa28cc 100644
--- a/src/plugins/boot2qt/qdbutils.cpp
+++ b/src/plugins/boot2qt/qdbutils.cpp
@@ -39,8 +39,6 @@ namespace Internal {
 static QString executableBaseName(QdbTool tool)
 {
     switch (tool) {
-    case QdbTool::Adb:
-        return QLatin1String("adb");
     case QdbTool::FlashingWizard:
         return QLatin1String("b2qt-flashing-wizard");
     case QdbTool::Qdb:
@@ -50,24 +48,15 @@ static QString executableBaseName(QdbTool tool)
     return QString();
 }
 
-QString appControllerFilePath()
-{
-    return QLatin1String("appcontroller");
-}
-
-Utils::FilePath findTool(QdbTool tool, PathSource *source)
+Utils::FilePath findTool(QdbTool tool)
 {
     QString filePath = QString::fromLocal8Bit(qgetenv(overridingEnvironmentVariable(tool)));
-    if (source)
-        *source = PathSource::Environment;
 
     if (filePath.isEmpty()) {
         QSettings * const settings = Core::ICore::settings();
         settings->beginGroup(settingsGroupKey());
         filePath = settings->value(settingsKey(tool)).toString();
         settings->endGroup();
-        if (source)
-            *source = PathSource::Settings;
     }
 
     if (filePath.isEmpty()) {
@@ -79,27 +68,14 @@ Utils::FilePath findTool(QdbTool tool, PathSource *source)
                     + QLatin1String("/../../b2qt/")
 #endif
                     + executableBaseName(tool));
-        if (source)
-            *source = PathSource::Fallback;
     }
 
     return Utils::FilePath::fromString(QDir::cleanPath(filePath));
 }
 
-bool isFlashActionDisabled()
-{
-    QSettings * const settings = Core::ICore::settings();
-    settings->beginGroup(settingsGroupKey());
-    bool disabled = settings->value("flashActionDisabled", false).toBool();
-    settings->endGroup();
-    return disabled;
-}
-
 const char *overridingEnvironmentVariable(QdbTool tool)
 {
     switch (tool) {
-    case QdbTool::Adb:
-        return "BOOT2QT_ADB_FILEPATH";
     case QdbTool::FlashingWizard:
         return "BOOT2QT_FLASHWIZARD_FILEPATH";
     case QdbTool::Qdb:
@@ -124,8 +100,6 @@ QString settingsGroupKey()
 QString settingsKey(QdbTool tool)
 {
     switch (tool) {
-    case QdbTool::Adb:
-        return QLatin1String("adbFilePath");
     case QdbTool::FlashingWizard:
         return QLatin1String("flashingWizardFilePath");
     case QdbTool::Qdb:
diff --git a/src/plugins/boot2qt/qdbutils.h b/src/plugins/boot2qt/qdbutils.h
index a67930fbec8..feafdbab576 100644
--- a/src/plugins/boot2qt/qdbutils.h
+++ b/src/plugins/boot2qt/qdbutils.h
@@ -33,20 +33,11 @@ namespace Qdb {
 namespace Internal {
 
 enum class QdbTool {
-    Adb,
     FlashingWizard,
     Qdb
 };
 
-enum class PathSource {
-    Environment,
-    Settings,
-    Fallback
-};
-
-QString appControllerFilePath();
-Utils::FilePath findTool(QdbTool tool, PathSource *source = nullptr);
-bool isFlashActionDisabled();
+Utils::FilePath findTool(QdbTool tool);
 const char *overridingEnvironmentVariable(QdbTool tool);
 void showMessage(const QString &message, bool important = false);
 QString settingsGroupKey();