Separate non-generic code out of QQmlPropertyCacheCreator

Some code is not suitable for a future conversion of the class to a
template, which is now moved out. This includes the tr() handling as
well as the instantiation context, which does not require any
parameterization.

Change-Id: Ib40e24ebb7166c8649ca218f02558a737d39fe53
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 18 insertions, 12 deletions

diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/compiler/qqmlpropertycachecreator_p.h
index 6d575c6a99..f78aa69cfe 100644
--- a/src/qml/compiler/qqmlpropertycachecreator_p.h
+++ b/src/qml/compiler/qqmlpropertycachecreator_p.h
@@ -54,9 +54,23 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlPropertyCacheCreator
+struct QQmlBindingInstantiationContext {
+    QQmlBindingInstantiationContext();
+    QQmlBindingInstantiationContext(int referencingObjectIndex, const QV4::CompiledData::Binding *instantiatingBinding, const QString &instantiatingPropertyName, const QQmlPropertyCache *referencingObjectPropertyCache);
+    int referencingObjectIndex;
+    const QV4::CompiledData::Binding *instantiatingBinding;
+    QQmlPropertyData *instantiatingProperty;
+};
+
+struct QQmlPropertyCacheCreatorBase
+{
+    Q_DECLARE_TR_FUNCTIONS(QQmlPropertyCacheCreatorBase)
+public:
+    static QAtomicInt classIndexCounter;
+};
+
+class QQmlPropertyCacheCreator : public QQmlPropertyCacheCreatorBase
 {
-    Q_DECLARE_TR_FUNCTIONS(QQmlPropertyCacheCreator)
 public:
     QQmlPropertyCacheCreator(QQmlPropertyCacheVector *propertyCaches, QQmlEnginePrivate *enginePrivate, const QQmlTypeCompiler *compiler, const QQmlImports *imports);
     ~QQmlPropertyCacheCreator();
@@ -64,16 +78,8 @@ public:
     QQmlCompileError buildMetaObjects();
 
 protected:
-    struct InstantiationContext {
-        InstantiationContext();
-        InstantiationContext(int referencingObjectIndex, const QV4::CompiledData::Binding *instantiatingBinding, const QString &instantiatingPropertyName, const QQmlPropertyCache *referencingObjectPropertyCache);
-        int referencingObjectIndex;
-        const QV4::CompiledData::Binding *instantiatingBinding;
-        QQmlPropertyData *instantiatingProperty;
-    };
-
-    QQmlCompileError buildMetaObjectRecursively(int objectIndex, const InstantiationContext &context);
-    QQmlPropertyCache *propertyCacheForObject(const QmlIR::Object *obj, const InstantiationContext &context, QQmlCompileError *error) const;
+    QQmlCompileError buildMetaObjectRecursively(int objectIndex, const QQmlBindingInstantiationContext &context);
+    QQmlPropertyCache *propertyCacheForObject(const QmlIR::Object *obj, const QQmlBindingInstantiationContext &context, QQmlCompileError *error) const;
     QQmlCompileError createMetaObject(int objectIndex, const QmlIR::Object *obj, QQmlPropertyCache *baseTypeCache);
 
     QString stringAt(int index) const { return compiler->stringAt(index); }