From 52e5fd336bcbe91f1d964015ecf59254c97d92d1 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 7 Jun 2011 16:29:35 +0200 Subject: cleanups code Make QXcbClipboard and QXcbDrag a QXcbObject to simplify the code. Use the predefined atoms in xproto.h instead of our own defines. --- src/plugins/platforms/xcb/qxcbclipboard.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/xcb/qxcbclipboard.h') diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index 937520b80a..ff2d44144e 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -43,13 +43,13 @@ #define QXCBCLIPBOARD_H #include - +#include #include class QXcbConnection; class QXcbScreen; -class QXcbClipboard : public QPlatformClipboard +class QXcbClipboard : public QXcbObject, public QPlatformClipboard { public: QXcbClipboard(QXcbConnection *connection); @@ -59,7 +59,6 @@ public: bool supportsMode(QClipboard::Mode mode) const; - QXcbConnection *connection() const { return m_connection; } QXcbScreen *screen() const { return m_screen; } xcb_window_t requestor() const; @@ -85,7 +84,6 @@ private: xcb_atom_t sendTargetsSelection(QMimeData *d, xcb_window_t window, xcb_atom_t property); xcb_atom_t sendSelection(QMimeData *d, xcb_atom_t target, xcb_window_t window, xcb_atom_t property); - QXcbConnection *m_connection; QXcbScreen *m_screen; QMimeData *m_xClipboard; -- cgit v1.2.3