1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Remove applyConfigure for xdg-shell popups

Browse Source 
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 <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-06-05 13:56:02 +02:00 committed by Johan Helsing
parent 2c9bb12fe3
commit 56b088d13e
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp
View File

@ -161,10 +161,6 @@ QWaylandXdgSurfaceV6::Popup::~Popup()
destroy(); destroy();
} }
void QWaylandXdgSurfaceV6::Popup::applyConfigure()
{
}
void QWaylandXdgSurfaceV6::Popup::zxdg_popup_v6_popup_done() void QWaylandXdgSurfaceV6::Popup::zxdg_popup_v6_popup_done()
{ {
m_xdgSurface->m_window->window()->close(); m_xdgSurface->m_window->window()->close();
@ -251,8 +247,6 @@ void QWaylandXdgSurfaceV6::applyConfigure()
if (m_toplevel) if (m_toplevel)
m_toplevel->applyConfigure(); m_toplevel->applyConfigure();
if (m_popup)
m_popup->applyConfigure();
m_configured = true; m_configured = true;
ack_configure(m_pendingConfigureSerial); ack_configure(m_pendingConfigureSerial);

1
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6_p.h
View File

@ -123,7 +123,6 @@ private:
Popup(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandXdgSurfaceV6 *parent, QtWayland::zxdg_positioner_v6 *positioner); Popup(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandXdgSurfaceV6 *parent, QtWayland::zxdg_positioner_v6 *positioner);
~Popup() override; ~Popup() override;
void applyConfigure();
void zxdg_popup_v6_popup_done() override; void zxdg_popup_v6_popup_done() override;
QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr;

6
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
View File

@ -161,10 +161,6 @@ QWaylandXdgSurface::Popup::~Popup()
destroy(); destroy();
} }
void QWaylandXdgSurface::Popup::applyConfigure()
{
}
void QWaylandXdgSurface::Popup::xdg_popup_popup_done() void QWaylandXdgSurface::Popup::xdg_popup_popup_done()
{ {
m_xdgSurface->m_window->window()->close(); m_xdgSurface->m_window->window()->close();
@ -251,8 +247,6 @@ void QWaylandXdgSurface::applyConfigure()
if (m_toplevel) if (m_toplevel)
m_toplevel->applyConfigure(); m_toplevel->applyConfigure();
if (m_popup)
m_popup->applyConfigure();
m_configured = true; m_configured = true;
ack_configure(m_pendingConfigureSerial); ack_configure(m_pendingConfigureSerial);

1
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
View File

@ -123,7 +123,6 @@ private:
Popup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSurface *parent, QtWayland::xdg_positioner *positioner); Popup(QWaylandXdgSurface *xdgSurface, QWaylandXdgSurface *parent, QtWayland::xdg_positioner *positioner);
~Popup() override; ~Popup() override;
void applyConfigure();
void xdg_popup_popup_done() override; void xdg_popup_popup_done() override;
QWaylandXdgSurface *m_xdgSurface = nullptr; QWaylandXdgSurface *m_xdgSurface = nullptr;