Fix QAbstractItemModel::moveColumn()
Task-number: QTBUG-30346 Change-Id: I3d6dbe1e88bb5e2748eadabb2663f30be16f8d18 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
parent
e324f5bc0e
commit
a7dc708eb5
@ -405,7 +405,7 @@ inline bool QAbstractItemModel::moveRow(const QModelIndex &sourceParent, int sou
|
|||||||
{ return moveRows(sourceParent, sourceRow, 1, destinationParent, destinationChild); }
|
{ return moveRows(sourceParent, sourceRow, 1, destinationParent, destinationChild); }
|
||||||
inline bool QAbstractItemModel::moveColumn(const QModelIndex &sourceParent, int sourceColumn,
|
inline bool QAbstractItemModel::moveColumn(const QModelIndex &sourceParent, int sourceColumn,
|
||||||
const QModelIndex &destinationParent, int destinationChild)
|
const QModelIndex &destinationParent, int destinationChild)
|
||||||
{ return moveRows(sourceParent, sourceColumn, 1, destinationParent, destinationChild); }
|
{ return moveColumns(sourceParent, sourceColumn, 1, destinationParent, destinationChild); }
|
||||||
inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, void *adata) const
|
inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, void *adata) const
|
||||||
{ return QModelIndex(arow, acolumn, adata, this); }
|
{ return QModelIndex(arow, acolumn, adata, this); }
|
||||||
inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, quintptr aid) const
|
inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, quintptr aid) const
|
||||||
|
@ -891,6 +891,10 @@ void tst_QAbstractItemModel::moveColumns()
|
|||||||
QCOMPARE(model.moveColumns(QModelIndex(), 6, 4, QModelIndex(), 1), true);
|
QCOMPARE(model.moveColumns(QModelIndex(), 6, 4, QModelIndex(), 1), true);
|
||||||
QCOMPARE(columnsAboutToBeMovedSpy.count(), 1);
|
QCOMPARE(columnsAboutToBeMovedSpy.count(), 1);
|
||||||
QCOMPARE(columnsMovedSpy.count(), 1);
|
QCOMPARE(columnsMovedSpy.count(), 1);
|
||||||
|
|
||||||
|
QCOMPARE(model.moveColumn(QModelIndex(), 4, QModelIndex(), 1), true);
|
||||||
|
QCOMPARE(columnsAboutToBeMovedSpy.count(), 2);
|
||||||
|
QCOMPARE(columnsMovedSpy.count(), 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QAbstractItemModel::reset()
|
void tst_QAbstractItemModel::reset()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user