diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-02-24 16:32:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-22 20:45:12 +0200 |
| commit | 15953e95030ee42c78a84c48c7a3f3c2c448601f (patch) | |
| tree | 628bc796efb6c825f09efa331e292d834603ae8d /src/corelib/itemmodels/qabstractitemmodel.cpp | |
| parent | be15856f61a949b8a01a1659c15af675c4c2f4e9 (diff) | |
QModelIndex: clean up integer size confusion in the API
QAIM::createIndex() took either int or quint32, but QMI::internalId()
returned qint64.
In the new interface, createIndex() takes, and internalId() provides,
integers of type quintptr.
This matches the storage size of the void* in the model index and
avoids truncation.
Remove the
createIndex(int, int, quint32) and
\obsolete createIndex(int,int,int)
overloads.
This makes a literal 0 in the third parameter ambiguous now.
The solutions have been noted in changes-5.0.0.
Change-Id: I0a0ecd8430eaf695129a4d09d14d4e30745485c4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib/itemmodels/qabstractitemmodel.cpp')
| -rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index e837cbf951..77654158d1 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -328,15 +328,15 @@ void *QPersistentModelIndex::internalPointer() const } /*! - \fn void *QPersistentModelIndex::internalId() const + \fn quintptr QPersistentModelIndex::internalId() const \internal - Returns a \c{qint64} used by the model to associate the index with + Returns a \c{quintptr} used by the model to associate the index with the internal data structure. */ -qint64 QPersistentModelIndex::internalId() const +quintptr QPersistentModelIndex::internalId() const { if (d) return d->index.internalId(); @@ -2345,15 +2345,7 @@ bool QAbstractItemModel::setHeaderData(int section, Qt::Orientation orientation, */ /*! - \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, int id) const - \obsolete - - Use QModelIndex - QAbstractItemModel::createIndex(int row, int column, quint32 id) instead. -*/ - -/*! - \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, quint32 id) const + \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, quintptr id) const Creates a model index for the given \a row and \a column with the internal identifier, \a id. @@ -3237,7 +3229,7 @@ QAbstractTableModel::~QAbstractTableModel() QModelIndex QAbstractTableModel::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(); } /*! @@ -3366,7 +3358,7 @@ QAbstractListModel::~QAbstractListModel() QModelIndex QAbstractListModel::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(); } /*! |