Android: Use QList instead of QVector

Change-Id: If4e163716e8ad5eac782d4b023dcb88fca0f8414
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

9 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index c37daf43b8..e537911fc6 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -273,7 +273,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
 
 QString AndroidAvdManager::findAvd(const QString &avdName) const
 {
-    const QVector<AndroidDeviceInfo> devices = androidConfig().connectedDevices();
+    const QList<AndroidDeviceInfo> devices = androidConfig().connectedDevices();
     for (const AndroidDeviceInfo &device : devices) {
         if (device.type != ProjectExplorer::IDevice::Emulator)
             continue;
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 4108106a2e..f9835e17b0 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -607,9 +607,9 @@ FilePath AndroidConfig::keytoolPath() const
     return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix();
 }
 
-QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
+QList<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
 {
-    QVector<AndroidDeviceInfo> devices;
+    QList<AndroidDeviceInfo> devices;
     Process adbProc;
     CommandLine cmd{adbToolPath(), {"devices"}};
     adbProc.setCommand(cmd);
@@ -664,7 +664,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
 
 bool AndroidConfig::isConnected(const QString &serialNumber) const
 {
-    const QVector<AndroidDeviceInfo> devices = connectedDevices();
+    const QList<AndroidDeviceInfo> devices = connectedDevices();
     for (const AndroidDeviceInfo &device : devices) {
         if (device.serialNumber == serialNumber)
             return true;
@@ -1225,7 +1225,7 @@ void AndroidConfigurations::removeUnusedDebuggers()
         return v->type() == Constants::ANDROID_QT_TYPE;
     });
 
-    QVector<FilePath> uniqueNdks;
+    QList<FilePath> uniqueNdks;
     for (const QtVersion *qt : qtVersions) {
         FilePath ndkLocation = androidConfig().ndkLocation(qt);
         if (!uniqueNdks.contains(ndkLocation))
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 2aeb343ff8..ce4604de18 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -9,14 +9,14 @@
 #include "androidsdkpackage.h"
 
 #include <projectexplorer/toolchain.h>
+
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/filepath.h>
 
-#include <QStringList>
-#include <QVector>
 #include <QHash>
 #include <QMap>
+#include <QStringList>
 #include <QVersionNumber>
 
 namespace ProjectExplorer { class Abi; }
@@ -114,7 +114,7 @@ public:
 
     Utils::FilePath keytoolPath() const;
 
-    QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
+    QList<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
 
     QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion) const;
 
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 56ffbf45b9..0242fdeded 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -666,7 +666,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
 {
     DeviceManager *const devMgr = DeviceManager::instance();
 
-    QVector<Id> existingAvds;
+    QList<Id> existingAvds;
     for (int i = 0; i < devMgr->deviceCount(); ++i) {
         const IDevice::ConstPtr dev = devMgr->deviceAt(i);
         const bool isEmulator = dev->machineType() == IDevice::Emulator;
@@ -674,7 +674,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
             existingAvds.append(dev->id());
     }
 
-    QVector<Id> connectedDevs;
+    QList<Id> connectedDevs;
     for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) {
         const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
         const QString displayName = AndroidDevice::displayNameFromInfo(item);
diff --git a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
index dc7443e745..28caf07c78 100644
--- a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
+++ b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QString>
-#include <QVector>
 #include <QWidget>
 
 #include <QCoreApplication>
@@ -30,7 +30,7 @@ public:
     void loadIcons();
     bool hasIcons() const;
 private:
-    QVector<AndroidManifestEditorIconWidget *> m_iconButtons;
+    QList<AndroidManifestEditorIconWidget *> m_iconButtons;
     QString m_iconFileName = QLatin1String("icon");
     bool m_hasIcons = false;
 signals:
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 22bb64b0a4..72b786fa73 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -35,7 +35,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
 {
     setId("AndroidRunner");
     static const int metaTypes[] = {
-        qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
+        qRegisterMetaType<QList<QStringList>>("QList<QStringList>"),
         qRegisterMetaType<Utils::Port>("Utils::Port"),
         qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
     };
diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h
index b91b653f81..acb371205d 100644
--- a/src/plugins/android/certificatesmodel.h
+++ b/src/plugins/android/certificatesmodel.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QVector>
+#include <QList>
 #include <QPair>
 
 namespace Android {
@@ -17,12 +17,12 @@ public:
     CertificatesModel(const QString &rowCertificates, QObject *parent);
 
 protected:
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
-    QVector<QPair<QString, QString> > m_certs;
+    QList<QPair<QString, QString>> m_certs;
 };
 
 }
diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp
index e0e203121d..253dce0dd4 100644
--- a/src/plugins/android/splashscreencontainerwidget.cpp
+++ b/src/plugins/android/splashscreencontainerwidget.cpp
@@ -73,7 +73,7 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
                                            const QString &splashScreenPath,
                                            int scalingRatio, int maxScalingRatio,
                                            QHBoxLayout *pageLayout,
-                                           QVector<SplashScreenWidget *> &widgetContainer)
+                                           QList<SplashScreenWidget *> &widgetContainer)
 {
     auto splashScreenWidget = new SplashScreenWidget(page,
                                                      size,
@@ -90,9 +90,9 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
 }
 
 static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget,
-                           QVector<SplashScreenWidget *> &widgetContainer,
-                           QVector<SplashScreenWidget *> &portraitWidgetContainer,
-                           QVector<SplashScreenWidget *> &landscapeWidgetContainer,
+                           QList<SplashScreenWidget *> &widgetContainer,
+                           QList<SplashScreenWidget *> &portraitWidgetContainer,
+                           QList<SplashScreenWidget *> &landscapeWidgetContainer,
                            int scalingRatio,
                            const QSize &size,
                            const QSize &portraitSize,
diff --git a/src/plugins/android/splashscreencontainerwidget.h b/src/plugins/android/splashscreencontainerwidget.h
index deec77faad..ef8f2f5b0a 100644
--- a/src/plugins/android/splashscreencontainerwidget.h
+++ b/src/plugins/android/splashscreencontainerwidget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QList>
 #include <QStackedWidget>
 
 QT_BEGIN_NAMESPACE
@@ -48,9 +48,9 @@ private:
     void clearAll();
 
     TextEditor::TextEditorWidget *m_textEditorWidget = nullptr;
-    QVector<SplashScreenWidget *> m_imageWidgets;
-    QVector<SplashScreenWidget *> m_portraitImageWidgets;
-    QVector<SplashScreenWidget *> m_landscapeImageWidgets;
+    QList<SplashScreenWidget *> m_imageWidgets;
+    QList<SplashScreenWidget *> m_portraitImageWidgets;
+    QList<SplashScreenWidget *> m_landscapeImageWidgets;
     bool m_splashScreenSticky = false;
     QColor m_splashScreenBackgroundColor;
     QCheckBox *m_stickyCheck = nullptr;