Commit 768c4ef0 authored by Alessandro Portale's avatar Alessandro Portale

Consistent names for AbstractGeneratedFileInfo::FileType keys

Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarMarco Bubke <marco.bubke@nokia.com>
parent 5a76c443
...@@ -207,10 +207,10 @@ QByteArray AbstractMobileApp::generateDesktopFile(QString *errorMessage, int fil ...@@ -207,10 +207,10 @@ QByteArray AbstractMobileApp::generateDesktopFile(QString *errorMessage, int fil
QByteArray desktopFileContent; QByteArray desktopFileContent;
if (!readTemplate(DesktopOrigin, &desktopFileContent, errorMessage)) if (!readTemplate(DesktopOrigin, &desktopFileContent, errorMessage))
return QByteArray(); return QByteArray();
if (fileType == AbstractGeneratedFileInfo::DesktopFileFremantle) { if (fileType == AbstractGeneratedFileInfo::DesktopFremantleFile) {
desktopFileContent.replace("Icon=thisApp", desktopFileContent.replace("Icon=thisApp",
"Icon=" + projectName().toUtf8() + "64"); "Icon=" + projectName().toUtf8() + "64");
} else if (fileType == AbstractGeneratedFileInfo::DesktopFileHarmattan) { } else if (fileType == AbstractGeneratedFileInfo::DesktopHarmattanFile) {
desktopFileContent.replace("Icon=thisApp", desktopFileContent.replace("Icon=thisApp",
"Icon=/usr/share/icons/hicolor/80x80/apps/" + projectName().toUtf8() + "80.png"); "Icon=/usr/share/icons/hicolor/80x80/apps/" + projectName().toUtf8() + "80.png");
if (m_supportsMeegoBooster) if (m_supportsMeegoBooster)
...@@ -410,10 +410,10 @@ Core::GeneratedFiles AbstractMobileApp::generateFiles(QString *errorMessage) con ...@@ -410,10 +410,10 @@ Core::GeneratedFiles AbstractMobileApp::generateFiles(QString *errorMessage) con
files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute); files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute);
files << file(generateFile(AbstractGeneratedFileInfo::MainCppFile, errorMessage), path(MainCpp)); files << file(generateFile(AbstractGeneratedFileInfo::MainCppFile, errorMessage), path(MainCpp));
files << file(generateFile(AbstractGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)); files << file(generateFile(AbstractGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon));
files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile64, errorMessage), path(PngIcon64)); files << file(generateFile(AbstractGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64));
files << file(generateFile(AbstractGeneratedFileInfo::pngIconFile80, errorMessage), path(PngIcon80)); files << file(generateFile(AbstractGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80));
files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)); files << file(generateFile(AbstractGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle));
files << file(generateFile(AbstractGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); files << file(generateFile(AbstractGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan));
return files; return files;
} }
#endif // CREATORLESSTEST #endif // CREATORLESSTEST
...@@ -465,14 +465,14 @@ QByteArray AbstractMobileApp::generateFile(int fileType, ...@@ -465,14 +465,14 @@ QByteArray AbstractMobileApp::generateFile(int fileType,
case AbstractGeneratedFileInfo::SymbianSvgIconFile: case AbstractGeneratedFileInfo::SymbianSvgIconFile:
data = readBlob(path(SymbianSvgIconOrigin), errorMessage); data = readBlob(path(SymbianSvgIconOrigin), errorMessage);
break; break;
case AbstractGeneratedFileInfo::pngIconFile64: case AbstractGeneratedFileInfo::PngIcon64File:
data = readBlob(path(PngIconOrigin64), errorMessage); data = readBlob(path(PngIconOrigin64), errorMessage);
break; break;
case AbstractGeneratedFileInfo::pngIconFile80: case AbstractGeneratedFileInfo::PngIcon80File:
data = readBlob(path(PngIconOrigin80), errorMessage); data = readBlob(path(PngIconOrigin80), errorMessage);
break; break;
case AbstractGeneratedFileInfo::DesktopFileFremantle: case AbstractGeneratedFileInfo::DesktopFremantleFile:
case AbstractGeneratedFileInfo::DesktopFileHarmattan: case AbstractGeneratedFileInfo::DesktopHarmattanFile:
data = generateDesktopFile(errorMessage, fileType); data = generateDesktopFile(errorMessage, fileType);
break; break;
case AbstractGeneratedFileInfo::DeploymentPriFile: case AbstractGeneratedFileInfo::DeploymentPriFile:
......
...@@ -57,10 +57,10 @@ struct ...@@ -57,10 +57,10 @@ struct
AppProFile, AppProFile,
DeploymentPriFile, DeploymentPriFile,
SymbianSvgIconFile, SymbianSvgIconFile,
pngIconFile64, PngIcon64File,
pngIconFile80, PngIcon80File,
DesktopFileFremantle, DesktopFremantleFile,
DesktopFileHarmattan, DesktopHarmattanFile,
ExtendedFile ExtendedFile
}; };
......
...@@ -56,10 +56,10 @@ bool QtQuickApp::generateFiles(QString *errorMessage) const ...@@ -56,10 +56,10 @@ bool QtQuickApp::generateFiles(QString *errorMessage) const
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::MaemoPngIconFile64, errorMessage), path(MaemoPngIcon64)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::MaemoPngIconFile80, errorMessage), path(MaemoPngIcon80)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)) && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle))
&& writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); && writeFile(generateFile(QtQuickAppGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan));
} }
bool Html5App::generateFiles(QString *errorMessage) const bool Html5App::generateFiles(QString *errorMessage) const
...@@ -71,10 +71,10 @@ 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::AppViewerCppFile, errorMessage), path(AppViewerCpp))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH)) && writeFile(generateFile(Html5AppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)) && writeFile(generateFile(Html5AppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::MaemoPngIconFile64, errorMessage), path(MaemoPngIcon64)) && writeFile(generateFile(Html5AppGeneratedFileInfo::PngIcon64File, errorMessage), path(PngIcon64))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::MaemoPngIconFile80, errorMessage), path(MaemoPngIcon80)) && writeFile(generateFile(Html5AppGeneratedFileInfo::PngIcon80File, errorMessage), path(PngIcon80))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFileFremantle, errorMessage), path(DesktopFremantle)) && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFremantleFile, errorMessage), path(DesktopFremantle))
&& writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopFileHarmattan, errorMessage), path(DesktopHarmattan)); && writeFile(generateFile(Html5AppGeneratedFileInfo::DesktopHarmattanFile, errorMessage), path(DesktopHarmattan));
} }
QString AbstractMobileApp::templatesRoot() QString AbstractMobileApp::templatesRoot()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment