diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-29 15:04:42 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-04-05 14:05:28 +0000 |
| commit | 465e6f559fccf04203997cdf5182693567a9e697 (patch) | |
| tree | ca1c50eb8fd3a26e02d8a2b205d1775febb0859e /tests | |
| parent | ac670666395882c60b512ff493b66d58a1ad6541 (diff) | |
Rename compositor Shell to WlShell
* QWaylandShell -> QWaylandWlShell
* QWaylandShellSurface -> QWaylandWlShellSurface
* QWaylandQuickShellSurfaceItem -> QWaylandQuickWlShellSurfaceItem
* Shell -> WlShell (QML)
* ShellSurface -> WlShellSurface (QML)
* ShellSurfaceItem -> WlShellSurfaceItem (QML)
This is done to avoid confusion with XdgShell and will hopefully help
clarify that some of the examples only support wl_shell and not
xdg_shell.
Additionally, this makes "Shell" an available name in the compositor
API, which may in turn enable the creation of a more general abstraction
hiding the details of the shell backends (i.e. xdg_shell, wl_shell, and
eventually ivi_shell).
Change-Id: Iebac1f36505084bfaaea68838005d54db6c55e21
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/compositor/testcompositor.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/testcompositor.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/testcompositor.cpp index d63e85c7c..d3b9ded9a 100644 --- a/tests/auto/compositor/testcompositor.cpp +++ b/tests/auto/compositor/testcompositor.cpp @@ -32,7 +32,7 @@ TestCompositor::TestCompositor(bool createInputDev) : QWaylandCompositor() - , shell(new QWaylandShell(this)) + , shell(new QWaylandWlShell(this)) , m_createInputDevice(createInputDev) { setSocketName("wayland-qt-test-0"); diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/testcompositor.h index affef7ec8..d0be1cec5 100644 --- a/tests/auto/compositor/testcompositor.h +++ b/tests/auto/compositor/testcompositor.h @@ -28,7 +28,7 @@ #include "qwaylandcompositor.h" #include "qwaylandsurface.h" -#include "qwaylandshell.h" +#include "qwaylandwlshell.h" class TestCompositor : public QWaylandCompositor { @@ -47,7 +47,7 @@ protected: public: QList<QWaylandSurface *> surfaces; - QWaylandShell* shell; + QWaylandWlShell* shell; bool m_createInputDevice; }; |