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/libs/ssh/sshconnection.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/libs/ssh/sshconnection.cpp')
-rw-r--r-- | src/libs/ssh/sshconnection.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index a9ee712ec5..2c3908920f 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -107,12 +107,6 @@ bool operator!=(const SshConnectionParameters &p1, const SshConnectionParameters // TODO: Mechanism for checking the host key. First connection to host: save, later: compare -SshConnection::Ptr SshConnection::create(const SshConnectionParameters &serverInfo) -{ - doStaticInitializationsIfNecessary(); - return Ptr(new SshConnection(serverInfo)); -} - SshConnection::SshConnection(const SshConnectionParameters &serverInfo) : d(new Internal::SshConnectionPrivate(this, serverInfo)) { @@ -208,6 +202,8 @@ SshConnectionPrivate::SshConnectionPrivate(SshConnection *conn, m_connParams(serverInfo), m_error(SshNoError), m_ignoreNextPacket(false), m_conn(conn) { + doStaticInitializationsIfNecessary(); + setupPacketHandlers(); m_socket->setProxy(m_connParams.proxyType == SshConnectionParameters::DefaultProxy ? QNetworkProxy::DefaultProxy : QNetworkProxy::NoProxy); |