From 56b088d13e0d5ae42b872f543b30c9a7151dacd4 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 5 Jun 2018 13:56:02 +0200 Subject: [PATCH] Client: Remove applyConfigure for xdg-shell popups It's just dead code, we can add it back in the unlikely event that we should need it. Change-Id: I209fe92fb160e022c992384d731964e774596f74 Reviewed-by: Paul Olav Tvete --- .../shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp | 6 ------ .../shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h | 1 - .../plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp | 6 ------ .../plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h | 1 - 4 files changed, 14 deletions(-) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp index d986bc69d1b..36a82fe9834 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp @@ -161,10 +161,6 @@ QWaylandXdgSurfaceV6::Popup::~Popup() destroy(); } -void QWaylandXdgSurfaceV6::Popup::applyConfigure() -{ -} - void QWaylandXdgSurfaceV6::Popup::zxdg_popup_v6_popup_done() { m_xdgSurface->m_window->window()->close(); @@ -251,8 +247,6 @@ void QWaylandXdgSurfaceV6::applyConfigure() if (m_toplevel) m_toplevel->applyConfigure(); - if (m_popup) - m_popup->applyConfigure(); m_configured = true; ack_configure(m_pendingConfigureSerial); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h index a2d19447128..c1d8564ac8f 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h @@ -123,7 +123,6 @@ private: Popup(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandXdgSurfaceV6 *parent, QtWayland::zxdg_positioner_v6 *positioner); ~Popup() override; - void applyConfigure(); void zxdg_popup_v6_popup_done() override; QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp index 183576da0c1..9fdfb3e1647 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp @@ -161,10 +161,6 @@ QWaylandXdgSurface::Popup::~Popup() destroy(); } -void QWaylandXdgSurface::Popup::applyConfigure() -{ -} - void QWaylandXdgSurface::Popup::xdg_popup_popup_done() { m_xdgSurface->m_window->window()->close(); @@ -251,8 +247,6 @@ void QWaylandXdgSurface::applyConfigure() if (m_toplevel) m_toplevel->applyConfigure(); - if (m_popup) - m_popup->applyConfigure(); m_configured = true; ack_configure(m_pendingConfigureSerial); diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h index 1b312bd2db4..3dfe16242db 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h @@ -123,7 +123,6 @@ private: Popup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSurface *parent, QtWayland::xdg_positioner *positioner); ~Popup() override; - void applyConfigure(); void xdg_popup_popup_done() override; QWaylandXdgSurface *m_xdgSurface = nullptr;