aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/transformer.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-01-08 14:36:16 -0500
committerJake Petroules <jake.petroules@petroules.com>2014-01-14 17:41:47 +0100
commit49a051bd4b320aff32066181932dc27a4eea63c5 (patch)
treea8f5c6e56bb275d2ae8c83179065623385d1395a /src/lib/corelib/buildgraph/transformer.cpp
parentcf706560d394e582a897d2a69e79ce5740d2459d (diff)
Prepare for using QT_NO_CAST_FROM/TO_ASCII.
Change-Id: Ib39e49e896cbddf5a5bd851088500991d962355a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/transformer.cpp')
-rw-r--r--src/lib/corelib/buildgraph/transformer.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 5c095f9db..87bc45527 100644
--- a/src/lib/corelib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
@@ -96,14 +96,14 @@ void Transformer::setupInputs(QScriptEngine *scriptEngine, QScriptValue targetSc
{
const QString &defaultModuleName = rule->module->name;
QScriptValue scriptValue = translateInOutputs(scriptEngine, inputs, defaultModuleName);
- targetScriptValue.setProperty("inputs", scriptValue);
+ targetScriptValue.setProperty(QLatin1String("inputs"), scriptValue);
if (inputs.count() == 1) {
Artifact *input = *inputs.begin();
const FileTags &fileTags = input->fileTags;
QBS_ASSERT(!fileTags.isEmpty(), return);
QScriptValue inputsForFileTag = scriptValue.property(fileTags.begin()->toString());
QScriptValue inputScriptValue = inputsForFileTag.property(0);
- targetScriptValue.setProperty("input", inputScriptValue);
+ targetScriptValue.setProperty(QLatin1String("input"), inputScriptValue);
} else {
targetScriptValue.setProperty(QLatin1String("input"), scriptEngine->undefinedValue());
}
@@ -113,14 +113,14 @@ void Transformer::setupOutputs(QScriptEngine *scriptEngine, QScriptValue targetS
{
const QString &defaultModuleName = rule->module->name;
QScriptValue scriptValue = translateInOutputs(scriptEngine, outputs, defaultModuleName);
- targetScriptValue.setProperty("outputs", scriptValue);
+ targetScriptValue.setProperty(QLatin1String("outputs"), scriptValue);
if (outputs.count() == 1) {
Artifact *output = *outputs.begin();
const FileTags &fileTags = output->fileTags;
QBS_ASSERT(!fileTags.isEmpty(), return);
QScriptValue outputsForFileTag = scriptValue.property(fileTags.begin()->toString());
QScriptValue outputScriptValue = outputsForFileTag.property(0);
- targetScriptValue.setProperty("output", outputScriptValue);
+ targetScriptValue.setProperty(QLatin1String("output"), outputScriptValue);
} else {
targetScriptValue.setProperty(QLatin1String("output"), scriptEngine->undefinedValue());
}
@@ -132,10 +132,10 @@ static AbstractCommand *createCommandFromScriptValue(const QScriptValue &scriptV
if (scriptValue.isUndefined() || !scriptValue.isValid())
return 0;
AbstractCommand *cmdBase = 0;
- QString className = scriptValue.property("className").toString();
- if (className == "Command")
+ QString className = scriptValue.property(QLatin1String("className")).toString();
+ if (className == QLatin1String("Command"))
cmdBase = new ProcessCommand;
- else if (className == "JavaScriptCommand")
+ else if (className == QLatin1String("JavaScriptCommand"))
cmdBase = new JavaScriptCommand;
if (cmdBase)
cmdBase->fillFromScriptValue(&scriptValue, codeLocation);
@@ -157,14 +157,15 @@ void Transformer::createCommands(const ScriptFunctionConstPtr &script,
propertiesRequestedFromArtifactInPrepareScript = engine->propertiesRequestedFromArtifact();
engine->clearRequestedProperties();
if (Q_UNLIKELY(engine->hasErrorOrException(scriptValue)))
- throw ErrorInfo("evaluating prepare script: " + engine->uncaughtException().toString(),
+ throw ErrorInfo(Tr::tr("evaluating prepare script: ")
+ + engine->uncaughtException().toString(),
CodeLocation(script->location.fileName(),
script->location.line() + engine->uncaughtExceptionLineNumber() - 1));
qDeleteAll(commands);
commands.clear();
if (scriptValue.isArray()) {
- const int count = scriptValue.property("length").toInt32();
+ const int count = scriptValue.property(QLatin1String("length")).toInt32();
for (qint32 i = 0; i < count; ++i) {
QScriptValue item = scriptValue.property(i);
if (item.isValid() && !item.isUndefined()) {