tools: port away from QPair

Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: If122a1c17b1b4092b115521cec814ce3b508cd80
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>

8 files changed, 25 insertions, 22 deletions

diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt
index 2a0f1ae9af..041d883877 100644
--- a/src/tools/androiddeployqt/CMakeLists.txt
+++ b/src/tools/androiddeployqt/CMakeLists.txt
@@ -17,6 +17,7 @@ qt_internal_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+        QT_NO_QPAIR
     LIBRARIES
         Qt::Core
     INCLUDE_DIRECTORIES
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 423978fcce..45d06f731b 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -224,7 +224,7 @@ struct Options
         qtPluginsDirectory = directories["qtPluginsDirectory"_L1];
         qtQmlDirectory = directories["qtQmlDirectory"_L1];
     }
-    typedef QPair<QString, QString> BundledFile;
+    using BundledFile = std::pair<QString, QString>;
     QHash<QString, QList<BundledFile>> bundledFiles;
     QHash<QString, QList<QtDependency>> qtDependencies;
     QHash<QString, QStringList> localLibs;
@@ -2582,7 +2582,7 @@ bool copyQtFiles(Options *options)
                                     *options)) {
             return false;
         }
-        options->bundledFiles[options->currentArchitecture] += qMakePair(destinationFileName, qtDependency.relativePath);
+        options->bundledFiles[options->currentArchitecture] += std::make_pair(destinationFileName, qtDependency.relativePath);
     }
 
     return true;
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index eec01c12e0..f56156d39d 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -29,6 +29,7 @@ qt_internal_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_FOREACH
+        QT_NO_QPAIR
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}
         ../../3rdparty/tinycbor/src
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
index f6e2077ef4..89aecf2bdf 100644
--- a/src/tools/qlalr/CMakeLists.txt
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -21,6 +21,7 @@ qt_internal_add_tool(${target_name}
         recognizer.cpp recognizer.h
     DEFINES
         QT_NO_FOREACH
+        QT_NO_QPAIR
     LIBRARIES
         Qt::Core
         Qt::CorePrivate
diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index e7496e94b5..51f1d94a40 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -139,24 +139,24 @@ State::State (Grammar *g):
 {
 }
 
-QPair<ItemPointer, bool> State::insert (const Item &item)
+std::pair<ItemPointer, bool> State::insert(const Item &item)
 {
   ItemPointer it = std::find (kernel.begin (), kernel.end (), item);
 
   if (it != kernel.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (kernel.insert (it, item), true);
+  return {kernel.insert(it, item), true};
 }
 
-QPair<ItemPointer, bool> State::insertClosure (const Item &item)
+std::pair<ItemPointer, bool> State::insertClosure(const Item &item)
 {
   ItemPointer it = std::find (closure.begin (), closure.end (), item);
 
   if (it != closure.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (closure.insert (it, item), true);
+  return {closure.insert (it, item), true};
 }
 
 
@@ -296,14 +296,14 @@ void Automaton::buildNullables ()
 #endif
 }
 
-QPair<StatePointer, bool> Automaton::internState (const State &state)
+std::pair<StatePointer, bool> Automaton::internState(const State &state)
 {
   StatePointer it = std::find (states.begin (), states.end (), state);
 
   if (it != states.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
-  return qMakePair (states.insert (it, state), true);
+  return {states.insert (it, state), true};
 }
 
 struct _Bucket
@@ -359,7 +359,7 @@ void Automaton::closure (StatePointer state)
               ii.rule = rule;
               ii.dot = rule->rhs.begin ();
 
-              QPair<ItemPointer, bool> r = state->insertClosure (ii);
+              std::pair<ItemPointer, bool> r = state->insertClosure(ii);
 
               if (r.second)
                 working_list.push (r.first);
@@ -371,7 +371,7 @@ void Automaton::closure (StatePointer state)
 
   for (bucket_map_type::iterator bucket = buckets.begin (); bucket != buckets.end (); ++bucket)
     {
-      QPair<StatePointer, bool> r = internState (bucket->toState (this));
+      std::pair<StatePointer, bool> r = internState(bucket->toState(this));
 
       StatePointer target = r.first;
 
diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h
index 19dcdb626e..efa0a91a39 100644
--- a/src/tools/qlalr/lalr.h
+++ b/src/tools/qlalr/lalr.h
@@ -9,7 +9,6 @@
 #include <QtCore/qmap.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qtextstream.h>
-#include <QtCore/qpair.h>
 
 #include <algorithm>
 #include <functional>
@@ -117,8 +116,8 @@ public:
   inline bool operator != (const State &other) const
   { return kernel != other.kernel; }
 
-  QPair<ItemPointer, bool> insert (const Item &item);
-  QPair<ItemPointer, bool> insertClosure (const Item &item);
+  std::pair<ItemPointer, bool> insert(const Item &item);
+  std::pair<ItemPointer, bool> insertClosure(const Item &item);
 
 public: // attributes
   ItemList kernel;
@@ -143,7 +142,7 @@ public:
 public:
   static iterator get (_Tp data);
 
-  QPair<edge_iterator, bool> insertEdge (iterator other) const;
+  std::pair<edge_iterator, bool> insertEdge(iterator other) const;
 
   inline edge_iterator begin () const
   { return outs.begin (); }
@@ -198,15 +197,15 @@ typename Node<_Tp>::iterator Node<_Tp>::get (_Tp data)
 }
 
 template <typename _Tp>
-QPair<typename std::list<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge(typename Node<_Tp>::iterator other) const
+std::pair<typename std::list<typename Node<_Tp>::iterator>::iterator, bool> Node<_Tp>::insertEdge(typename Node<_Tp>::iterator other) const
 {
   edge_iterator it = std::find (outs.begin (), outs.end (), other);
 
   if (it != outs.end ())
-    return qMakePair (it, false);
+    return {it, false};
 
   other->root = false;
-  return qMakePair (outs.insert (outs.end (), other), true);
+  return {outs.insert (outs.end (), other), true};
 }
 
 /////////////////////////////////////////////////////////////
@@ -312,7 +311,7 @@ class Automaton
 public:
   Automaton (Grammar *g);
 
-  QPair<StatePointer, bool> internState (const State &state);
+  std::pair<StatePointer, bool> internState (const State &state);
 
   typedef Node<Read> ReadsGraph;
   typedef ReadsGraph::iterator ReadNode;
diff --git a/src/tools/windeployqt/CMakeLists.txt b/src/tools/windeployqt/CMakeLists.txt
index 1e9e1d3297..2e50116484 100644
--- a/src/tools/windeployqt/CMakeLists.txt
+++ b/src/tools/windeployqt/CMakeLists.txt
@@ -21,6 +21,7 @@ qt_internal_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+        QT_NO_QPAIR
     LIBRARIES
         Qt::CorePrivate
 )
diff --git a/src/tools/windeployqt/utils.h b/src/tools/windeployqt/utils.h
index 88e5b38c2c..2c7cd79bf0 100644
--- a/src/tools/windeployqt/utils.h
+++ b/src/tools/windeployqt/utils.h
@@ -66,7 +66,7 @@ inline std::wostream &operator<<(std::wostream &str, const QString &s)
 // Container class for JSON output
 class JsonOutput
 {
-    using SourceTargetMapping = QPair<QString, QString>;
+    using SourceTargetMapping = std::pair<QString, QString>;
     using SourceTargetMappings = QList<SourceTargetMapping>;
 
 public: