Commit c310f167 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

SSH: Add parent object to SshConnection constructor.



There's no mandatory use of shared pointers anymore, so client code
should be able to make use of QObject-based ownership.

Change-Id: I2344ca66a40c310ef739b32502eb8471da98c03a
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 92c7dce1
......@@ -107,7 +107,8 @@ bool operator!=(const SshConnectionParameters &p1, const SshConnectionParameters
// TODO: Mechanism for checking the host key. First connection to host: save, later: compare
SshConnection::SshConnection(const SshConnectionParameters &serverInfo)
SshConnection::SshConnection(const SshConnectionParameters &serverInfo, QObject *parent)
: QObject(parent)
{
doStaticInitializationsIfNecessary();
......
......@@ -91,7 +91,7 @@ class QSSH_EXPORT SshConnection : public QObject
public:
enum State { Unconnected, Connecting, Connected };
SshConnection(const SshConnectionParameters &serverInfo);
explicit SshConnection(const SshConnectionParameters &serverInfo, QObject *parent = 0);
void connectToHost();
void disconnectFromHost();
......
......@@ -76,8 +76,6 @@ GenericLinuxDeviceTester::GenericLinuxDeviceTester(QObject *parent)
GenericLinuxDeviceTester::~GenericLinuxDeviceTester()
{
if (d->connection)
d->connection->deleteLater();
delete d;
}
......@@ -86,7 +84,7 @@ void GenericLinuxDeviceTester::testDevice(const LinuxDeviceConfiguration::ConstP
QTC_ASSERT(d->state == Inactive, return);
d->deviceConfiguration = deviceConfiguration;
d->connection = new SshConnection(deviceConfiguration->sshParameters());
d->connection = new SshConnection(deviceConfiguration->sshParameters(), this);
connect(d->connection, SIGNAL(connected()), SLOT(handleConnected()));
connect(d->connection, SIGNAL(error(QSsh::SshError)),
SLOT(handleConnectionFailure()));
......
......@@ -167,8 +167,6 @@ RemoteValgrindProcess::RemoteValgrindProcess(QSsh::SshConnection *connection, QO
RemoteValgrindProcess::~RemoteValgrindProcess()
{
if (m_connection)
m_connection->deleteLater();
}
bool RemoteValgrindProcess::isRunning() const
......@@ -186,7 +184,7 @@ void RemoteValgrindProcess::run(const QString &valgrindExecutable, const QString
// connect to host and wait for connection
if (!m_connection)
m_connection = new QSsh::SshConnection(m_params);
m_connection = new QSsh::SshConnection(m_params, this);
if (m_connection->state() != QSsh::SshConnection::Connected) {
connect(m_connection, SIGNAL(connected()), this, SLOT(connected()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment