diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-05-31 15:36:22 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-06-27 18:09:35 +0000 |
| commit | f09f2f240f008151c560bfb9cfe5cfe3d7889ac4 (patch) | |
| tree | bbdf2e7b732bb89eabca4b1e27f602ff662a305b /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | ac098eef427e20b35f14b0b3f84483e7828d07d4 (diff) | |
xcb: remove DISPLAY_FROM_XCB macro
... as it does not add much value and is not widely used.
and cleanup code:
- where we repeatedly (for no good reason) call DISPLAY_FROM_XCB,
instead of storing display as a (member) variable.
- inconsistency where we (in the same function) alternatingly
use DISPLAY_FROM_XCB and variable holding pointer to Display
(when both refer to the same display).
In other places this patch replaces macros with code they would
translate to (or with minor adjustments to keep sensible line length).
Change-Id: Ieb2a3e055892dcf31f132891f83ed4a665e3fa6e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index cb97a0be18..8e67621e9b 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -686,8 +686,6 @@ Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_MOVABLE_TYPE); #endif #endif -#define DISPLAY_FROM_XCB(object) (reinterpret_cast<Display *>(object->connection()->xlib_display())) - template<typename T> xcb_generic_event_t *QXcbConnection::checkEvent(T &checker) { |