diff --git a/plugins/platforms/wayland/wayland_backend.h b/plugins/platforms/wayland/wayland_backend.h --- a/plugins/platforms/wayland/wayland_backend.h +++ b/plugins/platforms/wayland/wayland_backend.h @@ -56,7 +56,6 @@ class RelativePointer; class RelativePointerManager; class Seat; -class Shell; class SubCompositor; class SubSurface; class Surface; @@ -236,7 +235,6 @@ KWayland::Client::Registry *m_registry; KWayland::Client::Compositor *m_compositor; KWayland::Client::SubCompositor *m_subCompositor; - KWayland::Client::Shell *m_shell; KWayland::Client::XdgShell *m_xdgShell = nullptr; KWayland::Client::ShmPool *m_shm; KWayland::Client::ConnectionThread *m_connectionThreadObject; diff --git a/plugins/platforms/wayland/wayland_backend.cpp b/plugins/platforms/wayland/wayland_backend.cpp --- a/plugins/platforms/wayland/wayland_backend.cpp +++ b/plugins/platforms/wayland/wayland_backend.cpp @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -448,7 +447,6 @@ , m_registry(new Registry(this)) , m_compositor(new KWayland::Client::Compositor(this)) , m_subCompositor(new KWayland::Client::SubCompositor(this)) - , m_shell(new Shell(this)) , m_shm(new ShmPool(this)) , m_connectionThreadObject(new ConnectionThread(nullptr)) , m_connectionThread(nullptr) @@ -468,7 +466,6 @@ if (m_xdgShell) { m_xdgShell->release(); } - m_shell->release(); m_subCompositor->release(); m_compositor->release(); m_registry->release(); @@ -495,11 +492,6 @@ m_subCompositor->setup(m_registry->bindSubCompositor(name, 1)); } ); - connect(m_registry, &Registry::shellAnnounced, this, - [this](quint32 name) { - m_shell->setup(m_registry->bindShell(name, 1)); - } - ); connect(m_registry, &Registry::seatAnnounced, this, [this](quint32 name) { if (Application::usesLibinput()) { @@ -619,9 +611,6 @@ qDeleteAll(m_outputs); m_outputs.clear(); - if (m_shell) { - m_shell->destroy(); - } if (m_xdgShell) { m_xdgShell->destroy(); } @@ -698,8 +687,6 @@ if (m_xdgShell && m_xdgShell->isValid()) { waylandOutput = new XdgShellOutput(surface, m_xdgShell, this, i+1); - } else if (m_shell->isValid()) { - waylandOutput = new ShellOutput(surface, m_shell, this); } if (!waylandOutput) { diff --git a/plugins/platforms/wayland/wayland_output.h b/plugins/platforms/wayland/wayland_output.h --- a/plugins/platforms/wayland/wayland_output.h +++ b/plugins/platforms/wayland/wayland_output.h @@ -96,18 +96,6 @@ bool m_rendered = false; }; -class ShellOutput : public WaylandOutput -{ -public: - ShellOutput(KWayland::Client::Surface *surface, - KWayland::Client::Shell *shell, - WaylandBackend *backend); - ~ShellOutput() override; - -private: - KWayland::Client::ShellSurface *m_shellSurface = nullptr; -}; - class XdgShellOutput : public WaylandOutput { public: diff --git a/plugins/platforms/wayland/wayland_output.cpp b/plugins/platforms/wayland/wayland_output.cpp --- a/plugins/platforms/wayland/wayland_output.cpp +++ b/plugins/platforms/wayland/wayland_output.cpp @@ -24,7 +24,6 @@ #include #include -#include #include @@ -74,19 +73,6 @@ setGlobalPos(logicalPosition); } -ShellOutput::ShellOutput(Surface *surface, Shell *shell, WaylandBackend *backend) - : WaylandOutput(surface, backend) -{ - auto shellSurface = shell->createSurface(surface, this); - shellSurface->setToplevel(); -} - -ShellOutput::~ShellOutput() -{ - m_shellSurface->destroy(); - delete m_shellSurface; -} - XdgShellOutput::XdgShellOutput(Surface *surface, XdgShell *xdgShell, WaylandBackend *backend, int number) : WaylandOutput(surface, backend) , m_number(number)