From f384c3097911c523e67620b77b1086e4788cd209 Mon Sep 17 00:00:00 2001
From: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Date: Tue, 19 Jan 2016 10:55:32 +0300
Subject: [PATCH] QMake: replace QStringLiteral with QLatin1String
... in string comparisons. It's more efficient.
Change-Id: I5d54ab7777a0838455eaaac671e735eb37bfe243
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
qmake/generators/mac/pbuilder_pbx.cpp | 6 +++---
qmake/generators/win32/cesdkhandler.cpp | 10 +++++-----
qmake/generators/win32/msbuild_objectmodel.cpp | 4 ++--
qmake/generators/win32/msvc_nmake.cpp | 4 ++--
qmake/generators/win32/msvc_vcproj.cpp | 2 +-
qmake/library/qmakeevaluator.cpp | 2 +-
qmake/main.cpp | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 42dd6c8aeb5..ef9aa9a2e60 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -498,11 +498,11 @@ static QString xcodeFiletypeForFilename(const QString &filename)
return QStringLiteral("sourcecode.cpp.objcpp");
if (filename.endsWith(Option::objc_ext))
return QStringLiteral("sourcecode.c.objc");
- if (filename.endsWith(QStringLiteral(".framework")))
+ if (filename.endsWith(QLatin1String(".framework")))
return QStringLiteral("wrapper.framework");
- if (filename.endsWith(QStringLiteral(".a")))
+ if (filename.endsWith(QLatin1String(".a")))
return QStringLiteral("archive.ar");
- if (filename.endsWith(QStringLiteral(".pro")) || filename.endsWith(QStringLiteral(".qrc")))
+ if (filename.endsWith(QLatin1String(".pro")) || filename.endsWith(QLatin1String(".qrc")))
return QStringLiteral("text");
return QString();
diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp
index f8235bae279..4550cc8aedd 100644
--- a/qmake/generators/win32/cesdkhandler.cpp
+++ b/qmake/generators/win32/cesdkhandler.cpp
@@ -63,8 +63,8 @@ struct ContainsPathKey
{
bool operator()(const QString &val) const
{
- return !(val.endsWith(QStringLiteral("MSBuildToolsPath"))
- || val.endsWith(QStringLiteral("MSBuildToolsRoot")));
+ return !(val.endsWith(QLatin1String("MSBuildToolsPath"))
+ || val.endsWith(QLatin1String("MSBuildToolsRoot")));
}
};
@@ -141,7 +141,7 @@ bool CeSdkHandler::parseMsBuildFile(QFile *file, CeSdkInfo *info)
if (success) {
const QString startPattern = QStringLiteral("$(Registry:");
const int startIndex = sdkRootPath.indexOf(startPattern);
- const int endIndex = sdkRootPath.lastIndexOf(QStringLiteral(")"));
+ const int endIndex = sdkRootPath.lastIndexOf(QLatin1Char(')'));
const QString regString = sdkRootPath.mid(startIndex + startPattern.size(),
endIndex - startIndex - startPattern.size());
QSettings sdkRootPathRegistry(regString, QSettings::NativeFormat);
@@ -180,7 +180,7 @@ QStringList CeSdkHandler::filterMsBuildToolPaths(const QStringList &paths) const
QStringList result;
foreach (const QString &path, paths) {
QDir dirVC110(path);
- if (path.endsWith(QStringLiteral("bin")))
+ if (path.endsWith(QLatin1String("bin")))
dirVC110.cdUp();
QDir dirVC120 = dirVC110;
if (dirVC110.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V110\\Platforms")))
@@ -279,7 +279,7 @@ void CeSdkHandler::retrieveWEC2013SDKs()
if (cpuInfo.properties.isEmpty())
continue;
const PropertyContainer &cpuInfoVal = cpuInfo.properties.first().properties.value(QLatin1String("CpuName"));
- if (cpuInfoVal.name != QStringLiteral("CpuName"))
+ if (cpuInfoVal.name != QLatin1String("CpuName"))
continue;
const QString SDKName = QStringLiteral("SDK name");
currentSdk.m_name = currentProperty.properties.value(SDKName).value+
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 8e2be589cdd..bcfab80ccf1 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -608,8 +608,8 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
xml.setIndentString(" ");
- const QString toolsVersion = (tool.SdkVersion == QStringLiteral("10.0")) ? QStringLiteral("14.0")
- : QStringLiteral("4.0");
+ const QString toolsVersion = (tool.SdkVersion == QLatin1String("10.0")) ? QStringLiteral("14.0")
+ : QStringLiteral("4.0");
xml << decl("1.0", "utf-8")
<< tag("Project")
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index d6753b4ed65..7499d76e751 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -110,10 +110,10 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
QString arch = project->first("VCPROJ_ARCH").toQString().toLower();
QString compiler;
QString compilerArch;
- if (arch == QStringLiteral("arm")) {
+ if (arch == QLatin1String("arm")) {
compiler = QStringLiteral("x86_arm");
compilerArch = QStringLiteral("arm");
- } else if (arch == QStringLiteral("x64")) {
+ } else if (arch == QLatin1String("x64")) {
const ProStringList hostArch = project->values("QMAKE_TARGET.arch");
if (hostArch.contains("x86_64"))
compiler = QStringLiteral("amd64");
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 465c8fc3129..c900cafbf21 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1199,7 +1199,7 @@ void VcprojGenerator::initResourceTool()
foreach (const ProString &path, project->values("RC_INCLUDEPATH")) {
QString fixedPath = fileFixify(path.toQString());
if (fileInfo(fixedPath).isRelative()) {
- if (fixedPath == QStringLiteral("."))
+ if (fixedPath == QLatin1String("."))
fixedPath = QStringLiteral("$(ProjectDir)");
else
fixedPath.prepend(QStringLiteral("$(ProjectDir)\\"));
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index 4c5ce2e0978..e9da45c14d2 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -957,7 +957,7 @@ static ProString msvcBinDirToQMakeArch(QString subdir)
if (idx >= 0)
subdir.remove(0, idx + 1);
subdir = subdir.toLower();
- if (subdir == QStringLiteral("amd64"))
+ if (subdir == QLatin1String("amd64"))
return ProString("x86_64");
return ProString(subdir);
}
diff --git a/qmake/main.cpp b/qmake/main.cpp
index bde537dcca5..5f848d48204 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -309,8 +309,8 @@ int runQMake(int argc, char **argv)
dir = tmp_dir;
}
#ifdef Q_OS_MAC
- if (fi.fileName().endsWith(QStringLiteral(".pbxproj"))
- && dir.endsWith(QStringLiteral(".xcodeproj")))
+ if (fi.fileName().endsWith(QLatin1String(".pbxproj"))
+ && dir.endsWith(QLatin1String(".xcodeproj")))
dir += QStringLiteral("/..");
#endif
if(!dir.isNull() && dir != ".")
--
GitLab