AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QIdentityProxyModel: implement moveRows / moveColumns

Browse Source 
It makes sense for it (instead of triggering the QAbstractItemModel
base class implementation, which doesn't do anything). Safe to override
virtuals in this case -- code calling the old version could not do
anything useful, so at least new code gets those functions properly
implemented for free.

Change-Id: Iefe1ff25e15d877435e93ab28289ad2579616f72
Task-number: QTBUG-48076
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2015-12-04 12:44:45 +01:00 committed by Christian Ehrlicher
parent cf033b32b5
commit 2ced01cbdd
3 changed files with 93 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/itemmodels/qidentityproxymodel.cpp
View File

@ -311,6 +311,30 @@ bool QIdentityProxyModel::removeRows(int row, int count, const QModelIndex& pare
return d->model->removeRows(row, count, mapToSource(parent));
}
/*!
\reimp
\since 5.15
*/
bool QIdentityProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)
{
Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == this : true);
Q_ASSERT(destinationParent.isValid() ? destinationParent.model() == this : true);
Q_D(QIdentityProxyModel);
return d->model->moveRows(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild);
}
/*!
\reimp
\since 5.15
*/
bool QIdentityProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild)
{
Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == this : true);
Q_ASSERT(destinationParent.isValid() ? destinationParent.model() == this : true);
Q_D(QIdentityProxyModel);
return d->model->moveColumns(mapToSource(sourceParent), sourceColumn, count, mapToSource(destinationParent), destinationChild);
}
/*!
\reimp
*/

2
src/corelib/itemmodels/qidentityproxymodel.h
View File

@ -77,6 +77,8 @@ public:
bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override;
bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override;
bool moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) override;
protected:
QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent);

102
tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
View File

@ -32,6 +32,7 @@
#include <QStandardItemModel>
#include <QStringListModel>
#include <QTest>
#include <QTransposeProxyModel>
#include <QLoggingCategory>
#include "dynamictreemodel.h"
@ -69,6 +70,7 @@ private slots:
void insertRows();
void removeRows();
void moveRows();
void moveColumns();
void reset();
void dataChanged();
@ -235,47 +237,24 @@ void tst_QIdentityProxyModel::removeRows()
void tst_QIdentityProxyModel::moveRows()
{
DynamicTreeModel model;
{
ModelInsertCommand insertCommand(&model);
insertCommand.setStartRow(0);
insertCommand.setEndRow(9);
insertCommand.doCommand();
}
{
ModelInsertCommand insertCommand(&model);
insertCommand.setAncestorRowNumbers(QList<int>() << 5);
insertCommand.setStartRow(0);
insertCommand.setEndRow(9);
insertCommand.doCommand();
}
QStringListModel model({"A", "B", "C", "D", "E", "F"});
m_proxy->setSourceModel(&model);
verifyIdentity(&model);
QSignalSpy modelBeforeSpy(&model, &DynamicTreeModel::rowsAboutToBeMoved);
QSignalSpy modelAfterSpy(&model, &DynamicTreeModel::rowsMoved);
QSignalSpy proxyBeforeSpy(m_proxy, &QIdentityProxyModel::rowsAboutToBeMoved);
QSignalSpy proxyAfterSpy(m_proxy, &QIdentityProxyModel::rowsMoved);
QSignalSpy modelBeforeSpy(&model, &QAbstractItemModel::rowsAboutToBeMoved);
QSignalSpy modelAfterSpy(&model, &QAbstractItemModel::rowsMoved);
QSignalSpy proxyBeforeSpy(m_proxy, &QAbstractItemModel::rowsAboutToBeMoved);
QSignalSpy proxyAfterSpy(m_proxy, &QAbstractItemModel::rowsMoved);
QVERIFY(modelBeforeSpy.isValid());
QVERIFY(modelAfterSpy.isValid());
QVERIFY(proxyBeforeSpy.isValid());
QVERIFY(proxyAfterSpy.isValid());
QVERIFY(m_proxy->moveRows(QModelIndex(), 1, 2, QModelIndex(), 5));
QCOMPARE(model.stringList(), QStringList({"A", "D", "E", "B", "C", "F"}));
{
ModelMoveCommand moveCommand(&model, 0);
moveCommand.setAncestorRowNumbers(QList<int>() << 5);
moveCommand.setStartRow(3);
moveCommand.setEndRow(4);
moveCommand.setDestRow(1);
moveCommand.doCommand();
}
QVERIFY(modelBeforeSpy.size() == 1 && 1 == proxyBeforeSpy.size());
QVERIFY(modelAfterSpy.size() == 1 && 1 == proxyAfterSpy.size());
QCOMPARE(modelBeforeSpy.size(), 1);
QCOMPARE(proxyBeforeSpy.size(), 1);
QCOMPARE(modelAfterSpy.size(), 1);
QCOMPARE(proxyAfterSpy.size(), 1);
QCOMPARE(modelBeforeSpy.first().first().value<QModelIndex>(), m_proxy->mapToSource(proxyBeforeSpy.first().first().value<QModelIndex>()));
QCOMPARE(modelBeforeSpy.first().at(1), proxyBeforeSpy.first().at(1));
@ -289,9 +268,62 @@ void tst_QIdentityProxyModel::moveRows()
QCOMPARE(modelAfterSpy.first().at(3).value<QModelIndex>(), m_proxy->mapToSource(proxyAfterSpy.first().at(3).value<QModelIndex>()));
QCOMPARE(modelAfterSpy.first().at(4), proxyAfterSpy.first().at(4));
QVERIFY(m_proxy->moveRows(QModelIndex(), 3, 2, QModelIndex(), 1));
QCOMPARE(model.stringList(), QStringList({"A", "B", "C", "D", "E", "F"}));
QVERIFY(m_proxy->moveRows(QModelIndex(), 0, 3, QModelIndex(), 6));
QCOMPARE(model.stringList(), QStringList({"D", "E", "F", "A", "B", "C"}));
verifyIdentity(&model);
m_proxy->setSourceModel(0);
m_proxy->setSourceModel(nullptr);
}
void tst_QIdentityProxyModel::moveColumns()
{
// QStringListModel implements moveRows but not moveColumns
// so we have to use a QTransposeProxyModel inbetween to check if
// QIdentityProxyModel::moveColumns works as expected
QStringListModel model({"A", "B", "C", "D", "E", "F"});
QTransposeProxyModel tpm;
tpm.setSourceModel(&model);
m_proxy->setSourceModel(&tpm);
verifyIdentity(&tpm);
QSignalSpy modelBeforeSpy(&tpm, &QAbstractItemModel::columnsAboutToBeMoved);
QSignalSpy modelAfterSpy(&tpm, &QAbstractItemModel::columnsMoved);
QSignalSpy proxyBeforeSpy(m_proxy, &QAbstractItemModel::columnsAboutToBeMoved);
QSignalSpy proxyAfterSpy(m_proxy, &QAbstractItemModel::columnsMoved);
QVERIFY(m_proxy->moveColumns(QModelIndex(), 1, 2, QModelIndex(), 5));
QCOMPARE(model.stringList(), QStringList({"A", "D", "E", "B", "C", "F"}));
QCOMPARE(proxyBeforeSpy.size(), 1);
QCOMPARE(modelBeforeSpy.size(), 1);
QCOMPARE(modelAfterSpy.size(), 1);
QCOMPARE(proxyAfterSpy.size(), 1);
QCOMPARE(modelBeforeSpy.first().first().value<QModelIndex>(), m_proxy->mapToSource(proxyBeforeSpy.first().first().value<QModelIndex>()));
QCOMPARE(modelBeforeSpy.first().at(1), proxyBeforeSpy.first().at(1));
QCOMPARE(modelBeforeSpy.first().at(2), proxyBeforeSpy.first().at(2));
QCOMPARE(modelBeforeSpy.first().at(3).value<QModelIndex>(), m_proxy->mapToSource(proxyBeforeSpy.first().at(3).value<QModelIndex>()));
QCOMPARE(modelBeforeSpy.first().at(4), proxyBeforeSpy.first().at(4));
QCOMPARE(modelAfterSpy.first().first().value<QModelIndex>(), m_proxy->mapToSource(proxyAfterSpy.first().first().value<QModelIndex>()));
QCOMPARE(modelAfterSpy.first().at(1), proxyAfterSpy.first().at(1));
QCOMPARE(modelAfterSpy.first().at(2), proxyAfterSpy.first().at(2));
QCOMPARE(modelAfterSpy.first().at(3).value<QModelIndex>(), m_proxy->mapToSource(proxyAfterSpy.first().at(3).value<QModelIndex>()));
QCOMPARE(modelAfterSpy.first().at(4), proxyAfterSpy.first().at(4));
QVERIFY(m_proxy->moveColumns(QModelIndex(), 3, 2, QModelIndex(), 1));
QCOMPARE(model.stringList(), QStringList({"A", "B", "C", "D", "E", "F"}));
QVERIFY(m_proxy->moveColumns(QModelIndex(), 0, 3, QModelIndex(), 6));
QCOMPARE(model.stringList(), QStringList({"D", "E", "F", "A", "B", "C"}));
verifyIdentity(&tpm);
m_proxy->setSourceModel(nullptr);
}
void tst_QIdentityProxyModel::reset()