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

ProjectExplorer: Remove IDevice::setDisplayName

Browse Source 
also removes IDevice::setDefaultDisplayName

Change-Id: Ie8ac3d95ba1991a20720342de3bf6e97c6414ffa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-07 14:04:19 +02:00
parent 96c21b0e36
commit 116ad3ed4f
16 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/ios/iosdevice.cpp
View File

@@ -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);

2
src/plugins/ios/iossimulator.cpp
View File

@@ -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);
}