Rename QQmlJSImportedMembersVisitor

We need to make this a general import visitor.

Change-Id: I735378fc9139cb4891f8b113d86395df856fb4e9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

5 files changed, 15 insertions, 15 deletions

diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 8b7c6139f3..0eab79259f 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -8,8 +8,8 @@ qt_internal_add_module(QmlCompiler
     STATIC
     INTERNAL_MODULE
     SOURCES
-        qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h
         qqmljsimporter.cpp qqmljsimporter_p.h
+        qqmljsimportvisitor.cpp qqmljsimportvisitor_p.h
         qqmljsmetatypes_p.h
         qqmljsresourcefilemapper.cpp qqmljsresourcefilemapper_p.h
         qqmljsscope.cpp qqmljsscope_p.h
diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro
index fa280dcd8e..111d27932a 100644
--- a/src/qmlcompiler/qmlcompiler.pro
+++ b/src/qmlcompiler/qmlcompiler.pro
@@ -5,7 +5,7 @@ CONFIG    += internal_module
 
 SOURCES = \
     qqmljsresourcefilemapper.cpp \
-    qqmljsimportedmembersvisitor.cpp \
+    qqmljsimportvisitor.cpp \
     qqmljsimporter.cpp \
     qqmljstypereader.cpp \
     qqmljsscope.cpp \
@@ -14,7 +14,7 @@ SOURCES = \
 
 HEADERS = \
     qqmljsresourcefilemapper_p.h \
-    qqmljsimportedmembersvisitor_p.h \
+    qqmljsimportvisitor_p.h \
     qqmljsimporter_p.h \
     qqmljstypereader_p.h \
     qqmljsmetatypes_p.h \
diff --git a/src/qmlcompiler/qqmljsimportedmembersvisitor.cpp b/src/qmlcompiler/qqmljsimportvisitor.cpp
index 3a78073f4e..87f9bc086e 100644
--- a/src/qmlcompiler/qqmljsimportedmembersvisitor.cpp
+++ b/src/qmlcompiler/qqmljsimportvisitor.cpp
@@ -26,13 +26,13 @@
 **
 ****************************************************************************/
 
-#include "qqmljsimportedmembersvisitor_p.h"
+#include "qqmljsimportvisitor_p.h"
 
 QT_BEGIN_NAMESPACE
 
 using namespace QQmlJS::AST;
 
-QQmlJSScope::Ptr QQmlJSImportedMembersVisitor::result(const QString &scopeName) const
+QQmlJSScope::Ptr QQmlJSImportVisitor::result(const QString &scopeName) const
 {
     QQmlJSScope::Ptr result = QQmlJSScope::create();
     result->setIsComposite(true);
@@ -59,7 +59,7 @@ QQmlJSScope::Ptr QQmlJSImportedMembersVisitor::result(const QString &scopeName)
     return result;
 }
 
-bool QQmlJSImportedMembersVisitor::visit(UiObjectDefinition *definition)
+bool QQmlJSImportVisitor::visit(UiObjectDefinition *definition)
 {
     QQmlJSScope::Ptr scope = QQmlJSScope::create();
     QString superType;
@@ -75,12 +75,12 @@ bool QQmlJSImportedMembersVisitor::visit(UiObjectDefinition *definition)
     return true;
 }
 
-void QQmlJSImportedMembersVisitor::endVisit(UiObjectDefinition *)
+void QQmlJSImportVisitor::endVisit(UiObjectDefinition *)
 {
     m_currentObjects.pop_back();
 }
 
-bool QQmlJSImportedMembersVisitor::visit(UiPublicMember *publicMember)
+bool QQmlJSImportVisitor::visit(UiPublicMember *publicMember)
 {
     switch (publicMember->type) {
     case UiPublicMember::Signal: {
@@ -119,7 +119,7 @@ bool QQmlJSImportedMembersVisitor::visit(UiPublicMember *publicMember)
     return true;
 }
 
-bool QQmlJSImportedMembersVisitor::visit(UiSourceElement *sourceElement)
+bool QQmlJSImportVisitor::visit(UiSourceElement *sourceElement)
 {
     if (FunctionExpression *fexpr = sourceElement->sourceElement->asFunctionDefinition()) {
         QQmlJSMetaMethod method;
@@ -146,7 +146,7 @@ bool QQmlJSImportedMembersVisitor::visit(UiSourceElement *sourceElement)
     return true;
 }
 
-bool QQmlJSImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
+bool QQmlJSImportVisitor::visit(UiScriptBinding *scriptBinding)
 {
     if (scriptBinding->qualifiedId->name == QLatin1String("id")) {
         const auto *statement = cast<ExpressionStatement *>(scriptBinding->statement);
@@ -156,7 +156,7 @@ bool QQmlJSImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
     return true;
 }
 
-bool QQmlJSImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
+bool QQmlJSImportVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
 {
     QQmlJSMetaEnum qmlEnum(uied->name.toString());
     for (const auto *member = uied->members; member; member = member->next)
@@ -165,7 +165,7 @@ bool QQmlJSImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
     return true;
 }
 
-void QQmlJSImportedMembersVisitor::throwRecursionDepthError()
+void QQmlJSImportVisitor::throwRecursionDepthError()
 {
     m_errors.append(QStringLiteral("Maximum statement or expression depth exceeded"));
 }
diff --git a/src/qmlcompiler/qqmljsimportedmembersvisitor_p.h b/src/qmlcompiler/qqmljsimportvisitor_p.h
index ae1804cadb..c8cbd66f14 100644
--- a/src/qmlcompiler/qqmljsimportedmembersvisitor_p.h
+++ b/src/qmlcompiler/qqmljsimportvisitor_p.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlJSImportedMembersVisitor : public QQmlJS::AST::Visitor
+class QQmlJSImportVisitor : public QQmlJS::AST::Visitor
 {
 public:
     QQmlJSScope::Ptr result(const QString &scopeName) const;
diff --git a/src/qmlcompiler/qqmljstypereader.cpp b/src/qmlcompiler/qqmljstypereader.cpp
index 90293e3e5f..0e12c8de95 100644
--- a/src/qmlcompiler/qqmljstypereader.cpp
+++ b/src/qmlcompiler/qqmljstypereader.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include "qqmljstypereader_p.h"
-#include "qqmljsimportedmembersvisitor_p.h"
+#include "qqmljsimportvisitor_p.h"
 
 #include <QtQml/private/qqmljsast_p.h>
 #include <QtQml/private/qqmljsengine_p.h>
@@ -127,7 +127,7 @@ QQmlJSScope::Ptr QQmlJSTypeReader::operator()()
     if (!isJavaScript) {
         QQmlJS::AST::UiProgram *program = parser.ast();
         m_imports = parseHeaders(program->headers);
-        QQmlJSImportedMembersVisitor membersVisitor;
+        QQmlJSImportVisitor membersVisitor;
         program->members->accept(&membersVisitor);
         m_errors = membersVisitor.errors();
         return membersVisitor.result(scopeName);