[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLSession.hpp loolwsd/MasterProcessSession.hpp

[Tor Lillqvist]

 loolwsd/LOOLSession.hpp          |    4 ++--
 loolwsd/MasterProcessSession.hpp |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 7bc269049738b04e2213f541edac07bfd6fbb9bc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 18 16:10:25 2016 +0200

    More members can be private

diff --git a/loolwsd/MasterProcessSession.hpp b/loolwsd/MasterProcessSession.hpp
index ce39836..87607fb 100644
--- a/loolwsd/MasterProcessSession.hpp
+++ b/loolwsd/MasterProcessSession.hpp
@@ -59,6 +59,7 @@ public:
 
     virtual void sendFontRendering(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
 
+private:
     void dispatchChild();
     void forwardToPeer(const char *buffer, int length);
 
@@ -73,14 +74,11 @@ public:
 
     std::unique_ptr<TileCache> _tileCache;
 
-private:
-
     static
     Poco::Path getJailPath(const std::string& childId);
 
     virtual bool _handleInput(const char *buffer, int length) override;
 
-private:
     int _curPart;
     int _loadPart;
     /// Kind::ToClient instances store URLs of completed 'save as' documents.
commit 26ccae2ac65ae7678d95d6dc476cf337445879f0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 18 16:09:15 2016 +0200

    Add vim mode line

diff --git a/loolwsd/MasterProcessSession.hpp b/loolwsd/MasterProcessSession.hpp
index c1b6dd6..ce39836 100644
--- a/loolwsd/MasterProcessSession.hpp
+++ b/loolwsd/MasterProcessSession.hpp
@@ -90,3 +90,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e55df2d02150e225f612676fa624bebac23b1f7d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 18 15:25:23 2016 +0200

    The jailed processes are not "loolwsd" in any sense any more

diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 6a55c72..33f9d34 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -34,8 +34,8 @@ class LOOLSession
 public:
     /// We have three kinds of Websocket sessions
     /// 1) Between the master loolwsd server to the end-user LOOL client
-    /// 2) Between the master loolwsd server and a jailed loolwsd child process, in the master process
-    /// 3) Ditto, in the jailed loolwsd process
+    /// 2) Between the master loolwsd server and a jailed child process, in the master process
+    /// 3) Ditto, in the jailed process
     enum class Kind { ToClient, ToPrisoner, ToMaster };
 
     const std::string& getId() const { return _id; }