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