aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/buildgraph')
-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
6 files changed, 20 insertions, 20 deletions
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 08:37:02 +0000