diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-05-29 13:22:33 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2012-05-29 19:07:08 +0200 |
| commit | 94ab29519b68e4b98701b50ea29ccea2c0522027 (patch) | |
| tree | 8b90a7cefc903af38d1dec4d066ff56bff26e9af /src/plugins/valgrind/valgrindprocess.cpp | |
| parent | 6886dcb787aa0cd94dc1057b3e5be678f8516e04 (diff) | |
| download | qt-creator-94ab29519b68e4b98701b50ea29ccea2c0522027.tar.gz | |
SSH: Use plain pointers to SshConnection objects.
It used to be shared pointers so that existing connection objects could
easily be passed around in order not to open a new connection to the same
server. Since the introduction of the SshConnectionManager, this
is no longer necessary.
Change-Id: I13fd3eceaf35d562e6260e9969abbffb01edd6b5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/valgrind/valgrindprocess.cpp')
| -rw-r--r-- | src/plugins/valgrind/valgrindprocess.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index b739f35a5a..c5cde6ff27 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -152,11 +152,12 @@ RemoteValgrindProcess::RemoteValgrindProcess(const QSsh::SshConnectionParameters QObject *parent) : ValgrindProcess(parent) , m_params(sshParams) + , m_connection(0) , m_error(QProcess::UnknownError) , m_pid(0) {} -RemoteValgrindProcess::RemoteValgrindProcess(const QSsh::SshConnection::Ptr &connection, QObject *parent) +RemoteValgrindProcess::RemoteValgrindProcess(QSsh::SshConnection *connection, QObject *parent) : ValgrindProcess(parent) , m_params(connection->connectionParameters()) , m_connection(connection) @@ -164,6 +165,11 @@ RemoteValgrindProcess::RemoteValgrindProcess(const QSsh::SshConnection::Ptr &con , m_pid(0) {} +RemoteValgrindProcess::~RemoteValgrindProcess() +{ + delete m_connection; +} + bool RemoteValgrindProcess::isRunning() const { return m_process && m_process->isRunning(); @@ -179,12 +185,11 @@ void RemoteValgrindProcess::run(const QString &valgrindExecutable, const QString // connect to host and wait for connection if (!m_connection) - m_connection = QSsh::SshConnection::create(m_params); + m_connection = new QSsh::SshConnection(m_params); if (m_connection->state() != QSsh::SshConnection::Connected) { - connect(m_connection.data(), SIGNAL(connected()), - this, SLOT(connected())); - connect(m_connection.data(), SIGNAL(error(QSsh::SshError)), + connect(m_connection, SIGNAL(connected()), this, SLOT(connected())); + connect(m_connection, SIGNAL(error(QSsh::SshError)), this, SLOT(error(QSsh::SshError))); if (m_connection->state() == QSsh::SshConnection::Unconnected) m_connection->connectToHost(); @@ -219,7 +224,7 @@ void RemoteValgrindProcess::connected() m_process->start(); } -QSsh::SshConnection::Ptr RemoteValgrindProcess::connection() const +QSsh::SshConnection *RemoteValgrindProcess::connection() const { return m_connection; } |