From 43b1f81bc359a2c9d5c3d26f5110319803ef31c2 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 25 Feb 2010 11:56:59 +1000
Subject: Make QML_REGISTER...TYPE functions unnecessary (still exist for now).
 Fix multimedia plugin.

---
 src/declarative/qml/qdeclarative.h                 | 26 +++++++++++-----------
 src/multimedia/qml/multimediadeclarative.cpp       |  8 +++----
 .../qdeclarativemodules/multimedia/multimedia.cpp  |  4 ++--
 .../qdeclarativemodules/widgets/widgets.cpp        | 12 +++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 3133d27..77b7484 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -87,9 +87,9 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 template<typename T>
-int qmlRegisterType(const char *typeName)
+int qmlRegisterType()
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -119,9 +119,9 @@ int qmlRegisterType(const char *typeName)
 }
 
 template<typename T>
-int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const char *typeName)
+int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -151,9 +151,9 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
 }
 
 template<typename T, typename E>
-int qmlRegisterExtendedType(const char *typeName)
+int qmlRegisterExtendedType()
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -184,9 +184,9 @@ int qmlRegisterExtendedType(const char *typeName)
 
 template<typename T, typename E>
 int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, 
-                            const char *qmlName, const char *typeName)
+                            const char *qmlName)
 {
-    QByteArray name(typeName);
+    QByteArray name(T::staticMetaObject.className());
 
     QByteArray pointerName(name + '*');
     QByteArray listName("QDeclarativeListProperty<" + name + ">");
@@ -278,14 +278,14 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
 #define QML_REGISTER_INTERFACE(INTERFACE) \
     qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
-#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \
-    qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE)
+#define QML_REGISTER_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, CLASS, EXTENSION) \
+    qmlRegisterExtendedType<CLASS,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME)
 
-#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,TYPE,CLASS) \
-    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #TYPE, #CLASS)
+#define QML_REGISTER_TYPE(URI,VMAJ,VMIN,NAME,CLASS) \
+    qmlRegisterType<CLASS>(#URI, VMAJ, VMIN, #NAME)
 
 #define QML_REGISTER_NOCREATE_TYPE(CLASS) \
-    qmlRegisterType<CLASS>(#CLASS)
+    qmlRegisterType<CLASS>()
 
 class QDeclarativeContext;
 class QDeclarativeEngine;
diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
index cfb8999..ba4036f 100644
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ b/src/multimedia/qml/multimediadeclarative.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
 #include <QtMultimedia/private/qsoundeffect_p.h>
 #include <QtMultimedia/private/qdeclarativeaudio_p.h>
 #include <QtMultimedia/private/qdeclarativevideo_p.h>
@@ -60,9 +60,9 @@ void qRegisterDeclarativeElements(QDeclarativeEngine *engine, const char *uri)
     Q_UNUSED(engine)
     Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
 
-    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect");
-    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio", "Audio");
-    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video", "Video");
+    qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect");
+    qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio");
+    qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video");
 }
 
 }
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
index e27dd8d..1158c88 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
@@ -41,7 +41,7 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/qdeclarative.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
 public:
     virtual void initialize(QDeclarativeEngine *engine, const char *uri)
     {
-        QtMultimedia::qRegisterDeclarativeElements(engine, uri);
+        QtMultimedia::qRegisterQmlElements(engine, uri);
     }
 };
 
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
index dc45428..7229d88 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp
+++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp
@@ -127,12 +127,12 @@ public:
 
         QML_REGISTER_INTERFACE(QGraphicsLayoutItem);
         QML_REGISTER_INTERFACE(QGraphicsLayout);
-        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem","QGraphicsLinearLayoutStretchItemObject");
-        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout","QGraphicsLinearLayoutObject");
-        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout","QGraphicsGridLayoutObject");
-        qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView","QGraphicsView");
-        qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene","QGraphicsScene");
-        qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget","QGraphicsWidget");
+        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem");
+        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout");
+        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout");
+        qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView");
+        qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene");
+        qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget");
         QML_REGISTER_INTERFACE(QGraphicsItem);
     }
 };
-- 
cgit v0.12