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

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

commit 02d2d76ec47635f79adb5b23da5569b5ce3074e3
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Oct 29 04:20:15 2015 +0100

    pulsemanager.{cpp,h}: switch port definitions to std::uint16_t.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    4 ++--
 src/pulsemanager.h   |    7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97a0d11..d1b2aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -170,6 +170,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.cpp: use initializer list for constructor.
     - pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables.
     - pulsemanager.cpp: reformat only.
+    - pulsemanager.{cpp,h}: switch port definitions to std::uint16_t.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index cd390bf..33d77d6 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -237,11 +237,11 @@ void PulseManager::shutdown () {
   loop.exec ();
 }
 
-int PulseManager::get_pulse_port () {
+std::uint16_t PulseManager::get_pulse_port () {
   return (pulse_port_);
 }
 
-void PulseManager::set_pulse_port (int pulse_port) {
+void PulseManager::set_pulse_port (std::uint16_t pulse_port) {
   pulse_port_ = pulse_port;
 }
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 5b1fe37..9252739 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -35,6 +35,7 @@
 #include <QApplication>
 #include <QTimer>
 #include <assert.h>
+#include <cstdint>
 #include "x2gologdebug.h"
 #include "x2gosettings.h"
 
@@ -44,8 +45,8 @@ class PulseManager: public QObject {
   public:
     PulseManager ();
     ~PulseManager ();
-    int get_pulse_port ();
-    void set_pulse_port (int pulse_port);
+    std::uint16_t get_pulse_port ();
+    void set_pulse_port (std::uint16_t pulse_port);
     QProcess::ProcessState state ();
 
   public slots:
@@ -78,7 +79,7 @@ class PulseManager: public QObject {
     QDir pulse_dir_;
     QProcessEnvironment env_;
     QProcess *pulse_server_;
-    int pulse_port_;
+    std::uint16_t pulse_port_;
     QProcess::ProcessState state_;
     QString app_dir_;
     uint32_t pulse_version_major_;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to