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

RemoteLinux: Add support for auto-detected devices.

Browse Source 
We assume them to be transient, which means they do not get saved.

Change-Id: Ia9016172737d6e2547e3db5faf35d81c5c8cb91a
Reviewed-on: http://codereview.qt.nokia.com/2943
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-08-15 10:36:53 +02:00
parent 6e93b47c33
commit d0ba9a8613
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,7 @@ public:
LinuxDeviceConfiguration::DeviceType deviceType;
PortList freePorts;
bool isDefault;
LinuxDeviceConfiguration::Origin origin;
LinuxDeviceConfiguration::Id internalId;
};
@@ -104,13 +105,14 @@ LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const ConstPtr &o
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QString &name,
const QString &osType, DeviceType deviceType, const PortList &freePorts,
const SshConnectionParameters &sshParams)
const SshConnectionParameters &sshParams, Origin origin)
{
return Ptr(new LinuxDeviceConfiguration(name, osType, deviceType, freePorts, sshParams));
return Ptr(new LinuxDeviceConfiguration(name, osType, deviceType, freePorts, sshParams, origin));
}
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QString &osType,
DeviceType deviceType, const PortList &freePorts, const SshConnectionParameters &sshParams)
DeviceType deviceType, const PortList &freePorts, const SshConnectionParameters &sshParams,
Origin origin)
: m_d(new LinuxDeviceConfigurationPrivate(sshParams))
{
m_d->name = name;
@@ -118,11 +120,13 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QS
m_d->deviceType = deviceType;
m_d->freePorts = freePorts;
m_d->isDefault = false;
m_d->origin = origin;
}
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings, Id &nextId)
: m_d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy))
{
m_d->origin = ManuallyAdded;
m_d->name = settings.value(NameKey).toString();
m_d->osType = settings.value(OsTypeKey).toString();
m_d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
@@ -163,6 +167,7 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguratio
m_d->deviceType = other->deviceType();
m_d->freePorts = other->freePorts();
m_d->isDefault = other->m_d->isDefault;
m_d->origin = other->m_d->origin;
m_d->internalId = other->m_d->internalId;
}
@@ -219,6 +224,11 @@ void LinuxDeviceConfiguration::setFreePorts(const PortList &freePorts)
m_d->freePorts = freePorts;
}
bool LinuxDeviceConfiguration::isAutoDetected() const
{
return m_d->origin == AutoDetected;
}
PortList LinuxDeviceConfiguration::freePorts() const { return m_d->freePorts; }
QString LinuxDeviceConfiguration::name() const { return m_d->name; }
QString LinuxDeviceConfiguration::osType() const { return m_d->osType; }