Privatize KitQueue member of Document.

It is no longer used externally, also remove un-used
KitQueue reference, and constify session accessor for later.

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I69ca1d6b01a4ca97b6d4815c21c76c5ce8c939e6

kit/ChildSession.hpp

@@ -144,7 +144,7 @@ class ChildSession final : public Session
     // Only called by kit.
     void setCanonicalViewId(int viewId) { _canonicalViewId = viewId; }
 
-    int  getCanonicalViewId() { return _canonicalViewId; }
+    int  getCanonicalViewId() const { return _canonicalViewId; }
 
     void setViewRenderState(const std::string& state) { _viewRenderState = state; }
 

kit/Kit.cpp

@@ -748,7 +748,7 @@ Document::Document(const std::shared_ptr<lok::Office>& loKit, const std::string&
     , _docId(docId)
     , _url(url)
     , _obfuscatedFileId(Uri::getFilenameFromURL(docKey))
-    , _queue(std::make_shared<KitQueue>())
+    , _queue(new KitQueue())
     , _websocketHandler(websocketHandler)
     , _modified(ModifiedState::UnModified)
     , _isBgSaveProcess(false)
@@ -1145,7 +1145,7 @@ void Document::trimAfterInactivity()
     assert(descriptor && "Null callback data.");
     assert(descriptor->getDoc() && "Null Document instance.");
 
-    std::shared_ptr<KitQueue> queue = descriptor->getDoc()->_queue;
+    std::unique_ptr<KitQueue> &queue = descriptor->getDoc()->_queue;
     assert(queue && "Null KitQueue.");
 
     const std::string payload = p ? p : "(nil)";

kit/Kit.hpp

@@ -393,8 +393,6 @@ class Document final : public std::enable_shared_from_this<Document>
     /// Are we currently performing a load ?
     bool isLoadOngoing() const { return _duringLoad > 0; }
 
-    std::shared_ptr<KitQueue> getQueue() const { return _queue; }
-
     LogUiCmd& getLogUiCmd() { return logUiCmd; }
 
 private:
@@ -419,7 +417,7 @@ class Document final : public std::enable_shared_from_this<Document>
 #ifdef __ANDROID__
     static std::shared_ptr<lok::Document> _loKitDocumentForAndroidOnly;
 #endif
-    std::shared_ptr<KitQueue> _queue;
+    std::unique_ptr<KitQueue> _queue;
 
     // Connection to the coolwsd process
     std::shared_ptr<WebSocketHandler> _websocketHandler;

kit/KitWebSocket.hpp

@@ -21,7 +21,6 @@ class KitSocketPoll;
 
 class KitWebSocketHandler final : public WebSocketHandler
 {
-    std::shared_ptr<KitQueue> _queue;
     std::string _socketName;
     std::shared_ptr<lok::Office> _loKit;
     std::string _jailId;