diff --git a/src/plugins/coreplugin/ssh/sshconnection.cpp b/src/plugins/coreplugin/ssh/sshconnection.cpp index 73721a320f7..3d8258da4bc 100644 --- a/src/plugins/coreplugin/ssh/sshconnection.cpp +++ b/src/plugins/coreplugin/ssh/sshconnection.cpp @@ -59,7 +59,7 @@ namespace { staticInitMutex.lock(); if (!staticInitializationsDone) { Botan::LibraryInitializer::initialize("thread_safe=true"); - qRegisterMetaType("SshError"); + qRegisterMetaType("Core::SshError"); qRegisterMetaType("Core::SftpJobId"); staticInitializationsDone = true; } @@ -109,8 +109,8 @@ SshConnection::SshConnection() : d(new Internal::SshConnectionPrivate(this)) SIGNAL(dataAvailable(QString)), Qt::QueuedConnection); connect(d, SIGNAL(disconnected()), this, SIGNAL(disconnected()), Qt::QueuedConnection); - connect(d, SIGNAL(error(SshError)), this, SIGNAL(error(SshError)), - Qt::QueuedConnection); + connect(d, SIGNAL(error(Core::SshError)), this, + SIGNAL(error(Core::SshError)), Qt::QueuedConnection); } void SshConnection::connectToHost(const SshConnectionParameters &serverInfo) diff --git a/src/plugins/coreplugin/ssh/sshconnection.h b/src/plugins/coreplugin/ssh/sshconnection.h index 73987ba5941..b262b3e21d6 100644 --- a/src/plugins/coreplugin/ssh/sshconnection.h +++ b/src/plugins/coreplugin/ssh/sshconnection.h @@ -95,7 +95,7 @@ signals: void connected(); void disconnected(); void dataAvailable(const QString &message); - void error(SshError); + void error(Core::SshError); private: SshConnection(); diff --git a/src/plugins/coreplugin/ssh/sshconnection_p.h b/src/plugins/coreplugin/ssh/sshconnection_p.h index 2dd3c5c3352..95339cdafc6 100644 --- a/src/plugins/coreplugin/ssh/sshconnection_p.h +++ b/src/plugins/coreplugin/ssh/sshconnection_p.h @@ -90,7 +90,7 @@ signals: void connected(); void disconnected(); void dataAvailable(const QString &message); - void error(SshError); + void error(Core::SshError); private: Q_SLOT void handleSocketConnected(); diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp index e26f8db792b..f80e6298294 100644 --- a/tests/manual/ssh/sftp/sftptest.cpp +++ b/tests/manual/ssh/sftp/sftptest.cpp @@ -28,7 +28,7 @@ void SftpTest::run() m_connection = SshConnection::create(); connect(m_connection.data(), SIGNAL(connected()), this, SLOT(handleConnected())); - connect(m_connection.data(), SIGNAL(error(SshError)), this, + connect(m_connection.data(), SIGNAL(error(Core::SshError)), this, SLOT(handleError())); connect(m_connection.data(), SIGNAL(disconnected()), this, SLOT(handleDisconnected()));