diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-01 14:23:27 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-05 14:58:36 +0200 |
commit | d200ccf92017ebc10a4ccdb5d944e1d803b87c1d (patch) | |
tree | 1dc85350482238423143ac71740b834fa6e8d240 /tools/qmllint/checkidentifiers.h | |
parent | 767dd738d3de9306062707fe05d32c91ed755da3 (diff) |
QmlCompiler: Rename ScopeTree to QQmlJSScope
That is a better name.
Change-Id: I34a6867692a236dd16ed8e3a68866f994eab02d2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmllint/checkidentifiers.h')
-rw-r--r-- | tools/qmllint/checkidentifiers.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/qmllint/checkidentifiers.h b/tools/qmllint/checkidentifiers.h index 181b54d290..93b6a13745 100644 --- a/tools/qmllint/checkidentifiers.h +++ b/tools/qmllint/checkidentifiers.h @@ -29,7 +29,7 @@ #ifndef CHECKIDENTIFIERS_H #define CHECKIDENTIFIERS_H -#include <QtQmlCompiler/private/scopetree_p.h> +#include <QtQmlCompiler/private/qqmljsscope_p.h> #include <QtQmlCompiler/private/qmljsimporter_p.h> class ColorOutput; @@ -46,7 +46,7 @@ struct FieldMember QQmlJS::SourceLocation m_location; }; -using MemberAccessChains = QHash<ScopeTree::ConstPtr, QVector<QVector<FieldMember>>>; +using MemberAccessChains = QHash<QQmlJSScope::ConstPtr, QVector<QVector<FieldMember>>>; class CheckIdentifiers { @@ -56,17 +56,17 @@ public: m_colorOut(colorOut), m_code(code), m_types(types), m_fileName(fileName) {} - bool operator ()(const QHash<QString, ScopeTree::ConstPtr> &qmlIDs, + bool operator ()(const QHash<QString, QQmlJSScope::ConstPtr> &qmlIDs, const QHash<QQmlJS::SourceLocation, SignalHandler> &signalHandlers, const MemberAccessChains &memberAccessChains, - const ScopeTree::ConstPtr &root, const QString &rootId) const; + const QQmlJSScope::ConstPtr &root, const QString &rootId) const; static void printContext(const QString &code, ColorOutput *output, const QQmlJS::SourceLocation &location); private: bool checkMemberAccess(const QVector<FieldMember> &members, - const ScopeTree::ConstPtr &outerScope, + const QQmlJSScope::ConstPtr &outerScope, const MetaProperty *prop = nullptr) const; ColorOutput *m_colorOut = nullptr; |