forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -86,11 +86,6 @@ QVariantMap BareMetalDevice::toMap() const
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceProcessSignalOperation::Ptr BareMetalDevice::signalOperation() const
|
|
||||||
{
|
|
||||||
return DeviceProcessSignalOperation::Ptr();
|
|
||||||
}
|
|
||||||
|
|
||||||
IDeviceWidget *BareMetalDevice::createWidget()
|
IDeviceWidget *BareMetalDevice::createWidget()
|
||||||
{
|
{
|
||||||
return new BareMetalDeviceConfigurationWidget(sharedFromThis());
|
return new BareMetalDeviceConfigurationWidget(sharedFromThis());
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ public:
|
|||||||
|
|
||||||
ProjectExplorer::IDeviceWidget *createWidget() final;
|
ProjectExplorer::IDeviceWidget *createWidget() final;
|
||||||
|
|
||||||
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const final;
|
|
||||||
|
|
||||||
QString debugServerProviderId() const;
|
QString debugServerProviderId() const;
|
||||||
void setDebugServerProviderId(const QString &id);
|
void setDebugServerProviderId(const QString &id);
|
||||||
void unregisterDebugServerProvider(IDebugServerProvider *provider);
|
void unregisterDebugServerProvider(IDebugServerProvider *provider);
|
||||||
|
|||||||
@@ -756,16 +756,6 @@ DeviceTester *DockerDevice::createDeviceTester() const
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceProcessSignalOperation::Ptr DockerDevice::signalOperation() const
|
|
||||||
{
|
|
||||||
return DeviceProcessSignalOperation::Ptr();
|
|
||||||
}
|
|
||||||
|
|
||||||
DeviceEnvironmentFetcher::Ptr DockerDevice::environmentFetcher() const
|
|
||||||
{
|
|
||||||
return DeviceEnvironmentFetcher::Ptr();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DockerDevice::usableAsBuildDevice() const
|
bool DockerDevice::usableAsBuildDevice() const
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -76,8 +76,6 @@ public:
|
|||||||
ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const override;
|
ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const override;
|
||||||
bool hasDeviceTester() const override { return false; }
|
bool hasDeviceTester() const override { return false; }
|
||||||
ProjectExplorer::DeviceTester *createDeviceTester() const override;
|
ProjectExplorer::DeviceTester *createDeviceTester() const override;
|
||||||
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
|
|
||||||
ProjectExplorer::DeviceEnvironmentFetcher::Ptr environmentFetcher() const override;
|
|
||||||
bool usableAsBuildDevice() const override;
|
bool usableAsBuildDevice() const override;
|
||||||
|
|
||||||
Utils::FilePath mapToGlobalPath(const Utils::FilePath &pathOnDevice) const override;
|
Utils::FilePath mapToGlobalPath(const Utils::FilePath &pathOnDevice) const override;
|
||||||
|
|||||||
@@ -123,11 +123,6 @@ IDeviceWidget *IosDevice::createWidget()
|
|||||||
return new IosDeviceInfoWidget(sharedFromThis());
|
return new IosDeviceInfoWidget(sharedFromThis());
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceProcessSignalOperation::Ptr IosDevice::signalOperation() const
|
|
||||||
{
|
|
||||||
return DeviceProcessSignalOperation::Ptr();
|
|
||||||
}
|
|
||||||
|
|
||||||
void IosDevice::fromMap(const QVariantMap &map)
|
void IosDevice::fromMap(const QVariantMap &map)
|
||||||
{
|
{
|
||||||
IDevice::fromMap(map);
|
IDevice::fromMap(map);
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public:
|
|||||||
|
|
||||||
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
|
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
|
||||||
ProjectExplorer::IDeviceWidget *createWidget() override;
|
ProjectExplorer::IDeviceWidget *createWidget() override;
|
||||||
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
|
|
||||||
|
|
||||||
QString deviceName() const;
|
QString deviceName() const;
|
||||||
QString uniqueDeviceID() const;
|
QString uniqueDeviceID() const;
|
||||||
|
|||||||
@@ -47,11 +47,6 @@ IDeviceWidget *IosSimulator::createWidget()
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceProcessSignalOperation::Ptr IosSimulator::signalOperation() const
|
|
||||||
{
|
|
||||||
return DeviceProcessSignalOperation::Ptr();
|
|
||||||
}
|
|
||||||
|
|
||||||
Utils::Port IosSimulator::nextPort() const
|
Utils::Port IosSimulator::nextPort() const
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 100; ++i) {
|
for (int i = 0; i < 100; ++i) {
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ public:
|
|||||||
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
|
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
|
||||||
|
|
||||||
ProjectExplorer::IDeviceWidget *createWidget() override;
|
ProjectExplorer::IDeviceWidget *createWidget() override;
|
||||||
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
|
|
||||||
Utils::Port nextPort() const;
|
Utils::Port nextPort() const;
|
||||||
bool canAutoDetectPorts() const override;
|
bool canAutoDetectPorts() const override;
|
||||||
|
|
||||||
|
|||||||
@@ -522,10 +522,6 @@ public:
|
|||||||
static Utils::Id testTypeId() { return "TestType"; }
|
static Utils::Id testTypeId() { return "TestType"; }
|
||||||
private:
|
private:
|
||||||
IDeviceWidget *createWidget() override { return nullptr; }
|
IDeviceWidget *createWidget() override { return nullptr; }
|
||||||
DeviceProcessSignalOperation::Ptr signalOperation() const override
|
|
||||||
{
|
|
||||||
return DeviceProcessSignalOperation::Ptr();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class TestDeviceFactory final : public IDeviceFactory
|
class TestDeviceFactory final : public IDeviceFactory
|
||||||
|
|||||||
@@ -396,9 +396,14 @@ OsType IDevice::osType() const
|
|||||||
return d->osType;
|
return d->osType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DeviceProcessSignalOperation::Ptr IDevice::signalOperation() const
|
||||||
|
{
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
DeviceEnvironmentFetcher::Ptr IDevice::environmentFetcher() const
|
DeviceEnvironmentFetcher::Ptr IDevice::environmentFetcher() const
|
||||||
{
|
{
|
||||||
return DeviceEnvironmentFetcher::Ptr();
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
IDevice::DeviceState IDevice::deviceState() const
|
IDevice::DeviceState IDevice::deviceState() const
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ public:
|
|||||||
virtual bool hasDeviceTester() const { return false; }
|
virtual bool hasDeviceTester() const { return false; }
|
||||||
virtual DeviceTester *createDeviceTester() const;
|
virtual DeviceTester *createDeviceTester() const;
|
||||||
|
|
||||||
virtual DeviceProcessSignalOperation::Ptr signalOperation() const = 0;
|
virtual DeviceProcessSignalOperation::Ptr signalOperation() const;
|
||||||
virtual DeviceEnvironmentFetcher::Ptr environmentFetcher() const;
|
virtual DeviceEnvironmentFetcher::Ptr environmentFetcher() const;
|
||||||
|
|
||||||
enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };
|
enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };
|
||||||
|
|||||||
Reference in New Issue
Block a user