aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/inputartifactscanner.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/inputartifactscanner.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/inputartifactscanner.cpp')
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index d5a0fabb6..ba646c54f 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -62,12 +62,14 @@ static void collectIncludePaths(const QVariantMap &modules, QSet<QString> *colle
QMapIterator<QString, QVariant> iterator(modules);
while (iterator.hasNext()) {
iterator.next();
- if (iterator.key() == "cpp") {
- QVariant includePathsVariant = iterator .value().toMap().value("includePaths");
+ if (iterator.key() == QLatin1String("cpp")) {
+ QVariant includePathsVariant =
+ iterator.value().toMap().value(QLatin1String("includePaths"));
if (includePathsVariant.isValid())
collectedPaths->unite(QSet<QString>::fromList(includePathsVariant.toStringList()));
} else {
- collectIncludePaths(iterator.value().toMap().value("modules").toMap(), collectedPaths);
+ collectIncludePaths(iterator.value().toMap().value(QLatin1String("modules")).toMap(),
+ collectedPaths);
}
}
}
@@ -184,7 +186,8 @@ void InputArtifactScanner::scan()
if (cacheHit) {
includePaths = cacheItem.includePaths;
} else {
- includePaths = collectIncludePaths(inputArtifact->properties->value().value("modules").toMap());
+ includePaths = collectIncludePaths(inputArtifact->properties->value()
+ .value(QLatin1String("modules")).toMap());
cacheItem.includePaths = includePaths;
cacheItem.valid = true;
}
@@ -212,7 +215,7 @@ void InputArtifactScanner::scanForFileDependencies(ScannerPlugin *scannerPlugin,
{
if (m_logger.debugEnabled()) {
m_logger.qbsDebug() << QString::fromLocal8Bit("scanning %1 [%2]\n from %3")
- .arg(inputArtifact->filePath()).arg(scannerPlugin->fileTag)
+ .arg(inputArtifact->filePath()).arg(QLatin1String(scannerPlugin->fileTag))
.arg(m_artifact->filePath());
}