Macro for QML extension boilerplate

defines which gives type sub-classes which adds desired functionality
for extensions in QML

Change-Id: I3973e07e0daf0c27813b3405b9188281092f4375

1 files changed, 6 insertions, 60 deletions

diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 597aa0734..2b78ccd25 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -46,6 +46,7 @@
 #include <QtCompositor/QWaylandOutput>
 #include <QtCompositor/QWaylandOutputSpace>
 #include <QtCompositor/QWaylandExtension>
+#include <QtCompositor/QWaylandQuickExtension>
 
 #include <QtCompositor/QWaylandShell>
 
@@ -54,63 +55,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_COMPOSITOR_EXPORT QWaylandQuickCompositorImpl : public QWaylandQuickCompositor
-{
-    Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false)
-    Q_PROPERTY(QQmlListProperty<QWaylandExtension> extensions READ extensions)
-    Q_CLASSINFO("DefaultProperty", "data")
-public:
-    QWaylandQuickCompositorImpl(QObject *parent = 0)
-        : QWaylandQuickCompositor(parent)
-    {
-        setInitializeLegazyQmlNames(false);
-    }
-
-    QQmlListProperty<QObject> data()
-    {
-        return QQmlListProperty<QObject>(this, m_objects);
-    }
-
-    QQmlListProperty<QWaylandExtension> extensions()
-    {
-        return QQmlListProperty<QWaylandExtension>(this, this,
-                                                   &QWaylandQuickCompositorImpl::append_extension,
-                                                   &QWaylandQuickCompositorImpl::countFunction,
-                                                   &QWaylandQuickCompositorImpl::atFunction,
-                                                   &QWaylandQuickCompositorImpl::clearFunction);
-    }
-
-    static int countFunction(QQmlListProperty<QWaylandExtension> *list)
-    {
-        return static_cast<QWaylandQuickCompositorImpl *>(list->data)->extension_vector.size();
-    }
-
-    static QWaylandExtension *atFunction(QQmlListProperty<QWaylandExtension> *list, int index)
-    {
-        return static_cast<QWaylandQuickCompositorImpl *>(list->data)->extension_vector.at(index);
-    }
-
-    static void append_extension(QQmlListProperty<QWaylandExtension> *list, QWaylandExtension *extension)
-    {
-        QWaylandQuickCompositorImpl *compositor = static_cast<QWaylandQuickCompositorImpl *>(list->data);
-        extension->setExtensionContainer(compositor);
-    }
-
-    static void clearFunction(QQmlListProperty<QWaylandExtension> *list)
-    {
-        static_cast<QWaylandQuickCompositorImpl *>(list->data)->extension_vector.clear();
-    }
-protected:
-    void componentComplete() Q_DECL_OVERRIDE
-    {
-        create();
-        QWaylandQuickCompositor::componentComplete();
-    }
-
-private:
-    QList<QObject *> m_objects;
-};
+Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandShell)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandQuickCompositor)
 
 class QmlUrlResolver
 {
@@ -174,19 +120,19 @@ public:
 
     static void defineModule(const char *uri)
     {
-        qmlRegisterType<QWaylandQuickCompositorImpl>(uri, 1, 0, "WaylandCompositor");
+        qmlRegisterType<QWaylandQuickCompositorQuickExtension>(uri, 1, 0, "WaylandCompositor");
         qmlRegisterType<QWaylandQuickItem>(uri, 1, 0, "WaylandQuickItem");
         qmlRegisterType<QWaylandMouseTracker>(uri, 1, 0, "WaylandMouseTracker");
 
         qmlRegisterUncreatableType<QWaylandExtension>(uri, 1, 0, "WaylandExtension", QObject::tr("Cannot create instance of WaylandExtension"));
-        qmlRegisterUncreatableType<QWaylandQuickSurface>(uri, 1, 0, "WaylandSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
+        qmlRegisterUncreatableType<QWaylandSurface>(uri, 1, 0, "WaylandSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
         qmlRegisterUncreatableType<QWaylandClient>(uri, 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient"));
         qmlRegisterUncreatableType<QWaylandOutput>(uri, 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput"));
         qmlRegisterUncreatableType<QWaylandOutputSpace>(uri, 1, 0, "WaylandOutputSpace", QObject::tr("Cannot create instance of WaylandOutputSpace"));
         qmlRegisterUncreatableType<QWaylandView>(uri, 1, 0, "WaylandView", QObject::tr("Cannot create instance of WaylandView, it can be retrieved by accessor on WaylandQuickItem"));
 
         //This should probably be somewhere else
-        qmlRegisterType<QWaylandShell>(uri, 1, 0, "DefaultShell");
+        qmlRegisterType<QWaylandShellQuickData>(uri, 1, 0, "DefaultShell");
         qmlRegisterUncreatableType<QWaylandShellSurface>(uri, 1, 0, "DefaultShellSurface", QObject::tr("Cannot create instance of DefaultShellSurface"));
     }
 };