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/qdeclarativecustomparser_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/qdeclarativecustomparser_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativecustomparser_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 31452836bd..47b3ee8f8e 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -55,7 +55,7 @@ #include "private/qdeclarativemetatype_p.h" #include "qdeclarativeerror.h" -#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativescript_p.h" #include "private/qdeclarativebinding_p.h" #include <QtCore/qbytearray.h> @@ -79,10 +79,10 @@ public: ~QDeclarativeCustomParserProperty(); QByteArray name() const; - QDeclarativeParser::Location location() const; + QDeclarativeScript::Location location() const; bool isList() const; - // Will be one of QDeclarativeParser::Variant, QDeclarativeCustomParserProperty or + // Will be one of QDeclarativeScript::Variant, QDeclarativeCustomParserProperty or // QDeclarativeCustomParserNode QList<QVariant> assignedValues() const; @@ -102,7 +102,7 @@ public: ~QDeclarativeCustomParserNode(); QByteArray name() const; - QDeclarativeParser::Location location() const; + QDeclarativeScript::Location location() const; QList<QDeclarativeCustomParserProperty> properties() const; @@ -147,7 +147,7 @@ protected: private: QList<QDeclarativeError> exceptions; QDeclarativeCompiler *compiler; - QDeclarativeParser::Object *object; + QDeclarativeScript::Object *object; Flags m_flags; friend class QDeclarativeCompiler; }; |