diff options
author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-04-25 10:28:02 +0300 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-04-29 13:36:35 +0000 |
commit | b85246e7009004d6157d919a6ee4ddb4040ce1e1 (patch) | |
tree | 7362168ed38b73cb5af54680776213cb35f1b5e5 /src/imports | |
parent | 32a09df9a1b42806be0fd82a40f5837a22cfa52c (diff) |
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>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/compositor/plugins.qmltypes | 14 | ||||
-rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 28 |
2 files changed, 15 insertions, 27 deletions
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] |