aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Benelli <marco.benelli@qt.io>2018-07-10 16:47:12 +0200
committerMarco Benelli <marco.benelli@qt.io>2018-07-12 09:33:45 +0000
commit86dcf1580f4b8cedcd65b1b8744af876583bd9b3 (patch)
tree62819ed7e01c3f2f3699ff7fc2602f42c906110b
parentc6b9d1a5b88dee95065db9eaba488e2fd57acd74 (diff)
qmlimportscanner: add some literal strings definitions
Change-Id: Ie65e7541b5a189867b27471b83e52dc2e4416183 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--tools/qmlimportscanner/main.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index eb5acfae8c..60e0f1773f 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -65,6 +65,9 @@ inline QString pluginsLiteral() { return QStringLiteral("plugins"); }
inline QString pathLiteral() { return QStringLiteral("path"); }
inline QString classnamesLiteral() { return QStringLiteral("classnames"); }
inline QString dependenciesLiteral() { return QStringLiteral("dependencies"); }
+inline QString moduleLiteral() { return QStringLiteral("module"); }
+inline QString javascriptLiteral() { return QStringLiteral("javascript"); }
+inline QString directoryLiteral() { return QStringLiteral("directory"); }
void printUsage(const QString &appNameIn)
{
@@ -97,9 +100,9 @@ QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, con
QString name = importNode->fileName.toString();
import[nameLiteral()] = name;
if (name.endsWith(QLatin1String(".js"))) {
- import[typeLiteral()] = QStringLiteral("javascript");
+ import[typeLiteral()] = javascriptLiteral();
} else {
- import[typeLiteral()] = QStringLiteral("directory");
+ import[typeLiteral()] = directoryLiteral();
}
import[pathLiteral()] = QDir::cleanPath(path + QLatin1Char('/') + name);
@@ -115,7 +118,7 @@ QVariantList findImportsInAst(QQmlJS::AST::UiHeaderItemList *headerItemList, con
name.chop(1); // remove trailing "."
if (!name.isEmpty())
import[nameLiteral()] = name;
- import[typeLiteral()] = QStringLiteral("module");
+ import[typeLiteral()] = moduleLiteral();
import[versionLiteral()] = code.mid(importNode->versionToken.offset, importNode->versionToken.length);
}
@@ -225,7 +228,7 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
for (int i = 0; i < importsCopy.length(); ++i) {
QVariantMap import = qvariant_cast<QVariantMap>(importsCopy.at(i));
- if (import.value(typeLiteral()) == QLatin1String("module")) {
+ if (import.value(typeLiteral()) == moduleLiteral()) {
const QPair<QString, QString> paths =
resolveImportPath(import.value(nameLiteral()).toString(), import.value(versionLiteral()).toString());
if (!paths.first.isEmpty()) {
@@ -244,7 +247,7 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
for (const QString &line : dependencies) {
const auto dep = line.splitRef(QLatin1Char(' '));
QVariantMap depImport;
- depImport[typeLiteral()] = QStringLiteral("module");
+ depImport[typeLiteral()] = moduleLiteral();
depImport[nameLiteral()] = dep[0].toString();
depImport[versionLiteral()] = dep[1].toString();
importsCopy.append(depImport);
@@ -296,7 +299,7 @@ struct ImportCollector : public QQmlJS::Directives
void importFile(const QString &jsfile, const QString &module, int line, int column) override
{
QVariantMap entry;
- entry[typeLiteral()] = QStringLiteral("javascript");
+ entry[typeLiteral()] = javascriptLiteral();
entry[pathLiteral()] = jsfile;
imports << entry;
@@ -309,10 +312,10 @@ struct ImportCollector : public QQmlJS::Directives
{
QVariantMap entry;
if (uri.contains(QLatin1Char('/'))) {
- entry[typeLiteral()] = QStringLiteral("directory");
+ entry[typeLiteral()] = directoryLiteral();
entry[nameLiteral()] = uri;
} else {
- entry[typeLiteral()] = QStringLiteral("module");
+ entry[typeLiteral()] = moduleLiteral();
entry[nameLiteral()] = uri;
entry[versionLiteral()] = version;
}
@@ -446,7 +449,7 @@ QSet<QString> importModulePaths(const QVariantList &imports) {
QVariantMap import = qvariant_cast<QVariantMap>(importVariant);
QString path = import.value(pathLiteral()).toString();
QString type = import.value(typeLiteral()).toString();
- if (type == QLatin1String("module") && !path.isEmpty())
+ if (type == moduleLiteral() && !path.isEmpty())
ret.insert(QDir(path).canonicalPath());
}
return ret;