ProjectExplorer: Remove IDevice::setDisplayName

also removes IDevice::setDefaultDisplayName

Change-Id: Ie8ac3d95ba1991a20720342de3bf6e97c6414ffa
Reviewed-by: <[email protected]>
Reviewed-by: Christian Kandeler <[email protected]>

16 files changed, 22 insertions, 36 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 155d30b8eba..08dc2ca0d15 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -151,7 +151,7 @@ AndroidDevice::AndroidDevice()
 {
     setupId(IDevice::AutoDetected, Constants::ANDROID_DEVICE_ID);
     setType(Constants::ANDROID_DEVICE_TYPE);
-    setDefaultDisplayName(Tr::tr("Run on Android"));
+    settings()->displayName.setDefaultValue(Tr::tr("Run on Android"));
     setDisplayType(Tr::tr("Android"));
     setMachineType(IDevice::Hardware);
     setOsType(OsType::OsTypeOtherUnix);
@@ -711,7 +711,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
 
         AndroidDevice *newDev = new AndroidDevice();
         newDev->setupId(IDevice::AutoDetected, deviceId);
-        newDev->setDisplayName(displayName);
+        newDev->settings()->displayName.setValue(displayName);
         newDev->setMachineType(item.type);
         newDev->setDeviceState(item.state);
 
@@ -792,7 +792,7 @@ void AndroidDeviceManager::HandleDevicesListChange(const QString &serialNumber)
         } else {
             AndroidDevice *newDev = new AndroidDevice();
             newDev->setupId(IDevice::AutoDetected, id);
-            newDev->setDisplayName(displayName);
+            newDev->settings()->displayName.setValue(displayName);
             newDev->setMachineType(IDevice::Hardware);
             newDev->setDeviceState(state);
 
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index a45423cc2c1..1a55c74fef2 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -167,7 +167,7 @@ ProjectExplorer::IDevice::Ptr AvdDialog::device() const
     using namespace ProjectExplorer;
     dev->setupId(IDevice::AutoDetected, deviceId);
     dev->setMachineType(IDevice::Emulator);
-    dev->setDisplayName(m_createdAvdInfo.name);
+    dev->settings()->displayName.setValue(m_createdAvdInfo.name);
     dev->setDeviceState(IDevice::DeviceConnected);
     dev->setExtraData(Constants::AndroidAvdName, m_createdAvdInfo.name);
     dev->setExtraData(Constants::AndroidCpuAbi, {m_createdAvdInfo.abi});
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
index 79df101ccf4..20b27d77e60 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
@@ -26,7 +26,7 @@ ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const
 {
     const auto dev = BareMetalDevice::create();
     dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
-    dev->setDisplayName(m_setupPage->configurationName());
+    dev->settings()->displayName.setDefaultValue(m_setupPage->configurationName());
     dev->setType(Constants::BareMetalOsType);
     dev->setMachineType(ProjectExplorer::IDevice::Hardware);
     dev->setDebugServerProviderId(m_setupPage->debugServerProviderId());
diff --git a/src/plugins/boot2qt/device-detection/devicedetector.cpp b/src/plugins/boot2qt/device-detection/devicedetector.cpp
index 78dfeb259de..10faa4fb3ca 100644
--- a/src/plugins/boot2qt/device-detection/devicedetector.cpp
+++ b/src/plugins/boot2qt/device-detection/devicedetector.cpp
@@ -82,7 +82,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
         const QString name = Tr::tr("Qt Debug Bridge device %1").arg(serial);
         QdbDevice::Ptr device = QdbDevice::create();
         device->setupId(IDevice::AutoDetected, deviceId);
-        device->setDisplayName(name);
+        device->settings()->displayName.setValue(name);
         device->setType(Qdb::Constants::QdbLinuxOsType);
         device->setMachineType(IDevice::Hardware);
 
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 68546d046e2..717a945e9ba 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -226,7 +226,7 @@ public:
     {
         QdbDevice::Ptr device = QdbDevice::create();
 
-        device->setDisplayName(settingsPage.deviceName());
+        device->settings()->displayName.setValue(settingsPage.deviceName());
         device->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
         device->setType(Constants::QdbLinuxOsType);
         device->setMachineType(ProjectExplorer::IDevice::Hardware);
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index ce63015d813..1344294c2cb 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -425,7 +425,8 @@ DockerDevice::DockerDevice(const DockerDeviceData &data)
     setupId(IDevice::ManuallyAdded);
     setType(Constants::DOCKER_DEVICE_TYPE);
     setMachineType(IDevice::Hardware);
-    setDisplayName(Tr::tr("Docker Image \"%1\" (%2)").arg(data.repoAndTag()).arg(data.imageId));
+    settings()->displayName.setDefaultValue(
+        Tr::tr("Docker Image \"%1\" (%2)").arg(data.repoAndTag()).arg(data.imageId));
     setAllowEmptyCommand(true);
 
     setOpenTerminal([this](const Environment &env, const FilePath &workingDir) {
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 6315f6d5817..f76f41db976 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -86,7 +86,7 @@ IosDevice::IosDevice(CtorHelper)
     : m_lastPort(Constants::IOS_DEVICE_PORT_START)
 {
     setType(Constants::IOS_DEVICE_TYPE);
-    setDefaultDisplayName(IosDevice::name());
+    settings()->displayName.setDefaultValue(IosDevice::name());
     setDisplayType(Tr::tr("iOS"));
     setMachineType(IDevice::Hardware);
     setOsType(Utils::OsTypeMac);
@@ -215,7 +215,7 @@ void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
     if (dev.isNull()) {
         auto newDev = new IosDevice(uid);
         if (!name.isNull())
-            newDev->setDisplayName(name);
+            newDev->settings()->displayName.setValue(name);
         qCDebug(detectLog) << "adding ios device " << uid;
         devManager->addDevice(IDevice::ConstPtr(newDev));
     } else if (dev->deviceState() != IDevice::DeviceConnected &&
@@ -285,7 +285,7 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
     }
     if (!skipUpdate) {
         if (info.contains(kDeviceName))
-            newDev->setDisplayName(info.value(kDeviceName));
+            newDev->settings()->displayName.setValue(info.value(kDeviceName));
         newDev->m_extraInfo = info;
         qCDebug(detectLog) << "updated info of ios device " << uid;
         dev = IDevice::ConstPtr(newDev);
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 301d8d087e8..185db8f429d 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -28,7 +28,7 @@ IosSimulator::IosSimulator(Id id)
     setType(Constants::IOS_SIMULATOR_TYPE);
     setMachineType(IDevice::Emulator);
     setOsType(Utils::OsTypeMac);
-    setDefaultDisplayName(Tr::tr("iOS Simulator"));
+    settings()->displayName.setDefaultValue(Tr::tr("iOS Simulator"));
     setDisplayType(Tr::tr("iOS Simulator"));
     setDeviceState(DeviceReadyToUse);
 }
diff --git a/src/plugins/mcusupport/mcusupportdevice.cpp b/src/plugins/mcusupport/mcusupportdevice.cpp
index 9e3118cab6a..ad611f265fe 100644
--- a/src/plugins/mcusupport/mcusupportdevice.cpp
+++ b/src/plugins/mcusupport/mcusupportdevice.cpp
@@ -16,7 +16,7 @@ McuSupportDevice::McuSupportDevice()
     setupId(IDevice::AutoDetected, Constants::DEVICE_ID);
     setType(Constants::DEVICE_TYPE);
     const QString displayNameAndType = Tr::tr("MCU Device");
-    setDefaultDisplayName(displayNameAndType);
+    settings()->displayName.setDefaultValue(displayNameAndType);
     setDisplayType(displayNameAndType);
     setDeviceState(IDevice::DeviceStateUnknown);
     setMachineType(IDevice::Hardware);
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index e895ee4f358..d7ffcf20981 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -258,7 +258,8 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device)
     }
 
     // TODO: make it thread safe?
-    device->setDisplayName(Utils::makeUniquelyNumbered(device->displayName(), names));
+    device->settings()->displayName.setValue(
+        Utils::makeUniquelyNumbered(device->displayName(), names));
 
     const int pos = d->indexForId(device->id());
 
@@ -563,7 +564,7 @@ void ProjectExplorerPlugin::testDeviceManager()
     TestDeviceFactory factory;
 
     TestDevice::Ptr dev = IDevice::Ptr(new TestDevice);
-    dev->setDisplayName(QLatin1String("blubbdiblubbfurz!"));
+    dev->settings()->displayName.setValue(QLatin1String("blubbdiblubbfurz!"));
     QVERIFY(dev->isAutoDetected());
     QCOMPARE(dev->deviceState(), IDevice::DeviceStateUnknown);
     QCOMPARE(dev->type(), TestDevice::testTypeId());
@@ -624,7 +625,7 @@ void ProjectExplorerPlugin::testDeviceManager()
     TestDevice::Ptr dev3 = IDevice::Ptr(new TestDevice);
     QVERIFY(dev->id() != dev3->id());
 
-    dev3->setDisplayName(dev->displayName());
+    dev3->settings()->displayName.setValue(dev->displayName());
     mgr->addDevice(dev3);
     QCOMPARE(mgr->deviceAt(mgr->deviceCount() - 1)->displayName(),
              QString(dev3->displayName() + QLatin1Char('2')));
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index ed794585e15..85d32b7a0eb 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -308,25 +308,11 @@ Environment IDevice::systemEnvironment() const
     return access->deviceEnvironment();
 }
 
-/*!
-    Specifies a free-text name for the device to be displayed in GUI elements.
-*/
-
 QString IDevice::displayName() const
 {
     return d->settings->displayName();
 }
 
-void IDevice::setDisplayName(const QString &name)
-{
-    settings()->displayName.setValue(name);
-}
-
-void IDevice::setDefaultDisplayName(const QString &name)
-{
-    settings()->displayName.setDefaultValue(name);
-}
-
 QString IDevice::displayType() const
 {
     return d->displayType;
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 12503f6b9a9..fb9366860e4 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -111,8 +111,6 @@ public:
     DeviceSettings *settings() const;
 
     QString displayName() const;
-    void setDisplayName(const QString &name);
-    void setDefaultDisplayName(const QString &name);
 
     // Provide some information on the device suitable for formated
     // output, e.g. in tool tips. Get a list of name value pairs.
diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp
index 9e35593b337..57ef6b0fcd4 100644
--- a/src/plugins/projectexplorer/kitaspects.cpp
+++ b/src/plugins/projectexplorer/kitaspects.cpp
@@ -1319,7 +1319,7 @@ void BuildDeviceKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *ex
     });
     expander->registerVariable("BuildDevice:Name", Tr::tr("Build device name"), [kit] {
         const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
-        return device ? device->displayName() : QString();
+        return device ? device->settings()->displayName() : QString();
     });
     expander
         ->registerFileVariables("BuildDevice::Root", Tr::tr("Build device root directory"), [kit] {
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index e355183c89d..5083fbb782a 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -62,7 +62,7 @@ public:
     QnxDevice()
     {
         setDisplayType(Tr::tr("QNX"));
-        setDefaultDisplayName(Tr::tr("QNX Device"));
+        settings()->displayName.setDefaultValue(Tr::tr("QNX Device"));
         setOsType(OsTypeOtherUnix);
         setupId(IDevice::ManuallyAdded);
         setType(Constants::QNX_QNX_OS_TYPE);
diff --git a/src/plugins/remotelinux/sshdevicewizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp
index 9606ecf434a..d73e146957e 100644
--- a/src/plugins/remotelinux/sshdevicewizard.cpp
+++ b/src/plugins/remotelinux/sshdevicewizard.cpp
@@ -76,7 +76,7 @@ private:
                && !m_userNameLineEdit->text().trimmed().isEmpty();
     }
     bool validatePage() final {
-        m_device->setDisplayName(m_nameLineEdit->text().trimmed());
+        m_device->settings()->displayName.setValue(m_nameLineEdit->text().trimmed());
         SshParameters sshParams = m_device->sshParameters();
         sshParams.setHost(m_hostNameLineEdit->text().trimmed());
         sshParams.setUserName(m_userNameLineEdit->text().trimmed());
diff --git a/src/plugins/webassembly/webassemblydevice.cpp b/src/plugins/webassembly/webassemblydevice.cpp
index 643dea0edbf..c3f16926310 100644
--- a/src/plugins/webassembly/webassemblydevice.cpp
+++ b/src/plugins/webassembly/webassemblydevice.cpp
@@ -16,7 +16,7 @@ WebAssemblyDevice::WebAssemblyDevice()
     setupId(IDevice::AutoDetected, Constants::WEBASSEMBLY_DEVICE_DEVICE_ID);
     setType(Constants::WEBASSEMBLY_DEVICE_TYPE);
     const QString displayNameAndType = Tr::tr("Web Browser");
-    setDefaultDisplayName(displayNameAndType);
+    settings()->displayName.setDefaultValue(displayNameAndType);
     setDisplayType(displayNameAndType);
     setDeviceState(IDevice::DeviceStateUnknown);
     setMachineType(IDevice::Hardware);