[X2Go-Commits] [x2goclient] 02/04: help.{cpp, h}: also pass the help message on (for display in graphical mode.)

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/help-cmd
in repository x2goclient.

commit f6a07c574f5878d44692e4c25a7a927097df3232
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 22 10:32:44 2015 +0200

    help.{cpp,h}: also pass the help message on (for display in graphical mode.)
---
 debian/changelog |    2 ++
 src/help.cpp     |    4 +++-
 src/help.h       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e79542..e5459d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -267,6 +267,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - help.cpp: "copy" old command line parameters.
     - help.cpp: document broker options. Fixes: #851.
     - help.cpp: actually output the help message.
+    - help.{cpp,h}: also pass the help message on (for display in graphical
+      mode.)
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/help.cpp b/src/help.cpp
index 1d5a70f..d528698 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -142,7 +142,7 @@ help::data_t help::build_data () {
   return (help::data_t (help::cleanup_prelude (help::build_prelude ()), help::cleanup_params (help::build_params ())));
 }
 
-void help::pretty_print (help::data_t data) {
+QTextStream help::pretty_print (help::data_t data) {
   help::data_t data = help::build_data ();
 
   QTextStream out << data.first.join ("\n") << "\n";
@@ -238,4 +238,6 @@ void help::pretty_print (help::data_t data) {
   }
 
   qCritical << out;
+
+  return (out);
 }
diff --git a/src/help.h b/src/help.h
index 8cc26b2..01a2f10 100644
--- a/src/help.h
+++ b/src/help.h
@@ -45,7 +45,7 @@ namespace help {
   params_t cleanup_params (params_t params);
 
   /* Prints a help_data_t structure. */
-  void pretty_print (data_t data);
+  QTextStream pretty_print (data_t data);
 }
 
 #endif /* !defined (HELP_H) */

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