diff options
Diffstat (limited to 'src')
13 files changed, 26 insertions, 27 deletions
diff --git a/src/plugins/madde/maddedevice.cpp b/src/plugins/madde/maddedevice.cpp index e92644536f6..81c70519d87 100644 --- a/src/plugins/madde/maddedevice.cpp +++ b/src/plugins/madde/maddedevice.cpp @@ -54,7 +54,7 @@ MaddeDevice::Ptr MaddeDevice::create() } MaddeDevice::Ptr MaddeDevice::create(const QString &name, const QString &type, - MachineType machineType, Origin origin, const Core::Id &id) + MachineType machineType, Origin origin, Core::Id id) { return Ptr(new MaddeDevice(name, type, machineType, origin, id)); } @@ -64,7 +64,7 @@ MaddeDevice::MaddeDevice() } MaddeDevice::MaddeDevice(const QString &name, const QString &type, MachineType machineType, - Origin origin, const Core::Id &id) + Origin origin, Core::Id id) : LinuxDeviceConfiguration(name, type, machineType, origin, id) { } diff --git a/src/plugins/madde/maddedevice.h b/src/plugins/madde/maddedevice.h index d63ef3233f5..b018628a853 100644 --- a/src/plugins/madde/maddedevice.h +++ b/src/plugins/madde/maddedevice.h @@ -48,7 +48,7 @@ public: static Ptr create(); static Ptr create(const QString &name, const QString &type, MachineType machineType, - Origin origin = ManuallyAdded, const Core::Id &id = Core::Id()); + Origin origin = ManuallyAdded, Core::Id id = Core::Id()); QString displayType() const; QStringList actionIds() const; @@ -60,7 +60,7 @@ public: private: MaddeDevice(); MaddeDevice(const QString &name, const QString &type, MachineType machineType, - Origin origin, const Core::Id &id); + Origin origin, Core::Id id); MaddeDevice(const MaddeDevice &other); }; diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 45cb93088aa..0d937f719ff 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -364,14 +364,14 @@ bool DeviceManager::hasDevice(const QString &name) const return false; } -IDevice::ConstPtr DeviceManager::find(const Core::Id &id) const +IDevice::ConstPtr DeviceManager::find(Core::Id id) const { const int index = indexForId(id); return index == -1 ? IDevice::ConstPtr() : deviceAt(index); } IDevice::ConstPtr DeviceManager::findInactiveAutoDetectedDevice(const QString &type, - const Core::Id id) + Core::Id id) { return findAutoDetectedDevice(d->inactiveAutoDetectedDevices, type, id); } @@ -384,7 +384,7 @@ IDevice::ConstPtr DeviceManager::defaultDevice(const QString &deviceType) const return find(id); } -int DeviceManager::indexForId(const Core::Id &id) const +int DeviceManager::indexForId(Core::Id id) const { for (int i = 0; i < d->devices.count(); ++i) { if (deviceAt(i)->id() == id) diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h index 03a0d4253e3..5ddd807a673 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h @@ -60,8 +60,8 @@ public: int deviceCount() const; IDevice::ConstPtr deviceAt(int index) const; - IDevice::ConstPtr find(const Core::Id &id) const; - IDevice::ConstPtr findInactiveAutoDetectedDevice(const QString &type, const Core::Id id); + IDevice::ConstPtr find(Core::Id id) const; + IDevice::ConstPtr findInactiveAutoDetectedDevice(const QString &type, Core::Id id); IDevice::ConstPtr defaultDevice(const QString &deviceType) const; bool hasDevice(const QString &name) const; Core::Id deviceId(const IDevice::ConstPtr &device) const; @@ -72,7 +72,7 @@ public: void removeDevice(int index); signals: - void deviceUpdated(const Core::Id &id); + void deviceUpdated(Core::Id id); void deviceAdded(const QSharedPointer<const IDevice> &device); void deviceRemoved(int index); @@ -91,7 +91,7 @@ private: void fromMap(const QVariantMap &map); QVariantMap toMap() const; void ensureOneDefaultDevicePerType(); - int indexForId(const Core::Id &id) const; + int indexForId(Core::Id id) const; // For SettingsWidget. IDevice::Ptr mutableDeviceAt(int index) const; diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 683c9377b2a..98557bb6374 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -167,8 +167,7 @@ IDevice::IDevice() : d(new Internal::IDevicePrivate) { } -IDevice::IDevice(const QString &type, Origin origin, const Core::Id &id) - : d(new Internal::IDevicePrivate) +IDevice::IDevice(const QString &type, Origin origin, Core::Id id) : d(new Internal::IDevicePrivate) { d->type = type; d->origin = origin; diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 1354a183e9d..5ff24583494 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -101,7 +101,7 @@ public: protected: IDevice(); - IDevice(const QString &type, Origin origin, const Core::Id &id = Core::Id()); + IDevice(const QString &type, Origin origin, Core::Id id = Core::Id()); IDevice(const IDevice &other); Ptr sharedFromThis(); diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp index e11c38f2526..c95a947a77f 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp @@ -84,7 +84,7 @@ LinuxDeviceConfiguration::~LinuxDeviceConfiguration() } LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QString &name, - const QString &type, MachineType machineType, Origin origin, const Core::Id &id) + const QString &type, MachineType machineType, Origin origin, Core::Id id) { return Ptr(new LinuxDeviceConfiguration(name, type, machineType, origin, id)); } @@ -140,7 +140,7 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration() : d(new LinuxDeviceConfigur } LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QString &type, - MachineType machineType, Origin origin, const Core::Id &id) + MachineType machineType, Origin origin, Core::Id id) : IDevice(type, origin, id), d(new LinuxDeviceConfigurationPrivate) { setDisplayName(name); diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h index b8043666a95..5a1d71fb39c 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.h +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h @@ -71,7 +71,7 @@ public: static Ptr create(); static Ptr create(const QString &name, const QString &type, MachineType machineType, - Origin origin = ManuallyAdded, const Core::Id &id = Core::Id()); + Origin origin = ManuallyAdded, Core::Id id = Core::Id()); QString displayType() const; ProjectExplorer::IDeviceWidget *createWidget(); @@ -84,7 +84,7 @@ public: protected: LinuxDeviceConfiguration(); LinuxDeviceConfiguration(const QString &name, const QString &type, MachineType machineType, - Origin origin, const Core::Id &id); + Origin origin, Core::Id id); LinuxDeviceConfiguration(const LinuxDeviceConfiguration &other); QVariantMap toMap() const; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index fdca61f8f04..5999bb09ebd 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -92,9 +92,9 @@ void RemoteLinuxDeployConfiguration::handleDeviceConfigurationListUpdated() setDeviceConfig(DeviceManager::instance()->deviceId(d->deviceConfiguration)); } -void RemoteLinuxDeployConfiguration::setDeviceConfig(const Core::Id &internalId) +void RemoteLinuxDeployConfiguration::setDeviceConfig(Core::Id id) { - d->deviceConfiguration = target()->deviceConfigModel()->find(internalId); + d->deviceConfiguration = target()->deviceConfigModel()->find(id); emit deviceConfigurationListChanged(); emit currentDeviceConfigurationChanged(); } diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index 740a79b8566..b000e2023e1 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -93,7 +93,7 @@ signals: private: void initialize(); - void setDeviceConfig(const Core::Id &internalId); + void setDeviceConfig(Core::Id id); Q_SLOT void handleDeviceConfigurationListUpdated(); Internal::RemoteLinuxDeployConfigurationPrivate * const d; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp index fd4ba389e38..f415a9d9d97 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp @@ -183,9 +183,9 @@ void RemoteLinuxDeployConfigurationWidget::handleDeviceConfigurationListChanged( { const LinuxDeviceConfiguration::ConstPtr &devConf = d->deployConfiguration->deviceConfiguration(); - const Core::Id &internalId = DeviceManager::instance()->deviceId(devConf); + const Core::Id id = DeviceManager::instance()->deviceId(devConf); const int newIndex - = d->deployConfiguration->target()->deviceConfigModel()->indexForInternalId(internalId); + = d->deployConfiguration->target()->deviceConfigModel()->indexForId(id); d->ui.deviceConfigsComboBox->setCurrentIndex(newIndex); } diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp index ef55ab7ca6b..a028c1a714e 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp @@ -109,7 +109,7 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::def return LinuxDeviceConfiguration::ConstPtr(); } -LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::find(const Core::Id &id) const +LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) const { const IDevice::ConstPtr &devConf = DeviceManager::instance()->find(id); if (devConf && target()->supportsDevice(devConf)) @@ -117,7 +117,7 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::fin return defaultDeviceConfig(); } -int TypeSpecificDeviceConfigurationListModel::indexForInternalId(const Core::Id &id) const +int TypeSpecificDeviceConfigurationListModel::indexForId(Core::Id id) const { const int count = rowCount(); for (int i = 0; i < count; ++i) { diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h index 9e61862c3da..e240bcd07f7 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h @@ -54,8 +54,8 @@ public: QSharedPointer<const LinuxDeviceConfiguration> deviceAt(int idx) const; QSharedPointer<const LinuxDeviceConfiguration> defaultDeviceConfig() const; - QSharedPointer<const LinuxDeviceConfiguration> find(const Core::Id &id) const; - int indexForInternalId(const Core::Id &id) const; + QSharedPointer<const LinuxDeviceConfiguration> find(Core::Id id) const; + int indexForId(Core::Id id) const; private: AbstractEmbeddedLinuxTarget * target() const; |