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>

22 files changed, 65 insertions, 52 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 0ba5838e0..ccc4b1dfd 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -351,12 +351,12 @@ void QWaylandCompositorPrivate::loadServerBufferIntegration()
 }
 
 QWaylandCompositor::QWaylandCompositor(QObject *parent)
-    : QObject(*new QWaylandCompositorPrivate(this), parent)
+    : QWaylandObject(*new QWaylandCompositorPrivate(this), parent)
 {
 }
 
 QWaylandCompositor::QWaylandCompositor(QWaylandCompositorPrivate &dptr, QObject *parent)
-    : QObject(dptr, parent)
+    : QWaylandObject(dptr, parent)
 {
 }
 
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 6f0abf02b..cae7b4582 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -64,7 +64,7 @@ class QWaylandPointer;
 class QWaylandKeyboard;
 class QWaylandTouch;
 
-class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandCompositor)
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp
index 6365e59b8..07987f0eb 100644
--- a/src/compositor/compositor_api/qwaylandinput.cpp
+++ b/src/compositor/compositor_api/qwaylandinput.cpp
@@ -144,7 +144,7 @@ QWaylandKeymap::QWaylandKeymap(const QString &layout, const QString &variant, co
 
 
 QWaylandInputDevice::QWaylandInputDevice(QWaylandCompositor *compositor, CapabilityFlags caps)
-    : QObject(*new QWaylandInputDevicePrivate(this,compositor))
+    : QWaylandObject(*new QWaylandInputDevicePrivate(this,compositor))
 {
     d_func()->setCapabilities(caps);
 }
diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h
index 3f8558bfb..0b5c14288 100644
--- a/src/compositor/compositor_api/qwaylandinput.h
+++ b/src/compositor/compositor_api/qwaylandinput.h
@@ -63,7 +63,7 @@ namespace QtWayland {
 class InputDevice;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandInputDevice : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandInputDevice : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandInputDevice)
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index 93e2fbe90..2c2febead 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -339,7 +339,7 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
 #endif
 
 QWaylandKeyboard::QWaylandKeyboard(QWaylandInputDevice *seat, QObject *parent)
-    : QObject(* new QWaylandKeyboardPrivate(seat), parent)
+    : QWaylandObject(* new QWaylandKeyboardPrivate(seat), parent)
 {
     Q_D(QWaylandKeyboard);
     connect(&d->focusDestroyListener, &QWaylandDestroyListener::fired, this, &QWaylandKeyboard::focusDestroyed);
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h
index f900ddc97..ccc140bb4 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard.h
@@ -40,7 +40,7 @@
 
 #include <QtCore/QObject>
 
-#include <QtWaylandCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandExtension>
 #include <QtWaylandCompositor/QWaylandSurface>
 
 QT_BEGIN_NAMESPACE
@@ -69,7 +69,7 @@ private:
     QString m_model;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandKeyboard : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandKeyboard)
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index 689c4919f..9d791a9d3 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -182,12 +182,12 @@ void QWaylandOutputPrivate::removeView(QWaylandView *view, QWaylandSurface *surf
 }
 
 QWaylandOutput::QWaylandOutput()
-    : QObject(*new QWaylandOutputPrivate())
+    : QWaylandObject(*new QWaylandOutputPrivate())
 {
 }
 
 QWaylandOutput::QWaylandOutput(QWaylandCompositor *compositor, QWindow *window)
-    : QObject(*new QWaylandOutputPrivate())
+    : QWaylandObject(*new QWaylandOutputPrivate())
 {
     Q_D(QWaylandOutput);
     d->compositor = compositor;
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 07213f1dc..957597f49 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -57,7 +57,7 @@ class QWaylandView;
 class QWaylandClient;
 class QWaylandOutputSpace;
 
-class Q_COMPOSITOR_EXPORT QWaylandOutput : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandOutput : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandOutput)
diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp
index 5646544ee..567f99f68 100644
--- a/src/compositor/compositor_api/qwaylandpointer.cpp
+++ b/src/compositor/compositor_api/qwaylandpointer.cpp
@@ -79,7 +79,7 @@ void QWaylandPointerPrivate::pointer_set_cursor(wl_pointer::Resource *resource,
 }
 
 QWaylandPointer::QWaylandPointer(QWaylandInputDevice *seat, QObject *parent)
-    : QObject(* new QWaylandPointerPrivate(this, seat), parent)
+    : QWaylandObject(* new QWaylandPointerPrivate(this, seat), parent)
 {
     connect(&d_func()->focusDestroyListener, &QWaylandDestroyListener::fired, this, &QWaylandPointer::focusDestroyed);
     connect(seat, &QWaylandInputDevice::mouseFocusChanged, this, &QWaylandPointer::pointerFocusChanged);
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index 0582f9d1e..2ef70b221 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDPOINTER_H
 #define QWAYLANDPOINTER_H
 
-#include <QtWaylandCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandExtension>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ class QWaylandView;
 class QWaylandOutput;
 class QWaylandClient;
 
-class Q_COMPOSITOR_EXPORT QWaylandPointer : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandPointer)
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 491fcfa8d..be20326c0 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -353,18 +353,18 @@ QtWayland::SurfaceBuffer *QWaylandSurfacePrivate::createSurfaceBuffer(struct ::w
 }
 
 QWaylandSurface::QWaylandSurface()
-    : QObject(*new QWaylandSurfacePrivate())
+    : QWaylandObject(*new QWaylandSurfacePrivate())
 {
 }
 
 QWaylandSurface::QWaylandSurface(QWaylandCompositor *compositor, QWaylandClient *client, uint id, int version)
-    : QObject(*new QWaylandSurfacePrivate())
+    : QWaylandObject(*new QWaylandSurfacePrivate())
 {
     initialize(compositor, client, id, version);
 }
 
 QWaylandSurface::QWaylandSurface(QWaylandSurfacePrivate &dptr)
-    : QObject(dptr)
+    : QWaylandObject(dptr)
 {
 }
 
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index c7611b921..d3fe4f15e 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -60,7 +60,7 @@ class QWaylandBufferRef;
 class QWaylandView;
 class QWaylandSurfaceOp;
 
-class Q_COMPOSITOR_EXPORT QWaylandSurface : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandSurface)
diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index edb4231fb..57c9dae2f 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -102,7 +102,7 @@ void QWaylandTouchPrivate::sendMotion(uint32_t time, int touch_id, const QPointF
 }
 
 QWaylandTouch::QWaylandTouch(QWaylandInputDevice *seat, QObject *parent)
-    : QObject(*new QWaylandTouchPrivate(this, seat), parent)
+    : QWaylandObject(*new QWaylandTouchPrivate(this, seat), parent)
 {
     connect(&d_func()->focusDestroyListener, &QWaylandDestroyListener::fired, this, &QWaylandTouch::focusDestroyed);
 }
diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h
index cd2d8a694..14d9b6a71 100644
--- a/src/compositor/compositor_api/qwaylandtouch.h
+++ b/src/compositor/compositor_api/qwaylandtouch.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTOUCH_H
 #define QWAYLANDTOUCH_H
 
-#include <QtWaylandCompositor/QWaylandExtensionContainer>
+#include <QtWaylandCompositor/QWaylandExtension>
 
 #include <QtCore/QObject>
 #include <QtGui/QTouchEvent>
@@ -50,7 +50,7 @@ class QWaylandInputDevice;
 class QWaylandView;
 class QWaylandClient;
 
-class Q_COMPOSITOR_EXPORT QWaylandTouch : public QObject, public QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandTouch)
diff --git a/src/compositor/extensions/qwlinputpanel.cpp b/src/compositor/extensions/qwlinputpanel.cpp
index 5c6fb27c4..8f41f0ca3 100644
--- a/src/compositor/extensions/qwlinputpanel.cpp
+++ b/src/compositor/extensions/qwlinputpanel.cpp
@@ -114,7 +114,7 @@ void QWaylandInputPanelPrivate::setCursorRectangle(const QRect &cursorRectangle)
     Q_EMIT q->cursorRectangleChanged();
 }
 
-QWaylandInputPanelPrivate *QWaylandInputPanelPrivate::findIn(QWaylandExtensionContainer *container)
+QWaylandInputPanelPrivate *QWaylandInputPanelPrivate::findIn(QWaylandObject *container)
 {
     QWaylandInputPanel *panel = QWaylandInputPanel::findIn(container);
     if (!panel)
diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h
index 95d6a0a20..ce0da169c 100644
--- a/src/compositor/extensions/qwlinputpanel_p.h
+++ b/src/compositor/extensions/qwlinputpanel_p.h
@@ -71,7 +71,7 @@ public:
     QRect cursorRectangle() const;
     void setCursorRectangle(const QRect &cursorRectangle);
 
-    static QWaylandInputPanelPrivate *findIn(QWaylandExtensionContainer *container);
+    static QWaylandInputPanelPrivate *findIn(QWaylandObject *container);
 protected:
     void input_panel_get_input_panel_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE;
 
diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp
index a9ad7bbbb..7546ab6a0 100644
--- a/src/compositor/extensions/qwltextinput.cpp
+++ b/src/compositor/extensions/qwltextinput.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWayland {
 
-TextInput::TextInput(QWaylandExtensionContainer *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id)
+TextInput::TextInput(QWaylandObject *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id)
     : QWaylandExtensionTemplate(container)
     , wl_text_input(client, id, 1)
     , m_compositor(compositor)
diff --git a/src/compositor/extensions/qwltextinput_p.h b/src/compositor/extensions/qwltextinput_p.h
index 359227a4d..949de9941 100644
--- a/src/compositor/extensions/qwltextinput_p.h
+++ b/src/compositor/extensions/qwltextinput_p.h
@@ -54,7 +54,7 @@ class InputMethod;
 class TextInput : public QWaylandExtensionTemplate<TextInput>, public QtWaylandServer::wl_text_input
 {
 public:
-    explicit TextInput(QWaylandExtensionContainer *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id);
+    explicit TextInput(QWaylandObject *container, QWaylandCompositor *compositor, struct ::wl_client *client, int id);
 
     QWaylandSurface *focus() const;
 
diff --git a/src/compositor/extensions/qwltextinputmanager_p.h b/src/compositor/extensions/qwltextinputmanager_p.h
index 30557e7b0..12ac0f008 100644
--- a/src/compositor/extensions/qwltextinputmanager_p.h
+++ b/src/compositor/extensions/qwltextinputmanager_p.h
@@ -46,7 +46,7 @@ class QWaylandCompositor;
 
 namespace QtWayland {
 
-class TextInputManager : public QWaylandExtensionTemplate<TextInputManager>, public QtWaylandServer::wl_text_input_manager, public QWaylandExtensionContainer
+class TextInputManager : public QWaylandExtensionTemplate<TextInputManager>, public QtWaylandServer::wl_text_input_manager
 {
     Q_OBJECT
 public:
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);
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
index 992e44cfd..f6860955c 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandextension.h
@@ -50,10 +50,10 @@ class QWaylandExtension;
 class QWaylandExtensionPrivate;
 class QWaylandExtensionTemplatePrivate;
 
-class Q_COMPOSITOR_EXPORT QWaylandExtensionContainer
+class Q_COMPOSITOR_EXPORT QWaylandObject : public QObject
 {
 public:
-    virtual ~QWaylandExtensionContainer();
+    virtual ~QWaylandObject();
 
     QWaylandExtension *extension(const QByteArray &name);
     QWaylandExtension *extension(const wl_interface *interface);
@@ -62,20 +62,22 @@ public:
     void removeExtension(QWaylandExtension *extension);
 
 protected:
+    QWaylandObject(QObject *parent = 0);
+    QWaylandObject(QObjectPrivate &d, QObject *parent = 0);
     QList<QWaylandExtension *> extension_vector;
 };
 
-class Q_COMPOSITOR_EXPORT QWaylandExtension : public QObject
+class Q_COMPOSITOR_EXPORT QWaylandExtension : public QWaylandObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandExtension)
 public:
     QWaylandExtension();
-    QWaylandExtension(QWaylandExtensionContainer *container);
+    QWaylandExtension(QWaylandObject *container);
     virtual ~QWaylandExtension();
 
-    QWaylandExtensionContainer *extensionContainer() const;
-    void setExtensionContainer(QWaylandExtensionContainer *container);
+    QWaylandObject *extensionContainer() const;
+    void setExtensionContainer(QWaylandObject *container);
 
     Q_INVOKABLE virtual void initialize();
     bool isInitialized() const;
@@ -84,7 +86,7 @@ public:
 
 protected:
     QWaylandExtension(QWaylandExtensionPrivate &dd);
-    QWaylandExtension(QWaylandExtensionContainer *container, QWaylandExtensionPrivate &dd);
+    QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd);
 
     bool event(QEvent *event) Q_DECL_OVERRIDE;
 };
@@ -98,7 +100,7 @@ public:
         : QWaylandExtension()
     { }
 
-    QWaylandExtensionTemplate(QWaylandExtensionContainer *container)
+    QWaylandExtensionTemplate(QWaylandObject *container)
         : QWaylandExtension(container)
     { }
 
@@ -107,7 +109,7 @@ public:
         return T::interface();
     }
 
-    static T *findIn(QWaylandExtensionContainer *container)
+    static T *findIn(QWaylandObject *container)
     {
         if (!container) return Q_NULLPTR;
         return qobject_cast<T *>(container->extension(T::interfaceName()));
@@ -118,7 +120,7 @@ protected:
         : QWaylandExtension(dd)
     { }
 
-    QWaylandExtensionTemplate(QWaylandExtensionContainer *container, QWaylandExtensionTemplatePrivate &dd)
+    QWaylandExtensionTemplate(QWaylandObject *container, QWaylandExtensionTemplatePrivate &dd)
         : QWaylandExtension(container,dd)
     { }
 };
diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandextension_p.h
index d1dddb674..f8ce4d2c9 100644
--- a/src/compositor/global/qwaylandextension_p.h
+++ b/src/compositor/global/qwaylandextension_p.h
@@ -54,7 +54,7 @@ public:
 
     static QWaylandExtensionPrivate *get(QWaylandExtension *extension) { return extension->d_func(); }
 
-    QWaylandExtensionContainer *extension_container;
+    QWaylandObject *extension_container;
     bool initialized;
 };