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/compositor/global | |
| 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/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandquickextension.h | 24 |
1 files changed, 12 insertions, 12 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; \ |