diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:49:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 14:45:38 +0200 |
commit | d757b5251fd2e0f98d54bb86296ce538aa50d6b6 (patch) | |
tree | 7b5e648323552a2d9b47fa34318b398eb9bc0b4e /src/widgets | |
parent | 1a844db508ec8350b24661e729f9bff8097ef1b6 (diff) |
Remove deprecated algorithms usage from itemviews
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I68efdd1b08b94a737345644a5b588ffff5caac63
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/itemviews/qlistwidget.cpp | 6 | ||||
-rw-r--r-- | src/widgets/itemviews/qtablewidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index 1573e97981..27abfb8eb4 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -304,7 +304,7 @@ void QListModel::sort(int column, Qt::SortOrder order) } LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qSort(sorting.begin(), sorting.end(), compare); + std::sort(sorting.begin(), sorting.end(), compare); QModelIndexList fromIndexes; QModelIndexList toIndexes; for (int r = 0; r < sorting.count(); ++r) { @@ -338,7 +338,7 @@ void QListModel::ensureSorted(int column, Qt::SortOrder order, int start, int en } LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qSort(sorting.begin(), sorting.end(), compare); + std::sort(sorting.begin(), sorting.end(), compare); QModelIndexList oldPersistentIndexes = persistentIndexList(); QModelIndexList newPersistentIndexes = oldPersistentIndexes; @@ -1832,7 +1832,7 @@ void QListWidget::dropEvent(QDropEvent *event) { if (persIndexes.contains(topIndex)) return; - qSort(persIndexes); // The dropped items will remain in the same visual order. + std::sort(persIndexes.begin(), persIndexes.end()); // The dropped items will remain in the same visual order. QPersistentModelIndex dropRow = model()->index(row, col, topIndex); diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp index d56314b23d..f15124605f 100644 --- a/src/widgets/itemviews/qtablewidget.cpp +++ b/src/widgets/itemviews/qtablewidget.cpp @@ -510,7 +510,7 @@ void QTableModel::sort(int column, Qt::SortOrder order) } LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qStableSort(sortable.begin(), sortable.end(), compare); + std::stable_sort(sortable.begin(), sortable.end(), compare); QVector<QTableWidgetItem*> sorted_table(tableItems.count()); QModelIndexList from; @@ -558,7 +558,7 @@ void QTableModel::ensureSorted(int column, Qt::SortOrder order, } LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qStableSort(sorting.begin(), sorting.end(), compare); + std::stable_sort(sorting.begin(), sorting.end(), compare); QModelIndexList oldPersistentIndexes = persistentIndexList(); QModelIndexList newPersistentIndexes = oldPersistentIndexes; diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index e4c2cfcb0c..b5f1b12365 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -61,6 +61,8 @@ #include <private/qtreeview_p.h> #include <private/qheaderview_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE /*! @@ -3758,7 +3760,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd } } //let's sort the list - qSort(logicalIndexes.begin(), logicalIndexes.end()); + std::sort(logicalIndexes.begin(), logicalIndexes.end()); QList<QPair<int, int> > ret; QPair<int, int> current; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 2de7830c6a..f098236d5c 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -614,7 +614,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order, } LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qStableSort(sorting.begin(), sorting.end(), compare); + std::stable_sort(sorting.begin(), sorting.end(), compare); QModelIndexList oldPersistentIndexes; QModelIndexList newPersistentIndexes; @@ -854,7 +854,7 @@ void QTreeModel::sortItems(QList<QTreeWidgetItem*> *items, int column, Qt::SortO // do the sorting LessThan compare = (order == Qt::AscendingOrder ? &itemLessThan : &itemGreaterThan); - qStableSort(sorting.begin(), sorting.end(), compare); + std::stable_sort(sorting.begin(), sorting.end(), compare); QModelIndexList fromList; QModelIndexList toList; |