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/declarative/qml/v4/qdeclarativev4ir_p.h | |
| 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/declarative/qml/v4/qdeclarativev4ir_p.h')
| -rw-r--r-- | src/declarative/qml/v4/qdeclarativev4ir_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/v4/qdeclarativev4ir_p.h b/src/declarative/qml/v4/qdeclarativev4ir_p.h index e79a289472..2c8f658378 100644 --- a/src/declarative/qml/v4/qdeclarativev4ir_p.h +++ b/src/declarative/qml/v4/qdeclarativev4ir_p.h @@ -55,7 +55,7 @@ #include <private/qdeclarativejsast_p.h> #include <private/qdeclarativejsengine_p.h> -#include <private/qdeclarativeparser_p.h> +#include <private/qdeclarativescript_p.h> #include <private/qdeclarativeimport_p.h> #include <private/qdeclarativeengine_p.h> #include <private/qdeclarativev4compiler_p.h> @@ -267,7 +267,7 @@ struct Name: Expr { void *ptr; const QMetaObject *meta; const QDeclarativeType *declarativeType; - const QDeclarativeParser::Object *idObject; + const QDeclarativeScript::Object *idObject; }; int index; Storage storage; @@ -534,7 +534,7 @@ struct BasicBlock { Name *SYMBOL(Type type, const QString &id, const QMetaObject *meta, int index, Name::Storage storage, quint32 line, quint32 column); Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, int index, quint32 line, quint32 column); Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, int index, Name::Storage storage, quint32 line, quint32 column); - Name *ID_OBJECT(const QString &id, const QDeclarativeParser::Object *object, quint32 line, quint32 column); + Name *ID_OBJECT(const QString &id, const QDeclarativeScript::Object *object, quint32 line, quint32 column); Name *ATTACH_TYPE(const QString &id, const QDeclarativeType *attachType, Name::Storage storage, quint32 line, quint32 column); Expr *UNOP(AluOp op, Expr *expr); |