Device support: Use value semantics for Core::Id.

We had a mixed style until now (mostly using const refs). Use value
semantics everywhere for consistency and hope that the class never gets
heavier.

Change-Id: Ic9536f87b01a76252bd8643c8681b3dc9067a266
Reviewed-by: Tobias Hunger <[email protected]>

7 files changed, 13 insertions, 13 deletions

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;