QmlCompiler: Rename QmlJSImporter

Add an extra 'Q' for consistency.

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

4 files changed, 24 insertions, 24 deletions

diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 9ff876595c..7fb51157f3 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -8,9 +8,9 @@ qt_add_module(QmlCompiler
     STATIC
     INTERNAL_MODULE
     SOURCES
-        qmljsimporter.cpp qmljsimporter_p.h
         qmljstypereader.cpp qmljstypereader_p.h
         qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h
+        qqmljsimporter.cpp qqmljsimporter_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 05fd39c98b..6d1ce8c2f7 100644
--- a/src/qmlcompiler/qmlcompiler.pro
+++ b/src/qmlcompiler/qmlcompiler.pro
@@ -6,7 +6,7 @@ CONFIG    += internal_module
 SOURCES = \
     qqmljsresourcefilemapper.cpp \
     qqmljsimportedmembersvisitor.cpp \
-    qmljsimporter.cpp \
+    qqmljsimporter.cpp \
     qmljstypereader.cpp \
     qqmljsscope.cpp \
     typedescriptionreader.cpp \
@@ -15,7 +15,7 @@ SOURCES = \
 HEADERS = \
     qqmljsresourcefilemapper_p.h \
     qqmljsimportedmembersvisitor_p.h \
-    qmljsimporter_p.h \
+    qqmljsimporter_p.h \
     qmljstypereader_p.h \
     qqmljsmetatypes_p.h \
     qqmljsscope_p.h \
diff --git a/src/qmlcompiler/qmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp
index 9385f74274..f5effd61ba 100644
--- a/src/qmlcompiler/qmljsimporter.cpp
+++ b/src/qmlcompiler/qqmljsimporter.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include "qmljsimporter_p.h"
+#include "qqmljsimporter_p.h"
 #include "typedescriptionreader_p.h"
 #include "qmljstypereader_p.h"
 
@@ -53,7 +53,7 @@ static QQmlDirParser createQmldirParserForFile(const QString &filename)
     return parser;
 }
 
-void QmlJSImporter::readQmltypes(
+void QQmlJSImporter::readQmltypes(
         const QString &filename, QHash<QString, QQmlJSScope::Ptr> *objects)
 {
     const QFileInfo fileInfo(filename);
@@ -76,7 +76,7 @@ void QmlJSImporter::readQmltypes(
         m_warnings.append(reader.errorMessage());
 }
 
-QmlJSImporter::Import QmlJSImporter::readQmldir(const QString &path)
+QQmlJSImporter::Import QQmlJSImporter::readQmldir(const QString &path)
 {
     Import result;
     auto reader = createQmldirParserForFile(path + SlashQmldir);
@@ -114,9 +114,9 @@ QmlJSImporter::Import QmlJSImporter::readQmldir(const QString &path)
     return result;
 }
 
-void QmlJSImporter::importDependencies(
-        const QmlJSImporter::Import &import,
-        QmlJSImporter::AvailableTypes *types, const QString &prefix, QTypeRevision version)
+void QQmlJSImporter::importDependencies(
+        const QQmlJSImporter::Import &import,
+        QQmlJSImporter::AvailableTypes *types, const QString &prefix, QTypeRevision version)
 {
     // Import the dependencies with an invalid prefix. The prefix will never be matched by actual
     // QML code but the C++ types will be visible.
@@ -130,9 +130,9 @@ void QmlJSImporter::importDependencies(
     }
 }
 
-void QmlJSImporter::processImport(
-        const QmlJSImporter::Import &import,
-        QmlJSImporter::AvailableTypes *types,
+void QQmlJSImporter::processImport(
+        const QQmlJSImporter::Import &import,
+        QQmlJSImporter::AvailableTypes *types,
         const QString &prefix)
 {
     for (auto it = import.scripts.begin(); it != import.scripts.end(); ++it)
@@ -158,7 +158,7 @@ void QmlJSImporter::processImport(
 /*!
  * Imports builtins.qmltypes found in any of the import paths.
  */
-QmlJSImporter::ImportedTypes QmlJSImporter::importBuiltins()
+QQmlJSImporter::ImportedTypes QQmlJSImporter::importBuiltins()
 {
     AvailableTypes types;
 
@@ -178,7 +178,7 @@ QmlJSImporter::ImportedTypes QmlJSImporter::importBuiltins()
 /*!
  * Imports types from the specified \a qmltypesFiles.
  */
-QmlJSImporter::ImportedTypes QmlJSImporter::importQmltypes(const QStringList &qmltypesFiles)
+QQmlJSImporter::ImportedTypes QQmlJSImporter::importQmltypes(const QStringList &qmltypesFiles)
 {
     AvailableTypes types;
     Import result;
@@ -192,7 +192,7 @@ QmlJSImporter::ImportedTypes QmlJSImporter::importQmltypes(const QStringList &qm
     return types.qmlNames;
 }
 
-QmlJSImporter::ImportedTypes QmlJSImporter::importModule(
+QQmlJSImporter::ImportedTypes QQmlJSImporter::importModule(
         const QString &module, const QString &prefix, QTypeRevision version)
 {
     AvailableTypes result;
@@ -200,7 +200,7 @@ QmlJSImporter::ImportedTypes QmlJSImporter::importModule(
     return result.qmlNames;
 }
 
-void QmlJSImporter::importHelper(const QString &module, AvailableTypes *types,
+void QQmlJSImporter::importHelper(const QString &module, AvailableTypes *types,
                                                 const QString &prefix, QTypeRevision version)
 {
 
@@ -227,7 +227,7 @@ void QmlJSImporter::importHelper(const QString &module, AvailableTypes *types,
     m_seenImports.insert(importId, {});
 }
 
-QQmlJSScope::Ptr QmlJSImporter::localFile2ScopeTree(const QString &filePath)
+QQmlJSScope::Ptr QQmlJSImporter::localFile2ScopeTree(const QString &filePath)
 {
     const auto seen = m_importedFiles.find(filePath);
     if (seen != m_importedFiles.end())
@@ -262,7 +262,7 @@ QQmlJSScope::Ptr QmlJSImporter::localFile2ScopeTree(const QString &filePath)
     return result;
 }
 
-QmlJSImporter::ImportedTypes QmlJSImporter::importFileOrDirectory(
+QQmlJSImporter::ImportedTypes QQmlJSImporter::importFileOrDirectory(
         const QString &fileOrDirectory, const QString &prefix)
 {
     AvailableTypes result;
diff --git a/src/qmlcompiler/qmljsimporter_p.h b/src/qmlcompiler/qqmljsimporter_p.h
index 31a1d57879..f13724b9cf 100644
--- a/src/qmlcompiler/qmljsimporter_p.h
+++ b/src/qmlcompiler/qqmljsimporter_p.h
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLJSIMPORTER_H
-#define QMLJSIMPORTER_H
+#ifndef QQMLJSIMPORTER_P_H
+#define QQMLJSIMPORTER_P_H
 
 //
 //  W A R N I N G
@@ -42,12 +42,12 @@
 #include "qqmljsscope_p.h"
 #include <QtQml/private/qqmldirparser_p.h>
 
-class QmlJSImporter
+class QQmlJSImporter
 {
 public:
     using ImportedTypes = QHash<QString, QQmlJSScope::ConstPtr>;
 
-    QmlJSImporter(const QStringList &importPaths) : m_importPaths(importPaths) {}
+    QQmlJSImporter(const QStringList &importPaths) : m_importPaths(importPaths) {}
 
     ImportedTypes importBuiltins();
     ImportedTypes importQmltypes(const QStringList &qmltypesFiles);
@@ -86,7 +86,7 @@ private:
                       QTypeRevision version = QTypeRevision());
     void processImport(const Import &import, AvailableTypes *types,
                        const QString &prefix = QString());
-    void importDependencies(const QmlJSImporter::Import &import,
+    void importDependencies(const QQmlJSImporter::Import &import,
                             AvailableTypes *types,
                             const QString &prefix = QString(),
                             QTypeRevision version = QTypeRevision());
@@ -100,4 +100,4 @@ private:
     QStringList m_warnings;
 };
 
-#endif // QMLJSIMPORTER_H
+#endif // QQMLJSIMPORTER_P_H