diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 05446d3760c..565fde8b51c 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -828,11 +828,6 @@ ProcessInterface *DockerDevice::createProcessInterface() const return new DockerProcessImpl(this->sharedFromThis(), d); } -ProcessList *DockerDevice::createProcessListModel(QObject *parent) const -{ - return new ProcessList(sharedFromThis(), parent); -} - DeviceTester *DockerDevice::createDeviceTester() const { return nullptr; diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h index e3e7bbf6b4b..596b047d0b8 100644 --- a/src/plugins/docker/dockerdevice.h +++ b/src/plugins/docker/dockerdevice.h @@ -74,7 +74,6 @@ public: Utils::ProcessInterface *createProcessInterface() const override; bool canCreateProcessModel() const override { return true; } - ProjectExplorer::ProcessList *createProcessListModel(QObject *parent) const override; bool hasDeviceTester() const override { return false; } ProjectExplorer::DeviceTester *createDeviceTester() const override; bool usableAsBuildDevice() const override; diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index bcd133488d7..98805597967 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -89,11 +89,6 @@ bool DesktopDevice::canCreateProcessModel() const return true; } -ProcessList *DesktopDevice::createProcessListModel(QObject *parent) const -{ - return new ProcessList(sharedFromThis(), parent); -} - DeviceProcessSignalOperation::Ptr DesktopDevice::signalOperation() const { return DeviceProcessSignalOperation::Ptr(new DesktopProcessSignalOperation()); diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.h b/src/plugins/projectexplorer/devicesupport/desktopdevice.h index bf5566d568c..f37c3f7f948 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.h @@ -26,7 +26,6 @@ public: IDeviceWidget *createWidget() override; bool canCreateProcessModel() const override; - ProcessList *createProcessListModel(QObject *parent) const override; DeviceProcessSignalOperation::Ptr signalOperation() const override; QUrl toolControlChannel(const ControlChannelHint &) const override; bool usableAsBuildDevice() const override; diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index 67545e6329c..b5d138dfc9b 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -187,7 +187,8 @@ void DeviceProcessesDialogPrivate::setDevice(const IDevice::ConstPtr &device) if (!device) return; - processList.reset(device->createProcessListModel()); + processList.reset(new ProcessList(device->sharedFromThis(), this)); + QTC_ASSERT(processList, return); proxyModel.setSourceModel(processList->model()); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index b35f8be9785..65a7d11f815 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -391,13 +391,6 @@ PortsGatheringMethod IDevice::portsGatheringMethod() const return {filePath("netstat"), {"-a", "-n"}}; }, &Port::parseFromCommandOutput}; -}; - -ProcessList *IDevice::createProcessListModel(QObject *parent) const -{ - Q_UNUSED(parent) - QTC_ASSERT(false, qDebug("This should not have been called..."); return nullptr); - return nullptr; } DeviceTester *IDevice::createDeviceTester() const diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 845acb94f83..2f1d60d288e 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -32,16 +32,14 @@ namespace Utils { class CommandLine; class DeviceFileAccess; class Environment; -class Icon; class PortList; class Port; -class ProcessInterface; class Process; +class ProcessInterface; } // Utils namespace ProjectExplorer { -class ProcessList; class FileTransferInterface; class FileTransferSetupData; class Kit; @@ -142,7 +140,6 @@ public: virtual PortsGatheringMethod portsGatheringMethod() const; virtual bool canCreateProcessModel() const { return false; } - virtual ProcessList *createProcessListModel(QObject *parent = nullptr) const; virtual bool hasDeviceTester() const { return false; } virtual DeviceTester *createDeviceTester() const; diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index a38f1c081a1..5883af8a4ae 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -995,11 +995,6 @@ IDeviceWidget *LinuxDevice::createWidget() return new Internal::GenericLinuxDeviceConfigurationWidget(sharedFromThis()); } -ProcessList *LinuxDevice::createProcessListModel(QObject *parent) const -{ - return new ProcessList(sharedFromThis(), parent); -} - DeviceTester *LinuxDevice::createDeviceTester() const { return new GenericLinuxDeviceTester; diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h index 36179c83ea8..d0a06219e8e 100644 --- a/src/plugins/remotelinux/linuxdevice.h +++ b/src/plugins/remotelinux/linuxdevice.h @@ -23,7 +23,6 @@ public: ProjectExplorer::IDeviceWidget *createWidget() override; bool canCreateProcessModel() const override { return true; } - ProjectExplorer::ProcessList *createProcessListModel(QObject *parent) const override; bool hasDeviceTester() const override { return true; } ProjectExplorer::DeviceTester *createDeviceTester() const override; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;