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 /src/compositor/compositor_api/qwaylandinput.cpp | |
| 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 'src/compositor/compositor_api/qwaylandinput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandinput.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp index 512ad6e37..ed1a9c786 100644 --- a/src/compositor/compositor_api/qwaylandinput.cpp +++ b/src/compositor/compositor_api/qwaylandinput.cpp @@ -42,7 +42,7 @@ #include <QtWaylandCompositor/QWaylandDrag> #include <QtWaylandCompositor/QWaylandTouch> #include <QtWaylandCompositor/QWaylandPointer> -#include <QtWaylandCompositor/QWaylandShellSurface> +#include <QtWaylandCompositor/QWaylandWlShellSurface> #include <QtWaylandCompositor/private/qwlinputmethod_p.h> #include <QtWaylandCompositor/private/qwaylandinput_p.h> #include <QtWaylandCompositor/private/qwaylandcompositor_p.h> @@ -346,8 +346,8 @@ bool QWaylandInputDevice::setKeyboardFocus(QWaylandSurface *surface) if (surface == oldSurface) return true; - QWaylandShellSurface *shellsurface = QWaylandShellSurface::findIn(surface); - if (shellsurface && shellsurface->focusPolicy() == QWaylandShellSurface::NoKeyboardFocus) + QWaylandWlShellSurface *wlShellsurface = QWaylandWlShellSurface::findIn(surface); + if (wlShellsurface && wlShellsurface->focusPolicy() == QWaylandWlShellSurface::NoKeyboardFocus) return false; d->keyboardFocus = surface; |