diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-30 15:31:43 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-02 15:33:23 +0200 |
commit | b2e1183cb7f4f552bb4409172f82327111f754bb (patch) | |
tree | f72311abf4c27dc6dd73acb005f5ceabb074d610 /tools/shared | |
parent | 65b6365ffbde369894f7af1ed735ea34a584d357 (diff) |
qmllint: Remove member access chains from ScopeTree
What we need there is a proper type inference. This should be added
separately. For now, keep the member access chains local in qmllint and
don't pollute ScopeTree with them.
Change-Id: I9f50aa4e54b285bd93e7bd4cd17797509df0c168
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/shared')
-rw-r--r-- | tools/shared/scopetree.cpp | 12 | ||||
-rw-r--r-- | tools/shared/scopetree.h | 17 |
2 files changed, 0 insertions, 29 deletions
diff --git a/tools/shared/scopetree.cpp b/tools/shared/scopetree.cpp index 223dfb92b8..7ebf636b2a 100644 --- a/tools/shared/scopetree.cpp +++ b/tools/shared/scopetree.cpp @@ -76,18 +76,6 @@ bool ScopeTree::isIdInCurrentScope(const QString &id) const return isIdInCurrentQMlScopes(id) || isIdInCurrentJSScopes(id); } -void ScopeTree::addIdToAccessed(const QString &id, const QQmlJS::SourceLocation &location) { - m_memberAccessChains.append(QVector<FieldMember>()); - m_memberAccessChains.last().append(FieldMember {id, QString(), location}); -} - -void ScopeTree::accessMember(const QString &name, const QString &parentType, - const QQmlJS::SourceLocation &location) -{ - Q_ASSERT(!m_memberAccessChains.last().isEmpty()); - m_memberAccessChains.last().append(FieldMember {name, parentType, location }); -} - bool ScopeTree::isIdInCurrentQMlScopes(const QString &id) const { if (m_scopeType == ScopeType::QMLScope) diff --git a/tools/shared/scopetree.h b/tools/shared/scopetree.h index 57a346d0d9..1794b45373 100644 --- a/tools/shared/scopetree.h +++ b/tools/shared/scopetree.h @@ -129,9 +129,6 @@ public: void insertPropertyIdentifier(const MetaProperty &prop); bool isIdInCurrentScope(const QString &id) const; - void addIdToAccessed(const QString &id, const QQmlJS::SourceLocation &location); - void accessMember(const QString &name, const QString &parentType, - const QQmlJS::SourceLocation &location); ScopeType scopeType() const { return m_scopeType; } @@ -180,18 +177,6 @@ public: void setAccessSemantics(AccessSemantics semantics) { m_semantics = semantics; } AccessSemantics accessSemantics() const { return m_semantics; } - struct FieldMember - { - QString m_name; - QString m_parentType; - QQmlJS::SourceLocation m_location; - }; - - QVector<QVector<FieldMember>> memberAccessChains() const - { - return m_memberAccessChains; - } - bool isIdInCurrentQMlScopes(const QString &id) const; bool isIdInCurrentJSScopes(const QString &id) const; bool isIdInjectedFromSignal(const QString &id) const; @@ -214,8 +199,6 @@ private: QHash<QString, MetaProperty> m_properties; QHash<QString, MetaEnum> m_enums; - QVector<QVector<FieldMember>> m_memberAccessChains; - QVector<ScopeTree::Ptr> m_childScopes; ScopeTree::WeakPtr m_parentScope; |