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

RemoteLinux: Decentralize knowledge about specific devices.

Browse Source 
Also remove files again that somehow crept back in.

Change-Id: Ie77491c4cd872e2bb26b971c04137e7c25a903c7
Reviewed-on: http://codereview.qt.nokia.com/566
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-06-21 16:52:48 +02:00
parent 974d825bba
commit 7f0e2d64de
12 changed files with 122 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/remotelinux/linuxdeviceconfiguration.h
View File

@@ -63,6 +63,8 @@ public:
int getNext();
QString toString() const;
static QString regularExpression();
private:
typedef QPair<int, int> Range;
QList<Range> m_ranges;
@@ -90,33 +92,22 @@ public:
QString name() const { return m_name; }
void setName(const QString &name) { m_name = name; }
QString osType() const { return m_osType; }
QString osTypeDisplayName() const { return m_osTypeDisplayName; }
DeviceType type() const { return m_type; }
QString portsSpec() const { return m_portsSpec; }
Id internalId() const { return m_internalId; }
bool isDefault() const { return m_isDefault; }
static QString portsRegExpr();
static QString defaultHost(DeviceType type, const QString &osType);
static QString defaultPrivateKeyFilePath();
static QString defaultPublicKeyFilePath();
static QString defaultUser(const QString &osType);
static int defaultSshPort(DeviceType type);
static QString defaultQemuPassword(const QString &osType);
static const Id InvalidId;
static Ptr createHardwareConfig(const QString &name, const QString &osType,
const QString &hostName, const QString &privateKeyFilePath);
static Ptr createGenericLinuxConfigUsingPassword(const QString &name, const QString &hostName,
const QString &userName, const QString &password);
static Ptr createGenericLinuxConfigUsingKey(const QString &name, const QString &hostName,
const QString &userName, const QString &privateKeyFilePath);
static Ptr createEmulatorConfig(const QString &name, const QString &osType);
static Ptr create(const QString &name, const QString &osType, DeviceType deviceType,
const QString &freePortsSpec, const Utils::SshConnectionParameters &sshParams);
private:
LinuxDeviceConfiguration(const QString &name, const QString &osType,
DeviceType type, const Utils::SshConnectionParameters &sshParams);
LinuxDeviceConfiguration(const QString &name, const QString &osType, DeviceType deviceType,
const QString &freePortsSpec, const Utils::SshConnectionParameters &sshParams);
LinuxDeviceConfiguration(const QSettings &settings, Id &nextId);
LinuxDeviceConfiguration(const ConstPtr &other);
@@ -135,7 +126,6 @@ private:
DeviceType m_type;
QString m_portsSpec;
bool m_isDefault;
QString m_osTypeDisplayName;
Id m_internalId;
};
@@ -193,6 +183,11 @@ public:
*/
virtual bool supportsOsType(const QString &osType) const=0;
/*!
Returns a human-readable string for the given OS type, if this factory supports that type.
*/
virtual QString displayNameForOsType(const QString &osType) const=0;
/*!
Returns a list of ids representing actions that can be run on device configurations
that this factory supports. These actions will be available in the "Linux Devices"
@@ -204,7 +199,7 @@ public:
A human-readable string for the given id. Will be displayed on a button which, when clicked,
will start the respective action.
*/
virtual QString displayNameForId(const QString &actionId) const=0;
virtual QString displayNameForActionId(const QString &actionId) const=0;
/*!