diff options
Diffstat (limited to 'src/plugins/remotelinux')
17 files changed, 65 insertions, 76 deletions
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index ec96ebdcc4..e0b3640f89 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -27,10 +27,10 @@ ** ** **************************************************************************/ + #include "abstractremotelinuxdeployservice.h" #include "deployablefile.h" -#include "linuxdeviceconfiguration.h" #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/target.h> diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp index 14dfdee553..9683622d56 100644 --- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp +++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp @@ -27,10 +27,10 @@ ** ** **************************************************************************/ + #include "abstractuploadandinstallpackageservice.h" #include "deployablefile.h" -#include "linuxdeviceconfiguration.h" #include "packageuploader.h" #include "remotelinuxpackageinstaller.h" diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp index 5f040de857..c84ec28e10 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp @@ -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; } diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index f47a548ab9..083a636bb3 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp @@ -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 diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp index d48d0a2b3e..df8d800d51 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp @@ -26,10 +26,11 @@ ** ** **************************************************************************/ + #include "genericlinuxdeviceconfigurationwizardpages.h" #include "ui_genericlinuxdeviceconfigurationwizardsetuppage.h" -#include "linuxdeviceconfiguration.h" +#include <projectexplorer/devicesupport/idevice.h> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdevice.cpp index eae9e9f2dd..4a3b1d968f 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -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) diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdevice.h index 8ce10b8cbe..3d4a5f7329 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.h +++ b/src/plugins/remotelinux/linuxdevice.h @@ -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; } -class REMOTELINUX_EXPORT LinuxDeviceConfiguration : public ProjectExplorer::IDevice +class REMOTELINUX_EXPORT LinuxDevice : public ProjectExplorer::IDevice { - Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::LinuxDeviceConfiguration) + Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::LinuxDevice) public: - typedef QSharedPointer<LinuxDeviceConfiguration> Ptr; - typedef QSharedPointer<const LinuxDeviceConfiguration> ConstPtr; + typedef QSharedPointer<LinuxDevice> Ptr; + typedef QSharedPointer<const LinuxDevice> ConstPtr; static Ptr create(); static Ptr create(const QString &name, Core::Id type, MachineType machineType, @@ -66,13 +67,13 @@ public: QList<ProjectExplorer::DeviceProcess> buildProcessList(const QString &listProcessesReply) const; protected: - LinuxDeviceConfiguration() {} - LinuxDeviceConfiguration(const QString &name, Core::Id type, + LinuxDevice() {} + LinuxDevice(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id); - LinuxDeviceConfiguration(const LinuxDeviceConfiguration &other); + LinuxDevice(const LinuxDevice &other); private: - LinuxDeviceConfiguration &operator=(const LinuxDeviceConfiguration &); + LinuxDevice &operator=(const LinuxDevice &); }; } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro index ed18ddd839..6059ce60ab 100644 --- a/src/plugins/remotelinux/remotelinux.pro +++ b/src/plugins/remotelinux/remotelinux.pro @@ -10,7 +10,7 @@ HEADERS += \ embeddedlinuxqtversionfactory.h \ remotelinuxplugin.h \ remotelinux_export.h \ - linuxdeviceconfiguration.h \ + linuxdevice.h \ remotelinuxrunconfiguration.h \ publickeydeploymentdialog.h \ genericlinuxdeviceconfigurationwizard.h \ @@ -57,7 +57,7 @@ SOURCES += \ embeddedlinuxqtversion.cpp \ embeddedlinuxqtversionfactory.cpp \ remotelinuxplugin.cpp \ - linuxdeviceconfiguration.cpp \ + linuxdevice.cpp \ remotelinuxrunconfiguration.cpp \ publickeydeploymentdialog.cpp \ genericlinuxdeviceconfigurationwizard.cpp \ diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 7c353ea2fc..221172e322 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -53,8 +53,8 @@ QtcPlugin { "genericlinuxdeviceconfigurationwidget.ui", "genericremotelinuxdeploystepfactory.cpp", "genericremotelinuxdeploystepfactory.h", - "linuxdeviceconfiguration.cpp", - "linuxdeviceconfiguration.h", + "linuxdevice.cpp", + "linuxdevice.h", "linuxdevicetestdialog.cpp", "linuxdevicetestdialog.h", "linuxdevicetester.cpp", diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp index 7837accc36..7d10f565f8 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp @@ -27,15 +27,11 @@ ** ** **************************************************************************/ -#include "remotelinuxcheckforfreediskspaceservice.h" -#include "linuxdeviceconfiguration.h" +#include "remotelinuxcheckforfreediskspaceservice.h" #include <ssh/sshremoteprocessrunner.h> -#include <QByteArray> -#include <QString> - namespace RemoteLinux { namespace Internal { class RemoteLinuxCheckForFreeDiskSpaceServicePrivate diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index 5054e81614..e76d28f738 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -27,15 +27,12 @@ ** ** **************************************************************************/ -#include "remotelinuxcustomcommanddeployservice.h" -#include "linuxdeviceconfiguration.h" +#include "remotelinuxcustomcommanddeployservice.h" #include <utils/qtcassert.h> #include <ssh/sshremoteprocessrunner.h> -#include <QString> - using namespace QSsh; namespace RemoteLinux { diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index e9d299db94..a0f57b283d 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -101,7 +101,7 @@ DebuggerStartParameters LinuxDeviceDebugSupport::startParameters(const RemoteLin DebuggerStartParameters params; Target *target = runConfig->target(); Profile *profile = target->profile(); - const IDevice::ConstPtr devConf = DeviceProfileInformation::device(profile); + const IDevice::ConstPtr device = DeviceProfileInformation::device(profile); params.sysRoot = SysRootProfileInformation::sysRoot(profile).toString(); params.debuggerCommand = DebuggerProfileInformation::debuggerCommand(profile).toString(); @@ -110,7 +110,7 @@ DebuggerStartParameters LinuxDeviceDebugSupport::startParameters(const RemoteLin if (runConfig->debuggerAspect()->useQmlDebugger()) { params.languages |= QmlLanguage; - params.qmlServerAddress = devConf->sshParameters().host; + params.qmlServerAddress = device->sshParameters().host; params.qmlServerPort = 0; // port is selected later on } if (runConfig->debuggerAspect()->useCppDebugger()) { @@ -118,7 +118,7 @@ DebuggerStartParameters LinuxDeviceDebugSupport::startParameters(const RemoteLin params.processArgs = runConfig->arguments(); params.startMode = AttachToRemoteServer; params.executable = runConfig->localExecutableFilePath(); - params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1"); + params.remoteChannel = device->sshParameters().host + QLatin1String(":-1"); } else { params.startMode = AttachToRemoteServer; } diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp index 63810a50e9..0939261785 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp @@ -28,7 +28,7 @@ **************************************************************************/ #include "remotelinuxenvironmentreader.h" -#include "linuxdeviceconfiguration.h" +#include "linuxdevice.h" #include <ssh/sshremoteprocessrunner.h> #include <projectexplorer/devicesupport/idevice.h> @@ -53,8 +53,8 @@ RemoteLinuxEnvironmentReader::RemoteLinuxEnvironmentReader(RunConfiguration *con void RemoteLinuxEnvironmentReader::start(const QString &environmentSetupCommand) { - IDevice::ConstPtr devConfig = DeviceProfileInformation::device(m_profile); - if (!devConfig) + IDevice::ConstPtr device = DeviceProfileInformation::device(m_profile); + if (!device) return; m_stop = false; if (!m_remoteProcessRunner) @@ -63,7 +63,7 @@ void RemoteLinuxEnvironmentReader::start(const QString &environmentSetupCommand) connect(m_remoteProcessRunner, SIGNAL(processClosed(int)), SLOT(remoteProcessFinished(int))); const QByteArray remoteCall = QString(environmentSetupCommand + QLatin1String("; env")).toUtf8(); - m_remoteProcessRunner->run(remoteCall, devConfig->sshParameters()); + m_remoteProcessRunner->run(remoteCall, device->sshParameters()); } void RemoteLinuxEnvironmentReader::stop() diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 3b73ebaf1e..33b311d3c7 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -31,7 +31,6 @@ #include "remotelinuxrunconfiguration.h" #include "deploymentinfo.h" -#include "linuxdeviceconfiguration.h" #include "remotelinuxdeployconfiguration.h" #include "remotelinuxrunconfigurationwidget.h" diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp index 80d2e42863..907d04e570 100644 --- a/src/plugins/remotelinux/remotelinuxutils.cpp +++ b/src/plugins/remotelinux/remotelinuxutils.cpp @@ -29,15 +29,9 @@ **************************************************************************/ #include "remotelinuxutils.h" -#include "linuxdeviceconfiguration.h" - -#include <extensionsystem/pluginmanager.h> +#include "linuxdevice.h" #include <QCoreApplication> -#include <QList> -#include <QString> - -using namespace ExtensionSystem; namespace RemoteLinux { diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h index 403a60d8d5..b8bbf3b758 100644 --- a/src/plugins/remotelinux/remotelinuxutils.h +++ b/src/plugins/remotelinux/remotelinuxutils.h @@ -35,7 +35,7 @@ #include <QSharedPointer> namespace RemoteLinux { -class LinuxDeviceConfiguration; +class LinuxDevice; class REMOTELINUX_EXPORT RemoteLinuxUtils { diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp index a09e78a9b3..71f8506691 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp @@ -66,11 +66,11 @@ QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index { if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole) return QVariant(); - const IDevice::ConstPtr &devConf = deviceAt(index.row()); - Q_ASSERT(devConf); - QString displayedName = devConf->displayName(); - if (deviceMatches(devConf) - && DeviceManager::instance()->defaultDevice(devConf->type()) == devConf) { + const IDevice::ConstPtr &device = deviceAt(index.row()); + Q_ASSERT(device); + QString displayedName = device->displayName(); + if (deviceMatches(device) + && DeviceManager::instance()->defaultDevice(device->type()) == device) { displayedName = tr("%1 (default)").arg(displayedName); } return displayedName; @@ -106,9 +106,9 @@ IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig( IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) const { - const IDevice::ConstPtr &devConf = DeviceManager::instance()->find(id); - if (deviceMatches(devConf)) - return devConf; + const IDevice::ConstPtr &device = DeviceManager::instance()->find(id); + if (deviceMatches(device)) + return device; return defaultDeviceConfig(); } |