Prepare for using QT_NO_CAST_FROM/TO_ASCII.

Change-Id: Ib39e49e896cbddf5a5bd851088500991d962355a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

4 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/corelib/tools/qbsassert.cpp b/src/lib/corelib/tools/qbsassert.cpp
index 46ea58b83..fc093a979 100644
--- a/src/lib/corelib/tools/qbsassert.cpp
+++ b/src/lib/corelib/tools/qbsassert.cpp
@@ -42,8 +42,8 @@ void writeAssertLocation(const char *condition, const char *file, int line)
 
 void throwAssertLocation(const char *condition, const char *file, int line)
 {
-    throw ErrorInfo(QString(QLatin1String("ASSERT: %1")).arg(condition),
-                CodeLocation(QString::fromLocal8Bit(file), line), true);
+    throw ErrorInfo(QString::fromLatin1("ASSERT: %1").arg(QLatin1String(condition)),
+                    CodeLocation(QString::fromLocal8Bit(file), line), true);
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index 3c5dad702..e795da159 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -68,11 +68,11 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log
     QStringList filters;
 
     if (HostOsInfo::isWindowsHost())
-        filters << "*.dll";
+        filters << QLatin1String("*.dll");
     else if (HostOsInfo::isOsxHost())
-        filters << "*.dylib";
+        filters << QLatin1String("*.dylib");
     else
-        filters << "*.so";
+        filters << QLatin1String("*.so");
 
     foreach (const QString &pluginPath, pluginPaths) {
         logger.qbsTrace() << QString::fromLocal8Bit("pluginmanager: loading plugins from '%1'.")
diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp
index c87898da5..1f9344264 100644
--- a/src/lib/corelib/tools/scripttools.cpp
+++ b/src/lib/corelib/tools/scripttools.cpp
@@ -80,49 +80,49 @@ QVariant getConfigProperty(const QVariantMap &cfg, const QStringList &name)
 
 QString toJSLiteral(const bool b)
 {
-    return b ? "true" : "false";
+    return b ? QLatin1String("true") : QLatin1String("false");
 }
 
 QString toJSLiteral(const QString &str)
 {
     QString js = str;
-    js.replace(QRegExp("([\\\\\"])"), "\\\\1");
-    js.prepend('"');
-    js.append('"');
+    js.replace(QRegExp(QLatin1String("([\\\\\"])")), QLatin1String("\\\\1"));
+    js.prepend(QLatin1Char('"'));
+    js.append(QLatin1Char('"'));
     return js;
 }
 
 QString toJSLiteral(const QStringList &strs)
 {
-    QString js = "[";
+    QString js = QLatin1String("[");
     for (int i = 0; i < strs.count(); ++i) {
         if (i != 0)
-            js.append(", ");
+            js.append(QLatin1String(", "));
         js.append(toJSLiteral(strs.at(i)));
     }
-    js.append(']');
+    js.append(QLatin1Char(']'));
     return js;
 }
 
 QString toJSLiteral(const QVariant &val)
 {
     if (!val.isValid()) {
-        return "undefined";
+        return QLatin1String("undefined");
     } else if (val.type() == QVariant::List || val.type() == QVariant::StringList) {
         QString res;
         foreach (const QVariant &child, val.toList()) {
-            if (res.length()) res.append(", ");
+            if (res.length()) res.append(QLatin1String(", "));
             res.append(toJSLiteral(child));
         }
-        res.prepend("[");
-        res.append("]");
+        res.prepend(QLatin1Char('['));
+        res.append(QLatin1Char(']'));
         return res;
     } else if (val.type() == QVariant::Bool) {
-        return val.toBool() ? "true" : "false";
+        return val.toBool() ? QLatin1String("true") : QLatin1String("false");
     } else if (val.canConvert(QVariant::String)) {
         return QLatin1Char('"') + val.toString() + QLatin1Char('"');
     } else {
-        return QString("Unconvertible type %1").arg(val.typeName());
+        return QString::fromLatin1("Unconvertible type %1").arg(QLatin1String(val.typeName()));
     }
 }
 
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index 9f6c07cb8..354bb6e0d 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -275,7 +275,7 @@ ErrorInfo SetupProjectParameters::expandBuildConfiguration(Settings *settings)
     // Fill in buildCfg in this order (making sure not to overwrite a key already set by a previous stage)
     // 1) Things specified on command line (already in buildCfg at this point)
     // 2) Everything from the profile key
-    QString profileName = expandedConfig.value("qbs.profile").toString();
+    QString profileName = expandedConfig.value(QLatin1String("qbs.profile")).toString();
     if (profileName.isNull()) {
         profileName = settings->defaultProfile();
         if (profileName.isNull()) {
@@ -289,7 +289,7 @@ ErrorInfo SetupProjectParameters::expandBuildConfiguration(Settings *settings)
                        .arg(profileNames));
             return err;
         }
-        expandedConfig.insert("qbs.profile", profileName);
+        expandedConfig.insert(QLatin1String("qbs.profile"), profileName);
     }
 
     // (2)