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

Move SSH support into a dedicated library.

Browse Source 
It does not belong into libUtils, which is a collection of small
unrelated utility classes.

Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Christian Kandeler
2012-05-18 10:49:35 +02:00
parent b9d9bb7ba8
commit 53a1087d13
153 changed files with 800 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/valgrind/callgrind/callgrindcontroller.cpp
View File

@@ -38,7 +38,7 @@
#include <valgrindprocess.h>
#include <utils/qtcassert.h>
#include <utils/ssh/sftpchannel.h>
#include <ssh/sftpchannel.h>
#include <QTemporaryFile>
@@ -236,8 +236,8 @@ void CallgrindController::foundRemoteFile()
m_remoteFile = m_findRemoteFile->readAllStandardOutput().trimmed();
m_sftp = m_ssh->createSftpChannel();
connect(m_sftp.data(), SIGNAL(finished(Utils::SftpJobId,QString)),
this, SLOT(sftpJobFinished(Utils::SftpJobId,QString)));
connect(m_sftp.data(), SIGNAL(finished(QSsh::SftpJobId,QString)),
this, SLOT(sftpJobFinished(QSsh::SftpJobId,QString)));
connect(m_sftp.data(), SIGNAL(initialized()), this, SLOT(sftpInitialized()));
m_sftp->initialize();
}
@@ -251,10 +251,10 @@ void CallgrindController::sftpInitialized()
dataFile.setAutoRemove(false);
dataFile.close();
m_downloadJob = m_sftp->downloadFile(m_remoteFile, m_tempDataFile, Utils::SftpOverwriteExisting);
m_downloadJob = m_sftp->downloadFile(m_remoteFile, m_tempDataFile, QSsh::SftpOverwriteExisting);
}
void CallgrindController::sftpJobFinished(Utils::SftpJobId job, const QString &error)
void CallgrindController::sftpJobFinished(QSsh::SftpJobId job, const QString &error)
{
QTC_ASSERT(job == m_downloadJob, return);