[X2Go-Commits] [x2goclient] 253/280: 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
git-admin at x2go.org
Wed Jan 18 12:26:16 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit e78ee215eb4fa7508a80a82d1a0b2d8ce9be964f
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 bb90744..af81ca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -477,6 +477,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 7de4eb0..7795224 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9983,10 +9983,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 cbf4118..61c66de 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1260,7 +1260,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
More information about the x2go-commits
mailing list