From 918978ce89c4ae3edf0e00309d251db59bd76150 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 11 Jul 2023 16:16:26 +0200
Subject: [PATCH] Android: Remove unused androiderrormessage.h/.cpp

These have been added 10 Years ago with the plan to use them soon after,
but that did not happen.

Amends: db78293e7f13d53053f323487f96fa3c9ee477ad

Change-Id: Ic916eafba56cbb5e4d1dadfb63222fa2870fbd2c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/plugins/android/CMakeLists.txt          |  1 -
 src/plugins/android/android.qbs             |  2 -
 src/plugins/android/androiderrormessage.cpp | 49 ---------------------
 src/plugins/android/androiderrormessage.h   | 31 -------------
 4 files changed, 83 deletions(-)
 delete mode 100644 src/plugins/android/androiderrormessage.cpp
 delete mode 100644 src/plugins/android/androiderrormessage.h

diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
index 9246c94e829..f49e57ba58c 100644
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -14,7 +14,6 @@ add_qtc_plugin(Android
     androiddeployqtstep.cpp androiddeployqtstep.h
     androiddevice.cpp androiddevice.h
     androiddeviceinfo.cpp androiddeviceinfo.h
-    androiderrormessage.cpp androiderrormessage.h
     androidextralibrarylistmodel.cpp androidextralibrarylistmodel.h
     androidglobal.h
     androidmanager.cpp androidmanager.h
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index b187ed428fc..2baca19e0f2 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -36,8 +36,6 @@ Project {
             "androiddevice.h",
             "androiddeviceinfo.cpp",
             "androiddeviceinfo.h",
-            "androiderrormessage.h",
-            "androiderrormessage.cpp",
             "androidextralibrarylistmodel.cpp",
             "androidextralibrarylistmodel.h",
             "androidglobal.h",
diff --git a/src/plugins/android/androiderrormessage.cpp b/src/plugins/android/androiderrormessage.cpp
deleted file mode 100644
index c67abf727f0..00000000000
--- a/src/plugins/android/androiderrormessage.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "androiderrormessage.h"
-#include "androidtr.h"
-
-#include <QObject>
-
-namespace Android {
-namespace Internal {
-
-QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList &parameters)
-{
-    Q_UNUSED(parameters)
-    switch (errorCode) {
-    case SDKInstallationError:
-        return Tr::tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);
-
-    case NDKInstallationError:
-        return Tr::tr("Android: NDK installation error 0x%1").arg(errorCode, 0, 16);
-
-    case JavaInstallationError:
-        return Tr::tr("Android: Java installation error 0x%1").arg(errorCode, 0, 16);
-
-    case AntInstallationError:
-        return Tr::tr("Android: ant installation error 0x%1").arg(errorCode, 0, 16);
-
-    case AdbInstallationError:
-        return Tr::tr("Android: adb installation error 0x%1").arg(errorCode, 0, 16);
-
-    case DeviceConnectionError:
-        return Tr::tr("Android: Device connection error 0x%1").arg(errorCode, 0, 16);
-
-    case DevicePermissionError:
-        return Tr::tr("Android: Device permission error 0x%1").arg(errorCode, 0, 16);
-
-    case DeviceAuthorizationError:
-        return Tr::tr("Android: Device authorization error 0x%1").arg(errorCode, 0, 16);
-
-    case DeviceAPILevelError:
-        return Tr::tr("Android: Device API level not supported: error 0x%1").arg(errorCode, 0, 16);
-
-    default:
-        return Tr::tr("Android: Unknown error 0x%1").arg(errorCode, 0, 16);
-    }
-}
-
-} // namespace Internal
-} // namespace Android
diff --git a/src/plugins/android/androiderrormessage.h b/src/plugins/android/androiderrormessage.h
deleted file mode 100644
index c7bb7bc0daa..00000000000
--- a/src/plugins/android/androiderrormessage.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <QVariantList>
-#include <QCoreApplication>
-
-namespace Android {
-namespace Internal {
-
-class AndroidErrorMessage
-{
-public:
-    enum ErrorCode {
-        UnknownError = 0x3000,
-        SDKInstallationError,
-        NDKInstallationError,
-        JavaInstallationError,
-        AntInstallationError,
-        AdbInstallationError,
-        DeviceConnectionError,
-        DevicePermissionError,
-        DeviceAuthorizationError,
-        DeviceAPILevelError
-    };
-    static QString getMessage(ErrorCode errorCode, const QVariantList &parameters = QVariantList());
-};
-
-} // namespace Internal
-} // namespace Android