[X2Go-Commits] [x2goclient] 01/59: onmainwindow.{cpp, h}: rename slotScDaemonOut() and slotScDaemonError() to slotScDaemonStdOut() and slotScDaemonStdErr().

git-admin at x2go.org git-admin at x2go.org
Wed Jun 3 03:10:40 CEST 2015


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

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

commit 6c83109951d264f1948dc6a57123f2f7cac73948
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri May 29 02:09:55 2015 +0200

    onmainwindow.{cpp,h}: rename slotScDaemonOut() and slotScDaemonError() to slotScDaemonStdOut() and slotScDaemonStdErr().
    
    I will need slotScDaemonError() later and the previous names were a bit
    of a misnomer.
---
 debian/changelog     |    4 ++++
 src/onmainwindow.cpp |    8 ++++----
 src/onmainwindow.h   |    4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index daae4cc..57b84a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
   * New upstream release (4.0.4.1):
     - INSTALL: add more verbose instructions on how to build X2Go Client and
       friends.
+    - onmainwindow.{cpp,h}: rename slotScDaemonOut() and slotScDaemonError()
+      to slotScDaemonStdOut() and slotScDaemonStdErr(). I will need
+      slotScDaemonError() later and the previous names were a bit of a
+      misnomer.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index eba9a3a..a26217e 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8335,9 +8335,9 @@ void ONMainWindow::slotStartPGPAuth()
     QStringList arguments;
     arguments<<"--multi-server";
     connect ( scDaemon,SIGNAL ( readyReadStandardError() ),this,
-              SLOT ( slotScDaemonError() ) );
+              SLOT ( slotScDaemonStdErr() ) );
     connect ( scDaemon,SIGNAL ( readyReadStandardOutput() ),this,
-              SLOT ( slotScDaemonOut() ) );
+              SLOT ( slotScDaemonStdOut() ) );
     connect ( scDaemon,SIGNAL ( finished ( int,QProcess::ExitStatus ) ),
               this,
               SLOT (
@@ -8355,7 +8355,7 @@ void ONMainWindow::slotCheckScDaemon()
     }
 }
 
-void ONMainWindow::slotScDaemonError()
+void ONMainWindow::slotScDaemonStdErr()
 {
     QString stdOut ( scDaemon->readAllStandardError() );
     stdOut=stdOut.simplified();
@@ -8375,7 +8375,7 @@ void ONMainWindow::slotScDaemonError()
     }
 }
 
-void ONMainWindow::slotScDaemonOut()
+void ONMainWindow::slotScDaemonStdOut()
 {
     QString stdOut ( scDaemon->readAllStandardOutput() );
     stdOut=stdOut.simplified();
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 1797258..7a2a806 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1109,8 +1109,8 @@ private slots:
     void slotRereadUsers();
     void slotExtTimer();
     void slotStartPGPAuth();
-    void slotScDaemonOut();
-    void slotScDaemonError();
+    void slotScDaemonStdOut();
+    void slotScDaemonStdErr();
     void slotGpgFinished ( int exitCode,
                            QProcess::ExitStatus exitStatus );
     void slotScDaemonFinished ( int exitCode,

--
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