Namespace cleanup

Move the QML IR types into the QmlIR namespace and clean them up.

Change-Id: I2125449e5a519034e23670651efa620f405730b4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 295461ba26..306552d39c 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -215,7 +215,7 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags)
     QV4::ScopedFunctionObject f(scope, v4function.value());
     Q_ASSERT(f);
     if (f->bindingKeyFlag) {
-        QQmlSourceLocation loc = f->as<QQmlBindingFunction>()->bindingLocation;
+        QQmlSourceLocation loc = f->as<QV4::QQmlBindingFunction>()->bindingLocation;
         url = loc.sourceFile;
         lineNumber = loc.line;
         columnNumber = loc.column;
diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index 16e3abf3a0..037b07dbb3 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -102,7 +102,7 @@ void QQmlCustomParser::clearErrors()
 
     An error is generated referring to the \a location in the source file.
 */
-void QQmlCustomParser::error(const CompiledData::Location &location, const QString &description)
+void QQmlCustomParser::error(const QV4::CompiledData::Location &location, const QString &description)
 {
     QQmlError error;
     error.setLine(location.line);
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 0825b8ec53..847d325763 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -703,7 +703,7 @@ void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip)
             if (!name.isEmpty()) {
                 if (binding->flags & QV4::CompiledData::Binding::IsSignalHandlerExpression
                     || binding->flags & QV4::CompiledData::Binding::IsSignalHandlerObject)
-                    property = PropertyResolver(_propertyCache).signal(name, /*notInRevision*/0, _qobject, context);
+                    property = QmlIR::PropertyResolver(_propertyCache).signal(name, /*notInRevision*/0, _qobject, context);
                 else
                     property = _propertyCache->property(name, _qobject, context);
             } else
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 5c48304b56..6b01a64c40 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2133,8 +2133,8 @@ void QQmlTypeData::dataReceived(const Data &data)
     if (data.isFile()) preparseData = data.asFile()->metaData(QLatin1String("qml:preparse"));
 
     QQmlEngine *qmlEngine = typeLoader()->engine();
-    parsedQML.reset(new QtQml::ParsedQML(QV8Engine::getV4(qmlEngine)->debugger != 0));
-    QQmlCodeGenerator compiler(QV8Engine::get(qmlEngine)->illegalNames());
+    parsedQML.reset(new QmlIR::ParsedQML(QV8Engine::getV4(qmlEngine)->debugger != 0));
+    QmlIR::QQmlCodeGenerator compiler(QV8Engine::get(qmlEngine)->illegalNames());
     if (!compiler.generateFromQml(code, finalUrl(), finalUrlString(), parsedQML.data())) {
         setError(compiler.errors);
         return;
@@ -2207,13 +2207,13 @@ void QQmlTypeData::dataReceived(const Data &data)
     // ### convert to use new data structure once old compiler is gone.
     if (m_newPragmas.isEmpty()) {
         m_newPragmas.reserve(parsedQML->pragmas.size());
-        foreach (QtQml::Pragma *p, parsedQML->pragmas) {
+        foreach (QmlIR::Pragma *p, parsedQML->pragmas) {
             QQmlScript::Pragma pragma;
             pragma.location.start.line = p->location.line;
             pragma.location.start.column = p->location.column;
 
             switch (p->type) {
-            case QtQml::Pragma::PragmaSingleton: pragma.type = QQmlScript::Pragma::Singleton; break;
+            case QmlIR::Pragma::PragmaSingleton: pragma.type = QQmlScript::Pragma::Singleton; break;
             default: break;
             }
 
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 9cd28a03ce..adb998d1f8 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -84,7 +84,7 @@ class QQmlTypeData;
 class QQmlDataLoader;
 class QQmlExtensionInterface;
 
-namespace QtQml {
+namespace QmlIR {
 struct ParsedQML;
 }
 
@@ -455,7 +455,7 @@ private:
 
     virtual void scriptImported(QQmlScriptBlob *blob, const QQmlScript::Location &location, const QString &qualifier, const QString &nameSpace);
 
-    QScopedPointer<QtQml::ParsedQML> parsedQML;
+    QScopedPointer<QmlIR::ParsedQML> parsedQML;
     QList<QQmlScript::Import> m_newImports;
     QList<QQmlScript::Pragma> m_newPragmas;