From fe9d56d2a9eb0a09cb66be2cf6c7be64f2cea26b Mon Sep 17 00:00:00 2001
From: Eimen Oueslati <eimen.oueslati@qt.io>
Date: Fri, 16 Aug 2024 08:58:33 +0200
Subject: [PATCH] QAccessible: eliminate use of QPair

Replace Qpair with std::pair

Task-number: QTBUG-115841
Change-Id: I0743447be0f8554dd3b87265f294c6ca116eafff
Reviewed-by: Mate Barany <mate.barany@qt.io>
---
 src/gui/accessible/qaccessible.cpp      | 6 +++---
 src/gui/accessible/qaccessible.h        | 2 +-
 src/gui/accessible/qaccessible_base.h   | 2 +-
 src/gui/accessible/qaccessiblecache_p.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index c83fe5e1b25..5c7155ab5e2 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -949,7 +949,7 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event)
     \param boundaryType the type of boundary to find
     \return the boundaries as pair
 */
-QPair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &offsetCursor, TextBoundaryType boundaryType)
+std::pair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &offsetCursor, TextBoundaryType boundaryType)
 {
     Q_ASSERT(!offsetCursor.isNull());
 
@@ -957,7 +957,7 @@ QPair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &
     endCursor.movePosition(QTextCursor::End);
     int characterCount = endCursor.position();
 
-    QPair<int, int> result;
+    std::pair<int, int> result;
     QTextCursor cursor = offsetCursor;
     switch (boundaryType) {
     case CharBoundary:
@@ -1157,7 +1157,7 @@ QPair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &
 
     \sa parent(), child()
 */
-QList<QPair<QAccessibleInterface*, QAccessible::Relation>>
+QList<std::pair<QAccessibleInterface*, QAccessible::Relation>>
 QAccessibleInterface::relations(QAccessible::Relation match) const
 {
     Q_UNUSED(match);
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 937b044f366..534aa87b941 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -58,7 +58,7 @@ public:
     virtual QWindow *window() const;
 
     // relations
-    virtual QList<QPair<QAccessibleInterface *, QAccessible::Relation>>
+    virtual QList<std::pair<QAccessibleInterface *, QAccessible::Relation>>
     relations(QAccessible::Relation match = QAccessible::AllRelations) const;
     virtual QAccessibleInterface *focusChild() const;
 
diff --git a/src/gui/accessible/qaccessible_base.h b/src/gui/accessible/qaccessible_base.h
index 9f9ffefbf7a..45d5a4b53ad 100644
--- a/src/gui/accessible/qaccessible_base.h
+++ b/src/gui/accessible/qaccessible_base.h
@@ -412,7 +412,7 @@ public:
 
     static void cleanup();
 
-    static QPair< int, int > qAccessibleTextBoundaryHelper(const QTextCursor &cursor, TextBoundaryType boundaryType);
+    static std::pair< int, int > qAccessibleTextBoundaryHelper(const QTextCursor &cursor, TextBoundaryType boundaryType);
 
 private:
     static UpdateHandler updateHandler;
diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h
index 6356969827a..dcdf195dea4 100644
--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@@ -54,7 +54,7 @@ private:
 
     mutable QHash<QAccessible::Id, QAccessibleInterface *> idToInterface;
     mutable QHash<QAccessibleInterface *, QAccessible::Id> interfaceToId;
-    mutable QMultiHash<QObject *, QPair<QAccessible::Id, const QMetaObject*>> objectToId;
+    mutable QMultiHash<QObject *, std::pair<QAccessible::Id, const QMetaObject*>> objectToId;
 
 #ifdef Q_OS_APPLE
     void removeAccessibleElement(QAccessible::Id axid);