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/qwaylandkeyboard.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/qwaylandkeyboard.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |