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

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp
index 80d78ff..6a455cd 100644 (file)
--- 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 1442ee7..eab38d7 100644 (file)
--- 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 b55aea6..dbd856c 100644 (file)
--- 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 46dbac8..ef1dcd8 100644 (file)
--- 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));