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

RemoteLinux: Simplify approach for id assignment.

Browse Source 
The current one is awkward and error-prone.

Change-Id: I9450b121d0f01c07507b8cc6d72cb2e1453cf02d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christian Kandeler
2012-03-02 14:08:43 +01:00
parent 5045852408
commit f7e127f740
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/remotelinux/linuxdeviceconfiguration.cpp
View File

@@ -94,10 +94,9 @@ LinuxDeviceConfiguration::~LinuxDeviceConfiguration()
delete d;
}
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QSettings &settings,
Id &nextId)
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QSettings &settings)
{
return Ptr(new LinuxDeviceConfiguration(settings, nextId));
return Ptr(new LinuxDeviceConfiguration(settings));
}
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const ConstPtr &other)
@@ -126,18 +125,14 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QS
d->attributes = attributes;
}
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings, Id &nextId)
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings)
: d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy))
{
d->origin = ManuallyAdded;
d->displayName = settings.value(NameKey).toString();
d->osType = settings.value(OsTypeKey).toString();
d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
d->internalId = settings.value(InternalIdKey, nextId).toULongLong();
if (d->internalId == nextId)
++nextId;
d->internalId = settings.value(InternalIdKey, InvalidId).toULongLong();
d->attributes = settings.value(AttributesKey).toHash();
// Convert from version < 2.3.