From f6cb6383457ccf8021b2df7e7cd9d760dcfc9fea Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 26 Jan 2022 13:02:49 +0100 Subject: [PATCH] ProjectExplorer: Make Tasks a QList, not a QVector That's what it is going to be in Qt6 anyways. Change-Id: I8a059fc0e4d8bb5a1e3138071613b1d72a08d15b Reviewed-by: Christian Stenger --- src/plugins/docker/dockerdevice.h | 2 +- src/plugins/projectexplorer/devicesupport/idevice.cpp | 2 +- src/plugins/projectexplorer/devicesupport/idevice.h | 2 +- src/plugins/projectexplorer/task.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h index 914fbabcb0e..1846c4f95f0 100644 --- a/src/plugins/docker/dockerdevice.h +++ b/src/plugins/docker/dockerdevice.h @@ -62,7 +62,7 @@ public: static Ptr create(const DockerDeviceData &data) { return Ptr(new DockerDevice(data)); } ProjectExplorer::IDeviceWidget *createWidget() override; - QVector validate() const override; + QList validate() const override; bool canCreateProcess() const override { return true; } ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const override; diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index f9c91dea1a0..4977cafac41 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -543,7 +543,7 @@ bool IDevice::isCompatibleWith(const Kit *k) const return DeviceTypeKitAspect::deviceTypeId(k) == type(); } -QVector IDevice::validate() const +QList IDevice::validate() const { return {}; } diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 7b7f1e572e4..144daffbfda 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -159,7 +159,7 @@ public: Utils::Id id() const; virtual bool isCompatibleWith(const Kit *k) const; - virtual QVector validate() const; + virtual QList validate() const; QString displayType() const; Utils::OsType osType() const; diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index 52cebcfc04a..1e9aa84dbb5 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -138,7 +138,7 @@ public: DeploymentTask(TaskType type, const QString &description); }; -using Tasks = QVector; +using Tasks = QList; PROJECTEXPLORER_EXPORT QString toHtml(const Tasks &issues); PROJECTEXPLORER_EXPORT bool containsType(const Tasks &issues, Task::TaskType);