[Libreoffice-commits] online.git: 2 commits - loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/LOOLKit.cpp

[Miklos Vajna]

 loolwsd/ChildProcessSession.cpp |    2 --
 loolwsd/ChildProcessSession.hpp |    2 --
 loolwsd/LOOLKit.cpp             |    2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit f46a43b5f586a81c1cff8df871580177cad30a4f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 1 09:53:37 2016 +0100

    loolwsd: fix -Werror,-Wunused-parameter

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 1a9982a..ae22965 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -307,7 +307,6 @@ std::recursive_mutex ChildProcessSession::Mutex;
 
 ChildProcessSession::ChildProcessSession(const std::string& id,
                                          std::shared_ptr<Poco::Net::WebSocket> ws,
-                                         LibreOfficeKit* loKit,
                                          LibreOfficeKitDocument * loKitDocument,
                                          const std::string& jailId,
                                          std::function<LibreOfficeKitDocument*(const std::string&, const std::string&, const std::string&, bool)> onLoad,
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 50a750f..b5e3511 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -63,7 +63,6 @@ public:
     //         used by downloadas to construct jailed path.
     ChildProcessSession(const std::string& id,
                         std::shared_ptr<Poco::Net::WebSocket> ws,
-                        LibreOfficeKit *loKit,
                         LibreOfficeKitDocument * loKitDocument,
                         const std::string& jailId,
                         std::function<LibreOfficeKitDocument*(const std::string&, const std::string&, const std::string&, bool)> onLoad,
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 27f4993..7dc7772 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -405,7 +405,7 @@ public:
         auto ws = std::make_shared<WebSocket>(cs, request, response);
         ws->setReceiveTimeout(0);
 
-        auto session = std::make_shared<ChildProcessSession>(sessionId, ws, _loKit, _loKitDocument, _jailId,
+        auto session = std::make_shared<ChildProcessSession>(sessionId, ws, _loKitDocument, _jailId,
                        [this](const std::string& id, const std::string& uri, const std::string& docPassword, bool isDocPasswordProvided) { return onLoad(id, uri, docPassword, isDocPasswordProvided); },
                        [this](const std::string& id) { onUnload(id); });
         // child -> 0,  sessionId -> 1, PID -> 2
commit a010c01bd7fcc91d7af7172d379c649577753ba8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 1 09:50:48 2016 +0100

    loolwsd: fix -Werror,-Wunused-private-field

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 0f9ad2b..1a9982a 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -313,7 +313,6 @@ ChildProcessSession::ChildProcessSession(const std::string& id,
                                          std::function<LibreOfficeKitDocument*(const std::string&, const std::string&, const std::string&, bool)> onLoad,
                                          std::function<void(const std::string&)> onUnload) :
     LOOLSession(id, Kind::ToMaster, ws),
-    _loKit(loKit),
     _loKitDocument(loKitDocument),
     _multiView(getenv("LOK_VIEW_CALLBACK")),
     _jailId(jailId),
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 66d78f6..50a750f 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -123,7 +123,6 @@ private:
     virtual bool _handleInput(const char *buffer, int length) override;
 
 private:
-    LibreOfficeKit *_loKit;
     LibreOfficeKitDocument *_loKitDocument;
     std::string _docType;
     const bool _multiView;