aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-02-19 22:16:04 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-02-25 15:58:40 +0000
commit0876dc4d6abb147ccdcc190adfad01c704a73e61 (patch)
treee8a1d558827e2a9e4092600cbe1a2029895d9f99 /src/lib
parente160b26d8c7476c63f6220ac69d1d6405e8ce3aa (diff)
Use QStringLiteral more where it is possible
Change-Id: I7419cc3fbc1e8776de3943852dcedab4c95d1c32 Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/corelib/api/internaljobs.cpp2
-rw-r--r--src/lib/corelib/api/languageinfo.cpp2
-rw-r--r--src/lib/corelib/api/projectdata.cpp6
-rw-r--r--src/lib/corelib/api/projectfileupdater.cpp7
-rw-r--r--src/lib/corelib/api/qmljsrewriter.cpp10
-rw-r--r--src/lib/corelib/api/runenvironment.cpp24
-rw-r--r--src/lib/corelib/buildgraph/artifact.h18
-rw-r--r--src/lib/corelib/buildgraph/buildgraph.cpp6
-rw-r--r--src/lib/corelib/buildgraph/emptydirectoriesremover.cpp2
-rw-r--r--src/lib/corelib/buildgraph/executor.cpp2
-rw-r--r--src/lib/corelib/buildgraph/productinstaller.cpp4
-rw-r--r--src/lib/corelib/buildgraph/rulesapplicator.cpp8
-rw-r--r--src/lib/corelib/generators/generatordata.cpp14
-rw-r--r--src/lib/corelib/jsextensions/binaryfile.cpp4
-rw-r--r--src/lib/corelib/jsextensions/domxml.cpp44
-rw-r--r--src/lib/corelib/jsextensions/file.cpp44
-rw-r--r--src/lib/corelib/jsextensions/fileinfoextension.cpp26
-rw-r--r--src/lib/corelib/jsextensions/moduleproperties.cpp14
-rw-r--r--src/lib/corelib/jsextensions/process.cpp8
-rw-r--r--src/lib/corelib/jsextensions/propertylist.cpp2
-rw-r--r--src/lib/corelib/jsextensions/propertylist.mm20
-rw-r--r--src/lib/corelib/jsextensions/temporarydir.cpp4
-rw-r--r--src/lib/corelib/jsextensions/textfile.cpp4
-rw-r--r--src/lib/corelib/jsextensions/utilitiesextension.cpp22
-rw-r--r--src/lib/corelib/language/builtindeclarations.cpp50
-rw-r--r--src/lib/corelib/language/evaluatorscriptclass.cpp4
-rw-r--r--src/lib/corelib/language/filetags.cpp2
-rw-r--r--src/lib/corelib/language/item.cpp12
-rw-r--r--src/lib/corelib/language/moduleloader.cpp22
-rw-r--r--src/lib/corelib/language/projectresolver.cpp4
-rw-r--r--src/lib/corelib/language/propertydeclaration.cpp2
-rw-r--r--src/lib/corelib/language/scriptengine.cpp66
-rw-r--r--src/lib/corelib/logging/ilogsink.cpp10
-rw-r--r--src/lib/corelib/logging/logger.cpp4
-rw-r--r--src/lib/corelib/parser/qmlerror.cpp2
-rw-r--r--src/lib/corelib/parser/qmljsparser.cpp6
-rw-r--r--src/lib/corelib/tools/applecodesignutils.cpp2
-rw-r--r--src/lib/corelib/tools/codelocation.cpp4
-rw-r--r--src/lib/corelib/tools/commandechomode.cpp8
-rw-r--r--src/lib/corelib/tools/error.cpp2
-rw-r--r--src/lib/corelib/tools/fileinfo.cpp4
-rw-r--r--src/lib/corelib/tools/filetime.cpp2
-rw-r--r--src/lib/corelib/tools/hostosinfo.h2
-rw-r--r--src/lib/corelib/tools/installoptions.cpp4
-rw-r--r--src/lib/corelib/tools/jsliterals.cpp6
-rw-r--r--src/lib/corelib/tools/launcherinterface.cpp2
-rw-r--r--src/lib/corelib/tools/msvcinfo.h2
-rw-r--r--src/lib/corelib/tools/persistence.cpp2
-rw-r--r--src/lib/corelib/tools/preferences.cpp16
-rw-r--r--src/lib/corelib/tools/profile.h2
-rw-r--r--src/lib/corelib/tools/profiling.cpp8
-rw-r--r--src/lib/corelib/tools/qbsassert.cpp2
-rw-r--r--src/lib/corelib/tools/qbspluginmanager.cpp6
-rw-r--r--src/lib/corelib/tools/settings.cpp2
-rw-r--r--src/lib/corelib/tools/settingscreator.cpp4
-rw-r--r--src/lib/corelib/tools/settingsmodel.cpp2
-rw-r--r--src/lib/corelib/tools/setupprojectparameters.cpp2
-rw-r--r--src/lib/corelib/tools/shellutils.cpp6
-rw-r--r--src/lib/corelib/tools/toolchains.cpp2
-rw-r--r--src/lib/corelib/tools/vsenvironmentdetector.cpp6
60 files changed, 290 insertions, 289 deletions
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<ArtifactData> 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<QVariantMap>(), 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<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(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<UiScriptBinding*>(member))
orderedMembers[toString(scriptBinding->qualifiedId)] = iter;
else if (cast<UiPublicMember*>(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<Artifact *>::toString(Artifact * const &artifact) const
{
- return artifact ? artifact->filePath() : QLatin1String("<null>");
+ return artifact ? artifact->filePath() : QStringLiteral("<null>");
}
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<Artifact *> 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<QString>(&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<CodeLocation>(&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<QStringList>(&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<QStringList>(&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<QString>(&ProductData::buildDirectory,
- QLatin1String("GeneratableProductData::buildDirectory: "
+ QStringLiteral("GeneratableProductData::buildDirectory: "
"internal bug; this should not happen."));
}
QString GeneratableProjectData::name() const
{
return uniqueValue<QString>(&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<ScriptEngine *>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<XmlDomNode*>(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<QDir::Filters>(context->argument(1).toUInt32());
@@ -170,7 +170,7 @@ QScriptValue File::js_remove(QScriptContext *context, QScriptEngine *engine)
const auto se = static_cast<ScriptEngine *>(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<ScriptEngine *>(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<ScriptEngine *>(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<const void *>(qscriptvalue_cast<quintptr>(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<ScriptEngine *>(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<ScriptEngine *>(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<PropertyList*>(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<std::pair<QString, ItemType>>({
- { 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 &parameters)
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<QString> &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("<Unknown File>");
+ rv = QStringLiteral("<Unknown File>");
} 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<AST::ArrayMemberExpression *>(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<std::string> &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<QSettings> 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<MSVC *> &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<MSVC *> &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) {