diff options
author | Gatis Paeglis <gatis.paeglis@qt.io> | 2019-01-03 12:00:48 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2021-10-22 23:30:07 +0200 |
commit | 7f0e227d8afa578e6875c1e790e226e3366a01fb (patch) | |
tree | 511359ffa161fd4956e630c193d9a492a6178336 /src/plugins/platforms/xcb/qxcbclipboard.h | |
parent | e0938223c4b5966b94893276ba36c9b0493168c7 (diff) |
xcb: remove confusing indirections for qt selection owner
This makes it more obvious that clipboard and DnD use the
same selection owner (QXcbConnection::qtSelectionOwner()).
This way we can also drop some QT_NO_CLIPBOARD defines.
These defines actually are broken, but that is out-of-scope
for this patch.
And renamed the functions according to Qt guidelines:
getSelectionOwner() -> selectionOwner()
getQtSelectionOwner() -> qtSelectionOwner()
The previous naming probably was influenced by underlying
C API - xcb_get_selection_owner().
Change-Id: I467f1a3dbe75b4e8fd41c7e66ca9b0e25ef1039c
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbclipboard.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index 51ae0dc1ee..a33f43c435 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -97,8 +97,6 @@ public: xcb_window_t requestor() const; void setRequestor(xcb_window_t window); - xcb_window_t owner() const; - void handleSelectionRequest(xcb_selection_request_event_t *event); void handleSelectionClearRequest(xcb_selection_clear_event_t *event); void handleXFixesSelectionRequest(xcb_xfixes_selection_notify_event_t *event); @@ -110,7 +108,6 @@ public: bool handlePropertyNotify(const xcb_generic_event_t *event); - xcb_window_t getSelectionOwner(xcb_atom_t atom) const; QByteArray getSelection(xcb_atom_t selection, xcb_atom_t target, xcb_atom_t property, xcb_timestamp_t t = 0); int increment() const { return m_maxPropertyRequestDataBytes; } @@ -133,7 +130,6 @@ private: xcb_timestamp_t m_timestamp[2]; xcb_window_t m_requestor = XCB_NONE; - xcb_window_t m_owner = XCB_NONE; static const int clipboard_timeout; |