From 2faf3b2548c6dc1e050f1b57087beb82e444fc8f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 28 Oct 2011 16:10:26 +0200 Subject: SSH: SshRemoteProcessRunner does not need to be a shared pointer. Change-Id: I49cf2e113d23ebebe0939adbf90a1a88c84998a5 Reviewed-by: Christian Kandeler --- src/plugins/madde/maddedevicetester.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/plugins/madde/maddedevicetester.cpp') diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp index 120a465ba0..24e5c68b1c 100644 --- a/src/plugins/madde/maddedevicetester.cpp +++ b/src/plugins/madde/maddedevicetester.cpp @@ -52,7 +52,8 @@ const char QmlToolingDirectory[] = "/usr/lib/qt4/plugins/qmltooling"; MaddeDeviceTester::MaddeDeviceTester(QObject *parent) : AbstractLinuxDeviceTester(parent), m_genericTester(new GenericLinuxDeviceTester(this)), - m_state(Inactive) + m_state(Inactive), + m_processRunner(0) { } @@ -106,14 +107,15 @@ void MaddeDeviceTester::handleGenericTestFinished(TestResult result) return; } - m_processRunner = SshRemoteProcessRunner::create(m_genericTester->connection()); - connect(m_processRunner.data(), SIGNAL(connectionError(Utils::SshError)), + delete m_processRunner; + m_processRunner = new SshRemoteProcessRunner(m_genericTester->connection(), this); + connect(m_processRunner, SIGNAL(connectionError(Utils::SshError)), SLOT(handleConnectionError())); - connect(m_processRunner.data(), SIGNAL(processOutputAvailable(QByteArray)), + connect(m_processRunner, SIGNAL(processOutputAvailable(QByteArray)), SLOT(handleStdout(QByteArray))); - connect(m_processRunner.data(), SIGNAL(processErrorOutputAvailable(QByteArray)), + connect(m_processRunner, SIGNAL(processErrorOutputAvailable(QByteArray)), SLOT(handleStderr(QByteArray))); - connect(m_processRunner.data(), SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int))); + connect(m_processRunner, SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int))); QString qtInfoCmd; if (m_deviceConfiguration->osType() == QLatin1String(MeeGoOsType)) { @@ -282,8 +284,9 @@ QString MaddeDeviceTester::processedQtLibsList() m_state = Inactive; disconnect(m_genericTester, 0, this, 0); if (m_processRunner) - disconnect(m_processRunner.data(), 0, this, 0); - m_processRunner.clear(); + disconnect(m_processRunner, 0, this, 0); + delete m_processRunner; + m_processRunner = 0; emit finished(m_result); } -- cgit v1.2.1