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

SSH: Fix SshConnection::error signal connections.

Browse Source 
I recently changed the signal argument, but forgot to update
some of the points of use.

Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-10-11 12:19:17 +02:00
parent 22130aae27
commit a48139b8d0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
View File

@@ -79,7 +79,7 @@ void MaemoConfigTestDialog::startConfigTest()
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(handleConnectionError())); SLOT(handleConnectionError()));
m_connection->connectToHost(m_config.server); m_connection->connectToHost(m_config.server);
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
View File

@@ -72,7 +72,7 @@ void MaemoDeviceEnvReader::start()
connect(m_connection.data(), SIGNAL(connected()), this, connect(m_connection.data(), SIGNAL(connected()), this,
SLOT(executeRemoteCall())); SLOT(executeRemoteCall()));
connect(m_connection.data(), SIGNAL(error(SshError)), this, connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleConnectionFailure())); SLOT(handleConnectionFailure()));
if (reuse) if (reuse)

2
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
View File

@@ -361,7 +361,7 @@ void MaemoSettingsWidget::deployKey()
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(handleConnectionFailure())); SLOT(handleConnectionFailure()));
m_connection->connectToHost(currentConfig().server); m_connection->connectToHost(currentConfig().server);
} }

6
tests/manual/ssh/errorhandling/main.cpp
View File

@@ -96,7 +96,7 @@ private slots:
qApp->quit(); qApp->quit();
} }
void handleError(SshError error) void handleError(Core::SshError error)
{ {
if (m_testSet.isEmpty()) { if (m_testSet.isEmpty()) {
qDebug("Error: Received error %d, but no test was running.", error); qDebug("Error: Received error %d, but no test was running.", error);
@@ -140,8 +140,8 @@ private:
SLOT(handleDisconnected())); SLOT(handleDisconnected()));
connect(m_connection.data(), SIGNAL(dataAvailable(QString)), this, connect(m_connection.data(), SIGNAL(dataAvailable(QString)), this,
SLOT(handleDataAvailable(QString))); SLOT(handleDataAvailable(QString)));
connect(m_connection.data(), SIGNAL(error(SshError)), this, connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleError(SshError))); SLOT(handleError(Core::SshError)));
const TestItem &nextItem = m_testSet.first(); const TestItem &nextItem = m_testSet.first();
m_timeoutTimer.stop(); m_timeoutTimer.stop();
m_timeoutTimer.setInterval(qMax(10000, nextItem.params.timeout * 1000)); m_timeoutTimer.setInterval(qMax(10000, nextItem.params.timeout * 1000));