diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-13 09:37:40 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-18 12:20:21 +0000 |
commit | 959d9d604da402e768ce329d43510d2b03756d89 (patch) | |
tree | 2308a6895b9b959fa0783d425bd3104902e1703c /src/compositor/global | |
parent | bc9c876939efbac4a62f9244cf2a7a15da15fb91 (diff) |
Rename QWaylandExtension to QWaylandCompositorExtension
Since we have QWaylandClientExtension
Change-Id: Ie8d60322c8e730bda651e06ed5db0fe1359d946e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/compositor/global')
-rw-r--r-- | src/compositor/global/global.pri | 6 | ||||
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension.cpp (renamed from src/compositor/global/qwaylandextension.cpp) | 56 | ||||
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension.h (renamed from src/compositor/global/qwaylandextension.h) | 52 | ||||
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension_p.h (renamed from src/compositor/global/qwaylandextension_p.h) | 16 | ||||
-rw-r--r-- | src/compositor/global/qwaylandquickextension.h | 16 |
5 files changed, 73 insertions, 73 deletions
diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri index 6edfd9685..e48b8a8c2 100644 --- a/src/compositor/global/global.pri +++ b/src/compositor/global/global.pri @@ -2,10 +2,10 @@ INCLUDEPATH += global/ HEADERS += \ global/qwaylandexport.h \ - global/qwaylandextension.h \ - global/qwaylandextension_p.h \ + global/qwaylandcompositorextension.h \ + global/qwaylandcompositorextension_p.h \ global/qwaylandquickextension.h \ SOURCES += \ - global/qwaylandextension.cpp + global/qwaylandcompositorextension.cpp diff --git a/src/compositor/global/qwaylandextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp index 4fee48df1..ddfd25837 100644 --- a/src/compositor/global/qwaylandextension.cpp +++ b/src/compositor/global/qwaylandcompositorextension.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ -#include "qwaylandextension.h" -#include "qwaylandextension_p.h" +#include "qwaylandcompositorextension.h" +#include "qwaylandcompositorextension_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QDebug> @@ -45,59 +45,59 @@ QT_BEGIN_NAMESPACE -QWaylandExtension::QWaylandExtension() - : QWaylandObject(*new QWaylandExtensionPrivate()) +QWaylandCompositorExtension::QWaylandCompositorExtension() + : QWaylandObject(*new QWaylandCompositorExtensionPrivate()) { } -QWaylandExtension::QWaylandExtension(QWaylandObject *container) - : QWaylandObject(*new QWaylandExtensionPrivate()) +QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandObject *container) + : QWaylandObject(*new QWaylandCompositorExtensionPrivate()) { d_func()->extension_container = container; QCoreApplication::postEvent(this, new QEvent(QEvent::Polish)); } -QWaylandExtension::QWaylandExtension(QWaylandExtensionPrivate &dd) +QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd) : QWaylandObject(dd) { } -QWaylandExtension::QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd) +QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd) : QWaylandObject(dd) { d_func()->extension_container = container; QCoreApplication::postEvent(this, new QEvent(QEvent::Polish)); } -QWaylandExtension::~QWaylandExtension() +QWaylandCompositorExtension::~QWaylandCompositorExtension() { - Q_D(QWaylandExtension); + Q_D(QWaylandCompositorExtension); if (d->extension_container) d->extension_container->removeExtension(this); } -QWaylandObject *QWaylandExtension::extensionContainer() const +QWaylandObject *QWaylandCompositorExtension::extensionContainer() const { - Q_D(const QWaylandExtension); + Q_D(const QWaylandCompositorExtension); return d->extension_container; } -void QWaylandExtension::setExtensionContainer(QWaylandObject *container) +void QWaylandCompositorExtension::setExtensionContainer(QWaylandObject *container) { - Q_D(QWaylandExtension); + Q_D(QWaylandCompositorExtension); d->extension_container = container; } -void QWaylandExtension::initialize() +void QWaylandCompositorExtension::initialize() { - Q_D(QWaylandExtension); + Q_D(QWaylandCompositorExtension); if (d->initialized) { - qWarning() << "QWaylandExtension:" << extensionInterface()->name << "is already initialized"; + qWarning() << "QWaylandCompositorExtension:" << extensionInterface()->name << "is already initialized"; return; } if (!d->extension_container) { - qWarning() << "QWaylandExtension:" << extensionInterface()->name << "requests to initialize with no extension container set"; + qWarning() << "QWaylandCompositorExtension:" << extensionInterface()->name << "requests to initialize with no extension container set"; return; } @@ -105,13 +105,13 @@ void QWaylandExtension::initialize() d->initialized = true; } -bool QWaylandExtension::isInitialized() const +bool QWaylandCompositorExtension::isInitialized() const { - Q_D(const QWaylandExtension); + Q_D(const QWaylandCompositorExtension); return d->initialized; } -bool QWaylandExtension::event(QEvent *event) +bool QWaylandCompositorExtension::event(QEvent *event) { switch(event->type()) { case QEvent::Polish: @@ -136,11 +136,11 @@ QWaylandObject::QWaylandObject(QObjectPrivate &d, QObject *parent) QWaylandObject::~QWaylandObject() { - foreach (QWaylandExtension *extension, extension_vector) - QWaylandExtensionPrivate::get(extension)->extension_container = Q_NULLPTR; + foreach (QWaylandCompositorExtension *extension, extension_vector) + QWaylandCompositorExtensionPrivate::get(extension)->extension_container = Q_NULLPTR; } -QWaylandExtension *QWaylandObject::extension(const QByteArray &name) +QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name) { for (int i = 0; i < extension_vector.size(); i++) { if (extension_vector.at(i)->extensionInterface()->name == name) @@ -149,7 +149,7 @@ QWaylandExtension *QWaylandObject::extension(const QByteArray &name) return Q_NULLPTR; } -QWaylandExtension *QWaylandObject::extension(const wl_interface *interface) +QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *interface) { for (int i = 0; i < extension_vector.size(); i++) { if (extension_vector.at(i)->extensionInterface() == interface) @@ -158,18 +158,18 @@ QWaylandExtension *QWaylandObject::extension(const wl_interface *interface) return Q_NULLPTR; } -QList<QWaylandExtension *> QWaylandObject::extensions() const +QList<QWaylandCompositorExtension *> QWaylandObject::extensions() const { return extension_vector; } -void QWaylandObject::addExtension(QWaylandExtension *extension) +void QWaylandObject::addExtension(QWaylandCompositorExtension *extension) { Q_ASSERT(!extension_vector.contains(extension)); extension_vector.append(extension); } -void QWaylandObject::removeExtension(QWaylandExtension *extension) +void QWaylandObject::removeExtension(QWaylandCompositorExtension *extension) { Q_ASSERT(extension_vector.contains(extension)); extension_vector.removeOne(extension); diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandcompositorextension.h index 7692aac8f..fd9cfad0e 100644 --- a/src/compositor/global/qwaylandextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -47,35 +47,35 @@ struct wl_interface; QT_BEGIN_NAMESPACE class QWaylandCompositor; -class QWaylandExtension; -class QWaylandExtensionPrivate; -class QWaylandExtensionTemplatePrivate; +class QWaylandCompositorExtension; +class QWaylandCompositorExtensionPrivate; +class QWaylandCompositorExtensionTemplatePrivate; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject { public: virtual ~QWaylandObject(); - QWaylandExtension *extension(const QByteArray &name); - QWaylandExtension *extension(const wl_interface *interface); - QList<QWaylandExtension *> extensions() const; - void addExtension(QWaylandExtension *extension); - void removeExtension(QWaylandExtension *extension); + QWaylandCompositorExtension *extension(const QByteArray &name); + QWaylandCompositorExtension *extension(const wl_interface *interface); + QList<QWaylandCompositorExtension *> extensions() const; + void addExtension(QWaylandCompositorExtension *extension); + void removeExtension(QWaylandCompositorExtension *extension); protected: QWaylandObject(QObject *parent = 0); QWaylandObject(QObjectPrivate &d, QObject *parent = 0); - QList<QWaylandExtension *> extension_vector; + QList<QWaylandCompositorExtension *> extension_vector; }; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtension : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtension : public QWaylandObject { Q_OBJECT - Q_DECLARE_PRIVATE(QWaylandExtension) + Q_DECLARE_PRIVATE(QWaylandCompositorExtension) public: - QWaylandExtension(); - QWaylandExtension(QWaylandObject *container); - virtual ~QWaylandExtension(); + QWaylandCompositorExtension(); + QWaylandCompositorExtension(QWaylandObject *container); + virtual ~QWaylandCompositorExtension(); QWaylandObject *extensionContainer() const; void setExtensionContainer(QWaylandObject *container); @@ -86,23 +86,23 @@ public: virtual const struct wl_interface *extensionInterface() const = 0; protected: - QWaylandExtension(QWaylandExtensionPrivate &dd); - QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd); + QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd); + QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd); bool event(QEvent *event) Q_DECL_OVERRIDE; }; template <typename T> -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplate : public QWaylandCompositorExtension { - Q_DECLARE_PRIVATE(QWaylandExtensionTemplate) + Q_DECLARE_PRIVATE(QWaylandCompositorExtensionTemplate) public: - QWaylandExtensionTemplate() - : QWaylandExtension() + QWaylandCompositorExtensionTemplate() + : QWaylandCompositorExtension() { } - QWaylandExtensionTemplate(QWaylandObject *container) - : QWaylandExtension(container) + QWaylandCompositorExtensionTemplate(QWaylandObject *container) + : QWaylandCompositorExtension(container) { } const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE @@ -117,12 +117,12 @@ public: } protected: - QWaylandExtensionTemplate(QWaylandExtensionPrivate &dd) - : QWaylandExtension(dd) + QWaylandCompositorExtensionTemplate(QWaylandCompositorExtensionPrivate &dd) + : QWaylandCompositorExtension(dd) { } - QWaylandExtensionTemplate(QWaylandObject *container, QWaylandExtensionPrivate &dd) - : QWaylandExtension(container,dd) + QWaylandCompositorExtensionTemplate(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd) + : QWaylandCompositorExtension(container,dd) { } }; diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h index 3aaf235c7..5548da949 100644 --- a/src/compositor/global/qwaylandextension_p.h +++ b/src/compositor/global/qwaylandcompositorextension_p.h @@ -48,34 +48,34 @@ // We mean it. // -#include "qwaylandextension.h" +#include "qwaylandcompositorextension.h" #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionPrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(QWaylandExtension) + Q_DECLARE_PUBLIC(QWaylandCompositorExtension) public: - QWaylandExtensionPrivate() + QWaylandCompositorExtensionPrivate() : QObjectPrivate() , extension_container(Q_NULLPTR) , initialized(false) { } - static QWaylandExtensionPrivate *get(QWaylandExtension *extension) { return extension->d_func(); } + static QWaylandCompositorExtensionPrivate *get(QWaylandCompositorExtension *extension) { return extension->d_func(); } QWaylandObject *extension_container; bool initialized; }; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivate : public QWaylandExtensionPrivate +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplatePrivate : public QWaylandCompositorExtensionPrivate { public: - QWaylandExtensionTemplatePrivate() - : QWaylandExtensionPrivate() + QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() { } }; diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h index 64359ffa1..32f4e6527 100644 --- a/src/compositor/global/qwaylandquickextension.h +++ b/src/compositor/global/qwaylandquickextension.h @@ -37,7 +37,7 @@ #ifndef QWAYLANDQUICKEXTENSION_H #define QWAYLANDQUICKEXTENSION_H -#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/QWaylandCompositorExtension> #include <QtQml/QQmlParserStatus> #include <QtQml/QQmlListProperty> @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE { \ /* qmake ignore Q_OBJECT */ \ Q_OBJECT \ - Q_PROPERTY(QQmlListProperty<QWaylandExtension> extensions READ extensions) \ + Q_PROPERTY(QQmlListProperty<QWaylandCompositorExtension> extensions READ extensions) \ Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false) \ Q_CLASSINFO("DefaultProperty", "data") \ public: \ @@ -74,28 +74,28 @@ QT_BEGIN_NAMESPACE { \ return QQmlListProperty<QObject>(this, m_objects); \ } \ - QQmlListProperty<QWaylandExtension> extensions() \ + QQmlListProperty<QWaylandCompositorExtension> extensions() \ { \ - return QQmlListProperty<QWaylandExtension>(this, this, \ + return QQmlListProperty<QWaylandCompositorExtension>(this, this, \ &className##QuickExtensionContainer::append_extension, \ &className##QuickExtensionContainer::countFunction, \ &className##QuickExtensionContainer::atFunction, \ &className##QuickExtensionContainer::clearFunction); \ } \ - static int countFunction(QQmlListProperty<QWaylandExtension> *list) \ + static int countFunction(QQmlListProperty<QWaylandCompositorExtension> *list) \ { \ return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.size(); \ } \ - static QWaylandExtension *atFunction(QQmlListProperty<QWaylandExtension> *list, int index) \ + static QWaylandCompositorExtension *atFunction(QQmlListProperty<QWaylandCompositorExtension> *list, int index) \ { \ return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.at(index); \ } \ - static void append_extension(QQmlListProperty<QWaylandExtension> *list, QWaylandExtension *extension) \ + static void append_extension(QQmlListProperty<QWaylandCompositorExtension> *list, QWaylandCompositorExtension *extension) \ { \ className##QuickExtensionContainer *quickExtObj = static_cast<className##QuickExtensionContainer *>(list->data); \ extension->setExtensionContainer(quickExtObj); \ } \ - static void clearFunction(QQmlListProperty<QWaylandExtension> *list) \ + static void clearFunction(QQmlListProperty<QWaylandCompositorExtension> *list) \ { \ static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.clear(); \ } \ |