[X2Go-Commits] [x2goclient] 251/267: src/onmainwindow.h: move WinServerStarter class definition around to hopefully get the definition of ONMainWindow::key_types.

git-admin at x2go.org git-admin at x2go.org
Sat Dec 10 13:36:27 CET 2016


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

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

commit 709973da1498a4fc174a3f99acea87fb4ec9cf6b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 26 20:36:14 2016 +0200

    src/onmainwindow.h: move WinServerStarter class definition around to hopefully get the definition of ONMainWindow::key_types.
---
 debian/changelog   |    2 ++
 src/onmainwindow.h |   35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 591292d..7721b81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -452,6 +452,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       startWinServers ().
     - src/onmainwindow.cpp: actually use key_type parameter in startSshd ()
       and make selection more generic.
+    - src/onmainwindow.h: move WinServerStarter class definition around to
+      hopefully get the definition of ONMainWindow::key_types.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index f9a9e4b..840ea83 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -247,22 +247,6 @@ class WWrapper : public QPushButton
 {
     friend class ONMainWindow;
 };
-#include <QThread>
-#include <QMutex>
-class ONMainWindow;
-class WinServerStarter: public QThread
-{
-public:
-    enum daemon {X,SSH};
-    WinServerStarter ( daemon server, ONMainWindow * par );
-    void run();
-    void set_ssh_key_type (ONMainWindow::key_types key_type);
-    ONMainWindow::key_types get_ssh_key_type ();
-private:
-    daemon mode;
-    ONMainWindow* parent;
-    key_types ssh_key_type_ = RSA_KEY_TYPE;
-};
 #endif
 
 
@@ -1269,4 +1253,23 @@ private slots:
 ////////////////end of plugin stuff////////////////////
 };
 
+#ifdef Q_OS_WIN
+#include <QThread>
+#include <QMutex>
+class ONMainWindow;
+class WinServerStarter: public QThread
+{
+public:
+    enum daemon {X,SSH};
+    WinServerStarter ( daemon server, ONMainWindow * par );
+    void run();
+    void set_ssh_key_type (ONMainWindow::key_types key_type);
+    ONMainWindow::key_types get_ssh_key_type ();
+private:
+    daemon mode;
+    ONMainWindow* parent;
+    ONMainWindow::key_types ssh_key_type_ = RSA_KEY_TYPE;
+};
+#endif
+
 #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