feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Simplify AndroidManifestEditorWidget::iconPath

Browse Source 
Avoid a use of FileName::appendPath().

Change-Id: Ifd5367dc9048bf379362d594d32809e0971e9524
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-15 15:39:08 +02:00
parent efa7a5a4d4
commit 413025db10
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/android/androidmanifesteditorwidget.cpp
+7 -13
View File
@@ -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) { switch (dpi) {
case HighDPI: case HighDPI:
fileName.appendPath(QLatin1String("res/drawable-hdpi/icon.png")); return QString("/res/drawable-hdpi/icon.png");
break;
case MediumDPI: case MediumDPI:
fileName.appendPath(QLatin1String("res/drawable-mdpi/icon.png")); return QString("/res/drawable-mdpi/icon.png");
break;
case LowDPI: case LowDPI:
fileName.appendPath(QLatin1String("res/drawable-ldpi/icon.png")); return QString("/res/drawable-ldpi/icon.png");
break;
default:
return QString();
} }
return fileName.toString(); return {};
} }
QIcon AndroidManifestEditorWidget::icon(const QString &baseDir, IconDPI dpi) 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()) if (dpi == LowDPI && !m_lIconPath.isEmpty())
return QIcon(m_lIconPath); return QIcon(m_lIconPath);
QString fileName = iconPath(baseDir, dpi); QString fileName = baseDir + iconPath(dpi);
if (fileName.isEmpty()) if (fileName.isEmpty())
return QIcon(); return QIcon();
return QIcon(fileName); return QIcon(fileName);
@@ -1253,7 +1247,7 @@ void AndroidManifestEditorWidget::copyIcon(IconDPI dpi, const QString &baseDir,
if (!QFileInfo::exists(filePath)) if (!QFileInfo::exists(filePath))
return; return;
const QString targetPath = iconPath(baseDir, dpi); const QString targetPath = baseDir + iconPath(dpi);
QFile::remove(targetPath); QFile::remove(targetPath);
QDir dir; QDir dir;
dir.mkpath(QFileInfo(targetPath).absolutePath()); dir.mkpath(QFileInfo(targetPath).absolutePath());
src/plugins/android/androidmanifesteditorwidget.h
+1 -1
View File
@@ -137,7 +137,7 @@ private:
int *errorLine, int *errorColumn); int *errorLine, int *errorColumn);
enum IconDPI { LowDPI, MediumDPI, HighDPI }; enum IconDPI { LowDPI, MediumDPI, HighDPI };
QIcon icon(const QString &baseDir, IconDPI dpi); 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 copyIcon(IconDPI dpi, const QString &baseDir, const QString &filePath);
void updateInfoBar(const QString &errorMessage, int line, int column); void updateInfoBar(const QString &errorMessage, int line, int column);