remove unused X11 drag-n-drop handlers 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 74602e4..e780f46 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1979,15 +1979,15 @@ int QApplication::x11ClientMessage(QWidget* w, XEvent* event, bool passive_only)
         } else if (event->xclient.message_type == ATOM(XdndPosition)) {
             qt_x11Data->xdndHandlePosition(widget, event, passive_only);
         } else if (event->xclient.message_type == ATOM(XdndEnter)) {
-            qt_x11Data->xdndHandleEnter(widget, event, passive_only);
+            qt_x11Data->xdndHandleEnter(event);
         } else if (event->xclient.message_type == ATOM(XdndStatus)) {
             qt_x11Data->xdndHandleStatus(widget, event, passive_only);
         } else if (event->xclient.message_type == ATOM(XdndLeave)) {
-            qt_x11Data->xdndHandleLeave(widget, event, passive_only);
+            qt_x11Data->xdndHandleLeave(widget, event);
         } else if (event->xclient.message_type == ATOM(XdndDrop)) {
-            qt_x11Data->xdndHandleDrop(widget, event, passive_only);
+            qt_x11Data->xdndHandleDrop(event, passive_only);
         } else if (event->xclient.message_type == ATOM(XdndFinished)) {
-            qt_x11Data->xdndHandleFinished(widget, event, passive_only);
+            qt_x11Data->xdndHandleFinished(event, passive_only);
         } else {
             if (passive_only) return 0;
             // All other are interactions

diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index ecc8e57..4892cd1 100644 (file)
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -780,7 +780,7 @@ static bool checkEmbedded(QWidget* w, const XEvent* xe)
     return false;
 }
 
-void QX11Data::xdndHandleEnter(QWidget *, const XEvent * xe, bool /*passive*/)
+void QX11Data::xdndHandleEnter(const XEvent * xe)
 {
     last_enter_event.xclient = xe->xclient;
 
@@ -1023,7 +1023,7 @@ void QX11Data::xdndHandleStatus(QWidget * w, const XEvent * xe, bool passive)
     DEBUG("xdndHandleStatus end");
 }
 
-void QX11Data::xdndHandleLeave(QWidget *w, const XEvent * xe, bool /*passive*/)
+void QX11Data::xdndHandleLeave(QWidget *w, const XEvent * xe)
 {
     DEBUG("xdnd leave");
     if (!qt_xdnd_current_widget ||
@@ -1079,7 +1079,7 @@ void qt_xdnd_send_leave()
         w = 0;
 
     if (w)
-        qt_x11Data->xdndHandleLeave(w, (const XEvent *)&leave, false);
+        qt_x11Data->xdndHandleLeave(w, (const XEvent *)&leave);
     else
         XSendEvent(qt_x11Data->display, qt_xdnd_current_proxy_target, False,
                     NoEventMask, (XEvent*)&leave);
@@ -1096,7 +1096,7 @@ void qt_xdnd_send_leave()
     waiting_for_status = false;
 }
 
-void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
+void QX11Data::xdndHandleDrop(const XEvent * xe, bool passive)
 {
     DEBUG("xdndHandleDrop");
     if (!qt_xdnd_current_widget) {
@@ -1193,7 +1193,7 @@ void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
 }
 
 
-void QX11Data::xdndHandleFinished(QWidget *, const XEvent * xe, bool passive)
+void QX11Data::xdndHandleFinished(const XEvent * xe, bool passive)
 {
     DEBUG("xdndHandleFinished");
     const unsigned long *l = (const unsigned long *)xe->xclient.data.l;
@@ -1648,7 +1648,7 @@ void QDragManager::move(const QPoint & globalPos)
 
             DEBUG("sending Xdnd enter");
             if (w)
-                qt_x11Data->xdndHandleEnter(w, (const XEvent *)&enter, false);
+                qt_x11Data->xdndHandleEnter((const XEvent *)&enter);
             else if (target)
                 XSendEvent(qt_x11Data->display, proxy_target, False, NoEventMask, (XEvent*)&enter);
             waiting_for_status = false;
@@ -1733,7 +1733,7 @@ void QDragManager::drop()
     restartXdndDropExpiryTimer();
 
     if (w)
-        qt_x11Data->xdndHandleDrop(w, (const XEvent *)&drop, false);
+        qt_x11Data->xdndHandleDrop((const XEvent *)&drop, false);
     else
         XSendEvent(qt_x11Data->display, qt_xdnd_current_proxy_target, False,
                    NoEventMask, (XEvent*)&drop);

diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h
index cd70f73..6b26289 100644 (file)
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
@@ -166,12 +166,12 @@ struct QX11Data
     // from qdnd_x11.cpp
     bool dndEnable(QWidget* w, bool on);
     static void xdndSetup();
-    void xdndHandleEnter(QWidget *, const XEvent *, bool);
+    void xdndHandleEnter(const XEvent *);
     void xdndHandlePosition(QWidget *, const XEvent *, bool);
     void xdndHandleStatus(QWidget *, const XEvent *, bool);
-    void xdndHandleLeave(QWidget *, const XEvent *, bool);
-    void xdndHandleDrop(QWidget *, const XEvent *, bool);
-    void xdndHandleFinished(QWidget *, const XEvent *, bool);
+    void xdndHandleLeave(QWidget *, const XEvent *);
+    void xdndHandleDrop(const XEvent *, bool);
+    void xdndHandleFinished(const XEvent *, bool);
     void xdndHandleSelectionRequest(const XSelectionRequestEvent *);
     static bool xdndHandleBadwindow();
     QByteArray xdndAtomToString(Atom a);