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

KitInformation: Simplify code a bit.

Browse Source 
Change-Id: I0b77381be19b7a84dcef680145ffce5cf4711d9a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-02-28 17:07:05 +01:00
parent a6dba15396
commit f65abb7147
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -429,8 +429,7 @@ KitInformation::ItemList DeviceKitInformation::toUserOutput(Kit *k) const
IDevice::ConstPtr DeviceKitInformation::device(const Kit *k) IDevice::ConstPtr DeviceKitInformation::device(const Kit *k)
{ {
QTC_ASSERT(DeviceManager::instance()->isLoaded(), return IDevice::ConstPtr()); QTC_ASSERT(DeviceManager::instance()->isLoaded(), return IDevice::ConstPtr());
DeviceManager *dm = DeviceManager::instance(); return DeviceManager::instance()->find(deviceId(k));
return dm ? dm->find(deviceId(k)) : IDevice::ConstPtr();
} }
Core::Id DeviceKitInformation::deviceId(const Kit *k) Core::Id DeviceKitInformation::deviceId(const Kit *k)