1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAccessible: eliminate use of QPair

Browse Source 
Replace Qpair with std::pair

Task-number: QTBUG-115841
Change-Id: I0743447be0f8554dd3b87265f294c6ca116eafff
Reviewed-by: Mate Barany <mate.barany@qt.io>
This commit is contained in:
Eimen Oueslati 2024-08-16 08:58:33 +02:00
parent 65eb1c5579
commit fe9d56d2a9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/accessible/qaccessible.cpp
View File

@ -949,7 +949,7 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event)
\param boundaryType the type of boundary to find \param boundaryType the type of boundary to find
\return the boundaries as pair \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()); Q_ASSERT(!offsetCursor.isNull());
@ -957,7 +957,7 @@ QPair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &
endCursor.movePosition(QTextCursor::End); endCursor.movePosition(QTextCursor::End);
int characterCount = endCursor.position(); int characterCount = endCursor.position();
QPair<int, int> result; std::pair<int, int> result;
QTextCursor cursor = offsetCursor; QTextCursor cursor = offsetCursor;
switch (boundaryType) { switch (boundaryType) {
case CharBoundary: case CharBoundary:
@ -1157,7 +1157,7 @@ QPair< int, int > QAccessible::qAccessibleTextBoundaryHelper(const QTextCursor &
\sa parent(), child() \sa parent(), child()
*/ */
QList<QPair<QAccessibleInterface*, QAccessible::Relation>> QList<std::pair<QAccessibleInterface*, QAccessible::Relation>>
QAccessibleInterface::relations(QAccessible::Relation match) const QAccessibleInterface::relations(QAccessible::Relation match) const
{ {
Q_UNUSED(match); Q_UNUSED(match);

2
src/gui/accessible/qaccessible.h
View File

@ -58,7 +58,7 @@ public:
virtual QWindow *window() const; virtual QWindow *window() const;
// relations // relations
virtual QList<QPair<QAccessibleInterface *, QAccessible::Relation>> virtual QList<std::pair<QAccessibleInterface *, QAccessible::Relation>>
relations(QAccessible::Relation match = QAccessible::AllRelations) const; relations(QAccessible::Relation match = QAccessible::AllRelations) const;
virtual QAccessibleInterface *focusChild() const; virtual QAccessibleInterface *focusChild() const;

2
src/gui/accessible/qaccessible_base.h
View File

@ -412,7 +412,7 @@ public:
static void cleanup(); 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: private:
static UpdateHandler updateHandler; static UpdateHandler updateHandler;

2
src/gui/accessible/qaccessiblecache_p.h
View File

@ -54,7 +54,7 @@ private:
mutable QHash<QAccessible::Id, QAccessibleInterface *> idToInterface; mutable QHash<QAccessible::Id, QAccessibleInterface *> idToInterface;
mutable QHash<QAccessibleInterface *, QAccessible::Id> interfaceToId; 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 #ifdef Q_OS_APPLE
void removeAccessibleElement(QAccessible::Id axid); void removeAccessibleElement(QAccessible::Id axid);