diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecustomparser.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index e80d911bb5..e806707a06 100644 --- a/src/declarative/qml/qdeclarativecustomparser.cpp +++ b/src/declarative/qml/qdeclarativecustomparser.cpp @@ -42,14 +42,13 @@ #include "private/qdeclarativecustomparser_p.h" #include "private/qdeclarativecustomparser_p_p.h" -#include "private/qdeclarativeparser_p.h" #include "private/qdeclarativecompiler_p.h" #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE -using namespace QDeclarativeParser; +using namespace QDeclarativeScript; /*! \class QDeclarativeCustomParser @@ -95,18 +94,13 @@ using namespace QDeclarativeParser; */ QDeclarativeCustomParserNode -QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root) +QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeScript::Object *root) { QDeclarativeCustomParserNode rootNode; rootNode.d->name = root->typeName; rootNode.d->location = root->location.start; - for(QHash<QByteArray, Property *>::Iterator iter = root->properties.begin(); - iter != root->properties.end(); - ++iter) { - - Property *p = *iter; - + for (Property *p = root->properties.first(); p; p = root->properties.next(p)) { rootNode.d->properties << fromProperty(p); } @@ -117,11 +111,11 @@ QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root } QDeclarativeCustomParserProperty -QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property *p) +QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeScript::Property *p) { QDeclarativeCustomParserProperty prop; - prop.d->name = p->name; - prop.d->isList = (p->values.count() > 1); + prop.d->name = p->name().toUtf8(); + prop.d->isList = p->values.isMany(); prop.d->location = p->location.start; if (p->value) { @@ -130,9 +124,8 @@ QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property * for (int ii = 0; ii < props.count(); ++ii) prop.d->values << QVariant::fromValue(props.at(ii)); } else { - for(int ii = 0; ii < p->values.count(); ++ii) { - QDeclarativeParser::Value *v = p->values.at(ii); - v->type = QDeclarativeParser::Value::Literal; + for (QDeclarativeScript::Value *v = p->values.first(); v; v = p->values.next(v)) { + v->type = QDeclarativeScript::Value::Literal; if(v->object) { QDeclarativeCustomParserNode node = fromObject(v->object); @@ -181,7 +174,7 @@ QList<QDeclarativeCustomParserProperty> QDeclarativeCustomParserNode::properties return d->properties; } -QDeclarativeParser::Location QDeclarativeCustomParserNode::location() const +QDeclarativeScript::Location QDeclarativeCustomParserNode::location() const { return d->location; } @@ -221,7 +214,7 @@ bool QDeclarativeCustomParserProperty::isList() const return d->isList; } -QDeclarativeParser::Location QDeclarativeCustomParserProperty::location() const +QDeclarativeScript::Location QDeclarativeCustomParserProperty::location() const { return d->location; } |