diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-10-05 12:22:55 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-10-23 12:21:27 +0000 |
commit | c39f3b238acfb0eac8e6763c7d65b23f19fe68d7 (patch) | |
tree | 44c5c9d7baa9b3036e667ada8f42d2b4999f6bbf /src/compositor/global/qwaylandextension.cpp | |
parent | 907bdf61761331729fe58c6394ea97354a6a9a2f (diff) |
Rename QWaylandExtensionContainer to QWaylandObject
Change the name, and make QWaylandExtension a
subclass of QWaylandObject. This way, all extensions
can have extensions of their own, without multiply
inheriting.
Change-Id: Ie06e764412d113f7a62399caa605a48b015c7d24
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/compositor/global/qwaylandextension.cpp')
-rw-r--r-- | src/compositor/global/qwaylandextension.cpp | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/src/compositor/global/qwaylandextension.cpp b/src/compositor/global/qwaylandextension.cpp index 124ebb35e..a0cb8d418 100644 --- a/src/compositor/global/qwaylandextension.cpp +++ b/src/compositor/global/qwaylandextension.cpp @@ -46,24 +46,24 @@ QT_BEGIN_NAMESPACE QWaylandExtension::QWaylandExtension() - : QObject(*new QWaylandExtensionPrivate()) + : QWaylandObject(*new QWaylandExtensionPrivate()) { } -QWaylandExtension::QWaylandExtension(QWaylandExtensionContainer *container) - : QObject(*new QWaylandExtensionPrivate()) +QWaylandExtension::QWaylandExtension(QWaylandObject *container) + : QWaylandObject(*new QWaylandExtensionPrivate()) { d_func()->extension_container = container; QCoreApplication::postEvent(this, new QEvent(QEvent::Polish)); } QWaylandExtension::QWaylandExtension(QWaylandExtensionPrivate &dd) - : QObject(dd) + : QWaylandObject(dd) { } -QWaylandExtension::QWaylandExtension(QWaylandExtensionContainer *container, QWaylandExtensionPrivate &dd) - : QObject(dd) +QWaylandExtension::QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd) + : QWaylandObject(dd) { d_func()->extension_container = container; QCoreApplication::postEvent(this, new QEvent(QEvent::Polish)); @@ -76,13 +76,13 @@ QWaylandExtension::~QWaylandExtension() d->extension_container->removeExtension(this); } -QWaylandExtensionContainer *QWaylandExtension::extensionContainer() const +QWaylandObject *QWaylandExtension::extensionContainer() const { Q_D(const QWaylandExtension); return d->extension_container; } -void QWaylandExtension::setExtensionContainer(QWaylandExtensionContainer *container) +void QWaylandExtension::setExtensionContainer(QWaylandObject *container) { Q_D(QWaylandExtension); d->extension_container = container; @@ -120,16 +120,27 @@ bool QWaylandExtension::event(QEvent *event) default: break; } - return QObject::event(event); + return QWaylandObject::event(event); } -QWaylandExtensionContainer::~QWaylandExtensionContainer() +QWaylandObject::QWaylandObject(QObject *parent) + :QObject(parent) +{ +} + +QWaylandObject::QWaylandObject(QObjectPrivate &d, QObject *parent) + :QObject(d, parent) +{ +} + + +QWaylandObject::~QWaylandObject() { foreach (QWaylandExtension *extension, extension_vector) QWaylandExtensionPrivate::get(extension)->extension_container = Q_NULLPTR; } -QWaylandExtension *QWaylandExtensionContainer::extension(const QByteArray &name) +QWaylandExtension *QWaylandObject::extension(const QByteArray &name) { for (int i = 0; i < extension_vector.size(); i++) { if (extension_vector.at(i)->extensionInterface()->name == name) @@ -138,7 +149,7 @@ QWaylandExtension *QWaylandExtensionContainer::extension(const QByteArray &name) return Q_NULLPTR; } -QWaylandExtension *QWaylandExtensionContainer::extension(const wl_interface *interface) +QWaylandExtension *QWaylandObject::extension(const wl_interface *interface) { for (int i = 0; i < extension_vector.size(); i++) { if (extension_vector.at(i)->extensionInterface() == interface) @@ -147,18 +158,18 @@ QWaylandExtension *QWaylandExtensionContainer::extension(const wl_interface *int return Q_NULLPTR; } -QList<QWaylandExtension *> QWaylandExtensionContainer::extensions() const +QList<QWaylandExtension *> QWaylandObject::extensions() const { return extension_vector; } -void QWaylandExtensionContainer::addExtension(QWaylandExtension *extension) +void QWaylandObject::addExtension(QWaylandExtension *extension) { Q_ASSERT(!extension_vector.contains(extension)); extension_vector.append(extension); } -void QWaylandExtensionContainer::removeExtension(QWaylandExtension *extension) +void QWaylandObject::removeExtension(QWaylandExtension *extension) { Q_ASSERT(extension_vector.contains(extension)); extension_vector.removeOne(extension); |