aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2022-11-22 10:29:50 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2022-11-29 13:34:31 +0000
commitac966d7bb9829e7bb2ec9e9dd59fcf68fd3b23f9 (patch)
tree9f49dbdac0475c99ab16f52293f6197461379fc7
parentac760f8e4ac4efe1731f4c76a6dd624a8c237ab6 (diff)
IDevice: Provide default implementation for signalOperation()
Don't repeat implementation returning nullptr in derived classes. Change-Id: I437f5d206464bf92706cd135d793438f46455ad6 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r--src/plugins/baremetal/baremetaldevice.cpp5
-rw-r--r--src/plugins/baremetal/baremetaldevice.h2
-rw-r--r--src/plugins/docker/dockerdevice.cpp10
-rw-r--r--src/plugins/docker/dockerdevice.h2
-rw-r--r--src/plugins/ios/iosdevice.cpp5
-rw-r--r--src/plugins/ios/iosdevice.h1
-rw-r--r--src/plugins/ios/iossimulator.cpp5
-rw-r--r--src/plugins/ios/iossimulator.h1
-rw-r--r--src/plugins/projectexplorer/devicesupport/devicemanager.cpp4
-rw-r--r--src/plugins/projectexplorer/devicesupport/idevice.cpp7
-rw-r--r--src/plugins/projectexplorer/devicesupport/idevice.h2
11 files changed, 7 insertions, 37 deletions
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index 7b79b990fd..609b76de71 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -86,11 +86,6 @@ QVariantMap BareMetalDevice::toMap() const
return map;
}
-DeviceProcessSignalOperation::Ptr BareMetalDevice::signalOperation() const
-{
- return DeviceProcessSignalOperation::Ptr();
-}
-
IDeviceWidget *BareMetalDevice::createWidget()
{
return new BareMetalDeviceConfigurationWidget(sharedFromThis());
diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h
index 6fcc1972b3..462baa87f6 100644
--- a/src/plugins/baremetal/baremetaldevice.h
+++ b/src/plugins/baremetal/baremetaldevice.h
@@ -26,8 +26,6 @@ public:
ProjectExplorer::IDeviceWidget *createWidget() final;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const final;
-
QString debugServerProviderId() const;
void setDebugServerProviderId(const QString &id);
void unregisterDebugServerProvider(IDebugServerProvider *provider);
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 5ca1037249..4aa38e46d2 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -756,16 +756,6 @@ DeviceTester *DockerDevice::createDeviceTester() const
return nullptr;
}
-DeviceProcessSignalOperation::Ptr DockerDevice::signalOperation() const
-{
- return DeviceProcessSignalOperation::Ptr();
-}
-
-DeviceEnvironmentFetcher::Ptr DockerDevice::environmentFetcher() const
-{
- return DeviceEnvironmentFetcher::Ptr();
-}
-
bool DockerDevice::usableAsBuildDevice() const
{
return true;
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index 2119587c7b..14a1a074d7 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -76,8 +76,6 @@ public:
ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const override;
bool hasDeviceTester() const override { return false; }
ProjectExplorer::DeviceTester *createDeviceTester() const override;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
- ProjectExplorer::DeviceEnvironmentFetcher::Ptr environmentFetcher() const override;
bool usableAsBuildDevice() const override;
Utils::FilePath mapToGlobalPath(const Utils::FilePath &pathOnDevice) const override;
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 277bfbfbca..cf5bd9763f 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -123,11 +123,6 @@ IDeviceWidget *IosDevice::createWidget()
return new IosDeviceInfoWidget(sharedFromThis());
}
-DeviceProcessSignalOperation::Ptr IosDevice::signalOperation() const
-{
- return DeviceProcessSignalOperation::Ptr();
-}
-
void IosDevice::fromMap(const QVariantMap &map)
{
IDevice::fromMap(map);
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 0fcca09c19..90f1469224 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -31,7 +31,6 @@ public:
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
ProjectExplorer::IDeviceWidget *createWidget() override;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
QString deviceName() const;
QString uniqueDeviceID() const;
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 5d9c834eac..4e2f29e769 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -47,11 +47,6 @@ IDeviceWidget *IosSimulator::createWidget()
return nullptr;
}
-DeviceProcessSignalOperation::Ptr IosSimulator::signalOperation() const
-{
- return DeviceProcessSignalOperation::Ptr();
-}
-
Utils::Port IosSimulator::nextPort() const
{
for (int i = 0; i < 100; ++i) {
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index d4555495c6..7d27c7ed7c 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -50,7 +50,6 @@ public:
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
ProjectExplorer::IDeviceWidget *createWidget() override;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
Utils::Port nextPort() const;
bool canAutoDetectPorts() const override;
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 97eb50b8ff..9dff261e2c 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -522,10 +522,6 @@ public:
static Utils::Id testTypeId() { return "TestType"; }
private:
IDeviceWidget *createWidget() override { return nullptr; }
- DeviceProcessSignalOperation::Ptr signalOperation() const override
- {
- return DeviceProcessSignalOperation::Ptr();
- }
};
class TestDeviceFactory final : public IDeviceFactory
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 2845e4defe..7bf8af38c1 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -396,9 +396,14 @@ OsType IDevice::osType() const
return d->osType;
}
+DeviceProcessSignalOperation::Ptr IDevice::signalOperation() const
+{
+ return {};
+}
+
DeviceEnvironmentFetcher::Ptr IDevice::environmentFetcher() const
{
- return DeviceEnvironmentFetcher::Ptr();
+ return {};
}
IDevice::DeviceState IDevice::deviceState() const
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 71528bfb83..cc91ae00f2 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -162,7 +162,7 @@ public:
virtual bool hasDeviceTester() const { return false; }
virtual DeviceTester *createDeviceTester() const;
- virtual DeviceProcessSignalOperation::Ptr signalOperation() const = 0;
+ virtual DeviceProcessSignalOperation::Ptr signalOperation() const;
virtual DeviceEnvironmentFetcher::Ptr environmentFetcher() const;
enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };