From 4161e7f9d98f93000ee0528ef7fc4b80a05e09aa Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Tue, 4 Nov 2014 16:23:38 +0100
Subject: [PATCH] qmljsscopebuilder: avoid warning from clang
Change-Id: I7ea4b8cd971bee1368dec3ce92ef27bf45d4c88b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
src/libs/qmljs/qmljsscopebuilder.cpp | 39 ++++++++++++++--------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index 19628bae9af..7658bb27753 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -67,26 +67,27 @@ void ScopeBuilder::push(AST::Node *node)
// JS signal handler scope
if (UiScriptBinding *script = cast<UiScriptBinding *>(node)) {
QString name;
- if (script->qualifiedId)
+ if (script->qualifiedId) {
name = script->qualifiedId->name.toString();
- if (!_scopeChain->qmlScopeObjects().isEmpty()
- && name.startsWith(QLatin1String("on"))
- && !script->qualifiedId->next) {
- const ObjectValue *owner = 0;
- const Value *value = 0;
- // try to find the name on the scope objects
- foreach (const ObjectValue *scope, _scopeChain->qmlScopeObjects()) {
- value = scope->lookupMember(name, _scopeChain->context(), &owner);
- if (value)
- break;
- }
- // signals defined in QML
- if (const ASTSignal *astsig = value_cast<ASTSignal>(value)) {
- _scopeChain->appendJsScope(astsig->bodyScope());
- // signals defined in C++
- } else if (const CppComponentValue *qmlObject = value_cast<CppComponentValue>(owner)) {
- if (const ObjectValue *scope = qmlObject->signalScope(name))
- _scopeChain->appendJsScope(scope);
+ if (!_scopeChain->qmlScopeObjects().isEmpty()
+ && name.startsWith(QLatin1String("on"))
+ && !script->qualifiedId->next) {
+ const ObjectValue *owner = 0;
+ const Value *value = 0;
+ // try to find the name on the scope objects
+ foreach (const ObjectValue *scope, _scopeChain->qmlScopeObjects()) {
+ value = scope->lookupMember(name, _scopeChain->context(), &owner);
+ if (value)
+ break;
+ }
+ // signals defined in QML
+ if (const ASTSignal *astsig = value_cast<ASTSignal>(value)) {
+ _scopeChain->appendJsScope(astsig->bodyScope());
+ // signals defined in C++
+ } else if (const CppComponentValue *qmlObject = value_cast<CppComponentValue>(owner)) {
+ if (const ObjectValue *scope = qmlObject->signalScope(name))
+ _scopeChain->appendJsScope(scope);
+ }
}
}
}
--
GitLab