Combine some SshConnectionParameter members

Combine host, port, username and password into a 'url' member and
add some convenience accessors.

Change-Id: Iddc26ff00dad1285c96aa56f196dbc4febe8e974
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index a94a4ea0de..f2eb58a613 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -72,14 +72,10 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
 {
     SshConnectionParameters sshParams;
     sshParams.options &= ~SshConnectionOptions(SshEnableStrictConformanceChecks); // For older SSH servers.
-    sshParams.host = d->setupPage.hostName();
-    sshParams.userName = d->setupPage.userName();
-    sshParams.port = 22;
+    sshParams.url = d->setupPage.url();
     sshParams.timeout = 10;
     sshParams.authenticationType = d->setupPage.authenticationType();
-    if (sshParams.authenticationType != SshConnectionParameters::AuthenticationTypePublicKey)
-        sshParams.password = d->setupPage.password();
-    else
+    if (sshParams.authenticationType == SshConnectionParameters::AuthenticationTypePublicKey)
         sshParams.privateKeyFile = d->setupPage.privateKeyFilePath();
     IDevice::Ptr device = LinuxDevice::create(d->setupPage.configurationName(),
         Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);