From 0702e8a3b516d109474c1988c0a9efb35ef616b4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 17 Aug 2011 14:16:24 +0200 Subject: [PATCH] MobileWizards: Rename MaemoPngIcon to just PngIcon Change-Id: I3aa1f0eb3d2a894ba816c0d055d847a21f71da27 Reviewed-on: http://codereview.qt.nokia.com/3110 Reviewed-by: Kai Koehne --- .../shared/{maemoicon64.png => icon64.png} | Bin .../shared/{maemoicon80.png => icon80.png} | Bin .../wizards/abstractmobileapp.cpp | 40 ++++++++++----------- .../qt4projectmanager/wizards/abstractmobileapp.h | 24 ++++++------- .../wizards/abstractmobileappwizard.cpp | 8 ++--- 5 files changed, 36 insertions(+), 36 deletions(-) rename share/qtcreator/templates/shared/{maemoicon64.png => icon64.png} (100%) rename share/qtcreator/templates/shared/{maemoicon80.png => icon80.png} (100%) diff --git a/share/qtcreator/templates/shared/maemoicon64.png b/share/qtcreator/templates/shared/icon64.png similarity index 100% rename from share/qtcreator/templates/shared/maemoicon64.png rename to share/qtcreator/templates/shared/icon64.png diff --git a/share/qtcreator/templates/shared/maemoicon80.png b/share/qtcreator/templates/shared/icon80.png similarity index 100% rename from share/qtcreator/templates/shared/maemoicon80.png rename to share/qtcreator/templates/shared/icon80.png diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index a5ccd36786..d56a1275fa 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -115,24 +115,24 @@ QString AbstractMobileApp::symbianSvgIcon() const return path(SymbianSvgIconOrigin); } -void AbstractMobileApp::setMaemoPngIcon64(const QString &icon) +void AbstractMobileApp::setPngIcon64(const QString &icon) { - m_maemoPngIcon64 = icon; + m_pngIcon64 = icon; } -QString AbstractMobileApp::maemoPngIcon64() const +QString AbstractMobileApp::pngIcon64() const { - return path(MaemoPngIconOrigin64); + return path(PngIconOrigin64); } -void AbstractMobileApp::setMaemoPngIcon80(const QString &icon) +void AbstractMobileApp::setPngIcon80(const QString &icon) { - m_maemoPngIcon80 = icon; + m_pngIcon80 = icon; } -QString AbstractMobileApp::maemoPngIcon80() const +QString AbstractMobileApp::pngIcon80() const { - return path(MaemoPngIconOrigin80); + return path(PngIconOrigin80); } void AbstractMobileApp::setSymbianTargetUid(const QString &uid) @@ -178,12 +178,12 @@ QString AbstractMobileApp::path(int fileType) const case SymbianSvgIcon: return outputPathBase() + cleanProjectName + QLatin1String(".svg"); case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon : originsRootShared + symbianIconFileName; - case MaemoPngIcon64: return outputPathBase() + cleanProjectName + QLatin1String("64.png"); - case MaemoPngIconOrigin64: return !m_maemoPngIcon64.isEmpty() ? m_maemoPngIcon64 - : originsRootShared + QLatin1String("maemoicon64.png"); - case MaemoPngIcon80: return outputPathBase() + cleanProjectName + QLatin1String("80.png"); - case MaemoPngIconOrigin80: return !m_maemoPngIcon80.isEmpty() ? m_maemoPngIcon80 - : originsRootShared + QLatin1String("maemoicon80.png"); + case PngIcon64: return outputPathBase() + cleanProjectName + QLatin1String("64.png"); + case PngIconOrigin64: return !m_pngIcon64.isEmpty() ? m_pngIcon64 + : originsRootShared + QLatin1String("icon64.png"); + case PngIcon80: return outputPathBase() + cleanProjectName + QLatin1String("80.png"); + case PngIconOrigin80: return !m_pngIcon80.isEmpty() ? m_pngIcon80 + : originsRootShared + QLatin1String("icon80.png"); default: return pathExtended(fileType); } return QString(); @@ -403,8 +403,8 @@ Core::GeneratedFiles AbstractMobileApp::generateFiles(QString *errorMessage) con files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute); files << file(generateFile(AbstractGeneratedFileInfo::MainCppFile, errorMessage), path(MainCpp)); files << file(generateFile(AbstractGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)); - files << file(generateFile(AbstractGeneratedFileInfo::MaemoPngIconFile64, errorMessage), path(MaemoPngIcon64)); - files << file(generateFile(AbstractGeneratedFileInfo::MaemoPngIconFile80, errorMessage), path(MaemoPngIcon80)); + files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile64, errorMessage), path(PngIcon64)); + files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile80, errorMessage), path(PngIcon80)); files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)); files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); return files; @@ -442,11 +442,11 @@ QByteArray AbstractMobileApp::generateFile(int fileType, case AbstractGeneratedFileInfo::SymbianSvgIconFile: data = readBlob(path(SymbianSvgIconOrigin), errorMessage); break; - case AbstractGeneratedFileInfo::MaemoPngIconFile64: - data = readBlob(path(MaemoPngIconOrigin64), errorMessage); + case AbstractGeneratedFileInfo::pngIconFile64: + data = readBlob(path(PngIconOrigin64), errorMessage); break; - case AbstractGeneratedFileInfo::MaemoPngIconFile80: - data = readBlob(path(MaemoPngIconOrigin80), errorMessage); + case AbstractGeneratedFileInfo::pngIconFile80: + data = readBlob(path(PngIconOrigin80), errorMessage); break; case AbstractGeneratedFileInfo::DesktopFileFremantle: case AbstractGeneratedFileInfo::DesktopFileHarmattan: diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h index f4bea31e2b..ca686f8e0f 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h @@ -57,8 +57,8 @@ struct AppProFile, DeploymentPriFile, SymbianSvgIconFile, - MaemoPngIconFile64, - MaemoPngIconFile80, + pngIconFile64, + pngIconFile80, DesktopFileFremantle, DesktopFileHarmattan, ExtendedFile @@ -106,10 +106,10 @@ public: DeploymentPriOrigin, SymbianSvgIcon, SymbianSvgIconOrigin, - MaemoPngIcon64, - MaemoPngIconOrigin64, - MaemoPngIcon80, - MaemoPngIconOrigin80, + PngIcon64, + PngIconOrigin64, + PngIcon80, + PngIconOrigin80, ExtendedFile }; @@ -122,10 +122,10 @@ public: void setProjectPath(const QString &path); void setSymbianSvgIcon(const QString &icon); QString symbianSvgIcon() const; - void setMaemoPngIcon64(const QString &icon); - QString maemoPngIcon64() const; - void setMaemoPngIcon80(const QString &icon); - QString maemoPngIcon80() const; + void setPngIcon64(const QString &icon); + QString pngIcon64() const; + void setPngIcon80(const QString &icon); + QString pngIcon80() const; void setSymbianTargetUid(const QString &uid); QString symbianTargetUid() const; void setNetworkEnabled(bool enabled); @@ -189,8 +189,8 @@ private: QString m_projectName; QFileInfo m_projectPath; QString m_symbianSvgIcon; - QString m_maemoPngIcon64; - QString m_maemoPngIcon80; + QString m_pngIcon64; + QString m_pngIcon80; QString m_symbianTargetUid; ScreenOrientation m_orientation; bool m_networkEnabled; diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 8fb4217fe5..650f6b92ba 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -233,8 +233,8 @@ QWizard *AbstractMobileAppWizard::createWizardDialog(QWidget *parent, wdlg->m_genericOptionsPage->setOrientation(app()->orientation()); wdlg->m_symbianOptionsPage->setSvgIcon(app()->symbianSvgIcon()); wdlg->m_symbianOptionsPage->setNetworkEnabled(app()->networkEnabled()); - wdlg->m_maemoOptionsPage->setPngIcon(app()->maemoPngIcon64()); - wdlg->m_harmattanOptionsPage->setPngIcon(app()->maemoPngIcon80()); + wdlg->m_maemoOptionsPage->setPngIcon(app()->pngIcon64()); + wdlg->m_harmattanOptionsPage->setPngIcon(app()->pngIcon80()); connect(wdlg, SIGNAL(projectParametersChanged(QString, QString)), SLOT(useProjectPath(QString, QString))); foreach (QWizardPage *p, extensionPages) @@ -251,8 +251,8 @@ Core::GeneratedFiles AbstractMobileAppWizard::generateFiles(const QWizard *wizar app()->setSymbianTargetUid(wdlg->m_symbianOptionsPage->symbianUid()); app()->setSymbianSvgIcon(wdlg->m_symbianOptionsPage->svgIcon()); app()->setNetworkEnabled(wdlg->m_symbianOptionsPage->networkEnabled()); - app()->setMaemoPngIcon64(wdlg->m_maemoOptionsPage->pngIcon()); - app()->setMaemoPngIcon80(wdlg->m_harmattanOptionsPage->pngIcon()); + app()->setPngIcon64(wdlg->m_maemoOptionsPage->pngIcon()); + app()->setPngIcon80(wdlg->m_harmattanOptionsPage->pngIcon()); prepareGenerateFiles(wizard, errorMessage); return app()->generateFiles(errorMessage); } -- 2.11.0