From a48139b8d030b6d0c811ecc6da9f35923806bbd0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 11 Oct 2010 12:19:17 +0200 Subject: [PATCH] SSH: Fix SshConnection::error signal connections. I recently changed the signal argument, but forgot to update some of the points of use. Reviewed-by: kh1 --- src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp | 2 +- src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp | 2 +- src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp | 2 +- tests/manual/ssh/errorhandling/main.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp index 80d78ffba4..6a455cd84f 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp @@ -79,7 +79,7 @@ void MaemoConfigTestDialog::startConfigTest() 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(handleConnectionError())); m_connection->connectToHost(m_config.server); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp index 1442ee7ac2..eab38d78f5 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp @@ -72,7 +72,7 @@ void MaemoDeviceEnvReader::start() connect(m_connection.data(), SIGNAL(connected()), this, SLOT(executeRemoteCall())); - connect(m_connection.data(), SIGNAL(error(SshError)), this, + connect(m_connection.data(), SIGNAL(error(Core::SshError)), this, SLOT(handleConnectionFailure())); if (reuse) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp index b55aea670e..dbd856c200 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp @@ -361,7 +361,7 @@ void MaemoSettingsWidget::deployKey() 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(handleConnectionFailure())); m_connection->connectToHost(currentConfig().server); } diff --git a/tests/manual/ssh/errorhandling/main.cpp b/tests/manual/ssh/errorhandling/main.cpp index 46dbac8c85..ef1dcd8318 100644 --- a/tests/manual/ssh/errorhandling/main.cpp +++ b/tests/manual/ssh/errorhandling/main.cpp @@ -96,7 +96,7 @@ private slots: qApp->quit(); } - void handleError(SshError error) + void handleError(Core::SshError error) { if (m_testSet.isEmpty()) { qDebug("Error: Received error %d, but no test was running.", error); @@ -140,8 +140,8 @@ private: SLOT(handleDisconnected())); connect(m_connection.data(), SIGNAL(dataAvailable(QString)), this, SLOT(handleDataAvailable(QString))); - connect(m_connection.data(), SIGNAL(error(SshError)), this, - SLOT(handleError(SshError))); + connect(m_connection.data(), SIGNAL(error(Core::SshError)), this, + SLOT(handleError(Core::SshError))); const TestItem &nextItem = m_testSet.first(); m_timeoutTimer.stop(); m_timeoutTimer.setInterval(qMax(10000, nextItem.params.timeout * 1000)); -- 2.11.0