QmlCompiler: Rename ImportedMembersVisitor

The class names should start with a common prefix.

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

5 files changed, 18 insertions, 18 deletions

diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index c015a339a9..7a1030b717 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -8,10 +8,10 @@ qt_add_module(QmlCompiler
     STATIC
     INTERNAL_MODULE
     SOURCES
-        importedmembersvisitor.cpp importedmembersvisitor_p.h
         qmljsimporter.cpp qmljsimporter_p.h
         qmljstypereader.cpp qmljstypereader_p.h
         qmlstreamwriter.cpp qmlstreamwriter_p.h
+        qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h
         qqmljsmetatypes_p.h
         qqmljsscope.cpp qqmljsscope_p.h
         resourcefilemapper.cpp resourcefilemapper_p.h
diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro
index 159c7c40ed..255b29aa57 100644
--- a/src/qmlcompiler/qmlcompiler.pro
+++ b/src/qmlcompiler/qmlcompiler.pro
@@ -5,7 +5,7 @@ CONFIG    += internal_module
 
 SOURCES = \
     resourcefilemapper.cpp \
-    importedmembersvisitor.cpp \
+    qqmljsimportedmembersvisitor.cpp \
     qmljsimporter.cpp \
     qmljstypereader.cpp \
     qqmljsscope.cpp \
@@ -14,7 +14,7 @@ SOURCES = \
 
 HEADERS = \
     resourcefilemapper_p.h \
-    importedmembersvisitor_p.h \
+    qqmljsimportedmembersvisitor_p.h \
     qmljsimporter_p.h \
     qmljstypereader_p.h \
     qqmljsmetatypes_p.h \
diff --git a/src/qmlcompiler/qmljstypereader.cpp b/src/qmlcompiler/qmljstypereader.cpp
index 2ffa10d3f4..dd2417a647 100644
--- a/src/qmlcompiler/qmljstypereader.cpp
+++ b/src/qmlcompiler/qmljstypereader.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include "qmljstypereader_p.h"
-#include "importedmembersvisitor_p.h"
+#include "qqmljsimportedmembersvisitor_p.h"
 
 #include <QtQml/private/qqmljsast_p.h>
 #include <QtQml/private/qqmljsengine_p.h>
@@ -125,7 +125,7 @@ QQmlJSScope::Ptr QmlJSTypeReader::operator()()
     if (!isJavaScript) {
         QQmlJS::AST::UiProgram *program = parser.ast();
         m_imports = parseHeaders(program->headers);
-        ImportedMembersVisitor membersVisitor;
+        QQmlJSImportedMembersVisitor membersVisitor;
         program->members->accept(&membersVisitor);
         m_errors = membersVisitor.errors();
         return membersVisitor.result(scopeName);
diff --git a/src/qmlcompiler/importedmembersvisitor.cpp b/src/qmlcompiler/qqmljsimportedmembersvisitor.cpp
index 95edc74d27..3e828f87fb 100644
--- a/src/qmlcompiler/importedmembersvisitor.cpp
+++ b/src/qmlcompiler/qqmljsimportedmembersvisitor.cpp
@@ -26,11 +26,11 @@
 **
 ****************************************************************************/
 
-#include "importedmembersvisitor_p.h"
+#include "qqmljsimportedmembersvisitor_p.h"
 
 using namespace QQmlJS::AST;
 
-QQmlJSScope::Ptr ImportedMembersVisitor::result(const QString &scopeName) const
+QQmlJSScope::Ptr QQmlJSImportedMembersVisitor::result(const QString &scopeName) const
 {
     QQmlJSScope::Ptr result = QQmlJSScope::create();
     result->setIsComposite(true);
@@ -57,7 +57,7 @@ QQmlJSScope::Ptr ImportedMembersVisitor::result(const QString &scopeName) const
     return result;
 }
 
-bool ImportedMembersVisitor::visit(UiObjectDefinition *definition)
+bool QQmlJSImportedMembersVisitor::visit(UiObjectDefinition *definition)
 {
     QQmlJSScope::Ptr scope = QQmlJSScope::create();
     QString superType;
@@ -73,12 +73,12 @@ bool ImportedMembersVisitor::visit(UiObjectDefinition *definition)
     return true;
 }
 
-void ImportedMembersVisitor::endVisit(UiObjectDefinition *)
+void QQmlJSImportedMembersVisitor::endVisit(UiObjectDefinition *)
 {
     m_currentObjects.pop_back();
 }
 
-bool ImportedMembersVisitor::visit(UiPublicMember *publicMember)
+bool QQmlJSImportedMembersVisitor::visit(UiPublicMember *publicMember)
 {
     switch (publicMember->type) {
     case UiPublicMember::Signal: {
@@ -117,7 +117,7 @@ bool ImportedMembersVisitor::visit(UiPublicMember *publicMember)
     return true;
 }
 
-bool ImportedMembersVisitor::visit(UiSourceElement *sourceElement)
+bool QQmlJSImportedMembersVisitor::visit(UiSourceElement *sourceElement)
 {
     if (FunctionExpression *fexpr = sourceElement->sourceElement->asFunctionDefinition()) {
         QQmlJSMetaMethod method;
@@ -144,7 +144,7 @@ bool ImportedMembersVisitor::visit(UiSourceElement *sourceElement)
     return true;
 }
 
-bool ImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
+bool QQmlJSImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
 {
     if (scriptBinding->qualifiedId->name == QLatin1String("id")) {
         const auto *statement = cast<ExpressionStatement *>(scriptBinding->statement);
@@ -154,7 +154,7 @@ bool ImportedMembersVisitor::visit(UiScriptBinding *scriptBinding)
     return true;
 }
 
-bool ImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
+bool QQmlJSImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
 {
     QQmlJSMetaEnum qmlEnum(uied->name.toString());
     for (const auto *member = uied->members; member; member = member->next)
@@ -163,7 +163,7 @@ bool ImportedMembersVisitor::visit(QQmlJS::AST::UiEnumDeclaration *uied)
     return true;
 }
 
-void ImportedMembersVisitor::throwRecursionDepthError()
+void QQmlJSImportedMembersVisitor::throwRecursionDepthError()
 {
     m_errors.append(QStringLiteral("Maximum statement or expression depth exceeded"));
 }
diff --git a/src/qmlcompiler/importedmembersvisitor_p.h b/src/qmlcompiler/qqmljsimportedmembersvisitor_p.h
index 71fd0927d6..15805fd82b 100644
--- a/src/qmlcompiler/importedmembersvisitor_p.h
+++ b/src/qmlcompiler/qqmljsimportedmembersvisitor_p.h
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#ifndef IMPORTEDMEMBERSVISITOR_H
-#define IMPORTEDMEMBERSVISITOR_H
+#ifndef QQMLJSIMPORTEDMEMBERSVISITOR_P_H
+#define QQMLJSIMPORTEDMEMBERSVISITOR_P_H
 
 //
 //  W A R N I N G
@@ -43,7 +43,7 @@
 
 #include <private/qqmljsast_p.h>
 
-class ImportedMembersVisitor : public QQmlJS::AST::Visitor
+class QQmlJSImportedMembersVisitor : public QQmlJS::AST::Visitor
 {
 public:
     QQmlJSScope::Ptr result(const QString &scopeName) const;
@@ -67,4 +67,4 @@ private:
     QStringList m_errors;
 };
 
-#endif // IMPORTEDMEMBERSVISITOR_H
+#endif // QQMLJSIMPORTEDMEMBERSVISITOR_P_H