diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp index 80d78ffba433b219ee31ba66ac45f1f2aa6157db..6a455cd84fb1780c5d0e9e0985bfa8589f3ae303 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 1442ee7ac25642cacac545edd8b65d1eb956b817..eab38d78f584b5d07c98948c071d9fa09cc7b916 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 b55aea670e633a89eecc615f0ed1ba620854116c..dbd856c200a655e2c88c3f2dc36bb2899b6d9b4b 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 46dbac8c8567736546b96ee3883c1b2683426fa3..ef1dcd8318391d2328a150c3f9f84d4ebf908d88 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));