From 6e88e8f8f884f9d10f8c4f07b02883bd773be925 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 11 Nov 2020 14:44:55 +0200 Subject: [PATCH] remove unused _XSETROOT_ID X11 atom from the table Signed-off-by: Ivailo Monev --- src/gui/kernel/qapplication_x11.cpp | 2 -- src/gui/kernel/qclipboard_x11.cpp | 3 +-- src/gui/kernel/qt_x11_p.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 8809857a8..0929f9e44 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -149,8 +149,6 @@ static const char* X11AtomsTbl[QX11Data::NPredefinedAtoms] = { "_QT_SELECTION_SENTINEL\0", "CLIPBOARD_MANAGER\0", - "_XSETROOT_ID\0", - "_QT_SCROLL_DONE\0", "_MOTIF_WM_HINTS\0", diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 9f42d75a8..a51626cbc 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -721,8 +721,7 @@ static Atom send_selection(QClipboardData *d, Atom target, Window window, Atom p // don't allow INCR transfers when using MULTIPLE or to // Motif clients (since Motif doesn't support INCR) - static Atom motif_clip_temporary = ATOM(CLIP_TEMPORARY); - bool allow_incr = property != motif_clip_temporary; + bool allow_incr = (property != ATOM(CLIP_TEMPORARY)); // X_ChangeProperty protocol request is 24 bytes const int increment = (XMaxRequestSize(qt_x11Data->display) * 4) - 24; diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 11028b5a0..b1c5eaf9e 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -327,8 +327,6 @@ struct QX11Data _QT_SELECTION_SENTINEL, CLIPBOARD_MANAGER, - _XSETROOT_ID, - _QT_SCROLL_DONE, _MOTIF_WM_HINTS,