diff options
Diffstat (limited to 'tests/auto')
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index 88751b1c5d..e0c024e39f 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -179,7 +179,7 @@ QtTestModel::QtTestModel(const QVector<QVector<QString> > tbl, QObject *parent) QModelIndex QtTestModel::index(int row, int column, const QModelIndex &parent) const { - return hasIndex(row, column, parent) ? createIndex(row, column, 0) : QModelIndex(); + return hasIndex(row, column, parent) ? createIndex(row, column) : QModelIndex(); } QModelIndex QtTestModel::parent(const QModelIndex &) const { return QModelIndex(); } diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index f7e90218ce..c86eed1deb 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1534,7 +1534,7 @@ public: } QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const { - return hasIndex(row, column, parent) ? createIndex(row, column, 0) : QModelIndex(); + return hasIndex(row, column, parent) ? createIndex(row, column) : QModelIndex(); } int rowCount(const QModelIndex & /* parent */) const { diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 352349f49a..b2a87164f1 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -3972,7 +3972,7 @@ public: qint64 parentRowPlusOne = index.internalId(); if (parentRowPlusOne > 0) { int row = static_cast<int>(parentRowPlusOne - 1); - return createIndex(row, 0, (quint32)0); + return createIndex(row, 0); } } return QModelIndex(); @@ -3992,7 +3992,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent) const { - return createIndex(row, column, parent.isValid() ? (quint32)(parent.row() + 1) : (quint32)0); + return createIndex(row, column, parent.isValid() ? (quintptr)(parent.row() + 1) : (quintptr)0); } public slots: @@ -4003,16 +4003,16 @@ public slots: if (current.isValid()) { int selectedRow = current.row(); - quint32 parentRowPlusOne = static_cast<quint32>(current.internalId()); + const quintptr parentRowPlusOne = current.internalId(); for (int i = 0; i < 2; ++i) { // announce the removal of all non top level items - beginRemoveRows(createIndex(i, 0, 0), 0, 3); + beginRemoveRows(createIndex(i, 0), 0, 3); // nothing to actually do for the removal endRemoveRows(); // put them back in again - beginInsertRows(createIndex(i, 0, 0), 0, 3); + beginInsertRows(createIndex(i, 0), 0, 3); // nothing to actually do for the insertion endInsertRows(); } |