diff options
Diffstat (limited to 'src/corelib/itemmodels/qsortfilterproxymodel.cpp')
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 80961e8eb3..6ab32a9366 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -52,6 +52,8 @@ #include <private/qabstractitemmodel_p.h> #include <private/qabstractproxymodel_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE typedef QList<QPair<QModelIndex, QPersistentModelIndex> > QModelIndexPairList; @@ -475,13 +477,13 @@ void QSortFilterProxyModelPrivate::sort_source_rows( if (source_sort_column >= 0) { if (sort_order == Qt::AscendingOrder) { QSortFilterProxyModelLessThan lt(source_sort_column, source_parent, model, q); - qStableSort(source_rows.begin(), source_rows.end(), lt); + std::stable_sort(source_rows.begin(), source_rows.end(), lt); } else { QSortFilterProxyModelGreaterThan gt(source_sort_column, source_parent, model, q); - qStableSort(source_rows.begin(), source_rows.end(), gt); + std::stable_sort(source_rows.begin(), source_rows.end(), gt); } } else { // restore the source model order - qStableSort(source_rows.begin(), source_rows.end()); + std::stable_sort(source_rows.begin(), source_rows.end()); } } @@ -518,7 +520,7 @@ QVector<QPair<int, int > > QSortFilterProxyModelPrivate::proxy_intervals_for_sou // Add interval to result proxy_intervals.append(QPair<int, int>(first_proxy_item, last_proxy_item)); } - qStableSort(proxy_intervals.begin(), proxy_intervals.end()); + std::stable_sort(proxy_intervals.begin(), proxy_intervals.end()); return proxy_intervals; } @@ -1255,7 +1257,7 @@ void QSortFilterProxyModelPrivate::_q_sourceHeaderDataChanged(Qt::Orientation or } } - qSort(proxy_positions); + std::sort(proxy_positions.begin(), proxy_positions.end()); int last_index = 0; const int numItems = proxy_positions.size(); @@ -2118,7 +2120,7 @@ bool QSortFilterProxyModel::removeRows(int row, int count, const QModelIndex &pa QVector<int> rows; for (int i = row; i < row + count; ++i) rows.append(m->source_rows.at(i)); - qSort(rows.begin(), rows.end()); + std::sort(rows.begin(), rows.end()); int pos = rows.count() - 1; bool ok = true; |