diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-15 11:16:34 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-15 13:17:12 +0200 |
commit | ea7d11a3c73b6054852092ab268466f7639b8dbf (patch) | |
tree | a9137ca1a34466bb95224c9a37adf3e20b8b14ab /tools/qmllint/findwarnings.h | |
parent | fa48382c492097d06d7ce066ac36dba04fd5e801 (diff) |
Further unify findwarnings.cpp and qqmljsimportvisitor.cpp
Most of the logic in findwarnings.cpp applies also to imported files and
should live in the base class.
Change-Id: I65f326f50a8bfab0dff4b5b31f7bee7300b20704
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmllint/findwarnings.h')
-rw-r--r-- | tools/qmllint/findwarnings.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h index da32f4c9d5..f60a003a4d 100644 --- a/tools/qmllint/findwarnings.h +++ b/tools/qmllint/findwarnings.h @@ -90,7 +90,7 @@ private: QVarLengthArray<OutstandingConnection, 3> m_outstandingConnections; // Connections whose target we have not encountered - void importExportedNames(QQmlJSScope::ConstPtr scope); + void checkInheritanceCycle(QQmlJSScope::ConstPtr scope); void parseHeaders(QQmlJS::AST::UiHeaderItemList *headers); QQmlJSScope::Ptr parseProgram(QQmlJS::AST::Program *program, const QString &name); @@ -99,42 +99,17 @@ private: void throwRecursionDepthError() override; // start block/scope handling - bool visit(QQmlJS::AST::ClassDeclaration *ast) override; - void endVisit(QQmlJS::AST::ClassDeclaration *ast) override; - - bool visit(QQmlJS::AST::ForStatement *ast) override; - void endVisit(QQmlJS::AST::ForStatement *ast) override; - - bool visit(QQmlJS::AST::ForEachStatement *ast) override; - void endVisit(QQmlJS::AST::ForEachStatement *ast) override; - bool visit(QQmlJS::AST::ExpressionStatement *ast) override; void endVisit(QQmlJS::AST::ExpressionStatement *ast) override; - bool visit(QQmlJS::AST::Block *ast) override; - void endVisit(QQmlJS::AST::Block *ast) override; - - bool visit(QQmlJS::AST::CaseBlock *ast) override; - void endVisit(QQmlJS::AST::CaseBlock *ast) override; - - bool visit(QQmlJS::AST::Catch *ast) override; - void endVisit(QQmlJS::AST::Catch *ast) override; - bool visit(QQmlJS::AST::WithStatement *withStatement) override; - void endVisit(QQmlJS::AST::WithStatement *ast) override; /* --- end block handling --- */ - bool visit(QQmlJS::AST::VariableDeclarationList *vdl) override; - bool visit(QQmlJS::AST::FormalParameterList *fpl) override; - - bool visit(QQmlJS::AST::UiEnumDeclaration *uied) override; bool visit(QQmlJS::AST::UiObjectBinding *uiob) override; - void endVisit(QQmlJS::AST::UiObjectBinding *uiob) override; bool visit(QQmlJS::AST::UiObjectDefinition *uiod) override; void endVisit(QQmlJS::AST::UiObjectDefinition *) override; bool visit(QQmlJS::AST::UiScriptBinding *uisb) override; - bool visit(QQmlJS::AST::UiPublicMember *uipm) override; // expression handling bool visit(QQmlJS::AST::IdentifierExpression *idexp) override; |