QmlCompiler: Rename QmlJSTypeReader

Add an extra 'Q' for consistency.

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

5 files changed, 14 insertions, 14 deletions

diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 7fb51157f3..b6eea0ff01 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -8,13 +8,13 @@ qt_add_module(QmlCompiler
     STATIC
     INTERNAL_MODULE
     SOURCES
-        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
         qqmljsstreamwriter.cpp qqmljsstreamwriter_p.h
+        qqmljstypereader.cpp qqmljstypereader_p.h
         typedescriptionreader.cpp typedescriptionreader_p.h
     PUBLIC_LIBRARIES
         Qt::CorePrivate
diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro
index 6d1ce8c2f7..94b3f90ee1 100644
--- a/src/qmlcompiler/qmlcompiler.pro
+++ b/src/qmlcompiler/qmlcompiler.pro
@@ -7,7 +7,7 @@ SOURCES = \
     qqmljsresourcefilemapper.cpp \
     qqmljsimportedmembersvisitor.cpp \
     qqmljsimporter.cpp \
-    qmljstypereader.cpp \
+    qqmljstypereader.cpp \
     qqmljsscope.cpp \
     typedescriptionreader.cpp \
     qqmljsstreamwriter.cpp
@@ -16,7 +16,7 @@ HEADERS = \
     qqmljsresourcefilemapper_p.h \
     qqmljsimportedmembersvisitor_p.h \
     qqmljsimporter_p.h \
-    qmljstypereader_p.h \
+    qqmljstypereader_p.h \
     qqmljsmetatypes_p.h \
     qqmljsscope_p.h \
     typedescriptionreader_p.h \
diff --git a/src/qmlcompiler/qqmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp
index f5effd61ba..d954d48420 100644
--- a/src/qmlcompiler/qqmljsimporter.cpp
+++ b/src/qmlcompiler/qqmljsimporter.cpp
@@ -28,7 +28,7 @@
 
 #include "qqmljsimporter_p.h"
 #include "typedescriptionreader_p.h"
-#include "qmljstypereader_p.h"
+#include "qqmljstypereader_p.h"
 
 #include <QtQml/private/qqmlimportresolver_p.h>
 
@@ -233,7 +233,7 @@ QQmlJSScope::Ptr QQmlJSImporter::localFile2ScopeTree(const QString &filePath)
     if (seen != m_importedFiles.end())
         return *seen;
 
-    QmlJSTypeReader typeReader(filePath);
+    QQmlJSTypeReader typeReader(filePath);
     QQmlJSScope::Ptr result = typeReader();
     m_importedFiles.insert(filePath, result);
 
diff --git a/src/qmlcompiler/qmljstypereader.cpp b/src/qmlcompiler/qqmljstypereader.cpp
index dd2417a647..5f95babb9b 100644
--- a/src/qmlcompiler/qmljstypereader.cpp
+++ b/src/qmlcompiler/qqmljstypereader.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include "qmljstypereader_p.h"
+#include "qqmljstypereader_p.h"
 #include "qqmljsimportedmembersvisitor_p.h"
 
 #include <QtQml/private/qqmljsast_p.h>
@@ -38,10 +38,10 @@
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdebug.h>
 
-static QList<QmlJSTypeReader::Import> parseHeaders(QQmlJS::AST::UiHeaderItemList *header)
+static QList<QQmlJSTypeReader::Import> parseHeaders(QQmlJS::AST::UiHeaderItemList *header)
 {
     using namespace QQmlJS::AST;
-    QList<QmlJSTypeReader::Import> imports;
+    QList<QQmlJSTypeReader::Import> imports;
 
     for (; header; header = header->next) {
         auto import = cast<UiImport *>(header->headerItem);
@@ -83,7 +83,7 @@ static QQmlJSScope::Ptr parseProgram(QQmlJS::AST::Program *program, const QStrin
     return result;
 }
 
-QQmlJSScope::Ptr QmlJSTypeReader::operator()()
+QQmlJSScope::Ptr QQmlJSTypeReader::operator()()
 {
     using namespace QQmlJS::AST;
     const QFileInfo info { m_file };
diff --git a/src/qmlcompiler/qmljstypereader_p.h b/src/qmlcompiler/qqmljstypereader_p.h
index c740fd99c6..efff9a8997 100644
--- a/src/qmlcompiler/qmljstypereader_p.h
+++ b/src/qmlcompiler/qqmljstypereader_p.h
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLJSTYPERADER_H
-#define QMLJSTYPERADER_H
+#ifndef QQMLJSTYPEREADER_P_H
+#define QQMLJSTYPEREADER_P_H
 
 //
 //  W A R N I N G
@@ -46,7 +46,7 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qset.h>
 
-class QmlJSTypeReader
+class QQmlJSTypeReader
 {
 public:
     struct Import {
@@ -55,7 +55,7 @@ public:
         QString prefix;
     };
 
-    QmlJSTypeReader(const QString &file) : m_file(file) {}
+    QQmlJSTypeReader(const QString &file) : m_file(file) {}
 
     QQmlJSScope::Ptr operator()();
     QList<Import> imports() const { return m_imports; }
@@ -67,4 +67,4 @@ private:
     QStringList m_errors;
 };
 
-#endif // QMLJSTYPEREADER_H
+#endif // QQMLJSTYPEREADER_P_H