Some replacements of QString::fromLatin1 with QLatin1String.

Change-Id: I76d6b7a0b7cb2a3acd4e82aa793ce50e43e1c678
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

10 files changed, 62 insertions, 62 deletions

diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp
index 405c0d4b4..61b8b19ef 100644
--- a/installerbuilder/binarycreator/binarycreator.cpp
+++ b/installerbuilder/binarycreator/binarycreator.cpp
@@ -351,7 +351,7 @@ private:
 
 static QString createBinaryResourceFile(const QString &directory)
 {
-    QTemporaryFile projectFile(directory + QString::fromLatin1("/rccprojectXXXXXX.qrc"));
+    QTemporaryFile projectFile(directory + QLatin1String("/rccprojectXXXXXX.qrc"));
     if (!projectFile.open())
         throw Error(QObject::tr("Could not create temporary file for generated rcc project file"));
     projectFile.close();
@@ -361,12 +361,12 @@ static QString createBinaryResourceFile(const QString &directory)
     const QString projectFileName = QFileInfo(projectFile.fileName()).absoluteFilePath();
 
     // 1. create the .qrc file
-    runRcc(QStringList() << QString::fromLatin1("rcc") << QString::fromLatin1("-project")
-        << QString::fromLatin1("-o") << projectFileName);
+    runRcc(QStringList() << QLatin1String("rcc") << QLatin1String("-project")
+        << QLatin1String("-o") << projectFileName);
 
     // 2. create the binary resource file from the .qrc file
-    runRcc(QStringList() << QString::fromLatin1("rcc") << QString::fromLatin1("-binary")
-        << QString::fromLatin1("-o") << binaryName << projectFileName);
+    runRcc(QStringList() << QLatin1String("rcc") << QLatin1String("-binary")
+        << QLatin1String("-o") << binaryName << projectFileName);
 
     return binaryName;
 }
@@ -379,8 +379,8 @@ static QStringList createBinaryResourceFiles(const QStringList &resources)
         if (file.exists()) {
             const QString binaryName = generateTemporaryFileName();
             const QString fileName = QFileInfo(file.fileName()).absoluteFilePath();
-            const int status = runRcc(QStringList() << QString::fromLatin1("rcc")
-                << QString::fromLatin1("-binary") << QString::fromLatin1("-o") << binaryName << fileName);
+            const int status = runRcc(QStringList() << QLatin1String("rcc")
+                << QLatin1String("-binary") << QLatin1String("-o") << binaryName << fileName);
             if (status == EXIT_SUCCESS)
                 result.append(binaryName);
         }
@@ -567,10 +567,10 @@ int main(int argc, char **argv)
 
     const QStringList args = app.arguments().mid(1);
     for (QStringList::const_iterator it = args.begin(); it != args.end(); ++it) {
-        if (*it == QString::fromLatin1("-h") || *it == QString::fromLatin1("--help")) {
+        if (*it == QLatin1String("-h") || *it == QLatin1String("--help")) {
             printUsage();
             return 0;
-        } else if (*it == QString::fromLatin1("-p") || *it == QString::fromLatin1("--packages")) {
+        } else if (*it == QLatin1String("-p") || *it == QLatin1String("--packages")) {
             ++it;
             if (it == args.end()) {
                 return printErrorAndUsageAndExit(QObject::tr("Error: Packages parameter missing argument."));
@@ -585,13 +585,13 @@ int main(int argc, char **argv)
             if (it == args.end() || it->startsWith(QLatin1String("-")))
                 return printErrorAndUsageAndExit(QObject::tr("Error: Package to exclude missing."));
             excludedPackages = it->split(QLatin1Char(','));
-        } else if (*it == QString::fromLatin1("-v") || *it == QString::fromLatin1("--verbose")) {
+        } else if (*it == QLatin1String("-v") || *it == QLatin1String("--verbose")) {
             QInstaller::setVerbose(true);
-        } else if (*it == QString::fromLatin1("-n") || *it == QString::fromLatin1("--nodeps")) {
+        } else if (*it == QLatin1String("-n") || *it == QLatin1String("--nodeps")) {
             nodeps = true;
-        } else if (*it == QString::fromLatin1("--offline-only")) {
+        } else if (*it == QLatin1String("--offline-only")) {
             offlineOnly = true;
-        } else if (*it == QString::fromLatin1("-t") || *it == QString::fromLatin1("--template")) {
+        } else if (*it == QLatin1String("-t") || *it == QLatin1String("--template")) {
             ++it;
             if (it == args.end()) {
                 return printErrorAndUsageAndExit(QObject::tr("Error: Template parameter missing argument."));
diff --git a/installerbuilder/common/binaryformatengine.cpp b/installerbuilder/common/binaryformatengine.cpp
index 47a9784b3..4060cf66c 100644
--- a/installerbuilder/common/binaryformatengine.cpp
+++ b/installerbuilder/common/binaryformatengine.cpp
@@ -88,8 +88,8 @@ void BinaryFormatEngine::setArchive(const QString &file)
 {
     m_fileNamePath = file;
 
-    static const QChar sep = QChar::fromLatin1('/');
-    static const QString prefix = QString::fromLatin1("installer://");
+    static const QChar sep = QLatin1Char('/');
+    static const QString prefix = QLatin1String("installer://");
     Q_ASSERT(file.toLower().startsWith(prefix));
 
     // cut the prefix
diff --git a/installerbuilder/common/fileutils.cpp b/installerbuilder/common/fileutils.cpp
index 725efc5c3..de7e4e1cf 100644
--- a/installerbuilder/common/fileutils.cpp
+++ b/installerbuilder/common/fileutils.cpp
@@ -405,7 +405,7 @@ QString QInstaller::createTemporaryDirectory(const QString &templ)
     QTemporaryFile f(t);
     if (!f.open())
         throw Error(QObject::tr("Could not create temporary folder for template %1: %2").arg(t, f.errorString()));
-    const QString path = f.fileName() + QString::fromLatin1("meta");
+    const QString path = f.fileName() + QLatin1String("meta");
     verbose() << "Creating meta data directory at " << path << std::endl;
 
     QInstaller::mkpath(path);
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 13521c10e..4d85d1329 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -97,7 +97,7 @@ static QVector<PackageInfo> collectAvailablePackages(const QString &packagesDire
                 QString::number(errorColumn), errorMessage));
         }
 
-        const QString name = doc.firstChildElement(QString::fromLatin1("Package"))
+        const QString name = doc.firstChildElement(QLatin1String("Package"))
             .firstChildElement(QLatin1String("Name")).text();
         if (name != it->fileName()) {
             verbose() << std::endl;
@@ -107,15 +107,15 @@ static QVector<PackageInfo> collectAvailablePackages(const QString &packagesDire
 
         PackageInfo info;
         info.name = name;
-        info.version = doc.firstChildElement(QString::fromLatin1("Package")).
-            firstChildElement(QString::fromLatin1("Version")).text();
+        info.version = doc.firstChildElement(QLatin1String("Package")).
+            firstChildElement(QLatin1String("Version")).text();
         if (!QRegExp(QLatin1String("[0-9]+((\\.|-)[0-9]+)*")).exactMatch(info.version)) {
             verbose() << std::endl;
             throw QInstaller::Error(QObject::tr("Component version for %1 is invalid! <Version>%2</version>")
                 .arg(it->fileName(), info.version));
         }
-        info.dependencies = doc.firstChildElement(QString::fromLatin1("Package")).
-            firstChildElement(QString::fromLatin1("Dependencies")).text().split(QRegExp(QLatin1String("\\b(,|, )\\b")),
+        info.dependencies = doc.firstChildElement(QLatin1String("Package")).
+            firstChildElement(QLatin1String("Dependencies")).text().split(QRegExp(QLatin1String("\\b(,|, )\\b")),
             QString::SkipEmptyParts);
         info.directory = it->filePath();
         dict.push_back(info);
@@ -141,7 +141,7 @@ static PackageInfo findMatchingPackage(const QString &name, const QVector<Packag
 
     QRegExp compEx(QLatin1String("([<=>]+)(.*)"));
     const QString comparator = compEx.exactMatch(version)
-        ? compEx.cap(1) : QString::fromLatin1("=");
+        ? compEx.cap(1) : QLatin1String("=");
     version = compEx.exactMatch(version) ? compEx.cap(2) : version;
 
     const bool allowEqual = comparator.contains(QLatin1Char('='));
@@ -168,7 +168,7 @@ static PackageInfo findMatchingPackage(const QString &name, const QVector<Packag
 static bool packageHasPrefix(const PackageInfo &package, const QString &prefix)
 {
     return package.name.startsWith(prefix)
-        && package.name.mid(prefix.length(), 1) == QString::fromLatin1(".");
+        && package.name.mid(prefix.length(), 1) == QLatin1String(".");
 }
 
 /**
@@ -393,11 +393,11 @@ void QInstaller::generateMetaDataDirectory(const QString &outDir, const QString
             if (node.isComment())
                 continue;
             const QString key = node.nodeName();
-            if (key == QString::fromLatin1("UserInterfaces"))
+            if (key == QLatin1String("UserInterfaces"))
                 continue;
-            if (key == QString::fromLatin1("Translations"))
+            if (key == QLatin1String("Translations"))
                 continue;
-            if (key == QString::fromLatin1("Licenses"))
+            if (key == QLatin1String("Licenses"))
                 continue;
             const QString value = node.toElement().text();
             QDomElement element = doc.createElement(key);
@@ -499,7 +499,7 @@ void QInstaller::generateMetaDataDirectory(const QString &outDir, const QString
         QStringList userinterfaces;
         for (int i = 0; i < uiNodes.count(); ++i) {
             const QDomNode node = uiNodes.at(i);
-            if (node.nodeName() != QString::fromLatin1("UserInterface"))
+            if (node.nodeName() != QLatin1String("UserInterface"))
                 continue;
 
             const QDir dir(QString::fromLatin1("%1/meta").arg(it->directory));
@@ -525,7 +525,7 @@ void QInstaller::generateMetaDataDirectory(const QString &outDir, const QString
         }
 
         if (!userinterfaces.isEmpty()) {
-            update.appendChild(doc.createElement(QString::fromLatin1("UserInterfaces")))
+            update.appendChild(doc.createElement(QLatin1String("UserInterfaces")))
                 .appendChild(doc.createTextNode(userinterfaces.join(QChar::fromLatin1(','))));
         }
 
@@ -534,7 +534,7 @@ void QInstaller::generateMetaDataDirectory(const QString &outDir, const QString
         QStringList translations;
         for (int i = 0; i < qmNodes.count(); ++i) {
             const QDomNode node = qmNodes.at(i);
-            if (node.nodeName() != QString::fromLatin1("Translation"))
+            if (node.nodeName() != QLatin1String("Translation"))
                 continue;
 
             const QDir dir(QString::fromLatin1("%1/meta").arg(it->directory));
@@ -560,7 +560,7 @@ void QInstaller::generateMetaDataDirectory(const QString &outDir, const QString
         }
 
         if (!translations.isEmpty()) {
-            update.appendChild(doc.createElement(QString::fromLatin1("Translations")))
+            update.appendChild(doc.createElement(QLatin1String("Translations")))
                 .appendChild(doc.createTextNode(translations.join(QChar::fromLatin1(','))));
         }
 
diff --git a/installerbuilder/common/utils.cpp b/installerbuilder/common/utils.cpp
index d99c2d279..350a48593 100644
--- a/installerbuilder/common/utils.cpp
+++ b/installerbuilder/common/utils.cpp
@@ -194,7 +194,7 @@ QInstaller::VerboseWriter::~VerboseWriter()
     if (output.open(QIODevice::ReadWrite | QIODevice::Append)) {
         QString logInfo;
         logInfo += QLatin1String("*************************************");
-        logInfo += QString::fromLatin1("Invoked:") + QDateTime::currentDateTime().toString();
+        logInfo += QLatin1String("Invoked:") + QDateTime::currentDateTime().toString();
         output.write(logInfo.toLocal8Bit());
         output.write(preFileBuffer.data());
         output.close();
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index d637ae19e..30db02292 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     const QStringList args = QInstaller::parseCommandLineArgs(argc, argv);
     try {
         if (args.contains(QLatin1String("--version"))) {
-            InstallerBase::showVersion(argc, argv, QString::fromLatin1(VERSION));
+            InstallerBase::showVersion(argc, argv, QLatin1String(VERSION));
             return 0;
         }
 
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 2c2b0947e..5829134e7 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -1069,7 +1069,7 @@ QList<QVariant> PackageManagerCore::execute(const QString &program, const QStrin
     if (p.state() != QProcessWrapper::NotRunning)
         loop.exec();
 
-    return QList< QVariant >() << QString::fromLatin1(p.readAllStandardOutput()) << p.exitCode();
+    return QList<QVariant>() << QString::fromLatin1(p.readAllStandardOutput()) << p.exitCode();
 }
 
 /*!
@@ -1118,7 +1118,7 @@ bool PackageManagerCore::performOperation(const QString &name, const QStringList
 bool PackageManagerCore::versionMatches(const QString &version, const QString &requirement)
 {
     QRegExp compEx(QLatin1String("([<=>]+)(.*)"));
-    const QString comparator = compEx.exactMatch(requirement) ? compEx.cap(1) : QString::fromLatin1("=");
+    const QString comparator = compEx.exactMatch(requirement) ? compEx.cap(1) : QLatin1String("=");
     const QString ver = compEx.exactMatch(requirement) ? compEx.cap(2) : requirement;
 
     const bool allowEqual = comparator.contains(QLatin1Char('='));
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 60ec1618a..6df44fe9a 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -258,7 +258,7 @@ QString PackageManagerCorePrivate::targetDir() const
 
 QString PackageManagerCorePrivate::configurationFileName() const
 {
-    return m_core->value(scTargetConfigurationFile, QString::fromLatin1("components.xml"));
+    return m_core->value(scTargetConfigurationFile, QLatin1String("components.xml"));
 }
 
 QString PackageManagerCorePrivate::componentsXmlPath() const
@@ -883,7 +883,7 @@ void PackageManagerCorePrivate::writeUninstallerBinaryData(QIODevice *output, QF
 void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperations)
 {
     bool gainedAdminRights = false;
-    QTemporaryFile tempAdminFile(targetDir() + QString::fromLatin1("/testjsfdjlkdsjflkdsjfldsjlfds")
+    QTemporaryFile tempAdminFile(targetDir() + QLatin1String("/testjsfdjlkdsjflkdsjfldsjlfds")
         + QString::number(qrand() % 1000));
     if (!tempAdminFile.open() || !tempAdminFile.isWritable()) {
         m_core->gainAdminRights();
diff --git a/installerbuilder/libinstaller/registerqtv23operation.cpp b/installerbuilder/libinstaller/registerqtv23operation.cpp
index 9cf7926aa..41eed026f 100644
--- a/installerbuilder/libinstaller/registerqtv23operation.cpp
+++ b/installerbuilder/libinstaller/registerqtv23operation.cpp
@@ -119,7 +119,7 @@ bool RegisterQtInCreatorV23Operation::performOperation()
     }
 
     const QString qtVersionsFileName = rootInstallPath
-                                     + QString::fromLatin1(QtVersionSettingsSuffixPath);
+                                     + QLatin1String(QtVersionSettingsSuffixPath);
     int argCounter = 0;
     const QString &versionName = args.at(argCounter++);
     const QString &path = QDir::toNativeSeparators(args.value(argCounter++));
@@ -135,9 +135,9 @@ bool RegisterQtInCreatorV23Operation::performOperation()
     QVariantMap map;
     if (reader.load(qtVersionsFileName)) {
         map = reader.restoreValues();
-        qtVersionCount = map.value(QString::fromLatin1("QtVersion.Count")).toInt();
-        map.remove(QString::fromLatin1("QtVersion.Count"));
-        map.remove(QString::fromLatin1("Version"));
+        qtVersionCount = map.value(QLatin1String("QtVersion.Count")).toInt();
+        map.remove(QLatin1String("QtVersion.Count"));
+        map.remove(QLatin1String("Version"));
     }
 
     ProjectExplorer::PersistentSettingsWriter writer;
@@ -145,30 +145,30 @@ bool RegisterQtInCreatorV23Operation::performOperation()
     if (!map.isEmpty()) {
         for (int i = 0; i < qtVersionCount; ++i) {
             writer.saveValue(QString::fromLatin1("QtVersion.%1").arg(i)
-                             , map[QString::fromLatin1("QtVersion.") + QString::number(i)].toMap());
+                             , map[QLatin1String("QtVersion.") + QString::number(i)].toMap());
         }
         map.clear();
     }
     // Enter new version
-    map.insert(QString::fromLatin1("Id"), -1);
-    map.insert(QString::fromLatin1("Name"), versionName);
-    map.insert(QString::fromLatin1("QMakePath"), versionQmakePath);
-    map.insert(QString::fromLatin1("QtVersion.Type"),
-               QString::fromLatin1("Qt4ProjectManager.QtVersion.") + versionTypeIdentifier);
-    map.insert(QString::fromLatin1("isAutodetected"), true);
-    map.insert(QString::fromLatin1("autodetectionSource"),
-               QString::fromLatin1("SDK.") + versionSDKIdentifier);
+    map.insert(QLatin1String("Id"), -1);
+    map.insert(QLatin1String("Name"), versionName);
+    map.insert(QLatin1String("QMakePath"), versionQmakePath);
+    map.insert(QLatin1String("QtVersion.Type"),
+               QLatin1String("Qt4ProjectManager.QtVersion.") + versionTypeIdentifier);
+    map.insert(QLatin1String("isAutodetected"), true);
+    map.insert(QLatin1String("autodetectionSource"),
+               QLatin1String("SDK.") + versionSDKIdentifier);
     if (!versionSystemRoot.isEmpty())
-        map.insert(QString::fromLatin1("SystemRoot"), versionSystemRoot);
+        map.insert(QLatin1String("SystemRoot"), versionSystemRoot);
     if (!versionSbsPath.isEmpty())
-        map.insert(QString::fromLatin1("SBSv2Directory"), versionSbsPath);
+        map.insert(QLatin1String("SBSv2Directory"), versionSbsPath);
 
-    writer.saveValue(QString::fromLatin1("QtVersion.") + QString::number(qtVersionCount), map);
+    writer.saveValue(QLatin1String("QtVersion.") + QString::number(qtVersionCount), map);
 
     writer.saveValue(QLatin1String("Version"), 1);
-    writer.saveValue(QString::fromLatin1("QtVersion.Count"), qtVersionCount + 1);
+    writer.saveValue(QLatin1String("QtVersion.Count"), qtVersionCount + 1);
     QDir().mkpath(QFileInfo(qtVersionsFileName).absolutePath());
-    writer.save(qtVersionsFileName, QString::fromLatin1("QtCreatorQtVersions"));
+    writer.save(qtVersionsFileName, QLatin1String("QtCreatorQtVersions"));
 
     return true;
 }
@@ -193,7 +193,7 @@ bool RegisterQtInCreatorV23Operation::undoOperation()
     const QString &rootInstallPath = core->value(scTargetDir);
 
     const QString qtVersionsFileName = rootInstallPath
-                                     + QString::fromLatin1(QtVersionSettingsSuffixPath);
+                                     + QLatin1String(QtVersionSettingsSuffixPath);
 
     ProjectExplorer::PersistentSettingsReader reader;
     // If no file, then it has been removed already
@@ -203,27 +203,27 @@ bool RegisterQtInCreatorV23Operation::undoOperation()
     const QVariantMap map = reader.restoreValues();
 
     ProjectExplorer::PersistentSettingsWriter writer;
-    const int qtVersionCount = map.value(QString::fromLatin1("QtVersion.Count")).toInt();
+    const int qtVersionCount = map.value(QLatin1String("QtVersion.Count")).toInt();
 
     int currentVersionIndex = 0;
     for (int i = 0; i < qtVersionCount; ++i) {
-        QVariantMap versionMap = map[QString::fromLatin1("QtVersion.") + QString::number(i)].toMap();
+        QVariantMap versionMap = map[QLatin1String("QtVersion.") + QString::number(i)].toMap();
 
         const QString path = QDir::toNativeSeparators(args.value(1));
         const QString versionQmakePath = absoluteQmakePath(path);
 
         //use absoluteQmakePath function to normalize the path string, for example //
         const QString existingQtQMakePath = absoluteQmakePath(
-            versionMap[QString::fromLatin1("QMakePath")].toString());
+            versionMap[QLatin1String("QMakePath")].toString());
         if (existingQtQMakePath == versionQmakePath)
             continue;
         writer.saveValue(QString::fromLatin1("QtVersion.%1").arg(currentVersionIndex++), versionMap);
     }
 
-    writer.saveValue(QString::fromLatin1("QtVersion.Count"), currentVersionIndex);
-    writer.saveValue(QString::fromLatin1("Version"), map[QString::fromLatin1("Version")].toInt());
+    writer.saveValue(QLatin1String("QtVersion.Count"), currentVersionIndex);
+    writer.saveValue(QLatin1String("Version"), map[QLatin1String("Version")].toInt());
 
-    writer.save(qtVersionsFileName, QString::fromLatin1("QtCreatorQtVersions"));
+    writer.save(qtVersionsFileName, QLatin1String("QtCreatorQtVersions"));
     return true;
 }
 
diff --git a/installerbuilder/repogen/repogen.cpp b/installerbuilder/repogen/repogen.cpp
index 5d8a36d09..1a56713ca 100644
--- a/installerbuilder/repogen/repogen.cpp
+++ b/installerbuilder/repogen/repogen.cpp
@@ -121,7 +121,7 @@ int main( int argc, char** argv ) {
             } else if (args.first() == QLatin1String("--single")) {
                 args.removeFirst();
                 replaceSingleComponent = true;
-            } else if (args.first() == QString::fromLatin1("-p") || args.first() == QString::fromLatin1("--packages")) {
+            } else if (args.first() == QLatin1String("-p") || args.first() == QLatin1String("--packages")) {
                 args.removeFirst();
                 if (args.isEmpty()) {
                     return printErrorAndUsageAndExit(QObject::tr("Error: Packages parameter missing "