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

SSH: Declare signal parameter with full namespace.

Browse Source 
Otherwise we can't sensibly declare slots with a matching parameter.
This commit is contained in:
Christian Kandeler
2010-10-06 10:08:39 +02:00
parent 37e96bae81
commit 1d3c08dabb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/ssh/sshconnection.cpp
View File

@@ -59,7 +59,7 @@ namespace {
staticInitMutex.lock(); staticInitMutex.lock();
if (!staticInitializationsDone) { if (!staticInitializationsDone) {
Botan::LibraryInitializer::initialize("thread_safe=true"); Botan::LibraryInitializer::initialize("thread_safe=true");
qRegisterMetaType<SshError>("SshError"); qRegisterMetaType<Core::SshError>("Core::SshError");
qRegisterMetaType<Core::SftpJobId>("Core::SftpJobId"); qRegisterMetaType<Core::SftpJobId>("Core::SftpJobId");
staticInitializationsDone = true; staticInitializationsDone = true;
} }
@@ -109,8 +109,8 @@ SshConnection::SshConnection() : d(new Internal::SshConnectionPrivate(this))
SIGNAL(dataAvailable(QString)), Qt::QueuedConnection); SIGNAL(dataAvailable(QString)), Qt::QueuedConnection);
connect(d, SIGNAL(disconnected()), this, SIGNAL(disconnected()), connect(d, SIGNAL(disconnected()), this, SIGNAL(disconnected()),
Qt::QueuedConnection); Qt::QueuedConnection);
connect(d, SIGNAL(error(SshError)), this, SIGNAL(error(SshError)), connect(d, SIGNAL(error(Core::SshError)), this,
Qt::QueuedConnection); SIGNAL(error(Core::SshError)), Qt::QueuedConnection);
} }
void SshConnection::connectToHost(const SshConnectionParameters &serverInfo) void SshConnection::connectToHost(const SshConnectionParameters &serverInfo)

2
src/plugins/coreplugin/ssh/sshconnection.h
View File

@@ -95,7 +95,7 @@ signals:
void connected(); void connected();
void disconnected(); void disconnected();
void dataAvailable(const QString &message); void dataAvailable(const QString &message);
void error(SshError); void error(Core::SshError);
private: private:
SshConnection(); SshConnection();

2
src/plugins/coreplugin/ssh/sshconnection_p.h
View File

@@ -90,7 +90,7 @@ signals:
void connected(); void connected();
void disconnected(); void disconnected();
void dataAvailable(const QString &message); void dataAvailable(const QString &message);
void error(SshError); void error(Core::SshError);
private: private:
Q_SLOT void handleSocketConnected(); Q_SLOT void handleSocketConnected();

2
tests/manual/ssh/sftp/sftptest.cpp
View File

@@ -28,7 +28,7 @@ void SftpTest::run()
m_connection = SshConnection::create(); m_connection = SshConnection::create();
connect(m_connection.data(), SIGNAL(connected()), this, connect(m_connection.data(), SIGNAL(connected()), this,
SLOT(handleConnected())); SLOT(handleConnected()));
connect(m_connection.data(), SIGNAL(error(SshError)), this, connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleError())); SLOT(handleError()));
connect(m_connection.data(), SIGNAL(disconnected()), this, connect(m_connection.data(), SIGNAL(disconnected()), this,
SLOT(handleDisconnected())); SLOT(handleDisconnected()));