Remove QPlatformDrag::platformDropData

Its only uses were:
 * Call it to just store it in QDragManager::QDragManager
 * qnsview.mm calls it but since it knows it's a QCocoaDrag it can just call a function of that class directly
 * qxcbdrag.cpp calls it but since it basically was calling itself can just use the class member directly

Change-Id: Ic7797c877d77f944a1212a7ea01173393bf903fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

src/gui/kernel/qdnd.cpp

@@ -71,14 +71,11 @@ QDragManager *QDragManager::m_instance = 0;
 
 
 QDragManager::QDragManager()
-    : QObject(qApp), m_platformDropData(0), m_currentDropTarget(0),
+    : QObject(qApp), m_currentDropTarget(0),
       m_platformDrag(QGuiApplicationPrivate::platformIntegration()->drag()),
       m_object(0)
 {
     Q_ASSERT(!m_instance);
-
-    if (m_platformDrag)
-        m_platformDropData = m_platformDrag->platformDropData();
 }
 
 

src/gui/kernel/qdnd_p.h

@@ -134,7 +134,6 @@ public:
     QObject *source() const;
 
 private:
-    QMimeData *m_platformDropData;
     QObject *m_currentDropTarget;
     QPlatformDrag *m_platformDrag;
     QDrag *m_object;

src/gui/kernel/qplatformdrag.h

@@ -95,7 +95,6 @@ public:
     virtual ~QPlatformDrag();
 
     QDrag *currentDrag() const;
-    virtual QMimeData *platformDropData() = 0;
 
     virtual Qt::DropAction drag(QDrag *m_drag) = 0;
     virtual void cancelDrag();

src/gui/kernel/qsimpledrag.cpp

@@ -353,13 +353,6 @@ QSimpleDrag::QSimpleDrag() : m_current_window(0)
 {
 }
 
-QMimeData *QSimpleDrag::platformDropData()
-{
-    if (drag())
-        return drag()->mimeData();
-    return 0;
-}
-
 void QSimpleDrag::startDrag()
 {
     QBasicDrag::startDrag();

src/gui/kernel/qsimpledrag_p.h

@@ -125,7 +125,6 @@ class Q_GUI_EXPORT QSimpleDrag : public QBasicDrag
 {
 public:
     QSimpleDrag();
-    virtual QMimeData *platformDropData() Q_DECL_OVERRIDE;
 
 protected:
     virtual void startDrag() Q_DECL_OVERRIDE;

src/plugins/platforms/cocoa/qcocoadrag.h

@@ -55,7 +55,7 @@ public:
     QCocoaDrag();
     ~QCocoaDrag();
 
-    QMimeData *platformDropData() Q_DECL_OVERRIDE;
+    QMimeData *dragMimeData();
     Qt::DropAction drag(QDrag *m_drag) Q_DECL_OVERRIDE;
 
     Qt::DropAction defaultAction(Qt::DropActions possibleActions,

src/plugins/platforms/cocoa/qcocoadrag.mm

@@ -68,7 +68,7 @@ void QCocoaDrag::setLastMouseEvent(NSEvent *event, NSView *view)
     m_lastView = view;
 }
 
-QMimeData *QCocoaDrag::platformDropData()
+QMimeData *QCocoaDrag::dragMimeData()
 {
     if (m_drag)
         return m_drag->mimeData();

src/plugins/platforms/cocoa/qnsview.mm

@@ -1999,7 +1999,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
     if (nativeDrag->currentDrag()) {
         // The drag was started from within the application
-        response = QWindowSystemInterface::handleDrag(target, nativeDrag->platformDropData(), mapWindowCoordinates(m_platformWindow->window(), target, qt_windowPoint), qtAllowed);
+        response = QWindowSystemInterface::handleDrag(target, nativeDrag->dragMimeData(), mapWindowCoordinates(m_platformWindow->window(), target, qt_windowPoint), qtAllowed);
         [self updateCursorFromDragResponse:response drag:nativeDrag];
     } else {
         QCocoaDropData mimeData([sender draggingPasteboard]);
@@ -2037,7 +2037,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
     if (nativeDrag->currentDrag()) {
         // The drag was started from within the application
-        response = QWindowSystemInterface::handleDrop(target, nativeDrag->platformDropData(), mapWindowCoordinates(m_platformWindow->window(), target, qt_windowPoint), qtAllowed);
+        response = QWindowSystemInterface::handleDrop(target, nativeDrag->dragMimeData(), mapWindowCoordinates(m_platformWindow->window(), target, qt_windowPoint), qtAllowed);
     } else {
         QCocoaDropData mimeData([sender draggingPasteboard]);
         response = QWindowSystemInterface::handleDrop(target, &mimeData, mapWindowCoordinates(m_platformWindow->window(), target, qt_windowPoint), qtAllowed);

src/plugins/platforms/offscreen/qoffscreencommon.h

@@ -75,7 +75,6 @@ public:
 class QOffscreenDrag : public QPlatformDrag
 {
 public:
-    QMimeData *platformDropData() Q_DECL_OVERRIDE { return 0; }
     Qt::DropAction drag(QDrag *) Q_DECL_OVERRIDE { return Qt::IgnoreAction; }
 };
 #endif

src/plugins/platforms/windows/qwindowsdrag.h

@@ -86,8 +86,6 @@ public:
     QWindowsDrag();
     virtual ~QWindowsDrag();
 
-    QMimeData *platformDropData() override { return &m_dropData; }
-
     Qt::DropAction drag(QDrag *drag) override;
 
     static QWindowsDrag *instance();

src/plugins/platforms/winrt/qwinrtdrag.cpp

@@ -768,12 +768,6 @@ void QWinRTDrag::setDropTarget(QWindow *target)
     m_dragTarget = target;
 }
 
-QMimeData *QWinRTDrag::platformDropData()
-{
-    qCDebug(lcQpaMime) << __FUNCTION__;
-    return m_mimeData;
-}
-
 void QWinRTDrag::setUiElement(ComPtr<ABI::Windows::UI::Xaml::IUIElement> &element)
 {
     qCDebug(lcQpaMime) << __FUNCTION__;

src/plugins/platforms/winrt/qwinrtdrag.h

@@ -91,7 +91,6 @@ public:
     virtual ~QWinRTDrag();
     static QWinRTDrag *instance();
 
-    QMimeData *platformDropData(void) override;
     Qt::DropAction drag(QDrag *) override;
 
     void setDropTarget(QWindow *target);

src/plugins/platforms/xcb/qxcbdrag.cpp

@@ -137,7 +137,7 @@ protected:
 
 QXcbDrag::QXcbDrag(QXcbConnection *c) : QXcbObject(c)
 {
-    dropData = new QXcbDropData(this);
+    m_dropData = new QXcbDropData(this);
 
     init();
     cleanup_timer = -1;
@@ -145,7 +145,7 @@ QXcbDrag::QXcbDrag(QXcbConnection *c) : QXcbObject(c)
 
 QXcbDrag::~QXcbDrag()
 {
-    delete dropData;
+    delete m_dropData;
 }
 
 void QXcbDrag::init()
@@ -167,11 +167,6 @@ void QXcbDrag::init()
     drag_types.clear();
 }
 
-QMimeData *QXcbDrag::platformDropData()
-{
-    return dropData;
-}
-
 bool QXcbDrag::eventFilter(QObject *o, QEvent *e)
 {
     /* We are setting a mouse grab on the QShapedPixmapWindow in order not to
@@ -737,7 +732,7 @@ void QXcbDrag::handle_xdnd_position(QPlatformWindow *w, const xcb_client_message
         dropData = currentDrag()->mimeData();
         supported_actions = currentDrag()->supportedActions();
     } else {
-        dropData = platformDropData();
+        dropData = m_dropData;
         supported_actions = Qt::DropActions(toDropAction(e->data.data32[4]));
     }
 
@@ -958,7 +953,7 @@ void QXcbDrag::handleDrop(QPlatformWindow *, const xcb_client_message_event_t *e
         dropData = currentDrag()->mimeData();
         supported_drop_actions = Qt::DropActions(l[4]);
     } else {
-        dropData = platformDropData();
+        dropData = m_dropData;
         supported_drop_actions = accepted_drop_action;
 
         // Drop coming from another app? Update keyboard modifiers.

src/plugins/platforms/xcb/qxcbdrag.h

@@ -74,7 +74,6 @@ public:
     QXcbDrag(QXcbConnection *c);
     ~QXcbDrag();
 
-    QMimeData *platformDropData() override;
     bool eventFilter(QObject *o, QEvent *e) override;
 
     void startDrag() override;
@@ -117,7 +116,7 @@ private:
     QPointer<QWindow> currentWindow;
     QPoint currentPosition;
 
-    QXcbDropData *dropData;
+    QXcbDropData *m_dropData;
     Qt::DropAction accepted_drop_action;
 
     QWindow *desktop_proxy;