diff options
Diffstat (limited to 'src/compositor/compositor_api')
14 files changed, 21 insertions, 21 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) |