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>

src/declarative/qml/qdeclarativecomponent.cpp

@@ -51,7 +51,7 @@
 #include "private/qdeclarativebinding_p.h"
 #include "private/qdeclarativebinding_p_p.h"
 #include "private/qdeclarativeglobal_p.h"
-#include "private/qdeclarativescriptparser_p.h"
+#include "private/qdeclarativescript_p.h"
 #include "private/qdeclarativedebugtrace_p.h"
 #include "private/qdeclarativeenginedebug_p.h"
 

src/declarative/qml/qdeclarativecontext_p.h

@@ -60,7 +60,7 @@
 #include "private/qdeclarativetypenamecache_p.h"
 #include "private/qdeclarativenotifier_p.h"
 #include "qdeclarativelist.h"
-#include "private/qdeclarativeparser_p.h"
+#include "private/qdeclarativescript_p.h"
 
 #include <QtCore/qhash.h>
 #include <QtDeclarative/qjsvalue.h>

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,7 +94,7 @@ using namespace QDeclarativeParser;
 */
 
 QDeclarativeCustomParserNode 
-QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root)
+QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeScript::Object *root)
 {
     QDeclarativeCustomParserNode rootNode;
     rootNode.d->name = root->typeName;
@@ -112,7 +111,7 @@ QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root
 }
 
 QDeclarativeCustomParserProperty 
-QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property *p)
+QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeScript::Property *p)
 {
     QDeclarativeCustomParserProperty prop;
     prop.d->name = p->name().toUtf8();
@@ -125,8 +124,8 @@ QDeclarativeCustomParserNodePrivate::fromProperty(QDeclarativeParser::Property *
         for (int ii = 0; ii < props.count(); ++ii)
             prop.d->values << QVariant::fromValue(props.at(ii));
     } else {
-        for (QDeclarativeParser::Value *v = p->values.first(); v; v = p->values.next(v)) {
-            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);
@@ -175,7 +174,7 @@ QList<QDeclarativeCustomParserProperty> QDeclarativeCustomParserNode::properties
     return d->properties;
 }
 
-QDeclarativeParser::Location QDeclarativeCustomParserNode::location() const
+QDeclarativeScript::Location QDeclarativeCustomParserNode::location() const
 {
     return d->location;
 }
@@ -215,7 +214,7 @@ bool QDeclarativeCustomParserProperty::isList() const
     return d->isList;
 }
 
-QDeclarativeParser::Location QDeclarativeCustomParserProperty::location() const
+QDeclarativeScript::Location QDeclarativeCustomParserProperty::location() const
 {
     return d->location;
 }

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 @@ class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty
     ~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 @@ class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserNode
     ~QDeclarativeCustomParserNode();
 
     QByteArray name() const;
-    QDeclarativeParser::Location location() const;
+    QDeclarativeScript::Location location() const;
 
     QList<QDeclarativeCustomParserProperty> properties() const;
 
@@ -147,7 +147,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
 private:
     QList<QDeclarativeError> exceptions;
     QDeclarativeCompiler *compiler;
-    QDeclarativeParser::Object *object;
+    QDeclarativeScript::Object *object;
     Flags m_flags;
     friend class QDeclarativeCompiler;
 };

src/declarative/qml/qdeclarativecustomparser_p_p.h

@@ -55,7 +55,7 @@
 
 #include "private/qdeclarativecustomparser_p.h"
 
-#include "private/qdeclarativeparser_p.h"
+#include "private/qdeclarativescript_p.h"
 
 #include <QtCore/qglobal.h>
 
@@ -66,10 +66,10 @@ class QDeclarativeCustomParserNodePrivate
 public:
     QByteArray name;
     QList<QDeclarativeCustomParserProperty> properties;
-    QDeclarativeParser::Location location;
+    QDeclarativeScript::Location location;
 
-    static QDeclarativeCustomParserNode fromObject(QDeclarativeParser::Object *);
-    static QDeclarativeCustomParserProperty fromProperty(QDeclarativeParser::Property *);
+    static QDeclarativeCustomParserNode fromObject(QDeclarativeScript::Object *);
+    static QDeclarativeCustomParserProperty fromProperty(QDeclarativeScript::Property *);
 };
 
 class QDeclarativeCustomParserPropertyPrivate
@@ -80,7 +80,7 @@ class QDeclarativeCustomParserPropertyPrivate
 
     QByteArray name;
     bool isList;
-    QDeclarativeParser::Location location;
+    QDeclarativeScript::Location location;
     QList<QVariant> values;
 };
 

src/declarative/qml/qdeclarativeimport.cpp

@@ -121,7 +121,7 @@ class QDeclarativeImportsPrivate {
     QString resolvedUri(const QString &dir_arg, QDeclarativeImportDatabase *database);
     bool add(const QDeclarativeDirComponents &qmldircomponentsnetwork, 
              const QString& uri_arg, const QString& prefix, 
-             int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType, 
+             int vmaj, int vmin, QDeclarativeScript::Import::Type importType, 
              QDeclarativeImportDatabase *database, QList<QDeclarativeError> *errors);
     bool find(const QString& type, int *vmajor, int *vminor,
               QDeclarativeType** type_return, QString* url_return, QList<QDeclarativeError> *errors);
@@ -463,7 +463,7 @@ QString QDeclarativeImportsPrivate::resolvedUri(const QString &dir_arg, QDeclara
 
 bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomponentsnetwork, 
                                      const QString& uri_arg, const QString& prefix, int vmaj, int vmin, 
-                                     QDeclarativeScriptParser::Import::Type importType, 
+                                     QDeclarativeScript::Import::Type importType, 
                                      QDeclarativeImportDatabase *database, QList<QDeclarativeError> *errors)
 {
     static QLatin1String Slash_qmldir("/qmldir");
@@ -481,7 +481,7 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
     }
     QString url = uri;
     bool versionFound = false;
-    if (importType == QDeclarativeScriptParser::Import::Library) {
+    if (importType == QDeclarativeScript::Import::Library) {
 
         Q_ASSERT(vmaj >= 0 && vmin >= 0); // Versions are always specified for libraries
 
@@ -561,7 +561,7 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
             return false;
         }
     } else {
-        if (importType == QDeclarativeScriptParser::Import::File && qmldircomponents.isEmpty()) {
+        if (importType == QDeclarativeScript::Import::File && qmldircomponents.isEmpty()) {
             QString importUrl = resolveLocalUrl(base, uri + Slash_qmldir);
             QString localFileOrQrc = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl);
             if (!localFileOrQrc.isEmpty()) {
@@ -633,7 +633,7 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
     data.url = url;
     data.majversion = vmaj;
     data.minversion = vmin;
-    data.isLibrary = importType == QDeclarativeScriptParser::Import::Library;
+    data.isLibrary = importType == QDeclarativeScript::Import::Library;
     data.qmlDirComponents = qmldircomponents;
     s->imports.prepend(data);
 
@@ -824,14 +824,14 @@ QDeclarativeImportDatabase::~QDeclarativeImportDatabase()
 */
 bool QDeclarativeImports::addImport(QDeclarativeImportDatabase *importDb, 
                                     const QString& uri, const QString& prefix, int vmaj, int vmin, 
-                                    QDeclarativeScriptParser::Import::Type importType, 
+                                    QDeclarativeScript::Import::Type importType, 
                                     const QDeclarativeDirComponents &qmldircomponentsnetwork, 
                                     QList<QDeclarativeError> *errors)
 {
     if (qmlImportTrace())
         qDebug().nospace() << "QDeclarativeImports(" << qPrintable(baseUrl().toString()) << ")" << "::addImport: " 
                            << uri << " " << vmaj << '.' << vmin << " " 
-                           << (importType==QDeclarativeScriptParser::Import::Library? "Library" : "File") 
+                           << (importType==QDeclarativeScript::Import::Library? "Library" : "File") 
                            << " as " << prefix;
 
     return d->add(qmldircomponentsnetwork, uri, prefix, vmaj, vmin, importType, importDb, errors);

src/declarative/qml/qdeclarativeimport_p.h

@@ -45,8 +45,9 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qset.h>
+#include <QtCore/qstringlist.h>
 #include <private/qdeclarativedirparser_p.h>
-#include <private/qdeclarativescriptparser_p.h>
+#include <private/qdeclarativescript_p.h>
 #include <private/qdeclarativemetatype_p.h>
 
 //
@@ -93,7 +94,7 @@ class QDeclarativeImports
 
     bool addImport(QDeclarativeImportDatabase *, 
                    const QString& uri, const QString& prefix, int vmaj, int vmin, 
-                   QDeclarativeScriptParser::Import::Type importType,
+                   QDeclarativeScript::Import::Type importType,
                    const QDeclarativeDirComponents &qmldircomponentsnetwork, 
                    QList<QDeclarativeError> *errors);