[new compiler] Match class and file name

QmlObjectCreator -> QQmlObjectCreator

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

13 files changed, 36 insertions, 36 deletions

diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h
index ebe81d647a..7354f9af1e 100644
--- a/src/qml/qml/qqmlabstractbinding_p.h
+++ b/src/qml/qml/qqmlabstractbinding_p.h
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlObjectCreator;
+class QQmlObjectCreator;
 
 class Q_QML_PRIVATE_EXPORT QQmlAbstractBinding
 {
@@ -152,7 +152,7 @@ private:
     friend class QQmlVME;
     friend class QtSharedPointer::ExternalRefCount<QQmlAbstractBinding>;
     friend class QV4Bindings;
-    friend class QmlObjectCreator;
+    friend class QQmlObjectCreator;
 
     typedef QSharedPointer<QQmlAbstractBinding> SharedPointer;
     // To save memory, we also store the rarely used weakPointer() instance in here
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index b3d02cdc6d..084441af01 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -862,7 +862,7 @@ QQmlComponentPrivate::beginCreate(QQmlContextData *context)
     enginePriv->referenceScarceResources();
     QObject *rv = 0;
     if (enginePriv->useNewCompiler) {
-        state.creator = new QmlObjectCreator(context, cc, creationContext);
+        state.creator = new QQmlObjectCreator(context, cc, creationContext);
         rv = state.creator->create(start);
         if (!rv)
             state.errors = state.creator->errors;
@@ -1058,7 +1058,7 @@ void QQmlComponent::create(QQmlIncubator &incubator, QQmlContext *context,
     p->compiledData = d->cc;
     p->compiledData->addref();
     if (enginePriv->useNewCompiler) {
-        p->creator.reset(new QmlObjectCreator(contextData, d->cc, d->creationContext));
+        p->creator.reset(new QQmlObjectCreator(contextData, d->cc, d->creationContext));
         p->subComponentToCreate = d->start;
     } else
         p->vme.init(contextData, d->cc, d->start, d->creationContext);
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index fe376d0e4a..4aa0daf47e 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -129,7 +129,7 @@ private:
     Q_DISABLE_COPY(QQmlComponent)
     friend class QQmlVME;
     friend class QQmlTypeData;
-    friend class QmlObjectCreator;
+    friend class QQmlObjectCreator;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h
index 7e855fdfd0..9bccb0be7b 100644
--- a/src/qml/qml/qqmlcomponent_p.h
+++ b/src/qml/qml/qqmlcomponent_p.h
@@ -115,7 +115,7 @@ public:
         }
 
         // --- new compiler
-        QmlObjectCreator *creator;
+        QQmlObjectCreator *creator;
         // --- old compiler
         QQmlVME vme;
         // ---
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index d5ceea271e..e00e55f157 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -99,7 +99,7 @@ class QQmlCleanup;
 class QQmlDelayedError;
 class QQuickWorkerScriptEngine;
 class QQmlVME;
-class QmlObjectCreator;
+class QQmlObjectCreator;
 class QDir;
 class QQmlIncubator;
 class QQmlProfiler;
@@ -173,7 +173,7 @@ public:
     // --- old compiler:
     QQmlVME *activeVME;
     // --- new compiler:
-    QmlObjectCreator *activeObjectCreator;
+    QQmlObjectCreator *activeObjectCreator;
     // ---
 
     QNetworkAccessManager *createNetworkAccessManager(QObject *parent) const;
diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h
index b7009bfe43..80da2910c1 100644
--- a/src/qml/qml/qqmlincubator_p.h
+++ b/src/qml/qml/qqmlincubator_p.h
@@ -91,7 +91,7 @@ public:
     // --- old compiler
     QQmlVME vme;
     // --- new compiler
-    QScopedPointer<QmlObjectCreator> creator;
+    QScopedPointer<QQmlObjectCreator> creator;
     int subComponentToCreate;
     // ---
     QQmlVMEGuard vmeGuard;
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 2934c795cd..7085915faa 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -62,12 +62,12 @@ QT_USE_NAMESPACE
 namespace {
 struct ActiveOCRestorer
 {
-    ActiveOCRestorer(QmlObjectCreator *creator, QQmlEnginePrivate *ep)
+    ActiveOCRestorer(QQmlObjectCreator *creator, QQmlEnginePrivate *ep)
     : ep(ep), oldCreator(ep->activeObjectCreator) { ep->activeObjectCreator = creator; }
     ~ActiveOCRestorer() { ep->activeObjectCreator = oldCreator; }
 
     QQmlEnginePrivate *ep;
-    QmlObjectCreator *oldCreator;
+    QQmlObjectCreator *oldCreator;
 };
 }
 
@@ -80,7 +80,7 @@ static void removeBindingOnProperty(QObject *o, int index)
     if (binding) binding->destroy();
 }
 
-QmlObjectCreator::QmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlContextData *creationContext)
+QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlContextData *creationContext)
     : compiledData(compiledData)
     , resolvedTypes(compiledData->resolvedTypes)
     , propertyCaches(compiledData->propertyCaches)
@@ -97,7 +97,7 @@ QmlObjectCreator::QmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledD
     sharedState->rootContext = 0;
 }
 
-QmlObjectCreator::QmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, SharedState *inheritedSharedState)
+QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, SharedState *inheritedSharedState)
     : compiledData(compiledData)
     , resolvedTypes(compiledData->resolvedTypes)
     , propertyCaches(compiledData->propertyCaches)
@@ -108,7 +108,7 @@ QmlObjectCreator::QmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledD
     sharedState = inheritedSharedState;
 }
 
-void QmlObjectCreator::init(QQmlContextData *providedParentContext)
+void QQmlObjectCreator::init(QQmlContextData *providedParentContext)
 {
     parentContext = providedParentContext;
     engine = parentContext->engine;
@@ -128,7 +128,7 @@ void QmlObjectCreator::init(QQmlContextData *providedParentContext)
     _qmlContext = 0;
 }
 
-QmlObjectCreator::~QmlObjectCreator()
+QQmlObjectCreator::~QQmlObjectCreator()
 {
     if (sharedState.flag()) {
         for (int i = 0; i < sharedState->allCreatedBindings.count(); ++i) {
@@ -145,7 +145,7 @@ QmlObjectCreator::~QmlObjectCreator()
     }
 }
 
-QObject *QmlObjectCreator::create(int subComponentIndex, QObject *parent)
+QObject *QQmlObjectCreator::create(int subComponentIndex, QObject *parent)
 {
     int objectToCreate;
 
@@ -209,7 +209,7 @@ QObject *QmlObjectCreator::create(int subComponentIndex, QObject *parent)
     return instance;
 }
 
-void QmlObjectCreator::setPropertyValue(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding)
+void QQmlObjectCreator::setPropertyValue(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding)
 {
     QQmlPropertyPrivate::WriteFlags propertyWriteFlags = QQmlPropertyPrivate::BypassInterceptor |
                                                                QQmlPropertyPrivate::RemoveBindingOnAliasWrite;
@@ -553,7 +553,7 @@ static QQmlType *qmlTypeForObject(QObject *object)
     return type;
 }
 
-void QmlObjectCreator::setupBindings()
+void QQmlObjectCreator::setupBindings()
 {
     QQmlListProperty<void> savedList;
     qSwap(_currentList, savedList);
@@ -640,7 +640,7 @@ void QmlObjectCreator::setupBindings()
     qSwap(_currentList, savedList);
 }
 
-bool QmlObjectCreator::setPropertyBinding(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding)
+bool QQmlObjectCreator::setPropertyBinding(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding)
 {
     if (binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) {
         Q_ASSERT(stringAt(qmlUnit->objectAt(binding->value.objectIndex)->inheritedTypeNameIndex).isEmpty());
@@ -897,7 +897,7 @@ bool QmlObjectCreator::setPropertyBinding(QQmlPropertyData *property, const QV4:
     return true;
 }
 
-void QmlObjectCreator::setupFunctions()
+void QQmlObjectCreator::setupFunctions()
 {
     QV4::Scope scope(_qmlContext);
     QV4::ScopedValue function(scope);
@@ -916,7 +916,7 @@ void QmlObjectCreator::setupFunctions()
     }
 }
 
-void QmlObjectCreator::recordError(const QV4::CompiledData::Location &location, const QString &description)
+void QQmlObjectCreator::recordError(const QV4::CompiledData::Location &location, const QString &description)
 {
     QQmlError error;
     error.setUrl(compiledData->url);
@@ -926,7 +926,7 @@ void QmlObjectCreator::recordError(const QV4::CompiledData::Location &location,
     errors << error;
 }
 
-QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
+QObject *QQmlObjectCreator::createInstance(int index, QObject *parent)
 {
     ActiveOCRestorer ocRestorer(this, QQmlEnginePrivate::get(engine));
 
@@ -971,7 +971,7 @@ QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
                 recordError(obj->location, tr("Composite Singleton Type %1 is not creatable").arg(stringAt(obj->inheritedTypeNameIndex)));
                 return 0;
             }
-            QmlObjectCreator subCreator(context, typeRef->component, sharedState.data());
+            QQmlObjectCreator subCreator(context, typeRef->component, sharedState.data());
             instance = subCreator.create();
             if (!instance) {
                 errors += subCreator.errors;
@@ -1044,7 +1044,7 @@ QObject *QmlObjectCreator::createInstance(int index, QObject *parent)
     return result ? instance : 0;
 }
 
-QQmlContextData *QmlObjectCreator::finalize(QQmlInstantiationInterrupt &interrupt)
+QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interrupt)
 {
     {
     QQmlTrace trace("VME Binding Enable");
@@ -1114,7 +1114,7 @@ QQmlContextData *QmlObjectCreator::finalize(QQmlInstantiationInterrupt &interrup
     return sharedState->rootContext;
 }
 
-bool QmlObjectCreator::populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache, QObject *bindingTarget, QQmlPropertyData *valueTypeProperty)
+bool QQmlObjectCreator::populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache, QObject *bindingTarget, QQmlPropertyData *valueTypeProperty)
 {
     const QV4::CompiledData::Object *obj = qmlUnit->objectAt(index);
 
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index 70b12e5f94..c48d7d3c05 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -54,13 +54,13 @@ class QQmlAbstractBinding;
 struct QQmlTypeCompiler;
 class QQmlInstantiationInterrupt;
 
-class QmlObjectCreator
+class QQmlObjectCreator
 {
-    Q_DECLARE_TR_FUNCTIONS(QmlObjectCreator)
+    Q_DECLARE_TR_FUNCTIONS(QQmlObjectCreator)
     struct SharedState;
 public:
-    QmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlContextData *creationContext);
-    ~QmlObjectCreator();
+    QQmlObjectCreator(QQmlContextData *parentContext, QQmlCompiledData *compiledData, QQmlContextData *creationContext);
+    ~QQmlObjectCreator();
 
     QObject *create(int subComponentIndex = -1, QObject *parent = 0);
     QQmlContextData *finalize(QQmlInstantiationInterrupt &interrupt);
@@ -74,7 +74,7 @@ public:
     QQmlContextData *parentContextData() const { return parentContext; }
 
 private:
-    QmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData, SharedState *inheritedSharedState);
+    QQmlObjectCreator(QQmlContextData *contextData, QQmlCompiledData *compiledData, SharedState *inheritedSharedState);
 
     void init(QQmlContextData *parentContext);
 
diff --git a/src/qml/qml/qqmlparserstatus.h b/src/qml/qml/qqmlparserstatus.h
index 1d63afd978..4e611f82b1 100644
--- a/src/qml/qml/qqmlparserstatus.h
+++ b/src/qml/qml/qqmlparserstatus.h
@@ -62,7 +62,7 @@ private:
     friend class QQmlComponent;
     friend class QQmlComponentPrivate;
     friend class QQmlEnginePrivate;
-    friend class QmlObjectCreator;
+    friend class QQmlObjectCreator;
     QQmlParserStatus **d;
 };
 
diff --git a/src/qml/qml/qqmlscriptstring.h b/src/qml/qml/qqmlscriptstring.h
index 852e7d629d..9817fdc92c 100644
--- a/src/qml/qml/qqmlscriptstring.h
+++ b/src/qml/qml/qqmlscriptstring.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 class QObject;
 class QQmlContext;
 class QQmlScriptStringPrivate;
-class QmlObjectCreator;
+class QQmlObjectCreator;
 class Q_QML_EXPORT QQmlScriptString
 {
 public:
@@ -75,7 +75,7 @@ private:
     QQmlScriptString(const QString &script, QQmlContext *context, QObject *scope);
     QSharedDataPointer<QQmlScriptStringPrivate> d;
 
-    friend class QmlObjectCreator;
+    friend class QQmlObjectCreator;
     friend class QQmlScriptStringPrivate;
     friend class QQmlVME;
     friend class QQmlExpression;
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index fb1dff49fd..e60010ade8 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -1315,7 +1315,7 @@ void QQmlVMEGuard::guard(QQmlVME *vme)
         m_contexts[m_contextCount - 1] = vme->rootContext.contextData();
 }
 
-void QQmlVMEGuard::guard(QmlObjectCreator *creator)
+void QQmlVMEGuard::guard(QQmlObjectCreator *creator)
 {
     clear();
     m_contextCount = 1;
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 226d498d2c..cde8c0c6c4 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -196,7 +196,7 @@ public:
     ~QQmlVMEGuard();
 
     void guard(QQmlVME *);
-    void guard(QmlObjectCreator *);
+    void guard(QQmlObjectCreator *);
     void clear();
 
     bool isOK() const;
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 3b02e1850b..60c6389d28 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1873,7 +1873,7 @@ void QQmlDelegateModelItem::incubateObject(
     incubatorPriv->compiledData = componentPriv->cc;
     incubatorPriv->compiledData->addref();
     if (enginePriv->useNewCompiler) {
-        incubatorPriv->creator.reset(new QmlObjectCreator(context, componentPriv->cc, componentPriv->creationContext));
+        incubatorPriv->creator.reset(new QQmlObjectCreator(context, componentPriv->cc, componentPriv->creationContext));
         incubatorPriv->subComponentToCreate = componentPriv->start;
     } else {
         incubatorPriv->vme.init(