diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-08-03 09:56:39 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-08-03 10:40:31 +0200 |
| commit | 1d00146e210257c3ae631d16b0250eb3c319d81e (patch) | |
| tree | bb44c772186c56a4e9c2d714347e38aee82e0ac3 /src/plugins/remotelinux/linuxdevice.cpp | |
| parent | aa2434d0932471a31473eccf056185d0f4cb5a52 (diff) | |
| download | qt-creator-1d00146e210257c3ae631d16b0250eb3c319d81e.tar.gz | |
Device support: Move processes dialog creation to settings widget.
With the process list model being publicly available from the IDevice
interface, there's no longer a need to force all subclasses to create
the dialog themselves via opaque handles.
Since clients can now check whether a device offers a process list,
the base process list model has been made abstract.
Change-Id: If4a0aa68a95b221862c287ad8397ebabe9be5909
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/remotelinux/linuxdevice.cpp')
| -rw-r--r-- | src/plugins/remotelinux/linuxdevice.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 7715e9f3fd..9296d91bce 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -37,7 +37,6 @@ #include <coreplugin/id.h> #include <projectexplorer/devicesupport/sshdeviceprocesslist.h> -#include <projectexplorer/devicesupport/deviceprocessesdialog.h> #include <ssh/sshconnection.h> #include <utils/portlist.h> #include <utils/qtcassert.h> @@ -197,8 +196,7 @@ ProjectExplorer::IDeviceWidget *LinuxDevice::createWidget() QList<Core::Id> LinuxDevice::actionIds() const { return QList<Core::Id>() << Core::Id(Constants::GenericTestDeviceActionId) - << Core::Id(Constants::GenericDeployKeyToDeviceActionId) - << Core::Id(Constants::GenericRemoteProcessesActionId); + << Core::Id(Constants::GenericDeployKeyToDeviceActionId); } QString LinuxDevice::displayNameForActionId(Core::Id actionId) const @@ -207,8 +205,6 @@ QString LinuxDevice::displayNameForActionId(Core::Id actionId) const if (actionId == Core::Id(Constants::GenericTestDeviceActionId)) return tr("Test"); - if (actionId == Core::Id(Constants::GenericRemoteProcessesActionId)) - return tr("Remote Processes..."); if (actionId == Core::Id(Constants::GenericDeployKeyToDeviceActionId)) return tr("Deploy Public Key..."); return QString(); // Can't happen. @@ -222,8 +218,6 @@ void LinuxDevice::executeAction(Core::Id actionId, QWidget *parent) const 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)) - d = new DeviceProcessesDialog(createProcessListModel(parent)); else if (actionId == Core::Id(Constants::GenericDeployKeyToDeviceActionId)) d = PublicKeyDeploymentDialog::createDialog(device, parent); if (d) |