summaryrefslogtreecommitdiff
path: root/tests/manual/ssh/sftp/sftptest.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-04-01 09:58:29 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2011-04-01 09:58:29 +0200
commitafa13623cdc44b64a8801d3f9dff67bdec788a11 (patch)
treeb6fbbf78480217bf4c292f9259e7358e871229a9 /tests/manual/ssh/sftp/sftptest.h
parentb32cddad4804b0b627025f37b94d58ce7068f188 (diff)
downloadqt-creator-afa13623cdc44b64a8801d3f9dff67bdec788a11.tar.gz
SSH: Fix tests to adapt to new location (utils vs. core plugin).
Diffstat (limited to 'tests/manual/ssh/sftp/sftptest.h')
-rw-r--r--tests/manual/ssh/sftp/sftptest.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/manual/ssh/sftp/sftptest.h b/tests/manual/ssh/sftp/sftptest.h
index 666542bba2..be4e51fd13 100644
--- a/tests/manual/ssh/sftp/sftptest.h
+++ b/tests/manual/ssh/sftp/sftptest.h
@@ -36,8 +36,8 @@
#include "parameters.h"
-#include <coreplugin/ssh/sftpchannel.h>
-#include <coreplugin/ssh/sshconnection.h>
+#include <utils/ssh/sftpchannel.h>
+#include <utils/ssh/sshconnection.h>
#include <QtCore/QElapsedTimer>
#include <QtCore/QHash>
@@ -61,11 +61,11 @@ private slots:
void handleDisconnected();
void handleChannelInitialized();
void handleChannelInitializationFailure(const QString &reason);
- void handleJobFinished(Core::SftpJobId job, const QString &error);
+ void handleJobFinished(Utils::SftpJobId job, const QString &error);
void handleChannelClosed();
private:
- typedef QHash<Core::SftpJobId, QString> JobMap;
+ typedef QHash<Utils::SftpJobId, QString> JobMap;
typedef QSharedPointer<QFile> FilePtr;
enum State { Inactive, Connecting, InitializingChannel, UploadingSmall,
DownloadingSmall, RemovingSmall, UploadingBig, DownloadingBig,
@@ -77,25 +77,25 @@ private:
QString cmpFileName(const QString &localFileName) const;
QString remoteFilePath(const QString &localFileName) const;
void earlyDisconnectFromHost();
- bool handleJobFinished(Core::SftpJobId job, JobMap &jobMap,
+ bool handleJobFinished(Utils::SftpJobId job, JobMap &jobMap,
const QString &error, const char *activity);
- bool handleBigJobFinished(Core::SftpJobId job, Core::SftpJobId expectedJob,
+ bool handleBigJobFinished(Utils::SftpJobId job, Utils::SftpJobId expectedJob,
const QString &error, const char *activity);
bool compareFiles(QFile *orig, QFile *copy);
const Parameters m_parameters;
State m_state;
bool m_error;
- Core::SshConnection::Ptr m_connection;
- Core::SftpChannel::Ptr m_channel;
+ Utils::SshConnection::Ptr m_connection;
+ Utils::SftpChannel::Ptr m_channel;
QList<FilePtr> m_localSmallFiles;
JobMap m_smallFilesUploadJobs;
JobMap m_smallFilesDownloadJobs;
JobMap m_smallFilesRemovalJobs;
FilePtr m_localBigFile;
- Core::SftpJobId m_bigFileUploadJob;
- Core::SftpJobId m_bigFileDownloadJob;
- Core::SftpJobId m_bigFileRemovalJob;
+ Utils::SftpJobId m_bigFileUploadJob;
+ Utils::SftpJobId m_bigFileDownloadJob;
+ Utils::SftpJobId m_bigFileRemovalJob;
QElapsedTimer m_bigJobTimer;
};