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

Devices: Add some 'override'

Browse Source 
Change-Id: I3dfc23dc5a1ea61c3fa24414f5337e156e5a6507
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2016-04-19 23:14:34 +02:00
parent 47afcd1a2e
commit 769abc8509
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androiddevice.h
View File

@@ -35,18 +35,18 @@ namespace Internal {
class AndroidDevice : public ProjectExplorer::IDevice class AndroidDevice : public ProjectExplorer::IDevice
{ {
public: public:
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const; ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
QString displayType() const; QString displayType() const override;
ProjectExplorer::IDeviceWidget *createWidget(); ProjectExplorer::IDeviceWidget *createWidget() override;
QList<Core::Id> actionIds() const; QList<Core::Id> actionIds() const override;
QString displayNameForActionId(Core::Id actionId) const; QString displayNameForActionId(Core::Id actionId) const override;
void executeAction(Core::Id actionId, QWidget *parent = 0); void executeAction(Core::Id actionId, QWidget *parent = 0) override;
bool canAutoDetectPorts() const; bool canAutoDetectPorts() const override;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
ProjectExplorer::IDevice::Ptr clone() const; ProjectExplorer::IDevice::Ptr clone() const override;
QString qmlProfilerHost() const; QString qmlProfilerHost() const override;
protected: protected:
friend class AndroidDeviceFactory; friend class AndroidDeviceFactory;

22
src/plugins/baremetal/baremetaldevice.h
View File

@@ -42,23 +42,23 @@ public:
Origin origin = ManuallyAdded, Core::Id id = Core::Id()); Origin origin = ManuallyAdded, Core::Id id = Core::Id());
static Ptr create(const BareMetalDevice &other); static Ptr create(const BareMetalDevice &other);
QString displayType() const; QString displayType() const override;
ProjectExplorer::IDeviceWidget *createWidget(); ProjectExplorer::IDeviceWidget *createWidget() override;
QList<Core::Id> actionIds() const; QList<Core::Id> actionIds() const override;
QString displayNameForActionId(Core::Id actionId) const; QString displayNameForActionId(Core::Id actionId) const override;
void executeAction(Core::Id actionId, QWidget *parent); void executeAction(Core::Id actionId, QWidget *parent) override;
ProjectExplorer::IDevice::Ptr clone() const; ProjectExplorer::IDevice::Ptr clone() const override;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
bool canCreateProcess() const { return true; } bool canCreateProcess() const override { return true; }
ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const; ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const override;
QString gdbServerProviderId() const; QString gdbServerProviderId() const;
void setGdbServerProviderId(const QString &id); void setGdbServerProviderId(const QString &id);
virtual void fromMap(const QVariantMap &map); virtual void fromMap(const QVariantMap &map) override;
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const override;
protected: protected:
BareMetalDevice() {} BareMetalDevice() {}

14
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -451,13 +451,13 @@ public:
static Core::Id testTypeId() { return "TestType"; } static Core::Id testTypeId() { return "TestType"; }
private: private:
TestDevice(const TestDevice &other) : IDevice(other) {} TestDevice(const TestDevice &other) : IDevice(other) {}
QString displayType() const { return QLatin1String("blubb"); } QString displayType() const override { return QLatin1String("blubb"); }
IDeviceWidget *createWidget() { return 0; } IDeviceWidget *createWidget() override { return 0; }
QList<Core::Id> actionIds() const { return QList<Core::Id>(); } QList<Core::Id> actionIds() const override { return QList<Core::Id>(); }
QString displayNameForActionId(Core::Id) const { return QString(); } QString displayNameForActionId(Core::Id) const override { return QString(); }
void executeAction(Core::Id, QWidget *) { } void executeAction(Core::Id, QWidget *) override { }
Ptr clone() const { return Ptr(new TestDevice(*this)); } Ptr clone() const override { return Ptr(new TestDevice(*this)); }
DeviceProcessSignalOperation::Ptr signalOperation() const DeviceProcessSignalOperation::Ptr signalOperation() const override
{ {
return DeviceProcessSignalOperation::Ptr(); return DeviceProcessSignalOperation::Ptr();
} }

18
src/plugins/winrt/winrtdevice.h
View File

@@ -45,15 +45,15 @@ public:
typedef QSharedPointer<WinRtDevice> Ptr; typedef QSharedPointer<WinRtDevice> Ptr;
typedef QSharedPointer<const WinRtDevice> ConstPtr; typedef QSharedPointer<const WinRtDevice> ConstPtr;
QString displayType() const; QString displayType() const override;
ProjectExplorer::IDeviceWidget *createWidget(); ProjectExplorer::IDeviceWidget *createWidget() override;
QList<Core::Id> actionIds() const; QList<Core::Id> actionIds() const override;
QString displayNameForActionId(Core::Id actionId) const; QString displayNameForActionId(Core::Id actionId) const override;
void executeAction(Core::Id actionId, QWidget *parent); void executeAction(Core::Id actionId, QWidget *parent) override;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
ProjectExplorer::IDevice::Ptr clone() const; ProjectExplorer::IDevice::Ptr clone() const override;
static QString displayNameForType(Core::Id type); static QString displayNameForType(Core::Id type);
int deviceId() const { return m_deviceId; } int deviceId() const { return m_deviceId; }