From aa285e913111a81daff99becb245c91604a314c8 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 28 Jun 2020 20:11:26 +0000 Subject: [PATCH] remove unused QX11Data::xdndHandleStatus() arguments Signed-off-by: Ivailo Monev --- src/gui/kernel/qapplication_x11.cpp | 2 +- src/gui/kernel/qdnd_x11.cpp | 10 +++++----- src/gui/kernel/qt_x11_p.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index d58a5c60d..da376b8da 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1976,7 +1976,7 @@ int QApplication::x11ClientMessage(QWidget* w, XEvent* event, bool passive_only) } else if (event->xclient.message_type == ATOM(XdndEnter)) { qt_x11Data->xdndHandleEnter(event); } else if (event->xclient.message_type == ATOM(XdndStatus)) { - qt_x11Data->xdndHandleStatus(widget, event, passive_only); + qt_x11Data->xdndHandleStatus(event); } else if (event->xclient.message_type == ATOM(XdndLeave)) { qt_x11Data->xdndHandleLeave(widget, event); } else if (event->xclient.message_type == ATOM(XdndDrop)) { diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index b9c3d3729..185877343 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -158,7 +158,7 @@ static Window findXdndAwareParent(Window window) // and all this stuff is copied -into- qapp_x11.cpp static void handle_xdnd_position(QWidget *, const XEvent *, bool); -static void handle_xdnd_status(QWidget * w, const XEvent * xe, bool /*passive*/); +static void handle_xdnd_status(const XEvent * xe); const int xdnd_version = 5; @@ -890,7 +890,7 @@ static void handle_xdnd_position(QWidget *w, const XEvent * xe, bool passive) DEBUG() << "sending XdndStatus"; if (source) - handle_xdnd_status(source, (const XEvent *)&response, passive); + handle_xdnd_status((const XEvent *)&response); else XSendEvent(qt_x11Data->display, qt_xdnd_dragsource_xid, False, NoEventMask, (XEvent*)&response); } @@ -917,7 +917,7 @@ void QX11Data::xdndHandlePosition(QWidget * w, const XEvent * xe, bool passive) } -static void handle_xdnd_status(QWidget *, const XEvent * xe, bool) +static void handle_xdnd_status(const XEvent * xe) { const unsigned long *l = (const unsigned long *)xe->xclient.data.l; // ignore late status messages @@ -953,13 +953,13 @@ static Bool xdnd_status_scanner(Display *, XEvent *event, XPointer) return false; } -void QX11Data::xdndHandleStatus(QWidget * w, const XEvent * xe, bool passive) +void QX11Data::xdndHandleStatus(const XEvent * xe) { DEBUG("xdndHandleStatus"); while (XCheckIfEvent(qt_x11Data->display, (XEvent *)xe, xdnd_status_scanner, 0)) ; - handle_xdnd_status(w, xe, passive); + handle_xdnd_status(xe); DEBUG("xdndHandleStatus end"); } diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 5c2bb5ede..15999aa09 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -168,7 +168,7 @@ struct QX11Data static void xdndSetup(); void xdndHandleEnter(const XEvent *); void xdndHandlePosition(QWidget *, const XEvent *, bool); - void xdndHandleStatus(QWidget *, const XEvent *, bool); + void xdndHandleStatus(const XEvent *); void xdndHandleLeave(QWidget *, const XEvent *); void xdndHandleDrop(const XEvent *, bool); void xdndHandleFinished(const XEvent *, bool); -- 2.11.0