feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use QList instead of QVector

Browse Source 
Change-Id: If4e163716e8ad5eac782d4b023dcb88fca0f8414
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-23 23:48:38 +02:00
parent 72f82f420a
commit 3fc5551465
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidavdmanager.cpp
View File

@@ -273,7 +273,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
QString AndroidAvdManager::findAvd(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) { for (const AndroidDeviceInfo &device : devices) {
if (device.type != ProjectExplorer::IDevice::Emulator) if (device.type != ProjectExplorer::IDevice::Emulator)
continue; continue;

8
src/plugins/android/androidconfigurations.cpp
View File

@@ -607,9 +607,9 @@ FilePath AndroidConfig::keytoolPath() const
return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix(); 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; Process adbProc;
CommandLine cmd{adbToolPath(), {"devices"}}; CommandLine cmd{adbToolPath(), {"devices"}};
adbProc.setCommand(cmd); adbProc.setCommand(cmd);
@@ -664,7 +664,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
bool AndroidConfig::isConnected(const QString &serialNumber) const bool AndroidConfig::isConnected(const QString &serialNumber) const
{ {
const QVector<AndroidDeviceInfo> devices = connectedDevices(); const QList<AndroidDeviceInfo> devices = connectedDevices();
for (const AndroidDeviceInfo &device : devices) { for (const AndroidDeviceInfo &device : devices) {
if (device.serialNumber == serialNumber) if (device.serialNumber == serialNumber)
return true; return true;
@@ -1225,7 +1225,7 @@ void AndroidConfigurations::removeUnusedDebuggers()
return v->type() == Constants::ANDROID_QT_TYPE; return v->type() == Constants::ANDROID_QT_TYPE;
}); });
QVector<FilePath> uniqueNdks; QList<FilePath> uniqueNdks;
for (const QtVersion *qt : qtVersions) { for (const QtVersion *qt : qtVersions) {
FilePath ndkLocation = androidConfig().ndkLocation(qt); FilePath ndkLocation = androidConfig().ndkLocation(qt);
if (!uniqueNdks.contains(ndkLocation)) if (!uniqueNdks.contains(ndkLocation))

6
src/plugins/android/androidconfigurations.h
View File

@@ -9,14 +9,14 @@
#include "androidsdkpackage.h" #include "androidsdkpackage.h"
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <utils/filepath.h> #include <utils/filepath.h>
#include <QStringList>
#include <QVector>
#include <QHash> #include <QHash>
#include <QMap> #include <QMap>
#include <QStringList>
#include <QVersionNumber> #include <QVersionNumber>
namespace ProjectExplorer { class Abi; } namespace ProjectExplorer { class Abi; }
@@ -114,7 +114,7 @@ public:
Utils::FilePath keytoolPath() const; 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; QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion) const;

4
src/plugins/android/androiddevice.cpp
View File

@@ -666,7 +666,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
{ {
DeviceManager *const devMgr = DeviceManager::instance(); DeviceManager *const devMgr = DeviceManager::instance();
QVector<Id> existingAvds; QList<Id> existingAvds;
for (int i = 0; i < devMgr->deviceCount(); ++i) { for (int i = 0; i < devMgr->deviceCount(); ++i) {
const IDevice::ConstPtr dev = devMgr->deviceAt(i); const IDevice::ConstPtr dev = devMgr->deviceAt(i);
const bool isEmulator = dev->machineType() == IDevice::Emulator; const bool isEmulator = dev->machineType() == IDevice::Emulator;
@@ -674,7 +674,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
existingAvds.append(dev->id()); existingAvds.append(dev->id());
} }
QVector<Id> connectedDevs; QList<Id> connectedDevs;
for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) { for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) {
const Id deviceId = AndroidDevice::idFromDeviceInfo(item); const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
const QString displayName = AndroidDevice::displayNameFromInfo(item); const QString displayName = AndroidDevice::displayNameFromInfo(item);

4
src/plugins/android/androidmanifesteditoriconcontainerwidget.h
View File

@@ -3,8 +3,8 @@
#pragma once #pragma once
#include <QList>
#include <QString> #include <QString>
#include <QVector>
#include <QWidget> #include <QWidget>
#include <QCoreApplication> #include <QCoreApplication>
@@ -30,7 +30,7 @@ public:
void loadIcons(); void loadIcons();
bool hasIcons() const; bool hasIcons() const;
private: private:
QVector<AndroidManifestEditorIconWidget *> m_iconButtons; QList<AndroidManifestEditorIconWidget *> m_iconButtons;
QString m_iconFileName = QLatin1String("icon"); QString m_iconFileName = QLatin1String("icon");
bool m_hasIcons = false; bool m_hasIcons = false;
signals: signals:

2
src/plugins/android/androidrunner.cpp
View File

@@ -35,7 +35,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
{ {
setId("AndroidRunner"); setId("AndroidRunner");
static const int metaTypes[] = { static const int metaTypes[] = {
qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"), qRegisterMetaType<QList<QStringList>>("QList<QStringList>"),
qRegisterMetaType<Utils::Port>("Utils::Port"), qRegisterMetaType<Utils::Port>("Utils::Port"),
qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo") qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
}; };

6
src/plugins/android/certificatesmodel.h
View File

@@ -5,7 +5,7 @@
#pragma once #pragma once
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QVector> #include <QList>
#include <QPair> #include <QPair>
namespace Android { namespace Android {
@@ -17,12 +17,12 @@ public:
CertificatesModel(const QString &rowCertificates, QObject *parent); CertificatesModel(const QString &rowCertificates, QObject *parent);
protected: 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; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
private: private:
QVector<QPair<QString, QString> > m_certs; QList<QPair<QString, QString>> m_certs;
}; };
} }

8
src/plugins/android/splashscreencontainerwidget.cpp
View File

@@ -73,7 +73,7 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
const QString &splashScreenPath, const QString &splashScreenPath,
int scalingRatio, int maxScalingRatio, int scalingRatio, int maxScalingRatio,
QHBoxLayout *pageLayout, QHBoxLayout *pageLayout,
QVector<SplashScreenWidget *> &widgetContainer) QList<SplashScreenWidget *> &widgetContainer)
{ {
auto splashScreenWidget = new SplashScreenWidget(page, auto splashScreenWidget = new SplashScreenWidget(page,
size, size,
@@ -90,9 +90,9 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
} }
static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget, static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget,
QVector<SplashScreenWidget *> &widgetContainer, QList<SplashScreenWidget *> &widgetContainer,
QVector<SplashScreenWidget *> &portraitWidgetContainer, QList<SplashScreenWidget *> &portraitWidgetContainer,
QVector<SplashScreenWidget *> &landscapeWidgetContainer, QList<SplashScreenWidget *> &landscapeWidgetContainer,
int scalingRatio, int scalingRatio,
const QSize &size, const QSize &size,
const QSize &portraitSize, const QSize &portraitSize,

8
src/plugins/android/splashscreencontainerwidget.h
View File

@@ -3,7 +3,7 @@
#pragma once #pragma once
#include <QVector> #include <QList>
#include <QStackedWidget> #include <QStackedWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -48,9 +48,9 @@ private:
void clearAll(); void clearAll();
TextEditor::TextEditorWidget *m_textEditorWidget = nullptr; TextEditor::TextEditorWidget *m_textEditorWidget = nullptr;
QVector<SplashScreenWidget *> m_imageWidgets; QList<SplashScreenWidget *> m_imageWidgets;
QVector<SplashScreenWidget *> m_portraitImageWidgets; QList<SplashScreenWidget *> m_portraitImageWidgets;
QVector<SplashScreenWidget *> m_landscapeImageWidgets; QList<SplashScreenWidget *> m_landscapeImageWidgets;
bool m_splashScreenSticky = false; bool m_splashScreenSticky = false;
QColor m_splashScreenBackgroundColor; QColor m_splashScreenBackgroundColor;
QCheckBox *m_stickyCheck = nullptr; QCheckBox *m_stickyCheck = nullptr;