diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-07 14:04:06 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-10 09:36:12 +0200 |
| commit | a7f78991c9317471ddc85f6556be971d019f3f59 (patch) | |
| tree | 51e53891d62970c14efc59e986a2459cad6267ed /src/libs/qmljs/qmljsscopebuilder.cpp | |
| parent | 737aaf02b4d221d8088513fef810e0f453a737be (diff) | |
| download | qt-creator-a7f78991c9317471ddc85f6556be971d019f3f59.tar.gz | |
QmlJS: Move commonly used functions to qmlutils.h.
Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6
Reviewed-on: http://codereview.qt-project.org/6238
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsscopebuilder.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsscopebuilder.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp index 92f90ab4a7..ed52edb6a8 100644 --- a/src/libs/qmljs/qmljsscopebuilder.cpp +++ b/src/libs/qmljs/qmljsscopebuilder.cpp @@ -36,6 +36,7 @@ #include "qmljscontext.h" #include "qmljsevaluate.h" #include "qmljsscopechain.h" +#include "qmljsutils.h" #include "parser/qmljsast_p.h" #include <utils/qtcassert.h> @@ -174,11 +175,7 @@ void ScopeBuilder::setQmlScopeObject(Node *node) prototype = isPropertyChangesObject(_scopeChain->context(), prototype); // find the target script binding if (prototype) { - UiObjectInitializer *initializer = 0; - if (UiObjectDefinition *definition = cast<UiObjectDefinition *>(node)) - initializer = definition->initializer; - if (UiObjectBinding *binding = cast<UiObjectBinding *>(node)) - initializer = binding->initializer; + UiObjectInitializer *initializer = initializerOfObject(node); if (initializer) { for (UiObjectMemberList *m = initializer->members; m; m = m->next) { if (UiScriptBinding *scriptBinding = cast<UiScriptBinding *>(m->member)) { |