diff options
author | Marco Bubke <marco.bubke@qt.io> | 2021-05-06 15:27:51 +0000 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 15:30:02 +0000 |
commit | f0a86d45104f585b7aeef07fcc68cea24061aedb (patch) | |
tree | 6f2bb2de1ed9a81b420c20198c7c629a6f69a802 /src/libs/qmljs/qmljscheck.cpp | |
parent | 53c0b82a93df3e79ae1f8f896e9cd164148bebf8 (diff) | |
download | qt-creator-f0a86d45104f585b7aeef07fcc68cea24061aedb.tar.gz |
Revert "Merge remote-tracking branch 'origin/4.15'"
This reverts commit 888ca0dd20ff647970fc85340e108cfa34d78c3a.
Reason for revert: wrong patchset
Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
-rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 8e364fa6be..344b39d14e 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -1366,9 +1366,7 @@ bool Check::visit(Block *ast) && !cast<WhileStatement *>(p) && !cast<IfStatement *>(p) && !cast<SwitchStatement *>(p) - && !isCaseOrDefault(p) - && !cast<WithStatement *>(p) - && hasVarStatement(ast)) { + && !cast<WithStatement *>(p)) { addMessage(WarnBlock, ast->lbraceToken); } if (!ast->statements @@ -1658,33 +1656,6 @@ bool Check::isQtQuick2Ui() const return _doc->language() == Dialect::QmlQtQuick2Ui; } -bool Check::isCaseOrDefault(Node *n) -{ - if (!cast<StatementList *>(n)) - return false; - if (Node *p = parent(1)) - return p->kind == Node::Kind_CaseClause || p->kind == Node::Kind_DefaultClause; - return false; -} - -bool Check::hasVarStatement(AST::Block *b) const -{ - QTC_ASSERT(b, return false); - StatementList *s = b->statements; - while (s) { - if (auto var = cast<VariableStatement *>(s->statement)) { - VariableDeclarationList *declList = var->declarations; - while (declList) { - if (declList->declaration && declList->declaration->scope == VariableScope::Var) - return true; - declList = declList->next; - } - } - s = s->next; - } - return false; -} - bool Check::visit(NewExpression *ast) { checkNewExpression(ast->expression); |