feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Move commonly used functions to qmlutils.h.

Browse Source 
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>
This commit is contained in:
Christian Kamm
2011-10-07 14:04:06 +02:00
parent 737aaf02b4
commit a7f78991c9
30 changed files with 308 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -31,6 +31,7 @@
**************************************************************************/
#include "qmljsdelta.h"
#include "qmljsutils.h"
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/parser/qmljsastvisitor_p.h>
@@ -168,14 +169,8 @@ struct Map {
static QList<UiObjectMember *> children(UiObjectMember *ast)
{
QList<UiObjectMember *> ret;
if (UiObjectDefinition* foo = cast<UiObjectDefinition *>(ast)) {
UiObjectMemberList* list = foo->initializer->members;
while (list) {
ret.append(list->member);
list = list->next;
}
} else if(UiObjectBinding *foo = cast<UiObjectBinding *>(ast)) {
UiObjectMemberList* list = foo->initializer->members;
if (UiObjectInitializer * foo = QmlJS::initializerOfObject(ast)) {
UiObjectMemberList* list = foo->members;
while (list) {
ret.append(list->member);
list = list->next;
@@ -308,10 +303,8 @@ static QString _methodName(UiSourceElement *source)
static UiObjectMemberList *objectMembers(UiObjectMember *object)
{
if (UiObjectDefinition *def = cast<UiObjectDefinition *>(object))
return def->initializer->members;
else if (UiObjectBinding *binding = cast<UiObjectBinding *>(object))
return binding->initializer->members;
if (UiObjectInitializer *init = QmlJS::initializerOfObject(object))
return init->members;
return 0;
}