diff options
Diffstat (limited to 'tools/qmllint/findunqualified.h')
| -rw-r--r-- | tools/qmllint/findunqualified.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/qmllint/findunqualified.h b/tools/qmllint/findunqualified.h index a70bf8032f..37ba259638 100644 --- a/tools/qmllint/findunqualified.h +++ b/tools/qmllint/findunqualified.h @@ -65,11 +65,13 @@ private: }; QScopedPointer<ScopeTree> m_rootScope; - ScopeTree *m_currentScope = nullptr; + ScopeTree *m_currentScope; + QQmlJS::AST::ExpressionNode *m_fieldMemberBase = nullptr; + QHash<QString, ScopeTree::ConstPtr> m_types; QHash<QString, ScopeTree::ConstPtr> m_exportedName2Scope; QStringList m_qmltypeDirs; QString m_code; - QHash<QString, ScopeTree::ConstPtr> m_qmlid2scope; + QHash<QString, const ScopeTree *> m_qmlid2scope; QString m_rootId; QString m_filePath; QSet<QPair<QString, QString>> m_alreadySeenImports; @@ -86,7 +88,7 @@ private: QVarLengthArray<OutstandingConnection, 3> m_outstandingConnections; // Connections whose target we have not encountered - void enterEnvironment(ScopeType type, QString name); + void enterEnvironment(ScopeType type, const QString &name); void leaveEnvironment(); void importHelper(const QString &module, const QString &prefix = QString(), int major = -1, int minor = -1); @@ -158,6 +160,8 @@ private: bool visit(QQmlJS::AST::IdentifierExpression *idexp) override; bool visit(QQmlJS::AST::PatternElement *) override; + bool visit(QQmlJS::AST::FieldMemberExpression *idprop) override; + void endVisit(QQmlJS::AST::FieldMemberExpression *) override; }; #endif // FINDUNQUALIFIED_H |