diff options
author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-05-18 10:49:35 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@nokia.com> | 2012-05-22 10:51:53 +0200 |
commit | 53a1087d1321758ab1dc0a6ad737c135249bd5e6 (patch) | |
tree | ab0f9596da64a1907690b324bd05416c585eaf8c /src/plugins/analyzerbase | |
parent | b9d9bb7ba85e3b3ea0e06f0876272c0e3bebd144 (diff) | |
download | qt-creator-53a1087d1321758ab1dc0a6ad737c135249bd5e6.tar.gz |
Move SSH support into a dedicated library.
It does not belong into libUtils, which is a collection of small
unrelated utility classes.
Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/analyzerbase')
-rw-r--r-- | src/plugins/analyzerbase/analyzermanager.cpp | 2 | ||||
-rw-r--r-- | src/plugins/analyzerbase/analyzerstartparameters.h | 4 | ||||
-rw-r--r-- | src/plugins/analyzerbase/startremotedialog.cpp | 10 | ||||
-rw-r--r-- | src/plugins/analyzerbase/startremotedialog.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 7a0ccbb6cc..3b5f2f17e0 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -74,7 +74,7 @@ #include <utils/qtcassert.h> #include <utils/checkablemessagebox.h> #include <utils/statuslabel.h> -#include <utils/ssh/sshconnection.h> +#include <ssh/sshconnection.h> #include <QVariant> #include <QDebug> diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h index d84bd95771..91a5c8b8aa 100644 --- a/src/plugins/analyzerbase/analyzerstartparameters.h +++ b/src/plugins/analyzerbase/analyzerstartparameters.h @@ -39,7 +39,7 @@ #include <QMetaType> #include <coreplugin/id.h> -#include <utils/ssh/sshconnection.h> +#include <ssh/sshconnection.h> #include <utils/environment.h> namespace Analyzer { @@ -54,7 +54,7 @@ public: {} StartMode startMode; - Utils::SshConnectionParameters connParams; + QSsh::SshConnectionParameters connParams; Core::Id toolId; QString debuggee; diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp index 25b784f607..9436add8ba 100644 --- a/src/plugins/analyzerbase/startremotedialog.cpp +++ b/src/plugins/analyzerbase/startremotedialog.cpp @@ -35,7 +35,7 @@ #include "ui_startremotedialog.h" #include <coreplugin/icore.h> -#include <utils/ssh/sshconnection.h> +#include <ssh/sshconnection.h> #include <QPushButton> @@ -113,16 +113,16 @@ void StartRemoteDialog::validate() m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid); } -Utils::SshConnectionParameters StartRemoteDialog::sshParams() const +QSsh::SshConnectionParameters StartRemoteDialog::sshParams() const { - Utils::SshConnectionParameters params; + QSsh::SshConnectionParameters params; params.host = m_ui->host->text(); params.userName = m_ui->user->text(); if (m_ui->keyFile->isValid()) { - params.authenticationType = Utils::SshConnectionParameters::AuthenticationByKey; + params.authenticationType = QSsh::SshConnectionParameters::AuthenticationByKey; params.privateKeyFile = m_ui->keyFile->path(); } else { - params.authenticationType = Utils::SshConnectionParameters::AuthenticationByPassword; + params.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword; params.password = m_ui->password->text(); } params.port = m_ui->port->value(); diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h index 8e74fafb1e..e827d2e0d2 100644 --- a/src/plugins/analyzerbase/startremotedialog.h +++ b/src/plugins/analyzerbase/startremotedialog.h @@ -37,7 +37,7 @@ #include <QDialog> -namespace Utils { class SshConnectionParameters; } +namespace QSsh { class SshConnectionParameters; } namespace Analyzer { @@ -52,7 +52,7 @@ public: explicit StartRemoteDialog(QWidget *parent = 0); virtual ~StartRemoteDialog(); - Utils::SshConnectionParameters sshParams() const; + QSsh::SshConnectionParameters sshParams() const; QString executable() const; QString arguments() const; QString workingDirectory() const; |