From ee84bb67a2f90038d1f3462cb9141dffbfa9517b Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Tue, 23 Aug 2011 11:41:50 +1000 Subject: Move all QML file parsing into the QDeclarativeScript namespace Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620 Reviewed-on: http://codereview.qt.nokia.com/3797 Reviewed-by: Roberto Raggi --- src/declarative/qml/qdeclarativecustomparser_p.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/declarative/qml/qdeclarativecustomparser_p.h') 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 @@ -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 assignedValues() const; @@ -102,7 +102,7 @@ public: ~QDeclarativeCustomParserNode(); QByteArray name() const; - QDeclarativeParser::Location location() const; + QDeclarativeScript::Location location() const; QList properties() const; @@ -147,7 +147,7 @@ protected: private: QList exceptions; QDeclarativeCompiler *compiler; - QDeclarativeParser::Object *object; + QDeclarativeScript::Object *object; Flags m_flags; friend class QDeclarativeCompiler; }; -- cgit v1.2.3