summaryrefslogtreecommitdiffstats
path: root/src/gui/accessible
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 12:04:36 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 13:43:11 +0200
commit23b7e7972ea40afd2594d0570cbcf8192619cd56 (patch)
treed57e1edca12c15cb5ef1e8673a72318b0527fa2c /src/gui/accessible
parent75deec346278783d52f00a088c69f05d10e3b741 (diff)
Use QList instead of QVector in platformsupport
Task-number: QTBUG-84469 Change-Id: I8e4e6626cc840bc9c8bce014c595da9080025dd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/accessible')
-rw-r--r--src/gui/accessible/linux/atspiadaptor.cpp2
-rw-r--r--src/gui/accessible/linux/qspi_struct_marshallers_p.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index 65b014c9e1..93b731746f 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -1495,7 +1495,7 @@ QStringList AtSpiAdaptor::accessibleInterfaces(QAccessibleInterface *interface)
QSpiRelationArray AtSpiAdaptor::relationSet(QAccessibleInterface *interface, const QDBusConnection &connection) const
{
typedef QPair<QAccessibleInterface*, QAccessible::Relation> RelationPair;
- const QVector<RelationPair> relationInterfaces = interface->relations();
+ const QList<RelationPair> relationInterfaces = interface->relations();
QSpiRelationArray relations;
for (const RelationPair &pair : relationInterfaces) {
diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h
index 876c2bf700..9850058efc 100644
--- a/src/gui/accessible/linux/qspi_struct_marshallers_p.h
+++ b/src/gui/accessible/linux/qspi_struct_marshallers_p.h
@@ -53,7 +53,7 @@
//
#include <QtGui/private/qtguiglobal_p.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtDBus/QDBusArgument>
#include <QtDBus/QDBusConnection>
@@ -63,8 +63,8 @@ QT_REQUIRE_CONFIG(accessibility);
QT_BEGIN_NAMESPACE
-typedef QVector<int> QSpiIntList;
-typedef QVector<uint> QSpiUIntList;
+using QSpiIntList = QList<int>;
+using QSpiUIntList = QList<uint>;
// FIXME: make this copy on write
struct QSpiObjectReference
@@ -82,7 +82,7 @@ Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_MOVABLE_TYPE); // QDBusObjectPath is m
QDBusArgument &operator<<(QDBusArgument &argument, const QSpiObjectReference &address);
const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiObjectReference &address);
-typedef QVector<QSpiObjectReference> QSpiObjectReferenceArray;
+typedef QList<QSpiObjectReference> QSpiObjectReferenceArray;
struct QSpiAccessibleCacheItem
{
@@ -98,7 +98,7 @@ struct QSpiAccessibleCacheItem
};
Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_MOVABLE_TYPE);
-typedef QVector<QSpiAccessibleCacheItem> QSpiAccessibleCacheArray;
+typedef QList<QSpiAccessibleCacheItem> QSpiAccessibleCacheArray;
QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAccessibleCacheItem &item);
const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAccessibleCacheItem &item);
@@ -111,7 +111,7 @@ struct QSpiAction
};
Q_DECLARE_TYPEINFO(QSpiAction, Q_MOVABLE_TYPE);
-typedef QVector<QSpiAction> QSpiActionArray;
+typedef QList<QSpiAction> QSpiActionArray;
QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAction &action);
const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAction &action);
@@ -123,13 +123,13 @@ struct QSpiEventListener
};
Q_DECLARE_TYPEINFO(QSpiEventListener, Q_MOVABLE_TYPE);
-typedef QVector<QSpiEventListener> QSpiEventListenerArray;
+typedef QList<QSpiEventListener> QSpiEventListenerArray;
QDBusArgument &operator<<(QDBusArgument &argument, const QSpiEventListener &action);
const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiEventListener &action);
typedef QPair<unsigned int, QSpiObjectReferenceArray> QSpiRelationArrayEntry;
-typedef QVector<QSpiRelationArrayEntry> QSpiRelationArray;
+typedef QList<QSpiRelationArrayEntry> QSpiRelationArray;
//a(iisv)
struct QSpiTextRange {
@@ -140,7 +140,7 @@ struct QSpiTextRange {
};
Q_DECLARE_TYPEINFO(QSpiTextRange, Q_MOVABLE_TYPE);
-typedef QVector<QSpiTextRange> QSpiTextRangeList;
+typedef QList<QSpiTextRange> QSpiTextRangeList;
typedef QMap <QString, QString> QSpiAttributeSet;
enum QSpiAppUpdateType {