From 768c4ef0824a009d2e37cf4d026e3079baf9e634 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 13 Sep 2011 19:21:52 +0200 Subject: [PATCH] Consistent names for AbstractGeneratedFileInfo::FileType keys Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0 Reviewed-on: http://codereview.qt-project.org/4828 Reviewed-by: Qt Sanity Bot Reviewed-by: Marco Bubke --- .../wizards/abstractmobileapp.cpp | 20 +++++++++---------- .../wizards/abstractmobileapp.h | 8 ++++---- tests/manual/appwizards/helpers.cpp | 16 +++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 8b24bae49d..e9f45f878e 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -207,10 +207,10 @@ QByteArray AbstractMobileApp::generateDesktopFile(QString *errorMessage, int fil QByteArray desktopFileContent; if (!readTemplate(DesktopOrigin, &desktopFileContent, errorMessage)) return QByteArray(); - if (fileType == AbstractGeneratedFileInfo::DesktopFileFremantle) { + if (fileType == AbstractGeneratedFileInfo::DesktopFremantleFile) { desktopFileContent.replace("Icon=thisApp", "Icon=" + projectName().toUtf8() + "64"); - } else if (fileType == AbstractGeneratedFileInfo::DesktopFileHarmattan) { + } else if (fileType == AbstractGeneratedFileInfo::DesktopHarmattanFile) { desktopFileContent.replace("Icon=thisApp", "Icon=/usr/share/icons/hicolor/80x80/apps/" + projectName().toUtf8() + "80.png"); if (m_supportsMeegoBooster) @@ -410,10 +410,10 @@ 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::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)); + files << file(generateFile(AbstractGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64)); + files << file(generateFile(AbstractGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80)); + files << file(generateFile(AbstractGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle)); + files << file(generateFile(AbstractGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan)); return files; } #endif // CREATORLESSTEST @@ -465,14 +465,14 @@ QByteArray AbstractMobileApp::generateFile(int fileType, case AbstractGeneratedFileInfo::SymbianSvgIconFile: data = readBlob(path(SymbianSvgIconOrigin), errorMessage); break; - case AbstractGeneratedFileInfo::pngIconFile64: + case AbstractGeneratedFileInfo::PngIcon64File: data = readBlob(path(PngIconOrigin64), errorMessage); break; - case AbstractGeneratedFileInfo::pngIconFile80: + case AbstractGeneratedFileInfo::PngIcon80File: data = readBlob(path(PngIconOrigin80), errorMessage); break; - case AbstractGeneratedFileInfo::DesktopFileFremantle: - case AbstractGeneratedFileInfo::DesktopFileHarmattan: + case AbstractGeneratedFileInfo::DesktopFremantleFile: + case AbstractGeneratedFileInfo::DesktopHarmattanFile: data = generateDesktopFile(errorMessage, fileType); break; case AbstractGeneratedFileInfo::DeploymentPriFile: diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h index caabba1aab..5ec32c512d 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h @@ -57,10 +57,10 @@ struct AppProFile, DeploymentPriFile, SymbianSvgIconFile, - pngIconFile64, - pngIconFile80, - DesktopFileFremantle, - DesktopFileHarmattan, + PngIcon64File, + PngIcon80File, + DesktopFremantleFile, + DesktopHarmattanFile, ExtendedFile }; diff --git a/tests/manual/appwizards/helpers.cpp b/tests/manual/appwizards/helpers.cpp index ddd636df21..7773fa95a2 100644 --- a/tests/manual/appwizards/helpers.cpp +++ b/tests/manual/appwizards/helpers.cpp @@ -56,10 +56,10 @@ bool QtQuickApp::generateFiles(QString *errorMessage) const && writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)) - && writeFile(generateFile(QtQuickAppGeneratedFileInfo::MaemoPngIconFile64, errorMessage), path(MaemoPngIcon64)) - && writeFile(generateFile(QtQuickAppGeneratedFileInfo::MaemoPngIconFile80, errorMessage), path(MaemoPngIcon80)) - && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)) - && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); + && writeFile(generateFile(QtQuickAppGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64)) + && writeFile(generateFile(QtQuickAppGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80)) + && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle)) + && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan)); } bool Html5App::generateFiles(QString *errorMessage) const @@ -71,10 +71,10 @@ bool Html5App::generateFiles(QString *errorMessage) const && writeFile(generateFile(Html5AppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp)) && writeFile(generateFile(Html5AppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH)) && writeFile(generateFile(Html5AppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)) - && writeFile(generateFile(Html5AppGeneratedFileInfo::MaemoPngIconFile64, errorMessage), path(MaemoPngIcon64)) - && writeFile(generateFile(Html5AppGeneratedFileInfo::MaemoPngIconFile80, errorMessage), path(MaemoPngIcon80)) - && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)) - && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); + && writeFile(generateFile(Html5AppGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64)) + && writeFile(generateFile(Html5AppGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80)) + && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle)) + && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan)); } QString AbstractMobileApp::templatesRoot() -- GitLab