diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2016-11-17 15:12:45 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-11-30 14:33:21 +0000 |
| commit | ba30a5654db341ac5b90112b74b6000ef0b4f939 (patch) | |
| tree | 292bba60a6e329a921336eeb45f764ce1ade1ae0 /src | |
| parent | 49e255c4d5bb09f25db389b3ea1350d6b1965353 (diff) | |
| download | qt-creator-ba30a5654db341ac5b90112b74b6000ef0b4f939.tar.gz | |
ProjectExplorer: Remove IDevice::[set]Icon
It turned out that IDeviceFactory::iconForId is a better solution which
supercedes the IDevice specific icon.
Change-Id: I82cd7aefc97e515849d00f59b87a8ba34082d0a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/idevice.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/idevice.h | 3 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/kit.cpp | 9 |
3 files changed, 0 insertions, 22 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 1cd551fc09..367e6eff53 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -401,16 +401,6 @@ QString IDevice::deviceStateToString() const } } -void IDevice::setDeviceIcon(const QList<Utils::Icon> &deviceIcon) -{ - d->deviceIcons = deviceIcon; -} - -QIcon IDevice::deviceIcon() const -{ - return Utils::Icon::combinedIcon(d->deviceIcons); -} - QSsh::SshConnectionParameters IDevice::sshParameters() const { return d->sshParameters; diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 60ee576605..835c909d8e 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -167,9 +167,6 @@ public: void setDeviceState(const DeviceState state); QString deviceStateToString() const; - void setDeviceIcon(const QList<Utils::Icon> &deviceIcon); - QIcon deviceIcon() const; - virtual void fromMap(const QVariantMap &map); virtual QVariantMap toMap() const; virtual Ptr clone() const = 0; diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 27467c58b7..515fd6caaf 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -377,15 +377,6 @@ QIcon Kit::icon() const return d->m_cachedIcon; } - const IDevice::ConstPtr kitDevice = DeviceKitInformation::device(this); - if (!kitDevice.isNull()) { - const QIcon deviceIcon = kitDevice->deviceIcon(); - if (!deviceIcon.isNull()) { - d->m_cachedIcon = deviceIcon; - return d->m_cachedIcon; - } - } - const Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(this); const QIcon deviceTypeIcon = iconForDeviceType(deviceType); if (!deviceTypeIcon.isNull()) { |