[X2Go-Commits] [x2goclient] 100/276: pulsemanager.{cpp, h}: rename relaunch () to restart ().

git-admin at x2go.org git-admin at x2go.org
Sat Dec 31 01:34:43 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 992c4724d25c83bc628c7236fad9b51ad0f90ad9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Oct 30 02:32:34 2015 +0100

    pulsemanager.{cpp,h}: rename relaunch () to restart ().
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    2 +-
 src/pulsemanager.h   |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ddf60b..92e7499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.h: add std:: namespace selector for uint32_t version
       variables.
     - pulsemanager.{cpp,h}: add ESD support.
+    - pulsemanager.{cpp,h}: rename relaunch () to restart ().
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index c92d64f..6999c18 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -286,7 +286,7 @@ void PulseManager::set_esd_port (std::uint16_t esd_port) {
   esd_port_ = esd_port;
 }
 
-void PulseManager::relaunch () {
+void PulseManager::restart () {
   if (pulse_server_ && is_server_running ())
     shutdown ();
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 22ab771..aae71e3 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -53,7 +53,7 @@ class PulseManager: public QObject {
 
   public slots:
     void start ();
-    void relaunch ();
+    void restart ();
 
   private:
     PulseManager (const PulseManager &other);

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