Rename the quick extension macros

This patch renames Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS to
Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS and
Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS to
Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS to reflect better their
purpose.

Change-Id: I8947f8bd99d12d2dfb8572ee88c129128fe6cb2b
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

3 files changed, 27 insertions, 39 deletions

diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h
index fb6c73c4a..6322d28fe 100644
--- a/src/compositor/global/qwaylandquickextension.h
+++ b/src/compositor/global/qwaylandquickextension.h
@@ -41,8 +41,8 @@
 
 QT_BEGIN_NAMESPACE
 
-#define Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(className) \
-    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickData : public className \
+#define Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(className) \
+    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickExtension : public className \
     { \
 /* qmake ignore Q_OBJECT */ \
         Q_OBJECT \
@@ -57,8 +57,8 @@ QT_BEGIN_NAMESPACE
         QList<QObject *> m_objects; \
     };
 
-#define Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(className) \
-    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickExtension : public className \
+#define Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS(className) \
+    class Q_WAYLAND_COMPOSITOR_EXPORT className##QuickExtensionContainer : public className \
     { \
 /* qmake ignore Q_OBJECT */ \
         Q_OBJECT \
@@ -73,27 +73,27 @@ QT_BEGIN_NAMESPACE
         QQmlListProperty<QWaylandExtension> extensions() \
         { \
             return QQmlListProperty<QWaylandExtension>(this, this, \
-                                                       &className##QuickExtension::append_extension, \
-                                                       &className##QuickExtension::countFunction, \
-                                                       &className##QuickExtension::atFunction, \
-                                                       &className##QuickExtension::clearFunction); \
+                                                       &className##QuickExtensionContainer::append_extension, \
+                                                       &className##QuickExtensionContainer::countFunction, \
+                                                       &className##QuickExtensionContainer::atFunction, \
+                                                       &className##QuickExtensionContainer::clearFunction); \
         } \
         static int countFunction(QQmlListProperty<QWaylandExtension> *list) \
         { \
-            return static_cast<className##QuickExtension *>(list->data)->extension_vector.size(); \
+            return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.size(); \
         } \
         static QWaylandExtension *atFunction(QQmlListProperty<QWaylandExtension> *list, int index) \
         { \
-            return static_cast<className##QuickExtension *>(list->data)->extension_vector.at(index); \
+            return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.at(index); \
         } \
         static void append_extension(QQmlListProperty<QWaylandExtension> *list, QWaylandExtension *extension) \
         { \
-            className##QuickExtension *quickExtObj = static_cast<className##QuickExtension *>(list->data); \
+            className##QuickExtensionContainer *quickExtObj = static_cast<className##QuickExtensionContainer *>(list->data); \
             extension->setExtensionContainer(quickExtObj); \
         } \
         static void clearFunction(QQmlListProperty<QWaylandExtension> *list) \
         { \
-            static_cast<className##QuickExtension *>(list->data)->extension_vector.clear(); \
+            static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.clear(); \
         } \
     private: \
         QList<QObject *> m_objects; \
diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index d284aaf19..82f9d57a5 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -174,7 +174,7 @@ Module {
     }
     Component { name: "QWaylandQuickCompositor"; prototype: "QWaylandCompositor" }
     Component {
-        name: "QWaylandQuickCompositorQuickExtension"
+        name: "QWaylandQuickCompositorQuickExtensionContainer"
         defaultProperty: "data"
         prototype: "QWaylandQuickCompositor"
         exports: ["QtWayland.Compositor/WaylandCompositor 1.0"]
@@ -338,7 +338,7 @@ Module {
         }
     }
     Component {
-        name: "QWaylandWindowManagerExtensionQuickData"
+        name: "QWaylandWindowManagerExtensionQuickExtension"
         defaultProperty: "data"
         prototype: "QWaylandWindowManagerExtension"
         exports: ["QtWayland.Compositor/WindowManager 1.0"]
@@ -359,7 +359,7 @@ Module {
         }
     }
     Component {
-        name: "QWaylandWlShellQuickData"
+        name: "QWaylandWlShellQuickExtension"
         defaultProperty: "data"
         prototype: "QWaylandWlShell"
         exports: ["QtWayland.Compositor/WlShell 1.0"]
@@ -461,14 +461,6 @@ Module {
         Method { name: "sendPopupDone" }
     }
     Component {
-        name: "QWaylandWlShellSurfaceQuickData"
-        defaultProperty: "data"
-        prototype: "QWaylandWlShellSurface"
-        exports: ["QtWayland.Compositor/WlShellSurface 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-    }
-    Component {
         prototype: "QQuickItem"
         name: "QtWayland.Compositor/WaylandCursorItem 1.0"
         exports: ["QtWayland.Compositor/WaylandCursorItem 1.0"]
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index d2d8189bf..ae4f874df 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -61,14 +61,11 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandQuickCompositor)
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandWindowManagerExtension)
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandWlShell)
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandWlShellSurface)
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandXdgShell)
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandXdgSurface)
-
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandTextInputManager)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS(QWaylandQuickCompositor)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWindowManagerExtension)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWlShell)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandXdgShell)
+Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandTextInputManager)
 
 class QmlUrlResolver
 {
@@ -132,12 +129,11 @@ public:
 
     static void defineModule(const char *uri)
     {
-        qmlRegisterType<QWaylandQuickCompositorQuickExtension>(uri, 1, 0, "WaylandCompositor");
+        qmlRegisterType<QWaylandQuickCompositorQuickExtensionContainer>(uri, 1, 0, "WaylandCompositor");
         qmlRegisterType<QWaylandQuickItem>(uri, 1, 0, "WaylandQuickItem");
         qmlRegisterType<QWaylandMouseTracker>(uri, 1, 0, "WaylandMouseTracker");
         qmlRegisterType<QWaylandQuickOutput>(uri, 1, 0, "WaylandOutput");
         qmlRegisterType<QWaylandQuickSurface>(uri, 1, 0, "WaylandSurface");
-        qmlRegisterType<QWaylandWindowManagerExtensionQuickData>(uri, 1, 0, "WindowManager");
 
         qmlRegisterUncreatableType<QWaylandExtension>(uri, 1, 0, "WaylandExtension", QObject::tr("Cannot create instance of WaylandExtension"));
         qmlRegisterUncreatableType<QWaylandClient>(uri, 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient"));
@@ -150,14 +146,14 @@ public:
         qmlRegisterUncreatableType<QWaylandResource>(uri, 1, 0, "WaylandResource", QObject::tr("Cannot create instance of WaylandResource"));
 
         //This should probably be somewhere else
-        qmlRegisterType<QWaylandWlShellQuickData>(uri, 1, 0, "WlShell");
-        qmlRegisterType<QWaylandWlShellSurfaceQuickData>(uri, 1, 0, "WlShellSurface");
+        qmlRegisterType<QWaylandWindowManagerExtensionQuickExtension>(uri, 1, 0, "WindowManager");
+        qmlRegisterType<QWaylandWlShellQuickExtension>(uri, 1, 0, "WlShell");
+        qmlRegisterType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurface");
         qmlRegisterType<QWaylandQuickWlShellSurfaceItem>(uri, 1, 0, "WlShellSurfaceItem");
-        qmlRegisterType<QWaylandTextInputManagerQuickData>(uri, 1, 0, "TextInputManager");
-
-        qmlRegisterType<QWaylandXdgShellQuickData>(uri, 1, 0, "XdgShell");
-        qmlRegisterType<QWaylandXdgSurfaceQuickData>(uri, 1, 0, "XdgSurface");
+        qmlRegisterType<QWaylandXdgShellQuickExtension>(uri, 1, 0, "XdgShell");
+        qmlRegisterType<QWaylandXdgSurface>(uri, 1, 0, "XdgSurface");
         qmlRegisterType<QWaylandQuickXdgSurfaceItem>(uri, 1, 0, "XdgSurfaceItem");
+        qmlRegisterType<QWaylandTextInputManagerQuickExtension>(uri, 1, 0, "TextInputManager");
     }
 };
 //![class decl]