From e7321e98b857384980b7dc55cfe6b58c38e028b6 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 23 Jan 2023 17:50:09 +0100 Subject: [PATCH] ProjectExplorer: devicemanager.cpp code cosmetics Unused code, namespaces. Change-Id: I6efcf3dc9b6aa9a030b92b7a116b1fcaf7b0823d Reviewed-by: Christian Kandeler --- .../devicesupport/devicemanager.cpp | 66 ++++++++----------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 6448b085b8d..e6ecfe4659b 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -5,30 +5,22 @@ #include "idevicefactory.h" #include "../projectexplorertr.h" +#include "../projectexplorerconstants.h" #include -#include - -#include #include #include #include -#include #include #include -#include #include #include #include -#include -#include #include -#include #include #include -#include #include #include @@ -43,14 +35,12 @@ const char DeviceManagerKey[] = "DeviceManager"; const char DeviceListKey[] = "DeviceList"; const char DefaultDevicesKey[] = "DefaultDevices"; -template using Continuation = std::function; - class DeviceManagerPrivate { public: DeviceManagerPrivate() = default; - int indexForId(Utils::Id id) const + int indexForId(Id id) const { for (int i = 0; i < devices.count(); ++i) { if (devices.at(i)->id() == id) @@ -69,8 +59,8 @@ public: mutable QMutex mutex; QList devices; - QHash defaultDevices; - Utils::PersistentSettingsWriter *writer = nullptr; + QHash defaultDevices; + PersistentSettingsWriter *writer = nullptr; }; DeviceManager *DeviceManagerPrivate::clonedInstance = nullptr; @@ -161,9 +151,9 @@ void DeviceManager::load() // Only create writer now: We do not want to save before the settings were read! d->writer = new PersistentSettingsWriter(settingsFilePath("devices.xml"), "QtCreatorDevices"); - Utils::PersistentSettingsReader reader; + PersistentSettingsReader reader; // read devices file from global settings path - QHash defaultDevices; + QHash defaultDevices; QList sdkDevices; if (reader.load(systemSettingsFilePath("devices.xml"))) sdkDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices); @@ -200,7 +190,7 @@ void DeviceManager::load() static const IDeviceFactory *restoreFactory(const QVariantMap &map) { - const Utils::Id deviceType = IDevice::typeFromMap(map); + const Id deviceType = IDevice::typeFromMap(map); IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(), [&map, deviceType](IDeviceFactory *factory) { return factory->canRestore(map) && factory->deviceType() == deviceType; @@ -213,15 +203,14 @@ static const IDeviceFactory *restoreFactory(const QVariantMap &map) return factory; } -QList DeviceManager::fromMap(const QVariantMap &map, - QHash *defaultDevices) +QList DeviceManager::fromMap(const QVariantMap &map, QHash *defaultDevices) { QList devices; if (defaultDevices) { const QVariantMap defaultDevsMap = map.value(DefaultDevicesKey).toMap(); for (auto it = defaultDevsMap.constBegin(); it != defaultDevsMap.constEnd(); ++it) - defaultDevices->insert(Utils::Id::fromString(it.key()), Utils::Id::fromSetting(it.value())); + defaultDevices->insert(Id::fromString(it.key()), Id::fromSetting(it.value())); } const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList(); for (const QVariant &v : deviceList) { @@ -241,11 +230,9 @@ QVariantMap DeviceManager::toMap() const { QVariantMap map; QVariantMap defaultDeviceMap; - using TypeIdHash = QHash; - for (TypeIdHash::ConstIterator it = d->defaultDevices.constBegin(); - it != d->defaultDevices.constEnd(); ++it) { + for (auto it = d->defaultDevices.constBegin(); it != d->defaultDevices.constEnd(); ++it) defaultDeviceMap.insert(it.key().toString(), it.value().toSetting()); - } + map.insert(QLatin1String(DefaultDevicesKey), defaultDeviceMap); QVariantList deviceList; for (const IDevice::Ptr &device : std::as_const(d->devices)) @@ -287,31 +274,29 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device) } emit deviceAdded(device->id()); - if (FSEngine::isAvailable()) { - Utils::FSEngine::addDevice(device->rootPath()); - } + if (FSEngine::isAvailable()) + FSEngine::addDevice(device->rootPath()); } emit updated(); } -void DeviceManager::removeDevice(Utils::Id id) +void DeviceManager::removeDevice(Id id) { const IDevice::Ptr device = mutableDevice(id); QTC_ASSERT(device, return); QTC_ASSERT(this != instance() || device->isAutoDetected(), return); const bool wasDefault = d->defaultDevices.value(device->type()) == device->id(); - const Utils::Id deviceType = device->type(); + const Id deviceType = device->type(); { QMutexLocker locker(&d->mutex); d->devices.removeAt(d->indexForId(id)); } emit deviceRemoved(device->id()); - if (FSEngine::isAvailable()) { - Utils::FSEngine::removeDevice(device->rootPath()); - } + if (FSEngine::isAvailable()) + FSEngine::removeDevice(device->rootPath()); if (wasDefault) { for (int i = 0; i < d->devices.count(); ++i) { @@ -328,7 +313,7 @@ void DeviceManager::removeDevice(Utils::Id id) emit updated(); } -void DeviceManager::setDeviceState(Utils::Id deviceId, IDevice::DeviceState deviceState) +void DeviceManager::setDeviceState(Id deviceId, IDevice::DeviceState deviceState) { // To see the state change in the DeviceSettingsWidget. This has to happen before // the pos check below, in case the device is only present in the cloned instance. @@ -379,7 +364,7 @@ IDevice::ConstPtr DeviceManager::defaultDesktopDevice() return m_instance->defaultDevice(Constants::DESKTOP_DEVICE_TYPE); } -void DeviceManager::setDefaultDevice(Utils::Id id) +void DeviceManager::setDefaultDevice(Id id) { QTC_ASSERT(this != instance(), return); @@ -482,7 +467,7 @@ IDevice::ConstPtr DeviceManager::deviceAt(int idx) const return d->devices.at(idx); } -IDevice::Ptr DeviceManager::mutableDevice(Utils::Id id) const +IDevice::Ptr DeviceManager::mutableDevice(Id id) const { const int index = d->indexForId(id); return index == -1 ? IDevice::Ptr() : d->devices.at(index); @@ -495,15 +480,15 @@ bool DeviceManager::hasDevice(const QString &name) const }); } -IDevice::ConstPtr DeviceManager::find(Utils::Id id) const +IDevice::ConstPtr DeviceManager::find(Id id) const { const int index = d->indexForId(id); return index == -1 ? IDevice::ConstPtr() : deviceAt(index); } -IDevice::ConstPtr DeviceManager::defaultDevice(Utils::Id deviceType) const +IDevice::ConstPtr DeviceManager::defaultDevice(Id deviceType) const { - const Utils::Id id = d->defaultDevices.value(deviceType); + const Id id = d->defaultDevices.value(deviceType); return id.isValid() ? find(id) : IDevice::ConstPtr(); } @@ -523,14 +508,15 @@ class TestDevice : public IDevice public: TestDevice() { - setupId(AutoDetected, Utils::Id::fromString(QUuid::createUuid().toString())); + setupId(AutoDetected, Id::fromString(QUuid::createUuid().toString())); setType(testTypeId()); setMachineType(Hardware); setOsType(HostOsInfo::hostOs()); setDisplayType("blubb"); } - static Utils::Id testTypeId() { return "TestType"; } + static Id testTypeId() { return "TestType"; } + private: IDeviceWidget *createWidget() override { return nullptr; } };