remove unused QX11Data::xdndHandleStatus() arguments

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index d58a5c6..da376b8 100644 (file)
--- 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 b9c3d37..1858773 100644 (file)
--- 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 5c2bb5e..15999aa 100644 (file)
--- 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);