From 7fba749edc4b0b69df67316a4714337963b4f754 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 2 Oct 2020 14:01:06 +0200 Subject: QmlCompiler: Rename QmlJSImporter Add an extra 'Q' for consistency. Change-Id: Idd34e0c898c9a7ac70b1ec3856a8af6829ec6fb7 Reviewed-by: Fabian Kosmale --- tools/qmllint/checkidentifiers.h | 6 +++--- tools/qmllint/findwarnings.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/qmllint') diff --git a/tools/qmllint/checkidentifiers.h b/tools/qmllint/checkidentifiers.h index cf5d71e670..f4fd8c9f14 100644 --- a/tools/qmllint/checkidentifiers.h +++ b/tools/qmllint/checkidentifiers.h @@ -30,7 +30,7 @@ #define CHECKIDENTIFIERS_H #include -#include +#include class ColorOutput; @@ -52,7 +52,7 @@ class CheckIdentifiers { public: CheckIdentifiers(ColorOutput *colorOut, const QString &code, - const QmlJSImporter::ImportedTypes &types, const QString &fileName) : + const QQmlJSImporter::ImportedTypes &types, const QString &fileName) : m_colorOut(colorOut), m_code(code), m_types(types), m_fileName(fileName) {} @@ -71,7 +71,7 @@ private: ColorOutput *m_colorOut = nullptr; QString m_code; - QmlJSImporter::ImportedTypes m_types; + QQmlJSImporter::ImportedTypes m_types; QString m_fileName; }; diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h index 111eb6c5b0..fd9c84fee9 100644 --- a/tools/qmllint/findwarnings.h +++ b/tools/qmllint/findwarnings.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ public: bool check(); private: - QmlJSImporter::ImportedTypes m_rootScopeImports; + QQmlJSImporter::ImportedTypes m_rootScopeImports; QHash m_signalHandlers; QQmlJS::SourceLocation m_pendingSingalHandler; @@ -95,7 +95,7 @@ private: QVarLengthArray m_outstandingConnections; // Connections whose target we have not encountered - QmlJSImporter m_importer; + QQmlJSImporter m_importer; void enterEnvironment(ScopeType type, const QString &name); void leaveEnvironment(); -- cgit v1.2.3