From 0876dc4d6abb147ccdcc190adfad01c704a73e61 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 19 Feb 2019 22:16:04 +0300 Subject: Use QStringLiteral more where it is possible Change-Id: I7419cc3fbc1e8776de3943852dcedab4c95d1c32 Reviewed-by: Anton Kudryavtsev Reviewed-by: Christian Kandeler --- src/app/config-ui/commandlineparser.cpp | 8 +- src/app/qbs-create-project/create-project-main.cpp | 10 +-- src/app/qbs-setup-android/android-setup.cpp | 8 +- src/app/qbs-setup-android/commandlineparser.cpp | 12 +-- src/app/qbs-setup-qt/commandlineparser.cpp | 10 +-- src/app/qbs-setup-qt/setupqt.cpp | 34 ++++---- src/app/qbs-setup-toolchains/commandlineparser.cpp | 12 +-- src/app/qbs-setup-toolchains/msvcprobe.cpp | 10 +-- src/app/qbs-setup-toolchains/probe.cpp | 67 ++++++++------- src/app/qbs-setup-toolchains/xcodeprobe.cpp | 18 ++-- src/app/qbs/application.cpp | 6 +- src/app/qbs/commandlinefrontend.cpp | 10 +-- src/app/qbs/consoleprogressobserver.cpp | 2 +- src/app/qbs/parser/commandlineoption.cpp | 82 +++++++++--------- src/app/qbs/parser/commandlineparser.cpp | 8 +- src/app/qbs/parser/parsercommand.cpp | 28 +++---- src/app/qbs/qbstool.cpp | 4 +- src/app/qbs/status.cpp | 10 +-- src/app/shared/logging/consolelogger.cpp | 8 +- src/lib/corelib/api/internaljobs.cpp | 2 +- src/lib/corelib/api/languageinfo.cpp | 2 +- src/lib/corelib/api/projectdata.cpp | 6 +- src/lib/corelib/api/projectfileupdater.cpp | 7 +- src/lib/corelib/api/qmljsrewriter.cpp | 10 +-- src/lib/corelib/api/runenvironment.cpp | 24 +++--- src/lib/corelib/buildgraph/artifact.h | 18 ++-- src/lib/corelib/buildgraph/buildgraph.cpp | 6 +- .../corelib/buildgraph/emptydirectoriesremover.cpp | 2 +- src/lib/corelib/buildgraph/executor.cpp | 2 +- src/lib/corelib/buildgraph/productinstaller.cpp | 4 +- src/lib/corelib/buildgraph/rulesapplicator.cpp | 8 +- src/lib/corelib/generators/generatordata.cpp | 14 ++-- src/lib/corelib/jsextensions/binaryfile.cpp | 4 +- src/lib/corelib/jsextensions/domxml.cpp | 44 +++++----- src/lib/corelib/jsextensions/file.cpp | 44 +++++----- src/lib/corelib/jsextensions/fileinfoextension.cpp | 26 +++--- src/lib/corelib/jsextensions/moduleproperties.cpp | 14 ++-- src/lib/corelib/jsextensions/process.cpp | 8 +- src/lib/corelib/jsextensions/propertylist.cpp | 2 +- src/lib/corelib/jsextensions/propertylist.mm | 20 ++--- src/lib/corelib/jsextensions/temporarydir.cpp | 4 +- src/lib/corelib/jsextensions/textfile.cpp | 4 +- .../corelib/jsextensions/utilitiesextension.cpp | 22 ++--- src/lib/corelib/language/builtindeclarations.cpp | 50 +++++------ src/lib/corelib/language/evaluatorscriptclass.cpp | 4 +- src/lib/corelib/language/filetags.cpp | 2 +- src/lib/corelib/language/item.cpp | 12 +-- src/lib/corelib/language/moduleloader.cpp | 22 ++--- src/lib/corelib/language/projectresolver.cpp | 4 +- src/lib/corelib/language/propertydeclaration.cpp | 2 +- src/lib/corelib/language/scriptengine.cpp | 66 +++++++-------- src/lib/corelib/logging/ilogsink.cpp | 10 +-- src/lib/corelib/logging/logger.cpp | 4 +- src/lib/corelib/parser/qmlerror.cpp | 2 +- src/lib/corelib/parser/qmljsparser.cpp | 6 +- src/lib/corelib/tools/applecodesignutils.cpp | 2 +- src/lib/corelib/tools/codelocation.cpp | 4 +- src/lib/corelib/tools/commandechomode.cpp | 8 +- src/lib/corelib/tools/error.cpp | 2 +- src/lib/corelib/tools/fileinfo.cpp | 4 +- src/lib/corelib/tools/filetime.cpp | 2 +- src/lib/corelib/tools/hostosinfo.h | 2 +- src/lib/corelib/tools/installoptions.cpp | 4 +- src/lib/corelib/tools/jsliterals.cpp | 6 +- src/lib/corelib/tools/launcherinterface.cpp | 2 +- src/lib/corelib/tools/msvcinfo.h | 2 +- src/lib/corelib/tools/persistence.cpp | 2 +- src/lib/corelib/tools/preferences.cpp | 16 ++-- src/lib/corelib/tools/profile.h | 2 +- src/lib/corelib/tools/profiling.cpp | 8 +- src/lib/corelib/tools/qbsassert.cpp | 2 +- src/lib/corelib/tools/qbspluginmanager.cpp | 6 +- src/lib/corelib/tools/settings.cpp | 2 +- src/lib/corelib/tools/settingscreator.cpp | 4 +- src/lib/corelib/tools/settingsmodel.cpp | 2 +- src/lib/corelib/tools/setupprojectparameters.cpp | 2 +- src/lib/corelib/tools/shellutils.cpp | 6 +- src/lib/corelib/tools/toolchains.cpp | 2 +- src/lib/corelib/tools/vsenvironmentdetector.cpp | 6 +- .../qbs_processlauncher/launchersockethandler.cpp | 6 +- .../makefilegenerator/makefilegenerator.cpp | 12 +-- .../visualstudio/msbuildqbsproductproject.cpp | 2 +- .../msbuildsharedsolutionpropertiesproject.cpp | 4 +- tests/auto/api/tst_api.cpp | 10 +-- .../blackbox/testdata-qt/plugin-meta-data/app.cpp | 6 +- tests/auto/blackbox/tst_blackbox.cpp | 98 +++++++++++----------- tests/auto/blackbox/tst_blackboxandroid.cpp | 4 +- tests/auto/blackbox/tst_blackboxbase.cpp | 4 +- tests/auto/language/tst_language.cpp | 44 +++++----- tests/auto/tools/tst_tools.cpp | 40 ++++----- tests/benchmarker/benchmarker.cpp | 2 +- tests/benchmarker/commandlineparser.cpp | 6 +- tests/benchmarker/runsupport.cpp | 8 +- tests/benchmarker/valgrindrunner.cpp | 18 ++-- tests/fuzzy-test/commandlineparser.cpp | 14 ++-- tests/fuzzy-test/fuzzytester.cpp | 24 +++--- 96 files changed, 614 insertions(+), 614 deletions(-) diff --git a/src/app/config-ui/commandlineparser.cpp b/src/app/config-ui/commandlineparser.cpp index d38c34e55..5f7265046 100644 --- a/src/app/config-ui/commandlineparser.cpp +++ b/src/app/config-ui/commandlineparser.cpp @@ -45,10 +45,10 @@ using qbs::Internal::Tr; -static QString helpOptionShort() { return QLatin1String("-h"); } -static QString helpOptionLong() { return QLatin1String("--help"); } -static QString settingsDirOption() { return QLatin1String("--settings-dir"); } -static QString systemOption() { return QLatin1String("--system"); } +static QString helpOptionShort() { return QStringLiteral("-h"); } +static QString helpOptionLong() { return QStringLiteral("--help"); } +static QString settingsDirOption() { return QStringLiteral("--settings-dir"); } +static QString systemOption() { return QStringLiteral("--system"); } void CommandLineParser::parse(const QStringList &commandLine) { diff --git a/src/app/qbs-create-project/create-project-main.cpp b/src/app/qbs-create-project/create-project-main.cpp index 8c3721232..f26df3dbf 100644 --- a/src/app/qbs-create-project/create-project-main.cpp +++ b/src/app/qbs-create-project/create-project-main.cpp @@ -56,17 +56,17 @@ int main(int argc, char *argv[]) using qbs::Internal::Tr; QCoreApplication app(argc, argv); - const QCommandLineOption flatOpt(QLatin1String("flat"), + const QCommandLineOption flatOpt(QStringLiteral("flat"), Tr::tr("Do not create nested project files, even if there are subdirectories and " "the top-level directory does not contain any files.")); - const QCommandLineOption whiteListOpt(QLatin1String("whitelist"), + const QCommandLineOption whiteListOpt(QStringLiteral("whitelist"), Tr::tr("Only consider files whose names match these patterns. The list entries " "can contain wildcards and are separated by commas. By default, all files " - "are considered."), QLatin1String("whitelist")); - const QCommandLineOption blackListOpt(QLatin1String("blacklist"), + "are considered."), QStringLiteral("whitelist")); + const QCommandLineOption blackListOpt(QStringLiteral("blacklist"), Tr::tr("Ignore files whose names match these patterns. The list entries " "can contain wildcards and are separated by commas. By default, no files " - "are ignored."), QLatin1String("blacklist")); + "are ignored."), QStringLiteral("blacklist")); QCommandLineParser parser; parser.setApplicationDescription(Tr::tr("This tool creates a qbs project from an existing " "source tree.\nNote: The resulting project file(s) " diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index 8c7373652..0a95dfd68 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -145,7 +145,7 @@ static QtInfoPerArch getQtAndroidInfo(const QString &qtSdkDir) return archs; QStringList qtDirs(qtSdkDir); - QDirIterator dit(qtSdkDir, QStringList() << QLatin1String("android_*"), QDir::Dirs); + QDirIterator dit(qtSdkDir, QStringList() << QStringLiteral("android_*"), QDir::Dirs); while (dit.hasNext()) qtDirs << dit.next(); for (auto it = qtDirs.cbegin(); it != qtDirs.cend(); ++it) { @@ -183,7 +183,7 @@ static QString getToolchainType(const QString &ndkDirPath) { QFile sourceProperties(ndkDirPath + qls("/source.properties")); if (!sourceProperties.open(QIODevice::ReadOnly)) - return QLatin1String("gcc"); // <= r10 + return QStringLiteral("gcc"); // <= r10 while (!sourceProperties.atEnd()) { const QByteArray curLine = sourceProperties.readLine().simplified(); static const QByteArray prefix = "Pkg.Revision = "; @@ -194,12 +194,12 @@ static QString getToolchainType(const QString &ndkDirPath) if (!ndkVersion.isValid()) { qWarning("Unexpected format of NDK revision string in '%s'", qPrintable(sourceProperties.fileName())); - return QLatin1String("clang"); + return QStringLiteral("clang"); } return qls(ndkVersion.majorVersion() >= 18 ? "clang" : "gcc"); } qWarning("No revision entry found in '%s'", qPrintable(sourceProperties.fileName())); - return QLatin1String("clang"); + return QStringLiteral("clang"); } static void setupNdk(qbs::Settings *settings, const QString &profileName, const QString &ndkDirPath, diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index df84f5332..0aecc8773 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -50,12 +50,12 @@ CommandLineParser::CommandLineParser() using qbs::Internal::Tr; -static QString helpOptionShort() { return QLatin1String("-h"); } -static QString helpOptionLong() { return QLatin1String("--help"); } -static QString settingsDirOption() { return QLatin1String("--settings-dir"); } -static QString sdkDirOption() { return QLatin1String("--sdk-dir"); } -static QString ndkDirOption() { return QLatin1String("--ndk-dir"); } -static QString qtSdkDirOption() { return QLatin1String("--qt-dir"); } +static QString helpOptionShort() { return QStringLiteral("-h"); } +static QString helpOptionLong() { return QStringLiteral("--help"); } +static QString settingsDirOption() { return QStringLiteral("--settings-dir"); } +static QString sdkDirOption() { return QStringLiteral("--sdk-dir"); } +static QString ndkDirOption() { return QStringLiteral("--ndk-dir"); } +static QString qtSdkDirOption() { return QStringLiteral("--qt-dir"); } void CommandLineParser::parse(const QStringList &commandLine) { diff --git a/src/app/qbs-setup-qt/commandlineparser.cpp b/src/app/qbs-setup-qt/commandlineparser.cpp index 8444faa77..3bfe9bb6b 100644 --- a/src/app/qbs-setup-qt/commandlineparser.cpp +++ b/src/app/qbs-setup-qt/commandlineparser.cpp @@ -45,11 +45,11 @@ using qbs::Internal::Tr; -static QString helpOptionShort() { return QLatin1String("-h"); } -static QString helpOptionLong() { return QLatin1String("--help"); } -static QString detectOption() { return QLatin1String("--detect"); } -static QString settingsDirOption() { return QLatin1String("--settings-dir"); } -static QString systemOption() { return QLatin1String("--system"); } +static QString helpOptionShort() { return QStringLiteral("-h"); } +static QString helpOptionLong() { return QStringLiteral("--help"); } +static QString detectOption() { return QStringLiteral("--detect"); } +static QString settingsDirOption() { return QStringLiteral("--settings-dir"); } +static QString systemOption() { return QStringLiteral("--system"); } void CommandLineParser::parse(const QStringList &commandLine) { diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index c22700a95..498b73d99 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -122,13 +122,13 @@ std::vector SetupQt::fetchEnvironments() static QStringList qbsToolchainFromDirName(const QString &dir) { if (dir.startsWith(QLatin1String("msvc"))) - return QStringList(QLatin1String("msvc")); + return QStringList(QStringLiteral("msvc")); if (dir.startsWith(QLatin1String("mingw"))) - return QStringList{QLatin1String("mingw"), QLatin1String("gcc")}; + return QStringList{QStringLiteral("mingw"), QStringLiteral("gcc")}; if (dir.startsWith(QLatin1String("clang"))) - return QStringList{QLatin1String("clang"), QLatin1String("llvm"), QLatin1String("gcc")}; + return QStringList{QStringLiteral("clang"), QStringLiteral("llvm"), QStringLiteral("gcc")}; if (dir.startsWith(QLatin1String("gcc"))) - return QStringList(QLatin1String("gcc")); + return QStringList(QStringLiteral("gcc")); return QStringList(); } @@ -156,20 +156,20 @@ static QString archFromDirName(const QString &dir) return QString(); const QString arch = QString::fromStdString(match[1]); if (arch == QLatin1String("32")) - return QLatin1String("x86"); + return QStringLiteral("x86"); if (arch == QLatin1String("64")) - return QLatin1String("x86_64"); + return QStringLiteral("x86_64"); if (arch.contains(QLatin1String("arm64"))) - return QLatin1String("arm64"); + return QStringLiteral("arm64"); return arch; } static QString platformFromDirName(const QString &dir) { if (dir.startsWith(QLatin1String("android"))) - return QLatin1String("android"); + return QStringLiteral("android"); if (dir == QLatin1String("Boot2Qt")) - return QLatin1String("linux"); + return QStringLiteral("linux"); return QString::fromStdString(HostOsInfo::hostOSIdentifier()); } @@ -184,7 +184,7 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) env.msvcVersion = msvcVersionFromDirName(qtDir.dirName()); env.architecture = archFromDirName(qtDir.dirName()); if (env.msvcVersion.isValid() && env.architecture.isEmpty()) - env.architecture = QLatin1String("x86"); + env.architecture = QStringLiteral("x86"); env.targetPlatform = platformFromDirName(qtDir.dirName()); qtDir.cdUp(); env.qtVersion = Version::fromString(qtDir.dirName()); @@ -196,9 +196,9 @@ static bool isToolchainProfile(const Profile &profile) { const auto actual = Internal::Set::fromList( profile.allKeys(Profile::KeySelectionRecursive)); - Internal::Set expected = Internal::Set { QLatin1String("qbs.toolchain") }; + Internal::Set expected = Internal::Set { QStringLiteral("qbs.toolchain") }; if (HostOsInfo::isMacosHost()) - expected.insert(QLatin1String("qbs.targetPlatform")); // match only Xcode profiles + expected.insert(QStringLiteral("qbs.targetPlatform")); // match only Xcode profiles return Internal::Set(actual).unite(expected) == actual; } @@ -231,7 +231,7 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro Match match = MatchFull; const auto toolchainNames = Internal::Set::fromList( - toolchainProfile.value(QLatin1String("qbs.toolchain")).toStringList()); + toolchainProfile.value(QStringLiteral("qbs.toolchain")).toStringList()); const auto qtToolchainNames = Internal::Set::fromList(env.qbsToolchain); if (areProfilePropertiesIncompatible(toolchainNames, qtToolchainNames)) { auto intersection = toolchainNames; @@ -243,11 +243,11 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro } const auto targetPlatform = toolchainProfile.value( - QLatin1String("qbs.targetPlatform")).toString(); + QStringLiteral("qbs.targetPlatform")).toString(); if (!targetPlatform.isEmpty() && targetPlatform != env.targetPlatform) return MatchNone; - const QString toolchainArchitecture = toolchainProfile.value(QLatin1String("qbs.architecture")) + const QString toolchainArchitecture = toolchainProfile.value(QStringLiteral("qbs.architecture")) .toString(); if (areProfilePropertiesIncompatible(canonicalArchitecture(env.architecture), canonicalArchitecture(toolchainArchitecture))) @@ -257,7 +257,7 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro // We want to know for sure that MSVC compiler versions match, // because it's especially important for this toolchain const Version compilerVersion = Version::fromString( - toolchainProfile.value(QLatin1String("cpp.compilerVersion")).toString()); + toolchainProfile.value(QStringLiteral("cpp.compilerVersion")).toString()); static const Version vs2017Version{19, 10}; if (env.msvcVersion >= vs2017Version) { @@ -314,7 +314,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, Profile profile(cleanQtVersionName, settings); profile.removeProfile(); - profile.setValue(QLatin1String("moduleProviders.Qt.qmakeFilePaths"), + profile.setValue(QStringLiteral("moduleProviders.Qt.qmakeFilePaths"), QStringList(qtEnvironment.qmakeFilePath)); if (!profile.baseProfile().isEmpty()) return; diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp index d96e18b7d..bf3937a2f 100644 --- a/src/app/qbs-setup-toolchains/commandlineparser.cpp +++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp @@ -45,12 +45,12 @@ using qbs::Internal::Tr; -static QString helpOptionShort() { return QLatin1String("-h"); } -static QString helpOptionLong() { return QLatin1String("--help"); } -static QString detectOption() { return QLatin1String("--detect"); } -static QString typeOption() { return QLatin1String("--type"); } -static QString settingsDirOption() { return QLatin1String("--settings-dir"); } -static QString systemOption() { return QLatin1String("--system"); } +static QString helpOptionShort() { return QStringLiteral("-h"); } +static QString helpOptionLong() { return QStringLiteral("--help"); } +static QString detectOption() { return QStringLiteral("--detect"); } +static QString typeOption() { return QStringLiteral("--type"); } +static QString settingsDirOption() { return QStringLiteral("--settings-dir"); } +static QString systemOption() { return QStringLiteral("--system"); } void CommandLineParser::parse(const QStringList &commandLine) { diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp index 967d443a2..267f9628d 100644 --- a/src/app/qbs-setup-toolchains/msvcprobe.cpp +++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp @@ -92,9 +92,9 @@ static void addMSVCPlatform(Settings *settings, QList &profiles, QStrin qbsInfo() << Tr::tr("Setting up profile '%1'.").arg(name); Profile p(name, settings); p.removeProfile(); - p.setValue(QLatin1String("qbs.targetPlatform"), QLatin1String("windows")); - p.setValue(QLatin1String("qbs.toolchain"), QStringList(QLatin1String("msvc"))); - p.setValue(QLatin1String("cpp.toolchainInstallPath"), msvc->binPath); + p.setValue(QStringLiteral("qbs.targetPlatform"), QStringLiteral("windows")); + p.setValue(QStringLiteral("qbs.toolchain"), QStringList(QStringLiteral("msvc"))); + p.setValue(QStringLiteral("cpp.toolchainInstallPath"), msvc->binPath); setQtHelperProperties(p, msvc); profiles.push_back(p); } @@ -154,7 +154,7 @@ static std::vector findSupportedArchitectures(const MSVC &msvc) static QString wow6432Key() { #ifdef Q_OS_WIN64 - return QLatin1String("\\Wow6432Node"); + return QStringLiteral("\\Wow6432Node"); #else return QString(); #endif @@ -351,7 +351,7 @@ void msvcProbe(Settings *settings, QList &profiles) const QSettings sdkRegistry(QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE") + wow6432Key() + QLatin1String("\\Microsoft\\Microsoft SDKs\\Windows"), QSettings::NativeFormat); - const QString defaultSdkPath = sdkRegistry.value(QLatin1String("CurrentInstallFolder")).toString(); + const QString defaultSdkPath = sdkRegistry.value(QStringLiteral("CurrentInstallFolder")).toString(); if (!defaultSdkPath.isEmpty()) { const auto sdkKeys = sdkRegistry.childGroups(); for (const QString &sdkKey : sdkKeys) { diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index 390b539a4..9ae8eac94 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -101,16 +101,16 @@ static QStringList validMinGWMachines() { // List of MinGW machine names (gcc -dumpmachine) recognized by Qbs return QStringList() - << QLatin1String("mingw32") << QLatin1String("mingw64") - << QLatin1String("i686-w64-mingw32") << QLatin1String("x86_64-w64-mingw32") - << QLatin1String("i686-w64-mingw32.shared") << QLatin1String("x86_64-w64-mingw32.shared") - << QLatin1String("i686-w64-mingw32.static") << QLatin1String("x86_64-w64-mingw32.static") - << QLatin1String("i586-mingw32msvc") << QLatin1String("amd64-mingw32msvc"); + << QStringLiteral("mingw32") << QStringLiteral("mingw64") + << QStringLiteral("i686-w64-mingw32") << QStringLiteral("x86_64-w64-mingw32") + << QStringLiteral("i686-w64-mingw32.shared") << QStringLiteral("x86_64-w64-mingw32.shared") + << QStringLiteral("i686-w64-mingw32.static") << QStringLiteral("x86_64-w64-mingw32.static") + << QStringLiteral("i586-mingw32msvc") << QStringLiteral("amd64-mingw32msvc"); } static QStringList knownIarCompilerNames() { - return { QLatin1String("icc8051"), QLatin1String("iccarm"), QLatin1String("iccavr") }; + return { QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr") }; } static bool isIarCompiler(const QString &compilerName) @@ -135,25 +135,25 @@ static bool isKeilCompiler(const QString &compilerName) static QStringList toolchainTypeFromCompilerName(const QString &compilerName) { if (compilerName == QLatin1String("cl.exe")) - return canonicalToolchain(QLatin1String("msvc")); - const auto types = { QLatin1String("clang"), QLatin1String("llvm"), - QLatin1String("mingw"), QLatin1String("gcc") }; + return canonicalToolchain(QStringLiteral("msvc")); + const auto types = { QStringLiteral("clang"), QStringLiteral("llvm"), + QStringLiteral("mingw"), QStringLiteral("gcc") }; for (const auto &type : types) { if (compilerName.contains(type)) return canonicalToolchain(type); } if (compilerName == QLatin1String("g++")) - return canonicalToolchain(QLatin1String("gcc")); + return canonicalToolchain(QStringLiteral("gcc")); if (isIarCompiler(compilerName)) - return canonicalToolchain(QLatin1String("iar")); + return canonicalToolchain(QStringLiteral("iar")); if (isKeilCompiler(compilerName)) - return canonicalToolchain(QLatin1String("keil")); + return canonicalToolchain(QStringLiteral("keil")); return QStringList(); } static QString gccMachineName(const QString &compilerFilePath) { - return qsystem(compilerFilePath, QStringList() << QLatin1String("-dumpmachine")).trimmed(); + return qsystem(compilerFilePath, QStringList() << QStringLiteral("-dumpmachine")).trimmed(); } static QStringList standardCompilerFileNames() @@ -176,15 +176,15 @@ static void setCommonProperties(Profile &profile, const QString &compilerFilePat const QString prefix = compilerName.left(compilerName.lastIndexOf(QLatin1Char('-')) + 1); if (!prefix.isEmpty()) - profile.setValue(QLatin1String("cpp.toolchainPrefix"), prefix); + profile.setValue(QStringLiteral("cpp.toolchainPrefix"), prefix); - profile.setValue(QLatin1String("cpp.toolchainInstallPath"), cfi.absolutePath()); - profile.setValue(QLatin1String("qbs.toolchain"), toolchainTypes); + profile.setValue(QStringLiteral("cpp.toolchainInstallPath"), cfi.absolutePath()); + profile.setValue(QStringLiteral("qbs.toolchain"), toolchainTypes); const QString suffix = compilerName.right(compilerName.size() - prefix.size()); if (!standardCompilerFileNames().contains(suffix)) qWarning("%s", qPrintable( - QString::fromLatin1("'%1' is not a standard compiler file name; " + QStringLiteral("'%1' is not a standard compiler file name; " "you must set the cpp.cCompilerName and " "cpp.cxxCompilerName properties of this profile " "manually").arg(compilerName))); @@ -205,9 +205,8 @@ public: return; const QString toolFilePath = findExecutable(toolFileName); if (toolFilePath.isEmpty()) { - qWarning("%s", qPrintable( - QString(QLatin1String("'%1' exists neither in '%2' nor in PATH.")) - .arg(toolFileName, m_compilerDirPath))); + qWarning("%s", qPrintable(QStringLiteral("'%1' exists neither in '%2' nor in PATH.") + .arg(toolFileName, m_compilerDirPath))); } m_profile->setValue(propertyName, toolFilePath); } @@ -251,14 +250,14 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti const ToolPathSetup toolPathSetup(&profile, compilerDirPath, profile.value(QStringLiteral("cpp.toolchainPrefix")) .toString()); - toolPathSetup.apply(QLatin1String("ar"), QLatin1String("cpp.archiverPath")); - toolPathSetup.apply(QLatin1String("as"), QLatin1String("cpp.assemblerPath")); - toolPathSetup.apply(QLatin1String("nm"), QLatin1String("cpp.nmPath")); + toolPathSetup.apply(QStringLiteral("ar"), QStringLiteral("cpp.archiverPath")); + toolPathSetup.apply(QStringLiteral("as"), QStringLiteral("cpp.assemblerPath")); + toolPathSetup.apply(QStringLiteral("nm"), QStringLiteral("cpp.nmPath")); if (doesProfileTargetOS(profile, QStringLiteral("darwin"))) - toolPathSetup.apply(QLatin1String("dsymutil"), QLatin1String("cpp.dsymutilPath")); + toolPathSetup.apply(QStringLiteral("dsymutil"), QStringLiteral("cpp.dsymutilPath")); else - toolPathSetup.apply(QLatin1String("objcopy"), QLatin1String("cpp.objcopyPath")); - toolPathSetup.apply(QLatin1String("strip"), QLatin1String("cpp.stripPath")); + toolPathSetup.apply(QStringLiteral("objcopy"), QStringLiteral("cpp.objcopyPath")); + toolPathSetup.apply(QStringLiteral("strip"), QStringLiteral("cpp.stripPath")); qStdout << Tr::tr("Profile '%1' created for '%2'.").arg(profile.name(), compilerFilePath) << endl; @@ -269,11 +268,11 @@ static QString guessIarArchitecture(const QFileInfo &compiler) { const auto baseName = compiler.baseName(); if (baseName == QLatin1String("icc8051")) - return QLatin1String("mcs51"); + return QStringLiteral("mcs51"); if (baseName == QLatin1String("iccarm")) - return QLatin1String("arm"); + return QStringLiteral("arm"); if (baseName == QLatin1String("iccavr")) - return QLatin1String("avr"); + return QStringLiteral("avr"); return {}; } @@ -350,7 +349,7 @@ static void mingwProbe(Settings *settings, QList &profiles) // List of possible compiler binary names for this platform QStringList compilerNames; if (HostOsInfo::isWindowsHost()) { - compilerNames << QLatin1String("gcc"); + compilerNames << QStringLiteral("gcc"); } else { const auto machineNames = validMinGWMachines(); for (const QString &machineName : machineNames) { @@ -363,7 +362,7 @@ static void mingwProbe(Settings *settings, QList &profiles) = findExecutable(HostOsInfo::appendExecutableSuffix(compilerName)); if (!gccPath.isEmpty()) profiles.push_back(createGccProfile(gccPath, settings, - canonicalToolchain(QLatin1String("mingw")))); + canonicalToolchain(QStringLiteral("mingw")))); } } @@ -409,8 +408,8 @@ void probe(Settings *settings) if (HostOsInfo::isWindowsHost()) { msvcProbe(settings, profiles); } else { - gccProbe(settings, profiles, QLatin1String("gcc")); - gccProbe(settings, profiles, QLatin1String("clang")); + gccProbe(settings, profiles, QStringLiteral("gcc")); + gccProbe(settings, profiles, QStringLiteral("clang")); if (HostOsInfo::isMacosHost()) { xcodeProbe(settings, profiles); @@ -426,7 +425,7 @@ void probe(Settings *settings) } else if (profiles.size() == 1 && settings->defaultProfile().isEmpty()) { const QString profileName = profiles.front().name(); qStdout << Tr::tr("Making profile '%1' the default.").arg(profileName) << endl; - settings->setValue(QLatin1String("defaultProfile"), profileName); + settings->setValue(QStringLiteral("defaultProfile"), profileName); } } diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 2cb54f5b9..277d14d0a 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -99,8 +99,8 @@ bool XcodeProbe::addDeveloperPath(const QString &path) void XcodeProbe::detectDeveloperPaths() { QProcess selectedXcode; - QString program = QLatin1String("/usr/bin/xcode-select"); - QStringList arguments(QLatin1String("--print-path")); + QString program = QStringLiteral("/usr/bin/xcode-select"); + QStringList arguments(QStringLiteral("--print-path")); selectedXcode.start(program, arguments, QProcess::ReadOnly); if (!selectedXcode.waitForFinished(-1) || selectedXcode.exitCode()) { qbsInfo() << Tr::tr("Could not detect selected Xcode with /usr/bin/xcode-select"); @@ -111,8 +111,8 @@ void XcodeProbe::detectDeveloperPaths() addDeveloperPath(defaultDeveloperPath); QProcess launchServices; - program = QLatin1String("/usr/bin/mdfind"); - arguments = QStringList(QLatin1String("kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'")); + program = QStringLiteral("/usr/bin/mdfind"); + arguments = QStringList(QStringLiteral("kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'")); launchServices.start(program, arguments, QProcess::ReadOnly); if (!launchServices.waitForFinished(-1) || launchServices.exitCode()) { qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind"); @@ -172,10 +172,10 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x Profile installationProfile(xcodeName, settings); installationProfile.removeProfile(); installationProfile.setValue(QStringLiteral("qbs.toolchain"), QStringList() - << QLatin1String("xcode") - << QLatin1String("clang") - << QLatin1String("llvm") - << QLatin1String("gcc")); + << QStringLiteral("xcode") + << QStringLiteral("clang") + << QStringLiteral("llvm") + << QStringLiteral("gcc")); if (devPath != defaultDeveloperPath) installationProfile.setValue(QStringLiteral("xcode.developerPath"), devPath); profiles.push_back(installationProfile); @@ -212,7 +212,7 @@ void XcodeProbe::detectAll() int i = 1; detectDeveloperPaths(); for (const QString &developerPath : developerPaths) { - QString profileName = QLatin1String("xcode"); + QString profileName = QStringLiteral("xcode"); if (developerPath != defaultDeveloperPath) { const auto devPath = developerPath.toStdString(); std::smatch match; diff --git a/src/app/qbs/application.cpp b/src/app/qbs/application.cpp index e22a0e9cc..2e6543241 100644 --- a/src/app/qbs/application.cpp +++ b/src/app/qbs/application.cpp @@ -47,9 +47,9 @@ namespace qbs { Application::Application(int &argc, char **argv) : QCoreApplication(argc, argv), m_clFrontend(nullptr), m_canceled(false) { - setApplicationName(QLatin1String("qbs")); - setOrganizationName(QLatin1String("QtProject")); - setOrganizationDomain(QLatin1String("qt-project.org")); + setApplicationName(QStringLiteral("qbs")); + setOrganizationName(QStringLiteral("QtProject")); + setOrganizationDomain(QStringLiteral("qt-project.org")); } Application *Application::instance() diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index b2bb5df62..1a8e1757d 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -156,9 +156,9 @@ void CommandLineFrontend::start() const auto buildConfigs = m_parser.buildConfigurations(); for (const QVariantMap &buildConfig : buildConfigs) { QVariantMap userConfig = buildConfig; - const QString configurationKey = QLatin1String("qbs.configurationName"); - const QString profileKey = QLatin1String("qbs.profile"); - const QString installRootKey = QLatin1String("qbs.installRoot"); + const QString configurationKey = QStringLiteral("qbs.configurationName"); + const QString profileKey = QStringLiteral("qbs.profile"); + const QString installRootKey = QStringLiteral("qbs.installRoot"); QString installRoot = userConfig.value(installRootKey).toString(); if (!installRoot.isEmpty() && QFileInfo(installRoot).isRelative()) { installRoot.prepend(QLatin1Char('/')).prepend(QDir::currentPath()); @@ -316,7 +316,7 @@ void CommandLineFrontend::handleProcessResultReport(const qbs::ProcessResult &re LogWriter w = result.success() ? qbsInfo() : qbsError(); w << shellQuote(QDir::toNativeSeparators(result.executableFilePath()), result.arguments()) - << (hasOutput ? QString::fromLatin1("\n") : QString()) + << (hasOutput ? QStringLiteral("\n") : QString()) << (result.stdOut().empty() ? QString() : result.stdOut().join(QLatin1Char('\n'))); if (!result.stdErr().empty()) w << result.stdErr().join(QLatin1Char('\n')) << MessageTag(QStringLiteral("stdErr")); @@ -593,7 +593,7 @@ void CommandLineFrontend::listProducts() QString productInfo = p.fullDisplayName(); if (!p.isEnabled()) productInfo.append(QLatin1Char(' ')).append(Tr::tr("[disabled]")); - else if (!p.properties().value(QLatin1String("builtByDefault")).toBool()) + else if (!p.properties().value(QStringLiteral("builtByDefault")).toBool()) productInfo.append(QLatin1Char(' ')).append(Tr::tr("[not built by default]")); output += productInfo; } diff --git a/src/app/qbs/consoleprogressobserver.cpp b/src/app/qbs/consoleprogressobserver.cpp index b49723a64..e6ab9db74 100644 --- a/src/app/qbs/consoleprogressobserver.cpp +++ b/src/app/qbs/consoleprogressobserver.cpp @@ -111,7 +111,7 @@ void ConsoleProgressObserver::updateProgressBarIfNecessary() void ConsoleProgressObserver::writePercentageString() { - std::cout << QString::fromLatin1(" %1%").arg(m_percentage).toLocal8Bit().constData(); + std::cout << QStringLiteral(" %1%").arg(m_percentage).toLocal8Bit().constData(); } } // namespace qbs diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp index dc5b4e440..0c13662f0 100644 --- a/src/app/qbs/parser/commandlineoption.cpp +++ b/src/app/qbs/parser/commandlineoption.cpp @@ -84,12 +84,12 @@ QString FileOption::description(CommandType command) const QString FileOption::shortRepresentation() const { - return QLatin1String("-f"); + return QStringLiteral("-f"); } QString FileOption::longRepresentation() const { - return QLatin1String("--file"); + return QStringLiteral("--file"); } void FileOption::doParse(const QString &representation, QStringList &input) @@ -114,22 +114,22 @@ QString BuildDirectoryOption::description(CommandType command) const QString BuildDirectoryOption::shortRepresentation() const { - return QLatin1String("-d"); + return QStringLiteral("-d"); } QString BuildDirectoryOption::longRepresentation() const { - return QLatin1String("--build-directory"); + return QStringLiteral("--build-directory"); } QString BuildDirectoryOption::magicProjectString() { - return QLatin1String("@project"); + return QStringLiteral("@project"); } QString BuildDirectoryOption::magicProjectDirString() { - return QLatin1String("@path"); + return QStringLiteral("@path"); } void BuildDirectoryOption::doParse(const QString &representation, QStringList &input) @@ -147,12 +147,12 @@ QString GeneratorOption::description(CommandType command) const QString GeneratorOption::shortRepresentation() const { - return QLatin1String("-g"); + return QStringLiteral("-g"); } QString GeneratorOption::longRepresentation() const { - return QLatin1String("--generator"); + return QStringLiteral("--generator"); } void GeneratorOption::doParse(const QString &representation, QStringList &input) @@ -164,7 +164,7 @@ void GeneratorOption::doParse(const QString &representation, QStringList &input) } } -static QString loglevelLongRepresentation() { return QLatin1String("--log-level"); } +static QString loglevelLongRepresentation() { return QStringLiteral("--log-level"); } QString VerboseOption::description(CommandType command) const { @@ -180,12 +180,12 @@ QString VerboseOption::description(CommandType command) const QString VerboseOption::shortRepresentation() const { - return QLatin1String("-v"); + return QStringLiteral("-v"); } QString VerboseOption::longRepresentation() const { - return QLatin1String("--more-verbose"); + return QStringLiteral("--more-verbose"); } QString QuietOption::description(CommandType command) const @@ -202,12 +202,12 @@ QString QuietOption::description(CommandType command) const QString QuietOption::shortRepresentation() const { - return QLatin1String("-q"); + return QStringLiteral("-q"); } QString QuietOption::longRepresentation() const { - return QLatin1String("--less-verbose"); + return QStringLiteral("--less-verbose"); } QString JobsOption::description(CommandType command) const @@ -221,12 +221,12 @@ QString JobsOption::description(CommandType command) const QString JobsOption::shortRepresentation() const { - return QLatin1String("-j"); + return QStringLiteral("-j"); } QString JobsOption::longRepresentation() const { - return QLatin1String("--jobs"); + return QStringLiteral("--jobs"); } void JobsOption::doParse(const QString &representation, QStringList &input) @@ -249,12 +249,12 @@ QString KeepGoingOption::description(CommandType command) const QString KeepGoingOption::shortRepresentation() const { - return QLatin1String("-k"); + return QStringLiteral("-k"); } QString KeepGoingOption::longRepresentation() const { - return QLatin1String("--keep-going"); + return QStringLiteral("--keep-going"); } QString DryRunOption::description(CommandType command) const @@ -268,12 +268,12 @@ QString DryRunOption::description(CommandType command) const QString DryRunOption::shortRepresentation() const { - return QLatin1String("-n"); + return QStringLiteral("-n"); } QString DryRunOption::longRepresentation() const { - return QLatin1String("--dry-run"); + return QStringLiteral("--dry-run"); } QString ForceProbesOption::description(CommandType command) const @@ -287,7 +287,7 @@ QString ForceProbesOption::description(CommandType command) const QString ForceProbesOption::longRepresentation() const { - return QLatin1String("--force-probe-execution"); + return QStringLiteral("--force-probe-execution"); } QString NoInstallOption::description(CommandType command) const @@ -300,13 +300,13 @@ QString NoInstallOption::description(CommandType command) const QString NoInstallOption::longRepresentation() const { - return QLatin1String("--no-install"); + return QStringLiteral("--no-install"); } static QString logTimeRepresentation() { - return QLatin1String("--log-time"); + return QStringLiteral("--log-time"); } QString ShowProgressOption::description(CommandType command) const @@ -321,7 +321,7 @@ QString ShowProgressOption::description(CommandType command) const static QString showProgressRepresentation() { - return QLatin1String("--show-progress"); + return QStringLiteral("--show-progress"); } QString ShowProgressOption::longRepresentation() const @@ -354,7 +354,7 @@ QString ChangedFilesOption::description(CommandType command) const QString ChangedFilesOption::longRepresentation() const { - return QLatin1String("--changed-files"); + return QStringLiteral("--changed-files"); } QString ProductsOption::description(CommandType command) const @@ -373,12 +373,12 @@ QString ProductsOption::description(CommandType command) const QString ProductsOption::shortRepresentation() const { - return QLatin1String("-p"); + return QStringLiteral("-p"); } QString ProductsOption::longRepresentation() const { - return QLatin1String("--products"); + return QStringLiteral("--products"); } static QStringList allLogLevelStrings() @@ -433,7 +433,7 @@ QString ForceTimeStampCheckOption::description(CommandType command) const QString ForceTimeStampCheckOption::longRepresentation() const { - return QLatin1String("--check-timestamps"); + return QStringLiteral("--check-timestamps"); } QString ForceOutputCheckOption::description(CommandType command) const @@ -446,7 +446,7 @@ QString ForceOutputCheckOption::description(CommandType command) const QString ForceOutputCheckOption::longRepresentation() const { - return QLatin1String("--check-outputs"); + return QStringLiteral("--check-outputs"); } QString BuildNonDefaultOption::description(CommandType command) const @@ -458,7 +458,7 @@ QString BuildNonDefaultOption::description(CommandType command) const QString BuildNonDefaultOption::longRepresentation() const { - return QLatin1String("--all-products"); + return QStringLiteral("--all-products"); } @@ -466,7 +466,7 @@ InstallRootOption::InstallRootOption() : m_useSysroot(false) { } -static QString magicSysrootString() { return QLatin1String("@sysroot"); } +static QString magicSysrootString() { return QStringLiteral("@sysroot"); } QString InstallRootOption::description(CommandType command) const { @@ -482,7 +482,7 @@ QString InstallRootOption::description(CommandType command) const QString InstallRootOption::longRepresentation() const { - return QLatin1String("--install-root"); + return QStringLiteral("--install-root"); } void InstallRootOption::doParse(const QString &representation, QStringList &input) @@ -507,7 +507,7 @@ QString RemoveFirstOption::description(CommandType command) const QString RemoveFirstOption::longRepresentation() const { - return QLatin1String("--clean-install-root"); + return QStringLiteral("--clean-install-root"); } @@ -520,7 +520,7 @@ QString NoBuildOption::description(CommandType command) const QString NoBuildOption::longRepresentation() const { - return QLatin1String("--no-build"); + return QStringLiteral("--no-build"); } @@ -537,7 +537,7 @@ QString LogTimeOption::description(CommandType command) const QString LogTimeOption::shortRepresentation() const { - return QLatin1String("-t"); + return QStringLiteral("-t"); } QString LogTimeOption::longRepresentation() const @@ -562,7 +562,7 @@ QString SettingsDirOption::description(CommandType command) const QString SettingsDirOption::longRepresentation() const { - return QLatin1String("--settings-dir"); + return QStringLiteral("--settings-dir"); } void SettingsDirOption::doParse(const QString &representation, QStringList &input) @@ -583,7 +583,7 @@ QString JobLimitsOption::description(CommandType command) const QString JobLimitsOption::longRepresentation() const { - return QLatin1String("--job-limits"); + return QStringLiteral("--job-limits"); } void JobLimitsOption::doParse(const QString &representation, QStringList &input) @@ -624,7 +624,7 @@ QString RespectProjectJobLimitsOption::description(CommandType command) const QString RespectProjectJobLimitsOption::longRepresentation() const { - return QLatin1String("--enforce-project-job-limits"); + return QStringLiteral("--enforce-project-job-limits"); } CommandEchoModeOption::CommandEchoModeOption() @@ -644,7 +644,7 @@ QString CommandEchoModeOption::description(CommandType command) const QString CommandEchoModeOption::longRepresentation() const { - return QLatin1String("--command-echo-mode"); + return QStringLiteral("--command-echo-mode"); } CommandEchoMode CommandEchoModeOption::commandEchoMode() const @@ -678,7 +678,7 @@ QString WaitLockOption::description(CommandType command) const QString WaitLockOption::longRepresentation() const { - return QLatin1String("--wait-lock"); + return QStringLiteral("--wait-lock"); } QString DisableFallbackProviderOption::description(CommandType) const @@ -689,7 +689,7 @@ QString DisableFallbackProviderOption::description(CommandType) const QString DisableFallbackProviderOption::longRepresentation() const { - return QLatin1String("--no-fallback-module-provider"); + return QStringLiteral("--no-fallback-module-provider"); } QString RunEnvConfigOption::description(CommandType command) const @@ -701,7 +701,7 @@ QString RunEnvConfigOption::description(CommandType command) const QString RunEnvConfigOption::longRepresentation() const { - return QLatin1String("--setup-run-env-config"); + return QStringLiteral("--setup-run-env-config"); } } // namespace qbs diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 32023e011..cd74210c7 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -135,7 +135,7 @@ void CommandLineParser::printHelp() const if (commandToDescribe) { stream << commandToDescribe->longDescription(); } else if (!QbsTool::tryToRunTool(helpCommand->commandToDescribe(), - QStringList(QLatin1String("--help")))) { + QStringList(QStringLiteral("--help")))) { throw ErrorInfo(Tr::tr("No such command '%1'.\n%2") .arg(helpCommand->commandToDescribe(), d->generalHelp())); } @@ -299,7 +299,7 @@ QString CommandLineParser::commandDescription() const static QString getBuildConfigurationName(const QVariantMap &buildConfig) { - return buildConfig.value(QLatin1String("qbs.configurationName")).toString(); + return buildConfig.value(QStringLiteral("qbs.configurationName")).toString(); } QList CommandLineParser::buildConfigurations() const @@ -429,7 +429,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const const QString whitespace = QString(rhsIndentation - 2 - toolName.size(), QLatin1Char(' ')); QbsTool tool; - tool.runTool(toolName, QStringList(QLatin1String("--help"))); + tool.runTool(toolName, QStringList(QStringLiteral("--help"))); if (tool.exitCode() != 0) continue; const QString shortDescription = extractToolDescription(toolName, tool.stdOut()); @@ -480,7 +480,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations() using PropertyListItem = std::pair; QList propertiesPerConfiguration; - const QString configurationNameKey = QLatin1String("qbs.configurationName"); + const QString configurationNameKey = QStringLiteral("qbs.configurationName"); QString currentConfigurationName; QVariantMap currentProperties; const auto args = command->additionalArguments(); diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index 79636ff0a..22e49b8d7 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -196,7 +196,7 @@ QString ResolveCommand::longDescription() const QString ResolveCommand::representation() const { - return QLatin1String("resolve"); + return QStringLiteral("resolve"); } static QList resolveOptions() @@ -235,7 +235,7 @@ QString GenerateCommand::longDescription() const QString GenerateCommand::representation() const { - return QLatin1String("generate"); + return QStringLiteral("generate"); } QList GenerateCommand::supportedOptions() const @@ -266,7 +266,7 @@ QString BuildCommand::longDescription() const return description += supportedOptionsDescription(); } -static QString buildCommandRepresentation() { return QLatin1String("build"); } +static QString buildCommandRepresentation() { return QStringLiteral("build"); } QString BuildCommand::representation() const { @@ -312,7 +312,7 @@ QString CleanCommand::longDescription() const QString CleanCommand::representation() const { - return QLatin1String("clean"); + return QStringLiteral("clean"); } QList CleanCommand::supportedOptions() const @@ -349,7 +349,7 @@ QString InstallCommand::longDescription() const QString InstallCommand::representation() const { - return QLatin1String("install"); + return QStringLiteral("install"); } QList installOptions() @@ -368,7 +368,7 @@ QList InstallCommand::supportedOptions() const QString RunCommand::shortDescription() const { - return QLatin1String("Run an executable generated by building a project."); + return QStringLiteral("Run an executable generated by building a project."); } QString RunCommand::longDescription() const @@ -386,7 +386,7 @@ QString RunCommand::longDescription() const QString RunCommand::representation() const { - return QLatin1String("run"); + return QStringLiteral("run"); } QList RunCommand::supportedOptions() const @@ -424,7 +424,7 @@ QString ShellCommand::longDescription() const QString ShellCommand::representation() const { - return QLatin1String("shell"); + return QStringLiteral("shell"); } QList ShellCommand::supportedOptions() const @@ -451,7 +451,7 @@ QString StatusCommand::longDescription() const QString StatusCommand::representation() const { - return QLatin1String("status"); + return QStringLiteral("status"); } QList StatusCommand::supportedOptions() const @@ -480,7 +480,7 @@ QString UpdateTimestampsCommand::longDescription() const QString UpdateTimestampsCommand::representation() const { - return QLatin1String("update-timestamps"); + return QStringLiteral("update-timestamps"); } QList UpdateTimestampsCommand::supportedOptions() const @@ -508,7 +508,7 @@ QString DumpNodesTreeCommand::longDescription() const QString DumpNodesTreeCommand::representation() const { - return QLatin1String("dump-nodes-tree"); + return QStringLiteral("dump-nodes-tree"); } QList DumpNodesTreeCommand::supportedOptions() const @@ -532,7 +532,7 @@ QString ListProductsCommand::longDescription() const QString ListProductsCommand::representation() const { - return QLatin1String("list-products"); + return QStringLiteral("list-products"); } QList ListProductsCommand::supportedOptions() const @@ -556,7 +556,7 @@ QString HelpCommand::longDescription() const QString HelpCommand::representation() const { - return QLatin1String("help"); + return QStringLiteral("help"); } QList HelpCommand::supportedOptions() const @@ -587,7 +587,7 @@ QString VersionCommand::longDescription() const QString VersionCommand::representation() const { - return QLatin1String("show-version"); + return QStringLiteral("show-version"); } QList VersionCommand::supportedOptions() const diff --git a/src/app/qbs/qbstool.cpp b/src/app/qbs/qbstool.cpp index eb70557b6..318b79638 100644 --- a/src/app/qbs/qbstool.cpp +++ b/src/app/qbs/qbstool.cpp @@ -47,7 +47,7 @@ #include -static QString toolPrefix() { return QLatin1String("qbs-"); } +static QString toolPrefix() { return QStringLiteral("qbs-"); } static QString qbsBinDir() { return QCoreApplication::applicationDirPath(); } static QString qbsToolFilePath(const QString &toolName) @@ -93,7 +93,7 @@ QStringList QbsTool::allToolNames() { const QString suffix = QLatin1String(QBS_HOST_EXE_SUFFIX); const QStringList toolFileNames = QDir(qbsBinDir()).entryList(QStringList(toolPrefix() - + QString::fromLatin1("*%1").arg(suffix)), QDir::Files, QDir::Name); + + QStringLiteral("*%1").arg(suffix)), QDir::Files, QDir::Name); QStringList toolNames; const int prefixLength = toolPrefix().size(); for (const QString &toolFileName : toolFileNames) { diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp index 8c235010d..79a75c673 100644 --- a/src/app/qbs/status.cpp +++ b/src/app/qbs/status.cpp @@ -56,11 +56,11 @@ static QList createIgnoreList(const QString &projectRootPath) { QList ignoreRegularExpressionList { QRegExp(projectRootPath + QLatin1String("/build.*")), - QRegExp(QLatin1String("*.qbs"), Qt::CaseSensitive, QRegExp::Wildcard), - QRegExp(QLatin1String("*.pro"), Qt::CaseSensitive, QRegExp::Wildcard), - QRegExp(QLatin1String("*Makefile"), Qt::CaseSensitive, QRegExp::Wildcard), - QRegExp(QLatin1String("*.so*"), Qt::CaseSensitive, QRegExp::Wildcard), - QRegExp(QLatin1String("*.o"), Qt::CaseSensitive, QRegExp::Wildcard) + QRegExp(QStringLiteral("*.qbs"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QStringLiteral("*.pro"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QStringLiteral("*Makefile"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QStringLiteral("*.so*"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QStringLiteral("*.o"), Qt::CaseSensitive, QRegExp::Wildcard) }; QString ignoreFilePath = projectRootPath + QLatin1String("/.qbsignore"); diff --git a/src/app/shared/logging/consolelogger.cpp b/src/app/shared/logging/consolelogger.cpp index 7639fb111..63b7dc9e3 100644 --- a/src/app/shared/logging/consolelogger.cpp +++ b/src/app/shared/logging/consolelogger.cpp @@ -47,10 +47,10 @@ static QHash setupColorTable() { QHash colorTable; - colorTable[QLatin1String("compiler")] = TextColorDefault; - colorTable[QLatin1String("linker")] = TextColorDarkGreen; - colorTable[QLatin1String("codegen")] = TextColorDarkYellow; - colorTable[QLatin1String("filegen")] = TextColorDarkYellow; + colorTable[QStringLiteral("compiler")] = TextColorDefault; + colorTable[QStringLiteral("linker")] = TextColorDarkGreen; + colorTable[QStringLiteral("codegen")] = TextColorDarkYellow; + colorTable[QStringLiteral("filegen")] = TextColorDarkYellow; return colorTable; } diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index 19496c83f..4d06821fd 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -329,7 +329,7 @@ void InternalSetupProjectJob::resolveProjectFromScratch(ScriptEngine *engine) void InternalSetupProjectJob::resolveBuildDataFromScratch(const RulesEvaluationContextPtr &evalContext) { - TimedActivityLogger resolveLogger(logger(), QLatin1String("Resolving build project"), timed()); + TimedActivityLogger resolveLogger(logger(), QStringLiteral("Resolving build project"), timed()); BuildDataResolver(logger()).resolveBuildData(m_newProject, evalContext); } diff --git a/src/lib/corelib/api/languageinfo.cpp b/src/lib/corelib/api/languageinfo.cpp index 840dfdf2b..cb023927a 100644 --- a/src/lib/corelib/api/languageinfo.cpp +++ b/src/lib/corelib/api/languageinfo.cpp @@ -69,7 +69,7 @@ std::string LanguageInfo::qmlTypeInfo() result.append(utf8TypeName); result.append(" "); const auto v = builtins.languageVersion(); - result.append(QString::fromLatin1("%1.%2") + result.append(QStringLiteral("%1.%2") .arg(v.majorVersion()).arg(v.minorVersion()).toUtf8()); result.append("\" ]\n"); result.append(" prototype: \"QQuickItem\"\n"); diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp index 9fe41d707..04c04ad25 100644 --- a/src/lib/corelib/api/projectdata.cpp +++ b/src/lib/corelib/api/projectdata.cpp @@ -558,8 +558,8 @@ QList ProductData::installableArtifacts() const QString ProductData::targetExecutable() const { QBS_ASSERT(isValid(), return QString()); - if (d->moduleProperties.getModuleProperty(QLatin1String("bundle"), - QLatin1String("isBundle")).toBool()) { + if (d->moduleProperties.getModuleProperty(QStringLiteral("bundle"), + QStringLiteral("isBundle")).toBool()) { for (const ArtifactData &ta : targetArtifacts()) { if (ta.fileTags().contains(QLatin1String("bundle.application-executable"))) { if (ta.installData().isInstallable()) @@ -886,7 +886,7 @@ static QString mapToString(const QVariantMap &map, const QString &prefix) if (val.type() == QVariant::Map) { stringRep += mapToString(val.value(), prefix + key + QLatin1Char('.')); } else { - stringRep += QString::fromLatin1("%1%2: %3\n") + stringRep += QStringLiteral("%1%2: %3\n") .arg(prefix, key, toJSLiteral(val)); } } diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp index 25c2705d1..944de7161 100644 --- a/src/lib/corelib/api/projectfileupdater.cpp +++ b/src/lib/corelib/api/projectfileupdater.cpp @@ -378,7 +378,7 @@ void ProjectFileFilesAdder::doApply(QString &fileContent, UiProgram *ast) // It cannot be the other way around, since the existing right-hand side could // have string type. - filesRepresentation += QString::fromLatin1(".concat(%1)").arg(rhsRepr); + filesRepresentation += QStringLiteral(".concat(%1)").arg(rhsRepr); } } @@ -468,10 +468,11 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast) throw ErrorInfo(Tr::tr("The following files were not found in the 'files' list: %1") .arg(filesToRemove.join(QLatin1String(", "))), bindingLocation); } - QString filesString = QLatin1String("[\n"); + QString filesString; + filesString += QLatin1String("[\n"); for (const QString &file : qAsConst(newFilesList)) { filesString += QString(arrayElemIndentation, QLatin1Char(' ')); - filesString += QString::fromLatin1("\"%1\",\n").arg(file); + filesString += QStringLiteral("\"%1\",\n").arg(file); } filesString += QString(bindingIndentation, QLatin1Char(' ')); filesString += QLatin1Char(']'); diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp index baf1f3e2c..6ddd7d5a6 100644 --- a/src/lib/corelib/api/qmljsrewriter.cpp +++ b/src/lib/corelib/api/qmljsrewriter.cpp @@ -132,15 +132,15 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast, QString newPropertyTemplate; switch (bindingType) { case ArrayBinding: - newPropertyTemplate = QLatin1String("%1: [\n%2\n]"); + newPropertyTemplate = QStringLiteral("%1: [\n%2\n]"); break; case ObjectBinding: - newPropertyTemplate = QLatin1String("%1: %2"); + newPropertyTemplate = QStringLiteral("%1: %2"); break; case ScriptBinding: - newPropertyTemplate = QLatin1String("%1: %2"); + newPropertyTemplate = QStringLiteral("%1: %2"); break; default: @@ -250,7 +250,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb else if (auto scriptBinding = cast(member)) orderedMembers[toString(scriptBinding->qualifiedId)] = iter; else if (cast(member)) - orderedMembers[QLatin1String("property")] = iter; + orderedMembers[QStringLiteral("property")] = iter; } int idx = propertyOrder.indexOf(propertyName); @@ -592,7 +592,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m else if (UiScriptBinding *scriptBinding = cast(member)) orderedMembers[toString(scriptBinding->qualifiedId)] = iter; else if (cast(member)) - orderedMembers[QLatin1String("property")] = iter; + orderedMembers[QStringLiteral("property")] = iter; } int idx = propertyOrder.indexOf(propertyName); diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp index bf973cbc4..3e0d045ec 100644 --- a/src/lib/corelib/api/runenvironment.cpp +++ b/src/lib/corelib/api/runenvironment.cpp @@ -188,10 +188,10 @@ int RunEnvironment::doRunShell() qputenv(key.toLocal8Bit().constData(), environment.value(key).toLocal8Bit()); QString command; if (HostOsInfo::isWindowsHost()) { - command = environment.value(QLatin1String("COMSPEC")); + command = environment.value(QStringLiteral("COMSPEC")); if (command.isEmpty()) - command = QLatin1String("cmd"); - const QString prompt = environment.value(QLatin1String("PROMPT")); + command = QStringLiteral("cmd"); + const QString prompt = environment.value(QStringLiteral("PROMPT")); command += QLatin1String(" /k prompt [qbs] ") + prompt; } else { const QVariantMap qbsProps = @@ -201,7 +201,7 @@ int RunEnvironment::doRunShell() const QString profileName = qbsProps.value(StringConstants::profileProperty()).toString(); command = Preferences(d->settings, profileName).shell(); if (command.isEmpty()) - command = environment.value(QLatin1String("SHELL"), QLatin1String("/bin/sh")); + command = environment.value(QStringLiteral("SHELL"), QStringLiteral("/bin/sh")); // Yes, we have to use this procedure. PS1 is not inherited from the environment. const QString prompt = QLatin1String("qbs ") + configName @@ -286,9 +286,9 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg { d->checkProduct(); const QStringList targetOS = d->resolvedProduct->moduleProperties->qbsPropertyValue( - QLatin1String("targetOS")).toStringList(); + QStringLiteral("targetOS")).toStringList(); const QStringList toolchain = d->resolvedProduct->moduleProperties->qbsPropertyValue( - QLatin1String("toolchain")).toStringList(); + QStringLiteral("toolchain")).toStringList(); QString targetExecutable = targetBin; QStringList targetArguments = arguments; @@ -403,24 +403,24 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg // Run Windows executables through Wine when not on Windows if (!HostOsInfo::isWindowsHost()) { targetArguments.prepend(targetExecutable); - targetExecutable = QLatin1String("wine"); + targetExecutable = QStringLiteral("wine"); } } if (toolchain.contains(QLatin1String("mono"))) { targetArguments.prepend(targetExecutable); - targetExecutable = QLatin1String("mono"); + targetExecutable = QStringLiteral("mono"); } if (completeSuffix == QLatin1String("js")) { targetExecutable = d->resolvedProduct->moduleProperties->moduleProperty( - QLatin1String("nodejs"), QLatin1String("interpreterFilePath")).toString(); + QStringLiteral("nodejs"), QStringLiteral("interpreterFilePath")).toString(); if (targetExecutable.isEmpty()) // The Node.js binary is called nodejs on Debian/Ubuntu-family operating systems due to // conflict with another package containing a binary named node targetExecutable = findExecutable(QStringList() - << QLatin1String("nodejs") - << QLatin1String("node")); + << QStringLiteral("nodejs") + << QStringLiteral("node")); targetArguments.prepend(targetBin); } @@ -434,7 +434,7 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg } QProcessEnvironment env = d->environment; - env.insert(QLatin1String("QBS_RUN_FILE_PATH"), targetBin); + env.insert(QStringLiteral("QBS_RUN_FILE_PATH"), targetBin); EnvironmentScriptRunner(d->resolvedProduct.get(), &d->evalContext, env) .setupForRun(d->setupRunEnvConfig); diff --git a/src/lib/corelib/buildgraph/artifact.h b/src/lib/corelib/buildgraph/artifact.h index 4d2a20086..32527caf3 100644 --- a/src/lib/corelib/buildgraph/artifact.h +++ b/src/lib/corelib/buildgraph/artifact.h @@ -130,7 +130,7 @@ private: template<> inline QString Set::toString(Artifact * const &artifact) const { - return artifact ? artifact->filePath() : QLatin1String(""); + return artifact ? artifact->filePath() : QStringLiteral(""); } template<> inline const void *uniqueAddress(const Artifact *a) { @@ -147,12 +147,12 @@ inline QString toString(Artifact::ArtifactType t) { switch (t) { case Artifact::SourceFile: - return QLatin1String("SourceFile"); + return QStringLiteral("SourceFile"); case Artifact::Generated: - return QLatin1String("Generated"); + return QStringLiteral("Generated"); case Artifact::Unknown: default: - return QLatin1String("Unknown"); + return QStringLiteral("Unknown"); } } @@ -161,15 +161,15 @@ inline QString toString(BuildGraphNode::BuildState s) { switch (s) { case BuildGraphNode::Untouched: - return QLatin1String("Untouched"); + return QStringLiteral("Untouched"); case BuildGraphNode::Buildable: - return QLatin1String("Buildable"); + return QStringLiteral("Buildable"); case BuildGraphNode::Building: - return QLatin1String("Building"); + return QStringLiteral("Building"); case BuildGraphNode::Built: - return QLatin1String("Built"); + return QStringLiteral("Built"); default: - return QLatin1String("Unknown"); + return QStringLiteral("Unknown"); } } diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index e28662434..e3afb7216 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -473,7 +473,7 @@ void connect(BuildGraphNode *p, BuildGraphNode *c) const bool filePathsMustBeDifferent = child->artifactType == Artifact::Generated || child->product == ac->product || child->artifactType != ac->artifactType; if (filePathsMustBeDifferent && child->filePath() == ac->filePath()) { - throw ErrorInfo(QString::fromLatin1("%1 already has a child artifact %2 as " + throw ErrorInfo(QStringLiteral("%1 already has a child artifact %2 as " "different object.").arg(p->toString(), ac->filePath()), CodeLocation(), true); @@ -554,7 +554,7 @@ void removeGeneratedArtifactFromDisk(const QString &filePath, const Logger &logg return; logger.qbsDebug() << "removing " << filePath; if (!file.remove()) - logger.qbsWarning() << QString::fromLatin1("Cannot remove '%1'.").arg(filePath); + logger.qbsWarning() << QStringLiteral("Cannot remove '%1'.").arg(filePath); } QString relativeArtifactFileName(const Artifact *artifact) @@ -808,7 +808,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, && (other->artifactType != Artifact::SourceFile || a->artifactType != Artifact::SourceFile || other->product == a->product)) { - throw ErrorInfo(QString::fromLatin1("There is more than one artifact for " + throw ErrorInfo(QStringLiteral("There is more than one artifact for " "file '%1' in the child list for output '%2'.") .arg(a->filePath(), output->filePath()), CodeLocation(), true); } diff --git a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp index da3be8755..b3cc6c840 100644 --- a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp +++ b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp @@ -103,7 +103,7 @@ void EmptyDirectoriesRemover::removeDirIfEmpty() return; dir.cdUp(); if (!dir.rmdir(fi.fileName())) { - m_logger.qbsWarning() << QString::fromLatin1("Cannot remove empty directory '%1'.") + m_logger.qbsWarning() << QStringLiteral("Cannot remove empty directory '%1'.") .arg(dirPath); return; } diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index b3f7e1f2a..8f71e1ea3 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -769,7 +769,7 @@ void Executor::addExecutorJobs() for (int i = 1; i <= m_buildOptions.maxJobCount(); i++) { const auto job = new ExecutorJob(m_logger, this); job->setMainThreadScriptEngine(m_evalContext->engine()); - job->setObjectName(QString::fromLatin1("J%1").arg(i)); + job->setObjectName(QStringLiteral("J%1").arg(i)); job->setDryRun(m_buildOptions.dryRun()); job->setEchoMode(m_buildOptions.echoMode()); m_availableJobs.push_back(job); diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp index 8e5af3266..eee418dc0 100644 --- a/src/lib/corelib/buildgraph/productinstaller.cpp +++ b/src/lib/corelib/buildgraph/productinstaller.cpp @@ -178,7 +178,7 @@ void ProductInstaller::removeInstallRoot() m_logger.qbsInfo() << Tr::tr("Would remove install root '%1'.").arg(nativeInstallRoot); return; } - m_logger.qbsDebug() << QString::fromLatin1("Removing install root '%1'.") + m_logger.qbsDebug() << QStringLiteral("Removing install root '%1'.") .arg(nativeInstallRoot); QString errorMessage; @@ -207,7 +207,7 @@ void ProductInstaller::copyFile(const Artifact *artifact) .arg(nativeFilePath, nativeTargetDir); return; } - m_logger.qbsDebug() << QString::fromLatin1("Copying file '%1' into target directory '%2'.") + m_logger.qbsDebug() << QStringLiteral("Copying file '%1' into target directory '%2'.") .arg(nativeFilePath, nativeTargetDir); if (!QDir::root().mkpath(targetDir)) { diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 777ec4b9e..7ff64a9ef 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -278,7 +278,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p for (const auto &binding : ra->bindings) { scriptValue = engine()->evaluate(binding.code); if (Q_UNLIKELY(engine()->hasErrorOrException(scriptValue))) { - QString msg = QLatin1String("evaluating rule binding '%1': %2"); + QString msg = QStringLiteral("evaluating rule binding '%1': %2"); throw ErrorInfo(msg.arg(binding.name.join(QLatin1Char('.')), engine()->lastErrorString(scriptValue)), engine()->lastErrorLocation(scriptValue, binding.location)); @@ -443,13 +443,13 @@ RulesApplicator::OutputArtifactInfo RulesApplicator::createOutputArtifact(const + QLatin1String("] -> [") + outputArtifact->fileTags().toStringList() .join(QLatin1String(", ")) + QLatin1Char(']'); - e += QString::fromLatin1(" while trying to apply: %1:%2:%3 %4\n") + e += QStringLiteral(" while trying to apply: %1:%2:%3 %4\n") .arg(m_rule->prepareScript.location().filePath()) .arg(m_rule->prepareScript.location().line()) .arg(m_rule->prepareScript.location().column()) .arg(str); - e += QString::fromLatin1(" was already defined in: %1:%2:%3 %4\n") + e += QStringLiteral(" was already defined in: %1:%2:%3 %4\n") .arg(transformer->rule->prepareScript.location().filePath()) .arg(transformer->rule->prepareScript.location().line()) .arg(transformer->rule->prepareScript.location().column()) @@ -518,7 +518,7 @@ QList RulesApplicator::runOutputArtifactsScript(const ArtifactSet &i m_rule->outputArtifactsScript.location().filePath(), m_rule->outputArtifactsScript.location().line()); if (!fun.isFunction()) - throw ErrorInfo(QLatin1String("Function expected."), + throw ErrorInfo(QStringLiteral("Function expected."), m_rule->outputArtifactsScript.location()); QScriptValue res = fun.call(QScriptValue(), args); engine()->releaseResourcesOfScriptObjects(); diff --git a/src/lib/corelib/generators/generatordata.cpp b/src/lib/corelib/generators/generatordata.cpp index 14f0a9f5f..7c6573484 100644 --- a/src/lib/corelib/generators/generatordata.cpp +++ b/src/lib/corelib/generators/generatordata.cpp @@ -48,7 +48,7 @@ namespace qbs { QString GeneratableProductData::name() const { return uniqueValue(&ProductData::name, - QLatin1String("Products with different names per configuration are not " + QStringLiteral("Products with different names per configuration are not " "compatible with this generator. " "Consider using the targetName property instead.")); } @@ -56,34 +56,34 @@ QString GeneratableProductData::name() const CodeLocation GeneratableProductData::location() const { return uniqueValue(&ProductData::location, - QLatin1String("GeneratableProductData::location: internal bug; this should not happen.")); + QStringLiteral("GeneratableProductData::location: internal bug; this should not happen.")); } QStringList GeneratableProductData::dependencies() const { return uniqueValue(&ProductData::dependencies, - QLatin1String("Products with different dependency lists per configuration are not " + QStringLiteral("Products with different dependency lists per configuration are not " "compatible with this generator.")); } QStringList GeneratableProductData::type() const { return uniqueValue(&ProductData::type, - QLatin1String("Products with different types per configuration are not " + QStringLiteral("Products with different types per configuration are not " "compatible with this generator.")); } QString GeneratableProductData::buildDirectory() const { return uniqueValue(&ProductData::buildDirectory, - QLatin1String("GeneratableProductData::buildDirectory: " + QStringLiteral("GeneratableProductData::buildDirectory: " "internal bug; this should not happen.")); } QString GeneratableProjectData::name() const { return uniqueValue(&ProjectData::name, - QLatin1String("Projects with different names per configuration are not " + QStringLiteral("Projects with different names per configuration are not " "compatible with this generator.")); } @@ -96,7 +96,7 @@ CodeLocation GeneratableProjectData::location() const CodeLocation oldLocation = location; location = it.value().location(); if (oldLocation.isValid() && oldLocation != location) - throw ErrorInfo(QLatin1String("Projects with different code locations " + throw ErrorInfo(QStringLiteral("Projects with different code locations " "per configuration are not compatible with this " "generator.")); } diff --git a/src/lib/corelib/jsextensions/binaryfile.cpp b/src/lib/corelib/jsextensions/binaryfile.cpp index a2c095dcb..f91274317 100644 --- a/src/lib/corelib/jsextensions/binaryfile.cpp +++ b/src/lib/corelib/jsextensions/binaryfile.cpp @@ -114,7 +114,7 @@ QScriptValue BinaryFile::ctor(QScriptContext *context, QScriptEngine *engine) const DubiousContextList dubiousContexts { DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }; - se->checkContext(QLatin1String("qbs.BinaryFile"), dubiousContexts); + se->checkContext(QStringLiteral("qbs.BinaryFile"), dubiousContexts); se->setUsesIo(); return engine->newQObject(t, QScriptEngine::QtOwnership); @@ -268,7 +268,7 @@ void initializeJsExtensionBinaryFile(QScriptValue extensionObject) QScriptEngine *engine = extensionObject.engine(); const QScriptValue obj = engine->newQMetaObject(&BinaryFile::staticMetaObject, engine->newFunction(&BinaryFile::ctor)); - extensionObject.setProperty(QLatin1String("BinaryFile"), obj); + extensionObject.setProperty(QStringLiteral("BinaryFile"), obj); } Q_DECLARE_METATYPE(qbs::Internal::BinaryFile *) diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp index dc84fbdaf..c6c34b3d3 100644 --- a/src/lib/corelib/jsextensions/domxml.cpp +++ b/src/lib/corelib/jsextensions/domxml.cpp @@ -131,7 +131,7 @@ QScriptValue XmlDomDocument::ctor(QScriptContext *context, QScriptEngine *engine xml = new XmlDomDocument(context, context->argument(0).toString()); break; default: - return context->throwError(QLatin1String("DomXml(QString file = QLatin1String(\"\"))")); + return context->throwError(QStringLiteral("DomXml(QString file = QLatin1String(\"\"))")); } QScriptValue obj = engine->newQObject(xml, QScriptEngine::ScriptOwnership); static_cast(engine)->setUsesIo(); @@ -172,7 +172,7 @@ void XmlDomDocument::save(const QString &filePath, int indent) { QFile f(filePath); if (!f.open(QIODevice::WriteOnly)) { - context()->throwError(QString::fromLatin1("unable to open '%1'") + context()->throwError(QStringLiteral("unable to open '%1'") .arg(filePath)); return; } @@ -194,7 +194,7 @@ void XmlDomDocument::load(const QString &filePath) { QFile f(filePath); if (!f.open(QIODevice::ReadOnly)) { - context()->throwError(QString::fromLatin1("unable to open '%1'") + context()->throwError(QStringLiteral("unable to open '%1'") .arg(filePath)); return; } @@ -237,7 +237,7 @@ QString XmlDomNode::attribute(const QString &name, const QString &defValue) { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return defValue; } return el.attribute(name, defValue); @@ -247,7 +247,7 @@ void XmlDomNode::setAttribute(const QString &name, const QString &value) { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return; } el.setAttribute(name, value); @@ -257,7 +257,7 @@ bool XmlDomNode::hasAttribute(const QString &name) const { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return false; } return el.hasAttribute(name); @@ -267,7 +267,7 @@ QString XmlDomNode::tagName() const { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return QString(); } return el.tagName(); @@ -277,7 +277,7 @@ void XmlDomNode::setTagName(const QString &name) { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return; } el.setTagName(name); @@ -287,7 +287,7 @@ QString XmlDomNode::text() const { QDomElement el = m_domNode.toElement(); if (el.isNull()) { - context()->throwError(QString::fromLatin1("Node '%1' is not an element node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName())); return QString(); } return el.text(); @@ -301,7 +301,7 @@ QString XmlDomNode::data() const return m_domNode.toCDATASection().data(); if (m_domNode.isCharacterData()) return m_domNode.toCharacterData().data(); - context()->throwError(QString::fromLatin1("Node '%1' is not a character data node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not a character data node").arg(m_domNode.nodeName())); return QString(); } @@ -313,7 +313,7 @@ void XmlDomNode::setData(const QString &v) const return m_domNode.toCDATASection().setData(v); if (m_domNode.isCharacterData()) return m_domNode.toCharacterData().setData(v); - context()->throwError(QString::fromLatin1("Node '%1' is not a character data node").arg(m_domNode.nodeName())); + context()->throwError(QStringLiteral("Node '%1' is not a character data node").arg(m_domNode.nodeName())); return; } @@ -369,7 +369,7 @@ QScriptValue XmlDomNode::appendChild(QScriptValue newChild) { auto newNode = qobject_cast(newChild.toQObject()); if (!newNode) { - context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("First argument is not a XmlDomNode object")); return QScriptValue(); } return engine()->newQObject(new XmlDomNode(m_domNode.appendChild(newNode->m_domNode)), QScriptEngine::ScriptOwnership); @@ -379,13 +379,13 @@ QScriptValue XmlDomNode::insertBefore(const QScriptValue &newChild, const QScrip { auto newNode = qobject_cast(newChild.toQObject()); if (!newNode) { - context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("First argument is not a XmlDomNode object")); return QScriptValue(); } auto refNode = qobject_cast(refChild.toQObject()); if (!refNode) { - context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object")); return QScriptValue(); } @@ -396,13 +396,13 @@ QScriptValue XmlDomNode::insertAfter(const QScriptValue &newChild, const QScript { auto newNode = qobject_cast(newChild.toQObject()); if (!newNode) { - context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("First argument is not a XmlDomNode object")); return QScriptValue(); } auto refNode = qobject_cast(refChild.toQObject()); if (!refNode) { - context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object")); return QScriptValue(); } @@ -413,13 +413,13 @@ QScriptValue XmlDomNode::replaceChild(const QScriptValue &newChild, const QScrip { auto newNode = qobject_cast(newChild.toQObject()); if (!newNode) { - context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("First argument is not a XmlDomNode object")); return QScriptValue(); } auto oldNode = qobject_cast(oldChild.toQObject()); if (!oldNode) { - context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object")); return QScriptValue(); } @@ -430,7 +430,7 @@ QScriptValue XmlDomNode::removeChild(const QScriptValue &oldChild) { auto oldNode = qobject_cast(oldChild.toQObject()); if (!oldNode) { - context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); + context()->throwError(QStringLiteral("First argument is not a XmlDomNode object")); return QScriptValue(); } @@ -454,10 +454,10 @@ void initializeJsExtensionXml(QScriptValue extensionObject) QScriptValue nodeObj = engine->newQMetaObject(&XmlDomNode::staticMetaObject, engine->newFunction(&XmlDomNode::ctor)); QScriptValue contextObject = engine->newObject(); - contextObject.setProperty(QLatin1String("DomDocument"), docObj); - contextObject.setProperty(QLatin1String("DomElement"), nodeObj); + contextObject.setProperty(QStringLiteral("DomDocument"), docObj); + contextObject.setProperty(QStringLiteral("DomElement"), nodeObj); - extensionObject.setProperty(QLatin1String("Xml"), contextObject); + extensionObject.setProperty(QStringLiteral("Xml"), contextObject); } Q_DECLARE_METATYPE(qbs::Internal::XmlDomDocument *) diff --git a/src/lib/corelib/jsextensions/file.cpp b/src/lib/corelib/jsextensions/file.cpp index 2905b7bed..7cd2aadb8 100644 --- a/src/lib/corelib/jsextensions/file.cpp +++ b/src/lib/corelib/jsextensions/file.cpp @@ -114,7 +114,7 @@ QScriptValue File::js_copy(QScriptContext *context, QScriptEngine *engine) DubiousContext(EvalContext::PropertyEvaluation), DubiousContext(EvalContext::RuleExecution, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("File.copy()"), dubiousContexts); + se->checkContext(QStringLiteral("File.copy()"), dubiousContexts); const QString sourceFile = context->argument(0).toString(); const QString targetFile = context->argument(1).toString(); @@ -150,7 +150,7 @@ QScriptValue File::js_directoryEntries(QScriptContext *context, QScriptEngine *e const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("File.directoryEntries()"), dubiousContexts); + se->checkContext(QStringLiteral("File.directoryEntries()"), dubiousContexts); const QString path = context->argument(0).toString(); const auto filters = static_cast(context->argument(1).toUInt32()); @@ -170,7 +170,7 @@ QScriptValue File::js_remove(QScriptContext *context, QScriptEngine *engine) const auto se = static_cast(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); - se->checkContext(QLatin1String("File.remove()"), dubiousContexts); + se->checkContext(QStringLiteral("File.remove()"), dubiousContexts); QString fileName = context->argument(0).toString(); @@ -204,7 +204,7 @@ QScriptValue File::js_makePath(QScriptContext *context, QScriptEngine *engine) const auto se = static_cast(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); - se->checkContext(QLatin1String("File.makePath()"), dubiousContexts); + se->checkContext(QStringLiteral("File.makePath()"), dubiousContexts); return QDir::root().mkpath(context->argument(0).toString()); } @@ -219,36 +219,36 @@ QScriptValue File::js_move(QScriptContext *context, QScriptEngine *engine) const auto se = static_cast(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); - se->checkContext(QLatin1String("File.move()"), dubiousContexts); + se->checkContext(QStringLiteral("File.move()"), dubiousContexts); const QString sourceFile = context->argument(0).toString(); const QString targetFile = context->argument(1).toString(); const bool overwrite = context->argumentCount() > 2 ? context->argument(2).toBool() : true; if (Q_UNLIKELY(QFileInfo(sourceFile).isDir())) - return context->throwError(QString(QLatin1String("Could not move '%1' to '%2': " - "Source file path is a directory.")) + return context->throwError(QStringLiteral("Could not move '%1' to '%2': " + "Source file path is a directory.") .arg(sourceFile, targetFile)); if (Q_UNLIKELY(QFileInfo(targetFile).isDir())) { - return context->throwError(QString(QLatin1String("Could not move '%1' to '%2': " - "Destination file path is a directory.")) + return context->throwError(QStringLiteral("Could not move '%1' to '%2': " + "Destination file path is a directory.") .arg(sourceFile, targetFile)); } QFile f(targetFile); if (overwrite && f.exists() && !f.remove()) - return context->throwError(QString(QLatin1String("Could not move '%1' to '%2': %3")) + return context->throwError(QStringLiteral("Could not move '%1' to '%2': %3") .arg(sourceFile, targetFile, f.errorString())); if (QFile::exists(targetFile)) - return context->throwError(QString(QLatin1String("Could not move '%1' to '%2': " - "Destination file exists.")) + return context->throwError(QStringLiteral("Could not move '%1' to '%2': " + "Destination file exists.") .arg(sourceFile, targetFile)); QFile f2(sourceFile); if (Q_UNLIKELY(!f2.rename(targetFile))) - return context->throwError(QString(QLatin1String("Could not move '%1' to '%2': %3")) + return context->throwError(QStringLiteral("Could not move '%1' to '%2': %3") .arg(sourceFile, targetFile, f2.errorString())); return true; } @@ -272,17 +272,17 @@ void initializeJsExtensionFile(QScriptValue extensionObject) QScriptEngine *engine = extensionObject.engine(); QScriptValue fileObj = engine->newQMetaObject(&File::staticMetaObject, engine->newFunction(&File::js_ctor)); - fileObj.setProperty(QLatin1String("copy"), engine->newFunction(File::js_copy)); - fileObj.setProperty(QLatin1String("exists"), engine->newFunction(File::js_exists)); - fileObj.setProperty(QLatin1String("directoryEntries"), + fileObj.setProperty(QStringLiteral("copy"), engine->newFunction(File::js_copy)); + fileObj.setProperty(QStringLiteral("exists"), engine->newFunction(File::js_exists)); + fileObj.setProperty(QStringLiteral("directoryEntries"), engine->newFunction(File::js_directoryEntries)); - fileObj.setProperty(QLatin1String("lastModified"), engine->newFunction(File::js_lastModified)); - fileObj.setProperty(QLatin1String("makePath"), engine->newFunction(File::js_makePath)); - fileObj.setProperty(QLatin1String("move"), engine->newFunction(File::js_move)); - fileObj.setProperty(QLatin1String("remove"), engine->newFunction(File::js_remove)); - fileObj.setProperty(QLatin1String("canonicalFilePath"), + fileObj.setProperty(QStringLiteral("lastModified"), engine->newFunction(File::js_lastModified)); + fileObj.setProperty(QStringLiteral("makePath"), engine->newFunction(File::js_makePath)); + fileObj.setProperty(QStringLiteral("move"), engine->newFunction(File::js_move)); + fileObj.setProperty(QStringLiteral("remove"), engine->newFunction(File::js_remove)); + fileObj.setProperty(QStringLiteral("canonicalFilePath"), engine->newFunction(File::js_canonicalFilePath)); - extensionObject.setProperty(QLatin1String("File"), fileObj); + extensionObject.setProperty(QStringLiteral("File"), fileObj); } Q_DECLARE_METATYPE(qbs::Internal::File *) diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp index 5b30ec35f..0f2570ed0 100644 --- a/src/lib/corelib/jsextensions/fileinfoextension.cpp +++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp @@ -288,33 +288,33 @@ void initializeJsExtensionFileInfo(QScriptValue extensionObject) engine->newFunction(FileInfoExtension::js_fileName)); fileInfoObj.setProperty(StringConstants::baseNameProperty(), engine->newFunction(FileInfoExtension::js_baseName)); - fileInfoObj.setProperty(QLatin1String("suffix"), + fileInfoObj.setProperty(QStringLiteral("suffix"), engine->newFunction(FileInfoExtension::js_suffix)); - fileInfoObj.setProperty(QLatin1String("completeSuffix"), + fileInfoObj.setProperty(QStringLiteral("completeSuffix"), engine->newFunction(FileInfoExtension::js_completeSuffix)); - fileInfoObj.setProperty(QLatin1String("canonicalPath"), + fileInfoObj.setProperty(QStringLiteral("canonicalPath"), engine->newFunction(FileInfoExtension::js_canonicalPath)); - fileInfoObj.setProperty(QLatin1String("cleanPath"), + fileInfoObj.setProperty(QStringLiteral("cleanPath"), engine->newFunction(FileInfoExtension::js_cleanPath)); fileInfoObj.setProperty(StringConstants::completeBaseNameProperty(), engine->newFunction(FileInfoExtension::js_completeBaseName)); - fileInfoObj.setProperty(QLatin1String("relativePath"), + fileInfoObj.setProperty(QStringLiteral("relativePath"), engine->newFunction(FileInfoExtension::js_relativePath)); - fileInfoObj.setProperty(QLatin1String("resolvePath"), + fileInfoObj.setProperty(QStringLiteral("resolvePath"), engine->newFunction(FileInfoExtension::js_resolvePath)); - fileInfoObj.setProperty(QLatin1String("isAbsolutePath"), + fileInfoObj.setProperty(QStringLiteral("isAbsolutePath"), engine->newFunction(FileInfoExtension::js_isAbsolutePath)); - fileInfoObj.setProperty(QLatin1String("toWindowsSeparators"), + fileInfoObj.setProperty(QStringLiteral("toWindowsSeparators"), engine->newFunction(FileInfoExtension::js_toWindowsSeparators)); - fileInfoObj.setProperty(QLatin1String("fromWindowsSeparators"), + fileInfoObj.setProperty(QStringLiteral("fromWindowsSeparators"), engine->newFunction(FileInfoExtension::js_fromWindowsSeparators)); - fileInfoObj.setProperty(QLatin1String("toNativeSeparators"), + fileInfoObj.setProperty(QStringLiteral("toNativeSeparators"), engine->newFunction(FileInfoExtension::js_toNativeSeparators)); - fileInfoObj.setProperty(QLatin1String("fromNativeSeparators"), + fileInfoObj.setProperty(QStringLiteral("fromNativeSeparators"), engine->newFunction(FileInfoExtension::js_fromNativeSeparators)); - fileInfoObj.setProperty(QLatin1String("joinPaths"), + fileInfoObj.setProperty(QStringLiteral("joinPaths"), engine->newFunction(FileInfoExtension::js_joinPaths)); - extensionObject.setProperty(QLatin1String("FileInfo"), fileInfoObj); + extensionObject.setProperty(QStringLiteral("FileInfo"), fileInfoObj); } Q_DECLARE_METATYPE(qbs::Internal::FileInfoExtension *) diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index 4deed3fd1..4634d1ff6 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -185,9 +185,9 @@ private: QScriptValue m_result; }; -static QString ptrKey() { return QLatin1String("__internalPtr"); } -static QString typeKey() { return QLatin1String("__type"); } -static QString artifactType() { return QLatin1String("artifact"); } +static QString ptrKey() { return QStringLiteral("__internalPtr"); } +static QString typeKey() { return QStringLiteral("__type"); } +static QString artifactType() { return QStringLiteral("artifact"); } static QScriptValue js_moduleDependencies(QScriptContext *, ScriptEngine *engine, const ResolvedModule *module) @@ -280,7 +280,7 @@ void ModuleProperties::init(QScriptValue objectWithProperties, const void *ptr, const QString &type) { QScriptEngine * const engine = objectWithProperties.engine(); - objectWithProperties.setProperty(QLatin1String("moduleProperty"), + objectWithProperties.setProperty(QStringLiteral("moduleProperty"), engine->newFunction(ModuleProperties::js_moduleProperty, 2)); objectWithProperties.setProperty(ptrKey(), engine->toScriptValue(quintptr(ptr))); objectWithProperties.setProperty(typeKey(), type); @@ -324,12 +324,12 @@ QScriptValue ModuleProperties::moduleProperty(QScriptContext *context, QScriptEn const QScriptValue typeScriptValue = objectWithProperties.property(typeKey()); if (Q_UNLIKELY(!typeScriptValue.isString())) { return context->throwError(QScriptContext::TypeError, - QLatin1String("Internal error: __type not set up")); + QStringLiteral("Internal error: __type not set up")); } const QScriptValue ptrScriptValue = objectWithProperties.property(ptrKey()); if (Q_UNLIKELY(!ptrScriptValue.isNumber())) { return context->throwError(QScriptContext::TypeError, - QLatin1String("Internal error: __internalPtr not set up")); + QStringLiteral("Internal error: __internalPtr not set up")); } const void *ptr = reinterpret_cast(qscriptvalue_cast(ptrScriptValue)); @@ -342,7 +342,7 @@ QScriptValue ModuleProperties::moduleProperty(QScriptContext *context, QScriptEn product = artifact->product.get(); } else { return context->throwError(QScriptContext::TypeError, - QLatin1String("Internal error: invalid type")); + QStringLiteral("Internal error: invalid type")); } const auto qbsEngine = static_cast(engine); diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp index d1bb8bafc..5148f9468 100644 --- a/src/lib/corelib/jsextensions/process.cpp +++ b/src/lib/corelib/jsextensions/process.cpp @@ -114,7 +114,7 @@ QScriptValue Process::ctor(QScriptContext *context, QScriptEngine *engine) t = new Process(context); break; default: - return context->throwError(QLatin1String("Process()")); + return context->throwError(QStringLiteral("Process()")); } const auto se = static_cast(engine); @@ -122,7 +122,7 @@ QScriptValue Process::ctor(QScriptContext *context, QScriptEngine *engine) const DubiousContextList dubiousContexts ({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("qbs.Process"), dubiousContexts); + se->checkContext(QStringLiteral("qbs.Process"), dubiousContexts); QScriptValue obj = engine->newQObject(t, QScriptEngine::QtOwnership); @@ -325,7 +325,7 @@ QScriptValue Process::js_shellQuote(QScriptContext *context, QScriptEngine *engi { if (Q_UNLIKELY(context->argumentCount() < 2)) { return context->throwError(QScriptContext::SyntaxError, - QLatin1String("shellQuote expects at least 2 arguments")); + QStringLiteral("shellQuote expects at least 2 arguments")); } const QString program = context->argument(0).toString(); const QStringList args = context->argument(1).toVariant().toStringList(); @@ -345,7 +345,7 @@ void initializeJsExtensionProcess(QScriptValue extensionObject) using namespace qbs::Internal; QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&Process::staticMetaObject, engine->newFunction(&Process::ctor)); - extensionObject.setProperty(QLatin1String("Process"), obj); + extensionObject.setProperty(QStringLiteral("Process"), obj); obj.setProperty(QStringLiteral("shellQuote"), engine->newFunction(Process::js_shellQuote, 3)); } diff --git a/src/lib/corelib/jsextensions/propertylist.cpp b/src/lib/corelib/jsextensions/propertylist.cpp index 520729cf6..197d5e99e 100644 --- a/src/lib/corelib/jsextensions/propertylist.cpp +++ b/src/lib/corelib/jsextensions/propertylist.cpp @@ -44,5 +44,5 @@ void initializeJsExtensionPropertyList(QScriptValue extensionObject) { QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newObject(); // provide a fake object - extensionObject.setProperty(QLatin1String("PropertyList"), obj); + extensionObject.setProperty(QStringLiteral("PropertyList"), obj); } diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm index 75154d252..eed1fec9b 100644 --- a/src/lib/corelib/jsextensions/propertylist.mm +++ b/src/lib/corelib/jsextensions/propertylist.mm @@ -105,7 +105,7 @@ QScriptValue PropertyList::ctor(QScriptContext *context, QScriptEngine *engine) const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("qbs.PropertyList"), dubiousContexts); + se->checkContext(QStringLiteral("qbs.PropertyList"), dubiousContexts); auto p = new PropertyList(context); QScriptValue obj = engine->newQObject(p, QScriptEngine::ScriptOwnership); @@ -204,13 +204,13 @@ QScriptValue PropertyList::format() const switch (p->d->propertyListFormat) { case QPropertyListOpenStepFormat: - return QLatin1String("openstep"); + return QStringLiteral("openstep"); case QPropertyListXMLFormat_v1_0: - return QLatin1String("xml1"); + return QStringLiteral("xml1"); case QPropertyListBinaryFormat_v1_0: - return QLatin1String("binary1"); + return QStringLiteral("binary1"); case QPropertyListJSONFormat: - return QLatin1String("json"); + return QStringLiteral("json"); default: return p->engine()->undefinedValue(); } @@ -229,7 +229,7 @@ QString PropertyList::toString(const QString &plistFormat) const auto p = qscriptvalue_cast(thisObject()); if (plistFormat == QLatin1String("binary1")) { - p->context()->throwError(QLatin1String("Property list object cannot be converted to a " + p->context()->throwError(QStringLiteral("Property list object cannot be converted to a " "string in the binary1 format; this format can only " "be written directly to a file")); return QString(); @@ -243,7 +243,7 @@ QString PropertyList::toString(const QString &plistFormat) const QString PropertyList::toXMLString() const { - return toString(QLatin1String("xml1")); + return toString(QStringLiteral("xml1")); } QString PropertyList::toJSON(const QString &style) const @@ -294,7 +294,7 @@ void PropertyListPrivate::readFromData(QScriptContext *context, QByteArray data) propertyListObject = obj; propertyListFormat = internalFormat; } else { - context->throwError(QLatin1String("error converting property list")); + context->throwError(QStringLiteral("error converting property list")); } } } @@ -309,7 +309,7 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri id obj = QPropertyListUtils::toPropertyList(propertyListObject); if (!obj) { - context->throwError(QLatin1String("error converting property list")); + context->throwError(QStringLiteral("error converting property list")); return QByteArray(); } @@ -365,7 +365,7 @@ void initializeJsExtensionPropertyList(QScriptValue extensionObject) QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&PropertyList::staticMetaObject, engine->newFunction(&PropertyList::ctor)); - extensionObject.setProperty(QLatin1String("PropertyList"), obj); + extensionObject.setProperty(QStringLiteral("PropertyList"), obj); } Q_DECLARE_METATYPE(qbs::Internal::PropertyList *) diff --git a/src/lib/corelib/jsextensions/temporarydir.cpp b/src/lib/corelib/jsextensions/temporarydir.cpp index 5ff8bc356..470d21d20 100644 --- a/src/lib/corelib/jsextensions/temporarydir.cpp +++ b/src/lib/corelib/jsextensions/temporarydir.cpp @@ -79,7 +79,7 @@ QScriptValue TemporaryDir::ctor(QScriptContext *context, QScriptEngine *engine) const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("qbs.TemporaryDir"), dubiousContexts); + se->checkContext(QStringLiteral("qbs.TemporaryDir"), dubiousContexts); const auto t = new TemporaryDir(context); QScriptValue obj = engine->newQObject(t, QScriptEngine::ScriptOwnership); @@ -116,7 +116,7 @@ void initializeJsExtensionTemporaryDir(QScriptValue extensionObject) QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&TemporaryDir::staticMetaObject, engine->newFunction(&TemporaryDir::ctor)); - extensionObject.setProperty(QLatin1String("TemporaryDir"), obj); + extensionObject.setProperty(QStringLiteral("TemporaryDir"), obj); } #include "temporarydir.moc" diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp index 0ba3c80ef..e4e65531b 100644 --- a/src/lib/corelib/jsextensions/textfile.cpp +++ b/src/lib/corelib/jsextensions/textfile.cpp @@ -124,7 +124,7 @@ QScriptValue TextFile::ctor(QScriptContext *context, QScriptEngine *engine) const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); - se->checkContext(QLatin1String("qbs.TextFile"), dubiousContexts); + se->checkContext(QStringLiteral("qbs.TextFile"), dubiousContexts); se->setUsesIo(); return engine->newQObject(t, QScriptEngine::QtOwnership); @@ -255,7 +255,7 @@ void initializeJsExtensionTextFile(QScriptValue extensionObject) QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&TextFile::staticMetaObject, engine->newFunction(&TextFile::ctor)); - extensionObject.setProperty(QLatin1String("TextFile"), obj); + extensionObject.setProperty(QStringLiteral("TextFile"), obj); } Q_DECLARE_METATYPE(qbs::Internal::TextFile *) diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index 4cbe6ed2f..0c5313e3c 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -336,7 +336,7 @@ QScriptValue UtilitiesExtension::js_getHash(QScriptContext *context, QScriptEngi { if (Q_UNLIKELY(context->argumentCount() < 1)) { return context->throwError(QScriptContext::SyntaxError, - QLatin1String("getHash expects 1 argument")); + QStringLiteral("getHash expects 1 argument")); } const QByteArray input = context->argument(0).toString().toLatin1(); const QByteArray hash @@ -348,7 +348,7 @@ QScriptValue UtilitiesExtension::js_getNativeSetting(QScriptContext *context, QS { if (Q_UNLIKELY(context->argumentCount() < 1 || context->argumentCount() > 3)) { return context->throwError(QScriptContext::SyntaxError, - QLatin1String("getNativeSetting expects between 1 and 3 arguments")); + QStringLiteral("getNativeSetting expects between 1 and 3 arguments")); } QString key = context->argumentCount() > 1 ? context->argument(1).toString() : QString(); @@ -375,7 +375,7 @@ QScriptValue UtilitiesExtension::js_nativeSettingGroups(QScriptContext *context, { if (Q_UNLIKELY(context->argumentCount() != 1)) { return context->throwError(QScriptContext::SyntaxError, - QLatin1String("nativeSettingGroups expects 1 argument")); + QStringLiteral("nativeSettingGroups expects 1 argument")); } QSettings settings(context->argument(0).toString(), QSettings::NativeFormat); @@ -387,7 +387,7 @@ QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context, { if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("rfc1034Identifier expects 1 argument")); + QStringLiteral("rfc1034Identifier expects 1 argument")); const QString identifier = context->argument(0).toString(); return engine->toScriptValue(HostOsInfo::rfc1034Identifier(identifier)); } @@ -408,11 +408,11 @@ QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context, #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, - QLatin1String("smimeMessageContent is not available on this platform")); + QStringLiteral("smimeMessageContent is not available on this platform")); #else if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("smimeMessageContent expects 1 argument")); + QStringLiteral("smimeMessageContent expects 1 argument")); const QString filePath = context->argument(0).toString(); QFile file(filePath); @@ -432,11 +432,11 @@ QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context, #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, - QLatin1String("certificateInfo is not available on this platform")); + QStringLiteral("certificateInfo is not available on this platform")); #else if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("certificateInfo expects 1 argument")); + QStringLiteral("certificateInfo expects 1 argument")); return engine->toScriptValue(certificateInfo(context->argument(0).toVariant().toByteArray())); #endif } @@ -448,7 +448,7 @@ QScriptValue UtilitiesExtension::js_signingIdentities(QScriptContext *context, #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, - QLatin1String("signingIdentities is not available on this platform")); + QStringLiteral("signingIdentities is not available on this platform")); #else Q_UNUSED(context); return engine->toScriptValue(identitiesProperties()); @@ -460,11 +460,11 @@ QScriptValue UtilitiesExtension::js_msvcCompilerInfo(QScriptContext *context, QS #ifndef Q_OS_WIN Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, - QLatin1String("msvcCompilerInfo is not available on this platform")); + QStringLiteral("msvcCompilerInfo is not available on this platform")); #else if (Q_UNLIKELY(context->argumentCount() < 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("msvcCompilerInfo expects at least 1 argument")); + QStringLiteral("msvcCompilerInfo expects at least 1 argument")); const QString compilerFilePath = context->argument(0).toString(); const QString compilerLanguage = context->argumentCount() > 1 diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp index 3ca0608d4..34cd497da 100644 --- a/src/lib/corelib/language/builtindeclarations.cpp +++ b/src/lib/corelib/language/builtindeclarations.cpp @@ -62,26 +62,26 @@ const char QBS_LANGUAGE_VERSION[] = "1.0"; BuiltinDeclarations::BuiltinDeclarations() : m_languageVersion(Version::fromString(QLatin1String(QBS_LANGUAGE_VERSION))) , m_typeMap(std::initializer_list>({ - { QLatin1String("Artifact"), ItemType::Artifact }, - { QLatin1String("Depends"), ItemType::Depends }, - { QLatin1String("Export"), ItemType::Export }, - { QLatin1String("FileTagger"), ItemType::FileTagger }, - { QLatin1String("Group"), ItemType::Group }, - { QLatin1String("JobLimit"), ItemType::JobLimit }, - { QLatin1String("Module"), ItemType::Module }, - { QLatin1String("ModuleProvider"), ItemType::ModuleProvider }, - { QLatin1String("Parameter"), ItemType::Parameter }, - { QLatin1String("Parameters"), ItemType::Parameters }, - { QLatin1String("Probe"), ItemType::Probe }, - { QLatin1String("Product"), ItemType::Product }, - { QLatin1String("Profile"), ItemType::Profile }, - { QLatin1String("Project"), ItemType::Project }, - { QLatin1String("Properties"), ItemType::Properties }, // Callers have to handle the SubProject case. - { QLatin1String("PropertyOptions"), ItemType::PropertyOptions }, - { QLatin1String("Rule"), ItemType::Rule }, - { QLatin1String("Scanner"), ItemType::Scanner }, - { QLatin1String("SubProject"), ItemType::SubProject }, - { QLatin1String("Transformer"), ItemType::Transformer } + { QStringLiteral("Artifact"), ItemType::Artifact }, + { QStringLiteral("Depends"), ItemType::Depends }, + { QStringLiteral("Export"), ItemType::Export }, + { QStringLiteral("FileTagger"), ItemType::FileTagger }, + { QStringLiteral("Group"), ItemType::Group }, + { QStringLiteral("JobLimit"), ItemType::JobLimit }, + { QStringLiteral("Module"), ItemType::Module }, + { QStringLiteral("ModuleProvider"), ItemType::ModuleProvider }, + { QStringLiteral("Parameter"), ItemType::Parameter }, + { QStringLiteral("Parameters"), ItemType::Parameters }, + { QStringLiteral("Probe"), ItemType::Probe }, + { QStringLiteral("Product"), ItemType::Product }, + { QStringLiteral("Profile"), ItemType::Profile }, + { QStringLiteral("Project"), ItemType::Project }, + { QStringLiteral("Properties"), ItemType::Properties }, // Callers have to handle the SubProject case. + { QStringLiteral("PropertyOptions"), ItemType::PropertyOptions }, + { QStringLiteral("Rule"), ItemType::Rule }, + { QStringLiteral("Scanner"), ItemType::Scanner }, + { QStringLiteral("SubProject"), ItemType::SubProject }, + { QStringLiteral("Transformer"), ItemType::Transformer } })) { addArtifactItem(); @@ -137,7 +137,7 @@ QString BuiltinDeclarations::nameForType(ItemType itemType) const { // Iterating is okay here, as this mapping is not used in hot code paths. if (itemType == ItemType::PropertiesInSubProject) - return QLatin1String("Properties"); + return QStringLiteral("Properties"); for (auto it = m_typeMap.constBegin(); it != m_typeMap.constEnd(); ++it) { if (it.value() == itemType) return it.key(); @@ -400,11 +400,11 @@ void BuiltinDeclarations::addProductItem() PropertyDeclaration::Boolean, StringConstants::trueValue()); PropertyDeclaration profilesDecl(StringConstants::profilesProperty(), PropertyDeclaration::StringList); - profilesDecl.setDeprecationInfo(DeprecationInfo(Version::fromString(QLatin1String("1.9.0")), + profilesDecl.setDeprecationInfo(DeprecationInfo(Version::fromString(QStringLiteral("1.9.0")), Tr::tr("Use qbs.profiles instead."))); item << profilesDecl; item << PropertyDeclaration(StringConstants::targetNameProperty(), PropertyDeclaration::String, - QLatin1String("new String(name)" + QStringLiteral("new String(name)" ".replace(/[/\\\\?%*:|\"<>]/g, '_').valueOf()")); item << buildDirProperty(); item << PropertyDeclaration(StringConstants::destinationDirProperty(), @@ -422,7 +422,7 @@ void BuiltinDeclarations::addProductItem() item << PropertyDeclaration(StringConstants::versionProperty(), PropertyDeclaration::String); item << PropertyDeclaration(StringConstants::multiplexByQbsPropertiesProperty(), - PropertyDeclaration::StringList, QLatin1String("[\"profiles\"]")); + PropertyDeclaration::StringList, QStringLiteral("[\"profiles\"]")); item << PropertyDeclaration(StringConstants::multiplexedTypeProperty(), PropertyDeclaration::StringList); item << PropertyDeclaration(StringConstants::aggregateProperty(), PropertyDeclaration::Boolean); @@ -518,7 +518,7 @@ void BuiltinDeclarations::addRuleItem() << StringConstants::projectVar() << StringConstants::productVar() << StringConstants::inputsVar() << StringConstants::inputVar()); item << outputArtifactsDecl; - PropertyDeclaration usingsDecl(QLatin1String("usings"), PropertyDeclaration::StringList); + PropertyDeclaration usingsDecl(QStringLiteral("usings"), PropertyDeclaration::StringList); usingsDecl.setDeprecationInfo(DeprecationInfo(Version(1, 5), Tr::tr("Use 'inputsFromDependencies' instead"))); item << usingsDecl; diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index 829cb7494..c0e140d0b 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -433,7 +433,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryItemProperty(const Evaluatio QString EvaluatorScriptClass::resultToString(const QScriptValue &scriptValue) { return (scriptValue.isObject() - ? QLatin1String("[Object: ") + ? QStringLiteral("[Object: ") + QString::number(scriptValue.objectId()) + QLatin1Char(']') : scriptValue.toVariant().toString()); } @@ -509,7 +509,7 @@ static void convertToPropertyType_impl(const QString &pathPropertiesBaseDir, con QString actualBaseDir; if (item && !pathPropertiesBaseDir.isEmpty()) { const VariantValueConstPtr itemSourceDir - = item->variantProperty(QLatin1String("sourceDirectory")); + = item->variantProperty(QStringLiteral("sourceDirectory")); actualBaseDir = itemSourceDir ? itemSourceDir->value().toString() : pathPropertiesBaseDir; } switch (decl.type()) { diff --git a/src/lib/corelib/language/filetags.cpp b/src/lib/corelib/language/filetags.cpp index 02beef7d6..83086b892 100644 --- a/src/lib/corelib/language/filetags.cpp +++ b/src/lib/corelib/language/filetags.cpp @@ -82,7 +82,7 @@ LogWriter operator <<(LogWriter w, const FileTags &tags) if (firstLoop) firstLoop = false; else - w.write(QLatin1String(", ")); + w.write(QStringLiteral(", ")); w.write(tag.toString()); } w.write(')'); diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp index 9ac12b0e6..39dc39370 100644 --- a/src/lib/corelib/language/item.cpp +++ b/src/lib/corelib/language/item.cpp @@ -106,12 +106,12 @@ Item *Item::clone() const QString Item::typeName() const { switch (type()) { - case ItemType::IdScope: return QLatin1String("[IdScope]"); - case ItemType::ModuleInstance: return QLatin1String("[ModuleInstance]"); - case ItemType::ModuleParameters: return QLatin1String("[ModuleParametersInstance]"); - case ItemType::ModulePrefix: return QLatin1String("[ModulePrefix]"); - case ItemType::Outer: return QLatin1String("[Outer]"); - case ItemType::Scope: return QLatin1String("[Scope]"); + case ItemType::IdScope: return QStringLiteral("[IdScope]"); + case ItemType::ModuleInstance: return QStringLiteral("[ModuleInstance]"); + case ItemType::ModuleParameters: return QStringLiteral("[ModuleParametersInstance]"); + case ItemType::ModulePrefix: return QStringLiteral("[ModulePrefix]"); + case ItemType::Outer: return QStringLiteral("[Outer]"); + case ItemType::Scope: return QStringLiteral("[Scope]"); default: return BuiltinDeclarations::instance().nameForType(type()); } } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index e6ef0eac4..abe10bf24 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -296,8 +296,8 @@ ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters ¶meters) for (const QString &key : m_parameters.overriddenValues().keys()) { static const QStringList prefixes({ StringConstants::projectPrefix(), - QLatin1String("projects"), - QLatin1String("products"), QLatin1String("modules"), + QStringLiteral("projects"), + QStringLiteral("products"), QStringLiteral("modules"), StringConstants::moduleProviders(), StringConstants::qbsModule()}); bool ok = false; @@ -673,7 +673,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, const QString minVersionStr = m_evaluator->stringValue(projectItem, StringConstants::minimumQbsVersionProperty(), - QLatin1String("1.3.0")); + QStringLiteral("1.3.0")); const Version minVersion = Version::fromString(minVersionStr); if (!minVersion.isValid()) { throw ErrorInfo(Tr::tr("The value '%1' of Project.minimumQbsVersion " @@ -809,7 +809,7 @@ ModuleLoader::MultiplexTable ModuleLoader::combine(const MultiplexTable &table, ModuleLoader::MultiplexInfo ModuleLoader::extractMultiplexInfo(Item *productItem, Item *qbsModuleItem) { - static const QString mpmKey = QLatin1String("multiplexMap"); + static const QString mpmKey = QStringLiteral("multiplexMap"); const QScriptValue multiplexMap = m_evaluator->value(qbsModuleItem, mpmKey); QStringList multiplexByQbsProperties = m_evaluator->stringListValue( @@ -1214,15 +1214,15 @@ void ModuleLoader::prepareProduct(ProjectContext *projectContext, Item *productI // and nothing else, thus providing us with the pure environment that we need to // evaluate the product's exported properties in isolation in the project resolver. Item * const importer = Item::create(productItem->pool(), ItemType::Product); - importer->setProperty(QLatin1String("name"), + importer->setProperty(QStringLiteral("name"), VariantValue::create(shadowProductPrefix() + productContext.name)); importer->setFile(productItem->file()); importer->setLocation(productItem->location()); importer->setScope(projectContext->scope); importer->setupForBuiltinType(m_logger); Item * const dependsItem = Item::create(productItem->pool(), ItemType::Depends); - dependsItem->setProperty(QLatin1String("name"), VariantValue::create(productContext.name)); - dependsItem->setProperty(QLatin1String("required"), VariantValue::create(false)); + dependsItem->setProperty(QStringLiteral("name"), VariantValue::create(productContext.name)); + dependsItem->setProperty(QStringLiteral("required"), VariantValue::create(false)); dependsItem->setFile(importer->file()); dependsItem->setLocation(importer->location()); dependsItem->setupForBuiltinType(m_logger); @@ -1418,7 +1418,7 @@ void ModuleLoader::handleProduct(ModuleLoader::ProductContext *productContext) for (auto it = exportsData.find(productContext->name); it != exportsData.end() && it.key() == productContext->name; ++it) { if (it.value().multiplexId == productContext->multiplexConfigurationId) { - createNonPresentModule(productContext->name, QLatin1String("disabled"), + createNonPresentModule(productContext->name, QStringLiteral("disabled"), it.value().exportItem); break; } @@ -1525,7 +1525,7 @@ void ModuleLoader::handleModuleSetupError(ModuleLoader::ProductContext *productC qCDebug(lcModuleLoader()) << "non-required module" << module.name.toString() << "found, but not usable in product" << productContext->name << error.toString(); - createNonPresentModule(module.name.toString(), QLatin1String("failed validation"), + createNonPresentModule(module.name.toString(), QStringLiteral("failed validation"), module.item); } } @@ -2337,7 +2337,7 @@ void ModuleLoader::adjustDefiningItemsInGroupModuleInstances(const Item::Module QBS_CHECK(v->definingItem()); Item *& replacement = definingItemReplacements[v->definingItem()]; - static const QString caseA = QLatin1String("__group_case_a"); + static const QString caseA = QStringLiteral("__group_case_a"); if (v->definingItem() == instanceWithProperty || v->definingItem()->variantProperty(caseA)) { // Case a) @@ -3085,7 +3085,7 @@ Item *ModuleLoader::searchAndLoadModuleFile(ProductContext *productContext, } } if (!isRequired) - return createNonPresentModule(fullName, QLatin1String("not found"), nullptr); + return createNonPresentModule(fullName, QStringLiteral("not found"), nullptr); if (Q_UNLIKELY(triedToLoadModule)) throw ErrorInfo(Tr::tr("Module %1 could not be loaded.").arg(fullName), dependsItemLocation); diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 9e9befbf3..6d5435899 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -872,8 +872,8 @@ void ProjectResolver::adaptExportedPropertyValues(const Item *shadowProductItem) QVariantMap prefixMap; for (const QVariant &v : prefixList) { const QVariantMap o = v.toMap(); - prefixMap.insert(o.value(QLatin1String("prefix")).toString(), - o.value(QLatin1String("replacement")).toString()); + prefixMap.insert(o.value(QStringLiteral("prefix")).toString(), + o.value(QStringLiteral("replacement")).toString()); } const auto valueRefersToImportingProduct = [shadowProductName, shadowProductBuildDir](const QString &value) { diff --git a/src/lib/corelib/language/propertydeclaration.cpp b/src/lib/corelib/language/propertydeclaration.cpp index c7826dc39..5ea6a3d88 100644 --- a/src/lib/corelib/language/propertydeclaration.cpp +++ b/src/lib/corelib/language/propertydeclaration.cpp @@ -156,7 +156,7 @@ QString PropertyDeclaration::typeString(PropertyDeclaration::Type t) case StringList: return stringListString(); case Variant: return variantString(); case VariantList: return varListString(); - case UnknownType: return QLatin1String("unknown"); + case UnknownType: return QStringLiteral("unknown"); } Q_UNREACHABLE(); // For stupid compilers. } diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 7b2c69aa1..973501bc3 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -107,10 +107,10 @@ ScriptEngine::ScriptEngine(Logger &logger, EvalContext evalContext, QObject *par { setProcessEventsInterval(1000); // For the cancelation mechanism to work. m_cancelationError = currentContext()->throwValue(tr("Execution canceled")); - QScriptValue objectProto = globalObject().property(QLatin1String("Object")); - m_definePropertyFunction = objectProto.property(QLatin1String("defineProperty")); + QScriptValue objectProto = globalObject().property(QStringLiteral("Object")); + m_definePropertyFunction = objectProto.property(QStringLiteral("defineProperty")); QBS_ASSERT(m_definePropertyFunction.isFunction(), /* ignore */); - m_emptyFunction = evaluate(QLatin1String("(function(){})")); + m_emptyFunction = evaluate(QStringLiteral("(function(){})")); QBS_ASSERT(m_emptyFunction.isFunction(), /* ignore */); // Initially push a new context to turn off scope chain insanity mode. QScriptEngine::pushContext(); @@ -630,8 +630,8 @@ CodeLocation ScriptEngine::lastErrorLocation(const QScriptValue &v, { const QScriptValue &errorVal = lastErrorValue(v); const CodeLocation errorLoc(errorVal.property(StringConstants::fileNameProperty()).toString(), - errorVal.property(QLatin1String("lineNumber")).toInt32(), - errorVal.property(QLatin1String("expressionCaretOffset")).toInt32(), + errorVal.property(QStringLiteral("lineNumber")).toInt32(), + errorVal.property(QStringLiteral("expressionCaretOffset")).toInt32(), false); return errorLoc.isValid() ? errorLoc : fallbackLocation; } @@ -674,7 +674,7 @@ public: : m_engine(engine) { m_proto = engine->globalObject().property(typeName) - .property(QLatin1String("prototype")); + .property(QStringLiteral("prototype")); QBS_ASSERT(m_proto.isObject(), return); m_descriptor = engine->newObject(); } @@ -683,7 +683,7 @@ public: { QScriptValue f = m_engine->evaluate(code); QBS_ASSERT(f.isFunction(), return); - m_descriptor.setProperty(QLatin1String("value"), f); + m_descriptor.setProperty(QStringLiteral("value"), f); m_engine->defineProperty(m_proto, name, m_descriptor); } @@ -697,7 +697,7 @@ static QScriptValue js_consoleError(QScriptContext *context, QScriptEngine *engi { if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("console.error() expects 1 argument")); + QStringLiteral("console.error() expects 1 argument")); logger->qbsLog(LoggerError) << context->argument(0).toString(); return engine->undefinedValue(); } @@ -706,7 +706,7 @@ static QScriptValue js_consoleWarn(QScriptContext *context, QScriptEngine *engin { if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("console.warn() expects 1 argument")); + QStringLiteral("console.warn() expects 1 argument")); logger->qbsWarning() << context->argument(0).toString(); return engine->undefinedValue(); } @@ -715,7 +715,7 @@ static QScriptValue js_consoleInfo(QScriptContext *context, QScriptEngine *engin { if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("console.info() expects 1 argument")); + QStringLiteral("console.info() expects 1 argument")); logger->qbsInfo() << context->argument(0).toString(); return engine->undefinedValue(); } @@ -724,7 +724,7 @@ static QScriptValue js_consoleDebug(QScriptContext *context, QScriptEngine *engi { if (Q_UNLIKELY(context->argumentCount() != 1)) return context->throwError(QScriptContext::SyntaxError, - QLatin1String("console.debug() expects 1 argument")); + QStringLiteral("console.debug() expects 1 argument")); logger->qbsDebug() << context->argument(0).toString(); return engine->undefinedValue(); } @@ -738,27 +738,27 @@ void ScriptEngine::installQbsBuiltins() { globalObject().setProperty(StringConstants::qbsModule(), m_qbsObject = newObject()); - globalObject().setProperty(QLatin1String("console"), m_consoleObject = newObject()); - installConsoleFunction(QLatin1String("debug"), &js_consoleDebug); - installConsoleFunction(QLatin1String("error"), &js_consoleError); - installConsoleFunction(QLatin1String("info"), &js_consoleInfo); - installConsoleFunction(QLatin1String("log"), &js_consoleLog); - installConsoleFunction(QLatin1String("warn"), &js_consoleWarn); + globalObject().setProperty(QStringLiteral("console"), m_consoleObject = newObject()); + installConsoleFunction(QStringLiteral("debug"), &js_consoleDebug); + installConsoleFunction(QStringLiteral("error"), &js_consoleError); + installConsoleFunction(QStringLiteral("info"), &js_consoleInfo); + installConsoleFunction(QStringLiteral("log"), &js_consoleLog); + installConsoleFunction(QStringLiteral("warn"), &js_consoleWarn); } void ScriptEngine::extendJavaScriptBuiltins() { - JSTypeExtender arrayExtender(this, QLatin1String("Array")); - arrayExtender.addFunction(QLatin1String("contains"), - QLatin1String("(function(e){return this.indexOf(e) !== -1;})")); - arrayExtender.addFunction(QLatin1String("containsAll"), - QLatin1String("(function(e){var $this = this;" + JSTypeExtender arrayExtender(this, QStringLiteral("Array")); + arrayExtender.addFunction(QStringLiteral("contains"), + QStringLiteral("(function(e){return this.indexOf(e) !== -1;})")); + arrayExtender.addFunction(QStringLiteral("containsAll"), + QStringLiteral("(function(e){var $this = this;" "return e.every(function (v) { return $this.contains(v) });})")); - arrayExtender.addFunction(QLatin1String("containsAny"), - QLatin1String("(function(e){var $this = this;" + arrayExtender.addFunction(QStringLiteral("containsAny"), + QStringLiteral("(function(e){var $this = this;" "return e.some(function (v) { return $this.contains(v) });})")); - arrayExtender.addFunction(QLatin1String("uniqueConcat"), - QLatin1String("(function(other){" + arrayExtender.addFunction(QStringLiteral("uniqueConcat"), + QStringLiteral("(function(other){" "var r = this.concat();" "var s = {};" "r.forEach(function(x){ s[x] = true; });" @@ -770,13 +770,13 @@ void ScriptEngine::extendJavaScriptBuiltins() "});" "return r;})")); - JSTypeExtender stringExtender(this, QLatin1String("String")); - stringExtender.addFunction(QLatin1String("contains"), - QLatin1String("(function(e){return this.indexOf(e) !== -1;})")); - stringExtender.addFunction(QLatin1String("startsWith"), - QLatin1String("(function(e){return this.slice(0, e.length) === e;})")); - stringExtender.addFunction(QLatin1String("endsWith"), - QLatin1String("(function(e){return this.slice(-e.length) === e;})")); + JSTypeExtender stringExtender(this, QStringLiteral("String")); + stringExtender.addFunction(QStringLiteral("contains"), + QStringLiteral("(function(e){return this.indexOf(e) !== -1;})")); + stringExtender.addFunction(QStringLiteral("startsWith"), + QStringLiteral("(function(e){return this.slice(0, e.length) === e;})")); + stringExtender.addFunction(QStringLiteral("endsWith"), + QStringLiteral("(function(e){return this.slice(-e.length) === e;})")); } void ScriptEngine::installFunction(const QString &name, int length, QScriptValue *functionValue, diff --git a/src/lib/corelib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp index 4623e8ef8..ba5b68f71 100644 --- a/src/lib/corelib/logging/ilogsink.cpp +++ b/src/lib/corelib/logging/ilogsink.cpp @@ -60,15 +60,15 @@ QString logLevelName(LoggerLevel level) { switch (level) { case qbs::LoggerError: - return QLatin1String("error"); + return QStringLiteral("error"); case qbs::LoggerWarning: - return QLatin1String("warning"); + return QStringLiteral("warning"); case qbs::LoggerInfo: - return QLatin1String("info"); + return QStringLiteral("info"); case qbs::LoggerDebug: - return QLatin1String("debug"); + return QStringLiteral("debug"); case qbs::LoggerTrace: - return QLatin1String("trace"); + return QStringLiteral("trace"); default: break; } diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index 3b27153e7..c3b11094d 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -139,7 +139,7 @@ LogWriter operator<<(LogWriter w, const QStringList &strList) for (int i = 0; i < strList.size(); ++i) { w.write(strList.at(i)); if (i != strList.size() - 1) - w.write(QLatin1String(", ")); + w.write(QStringLiteral(", ")); } w.write(']'); return w; @@ -153,7 +153,7 @@ LogWriter operator<<(LogWriter w, const Internal::Set &strSet) if (firstLoop) firstLoop = false; else - w.write(QLatin1String(", ")); + w.write(QStringLiteral(", ")); w.write(str); } w.write(')'); diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp index c6fd2e27c..2a951df12 100644 --- a/src/lib/corelib/parser/qmlerror.cpp +++ b/src/lib/corelib/parser/qmlerror.cpp @@ -220,7 +220,7 @@ QString QmlError::toString() const { QString rv; if (url().isEmpty()) { - rv = QLatin1String(""); + rv = QStringLiteral(""); } else if (line() != -1) { rv = url().toString() + QLatin1Char(':') + QString::number(line()); if (column() != -1) diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp index 3e92adb94..e90f3af9d 100644 --- a/src/lib/corelib/parser/qmljsparser.cpp +++ b/src/lib/corelib/parser/qmljsparser.cpp @@ -291,7 +291,7 @@ case 20: { node->importToken = loc(1); } else { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1), - QLatin1String("Expected a qualified name id or a string literal"))); + QStringLiteral("Expected a qualified name id or a string literal"))); return false; // ### remove me } @@ -681,7 +681,7 @@ case 88: { case 89: { if (const auto *mem = AST::cast(sym(1).Expression)) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken, - QLatin1String("Ignored annotation"))); + QStringLiteral("Ignored annotation"))); sym(1).Expression = mem->base; } @@ -692,7 +692,7 @@ case 89: { sym(1).UiQualifiedId = nullptr; diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1), - QLatin1String("Expected a qualified name id"))); + QStringLiteral("Expected a qualified name id"))); return false; // ### recover } diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp index 8191f77a6..b110c41f4 100644 --- a/src/lib/corelib/tools/applecodesignutils.cpp +++ b/src/lib/corelib/tools/applecodesignutils.cpp @@ -90,7 +90,7 @@ QVariantMap certificateInfo(const QByteArray &data) const auto subjectInfo = [](const QSslCertificate &cert) { QVariantMap map; for (const auto &attr : cert.subjectInfoAttributes()) - map.insert(QString::fromLatin1(attr), cert.subjectInfo(attr).front()); + map.insert(QStringLiteral(attr), cert.subjectInfo(attr).front()); return map; }; diff --git a/src/lib/corelib/tools/codelocation.cpp b/src/lib/corelib/tools/codelocation.cpp index 8ffb3dc97..57b577711 100644 --- a/src/lib/corelib/tools/codelocation.cpp +++ b/src/lib/corelib/tools/codelocation.cpp @@ -125,9 +125,9 @@ QString CodeLocation::toString() const if (isValid()) { str = QDir::toNativeSeparators(filePath()); QString lineAndColumn; - if (line() > 0 && !str.contains(QRegExp(QLatin1String(":[0-9]+$")))) + if (line() > 0 && !str.contains(QRegExp(QStringLiteral(":[0-9]+$")))) lineAndColumn += QLatin1Char(':') + QString::number(line()); - if (column() > 0 && !str.contains(QRegExp(QLatin1String(":[0-9]+:[0-9]+$")))) + if (column() > 0 && !str.contains(QRegExp(QStringLiteral(":[0-9]+:[0-9]+$")))) lineAndColumn += QLatin1Char(':') + QString::number(column()); str += lineAndColumn; } diff --git a/src/lib/corelib/tools/commandechomode.cpp b/src/lib/corelib/tools/commandechomode.cpp index 52c619637..aef9faa11 100644 --- a/src/lib/corelib/tools/commandechomode.cpp +++ b/src/lib/corelib/tools/commandechomode.cpp @@ -64,13 +64,13 @@ QString commandEchoModeName(CommandEchoMode mode) { switch (mode) { case CommandEchoModeSilent: - return QLatin1String("silent"); + return QStringLiteral("silent"); case CommandEchoModeSummary: - return QLatin1String("summary"); + return QStringLiteral("summary"); case CommandEchoModeCommandLine: - return QLatin1String("command-line"); + return QStringLiteral("command-line"); case CommandEchoModeCommandLineWithEnvironment: - return QLatin1String("command-line-with-environment"); + return QStringLiteral("command-line-with-environment"); default: break; } diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp index e67b551f6..185dc0531 100644 --- a/src/lib/corelib/tools/error.cpp +++ b/src/lib/corelib/tools/error.cpp @@ -274,7 +274,7 @@ QString ErrorInfo::toString() const if (e.codeLocation().isValid()) line.append(QStringLiteral(" in %1").arg(e.codeLocation().toString())); if (!line.isEmpty()) - lines.push_back(QStringLiteral("\t") + line); + lines.push_back(QLatin1Char('\t') + line); } else { lines.push_back(e.toString()); } diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp index 15a8e8783..eb24fdd37 100644 --- a/src/lib/corelib/tools/fileinfo.cpp +++ b/src/lib/corelib/tools/fileinfo.cpp @@ -258,8 +258,8 @@ static QString prependLongPathPrefix(const QString &absolutePath) { QString nativePath = QDir::toNativeSeparators(absolutePath); if (nativePath.startsWith(QStringLiteral("\\\\"))) - nativePath.remove(0, 1).prepend(QStringLiteral("UNC")); - nativePath.prepend(QStringLiteral("\\\\?\\")); + nativePath.remove(0, 1).prepend(QLatin1String("UNC")); + nativePath.prepend(QLatin1String("\\\\?\\")); return nativePath; } #endif diff --git a/src/lib/corelib/tools/filetime.cpp b/src/lib/corelib/tools/filetime.cpp index 263950d9c..d115075a7 100644 --- a/src/lib/corelib/tools/filetime.cpp +++ b/src/lib/corelib/tools/filetime.cpp @@ -194,7 +194,7 @@ QString FileTime::toString() const SYSTEMTIME stUTC, stLocal; FileTimeToSystemTime(ft, &stUTC); SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal); - const QString result = QString::fromLatin1("%1.%2.%3 %4:%5:%6") + const QString result = QStringLiteral("%1.%2.%3 %4:%5:%6") .arg(stLocal.wDay, 2, 10, QLatin1Char('0')).arg(stLocal.wMonth, 2, 10, QLatin1Char('0')).arg(stLocal.wYear) .arg(stLocal.wHour, 2, 10, QLatin1Char('0')).arg(stLocal.wMinute, 2, 10, QLatin1Char('0')).arg(stLocal.wSecond, 2, 10, QLatin1Char('0')); return result; diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h index 7ba4b2d4d..cae451638 100644 --- a/src/lib/corelib/tools/hostosinfo.h +++ b/src/lib/corelib/tools/hostosinfo.h @@ -81,7 +81,7 @@ public: static inline Version hostOsVersion() { Version v; if (HostOsInfo::isWindowsHost()) { - QSettings settings(QString::fromLatin1("HKEY_LOCAL_MACHINE\\Software\\" + QSettings settings(QStringLiteral("HKEY_LOCAL_MACHINE\\Software\\" "Microsoft\\Windows NT\\CurrentVersion"), QSettings::NativeFormat); v = v.fromString(settings.value(QStringLiteral("CurrentVersion")).toString() + diff --git a/src/lib/corelib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp index ebf8037c5..5cddae4ad 100644 --- a/src/lib/corelib/tools/installoptions.cpp +++ b/src/lib/corelib/tools/installoptions.cpp @@ -70,7 +70,7 @@ QString effectiveInstallRoot(const InstallOptions &options, const TopLevelProjec if (options.installIntoSysroot()) { return project->buildConfiguration().value(StringConstants::qbsModule()).toMap() - .value(QLatin1String("sysroot")).toString(); + .value(QStringLiteral("sysroot")).toString(); } return project->buildConfiguration().value(StringConstants::qbsModule()).toMap() .value(StringConstants::installRootProperty()).toString(); @@ -111,7 +111,7 @@ InstallOptions::~InstallOptions() */ QString InstallOptions::defaultInstallRoot() { - return QLatin1String("install-root"); + return QStringLiteral("install-root"); } /*! diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp index 72519c2ff..bf9720493 100644 --- a/src/lib/corelib/tools/jsliterals.cpp +++ b/src/lib/corelib/tools/jsliterals.cpp @@ -61,7 +61,7 @@ QString toJSLiteral(const QString &str) QString toJSLiteral(const QStringList &strs) { - QString js = QLatin1String("["); + QString js = QStringLiteral("["); for (int i = 0; i < strs.size(); ++i) { if (i != 0) js.append(QLatin1String(", ")); @@ -87,7 +87,7 @@ QString toJSLiteral(const QVariant &val) } if (val.type() == QVariant::Map) { const QVariantMap &vm = val.toMap(); - QString str = QLatin1String("{"); + QString str = QStringLiteral("{"); for (QVariantMap::const_iterator it = vm.begin(); it != vm.end(); ++it) { if (it != vm.begin()) str += QLatin1Char(','); @@ -100,7 +100,7 @@ QString toJSLiteral(const QVariant &val) return toJSLiteral(val.toBool()); if (val.canConvert(QVariant::String)) return toJSLiteral(val.toString()); - return QString::fromLatin1("Unconvertible type %1").arg(QLatin1String(val.typeName())); + return QStringLiteral("Unconvertible type %1").arg(QLatin1String(val.typeName())); } } // namespace qbs diff --git a/src/lib/corelib/tools/launcherinterface.cpp b/src/lib/corelib/tools/launcherinterface.cpp index 97f1c62ee..f635ef250 100644 --- a/src/lib/corelib/tools/launcherinterface.cpp +++ b/src/lib/corelib/tools/launcherinterface.cpp @@ -75,7 +75,7 @@ private: static QString launcherSocketName() { - return QString::fromLatin1("qbs_processlauncher-%1") + return QStringLiteral("qbs_processlauncher-%1") .arg(QString::number(qApp->applicationPid())); } diff --git a/src/lib/corelib/tools/msvcinfo.h b/src/lib/corelib/tools/msvcinfo.h index 664557777..61a19dc4f 100644 --- a/src/lib/corelib/tools/msvcinfo.h +++ b/src/lib/corelib/tools/msvcinfo.h @@ -107,7 +107,7 @@ public: WinSDK() { - pathPrefix = QLatin1String("bin"); + pathPrefix = QStringLiteral("bin"); } }; diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp index 5591c9761..dfa7fb683 100644 --- a/src/lib/corelib/tools/persistence.cpp +++ b/src/lib/corelib/tools/persistence.cpp @@ -84,7 +84,7 @@ void PersistentPool::load(const QString &filePath) m_stream.setDevice(nullptr); throw ErrorInfo(Tr::tr("Cannot use stored build graph at '%1': Incompatible file format. " "Expected magic token '%2', got '%3'.") - .arg(filePath, QString::fromLatin1(QBS_PERSISTENCE_MAGIC), + .arg(filePath, QLatin1String(QBS_PERSISTENCE_MAGIC), QString::fromLatin1(magic))); } diff --git a/src/lib/corelib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp index 12af4e9c7..ca3fe8378 100644 --- a/src/lib/corelib/tools/preferences.cpp +++ b/src/lib/corelib/tools/preferences.cpp @@ -68,7 +68,7 @@ Preferences::Preferences(Settings *settings, const QVariantMap &profileContents) */ bool Preferences::useColoredOutput() const { - return getPreference(QLatin1String("useColoredOutput"), true).toBool(); + return getPreference(QStringLiteral("useColoredOutput"), true).toBool(); } /*! @@ -77,7 +77,7 @@ bool Preferences::useColoredOutput() const */ int Preferences::jobs() const { - return getPreference(QLatin1String("jobs"), BuildOptions::defaultMaxJobCount()).toInt(); + return getPreference(QStringLiteral("jobs"), BuildOptions::defaultMaxJobCount()).toInt(); } /*! @@ -86,7 +86,7 @@ int Preferences::jobs() const */ QString Preferences::shell() const { - return getPreference(QLatin1String("shell")).toString(); + return getPreference(QStringLiteral("shell")).toString(); } /*! @@ -94,7 +94,7 @@ QString Preferences::shell() const */ QString Preferences::defaultBuildDirectory() const { - return getPreference(QLatin1String("defaultBuildDirectory")).toString(); + return getPreference(QStringLiteral("defaultBuildDirectory")).toString(); } /*! @@ -102,7 +102,7 @@ QString Preferences::defaultBuildDirectory() const */ CommandEchoMode Preferences::defaultEchoMode() const { - return commandEchoModeFromName(getPreference(QLatin1String("defaultEchoMode")).toString()); + return commandEchoModeFromName(getPreference(QStringLiteral("defaultEchoMode")).toString()); } /*! @@ -121,7 +121,7 @@ QStringList Preferences::searchPaths(const QString &baseDir) const */ QStringList Preferences::pluginPaths(const QString &baseDir) const { - return pathList(QLatin1String("pluginsPath"), baseDir + QLatin1String("/qbs/plugins")); + return pathList(QStringLiteral("pluginsPath"), baseDir + QStringLiteral("/qbs/plugins")); } /*! @@ -129,7 +129,7 @@ QStringList Preferences::pluginPaths(const QString &baseDir) const */ JobLimits Preferences::jobLimits() const { - const QString prefix = QLatin1String("preferences.jobLimit"); + const QString prefix = QStringLiteral("preferences.jobLimit"); JobLimits limits; for (const QString &key : m_settings->allKeysWithPrefix(prefix, Settings::allScopes())) { limits.setJobLimit(key, m_settings->value(prefix + QLatin1Char('.') + key, @@ -152,7 +152,7 @@ JobLimits Preferences::jobLimits() const QVariant Preferences::getPreference(const QString &key, const QVariant &defaultValue) const { - static const QString keyPrefix = QLatin1String("preferences"); + static const QString keyPrefix = QStringLiteral("preferences"); const QString fullKey = keyPrefix + QLatin1Char('.') + key; const bool isSearchPaths = key == Internal::StringConstants::qbsSearchPathsProperty(); if (!m_profile.isEmpty()) { diff --git a/src/lib/corelib/tools/profile.h b/src/lib/corelib/tools/profile.h index 2ccc99def..aa8b7ef10 100644 --- a/src/lib/corelib/tools/profile.h +++ b/src/lib/corelib/tools/profile.h @@ -76,7 +76,7 @@ public: static QString cleanName(const QString &name); - static QString fallbackName() { return QLatin1String("none"); } + static QString fallbackName() { return QStringLiteral("none"); } private: static QString baseProfileKey(); diff --git a/src/lib/corelib/tools/profiling.cpp b/src/lib/corelib/tools/profiling.cpp index 2f92658d7..7e3559b54 100644 --- a/src/lib/corelib/tools/profiling.cpp +++ b/src/lib/corelib/tools/profiling.cpp @@ -112,13 +112,13 @@ QString elapsedTimeString(qint64 elapsedTimeInMs) s -= m*60; const qint64 h = m/60; m -= h*60; - QString timeString = QString::fromLatin1("%1ms").arg(ms); + QString timeString = QStringLiteral("%1ms").arg(ms); if (h || m || s) - timeString.prepend(QString::fromLatin1("%1s, ").arg(s)); + timeString.prepend(QStringLiteral("%1s, ").arg(s)); if (h || m) - timeString.prepend(QString::fromLatin1("%1m, ").arg(m)); + timeString.prepend(QStringLiteral("%1m, ").arg(m)); if (h) - timeString.prepend(QString::fromLatin1("%1h, ").arg(h)); + timeString.prepend(QStringLiteral("%1h, ").arg(h)); return timeString; } diff --git a/src/lib/corelib/tools/qbsassert.cpp b/src/lib/corelib/tools/qbsassert.cpp index f002469d0..a6cfd6109 100644 --- a/src/lib/corelib/tools/qbsassert.cpp +++ b/src/lib/corelib/tools/qbsassert.cpp @@ -52,7 +52,7 @@ void writeAssertLocation(const char *condition, const char *file, int line) void throwAssertLocation(const char *condition, const char *file, int line) { - throw ErrorInfo(QString::fromLatin1("ASSERT: %1").arg(QLatin1String(condition)), + throw ErrorInfo(QStringLiteral("ASSERT: %1").arg(QLatin1String(condition)), CodeLocation(QString::fromLocal8Bit(file), line, -1, false), true); } diff --git a/src/lib/corelib/tools/qbspluginmanager.cpp b/src/lib/corelib/tools/qbspluginmanager.cpp index d0be73891..d4e92e22a 100644 --- a/src/lib/corelib/tools/qbspluginmanager.cpp +++ b/src/lib/corelib/tools/qbspluginmanager.cpp @@ -125,11 +125,11 @@ void QbsPluginManager::loadPlugins(const std::vector &pluginPaths, QStringList filters; if (HostOsInfo::isWindowsHost()) - filters << QLatin1String("*.dll"); + filters << QStringLiteral("*.dll"); else if (HostOsInfo::isMacosHost()) - filters << QLatin1String("*.bundle") << QLatin1String("*.dylib"); + filters << QStringLiteral("*.bundle") << QStringLiteral("*.dylib"); else - filters << QLatin1String("*.so"); + filters << QStringLiteral("*.so"); for (const std::string &pluginPath : pluginPaths) { const QString qtPluginPath = QString::fromStdString(pluginPath); diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp index 189c96a6a..3b3d173f8 100644 --- a/src/lib/corelib/tools/settings.cpp +++ b/src/lib/corelib/tools/settings.cpp @@ -196,7 +196,7 @@ void Settings::sync() QString Settings::defaultProfile() const { - return value(QLatin1String("defaultProfile"), allScopes()).toString(); + return value(QStringLiteral("defaultProfile"), allScopes()).toString(); } QStringList Settings::profiles() const diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp index 51c020778..8479a67dc 100644 --- a/src/lib/corelib/tools/settingscreator.cpp +++ b/src/lib/corelib/tools/settingscreator.cpp @@ -124,8 +124,8 @@ void SettingsCreator::migrate() void SettingsCreator::createQSettings() { std::unique_ptr tmp(m_settingsBaseDir.isEmpty() - ? new QSettings(format(), QSettings::UserScope, QLatin1String("QtProject"), - QLatin1String("qbs")) + ? new QSettings(format(), QSettings::UserScope, QStringLiteral("QtProject"), + QStringLiteral("qbs")) : new QSettings(m_settingsBaseDir + QLatin1String("/qbs.conf"), format())); const QFileInfo fi(tmp->fileName()); m_settingsBaseDir = fi.path(); diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 9d76fcb4d..bbfa71ead 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -73,7 +73,7 @@ struct Node QString Node::uniqueChildName() const { - QString newName = QLatin1String("newkey"); + QString newName = QStringLiteral("newkey"); bool unique; do { unique = true; diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp index 5600d9b0b..4d3271f98 100644 --- a/src/lib/corelib/tools/setupprojectparameters.cpp +++ b/src/lib/corelib/tools/setupprojectparameters.cpp @@ -541,7 +541,7 @@ QProcessEnvironment SetupProjectParameters::adjustedEnvironment() const { QProcessEnvironment result = environment(); const QVariantMap environmentFromProfile - = buildConfigurationTree().value(QLatin1String("buildEnvironment")).toMap(); + = buildConfigurationTree().value(QStringLiteral("buildEnvironment")).toMap(); for (QVariantMap::const_iterator it = environmentFromProfile.begin(); it != environmentFromProfile.end(); ++it) { result.insert(it.key(), it.value().toString()); diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp index 3f2855ef8..233d2ef34 100644 --- a/src/lib/corelib/tools/shellutils.cpp +++ b/src/lib/corelib/tools/shellutils.cpp @@ -53,7 +53,7 @@ QString shellInterpreter(const QString &filePath) { QTextStream ts(&file); const QString shebang = ts.readLine(); if (shebang.startsWith(QLatin1String("#!"))) { - return (shebang.mid(2).split(QRegExp(QLatin1String("\\s")), + return (shebang.mid(2).split(QRegExp(QStringLiteral("\\s")), QString::SkipEmptyParts) << QString()).front(); } } @@ -89,7 +89,7 @@ static QString shellQuoteUnix(const QString &arg) }; // 0-32 \'"$`<>|;&(){}*?#!~[] if (!arg.length()) - return QString::fromLatin1("''"); + return QStringLiteral("''"); QString ret(arg); if (hasSpecialChars(ret, iqm)) { @@ -117,7 +117,7 @@ static QString shellQuoteWin(const QString &arg) }; // &()<>^| if (!arg.length()) - return QString::fromLatin1("\"\""); + return QStringLiteral("\"\""); QString ret(arg); if (hasSpecialChars(ret, iqm)) { diff --git a/src/lib/corelib/tools/toolchains.cpp b/src/lib/corelib/tools/toolchains.cpp index be473f392..0d793f8aa 100644 --- a/src/lib/corelib/tools/toolchains.cpp +++ b/src/lib/corelib/tools/toolchains.cpp @@ -109,7 +109,7 @@ QStringList canonicalToolchain(const QString &name) toolchains << canonicalToolchain(llvmToolchain()); else if (toolchainName == llvmToolchain() || toolchainName == mingwToolchain()) { - toolchains << canonicalToolchain(QLatin1String("gcc")); + toolchains << canonicalToolchain(QStringLiteral("gcc")); } return toolchains; } diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index 21ce3406f..08a9cb1e6 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -160,7 +160,7 @@ bool VsEnvironmentDetector::startDetection(const std::vector &compatible tmpFile.flush(); QProcess process; - static const QString shellFilePath = QLatin1String("cmd.exe"); + static const QString shellFilePath = QStringLiteral("cmd.exe"); process.start(shellFilePath, QStringList() << QStringLiteral("/C") << tmpFile.fileName()); if (!process.waitForStarted()) { @@ -217,8 +217,8 @@ void VsEnvironmentDetector::writeBatchFile(QIODevice *device, const QString &vcv const std::vector &msvcs) const { const QStringList varnames = QStringList() << StringConstants::pathEnvVar() - << QLatin1String("INCLUDE") << QLatin1String("LIB") << QLatin1String("WindowsSdkDir") - << QLatin1String("WindowsSDKVersion") << QLatin1String("VSINSTALLDIR"); + << QStringLiteral("INCLUDE") << QStringLiteral("LIB") << QStringLiteral("WindowsSdkDir") + << QStringLiteral("WindowsSDKVersion") << QStringLiteral("VSINSTALLDIR"); QTextStream s(device); s << "@echo off" << endl; for (const MSVC *msvc : msvcs) { diff --git a/src/libexec/qbs_processlauncher/launchersockethandler.cpp b/src/libexec/qbs_processlauncher/launchersockethandler.cpp index 9fb7d4655..54951a586 100644 --- a/src/libexec/qbs_processlauncher/launchersockethandler.cpp +++ b/src/libexec/qbs_processlauncher/launchersockethandler.cpp @@ -133,7 +133,7 @@ void LauncherSocketHandler::handleSocketData() if (!m_packetParser.parse()) return; } catch (const PacketParser::InvalidPacketSizeException &e) { - logWarn(QString::fromLatin1("Internal protocol error: invalid packet size %1.") + logWarn(QStringLiteral("Internal protocol error: invalid packet size %1.") .arg(e.size)); return; } @@ -148,7 +148,7 @@ void LauncherSocketHandler::handleSocketData() handleShutdownPacket(); return; default: - logWarn(QString::fromLatin1("Internal protocol error: invalid packet type %1.") + logWarn(QStringLiteral("Internal protocol error: invalid packet type %1.") .arg(static_cast(m_packetParser.type()))); return; } @@ -158,7 +158,7 @@ void LauncherSocketHandler::handleSocketData() void LauncherSocketHandler::handleSocketError() { if (m_socket->error() != QLocalSocket::PeerClosedError) { - logError(QString::fromLatin1("socket error: %1").arg(m_socket->errorString())); + logError(QStringLiteral("socket error: %1").arg(m_socket->errorString())); m_socket->disconnect(); qApp->quit(); } diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp index 11b9297d7..f186b5244 100644 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp @@ -68,10 +68,10 @@ QString qbs::MakefileGenerator::generatorName() const static QString quote(const QString &s) { QString quoted = shellQuote(s); - quoted.replace(QLatin1Char('$'), QStringLiteral("$$")); // For make - quoted.replace(QStringLiteral("$$(SRCDIR)"), QStringLiteral("$(SRCDIR)")); - quoted.replace(QStringLiteral("$$(BUILD_ROOT)"), QStringLiteral("$(BUILD_ROOT)")); - quoted.replace(QStringLiteral("$$(INSTALL_ROOT)"), QStringLiteral("$(INSTALL_ROOT)")); + quoted.replace(QLatin1Char('$'), QLatin1String("$$")); // For make + quoted.replace(QLatin1String("$$(SRCDIR)"), QLatin1String("$(SRCDIR)")); + quoted.replace(QLatin1String("$$(BUILD_ROOT)"), QLatin1String("$(BUILD_ROOT)")); + quoted.replace(QLatin1String("$$(INSTALL_ROOT)"), QLatin1String("$(INSTALL_ROOT)")); return quoted; } @@ -133,7 +133,7 @@ static QString bruteForcePathReplace(const QString &value, const QString &srcDir static QString mkdirCmdLine(const QString &dir) { if (HostOsInfo::isWindowsHost()) - return QString::fromLatin1("if not exist %1 mkdir %1 & if not exist %1 exit 1").arg(dir); + return QStringLiteral("if not exist %1 mkdir %1 & if not exist %1 exit 1").arg(dir); return QStringLiteral("mkdir -p ") + dir; } @@ -340,7 +340,7 @@ void qbs::MakefileGenerator::generate() "Makefile-compatible, because they depend entirely on JavaScriptCommands. " "The build is probably not fully functional. " "Affected build artifacts:\n\t%1") - .arg(filesCreatedByJsCommands.join(QStringLiteral("\n\t"))); + .arg(filesCreatedByJsCommands.join(QLatin1String("\n\t"))); } else if (jsCommandsEncountered) { logger().qbsWarning() << Tr::tr("Some rules in this project use JavaScriptCommands, " "which cannot be converted to Makefile-compatible constructs. The build may " diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp index f9bfaab98..ed41dfb33 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp @@ -213,7 +213,7 @@ void MSBuildQbsProductProject::addConfiguration(const GeneratableProject &projec } propertyGroup1->appendProperty(QStringLiteral("LocalDebuggerEnvironment"), - env.toStringList().join(QStringLiteral("\n"))); + env.toStringList().join(QLatin1String("\n"))); } // NMake - General diff --git a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp index b87c842fa..878ebbcd2 100644 --- a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp @@ -73,8 +73,8 @@ static QString qbsCommandLine(const GeneratableProject &project, if (subCommand == QStringLiteral("generate")) { commandLine.appendArgument(QStringLiteral("-g")); - commandLine.appendArgument( - QString(QStringLiteral("visualstudio%1")).arg(versionInfo.marketingVersion())); + commandLine.appendArgument(QStringLiteral("visualstudio%1") + .arg(versionInfo.marketingVersion())); } else { commandLine.appendArgument(QStringLiteral("-p")); addEnvironmentVariableArgument(commandLine, QStringLiteral("QbsProductName")); diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 228b0e078..58150150a 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -1372,7 +1372,7 @@ void TestApi::generatedFilesList() const QStringList directParents = project.generatedFiles(product, uiFilePath, false); QCOMPARE(directParents.size(), 1); const QFileInfo uiHeaderFileInfo(directParents.front()); - QCOMPARE(uiHeaderFileInfo.fileName(), QLatin1String("ui_mainwindow.h")); + QCOMPARE(uiHeaderFileInfo.fileName(), QStringLiteral("ui_mainwindow.h")); QVERIFY(!uiHeaderFileInfo.exists()); const QStringList allParents = project.generatedFiles(product, uiFilePath, true); QCOMPARE(allParents.size(), 3); @@ -1448,7 +1448,7 @@ void TestApi::installableFiles() { qbs::SetupProjectParameters setupParams = defaultSetupParameters("installed-artifact"); QVariantMap overriddenValues; - overriddenValues.insert(QLatin1String("qbs.installRoot"), QLatin1String("/tmp")); + overriddenValues.insert(QStringLiteral("qbs.installRoot"), QStringLiteral("/tmp")); setupParams.setOverriddenValues(overriddenValues); std::unique_ptr job(qbs::Project().setupProject(setupParams, m_logSink, 0)); @@ -1471,7 +1471,7 @@ void TestApi::installableFiles() if (!QFileInfo(f.filePath()).fileName().startsWith("main")) { QVERIFY(f.isExecutable()); QString expectedTargetFilePath = qbs::Internal::HostOsInfo - ::appendExecutableSuffix(QLatin1String("/tmp/usr/bin/installedApp")); + ::appendExecutableSuffix(QStringLiteral("/tmp/usr/bin/installedApp")); QCOMPARE(f.installData().localInstallFilePath(), expectedTargetFilePath); QCOMPARE(product.targetExecutable(), expectedTargetFilePath); break; @@ -1872,7 +1872,7 @@ void TestApi::multiArch() // Error check: Try to build for the same profile twice, this time attaching // the properties via the product name. - overriddenValues.remove(QLatin1String("project.targetProfile")); + overriddenValues.remove(QStringLiteral("project.targetProfile")); overriddenValues.insert("products.p1.myProfiles", targetProfile.name() + ',' + targetProfile.name()); setupParams.setOverriddenValues(overriddenValues); @@ -2185,7 +2185,7 @@ void TestApi::nonexistingProjectPropertyFromCommandLine() = defaultSetupParameters("nonexistingprojectproperties"); removeBuildDir(setupParams); QVariantMap projectProperties; - projectProperties.insert(QLatin1String("project.blubb"), QLatin1String("true")); + projectProperties.insert(QStringLiteral("project.blubb"), QStringLiteral("true")); setupParams.setOverriddenValues(projectProperties); std::unique_ptr job(qbs::Project().setupProject(setupParams, m_logSink, 0)); diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp index 8f2aec87d..c57504e9e 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) #endif if (metaData.isEmpty()) metaData = QPluginLoader("thePlugin").metaData(); - const QJsonValue v = metaData.value(QLatin1String("theKey")); + const QJsonValue v = metaData.value(QStringLiteral("theKey")); if (!v.isArray()) { qDebug() << "value is" << v; return 1; @@ -72,8 +72,8 @@ int main(int argc, char *argv[]) qDebug() << "value is" << v; return 1; } - const QJsonValue v2 = metaData.value(QLatin1String("MetaData")).toObject() - .value(QLatin1String("theOtherKey")); + const QJsonValue v2 = metaData.value(QStringLiteral("MetaData")).toObject() + .value(QStringLiteral("theOtherKey")); if (v2.toString() != QLatin1String("theOtherValue")) { qDebug() << "metadata:" << metaData; return 1; diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index e1f5026bd..d8c2d2c82 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -819,7 +819,7 @@ static QJsonObject findByName(const QJsonArray &objects, const QString &name) if (!v.isObject()) continue; QJsonObject obj = v.toObject(); - const QString objName = obj.value(QLatin1String("name")).toString(); + const QString objName = obj.value(QStringLiteral("name")).toString(); if (objName == name) return obj; } @@ -850,14 +850,14 @@ void TestBlackbox::dependenciesProperty() QJsonArray dependencies = jsondoc.array(); QCOMPARE(dependencies.size(), 2); QJsonObject product2 = findByName(dependencies, QStringLiteral("product2")); - QJsonArray product2_type = product2.value(QLatin1String("type")).toArray(); + QJsonArray product2_type = product2.value(QStringLiteral("type")).toArray(); QCOMPARE(product2_type.size(), 1); QCOMPARE(product2_type.first().toString(), QLatin1String("application")); QCOMPARE(product2.value(QLatin1String("narf")).toString(), QLatin1String("zort")); QJsonArray product2_cppArtifacts = product2.value("artifacts").toObject().value("cpp").toArray(); QCOMPARE(product2_cppArtifacts.size(), 1); - QJsonArray product2_deps = product2.value(QLatin1String("dependencies")).toArray(); + QJsonArray product2_deps = product2.value(QStringLiteral("dependencies")).toArray(); QVERIFY(!product2_deps.empty()); QJsonObject product2_qbs = findByName(product2_deps, QStringLiteral("qbs")); QVERIFY(!product2_qbs.empty()); @@ -918,9 +918,9 @@ void TestBlackbox::dependenciesProperty() dependencies = jsondoc.array(); QCOMPARE(dependencies.size(), 3); product2 = findByName(dependencies, QStringLiteral("product2")); - product2_deps = product2.value(QLatin1String("dependencies")).toArray(); + product2_deps = product2.value(QStringLiteral("dependencies")).toArray(); product2_cpp = findByName(product2_deps, QStringLiteral("cpp")); - product2_cpp_defines = product2_cpp.value(QLatin1String("defines")).toArray(); + product2_cpp_defines = product2_cpp.value(QStringLiteral("defines")).toArray(); QCOMPARE(product2_cpp_defines.size(), 1); QCOMPARE(product2_cpp_defines.first().toString(), QLatin1String("DIGEDAG")); } @@ -1532,7 +1532,7 @@ void TestBlackbox::clean() QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(appObjectFilePath)); QVERIFY(regularFileExists(appExeFilePath)); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("clean"))), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("clean"))), 0); QVERIFY(!QFile(appObjectFilePath).exists()); QVERIFY(!QFile(appExeFilePath).exists()); QVERIFY(!QFile(depObjectFilePath).exists()); @@ -1563,7 +1563,7 @@ void TestBlackbox::clean() QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(appObjectFilePath)); QVERIFY(regularFileExists(appExeFilePath)); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("clean"), QStringList("-n"))), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("clean"), QStringList("-n"))), 0); QVERIFY(regularFileExists(appObjectFilePath)); QVERIFY(regularFileExists(appExeFilePath)); QVERIFY(regularFileExists(depObjectFilePath)); @@ -1577,7 +1577,7 @@ void TestBlackbox::clean() QVERIFY(regularFileExists(appExeFilePath)); QVERIFY(regularFileExists(depObjectFilePath)); QVERIFY(regularFileExists(depLibFilePath)); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("clean"), QStringList("-p") << "dep")), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("clean"), QStringList("-p") << "dep")), 0); QVERIFY(regularFileExists(appObjectFilePath)); QVERIFY(regularFileExists(appExeFilePath)); QVERIFY(!QFile(depObjectFilePath).exists()); @@ -1591,7 +1591,7 @@ void TestBlackbox::clean() QVERIFY(regularFileExists(appExeFilePath)); QVERIFY(regularFileExists(depObjectFilePath)); QVERIFY(regularFileExists(depLibFilePath)); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("clean"), QStringList("-p") << "app")), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("clean"), QStringList("-p") << "app")), 0); QVERIFY(!QFile(appObjectFilePath).exists()); QVERIFY(!QFile(appExeFilePath).exists()); QVERIFY(regularFileExists(depObjectFilePath)); @@ -2042,7 +2042,7 @@ void TestBlackbox::trackRemoveFile() QFile::copy("../before/main.cpp", "main.cpp"); QVERIFY(QFile::remove("zort.h")); QVERIFY(QFile::remove("zort.cpp")); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("resolve"))), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("resolve"))), 0); touch("main.cpp"); touch("trackAddFile.qbs"); @@ -2184,7 +2184,7 @@ void TestBlackbox::wildcardRenaming() QVERIFY(QFileInfo(defaultInstallRoot + "/pioniere.txt").exists()); WAIT_FOR_NEW_TIMESTAMP(); QFile::rename(QDir::currentPath() + "/pioniere.txt", QDir::currentPath() + "/fdj.txt"); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("install"), + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("install"), QStringList("--clean-install-root"))), 0); QVERIFY(!QFileInfo(defaultInstallRoot + "/pioniere.txt").exists()); QVERIFY(QFileInfo(defaultInstallRoot + "/fdj.txt").exists()); @@ -2198,7 +2198,7 @@ void TestBlackbox::recursiveRenaming() QVERIFY(QFileInfo(defaultInstallRoot + "/dir/subdir/blubb.txt").exists()); WAIT_FOR_NEW_TIMESTAMP(); QVERIFY(QFile::rename(QDir::currentPath() + "/dir/wasser.txt", QDir::currentPath() + "/dir/wein.txt")); - QCOMPARE(runQbs(QbsRunParameters(QLatin1String("install"), + QCOMPARE(runQbs(QbsRunParameters(QStringLiteral("install"), QStringList("--clean-install-root"))), 0); QVERIFY(!QFileInfo(defaultInstallRoot + "/dir/wasser.txt").exists()); QVERIFY(QFileInfo(defaultInstallRoot + "/dir/wein.txt").exists()); @@ -2679,25 +2679,25 @@ void TestBlackbox::overrideProjectProperties() { QDir::setCurrent(testDataDir + "/overrideProjectProperties"); QCOMPARE(runQbs(QbsRunParameters(QStringList() - << QLatin1String("-f") - << QLatin1String("overrideProjectProperties.qbs") - << QLatin1String("project.nameSuffix:ForYou") - << QLatin1String("project.someBool:false") - << QLatin1String("project.someInt:156") - << QLatin1String("project.someStringList:one") - << QLatin1String("products.MyAppForYou.mainFile:main.cpp"))), + << QStringLiteral("-f") + << QStringLiteral("overrideProjectProperties.qbs") + << QStringLiteral("project.nameSuffix:ForYou") + << QStringLiteral("project.someBool:false") + << QStringLiteral("project.someInt:156") + << QStringLiteral("project.someStringList:one") + << QStringLiteral("products.MyAppForYou.mainFile:main.cpp"))), 0); QVERIFY(regularFileExists(relativeExecutableFilePath("MyAppForYou"))); QVERIFY(QFile::remove(relativeBuildGraphFilePath())); QbsRunParameters params; - params.arguments << QLatin1String("-f") << QLatin1String("project_using_helper_lib.qbs"); + params.arguments << QStringLiteral("-f") << QStringLiteral("project_using_helper_lib.qbs"); params.expectFailure = true; QVERIFY(runQbs(params) != 0); rmDirR(relativeBuildDir()); - params.arguments = QStringList() << QLatin1String("-f") - << QLatin1String("project_using_helper_lib.qbs") - << QLatin1String("project.linkSuccessfully:true"); + params.arguments = QStringList() << QStringLiteral("-f") + << QStringLiteral("project_using_helper_lib.qbs") + << QStringLiteral("project.linkSuccessfully:true"); params.expectFailure = false; QCOMPARE(runQbs(params), 0); } @@ -2968,8 +2968,8 @@ void TestBlackbox::probesAndShadowProducts() void TestBlackbox::probeInExportedModule() { QDir::setCurrent(testDataDir + "/probe-in-exported-module"); - QCOMPARE(runQbs(QbsRunParameters(QStringList() << QLatin1String("-f") - << QLatin1String("probe-in-exported-module.qbs"))), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringList() << QStringLiteral("-f") + << QStringLiteral("probe-in-exported-module.qbs"))), 0); QVERIFY2(m_qbsStdout.contains("found: true"), m_qbsStdout.constData()); QVERIFY2(m_qbsStdout.contains("prop: yes"), m_qbsStdout.constData()); QVERIFY2(m_qbsStdout.contains("listProp: my,myother"), m_qbsStdout.constData()); @@ -2989,8 +2989,8 @@ void TestBlackbox::probesAndArrayProperties() void TestBlackbox::productProperties() { QDir::setCurrent(testDataDir + "/productproperties"); - QCOMPARE(runQbs(QbsRunParameters(QStringList() << QLatin1String("-f") - << QLatin1String("productproperties.qbs"))), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringList() << QStringLiteral("-f") + << QStringLiteral("productproperties.qbs"))), 0); QVERIFY(regularFileExists(relativeExecutableFilePath("blubb_user"))); } @@ -5069,7 +5069,7 @@ void TestBlackbox::properQuoting() { QDir::setCurrent(testDataDir + "/proper quoting"); QCOMPARE(runQbs(), 0); - QbsRunParameters params(QLatin1String("run"), QStringList() << "-q" << "-p" << "Hello World"); + QbsRunParameters params(QStringLiteral("run"), QStringList() << "-q" << "-p" << "Hello World"); params.expectFailure = true; // Because the exit code is non-zero. QCOMPARE(runQbs(params), 156); const char * const expectedOutput = "whitespaceless\ncontains space\ncontains\ttab\n" @@ -5318,7 +5318,7 @@ void TestBlackbox::installedApp() QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(defaultInstallRoot - + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/bin/installedApp")))); + + HostOsInfo::appendExecutableSuffix(QStringLiteral("/usr/bin/installedApp")))); QCOMPARE(runQbs(QbsRunParameters("resolve", QStringList("qbs.installRoot:" + testDataDir + "/installed-app"))), 0); @@ -5333,7 +5333,7 @@ void TestBlackbox::installedApp() QCOMPARE(runQbs(QbsRunParameters("resolve")), 0); QCOMPARE(runQbs(QbsRunParameters(QStringList() << "--clean-install-root")), 0); QVERIFY(regularFileExists(defaultInstallRoot - + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/bin/installedApp")))); + + HostOsInfo::appendExecutableSuffix(QStringLiteral("/usr/bin/installedApp")))); QVERIFY(regularFileExists(defaultInstallRoot + QLatin1String("/usr/src/main.cpp"))); QVERIFY(!addedFile.exists()); @@ -5343,7 +5343,7 @@ void TestBlackbox::installedApp() "qbs.installPrefix: '/usr/local'"); QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(defaultInstallRoot - + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/local/bin/installedApp")))); + + HostOsInfo::appendExecutableSuffix(QStringLiteral("/usr/local/bin/installedApp")))); QVERIFY(regularFileExists(defaultInstallRoot + QLatin1String("/usr/local/src/main.cpp"))); // Check whether changing install parameters on the artifact causes re-installation. @@ -5352,7 +5352,7 @@ void TestBlackbox::installedApp() "qbs.installDir: 'custom'"); QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(defaultInstallRoot - + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/local/custom/installedApp")))); + + HostOsInfo::appendExecutableSuffix(QStringLiteral("/usr/local/custom/installedApp")))); // Check whether changing install parameters on a source file causes re-installation. WAIT_FOR_NEW_TIMESTAMP(); @@ -5410,7 +5410,7 @@ void TestBlackbox::installedSourceFiles() void TestBlackbox::toolLookup() { - QbsRunParameters params(QLatin1String("setup-toolchains"), QStringList("--help")); + QbsRunParameters params(QStringLiteral("setup-toolchains"), QStringList("--help")); params.profile.clear(); QCOMPARE(runQbs(params), 0); } @@ -5514,13 +5514,13 @@ public: TemporaryDefaultProfileRemover(qbs::Settings *settings) : m_settings(settings), m_defaultProfile(settings->defaultProfile()) { - m_settings->remove(QLatin1String("defaultProfile")); + m_settings->remove(QStringLiteral("defaultProfile")); } ~TemporaryDefaultProfileRemover() { if (!m_defaultProfile.isEmpty()) - m_settings->setValue(QLatin1String("defaultProfile"), m_defaultProfile); + m_settings->setValue(QStringLiteral("defaultProfile"), m_defaultProfile); } private: @@ -5680,15 +5680,15 @@ void TestBlackbox::explicitlyDependsOn_data() static bool haveMakeNsis() { QStringList regKeys; - regKeys << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS") - << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS"); + regKeys << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS") + << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); for (const QString &key : qAsConst(regKeys)) { QSettings settings(key, QSettings::NativeFormat); - QString str = settings.value(QLatin1String(".")).toString(); + QString str = settings.value(QStringLiteral(".")).toString(); if (!str.isEmpty()) paths.prepend(str); } @@ -5696,7 +5696,7 @@ static bool haveMakeNsis() bool haveMakeNsis = false; for (const QString &path : qAsConst(paths)) { if (regularFileExists(QDir::fromNativeSeparators(path) + - HostOsInfo::appendExecutableSuffix(QLatin1String("/makensis")))) { + HostOsInfo::appendExecutableSuffix(QStringLiteral("/makensis")))) { haveMakeNsis = true; break; } @@ -5904,8 +5904,8 @@ static bool haveWiX(const Profile &profile) } QStringList regKeys; - regKeys << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows Installer XML\\") - << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Installer XML\\"); + regKeys << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows Installer XML\\") + << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Installer XML\\"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); @@ -5914,7 +5914,7 @@ static bool haveWiX(const Profile &profile) const QStringList versions = QSettings(key, QSettings::NativeFormat).childGroups(); for (const QString &version : versions) { QSettings settings(key + version, QSettings::NativeFormat); - QString str = settings.value(QLatin1String("InstallRoot")).toString(); + QString str = settings.value(QStringLiteral("InstallRoot")).toString(); if (!str.isEmpty()) paths.prepend(str); } @@ -5922,9 +5922,9 @@ static bool haveWiX(const Profile &profile) for (const QString &path : qAsConst(paths)) { if (regularFileExists(QDir::fromNativeSeparators(path) + - HostOsInfo::appendExecutableSuffix(QLatin1String("/candle"))) && + HostOsInfo::appendExecutableSuffix(QStringLiteral("/candle"))) && regularFileExists(QDir::fromNativeSeparators(path) + - HostOsInfo::appendExecutableSuffix(QLatin1String("/light")))) { + HostOsInfo::appendExecutableSuffix(QStringLiteral("/light")))) { return true; } } @@ -6043,7 +6043,7 @@ void TestBlackbox::typescript() QCOMPARE(status, 0); params.expectFailure = false; - params.command = QLatin1String("run"); + params.command = QStringLiteral("run"); params.arguments = QStringList() << "-p" << "animals"; QCOMPARE(runQbs(params), 0); @@ -6093,22 +6093,22 @@ static bool haveInnoSetup(const Profile &profile) return true; QStringList regKeys; - regKeys << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1") - << QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1"); + regKeys << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1") + << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Inno Setup 5_is1"); QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); for (const QString &key : regKeys) { QSettings settings(key, QSettings::NativeFormat); - QString str = settings.value(QLatin1String("InstallLocation")).toString(); + QString str = settings.value(QStringLiteral("InstallLocation")).toString(); if (!str.isEmpty()) paths.prepend(str); } for (const QString &path : paths) { if (regularFileExists(QDir::fromNativeSeparators(path) + - HostOsInfo::appendExecutableSuffix(QLatin1String("/ISCC")))) + HostOsInfo::appendExecutableSuffix(QStringLiteral("/ISCC")))) return true; } diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index bf47c241c..e02f70213 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -192,7 +192,7 @@ void TestBlackboxAndroid::android_data() const SettingsPtr s = settings(); const Profile p(profileName(), s.get()); const Profile pQt(theProfileName(true), s.get()); - QStringList archsStringList = p.value(QLatin1String("qbs.architectures")).toStringList(); + QStringList archsStringList = p.value(QStringLiteral("qbs.architectures")).toStringList(); if (archsStringList.empty()) archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs QByteArrayList archs; @@ -203,7 +203,7 @@ void TestBlackboxAndroid::android_data() .replace("arm64", "arm64-v8a"); }); const auto cxxLibPath = [&p, &pQt](const QByteArray &oldcxxLib, bool forQt) { - const bool usesClang = (forQt ? pQt : p).value(QLatin1String("qbs.toolchainType")) + const bool usesClang = (forQt ? pQt : p).value(QStringLiteral("qbs.toolchainType")) .toString() == "clang"; return QByteArray("lib/${ARCH}/") + (usesClang ? "libc++_shared.so" : oldcxxLib); }; diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp index e1844b69c..85bc26ba4 100644 --- a/tests/auto/blackbox/tst_blackboxbase.cpp +++ b/tests/auto/blackbox/tst_blackboxbase.cpp @@ -79,9 +79,9 @@ int TestBlackboxBase::runQbs(const QbsRunParameters ¶ms) if (!params.settingsDir.isEmpty() && supportsSettingsDirOption(params.command)) args << "--settings-dir" << params.settingsDir; if (supportsBuildDirectoryOption(params.command)) { - args.push_back(QLatin1String("-d")); + args.push_back(QStringLiteral("-d")); args.push_back(params.buildDirectory.isEmpty() - ? QLatin1String(".") + ? QStringLiteral(".") : params.buildDirectory); } args << params.arguments; diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 9a7071f3b..31aebfa3a 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -79,8 +79,8 @@ using namespace qbs; using namespace qbs::Internal; static QString testDataDir() { - return FileInfo::resolvePath(QLatin1String(SRCDIR), - QLatin1String("../../../tests/auto/language/testdata")); + return FileInfo::resolvePath(QStringLiteral(SRCDIR), + QStringLiteral("../../../tests/auto/language/testdata")); } static QString testProject(const char *fileName) { return testDataDir() + QLatin1Char('/') + QLatin1String(fileName); @@ -180,7 +180,7 @@ void TestLanguage::initTestCase() m_engine = ScriptEngine::create(m_logger, EvalContext::PropertyEvaluation, this); loader = new Loader(m_engine, m_logger); loader->setSearchPaths(QStringList() - << QLatin1String(SRCDIR "/../../../share/qbs")); + << QStringLiteral(SRCDIR "/../../../share/qbs")); defaultParameters.setTopLevelProfile(profileName()); defaultParameters.setConfigurationName("default"); defaultParameters.expandBuildConfiguration(); @@ -343,7 +343,7 @@ void TestLanguage::canonicalArchitecture() project = loader->loadProject(defaultParameters); QVERIFY(!!project); QHash products = productsFromProject(project); - ResolvedProductPtr product = products.value(QLatin1String("x86")); + ResolvedProductPtr product = products.value(QStringLiteral("x86")); QVERIFY(!!product); } catch (const ErrorInfo &e) { exceptionCaught = true; @@ -360,7 +360,7 @@ void TestLanguage::rfc1034Identifier() project = loader->loadProject(defaultParameters); QVERIFY(!!project); QHash products = productsFromProject(project); - ResolvedProductPtr product = products.value(QLatin1String("this-has-special-characters-" + ResolvedProductPtr product = products.value(QStringLiteral("this-has-special-characters-" "uh-oh-Undersc0r3s-Are.Bad")); QVERIFY(!!product); } catch (const ErrorInfo &e) { @@ -753,7 +753,7 @@ void TestLanguage::environmentVariable() bool exceptionCaught = false; try { // Create new environment: - const QString varName = QLatin1String("PRODUCT_NAME"); + const QString varName = QStringLiteral("PRODUCT_NAME"); const QString productName = QLatin1String("MyApp") + QString::number(qrand()); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(varName, productName); @@ -1161,11 +1161,11 @@ void TestLanguage::getNativeSetting() QString expectedTargetName; if (HostOsInfo::isMacosHost()) - expectedTargetName = QLatin1String("Mac OS X"); + expectedTargetName = QStringLiteral("Mac OS X"); else if (HostOsInfo::isWindowsHost()) - expectedTargetName = QLatin1String("Windows"); + expectedTargetName = QStringLiteral("Windows"); else - expectedTargetName = QLatin1String("Unix"); + expectedTargetName = QStringLiteral("Unix"); QVERIFY(!!project); QHash products; @@ -1173,7 +1173,7 @@ void TestLanguage::getNativeSetting() products.insert(product->targetName, product); ResolvedProductPtr product = products.value(expectedTargetName); QVERIFY(!!product); - ResolvedProductPtr product2 = products.value(QLatin1String("fallback")); + ResolvedProductPtr product2 = products.value(QStringLiteral("fallback")); QVERIFY(!!product2); } catch (const ErrorInfo &e) { exceptionCaught = true; @@ -1288,11 +1288,11 @@ void TestLanguage::homeDirectory() dir.filePath("a")); QCOMPARE(product->productProperties.value("bogus1").toString(), - FileInfo::resolvePath(product->sourceDirectory, QLatin1String("a~b"))); + FileInfo::resolvePath(product->sourceDirectory, QStringLiteral("a~b"))); QCOMPARE(product->productProperties.value("bogus2").toString(), - FileInfo::resolvePath(product->sourceDirectory, QLatin1String("a/~/bb"))); + FileInfo::resolvePath(product->sourceDirectory, QStringLiteral("a/~/bb"))); QCOMPARE(product->productProperties.value("user").toString(), - FileInfo::resolvePath(product->sourceDirectory, QLatin1String("~foo/bar"))); + FileInfo::resolvePath(product->sourceDirectory, QStringLiteral("~foo/bar"))); } catch (const ErrorInfo &e) { qDebug() << e.toString(); @@ -1650,7 +1650,7 @@ void TestLanguage::jsImportUsedInMultipleScopes() try { SetupProjectParameters params = defaultParameters; params.setProjectFilePath(testProject("jsimportsinmultiplescopes.qbs")); - params.setOverriddenValues({std::make_pair(QLatin1String("qbs.buildVariant"), + params.setOverriddenValues({std::make_pair(QStringLiteral("qbs.buildVariant"), buildVariant)}); params.expandBuildConfiguration(); TopLevelProjectPtr project = loader->loadProject(params); @@ -1703,7 +1703,7 @@ void TestLanguage::modulePrioritizationBySearchPath() try { SetupProjectParameters params = defaultParameters; params.setProjectFilePath(testProject("module-prioritization-by-search-path/project.qbs")); - params.setOverriddenValues({std::make_pair(QLatin1String("project.qbsSearchPaths"), + params.setOverriddenValues({std::make_pair(QStringLiteral("project.qbsSearchPaths"), searchPaths)}); params.expandBuildConfiguration(); TopLevelProjectPtr project = loader->loadProject(params); @@ -2398,9 +2398,9 @@ void TestLanguage::pathProperties() QStringList() << "dummy" << "includePaths").toStringList(); QCOMPARE(includePaths, QStringList() << projectFileDir); QCOMPARE(productProps.value("base_fileInProductDir").toString(), - FileInfo::resolvePath(projectFileDir, QLatin1String("foo"))); + FileInfo::resolvePath(projectFileDir, QStringLiteral("foo"))); QCOMPARE(productProps.value("base_fileInBaseProductDir").toString(), - FileInfo::resolvePath(projectFileDir, QLatin1String("subdir/bar"))); + FileInfo::resolvePath(projectFileDir, QStringLiteral("subdir/bar"))); } catch (const ErrorInfo &e) { exceptionCaught = true; qDebug() << e.toString(); @@ -2412,7 +2412,7 @@ void TestLanguage::profileValuesAndOverriddenValues() { bool exceptionCaught = false; try { - TemporaryProfile tp(QLatin1String("tst_lang_profile"), m_settings); + TemporaryProfile tp(QStringLiteral("tst_lang_profile"), m_settings); Profile profile = tp.p; profile.setValue("dummy.defines", "IN_PROFILE"); profile.setValue("dummy.cFlags", "IN_PROFILE"); @@ -2435,7 +2435,7 @@ void TestLanguage::profileValuesAndOverriddenValues() QCOMPARE(values.length(), 1); QCOMPARE(values.front().toString(), QString("IN_PROFILE")); values = product->moduleProperties->moduleProperty("dummy", "defines").toList(); - QCOMPARE(values, QVariantList() << QLatin1String("IN_FILE") << QLatin1String("IN_PROFILE")); + QCOMPARE(values, QVariantList() << QStringLiteral("IN_FILE") << QStringLiteral("IN_PROFILE")); values = product->moduleProperties->moduleProperty("dummy", "cFlags").toList(); QCOMPARE(values.length(), 1); QCOMPARE(values.front().toString(), QString("OVERRIDDEN")); @@ -2536,9 +2536,9 @@ void TestLanguage::productDirectories() product = products.value("MyApp"); QVERIFY(!!product); const QVariantMap config = product->productProperties; - QCOMPARE(config.value(QLatin1String("buildDirectory")).toString(), + QCOMPARE(config.value(QStringLiteral("buildDirectory")).toString(), product->buildDirectory()); - QCOMPARE(config.value(QLatin1String("sourceDirectory")).toString(), testDataDir()); + QCOMPARE(config.value(QStringLiteral("sourceDirectory")).toString(), testDataDir()); } catch (const ErrorInfo &e) { exceptionCaught = true; @@ -2911,7 +2911,7 @@ void TestLanguage::throwingProbe() SetupProjectParameters params = defaultParameters; params.setProjectFilePath(testProject("throwing-probe.qbs")); QVariantMap properties; - properties.insert(QLatin1String("products.theProduct.enableProbe"), enableProbe); + properties.insert(QStringLiteral("products.theProduct.enableProbe"), enableProbe); params.setOverriddenValues(properties); const TopLevelProjectPtr project = loader->loadProject(params); QVERIFY(!!project); diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp index 33cb95a78..da40a2dc6 100644 --- a/tests/auto/tools/tst_tools.cpp +++ b/tests/auto/tools/tst_tools.cpp @@ -387,37 +387,37 @@ void TestTools::testBuildConfigMerging() { TemporaryProfile tp(QLatin1String("tst_tools_profile"), m_settings); Profile profile = tp.p; - profile.setValue(QLatin1String("topLevelKey"), QLatin1String("topLevelValue")); - profile.setValue(QLatin1String("qbs.toolchain"), QLatin1String("gcc")); - profile.setValue(QLatin1String("qbs.architecture"), - QLatin1String("Jean-Claude Pillemann")); - profile.setValue(QLatin1String("cpp.treatWarningsAsErrors"), true); + profile.setValue(QStringLiteral("topLevelKey"), QStringLiteral("topLevelValue")); + profile.setValue(QStringLiteral("qbs.toolchain"), QStringLiteral("gcc")); + profile.setValue(QStringLiteral("qbs.architecture"), + QStringLiteral("Jean-Claude Pillemann")); + profile.setValue(QStringLiteral("cpp.treatWarningsAsErrors"), true); QVariantMap overrideMap; - overrideMap.insert(QLatin1String("qbs.toolchain"), QLatin1String("clang")); - overrideMap.insert(QLatin1String("qbs.installRoot"), QLatin1String("/blubb")); + overrideMap.insert(QStringLiteral("qbs.toolchain"), QStringLiteral("clang")); + overrideMap.insert(QStringLiteral("qbs.installRoot"), QStringLiteral("/blubb")); SetupProjectParameters params; params.setSettingsDirectory(m_settings->baseDirectory()); params.setTopLevelProfile(profile.name()); - params.setConfigurationName(QLatin1String("debug")); + params.setConfigurationName(QStringLiteral("debug")); params.setOverriddenValues(overrideMap); const ErrorInfo error = params.expandBuildConfiguration(); QVERIFY2(!error.hasError(), qPrintable(error.toString())); const QVariantMap finalMap = params.finalBuildConfigurationTree(); QCOMPARE(finalMap.size(), 3); - QCOMPARE(finalMap.value(QLatin1String("topLevelKey")).toString(), - QString::fromLatin1("topLevelValue")); - const QVariantMap finalQbsMap = finalMap.value(QLatin1String("qbs")).toMap(); + QCOMPARE(finalMap.value(QStringLiteral("topLevelKey")).toString(), + QStringLiteral("topLevelValue")); + const QVariantMap finalQbsMap = finalMap.value(QStringLiteral("qbs")).toMap(); QCOMPARE(finalQbsMap.size(), 4); - QCOMPARE(finalQbsMap.value(QLatin1String("toolchain")).toString(), - QString::fromLatin1("clang")); - QCOMPARE(finalQbsMap.value(QLatin1String("configurationName")).toString(), - QString::fromLatin1("debug")); - QCOMPARE(finalQbsMap.value(QLatin1String("architecture")).toString(), - QString::fromLatin1("Jean-Claude Pillemann")); - QCOMPARE(finalQbsMap.value(QLatin1String("installRoot")).toString(), QLatin1String("/blubb")); - const QVariantMap finalCppMap = finalMap.value(QLatin1String("cpp")).toMap(); + QCOMPARE(finalQbsMap.value(QStringLiteral("toolchain")).toString(), + QStringLiteral("clang")); + QCOMPARE(finalQbsMap.value(QStringLiteral("configurationName")).toString(), + QStringLiteral("debug")); + QCOMPARE(finalQbsMap.value(QStringLiteral("architecture")).toString(), + QStringLiteral("Jean-Claude Pillemann")); + QCOMPARE(finalQbsMap.value(QStringLiteral("installRoot")).toString(), QLatin1String("/blubb")); + const QVariantMap finalCppMap = finalMap.value(QStringLiteral("cpp")).toMap(); QCOMPARE(finalCppMap.size(), 1); - QCOMPARE(finalCppMap.value(QLatin1String("treatWarningsAsErrors")).toBool(), true); + QCOMPARE(finalCppMap.value(QStringLiteral("treatWarningsAsErrors")).toBool(), true); } void TestTools::testProcessNameByPid() diff --git a/tests/benchmarker/benchmarker.cpp b/tests/benchmarker/benchmarker.cpp index 050eb97a7..5ecdbf08b 100644 --- a/tests/benchmarker/benchmarker.cpp +++ b/tests/benchmarker/benchmarker.cpp @@ -116,7 +116,7 @@ void Benchmarker::rememberCurrentRepoState() void Benchmarker::buildQbs(const QString &buildDir) const { if (!QDir::root().mkpath(buildDir)) - throw Exception(QString::fromLatin1("Failed to create directory '%1'.").arg(buildDir)); + throw Exception(QStringLiteral("Failed to create directory '%1'.").arg(buildDir)); runProcess(QStringList() << "qmake" << "CONFIG+=force_debug_info" << (m_qbsRepo + "/qbs.pro"), buildDir); runProcess(QStringList() << "make" << "-s", buildDir); diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp index 7c7e1a9c7..4e5052453 100644 --- a/tests/benchmarker/commandlineparser.cpp +++ b/tests/benchmarker/commandlineparser.cpp @@ -64,7 +64,7 @@ void CommandLineParser::parse() "repo path"); parser.addOption(qbsRepoOption); QCommandLineOption activitiesOption(QStringList{"activities", "a"}, - QString::fromLatin1("The activities to benchmark. Possible values (CSV): %1,%2,%3,%4") + QStringLiteral("The activities to benchmark. Possible values (CSV): %1,%2,%3,%4") .arg(resolveActivity(), ruleExecutionActivity(), nullBuildActivity(), allActivities()), "activities", allActivities()); parser.addOption(activitiesOption); @@ -119,14 +119,14 @@ void CommandLineParser::parse() void CommandLineParser::throwException(const QString &optionName, const QString &illegalValue, const QString &helpText) { - const QString errorText(QString::fromLatin1("Error parsing command line: Illegal value '%1' " + const QString errorText(QStringLiteral("Error parsing command line: Illegal value '%1' " "for option '--%2'.\n%3").arg(illegalValue, optionName, helpText)); throw Exception(errorText); } void CommandLineParser::throwException(const QString &missingOption, const QString &helpText) { - const QString errorText(QString::fromLatin1("Error parsing command line: Missing mandatory " + const QString errorText(QStringLiteral("Error parsing command line: Missing mandatory " "option '--%1'.\n%3").arg(missingOption, helpText)); throw Exception(errorText); } diff --git a/tests/benchmarker/runsupport.cpp b/tests/benchmarker/runsupport.cpp index e01200067..3f8f46470 100644 --- a/tests/benchmarker/runsupport.cpp +++ b/tests/benchmarker/runsupport.cpp @@ -46,20 +46,20 @@ void runProcess(const QStringList &commandLine, const QString &workingDir, QByte p.setWorkingDirectory(workingDir); p.start(command, args); if (!p.waitForStarted()) - throw Exception(QString::fromLatin1("Process '%1' failed to start.").arg(command)); + throw Exception(QStringLiteral("Process '%1' failed to start.").arg(command)); p.waitForFinished(-1); if (p.exitStatus() != QProcess::NormalExit) { - throw Exception(QString::fromLatin1("Error running '%1': %2") + throw Exception(QStringLiteral("Error running '%1': %2") .arg(command, p.errorString())); } if (exitCode) *exitCode = p.exitCode(); if (p.exitCode() != 0) { - QString errorString = QString::fromLatin1("Command '%1' finished with exit code %2.") + QString errorString = QStringLiteral("Command '%1' finished with exit code %2.") .arg(command).arg(p.exitCode()); const QByteArray stdErr = p.readAllStandardError(); if (!stdErr.isEmpty()) { - errorString += QString::fromLatin1("\nStandard error output was: '%1'") + errorString += QStringLiteral("\nStandard error output was: '%1'") .arg(QString::fromLocal8Bit(stdErr)); } throw Exception(errorString); diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp index 399216226..0441e1b10 100644 --- a/tests/benchmarker/valgrindrunner.cpp +++ b/tests/benchmarker/valgrindrunner.cpp @@ -51,7 +51,7 @@ ValgrindRunner::ValgrindRunner(Activities activities, const QString &testProject , m_baseOutputDir(baseOutputDir) { if (!QDir::root().mkpath(m_baseOutputDir)) - throw Exception(QString::fromLatin1("Failed to create directory '%1'.").arg(baseOutputDir)); + throw Exception(QStringLiteral("Failed to create directory '%1'.").arg(baseOutputDir)); } void ValgrindRunner::run() @@ -163,7 +163,7 @@ qint64 ValgrindRunner::runCallgrind(const QString &qbsCommand, const QString &bu runProcess(valgrindCommandLine(qbsCommand, buildDir, dryRun, "callgrind", outFile)); QFile f(outFile); if (!f.open(QIODevice::ReadOnly)) { - throw Exception(QString::fromLatin1("Failed to open file '%1': %2") + throw Exception(QStringLiteral("Failed to open file '%1': %2") .arg(outFile, f.errorString())); } while (!f.atEnd()) { @@ -175,14 +175,14 @@ qint64 ValgrindRunner::runCallgrind(const QString &qbsCommand, const QString &bu bool ok; const qint64 iCount = icString.toLongLong(&ok); if (!ok) { - throw Exception(QString::fromLatin1("Unexpected line in callgrind output file " + throw Exception(QStringLiteral("Unexpected line in callgrind output file " "'%1': '%2'.") .arg(outFile, QString::fromLocal8Bit(line))); } return iCount; } - throw Exception(QString::fromLatin1("Failed to find summary line in callgrind " + throw Exception(QStringLiteral("Failed to find summary line in callgrind " "output file '%1'.").arg(outFile)); } @@ -195,7 +195,7 @@ qint64 ValgrindRunner::runMassif(const QString &qbsCommand, const QString &build QBuffer buffer(&ms_printOutput); buffer.open(QIODevice::ReadOnly); QByteArray peakSnapshot; - const QString exceptionStringPattern = QString::fromLatin1("Failed to extract peak memory " + const QString exceptionStringPattern = QStringLiteral("Failed to extract peak memory " "usage from file '%1': %2").arg(outFile); while (!buffer.atEnd()) { const QByteArray line = buffer.readLine(); @@ -207,7 +207,7 @@ qint64 ValgrindRunner::runMassif(const QString &qbsCommand, const QString &build if (delimiterOffset == -1) delimiterOffset = line.lastIndexOf('[', magicStringOffset); if (delimiterOffset == -1) { - const QString details = QString::fromLatin1("Failed to extract peak snapshot from " + const QString details = QStringLiteral("Failed to extract peak snapshot from " "line '%1'.").arg(QString::fromLocal8Bit(line)); throw Exception(exceptionStringPattern.arg(details)); } @@ -222,7 +222,7 @@ qint64 ValgrindRunner::runMassif(const QString &qbsCommand, const QString &build continue; const QList entries = line.split(' '); if (entries.size() != 6) { - const QString details = QString::fromLatin1("Expected 6 entries in line '%1', but " + const QString details = QStringLiteral("Expected 6 entries in line '%1', but " "there are %2.").arg(QString::fromLocal8Bit(line)).arg(entries.size()); throw Exception(exceptionStringPattern.arg(details)); } @@ -231,14 +231,14 @@ qint64 ValgrindRunner::runMassif(const QString &qbsCommand, const QString &build bool ok; qint64 peakMemoryUsage = peakMemoryString.toLongLong(&ok); if (!ok) { - const QString details = QString::fromLatin1("Failed to parse peak memory value '%1' " + const QString details = QStringLiteral("Failed to parse peak memory value '%1' " "as a number.").arg(QString::fromLocal8Bit(peakMemoryString)); throw Exception(exceptionStringPattern.arg(details)); } return peakMemoryUsage; } - const QString details = QString::fromLatin1("Failed to find snapshot '%1'.") + const QString details = QStringLiteral("Failed to find snapshot '%1'.") .arg(QString::fromLocal8Bit(peakSnapshot)); throw Exception(exceptionStringPattern.arg(details)); } diff --git a/tests/fuzzy-test/commandlineparser.cpp b/tests/fuzzy-test/commandlineparser.cpp index 86f498dec..18515604b 100644 --- a/tests/fuzzy-test/commandlineparser.cpp +++ b/tests/fuzzy-test/commandlineparser.cpp @@ -64,7 +64,7 @@ void CommandLineParser::parse(const QStringList &commandLine) else if (arg == logOption()) m_log = true; else - throw ParseException(QString::fromLatin1("Unknown parameter '%1'").arg(arg)); + throw ParseException(QStringLiteral("Unknown parameter '%1'").arg(arg)); } if (m_profile.isEmpty()) throw ParseException("No profile given."); @@ -74,7 +74,7 @@ void CommandLineParser::parse(const QStringList &commandLine) QString CommandLineParser::usageString() const { - return QString::fromLatin1("%1 %2 %3 [%4 ] " + return QStringLiteral("%1 %2 %3 [%4 ] " "[%5 ] [%6]") .arg(QFileInfo(m_command).fileName(), profileOption(), startCommitOption(), maxDurationoption(), jobCountOption(), logOption()); @@ -83,10 +83,10 @@ QString CommandLineParser::usageString() const void CommandLineParser::assignOptionArgument(const QString &option, QString &argument) { if (m_commandLine.empty()) - throw ParseException(QString::fromLatin1("Option '%1' needs an argument.").arg(option)); + throw ParseException(QStringLiteral("Option '%1' needs an argument.").arg(option)); argument = m_commandLine.takeFirst(); if (argument.isEmpty()) { - throw ParseException(QString::fromLatin1("Argument for option '%1' must not be empty.") + throw ParseException(QStringLiteral("Argument for option '%1' must not be empty.") .arg(option)); } } @@ -98,7 +98,7 @@ void CommandLineParser::assignOptionArgument(const QString &option, int &argumen bool ok; argument = numberString.toInt(&ok); if (!ok || argument <= 0) { - throw ParseException(QString::fromLatin1("Invalid argument '%1' for option '%2'.") + throw ParseException(QStringLiteral("Invalid argument '%1' for option '%2'.") .arg(numberString, option)); } } @@ -116,7 +116,7 @@ void CommandLineParser::parseDuration() bool ok; m_maxDuration = choppedDurationString.toInt(&ok); if (!ok || m_maxDuration <= 0) { - throw ParseException(QString::fromLatin1("Invalid duration argument '%1'.") + throw ParseException(QStringLiteral("Invalid duration argument '%1'.") .arg(durationString)); } if (hasSuffix) { @@ -125,7 +125,7 @@ void CommandLineParser::parseDuration() case 'd': m_maxDuration *= 24; // Fall-through. case 'h': m_maxDuration *= 60; break; default: - throw ParseException(QString::fromLatin1("Invalid duration suffix '%1'.") + throw ParseException(QStringLiteral("Invalid duration suffix '%1'.") .arg(suffix)); } } diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp index 37a6c56fe..b836ee623 100644 --- a/tests/fuzzy-test/fuzzytester.cpp +++ b/tests/fuzzy-test/fuzzytester.cpp @@ -100,10 +100,10 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit, // for errors, as information from change tracking has to be serialized correctly. QString qbsError; m_currentActivity = resolveIncrementalActivity(); - bool success = runQbs(defaultBuildDir(), QLatin1String("resolve"), &qbsError); + bool success = runQbs(defaultBuildDir(), QStringLiteral("resolve"), &qbsError); if (success) { m_currentActivity = buildIncrementalActivity(); - success = runQbs(defaultBuildDir(), QLatin1String("build"), &qbsError); + success = runQbs(defaultBuildDir(), QStringLiteral("build"), &qbsError); } m_currentActivity = buildFromScratchActivity(); if (success) { @@ -111,7 +111,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit, QString message = "An incremental build succeeded " "with a commit for which a clean build failed."; if (!m_log) { - message += QString::fromLatin1("\nThe qbs error message " + message += QStringLiteral("\nThe qbs error message " "for the clean build was: '%1'").arg(qbsError); } throwIncrementalBuildError(message, buildSequence); @@ -122,7 +122,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit, QString message = "An incremental build failed " "with a commit for which a clean build succeeded."; if (!m_log) { - message += QString::fromLatin1("\nThe qbs error message for " + message += QStringLiteral("\nThe qbs error message for " "the incremental build was: '%1'").arg(qbsError); } throwIncrementalBuildError(message, buildSequence); @@ -166,14 +166,14 @@ QString FuzzyTester::findWorkingStartCommit(const QString &startCommit) } checkoutCommit(m_currentCommit); removeDir(defaultBuildDir()); - if (runQbs(defaultBuildDir(), QLatin1String("build"), &qbsError)) { + if (runQbs(defaultBuildDir(), QStringLiteral("build"), &qbsError)) { m_buildableCommits << m_currentCommit; return m_currentCommit; } qDebug("Commit %s is not buildable.", qPrintable(m_currentCommit)); m_unbuildableCommits << m_currentCommit; } - throw TestError(QString::fromLatin1("Cannot run test: Failed to find a single commit that " + throw TestError(QStringLiteral("Cannot run test: Failed to find a single commit that " "builds successfully with qbs. The last qbs error was: '%1'").arg(qbsError)); } @@ -184,9 +184,9 @@ void FuzzyTester::runGit(const QStringList &arguments, QString *output) if (!git.waitForStarted()) throw TestError("Failed to start git. It is expected to be in the PATH."); if (!git.waitForFinished(300000) || git.exitStatus() != QProcess::NormalExit) // 5 minutes ought to be enough for everyone - throw TestError(QString::fromLatin1("git failed: %1").arg(git.errorString())); + throw TestError(QStringLiteral("git failed: %1").arg(git.errorString())); if (git.exitCode() != 0) { - throw TestError(QString::fromLatin1("git failed: %1") + throw TestError(QStringLiteral("git failed: %1") .arg(QString::fromLocal8Bit(git.readAllStandardError()))); } if (output) @@ -222,7 +222,7 @@ bool FuzzyTester::runQbs(const QString &buildDir, const QString &command, QStrin commandLine << ("profile:" + m_profile); qbs.start("qbs", commandLine); if (!qbs.waitForStarted()) { - throw TestError(QString::fromLatin1("Failed to start qbs. It is expected to be " + throw TestError(QStringLiteral("Failed to start qbs. It is expected to be " "in the PATH. QProcess error string: '%1'").arg(qbs.errorString())); } if (!qbs.waitForFinished(-1) || qbs.exitCode() != 0) { @@ -237,7 +237,7 @@ void FuzzyTester::removeDir(const QString &dirPath) { QDir dir(dirPath); if (!dir.removeRecursively()) { - throw TestError(QString::fromLatin1("Failed to remove temporary dir '%1'.") + throw TestError(QStringLiteral("Failed to remove temporary dir '%1'.") .arg(dir.absolutePath())); } } @@ -254,7 +254,7 @@ bool FuzzyTester::doCleanBuild(QString *errorMessage) } const QString cleanBuildDir = "fuzzytest-verification-build"; removeDir(cleanBuildDir); - if (runQbs(cleanBuildDir, QLatin1String("build"), errorMessage)) { + if (runQbs(cleanBuildDir, QStringLiteral("build"), errorMessage)) { m_buildableCommits << m_currentCommit; return true; } @@ -266,7 +266,7 @@ void FuzzyTester::throwIncrementalBuildError(const QString &message, const QStringList &commitSequence) { const QString commitSequenceString = commitSequence.join(QLatin1Char(',')); - throw TestError(QString::fromLatin1("Found qbs bug with incremental build!\n" + throw TestError(QStringLiteral("Found qbs bug with incremental build!\n" "%1\n" "The sequence of commits was: %2.").arg(message, commitSequenceString)); } -- cgit v1.2.3