Generalize qml "registration"

While it is difficult to predict the future, the hope is that this might
give us a little more flexibility when it comes to fixing bugs etc. in
patch releases.

6 files changed, 64 insertions, 21 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index b198077..5d623dc 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -95,7 +95,8 @@ static QDeclarativePrivate::AutoParentResult qgraphicsobject_autoParent(QObject
 
 void QDeclarativeItemModule::defineModule()
 {
-    QDeclarativePrivate::registerAutoParentFunction(qgraphicsobject_autoParent);
+    QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qgraphicsobject_autoParent };
+    QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
 
 #ifdef QT_NO_MOVIE
     qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 53ff51c..c6b64ae 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -116,7 +116,7 @@ int qmlRegisterType()
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
@@ -151,7 +151,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 template<typename T>
@@ -184,7 +184,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 template<typename T, typename E>
@@ -217,7 +217,7 @@ int qmlRegisterExtendedType()
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 template<typename T, typename E>
@@ -258,7 +258,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor,
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 template<typename T>
@@ -278,7 +278,7 @@ int qmlRegisterInterface(const char *typeName)
         qobject_interface_iid<T *>()
     };
 
-    return QDeclarativePrivate::registerType(interface);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &interface);
 }
 
 template<typename T>
@@ -312,7 +312,7 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
         parser
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 class QDeclarativeContext;
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 153e2be..18b84cc 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#include <QtDeclarative/qdeclarativeprivate.h>
+static int registerType(const QDeclarativePrivate::RegisterType &);
+static int registerInterface(const QDeclarativePrivate::RegisterInterface &);
+
 #include "private/qdeclarativemetatype_p.h"
 
 #include "private/qdeclarativeproxymetaobject_p.h"
@@ -485,17 +489,17 @@ int QDeclarativeType::index() const
     return d->m_index;
 }
 
-int QDeclarativePrivate::registerAutoParentFunction(AutoParentFunction function)
+static int registerAutoParentFunction(QDeclarativePrivate::RegisterAutoParent &autoparent)
 {
     QWriteLocker lock(metaTypeDataLock());
     QDeclarativeMetaTypeData *data = metaTypeData();
 
-    data->parentFunctions.append(function);
+    data->parentFunctions.append(autoparent.function);
 
     return data->parentFunctions.count() - 1;
 }
 
-int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &interface)
+static int registerInterface(const QDeclarativePrivate::RegisterInterface &interface)
 {
     if (interface.version > 0) 
         qFatal("qmlRegisterType(): Cannot mix incompatible QML versions.");
@@ -524,7 +528,7 @@ int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterfa
     return index;
 }
 
-int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &type)
+static int registerType(const QDeclarativePrivate::RegisterType &type)
 {
     if (type.elementName) {
         for (int ii = 0; type.elementName[ii]; ++ii) {
@@ -576,6 +580,22 @@ int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &t
 }
 
 /*
+This method is "over generalized" to allow us to (potentially) register more types of things in
+the future without adding exported symbols.
+*/
+int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
+{
+    if (type == TypeRegistration) {
+        return registerType(*reinterpret_cast<RegisterType *>(data));
+    } else if (type == InterfaceRegistration) {
+        return registerInterface(*reinterpret_cast<RegisterInterface *>(data));
+    } else if (type == AutoParentRegistration) {
+        return registerAutoParentFunction(*reinterpret_cast<RegisterAutoParent *>(data));
+    }
+    return -1;
+}
+
+/*
     Have any types been registered for \a module with at least versionMajor.versionMinor, and types
     for \a module with at most versionMajor.versionMinor.
 
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 4c98b6f..f410547 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -63,6 +63,8 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeType;
 class QDeclarativeCustomParser;
+class QDeclarativeTypePrivate;
+
 class Q_DECLARATIVE_EXPORT QDeclarativeMetaType
 {
 public:
@@ -103,7 +105,6 @@ public:
     static QList<QDeclarativePrivate::AutoParentFunction> parentFunctions();
 };
 
-class QDeclarativeTypePrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeType
 {
 public:
@@ -144,11 +145,12 @@ public:
     int propertyValueInterceptorCast() const;
 
     int index() const;
+
 private:
     friend class QDeclarativeTypePrivate;
     friend struct QDeclarativeMetaTypeData;
-    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
-    friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
+    friend int registerType(const QDeclarativePrivate::RegisterType &);
+    friend int registerInterface(const QDeclarativePrivate::RegisterInterface &);
     QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);
     QDeclarativeType(int, const QDeclarativePrivate::RegisterType &);
     ~QDeclarativeType();
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index cd859fe..b2d7451 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -42,6 +42,17 @@
 #ifndef QDECLARATIVEPRIVATE_H
 #define QDECLARATIVEPRIVATE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 #ifndef Q_OS_WIN
@@ -177,6 +188,9 @@ namespace QDeclarativePrivate
         return AttachedPropertySelector<T, has_attachedPropertiesMethod<T, has_attachedPropertiesMember<T>::value>::value>::metaObject();
     }
 
+    enum AutoParentResult { Parented, IncompatibleObject, IncompatibleParent };
+    typedef AutoParentResult (*AutoParentFunction)(QObject *object, QObject *parent);
+
     struct RegisterType {
         int version;
 
@@ -214,13 +228,19 @@ namespace QDeclarativePrivate
         const char *iid;
     };
 
-    enum AutoParentResult { Parented, IncompatibleObject, IncompatibleParent };
-    typedef AutoParentResult (*AutoParentFunction)(QObject *object, QObject *parent);
+    struct RegisterAutoParent {
+        int version;
 
-    int Q_DECLARATIVE_EXPORT registerAutoParentFunction(AutoParentFunction);
-    int Q_DECLARATIVE_EXPORT registerType(const RegisterType &);
-    int Q_DECLARATIVE_EXPORT registerType(const RegisterInterface &);
+        AutoParentFunction function;
+    };
+
+    enum RegistrationType {
+        TypeRegistration       = 0, 
+        InterfaceRegistration  = 1,
+        AutoParentRegistration = 2
+    };
 
+    int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index 61e550a..98e9a58 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -74,7 +74,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
         0
     };
 
-    return QDeclarativePrivate::registerType(type);
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
 QDeclarativeValueTypeFactory::QDeclarativeValueTypeFactory()