From 4696e9dbaa4fc8bf3c7eeed9aceaba5da480acaf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Jun 2014 14:01:52 +0200 Subject: QAbstractProxyModel: Forward drop-related API. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forward canDropMimeData() and dropMimeData() to the source model. [ChangeLog][QtCore][QAbstractProxyModel] QAbstractProxyModel now forwards the drop-related API. Task-number: QTBUG-39549 Change-Id: Ib81fcec862586e4ecfb99b9e0f4eb1a16eace762 Reviewed-by: Jørgen Lind Reviewed-by: Stephen Kelly --- src/corelib/itemmodels/qabstractproxymodel.cpp | 24 ++++++++++++++++++++++++ src/corelib/itemmodels/qabstractproxymodel.h | 4 ++++ 2 files changed, 28 insertions(+) (limited to 'src') diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 2f1f4921f7..5250e2bf15 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -392,6 +392,30 @@ QMimeData* QAbstractProxyModel::mimeData(const QModelIndexList &indexes) const return d->model->mimeData(list); } +/*! + \reimp + \since 5.4 + */ +bool QAbstractProxyModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) const +{ + Q_D(const QAbstractProxyModel); + const QModelIndex source = mapToSource(index(row, column, parent)); + return d->model->canDropMimeData(data, action, source.row(), source.column(), source.parent()); +} + +/*! + \reimp + \since 5.4 + */ +bool QAbstractProxyModel::dropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) +{ + Q_D(QAbstractProxyModel); + const QModelIndex source = mapToSource(index(row, column, parent)); + return d->model->dropMimeData(data, action, source.row(), source.column(), source.parent()); +} + /*! \reimp */ diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 9b26d6cead..f1d3d0b07c 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -91,6 +91,10 @@ public: QModelIndex sibling(int row, int column, const QModelIndex &idx) const; QMimeData* mimeData(const QModelIndexList &indexes) const; + bool canDropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; QStringList mimeTypes() const; Qt::DropActions supportedDropActions() const; -- cgit v1.2.3