Commit 64602549 authored by hjk's avatar hjk Committed by Christian Kandeler

remotelinux: rename LinuxDeviceConfiguration to LinuxDevice

Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent c80af2a4
......@@ -29,7 +29,6 @@
**************************************************************************/
#include "hostutils.h"
#include "breakpoint.h"
#include <utils/synchronousprocess.h>
......
......@@ -64,11 +64,11 @@ MaddeDevice::MaddeDevice()
MaddeDevice::MaddeDevice(const QString &name, Core::Id type, MachineType machineType,
Origin origin, Core::Id id)
: LinuxDeviceConfiguration(name, type, machineType, origin, id)
: LinuxDevice(name, type, machineType, origin, id)
{
}
MaddeDevice::MaddeDevice(const MaddeDevice &other) : LinuxDeviceConfiguration(other)
MaddeDevice::MaddeDevice(const MaddeDevice &other) : LinuxDevice(other)
{
}
......
......@@ -31,14 +31,14 @@
#ifndef MADDEDEVICE_H
#define MADDEDEVICE_H
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
#include <QCoreApplication>
namespace Madde {
namespace Internal {
class MaddeDevice : public RemoteLinux::LinuxDeviceConfiguration
class MaddeDevice : public RemoteLinux::LinuxDevice
{
Q_DECLARE_TR_FUNCTIONS(Madde::Internal::MaddeDevice)
public:
......
......@@ -32,7 +32,7 @@
#include "maemoconstants.h"
#include "maemoglobal.h"
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
#include <utils/qtcassert.h>
#include <ssh/sshremoteprocessrunner.h>
......
......@@ -45,7 +45,7 @@
#include <remotelinux/abstractremotelinuxdeployservice.h>
#include <remotelinux/deployablefile.h>
#include <remotelinux/deploymentinfo.h>
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
#include <utils/qtcassert.h>
#include <ssh/sshconnection.h>
......
......@@ -572,15 +572,15 @@ IDevice::Ptr MaemoDeviceConfigWizard::device()
freePortsSpec = QLatin1String("10000-10100");
doTest = true;
}
const MaddeDevice::Ptr devConf = MaddeDevice::create(d->wizardData.configName,
const MaddeDevice::Ptr device = MaddeDevice::create(d->wizardData.configName,
d->wizardData.deviceType, d->wizardData.machineType);
devConf->setFreePorts(PortList::fromString(freePortsSpec));
devConf->setSshParameters(sshParams);
device->setFreePorts(PortList::fromString(freePortsSpec));
device->setSshParameters(sshParams);
if (doTest) {
LinuxDeviceTestDialog dlg(devConf, new MaddeDeviceTester(this), this);
LinuxDeviceTestDialog dlg(device, new MaddeDeviceTester(this), this);
dlg.exec();
}
return devConf;
return device;
}
int MaemoDeviceConfigWizard::nextId() const
......
......@@ -146,18 +146,18 @@ QString MaemoGlobal::remoteSourceProfilesCommand()
Utils::PortList MaemoGlobal::freePorts(const Profile *profile)
{
IDevice::ConstPtr devConf = DeviceProfileInformation::device(profile);
IDevice::ConstPtr device = DeviceProfileInformation::device(profile);
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtProfileInformation::qtVersion(profile);
if (!devConf || !qtVersion)
if (!device || !qtVersion)
return Utils::PortList();
if (devConf->machineType() == IDevice::Emulator) {
if (device->machineType() == IDevice::Emulator) {
MaemoQemuRuntime rt;
const int id = qtVersion->uniqueId();
if (MaemoQemuManager::instance().runtimeForQtVersion(id, &rt))
return rt.m_freePorts;
}
return devConf->freePorts();
return device->freePorts();
}
QString MaemoGlobal::maddeRoot(const QString &qmakePath)
......
......@@ -51,13 +51,13 @@ MaemoRemoteCopyFacility::MaemoRemoteCopyFacility(QObject *parent) :
MaemoRemoteCopyFacility::~MaemoRemoteCopyFacility() {}
void MaemoRemoteCopyFacility::copyFiles(SshConnection *connection,
const IDevice::ConstPtr &devConf,
const IDevice::ConstPtr &device,
const QList<DeployableFile> &deployables, const QString &mountPoint)
{
Q_ASSERT(connection->state() == SshConnection::Connected);
Q_ASSERT(!m_isCopying);
m_devConf = devConf;
m_devConf = device;
m_deployables = deployables;
m_mountPoint = mountPoint;
......
......@@ -53,7 +53,7 @@ public:
~MaemoRemoteCopyFacility();
void copyFiles(QSsh::SshConnection *connection,
const ProjectExplorer::IDevice::ConstPtr &devConf,
const ProjectExplorer::IDevice::ConstPtr &device,
const QList<RemoteLinux::DeployableFile> &deployables, const QString &mountPoint);
void cancel();
......
......@@ -42,8 +42,8 @@ enum State { Inactive, Listing, Killing };
class DeviceProcessListPrivate
{
public:
DeviceProcessListPrivate(const IDevice::ConstPtr &devConf)
: device(devConf),
DeviceProcessListPrivate(const IDevice::ConstPtr &device)
: device(device),
state(Inactive)
{ }
......@@ -58,8 +58,8 @@ public:
using namespace Internal;
DeviceProcessList::DeviceProcessList(const IDevice::ConstPtr &devConfig, QObject *parent)
: QAbstractTableModel(parent), d(new DeviceProcessListPrivate(devConfig))
DeviceProcessList::DeviceProcessList(const IDevice::ConstPtr &device, QObject *parent)
: QAbstractTableModel(parent), d(new DeviceProcessListPrivate(device))
{
}
......
......@@ -45,7 +45,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessList : public QAbstractTableModel
Q_OBJECT
public:
DeviceProcessList(const IDevice::ConstPtr &devConfig, QObject *parent = 0);
DeviceProcessList(const IDevice::ConstPtr &device, QObject *parent = 0);
~DeviceProcessList();
void update();
......
......@@ -67,11 +67,11 @@ DeviceUsedPortsGatherer::~DeviceUsedPortsGatherer()
delete d;
}
void DeviceUsedPortsGatherer::start(const IDevice::ConstPtr &devConf)
void DeviceUsedPortsGatherer::start(const IDevice::ConstPtr &device)
{
QTC_ASSERT(!d->connection, return);
d->portsToCheck = devConf->freePorts();
d->connection = SshConnectionManager::instance().acquireConnection(devConf->sshParameters());
d->portsToCheck = device->freePorts();
d->connection = SshConnectionManager::instance().acquireConnection(device->sshParameters());
connect(d->connection, SIGNAL(error(QSsh::SshError)), SLOT(handleConnectionError()));
if (d->connection->state() == SshConnection::Connected) {
handleConnectionEstablished();
......
......@@ -45,7 +45,7 @@ public:
DeviceUsedPortsGatherer(QObject *parent = 0);
~DeviceUsedPortsGatherer();
void start(const ProjectExplorer::IDevice::ConstPtr &devConf);
void start(const ProjectExplorer::IDevice::ConstPtr &device);
void stop();
int getNextFreePort(Utils::PortList *freePorts) const; // returns -1 if no more are left
QList<int> usedPorts() const;
......
......@@ -56,7 +56,7 @@
#include <projectexplorer/applicationrunconfiguration.h>
#include <remotelinux/remotelinuxrunconfiguration.h>
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
......
......@@ -43,19 +43,19 @@ using namespace Qnx::Internal;
using namespace ProjectExplorer;
BlackBerryDeviceConfiguration::BlackBerryDeviceConfiguration()
: RemoteLinux::LinuxDeviceConfiguration()
: RemoteLinux::LinuxDevice()
{
}
BlackBerryDeviceConfiguration::BlackBerryDeviceConfiguration(const QString &name, Core::Id type,
IDevice::MachineType machineType,
IDevice::Origin origin, Core::Id id)
: RemoteLinux::LinuxDeviceConfiguration(name, type, machineType, origin, id)
: RemoteLinux::LinuxDevice(name, type, machineType, origin, id)
{
}
BlackBerryDeviceConfiguration::BlackBerryDeviceConfiguration(const BlackBerryDeviceConfiguration &other)
: RemoteLinux::LinuxDeviceConfiguration(other)
: RemoteLinux::LinuxDevice(other)
, m_debugToken(other.m_debugToken)
{
}
......@@ -84,7 +84,7 @@ void BlackBerryDeviceConfiguration::setDebugToken(const QString &debugToken)
void BlackBerryDeviceConfiguration::fromMap(const QVariantMap &map)
{
RemoteLinux::LinuxDeviceConfiguration::fromMap(map);
RemoteLinux::LinuxDevice::fromMap(map);
m_debugToken = map.value(QLatin1String(Constants::QNX_DEBUG_TOKEN_KEY)).toString();
}
......@@ -129,7 +129,7 @@ void BlackBerryDeviceConfiguration::executeAction(Core::Id actionId, QWidget *pa
QVariantMap BlackBerryDeviceConfiguration::toMap() const
{
QVariantMap map = RemoteLinux::LinuxDeviceConfiguration::toMap();
QVariantMap map = RemoteLinux::LinuxDevice::toMap();
map.insert(QLatin1String(Constants::QNX_DEBUG_TOKEN_KEY), m_debugToken);
return map;
}
......@@ -34,7 +34,7 @@
#ifndef QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATION_H
#define QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATION_H
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
namespace ProjectExplorer {
class Profile;
......@@ -43,7 +43,7 @@ class Profile;
namespace Qnx {
namespace Internal {
class BlackBerryDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
class BlackBerryDeviceConfiguration : public RemoteLinux::LinuxDevice
{
Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::BlackBerryDeviceConfiguration)
public:
......
......@@ -34,7 +34,7 @@
#ifndef QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATIONWIZARDPAGES_H
#define QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATIONWIZARDPAGES_H
#include <remotelinux/linuxdeviceconfiguration.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <QWizardPage>
......
......@@ -37,17 +37,17 @@ using namespace Qnx;
using namespace Qnx::Internal;
QnxDeviceConfiguration::QnxDeviceConfiguration()
: RemoteLinux::LinuxDeviceConfiguration()
: RemoteLinux::LinuxDevice()
{
}
QnxDeviceConfiguration::QnxDeviceConfiguration(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id)
: RemoteLinux::LinuxDeviceConfiguration(name, type, machineType, origin, id)
: RemoteLinux::LinuxDevice(name, type, machineType, origin, id)
{
}
QnxDeviceConfiguration::QnxDeviceConfiguration(const QnxDeviceConfiguration &other)
: RemoteLinux::LinuxDeviceConfiguration(other)
: RemoteLinux::LinuxDevice(other)
{
}
......
......@@ -34,14 +34,15 @@
#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATION_H
#define QNX_INTERNAL_QNXDEVICECONFIGURATION_H
#include <remotelinux/linuxdeviceconfiguration.h>
#include <remotelinux/linuxdevice.h>
namespace Qnx {
namespace Internal {
class QnxDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
class QnxDeviceConfiguration : public RemoteLinux::LinuxDevice
{
Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::QnxDeviceConfiguration)
public:
typedef QSharedPointer<QnxDeviceConfiguration> Ptr;
typedef QSharedPointer<const QnxDeviceConfiguration> ConstPtr;
......@@ -53,7 +54,6 @@ public:
QString displayType() const;
protected:
QnxDeviceConfiguration();
QnxDeviceConfiguration(const QString &name, Core::Id type, MachineType machineType,
......
......@@ -75,16 +75,16 @@ IDevice::Ptr QnxDeviceConfigurationWizard::device()
sshParams.privateKeyFile = m_setupPage->privateKeyFilePath();
}
QnxDeviceConfiguration::Ptr devConf = QnxDeviceConfiguration::create(m_setupPage->configurationName(),
QnxDeviceConfiguration::Ptr device = QnxDeviceConfiguration::create(m_setupPage->configurationName(),
Core::Id(Constants::QNX_QNX_OS_TYPE), IDevice::Hardware);
devConf->setSshParameters(sshParams);
devConf->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
device->setSshParameters(sshParams);
device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
RemoteLinux::GenericLinuxDeviceTester *devTester = new RemoteLinux::GenericLinuxDeviceTester(this);
devTester->usedPortsGatherer()->setCommand(QLatin1String(Constants::QNX_PORT_GATHERER_COMMAND));
RemoteLinux::LinuxDeviceTestDialog dlg(devConf, devTester, this);
RemoteLinux::LinuxDeviceTestDialog dlg(device, devTester, this);
dlg.exec();
return devConf;
return device;
}
......@@ -62,8 +62,8 @@ DebuggerStartParameters createStartParameters(const QnxRunConfiguration *runConf
Target *target = runConfig->target();
Profile *profile = target->profile();
const IDevice::ConstPtr devConf = DeviceProfileInformation::device(profile);
if (devConf.isNull())
const IDevice::ConstPtr device = DeviceProfileInformation::device(profile);
if (device.isNull())
return params;
params.startMode = AttachToRemoteServer;
......@@ -75,7 +75,7 @@ DebuggerStartParameters createStartParameters(const QnxRunConfiguration *runConf
params.symbolFileName = runConfig->localExecutableFilePath();
params.remoteExecutable = runConfig->remoteExecutableFilePath();
params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1");
params.remoteChannel = device->sshParameters().host + QLatin1String(":-1");
params.displayName = runConfig->displayName();
params.remoteSetupNeeded = true;
params.closeMode = DetachAtClose;
......
......@@ -27,10 +27,10 @@
**
**
**************************************************************************/
#include "abstractremotelinuxdeployservice.h"
#include "deployablefile.h"
#include "linuxdeviceconfiguration.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h>
......
......@@ -27,10 +27,10 @@
**
**
**************************************************************************/
#include "abstractuploadandinstallpackageservice.h"
#include "deployablefile.h"
#include "linuxdeviceconfiguration.h"
#include "packageuploader.h"
#include "remotelinuxpackageinstaller.h"
......
......@@ -30,7 +30,7 @@
#include "genericlinuxdeviceconfigurationfactory.h"
#include "genericlinuxdeviceconfigurationwizard.h"
#include "linuxdeviceconfiguration.h"
#include "linuxdevice.h"
#include "remotelinux_constants.h"
#include <utils/qtcassert.h>
......@@ -72,7 +72,7 @@ bool GenericLinuxDeviceConfigurationFactory::canRestore(const QVariantMap &map)
IDevice::Ptr GenericLinuxDeviceConfigurationFactory::restore(const QVariantMap &map) const
{
QTC_ASSERT(canRestore(map), return IDevice::Ptr());
const IDevice::Ptr device = LinuxDeviceConfiguration::create();
const IDevice::Ptr device = LinuxDevice::create();
device->fromMap(map);
return device;
}
......
......@@ -26,13 +26,15 @@
**
**
**************************************************************************/
#include "genericlinuxdeviceconfigurationwizard.h"
#include "genericlinuxdeviceconfigurationwizardpages.h"
#include "linuxdeviceconfiguration.h"
#include "linuxdevice.h"
#include "linuxdevicetestdialog.h"
#include "linuxdevicetester.h"
#include "remotelinux_constants.h"
#include <utils/portlist.h>
using namespace ProjectExplorer;
......@@ -84,13 +86,13 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
sshParams.password = d->setupPage.password();
else
sshParams.privateKeyFile = d->setupPage.privateKeyFilePath();
IDevice::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(),
IDevice::Ptr device = LinuxDevice::create(d->setupPage.configurationName(),
Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
devConf->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
devConf->setSshParameters(sshParams);
LinuxDeviceTestDialog dlg(devConf, new GenericLinuxDeviceTester(this), this);
device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
device->setSshParameters(sshParams);
LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), this);
dlg.exec();
return devConf;
return device;
}
} // namespace RemoteLinux
......@@ -26,10 +26,11 @@
**
**
**************************************************************************/
#include "genericlinuxdeviceconfigurationwizardpages.h"
#include "ui_genericlinuxdeviceconfigurationwizardsetuppage.h"
#include "linuxdeviceconfiguration.h"
#include <projectexplorer/devicesupport/idevice.h>
namespace RemoteLinux {
namespace Internal {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
#include "linuxdeviceconfiguration.h"
#include "linuxdevice.h"
#include "genericlinuxdeviceconfigurationwidget.h"
#include "linuxdevicetestdialog.h"
......@@ -54,30 +54,30 @@ static QString visualizeNull(QString s)
return s.replace(QLatin1Char('\0'), QLatin1String("<null>"));
}
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QString &name,
LinuxDevice::Ptr LinuxDevice::create(const QString &name,
Core::Id type, MachineType machineType, Origin origin, Core::Id id)
{
return Ptr(new LinuxDeviceConfiguration(name, type, machineType, origin, id));
return Ptr(new LinuxDevice(name, type, machineType, origin, id));
}
QString LinuxDeviceConfiguration::displayType() const
QString LinuxDevice::displayType() const
{
return tr("Generic Linux");
}
ProjectExplorer::IDeviceWidget *LinuxDeviceConfiguration::createWidget()
ProjectExplorer::IDeviceWidget *LinuxDevice::createWidget()
{
return new GenericLinuxDeviceConfigurationWidget(sharedFromThis());
}
QList<Core::Id> LinuxDeviceConfiguration::actionIds() const
QList<Core::Id> LinuxDevice::actionIds() const
{
return QList<Core::Id>() << Core::Id(Constants::GenericTestDeviceActionId)
<< Core::Id(Constants::GenericDeployKeyToDeviceActionId)
<< Core::Id(Constants::GenericRemoteProcessesActionId);
}
QString LinuxDeviceConfiguration::displayNameForActionId(Core::Id actionId) const
QString LinuxDevice::displayNameForActionId(Core::Id actionId) const
{
QTC_ASSERT(actionIds().contains(actionId), return QString());
......@@ -90,13 +90,12 @@ QString LinuxDeviceConfiguration::displayNameForActionId(Core::Id actionId) cons
return QString(); // Can't happen.
}
void LinuxDeviceConfiguration::executeAction(Core::Id actionId, QWidget *parent) const
void LinuxDevice::executeAction(Core::Id actionId, QWidget *parent) const
{
QTC_ASSERT(actionIds().contains(actionId), return);
QDialog *d = 0;
const LinuxDeviceConfiguration::ConstPtr device
= sharedFromThis().staticCast<const LinuxDeviceConfiguration>();
const LinuxDevice::ConstPtr device = sharedFromThis().staticCast<const LinuxDevice>();
if (actionId == Core::Id(Constants::GenericTestDeviceActionId))
d = new LinuxDeviceTestDialog(device, new GenericLinuxDeviceTester, parent);
else if (actionId == Core::Id(Constants::GenericRemoteProcessesActionId))
......@@ -107,29 +106,29 @@ void LinuxDeviceConfiguration::executeAction(Core::Id actionId, QWidget *parent)
d->exec();
}
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, Core::Id type, MachineType machineType,
LinuxDevice::LinuxDevice(const QString &name, Core::Id type, MachineType machineType,
Origin origin, Core::Id id)
: IDevice(type, origin, machineType, id)
{
setDisplayName(name);
}
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguration &other)
LinuxDevice::LinuxDevice(const LinuxDevice &other)
: IDevice(other)
{
}
LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create()
LinuxDevice::Ptr LinuxDevice::create()
{
return Ptr(new LinuxDeviceConfiguration);
return Ptr(new LinuxDevice);
}
ProjectExplorer::IDevice::Ptr LinuxDeviceConfiguration::clone() const
ProjectExplorer::IDevice::Ptr LinuxDevice::clone() const
{
return Ptr(new LinuxDeviceConfiguration(*this));
return Ptr(new LinuxDevice(*this));
}
QString LinuxDeviceConfiguration::listProcessesCommandLine() const
QString LinuxDevice::listProcessesCommandLine() const
{
return QString::fromLatin1(
"for dir in `ls -d /proc/[0123456789]*`; do "
......@@ -142,12 +141,12 @@ QString LinuxDeviceConfiguration::listProcessesCommandLine() const
"done").arg(Delimiter0).arg(Delimiter1);
}
QString LinuxDeviceConfiguration::killProcessCommandLine(const DeviceProcess &process) const
QString LinuxDevice::killProcessCommandLine(const DeviceProcess &process) const
{
return QLatin1String("kill -9 ") + QString::number(process.pid);
}
QList<DeviceProcess> LinuxDeviceConfiguration::buildProcessList(const QString &listProcessesReply) const
QList<DeviceProcess> LinuxDevice::buildProcessList(const QString &listProcessesReply) const
{
QList<DeviceProcess> processes;
const QStringList lines = listProcessesReply.split(QString::fromLatin1(Delimiter0)
......
......@@ -27,6 +27,7 @@
**
**
**************************************************************************/
#ifndef LINUXDEVICECONFIGURATION_H
#define LINUXDEVICECONFIGURATION_H
......@@ -40,15 +41,15 @@ namespace QSsh { class SshConnectionParameters; }
namespace Utils { class PortList; }
namespace RemoteLinux {
namespace Internal { class LinuxDeviceConfigurationPrivate; }
namespace Internal { class LinuxDevicePrivate; }