aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlimportscanner
diff options
context:
space:
mode:
authorMarco Benelli <marco.benelli@qt.io>2018-07-10 16:41:45 +0200
committerMarco Benelli <marco.benelli@qt.io>2018-07-12 07:26:16 +0000
commitc6b9d1a5b88dee95065db9eaba488e2fd57acd74 (patch)
tree41aa8937dcc743615bae071a8824599bb753549a /tools/qmlimportscanner
parent13cbbef38cf7dd58a5550a8548a9ea9e820cca85 (diff)
Use anonymous namespace instead of static declarations
Change-Id: Iced889303616fdae0074149a3f10572425275085 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tools/qmlimportscanner')
-rw-r--r--tools/qmlimportscanner/main.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 5bd66243e6..eb5acfae8c 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -53,18 +53,20 @@
QT_USE_NAMESPACE
+namespace {
+
QStringList g_qmlImportPaths;
-static inline QString typeLiteral() { return QStringLiteral("type"); }
-static inline QString versionLiteral() { return QStringLiteral("version"); }
-static inline QString nameLiteral() { return QStringLiteral("name"); }
-static inline QString relativePathLiteral() { return QStringLiteral("relativePath"); }
-static inline QString pluginsLiteral() { return QStringLiteral("plugins"); }
-static inline QString pathLiteral() { return QStringLiteral("path"); }
-static inline QString classnamesLiteral() { return QStringLiteral("classnames"); }
-static inline QString dependenciesLiteral() { return QStringLiteral("dependencies"); }
+inline QString typeLiteral() { return QStringLiteral("type"); }
+inline QString versionLiteral() { return QStringLiteral("version"); }
+inline QString nameLiteral() { return QStringLiteral("name"); }
+inline QString relativePathLiteral() { return QStringLiteral("relativePath"); }
+inline QString pluginsLiteral() { return QStringLiteral("plugins"); }
+inline QString pathLiteral() { return QStringLiteral("path"); }
+inline QString classnamesLiteral() { return QStringLiteral("classnames"); }
+inline QString dependenciesLiteral() { return QStringLiteral("dependencies"); }
-static void printUsage(const QString &appNameIn)
+void printUsage(const QString &appNameIn)
{
const std::wstring appName = appNameIn.toStdWString();
#ifndef QT_BOOTSTRAPPED
@@ -255,7 +257,7 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
}
// Scan a single qml file for import statements
-static QVariantList findQmlImportsInQmlCode(const QString &filePath, const QString &code)
+QVariantList findQmlImportsInQmlCode(const QString &filePath, const QString &code)
{
QQmlJS::Engine engine;
QQmlJS::Lexer lexer(&engine);
@@ -275,7 +277,7 @@ static QVariantList findQmlImportsInQmlCode(const QString &filePath, const QStri
}
// Scan a single qml file for import statements
-static QVariantList findQmlImportsInQmlFile(const QString &filePath)
+QVariantList findQmlImportsInQmlFile(const QString &filePath)
{
QFile file(filePath);
if (!file.open(QIODevice::ReadOnly)) {
@@ -490,6 +492,8 @@ QVariantList findQmlImportsRecursively(const QStringList &qmlDirs, const QString
return ret;
}
+} // namespace
+
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);