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

Use ranged for loop in DeviceManager

Browse Source 
Change-Id: Ic3017de13be1cdff63d800bfe94af46055d93b54
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-12-22 14:59:02 +01:00
parent 42abef3434
commit 035ba1c10e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ void DeviceManager::replaceInstance()
const QList<Id> newIds = const QList<Id> newIds =
Utils::transform(DeviceManagerPrivate::clonedInstance->d->devices, &IDevice::id); Utils::transform(DeviceManagerPrivate::clonedInstance->d->devices, &IDevice::id);
for (IDevice::Ptr dev : m_instance->d->devices) { for (const IDevice::ConstPtr &dev : qAsConst(m_instance->d->devices)) {
if (!newIds.contains(dev->id())) if (!newIds.contains(dev->id()))
dev->aboutToBeRemoved(); dev->aboutToBeRemoved();
} }
@@ -132,7 +132,7 @@ DeviceManager *DeviceManager::cloneInstance()
void DeviceManager::copy(const DeviceManager *source, DeviceManager *target, bool deep) void DeviceManager::copy(const DeviceManager *source, DeviceManager *target, bool deep)
{ {
if (deep) { if (deep) {
foreach (const IDevice::ConstPtr &device, source->d->devices) for (const IDevice::ConstPtr &device : qAsConst(source->d->devices))
target->d->devices << device->clone(); target->d->devices << device->clone();
} else { } else {
target->d->devices = source->d->devices; target->d->devices = source->d->devices;
@@ -178,8 +178,8 @@ void DeviceManager::load()
userDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices); userDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices);
// Insert devices into the model. Prefer the higher device version when there are multiple // Insert devices into the model. Prefer the higher device version when there are multiple
// devices with the same id. // devices with the same id.
foreach (IDevice::Ptr device, userDevices) { for (IDevice::ConstPtr device : qAsConst(userDevices)) {
foreach (const IDevice::Ptr &sdkDevice, sdkDevices) { for (const IDevice::Ptr &sdkDevice : qAsConst(sdkDevices)) {
if (device->id() == sdkDevice->id()) { if (device->id() == sdkDevice->id()) {
if (device->version() < sdkDevice->version()) if (device->version() < sdkDevice->version())
device = sdkDevice; device = sdkDevice;
@@ -190,7 +190,7 @@ void DeviceManager::load()
addDevice(device); addDevice(device);
} }
// Append the new SDK devices to the model. // Append the new SDK devices to the model.
foreach (const IDevice::Ptr &sdkDevice, sdkDevices) for (const IDevice::Ptr &sdkDevice : qAsConst(sdkDevices))
addDevice(sdkDevice); addDevice(sdkDevice);
// Overwrite with the saved default devices. // Overwrite with the saved default devices.
@@ -229,7 +229,7 @@ QList<IDevice::Ptr> DeviceManager::fromMap(const QVariantMap &map,
defaultDevices->insert(Utils::Id::fromString(it.key()), Utils::Id::fromSetting(it.value())); defaultDevices->insert(Utils::Id::fromString(it.key()), Utils::Id::fromSetting(it.value()));
} }
const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList(); const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList();
foreach (const QVariant &v, deviceList) { for (const QVariant &v : deviceList) {
const QVariantMap map = v.toMap(); const QVariantMap map = v.toMap();
const IDeviceFactory * const factory = restoreFactory(map); const IDeviceFactory * const factory = restoreFactory(map);
if (!factory) if (!factory)
@@ -253,7 +253,7 @@ QVariantMap DeviceManager::toMap() const
} }
map.insert(QLatin1String(DefaultDevicesKey), defaultDeviceMap); map.insert(QLatin1String(DefaultDevicesKey), defaultDeviceMap);
QVariantList deviceList; QVariantList deviceList;
foreach (const IDevice::ConstPtr &device, d->devices) for (const IDevice::ConstPtr &device : qAsConst(d->devices))
deviceList << device->toMap(); deviceList << device->toMap();
map.insert(QLatin1String(DeviceListKey), deviceList); map.insert(QLatin1String(DeviceListKey), deviceList);
return map; return map;
@@ -264,7 +264,7 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device)
const IDevice::Ptr device = _device->clone(); const IDevice::Ptr device = _device->clone();
QStringList names; QStringList names;
foreach (const IDevice::ConstPtr &tmp, d->devices) { for (const IDevice::ConstPtr &tmp : qAsConst(d->devices)) {
if (tmp->id() != device->id()) if (tmp->id() != device->id())
names << tmp->displayName(); names << tmp->displayName();
} }