From 413025db105ba1d700cd4393c5a5eab64338df7e Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 15 May 2019 15:39:08 +0200
Subject: [PATCH] Android: Simplify AndroidManifestEditorWidget::iconPath

Avoid a use of FileName::appendPath().

Change-Id: Ifd5367dc9048bf379362d594d32809e0971e9524
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../android/androidmanifesteditorwidget.cpp   | 20 +++++++------------
 .../android/androidmanifesteditorwidget.h     |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 34eaab71594..ca0946d1c98 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -1211,23 +1211,17 @@ void AndroidManifestEditorWidget::parseUnknownElement(QXmlStreamReader &reader,
     }
 }
 
-QString AndroidManifestEditorWidget::iconPath(const QString &baseDir, IconDPI dpi)
+QString AndroidManifestEditorWidget::iconPath(IconDPI dpi)
 {
-    Utils::FileName fileName = Utils::FileName::fromString(baseDir);
     switch (dpi) {
     case HighDPI:
-        fileName.appendPath(QLatin1String("res/drawable-hdpi/icon.png"));
-        break;
+        return QString("/res/drawable-hdpi/icon.png");
     case MediumDPI:
-        fileName.appendPath(QLatin1String("res/drawable-mdpi/icon.png"));
-        break;
+        return QString("/res/drawable-mdpi/icon.png");
     case LowDPI:
-        fileName.appendPath(QLatin1String("res/drawable-ldpi/icon.png"));
-        break;
-    default:
-        return QString();
+        return QString("/res/drawable-ldpi/icon.png");
     }
-    return fileName.toString();
+    return {};
 }
 
 QIcon AndroidManifestEditorWidget::icon(const QString &baseDir, IconDPI dpi)
@@ -1242,7 +1236,7 @@ QIcon AndroidManifestEditorWidget::icon(const QString &baseDir, IconDPI dpi)
     if (dpi == LowDPI && !m_lIconPath.isEmpty())
         return QIcon(m_lIconPath);
 
-    QString fileName = iconPath(baseDir, dpi);
+    QString fileName = baseDir + iconPath(dpi);
     if (fileName.isEmpty())
         return QIcon();
     return QIcon(fileName);
@@ -1253,7 +1247,7 @@ void AndroidManifestEditorWidget::copyIcon(IconDPI dpi, const QString &baseDir,
     if (!QFileInfo::exists(filePath))
         return;
 
-    const QString targetPath = iconPath(baseDir, dpi);
+    const QString targetPath = baseDir + iconPath(dpi);
     QFile::remove(targetPath);
     QDir dir;
     dir.mkpath(QFileInfo(targetPath).absolutePath());
diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 49d1ec11558..d7a7ff092ca 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -137,7 +137,7 @@ private:
                        int *errorLine, int *errorColumn);
     enum IconDPI { LowDPI, MediumDPI, HighDPI };
     QIcon icon(const QString &baseDir, IconDPI dpi);
-    QString iconPath(const QString &baseDir, IconDPI dpi);
+    QString iconPath(IconDPI dpi);
     void copyIcon(IconDPI dpi, const QString &baseDir, const QString &filePath);
 
     void updateInfoBar(const QString &errorMessage, int line, int column);