diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index d1cbd7f461e..e05b76f5dae 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -43,6 +43,8 @@ #include #include +#include + #ifndef QT_NO_ITEMVIEWS QT_BEGIN_NAMESPACE @@ -1007,8 +1009,8 @@ void QItemSelectionModelPrivate::_q_layoutChanged(const QList #include +#include + QT_BEGIN_NAMESPACE typedef QList > 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 > QSortFilterProxyModelPrivate::proxy_intervals_for_sou // Add interval to result proxy_intervals.append(QPair(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 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; diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp index 49345f155a8..641dfb28f9f 100644 --- a/src/corelib/itemmodels/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -47,6 +47,8 @@ #include +#include + #ifndef QT_NO_STRINGLISTMODEL QT_BEGIN_NAMESPACE @@ -267,9 +269,9 @@ void QStringListModel::sort(int, Qt::SortOrder order) list.append(QPair(lst.at(i), i)); if (order == Qt::AscendingOrder) - qSort(list.begin(), list.end(), ascendingLessThan); + std::sort(list.begin(), list.end(), ascendingLessThan); else - qSort(list.begin(), list.end(), decendingLessThan); + std::sort(list.begin(), list.end(), decendingLessThan); lst.clear(); QVector forwarding(list.count());