From 1df7a6a50a794721edb1bc63d268378f4f0ed7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@digia.com>
Date: Thu, 23 May 2013 12:44:20 +0200
Subject: Move QBasicDrag and QSimpleDrag to QtGui.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are useful as default implementations of
QPlatformIntegration::drag(), instead of having it return 0 which will
lead to crashes in Qt Quick 2 and widgets applications that use drag
and drop.

Task-number: QTBUG-31288

Change-Id: I70efa139306ced5d879def0f74e3a72d3bcd64f7
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
---
 src/platformsupport/dnd/qsimpledrag_p.h | 122 --------------------------------
 1 file changed, 122 deletions(-)
 delete mode 100644 src/platformsupport/dnd/qsimpledrag_p.h

(limited to 'src/platformsupport/dnd/qsimpledrag_p.h')

diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h
deleted file mode 100644
index 10237b36d7..0000000000
--- a/src/platformsupport/dnd/qsimpledrag_p.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSIMPLEDRAG_H
-#define QSIMPLEDRAG_H
-
-#include <qpa/qplatformdrag.h>
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_DRAGANDDROP
-
-class QMouseEvent;
-class QWindow;
-class QEventLoop;
-class QDropData;
-class QShapedPixmapWindow;
-
-class QBasicDrag : public QPlatformDrag, public QObject
-{
-public:
-    virtual ~QBasicDrag();
-
-    virtual Qt::DropAction drag(QDrag *drag);
-
-    virtual bool eventFilter(QObject *o, QEvent *e);
-
-protected:
-    QBasicDrag();
-
-    virtual void startDrag();
-    virtual void cancel();
-    virtual void move(const QMouseEvent *me);
-    virtual void drop(const QMouseEvent *me);
-    virtual void endDrag();
-
-    QShapedPixmapWindow *shapedPixmapWindow() const { return m_drag_icon_window; }
-    void updateCursor(Qt::DropAction action);
-
-    bool canDrop() const { return m_can_drop; }
-    void setCanDrop(bool c) { m_can_drop = c; }
-
-    Qt::DropAction executedDropAction() const { return m_executed_drop_action; }
-    void  setExecutedDropAction(Qt::DropAction da) { m_executed_drop_action = da; }
-
-    QDrag *drag() const { return m_drag; }
-
-private:
-    void enableEventFilter();
-    void disableEventFilter();
-    void restoreCursor();
-    void exitDndEventLoop();
-
-    bool m_restoreCursor;
-    QEventLoop *m_eventLoop;
-    Qt::DropAction m_executed_drop_action;
-    bool m_can_drop;
-    QDrag *m_drag;
-    QShapedPixmapWindow *m_drag_icon_window;
-};
-
-class QSimpleDrag : public QBasicDrag
-{
-public:
-    QSimpleDrag();
-    virtual QMimeData *platformDropData();
-
-protected:
-    virtual void startDrag();
-    virtual void cancel();
-    virtual void move(const QMouseEvent *me);
-    virtual void drop(const QMouseEvent *me);
-
-private:
-    QWindow *m_current_window;
-};
-
-#endif // QT_NO_DRAGANDDROP
-
-QT_END_NAMESPACE
-
-#endif
-- 
cgit v1.2.3