[LyX/master] Use the xcb definition for the primary selection atom.

[Enrico Forestieri]

commit 82e4dbc48e982a262bbf4fa41f83ee2737e2b6bc
Author: Enrico Forestieri <for...@lyx.org>
Date:   Tue May 19 21:19:49 2015 +0200

    Use the xcb definition for the primary selection atom.

diff --git a/src/frontends/qt4/GuiApplication.cpp 
b/src/frontends/qt4/GuiApplication.cpp
index ff19ce2..f03776c 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -123,9 +123,6 @@
 #undef None
 #elif defined(QPA_XCB)
 #include <xcb/xcb.h>
-#include <X11/Xatom.h>
-#include <X11/Intrinsic.h>
-#undef None
 #endif
 
 #if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400)
@@ -3067,7 +3064,7 @@ bool GuiApplication::nativeEventFilter(const QByteArray & 
eventType,
        case XCB_SELECTION_REQUEST: {
                xcb_selection_request_event_t * srev =
                        reinterpret_cast<xcb_selection_request_event_t *>(ev);
-               if (srev->selection != XA_PRIMARY)
+               if (srev->selection != XCB_ATOM_PRIMARY)
                        break;
                LYXERR(Debug::SELECTION, "X requested selection.");
                BufferView * bv = current_view_->currentBufferView();
@@ -3081,7 +3078,7 @@ bool GuiApplication::nativeEventFilter(const QByteArray & 
eventType,
        case XCB_SELECTION_CLEAR: {
                xcb_selection_clear_event_t * scev =
                        reinterpret_cast<xcb_selection_clear_event_t *>(ev);
-               if (scev->selection != XA_PRIMARY)
+               if (scev->selection != XCB_ATOM_PRIMARY)
                        break;
                LYXERR(Debug::SELECTION, "Lost selection.");
                BufferView * bv = current_view_->currentBufferView();