[X2Go-Commits] [x2goclient] 05/07: src/onmainwindow.cpp: fix various broken qCritical () calls.

git-admin at x2go.org git-admin at x2go.org
Thu Mar 28 11:33:34 CET 2019


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 05ce22d365d4353e558b3ed4677fef0c424e88c9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 28 08:19:59 2019 +0100

    src/onmainwindow.cpp: fix various broken qCritical () calls.
---
 debian/changelog     | 1 +
 src/onmainwindow.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79b0048..bb37f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       needed here, but that should cover the most basic bits.
     - src/onmainwindow.{cpp,h}: remove left-over references to agentCheckTimer
       and slotCheckAgentProcess ().
+    - src/onmainwindow.cpp: fix various broken qCritical () calls.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f95a81a..5b8098c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8088,7 +8088,7 @@ void ONMainWindow::showHelpPack()
         msg+=pc+"\n";
     }
     file.close();
-    qCritical()<<msg;
+    qCritical().nospace () << qPrintable (msg);
     if (!startHidden && !haveTerminal)
     {
         HelpDialog dlg(this);
@@ -8106,7 +8106,7 @@ void ONMainWindow::showTextFile(QString fname, QString title)
     QTextStream in ( &file );
     QString msg=in.readAll();
     file.close();
-    qCritical()<<msg;
+    qCritical().nospace () << qPrintable (msg);
     if (!startHidden && !haveTerminal)
     {
         HelpDialog dlg(this);
@@ -8140,7 +8140,7 @@ void ONMainWindow::showGit()
 
 void ONMainWindow::showVersion()
 {
-    qCritical()<<VERSION;
+    qCritical().nospace () << VERSION;
 
     if (!startHidden && !haveTerminal)
     {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list