diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2018-07-10 12:57:58 +0300 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-07-10 20:04:17 +0000 |
commit | 4e0404a6d2952ccb2c70d8dac95cd1b978779e4f (patch) | |
tree | da94bb32ac09b586ee585df294d539a20eaccf35 /src | |
parent | 556221d97b6c4ca387ca5535ef8f0a2b0f5b7644 (diff) |
xcb: Remove unused QXcbNativeInterface::locateSystemTray()
It was forgotten to be removed in 8f9a72c39df46e94b38dd804b7cdffaed9f340b9.
Change-Id: I028bea448a2c99cdbdfa0db07de2b1fcd50c93b2
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbnativeinterface.cpp | 19 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbnativeinterface.h | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp index 82d3912c4f..26b9fcc15a 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp @@ -105,25 +105,6 @@ static inline QXcbSystemTrayTracker *systemTrayTracker(const QScreen *s) return static_cast<const QXcbScreen *>(s->handle())->connection()->systemTrayTracker(); } -xcb_window_t QXcbNativeInterface::locateSystemTray(xcb_connection_t *conn, const QXcbScreen *screen) -{ - if (m_sysTraySelectionAtom == XCB_ATOM_NONE) { - const QByteArray net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen->screenNumber()).toLatin1(); - auto intern_r = Q_XCB_REPLY_UNCHECKED(xcb_intern_atom, conn, - true, net_sys_tray.length(), net_sys_tray); - if (!intern_r) - return XCB_WINDOW_NONE; - - m_sysTraySelectionAtom = intern_r->atom; - } - - auto sel_owner_r = Q_XCB_REPLY_UNCHECKED(xcb_get_selection_owner, conn, m_sysTraySelectionAtom); - if (!sel_owner_r) - return XCB_WINDOW_NONE; - - return sel_owner_r->owner; -} - void *QXcbNativeInterface::nativeResourceForIntegration(const QByteArray &resourceString) { QByteArray lowerCaseResource = resourceString.toLower(); diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h index 129f3a4a1f..5ec3827afd 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.h +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h @@ -131,8 +131,6 @@ signals: void systemTrayWindowChanged(QScreen *screen); private: - xcb_window_t locateSystemTray(xcb_connection_t *conn, const QXcbScreen *screen); - const QByteArray m_genericEventFilterType; xcb_atom_t m_sysTraySelectionAtom = XCB_ATOM_NONE; |