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

Maemo: Deal sensibly with device type changes in settings page.

Browse Source 
Task-number: QTCREATORBUG-1074
Reviewed-by: kh1
This commit is contained in:
ck
2010-04-08 17:31:55 +02:00
parent b949cafc78
commit 499c3c8362
5 changed files with 112 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -71,8 +71,12 @@ namespace {
const QString DefaultKeyFile =
QDesktopServices::storageLocation(QDesktopServices::HomeLocation)
+ QLatin1String("/.ssh/id_rsa");
const int DefaultSshPort(22);
const int DefaultGdbServerPort(10000);
const int DefaultSshPortHW(22);
const int DefaultSshPortSim(6666);
const int DefaultGdbServerPortHW(10000);
const int DefaultGdbServerPortSim(13219);
const QString DefaultHostNameHW(QLatin1String("192.168.2.15"));
const QString DefaultHostNameSim(QLatin1String("localhost"));
const QString DefaultUserName(QLatin1String("developer"));
const MaemoDeviceConfig::AuthType DefaultAuthType(MaemoDeviceConfig::Key);
const int DefaultTimeout(30);
@@ -91,11 +95,12 @@ private:
const quint64 m_id;
};
MaemoDeviceConfig::MaemoDeviceConfig(const QString &name)
MaemoDeviceConfig::MaemoDeviceConfig(const QString &name, MaemoDeviceConfig::DeviceType devType)
: name(name),
type(DefaultDeviceType),
sshPort(DefaultSshPort),
gdbServerPort(DefaultGdbServerPort),
type(devType),
host(defaultHost(type)),
sshPort(defaultSshPort(type)),
gdbServerPort(defaultGdbServerPort(type)),
uname(DefaultUserName),
authentication(DefaultAuthType),
keyFile(DefaultKeyFile),
@@ -108,9 +113,9 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
quint64 &nextId)
: name(settings.value(NameKey).toString()),
type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())),
host(settings.value(HostKey).toString()),
sshPort(settings.value(SshPortKey, DefaultSshPort).toInt()),
gdbServerPort(settings.value(GdbServerPortKey, DefaultGdbServerPort).toInt()),
host(settings.value(HostKey, defaultHost(type)).toString()),
sshPort(settings.value(SshPortKey, defaultSshPort(type)).toInt()),
gdbServerPort(settings.value(GdbServerPortKey, defaultGdbServerPort(type)).toInt()),
uname(settings.value(UserNameKey, DefaultUserName).toString()),
authentication(static_cast<AuthType>(settings.value(AuthKey, DefaultAuthType).toInt())),
pwd(settings.value(PasswordKey).toString()),
@@ -127,6 +132,21 @@ MaemoDeviceConfig::MaemoDeviceConfig()
{
}
int MaemoDeviceConfig::defaultSshPort(DeviceType type) const
{
return type == Physical ? DefaultSshPortHW : DefaultSshPortSim;
}
int MaemoDeviceConfig::defaultGdbServerPort(DeviceType type) const
{
return type == Physical ? DefaultGdbServerPortHW : DefaultGdbServerPortSim;
}
QString MaemoDeviceConfig::defaultHost(DeviceType type) const
{
return type == Physical ? DefaultHostNameHW : DefaultHostNameSim;
}
bool MaemoDeviceConfig::isValid() const
{
return internalId != InvalidId;