From 471e4fcb226c4523efe93b1bdaf0db026495da94 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 11:55:39 +0200
Subject: Use QList instead of QVector in gui implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-84469
Change-Id: I366e845249203d80d640355a7780ac2f91a762f1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h | 12 ++++++------
 src/gui/platform/unix/dbustray/qdbustraytypes_p.h |  2 +-
 src/gui/platform/unix/qxkbcommon.cpp              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui/platform')

diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h
index fd6727d3be..047f6c963c 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
 class QDBusPlatformMenu;
 class QDBusPlatformMenuItem;
 class QDBusMenuItem;
-typedef QVector<QDBusMenuItem> QDBusMenuItemList;
-typedef QVector<QStringList> QDBusMenuShortcut;
+typedef QList<QDBusMenuItem> QDBusMenuItemList;
+typedef QList<QStringList> QDBusMenuShortcut;
 
 class QDBusMenuItem
 {
@@ -99,7 +99,7 @@ Q_DECLARE_TYPEINFO(QDBusMenuItemKeys, Q_MOVABLE_TYPE);
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuItemKeys &keys);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuItemKeys &keys);
 
-typedef QVector<QDBusMenuItemKeys> QDBusMenuItemKeysList;
+typedef QList<QDBusMenuItemKeys> QDBusMenuItemKeysList;
 
 class QDBusMenuLayoutItem
 {
@@ -110,14 +110,14 @@ public:
 
     int m_id;
     QVariantMap m_properties;
-    QVector<QDBusMenuLayoutItem> m_children;
+    QList<QDBusMenuLayoutItem> m_children;
 };
 Q_DECLARE_TYPEINFO(QDBusMenuLayoutItem, Q_MOVABLE_TYPE);
 
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuLayoutItem &);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuLayoutItem &item);
 
-typedef QVector<QDBusMenuLayoutItem> QDBusMenuLayoutItemList;
+typedef QList<QDBusMenuLayoutItem> QDBusMenuLayoutItemList;
 
 class QDBusMenuEvent
 {
@@ -133,7 +133,7 @@ Q_DECLARE_TYPEINFO(QDBusMenuEvent, Q_MOVABLE_TYPE); // QDBusVariant is movable,
 const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuEvent &ev);
 const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuEvent &ev);
 
-typedef QVector<QDBusMenuEvent> QDBusMenuEventList;
+typedef QList<QDBusMenuEvent> QDBusMenuEventList;
 
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const QDBusMenuItem &item);
diff --git a/src/gui/platform/unix/dbustray/qdbustraytypes_p.h b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h
index 3f75555579..d11ccd04ec 100644
--- a/src/gui/platform/unix/dbustray/qdbustraytypes_p.h
+++ b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h
@@ -77,7 +77,7 @@ struct QXdgDBusImageStruct
 };
 Q_DECLARE_TYPEINFO(QXdgDBusImageStruct, Q_MOVABLE_TYPE);
 
-typedef QVector<QXdgDBusImageStruct> QXdgDBusImageVector;
+using QXdgDBusImageVector = QList<QXdgDBusImageStruct>;
 
 QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon);
 
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
index 540dbbc842..ff19ebd5d5 100644
--- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp
@@ -485,7 +485,7 @@ QList<xkb_keysym_t> QXkbCommon::toKeysym(QKeyEvent *event)
         return keysyms;
     }
 
-    QVector<uint> ucs4;
+    QList<uint> ucs4;
     if (event->text().isEmpty())
         ucs4.append(qtKey);
     else
-- 
cgit v1.2.3