diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-25 15:00:13 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-25 23:57:59 +0200 |
commit | 26e5788a273b8614e9b9e701d29a7b6c77adacc0 (patch) | |
tree | 365df53450bcf2a121ac523857f4adaadf2ab0a4 /tools | |
parent | f0031c949ea6e5e6bc5dfb645e125e12192d425d (diff) |
qmllint: Use a hash for scripts read from qmldir files
You cannot use the same name multiple times anyway (for now)
Change-Id: I957340273772a1c5cf0a9da840a305bc8b311e95
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmllint/findwarnings.cpp | 8 | ||||
-rw-r--r-- | tools/qmllint/findwarnings.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/qmllint/findwarnings.cpp b/tools/qmllint/findwarnings.cpp index 7e1dfc743e..5516f86654 100644 --- a/tools/qmllint/findwarnings.cpp +++ b/tools/qmllint/findwarnings.cpp @@ -131,7 +131,7 @@ FindWarningVisitor::Importer::Import FindWarningVisitor::Importer::readQmldir(co const auto scripts = reader.scripts(); for (const auto &script : scripts) { const QString filePath = path + QLatin1Char('/') + script.fileName; - result.scripts.push_back({ script.nameSpace, localFile2ScopeTree(filePath) }); + result.scripts.insert(script.nameSpace, localFile2ScopeTree(filePath)); } return result; } @@ -151,9 +151,9 @@ void FindWarningVisitor::Importer::processImport( import.isAutoImport ? version : import.version); } - for (const auto &it : qAsConst(import.scripts)) { - m_exportedName2Scope.importedQmlNames.insert(prefixedName(prefix, it.first), it.second); - m_exportedName2Scope.exportedQmlNames.insert(it.first, it.second); + for (auto it = import.scripts.begin(); it != import.scripts.end(); ++it) { + m_exportedName2Scope.importedQmlNames.insert(prefixedName(prefix, it.key()), it.value()); + m_exportedName2Scope.exportedQmlNames.insert(it.key(), it.value()); } // add objects diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h index 2c7fe5ce05..cc56f628ee 100644 --- a/tools/qmllint/findwarnings.h +++ b/tools/qmllint/findwarnings.h @@ -95,9 +95,9 @@ private: private: struct Import { QHash<QString, ScopeTree::Ptr> objects; + QHash<QString, ScopeTree::Ptr> scripts; QList<QQmlDirParser::Import> imports; QList<QQmlDirParser::Import> dependencies; - QList<QPair<QString, ScopeTree::Ptr>> scripts; }; void importHelper(const QString &module, const QString &prefix = QString(), |