feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Use plain pointers to SshConnection objects.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2012-05-29 13:22:33 +02:00
parent 6886dcb787
commit 94ab29519b
34 changed files with 198 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/ssh/sshremoteprocessrunner.cpp
View File

@@ -54,7 +54,7 @@ public:
SshRemoteProcessRunnerPrivate() : m_state(Inactive) {}
SshRemoteProcess::Ptr m_process;
SshConnection::Ptr m_connection;
SshConnection *m_connection;
bool m_runInTerminal;
SshPseudoTerminal m_terminal;
QByteArray m_command;
@@ -112,13 +112,13 @@ void SshRemoteProcessRunner::runInternal(const QByteArray &command,
d->m_exitCode = -1;
d->m_command = command;
d->m_connection = SshConnectionManager::instance().acquireConnection(sshParams);
connect(d->m_connection.data(), SIGNAL(error(QSsh::SshError)),
connect(d->m_connection, SIGNAL(error(QSsh::SshError)),
SLOT(handleConnectionError(QSsh::SshError)));
connect(d->m_connection.data(), SIGNAL(disconnected()), SLOT(handleDisconnected()));
connect(d->m_connection, SIGNAL(disconnected()), SLOT(handleDisconnected()));
if (d->m_connection->state() == SshConnection::Connected) {
handleConnected();
} else {
connect(d->m_connection.data(), SIGNAL(connected()), SLOT(handleConnected()));
connect(d->m_connection, SIGNAL(connected()), SLOT(handleConnected()));
if (d->m_connection->state() == SshConnection::Unconnected)
d->m_connection->connectToHost();
}
@@ -208,9 +208,9 @@ void SshRemoteProcessRunner::setState(int newState)
d->m_process.clear();
}
if (d->m_connection) {
disconnect(d->m_connection.data(), 0, this, 0);
disconnect(d->m_connection, 0, this, 0);
SshConnectionManager::instance().releaseConnection(d->m_connection);
d->m_connection.clear();
d->m_connection = 0;
}
}
}