[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - kit/Kit.cpp

[Libreoffice Gerrit user]

 kit/Kit.cpp |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit d12d46ed02890f5533fbca6d506c1efac718d826
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri May 10 18:03:11 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 10 18:07:12 2019 +0100

    unipoll: remove now redundant SocketPoll parameters.
    
    Change-Id: I8308a0b503db34ac43658a5461005a32132d392f

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index dfa80055e..fa80d1a69 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -873,7 +873,6 @@ public:
              const std::string& docId,
              const std::string& url,
              std::shared_ptr<TileQueue> tileQueue,
-             SocketPoll& socketPoll,
              const std::shared_ptr<WebSocketHandler>& websocketHandler)
       : _loKit(loKit),
         _jailId(jailId),
@@ -882,7 +881,6 @@ public:
         _url(url),
         _obfuscatedFileId(Util::getFilenameFromURL(docKey)),
         _tileQueue(std::move(tileQueue)),
-        _socketPoll(socketPoll),
         _websocketHandler(websocketHandler),
         _docPassword(""),
         _haveDocPassword(false),
@@ -2172,7 +2170,6 @@ private:
 
     std::shared_ptr<lok::Document> _loKitDocument;
     std::shared_ptr<TileQueue> _tileQueue;
-    SocketPoll& _socketPoll;
     std::shared_ptr<WebSocketHandler> _websocketHandler;
 
     std::mutex _pngMutex;
@@ -2220,16 +2217,14 @@ class KitWebSocketHandler final : public WebSocketHandler, public std::enable_sh
     std::string _socketName;
     std::shared_ptr<lok::Office> _loKit;
     std::string _jailId;
-    SocketPoll& _socketPoll;
 
 public:
-    KitWebSocketHandler(const std::string& socketName, const std::shared_ptr<lok::Office>& loKit, const std::string& jailId, SocketPoll& socketPoll) :
+    KitWebSocketHandler(const std::string& socketName, const std::shared_ptr<lok::Office>& loKit, const std::string& jailId) :
         WebSocketHandler(/* isClient = */ true, /* isMasking */ false),
         _queue(std::make_shared<TileQueue>()),
         _socketName(socketName),
         _loKit(loKit),
-        _jailId(jailId),
-        _socketPoll(socketPoll)
+        _jailId(jailId)
     {
     }
 
@@ -2281,9 +2276,7 @@ protected:
             LOG_INF("New session [" << sessionId << "] request on url [" << url << "].");
 
             if (!document)
-            {
-                document = std::make_shared<Document>(_loKit, _jailId, docKey, docId, url, _queue, _socketPoll, shared_from_this());
-            }
+                document = std::make_shared<Document>(_loKit, _jailId, docKey, docId, url, _queue, shared_from_this());
 
             // Validate and create session.
             if (!(url == document->getUrl() && document->createSession(sessionId)))
@@ -2736,7 +2729,7 @@ void lokit_main(
         mainKit.runOnClientThread(); // We will do the polling on this thread.
 
         std::shared_ptr<SocketHandlerInterface> websocketHandler =
-            std::make_shared<KitWebSocketHandler>("child_ws", loKit, jailId, mainKit);
+            std::make_shared<KitWebSocketHandler>("child_ws", loKit, jailId);
 #if !MOBILEAPP
         mainKit.insertNewUnixSocket(MasterLocation, pathAndQuery, websocketHandler);
 #else