Commit ba30a565 authored by Alessandro Portale's avatar Alessandro Portale

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's avatarTobias Hunger <tobias.hunger@qt.io>
parent 49e255c4
......@@ -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;
......
......@@ -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;
......
......@@ -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()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment