QCbor/QJson: s/QPair/std::pair/

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

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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h
index 523ef9ea34..f5a118d673 100644
--- a/src/corelib/serialization/qcbormap.h
+++ b/src/corelib/serialization/qcbormap.h
@@ -20,7 +20,7 @@ class QCborContainerPrivate;
 class Q_CORE_EXPORT QCborMap
 {
 public:
-    typedef QPair<QCborValue, QCborValue> value_type;
+    typedef std::pair<QCborValue, QCborValue> value_type;
     typedef QCborValue key_type;
     typedef QCborValue mapped_type;
     typedef qsizetype size_type;
@@ -34,9 +34,9 @@ public:
     public:
         typedef std::random_access_iterator_tag iterator_category;
         typedef qsizetype difference_type;
-        typedef QPair<QCborValueConstRef, QCborValueRef> value_type;
-        typedef QPair<QCborValueConstRef, QCborValueRef> reference;
-        typedef QPair<QCborValueConstRef, QCborValueRef> pointer;
+        typedef std::pair<QCborValueConstRef, QCborValueRef> value_type;
+        typedef std::pair<QCborValueConstRef, QCborValueRef> reference;
+        typedef std::pair<QCborValueConstRef, QCborValueRef> pointer;
 
         constexpr Iterator() = default;
         constexpr Iterator(const Iterator &) = default;
@@ -94,9 +94,9 @@ public:
     public:
         typedef std::random_access_iterator_tag iterator_category;
         typedef qsizetype difference_type;
-        typedef QPair<QCborValueConstRef, QCborValueConstRef> value_type;
-        typedef QPair<QCborValueConstRef, QCborValueConstRef> reference;
-        typedef QPair<QCborValueConstRef, QCborValueConstRef> pointer;
+        typedef std::pair<QCborValueConstRef, QCborValueConstRef> value_type;
+        typedef std::pair<QCborValueConstRef, QCborValueConstRef> reference;
+        typedef std::pair<QCborValueConstRef, QCborValueConstRef> pointer;
 
         constexpr ConstIterator() = default;
         constexpr ConstIterator(const ConstIterator &) = default;