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/compositor_api/qwaylandsurface.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/compositor_api/qwaylandsurface.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) { } |