[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.{cpp, h}: don't try to initialize non-static ssh_key_type_ member variable directly, but in the constructor.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 2c83c8cc7bb74d9985b399463e83fd86fa387a53
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 26 20:42:45 2016 +0200

    src/onmainwindow.{cpp,h}: don't try to initialize non-static ssh_key_type_ member variable directly, but in the constructor.
    
    Also, use the initializer list to initialize the other member variables
    directly.
---
 debian/changelog     |    4 ++++
 src/onmainwindow.cpp |    4 +---
 src/onmainwindow.h   |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d370bf..8e8fed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -451,6 +451,10 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.h: move WinServerStarter class definition around to
       hopefully get the definition of ONMainWindow::key_types.
     - src/onmainwindow.h: remove WWrapper definition, seems to be unused.
+    - src/onmainwindow.{cpp,h}: don't try to initialize non-static
+      ssh_key_type_ member variable directly, but in the constructor. Also,
+      use the initializer list to initialize the other member variables
+      directly.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 0ff7d31..35aecb9 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9949,10 +9949,8 @@ void ONMainWindow::slotCheckXOrgConnection()
 }
 
 WinServerStarter::WinServerStarter ( daemon server, ONMainWindow * par ) :
-    QThread ( 0 )
+    QThread ( 0 ), ssh_key_type_ (ONMainWindow::RSA_KEY_TYPE), mode (server), parent (par)
 {
-    mode=server;
-    parent=par;
 }
 
 void WinServerStarter::run()
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index dc3e6ec..144241f 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1259,7 +1259,7 @@ public:
 private:
     daemon mode;
     ONMainWindow* parent;
-    ONMainWindow::key_types ssh_key_type_ = RSA_KEY_TYPE;
+    ONMainWindow::key_types ssh_key_type_;
 };
 #endif
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git