diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 12:34:58 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 13:43:20 +0200 |
commit | 1e25b81e0d6c1da4643c9cc48680f5cc4399d068 (patch) | |
tree | 39f7a70e11b6b14382673167b6e183f70e3dc6c5 /src/plugins/platforms/android | |
parent | 23b7e7972ea40afd2594d0570cbcf8192619cd56 (diff) |
Use QList instead of QVector in plugins
Task-number: QTBUG-84469
Change-Id: Ic86f4a3000592a1c9ae62e4a83f4fe39832a6b24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 07776a4a76..6edddf4a66 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -42,7 +42,7 @@ #include <optional> #include <QCoreApplication> -#include <QVector> +#include <QList> #include <QtCore/private/qjni_p.h> QT_BEGIN_NAMESPACE @@ -88,7 +88,7 @@ struct AssetItem { QString name; }; -using AssetItemList = QVector<AssetItem>; +using AssetItemList = QList<AssetItem>; class FolderIterator : public AssetItemList { diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 82d414d49a..85d4cee6cb 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -78,7 +78,7 @@ public: private: QMutex m_mutex; QAtomicInt m_started = 1; - QVector<QAndroidEventDispatcher *> m_dispatchers; + QList<QAndroidEventDispatcher *> m_dispatchers; }; diff --git a/src/plugins/platforms/android/qandroidplatformmenu.h b/src/plugins/platforms/android/qandroidplatformmenu.h index b1d6a88787..b8334ff970 100644 --- a/src/plugins/platforms/android/qandroidplatformmenu.h +++ b/src/plugins/platforms/android/qandroidplatformmenu.h @@ -41,7 +41,7 @@ #define QANDROIDPLATFORMMENU_H #include <qpa/qplatformmenu.h> -#include <qvector.h> +#include <qlist.h> #include <qmutex.h> QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ class QAndroidPlatformMenuItem; class QAndroidPlatformMenu: public QPlatformMenu { public: - typedef QVector<QAndroidPlatformMenuItem *> PlatformMenuItemsType; + typedef QList<QAndroidPlatformMenuItem *> PlatformMenuItemsType; public: QAndroidPlatformMenu(); diff --git a/src/plugins/platforms/android/qandroidplatformmenubar.h b/src/plugins/platforms/android/qandroidplatformmenubar.h index 81a26c72f4..449c39ca52 100644 --- a/src/plugins/platforms/android/qandroidplatformmenubar.h +++ b/src/plugins/platforms/android/qandroidplatformmenubar.h @@ -41,9 +41,9 @@ #define QANDROIDPLATFORMMENUBAR_H #include <qpa/qplatformmenu.h> -#include <qvector.h> -#include <qmutex.h> #include <qhash.h> +#include <qlist.h> +#include <qmutex.h> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ class QAndroidPlatformMenu; class QAndroidPlatformMenuBar: public QPlatformMenuBar { public: - typedef QVector<QAndroidPlatformMenu *> PlatformMenusType; + typedef QList<QAndroidPlatformMenu *> PlatformMenusType; public: QAndroidPlatformMenuBar(); ~QAndroidPlatformMenuBar(); |