[X2Go-Commits] [x2goclient] 02/02: help.h: fix run time error by actually giving QTextStream a "device" to write to.

[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 462e8f226f1c8df7267bbf764400af9156590f9f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 22 11:52:30 2015 +0200

    help.h: fix run time error by actually giving QTextStream a "device" to write to.
---
 debian/changelog |    4 +++-
 src/help.cpp     |    5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8062f3..bfa56c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -271,7 +271,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       mode.)
     - x2goclient.pro{,.maemo}: add new help.{cpp,h} files.
     - onmainwindow.cpp: replace old help system with new one.
-    - {{onmainwindow,help}.cpp},helph}: fix misc. build errors.
+    - {{onmainwindow,help}.cpp},help.h}: fix misc. build errors.
+    - help.h: fix run time error by actually giving QTextStream a "device" to
+      write to.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/help.cpp b/src/help.cpp
index 4855a3a..a8caf2b 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -152,7 +152,8 @@ QString help::pretty_print () {
 }
 
 QString help::pretty_print (help::data_t data) {
-  QTextStream out;
+  QString ret = "";
+  QTextStream out (&ret);
   out << data.first.join ("\n") << "\n";
 
   std::size_t max_len = 0;
@@ -245,8 +246,6 @@ QString help::pretty_print (help::data_t data) {
     out << "\n";
   }
 
-  QString ret  = out.readAll ();
-
   qCritical () << ret;
 
   return (ret);

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