diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-08-23 11:41:50 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
commit | ee84bb67a2f90038d1f3462cb9141dffbfa9517b (patch) | |
tree | 18d1f857ba6e8e89d670cec1f8218b8d14e1c71d /src/qtquick1/util | |
parent | c7a9493730b93f0e19705bdb02729e15b9955117 (diff) |
Move all QML file parsing into the QDeclarativeScript namespace
Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620
Reviewed-on: http://codereview.qt.nokia.com/3797
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/qtquick1/util')
-rw-r--r-- | src/qtquick1/util/qdeclarativeconnections.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativelistmodel.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativepropertychanges.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/qtquick1/util/qdeclarativeconnections.cpp b/src/qtquick1/util/qdeclarativeconnections.cpp index 5fc019c4c1..54f51acd12 100644 --- a/src/qtquick1/util/qdeclarativeconnections.cpp +++ b/src/qtquick1/util/qdeclarativeconnections.cpp @@ -223,7 +223,7 @@ QDeclarative1ConnectionsParser::compile(const QList<QDeclarativeCustomParserProp error(props.at(ii), QDeclarative1Connections::tr("Connections: syntax error")); return QByteArray(); } else { - QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value); + QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(value); if (v.isScript()) { ds << propName; ds << v.asScript(); diff --git a/src/qtquick1/util/qdeclarativelistmodel.cpp b/src/qtquick1/util/qdeclarativelistmodel.cpp index 08e15c52b6..5c31a8bd79 100644 --- a/src/qtquick1/util/qdeclarativelistmodel.cpp +++ b/src/qtquick1/util/qdeclarativelistmodel.cpp @@ -44,7 +44,7 @@ #include "QtQuick1/private/qdeclarativeopenmetaobject_p.h" #include <QtDeclarative/private/qdeclarativecustomparser_p.h> -#include <QtDeclarative/private/qdeclarativeparser_p.h> +#include <QtDeclarative/private/qdeclarativescript_p.h> #include <QtDeclarative/private/qdeclarativeengine_p.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeinfo.h> diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp index 776701e58f..fc063cafb0 100644 --- a/src/qtquick1/util/qdeclarativepropertychanges.cpp +++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtDeclarative/private/qdeclarativecustomparser_p.h> -#include <QtDeclarative/private/qdeclarativeparser_p.h> +#include <QtDeclarative/private/qdeclarativescript_p.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/private/qdeclarativebinding_p.h> #include <QtDeclarative/qdeclarativecontext.h> @@ -282,22 +282,22 @@ QDeclarative1PropertyChangesParser::compile(const QList<QDeclarativeCustomParser ds << data.count(); for(int ii = 0; ii < data.count(); ++ii) { - QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second); + QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(data.at(ii).second); QVariant var; bool isScript = v.isScript(); QDeclarativeBinding::Identifier id = 0; switch(v.type()) { - case QDeclarativeParser::Variant::Boolean: + case QDeclarativeScript::Variant::Boolean: var = QVariant(v.asBoolean()); break; - case QDeclarativeParser::Variant::Number: + case QDeclarativeScript::Variant::Number: var = QVariant(v.asNumber()); break; - case QDeclarativeParser::Variant::String: + case QDeclarativeScript::Variant::String: var = QVariant(v.asString()); break; - case QDeclarativeParser::Variant::Invalid: - case QDeclarativeParser::Variant::Script: + case QDeclarativeScript::Variant::Invalid: + case QDeclarativeScript::Variant::Script: var = QVariant(v.asScript()); { // Pre-rewrite the expression |