From a7dc708eb57b8db55f2dd0380fabb4a4e64a39d1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 23 Apr 2013 12:31:23 +0200 Subject: [PATCH] Fix QAbstractItemModel::moveColumn() Task-number: QTBUG-30346 Change-Id: I3d6dbe1e88bb5e2748eadabb2663f30be16f8d18 Reviewed-by: Stephen Kelly Reviewed-by: Mark Brand --- src/corelib/itemmodels/qabstractitemmodel.h | 2 +- .../itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 6a57ccaca88..d5bf29212fc 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -405,7 +405,7 @@ inline bool QAbstractItemModel::moveRow(const QModelIndex &sourceParent, int sou { return moveRows(sourceParent, sourceRow, 1, destinationParent, destinationChild); } inline bool QAbstractItemModel::moveColumn(const QModelIndex &sourceParent, int sourceColumn, 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 { return QModelIndex(arow, acolumn, adata, this); } inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, quintptr aid) const diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index d2fb56ce027..2d2ae14fb81 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -891,6 +891,10 @@ void tst_QAbstractItemModel::moveColumns() QCOMPARE(model.moveColumns(QModelIndex(), 6, 4, QModelIndex(), 1), true); QCOMPARE(columnsAboutToBeMovedSpy.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()