Itemmodels: s/QPair/std::pair/

Also port from qMakePair() to just braced initialization and CTAD.

As a drive-by, use emplacement instead of appending pairs explicitly,
rewrite typedef into `using`, and remove the qpair.h include from the
.cpp file (cannot affect other TUs and <utility> is considered
included in qcompilerdetection.h).

Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: Ia985520dfce6b77b1c0fe7669fc92d2df97e1b06
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>

1 files changed, 17 insertions, 18 deletions

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index c02fb7619b..a9ead2e1eb 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -6,7 +6,6 @@
 #include <qsize.h>
 #include <qdebug.h>
 #include <qdatetime.h>
-#include <qpair.h>
 #include <qstringlist.h>
 #include <private/qabstractitemmodel_p.h>
 #include <private/qabstractproxymodel_p.h>
@@ -16,7 +15,7 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QList<QPair<QModelIndex, QPersistentModelIndex>> QModelIndexPairList;
+using QModelIndexPairList = QList<std::pair<QModelIndex, QPersistentModelIndex>>;
 
 struct QSortFilterProxyModelDataChanged
 {
@@ -333,10 +332,10 @@ public:
     int find_source_sort_column() const;
     void sort_source_rows(QList<int> &source_rows,
                           const QModelIndex &source_parent) const;
-    QList<QPair<int, QList<int>>> proxy_intervals_for_source_items_to_add(
+    QList<std::pair<int, QList<int>>> proxy_intervals_for_source_items_to_add(
         const QList<int> &proxy_to_source, const QList<int> &source_items,
         const QModelIndex &source_parent, Qt::Orientation orient) const;
-    QList<QPair<int, int>> proxy_intervals_for_source_items(
+    QList<std::pair<int, int>> proxy_intervals_for_source_items(
         const QList<int> &source_to_proxy, const QList<int> &source_items) const;
     void insert_source_items(
         QList<int> &source_to_proxy, QList<int> &proxy_to_source,
@@ -705,10 +704,10 @@ void QSortFilterProxyModelPrivate::sort_source_rows(
   The result is a vector of pairs, where each pair represents a
   (start, end) tuple, sorted in ascending order.
 */
-QList<QPair<int, int>> QSortFilterProxyModelPrivate::proxy_intervals_for_source_items(
+QList<std::pair<int, int>> QSortFilterProxyModelPrivate::proxy_intervals_for_source_items(
     const QList<int> &source_to_proxy, const QList<int> &source_items) const
 {
-    QList<QPair<int, int>> proxy_intervals;
+    QList<std::pair<int, int>> proxy_intervals;
     if (source_items.isEmpty())
         return proxy_intervals;
 
@@ -725,19 +724,19 @@ QList<QPair<int, int>> QSortFilterProxyModelPrivate::proxy_intervals_for_source_
             ++source_items_index;
         }
         // Add interval to result
-        proxy_intervals.append(QPair<int, int>(first_proxy_item, last_proxy_item));
+        proxy_intervals.emplace_back(first_proxy_item, last_proxy_item);
     }
     std::stable_sort(proxy_intervals.begin(), proxy_intervals.end());
     // Consolidate adjacent intervals
     for (int i = proxy_intervals.size()-1; i > 0; --i) {
-        QPair<int, int> &interval = proxy_intervals[i];
-        QPair<int, int> &preceeding_interval = proxy_intervals[i - 1];
+        std::pair<int, int> &interval = proxy_intervals[i];
+        std::pair<int, int> &preceeding_interval = proxy_intervals[i - 1];
         if (interval.first == preceeding_interval.second + 1) {
             preceeding_interval.second = interval.second;
             interval.first = interval.second = -1;
         }
     }
-    proxy_intervals.removeIf([](QPair<int, int> interval) { return interval.first < 0; });
+    proxy_intervals.removeIf([](std::pair<int, int> interval) { return interval.first < 0; });
     return proxy_intervals;
 }
 
@@ -766,7 +765,7 @@ void QSortFilterProxyModelPrivate::remove_source_items(
 
     const auto end = proxy_intervals.rend();
     for (auto it = proxy_intervals.rbegin(); it != end; ++it) {
-        const QPair<int, int> &interval = *it;
+        const std::pair<int, int> &interval = *it;
         const int proxy_start = interval.first;
         const int proxy_end = interval.second;
         remove_proxy_interval(source_to_proxy, proxy_to_source, proxy_start, proxy_end,
@@ -820,12 +819,12 @@ void QSortFilterProxyModelPrivate::remove_proxy_interval(
   items), where items is a vector containing the (sorted) source items that
   should be inserted at that proxy model location.
 */
-QList<QPair<int, QList<int>>> QSortFilterProxyModelPrivate::proxy_intervals_for_source_items_to_add(
+QList<std::pair<int, QList<int>>> QSortFilterProxyModelPrivate::proxy_intervals_for_source_items_to_add(
     const QList<int> &proxy_to_source, const QList<int> &source_items,
     const QModelIndex &source_parent, Qt::Orientation orient) const
 {
     Q_Q(const QSortFilterProxyModel);
-    QList<QPair<int, QList<int>>> proxy_intervals;
+    QList<std::pair<int, QList<int>>> proxy_intervals;
     if (source_items.isEmpty())
         return proxy_intervals;
 
@@ -880,7 +879,7 @@ QList<QPair<int, QList<int>>> QSortFilterProxyModelPrivate::proxy_intervals_for_
         }
 
         // Add interval to result
-        proxy_intervals.append(QPair<int, QList<int>>(proxy_item, source_items_in_interval));
+        proxy_intervals.emplace_back(proxy_item, std::move(source_items_in_interval));
     }
     return proxy_intervals;
 }
@@ -908,7 +907,7 @@ void QSortFilterProxyModelPrivate::insert_source_items(
 
     const auto end = proxy_intervals.rend();
     for (auto it = proxy_intervals.rbegin(); it != end; ++it) {
-        const QPair<int, QList<int>> &interval = *it;
+        const std::pair<int, QList<int>> &interval = *it;
         const int proxy_start = interval.first;
         const QList<int> &source_items = interval.second;
         const int proxy_end = proxy_start + source_items.size() - 1;
@@ -1137,7 +1136,7 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour
                                                          Qt::Orientation orient, int start, int end, int delta_item_count, bool remove)
 {
     // see if any mapped children should be (re)moved
-    QList<QPair<QModelIndex, Mapping *>> moved_source_index_mappings;
+    QList<std::pair<QModelIndex, Mapping *>> moved_source_index_mappings;
     auto it2 = parent_mapping->mapped_children.begin();
     for ( ; it2 != parent_mapping->mapped_children.end();) {
         const QModelIndex source_child_index = *it2;
@@ -1171,7 +1170,7 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour
             Mapping *cm = source_index_mapping.take(source_child_index);
             Q_ASSERT(cm);
             // we do not reinsert right away, because the new index might be identical with another, old index
-            moved_source_index_mappings.append(QPair<QModelIndex, Mapping*>(new_index, cm));
+            moved_source_index_mappings.emplace_back(new_index, cm);
         }
     }
 
@@ -1228,7 +1227,7 @@ QModelIndexPairList QSortFilterProxyModelPrivate::store_persistent_indexes() con
     for (const QPersistentModelIndexData *data : std::as_const(persistent.indexes)) {
         const QModelIndex &proxy_index = data->index;
         QModelIndex source_index = q->mapToSource(proxy_index);
-        source_indexes.append(qMakePair(proxy_index, QPersistentModelIndex(source_index)));
+        source_indexes.emplace_back(proxy_index, source_index);
     }
     return source_indexes;
 }