diff --git a/tools/qmltc/prototype/qml2cppdefaultpasses.cpp b/tools/qmltc/prototype/qml2cppdefaultpasses.cpp index 13ce81202c..870f94359a 100644 --- a/tools/qmltc/prototype/qml2cppdefaultpasses.cpp +++ b/tools/qmltc/prototype/qml2cppdefaultpasses.cpp @@ -506,23 +506,16 @@ QHash makeUniqueCppNames(const Qml2CppContext &context, QHash typeCounts; for (const QString &str : cppKeywords) typeCounts.insert(str, 1); - const auto knownCppNames = context.typeResolver->gatherKnownCppClassNames(); - for (const QString &str : knownCppNames) - typeCounts.insert(str, 1); // root is special: QQmlJSScope::Ptr root = context.typeResolver->root(); QFileInfo fi(context.documentUrl); auto cppName = fi.baseName(); - // TODO: root is special and with implicit import directory cppName might be - // in typeCounts. -#if 0 if (typeCounts.contains(cppName)) { context.recordError(root->sourceLocation(), u"Root object name '" + cppName + u"' is reserved"); return typeCounts; } -#endif if (cppName.isEmpty()) { context.recordError(root->sourceLocation(), u"Root object's name is empty"_qs); return typeCounts; diff --git a/tools/qmltc/prototype/typeresolver.h b/tools/qmltc/prototype/typeresolver.h index fc8e1c70eb..a382c4c07a 100644 --- a/tools/qmltc/prototype/typeresolver.h +++ b/tools/qmltc/prototype/typeresolver.h @@ -42,30 +42,6 @@ class TypeResolver : public QQmlJSTypeResolver public: TypeResolver(QQmlJSImporter *importer); - // helper function for code generator - QStringList gatherKnownCppClassNames() const - { - QStringList cppNames; - QQmlJSImporter::ImportedTypes builtins = m_importer->builtinInternalNames(); - cppNames.reserve(builtins.size() + m_imports.size()); - const auto getInternalName = [](const QQmlJSImportedScope &t) { - if (!t.scope) - return QString(); - return t.scope->internalName(); - }; - std::transform(builtins.cbegin(), builtins.cend(), std::back_inserter(cppNames), - getInternalName); - - // builtins must be valid: all QQmlJSScopes are not nullptr and have - // non-empty internal names. m_imports may have nullptrs, due to import - // namespaces - Q_ASSERT(std::find(cppNames.cbegin(), cppNames.cend(), QString()) == cppNames.cend()); - - std::transform(m_imports.cbegin(), m_imports.cend(), std::back_inserter(cppNames), - getInternalName); - return cppNames; - } - void init(Visitor &visitor, QQmlJS::AST::Node *program); // TODO: this shouldn't be exposed. instead, all the custom passes on