diff --git a/wayland_server.cpp b/wayland_server.cpp index 05e5b61bb0..ca8a12b5bc 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -65,7 +65,7 @@ along with this program. If not, see . #include #include #include -#include +#include // KF #include @@ -323,7 +323,7 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags ); m_tabletManager = m_display->createTabletManagerInterface(m_display); - m_keyboardShortcutsInhibitManager = m_display->createKeyboardShortcutsInhibitManager(m_display); + m_keyboardShortcutsInhibitManager = m_display->createKeyboardShortcutsInhibitManagerV1(m_display); m_xdgShell = m_display->createXdgShell(XdgShellInterfaceVersion::Stable, m_display); m_xdgShell->create(); connect(m_xdgShell, &XdgShellInterface::surfaceCreated, this, &WaylandServer::createSurface); diff --git a/wayland_server.h b/wayland_server.h index 4e768e6096..4525025292 100644 --- a/wayland_server.h +++ b/wayland_server.h @@ -70,7 +70,7 @@ class KeyStateInterface; class LinuxDmabufUnstableV1Interface; class LinuxDmabufUnstableV1Buffer; class TabletManagerInterface; -class KeyboardShortcutsInhibitManagerInterface; +class KeyboardShortcutsInhibitManagerV1Interface; } @@ -133,7 +133,7 @@ public: KWaylandServer::XdgOutputManagerInterface *xdgOutputManager() const { return m_xdgOutputManager; } - KWaylandServer::KeyboardShortcutsInhibitManagerInterface *keyboardShortcutsInhibitManager() const + KWaylandServer::KeyboardShortcutsInhibitManagerV1Interface *keyboardShortcutsInhibitManager() const { return m_keyboardShortcutsInhibitManager; } @@ -281,7 +281,7 @@ private: KWaylandServer::XdgOutputManagerInterface *m_xdgOutputManager = nullptr; KWaylandServer::XdgDecorationManagerInterface *m_xdgDecorationManager = nullptr; KWaylandServer::LinuxDmabufUnstableV1Interface *m_linuxDmabuf = nullptr; - KWaylandServer::KeyboardShortcutsInhibitManagerInterface *m_keyboardShortcutsInhibitManager = nullptr; + KWaylandServer::KeyboardShortcutsInhibitManagerV1Interface *m_keyboardShortcutsInhibitManager = nullptr; QSet m_linuxDmabufBuffers; struct { KWaylandServer::ClientConnection *client = nullptr;