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/qxcbconnection.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/qxcbconnection.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index b0b26085d7..13917ed1df 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -191,8 +191,8 @@ public: inline void setNetWmUserTime(xcb_timestamp_t t) { if (timeGreaterThan(t, m_netWmUserTime)) m_netWmUserTime = t; } xcb_timestamp_t getTimestamp(); - xcb_window_t getSelectionOwner(xcb_atom_t atom) const; - xcb_window_t getQtSelectionOwner(); + xcb_window_t selectionOwner(xcb_atom_t atom) const; + xcb_window_t qtSelectionOwner(); void setButtonState(Qt::MouseButton button, bool down); Qt::MouseButtons buttonState() const { return m_buttonState; } |