1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QItemSelectionModel: refactoring of internal functions

Browse Source 
Introduce template helper function qSelectionIndexes().
Template argument is container. Now we have the same code for
QVector and QList.

Also it's needed for a follow-up change in this file:
add method QModelIndex QItemSelection::index().

Change-Id: I7f86a9b96e5feac9873cf0df7a1cbca74f9191ec
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Anton Kudryavtsev 2016-03-10 18:32:48 +03:00
parent 343e5d066a
commit df909d8b1f
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/itemmodels/qitemselectionmodel.cpp
View File

@ -327,6 +327,15 @@ static void indexesFromRange(const QItemSelectionRange &range, ModelIndexContain
} }
} }
template<typename ModelIndexContainer>
static ModelIndexContainer qSelectionIndexes(const QItemSelection &selection)
{
ModelIndexContainer result;
for (const auto &range : selection)
indexesFromRange(range, result);
return result;
}
/*! /*!
Returns \c true if the selection range contains no selectable item Returns \c true if the selection range contains no selectable item
\since 4.7 \since 4.7
@ -469,20 +478,7 @@ bool QItemSelection::contains(const QModelIndex &index) const
QModelIndexList QItemSelection::indexes() const QModelIndexList QItemSelection::indexes() const
{ {
QModelIndexList result; return qSelectionIndexes<QModelIndexList>(*this);
QList<QItemSelectionRange>::const_iterator it = begin();
for (; it != end(); ++it)
indexesFromRange(*it, result);
return result;
}
static QVector<QPersistentModelIndex> qSelectionPersistentindexes(const QItemSelection &sel)
{
QVector<QPersistentModelIndex> result;
QList<QItemSelectionRange>::const_iterator it = sel.constBegin();
for (; it != sel.constEnd(); ++it)
indexesFromRange(*it, result);
return result;
} }
static QVector<QPair<QPersistentModelIndex, uint> > qSelectionPersistentRowLengths(const QItemSelection &sel) static QVector<QPair<QPersistentModelIndex, uint> > qSelectionPersistentRowLengths(const QItemSelection &sel)
@ -892,8 +888,8 @@ void QItemSelectionModelPrivate::_q_layoutAboutToBeChanged(const QList<QPersiste
savedPersistentRowLengths = qSelectionPersistentRowLengths(ranges); savedPersistentRowLengths = qSelectionPersistentRowLengths(ranges);
savedPersistentCurrentRowLengths = qSelectionPersistentRowLengths(currentSelection); savedPersistentCurrentRowLengths = qSelectionPersistentRowLengths(currentSelection);
} else { } else {
savedPersistentIndexes = qSelectionPersistentindexes(ranges); savedPersistentIndexes = qSelectionIndexes<QVector<QPersistentModelIndex>>(ranges);
savedPersistentCurrentIndexes = qSelectionPersistentindexes(currentSelection); savedPersistentCurrentIndexes = qSelectionIndexes<QVector<QPersistentModelIndex>>(currentSelection);
} }
} }
/*! /*!