webgui: use unique_ptr where it make sense

Move constructor/destructor into implementation part, where contained classes are defined.
hageboeck · Nov 9, 2017 · 640419c · 640419c
1 parent 5464ef8
commit 640419c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/gui/webdisplay/inc/ROOT/TWebWindow.hxx b/gui/webdisplay/inc/ROOT/TWebWindow.hxx
@@ -67,7 +67,7 @@ private:
    std::string fDefaultPage;                   ///<!  HTML page (or file name) returned when window URL is opened
    std::string fPanelName;                     ///<!  panel name which should be shown in the window
    unsigned fId{0};                            ///<!  unique identifier
-   std::shared_ptr<TWebWindowWSHandler> fWSHandler;  ///<!  specialize websocket handler for all incoming connections
+   std::unique_ptr<TWebWindowWSHandler> fWSHandler;  ///<!  specialize websocket handler for all incoming connections
    bool fShown{false};                         ///<!  true when window was shown at least once
    unsigned fConnCnt{0};                       ///<!  counter of new connections to assign ids
    std::list<WebConn> fConn;                   ///<!  list of all accepted connections
@@ -98,7 +98,7 @@ private:
 public:
 
    /// default constructor
-   TWebWindow() = default;
+   TWebWindow();
 
    /// destructor
    ~TWebWindow();

diff --git a/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx b/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx
@@ -18,7 +18,7 @@
 
 #include <memory>
 #include <string>
-#include <list>
+// #include <list>
 
 #include "THttpEngine.h"
 
@@ -35,7 +35,7 @@ class TWebWindowsManager {
 friend class TWebWindow;
 
 private:
-   THttpServer *fServer{0};                            ///<!  central communication with the all used displays
+   std::unique_ptr<THttpServer> fServer;              ///<!  central communication with the all used displays
    std::string fAddr;                                  ///<!   HTTP address of the server
    // std::list<std::shared_ptr<TWebWindow>> fDisplays;   ///<! list of existing displays (not used at the moment)
    unsigned fIdCnt{0};                                 ///<! counter for identifiers
@@ -51,7 +51,7 @@ private:
 
 public:
    /// Default constructor
-   TWebWindowsManager() = default;
+   TWebWindowsManager();
 
    /// Destructor
    ~TWebWindowsManager();

diff --git a/gui/webdisplay/src/TWebWindow.cxx b/gui/webdisplay/src/TWebWindow.cxx
@@ -69,9 +69,16 @@ using TWebWindow::Send() method and call-back function assigned via TWebWindow::
 
 */
 
+//////////////////////////////////////////////////////////////////////////////////////////
+/// TWebWindow constructor
+/// Should be here defined here because of std::unique_ptr<TWebWindowWSHandler>
+
+ROOT::Experimental::TWebWindow::TWebWindow() = default;
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
-/// destructor - closed all connections and remove window from manager
+/// TWebWindow destructor
+/// Closes all connections and remove window from manager
 
 ROOT::Experimental::TWebWindow::~TWebWindow()
 {
@@ -101,7 +108,7 @@ void ROOT::Experimental::TWebWindow::SetPanelName(const std::string &name)
 void ROOT::Experimental::TWebWindow::CreateWSHandler()
 {
    if (!fWSHandler)
-      fWSHandler = std::make_shared<TWebWindowWSHandler>(*this, Form("win%u", GetId()));
+      fWSHandler = std::make_unique<TWebWindowWSHandler>(*this, Form("win%u", GetId()));
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/gui/webdisplay/src/TWebWindowsManager.cxx b/gui/webdisplay/src/TWebWindowsManager.cxx
@@ -49,16 +49,19 @@ std::shared_ptr<ROOT::Experimental::TWebWindowsManager> &ROOT::Experimental::TWe
    return sInstance;
 }
 
+
+//////////////////////////////////////////////////////////////////////////////////////////
+/// window manager constructor
+/// Required here for correct usage of unique_ptr<THttpServer>
+
+ROOT::Experimental::TWebWindowsManager::TWebWindowsManager() = default;
+
 //////////////////////////////////////////////////////////////////////////////////////////
 /// window manager destructor
-/// Closes THttpServer instance
+/// Required here for correct usage of unique_ptr<THttpServer>
 
 ROOT::Experimental::TWebWindowsManager::~TWebWindowsManager()
 {
-   if (fServer) {
-      delete fServer;
-      fServer = 0;
-   }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -67,7 +70,7 @@ ROOT::Experimental::TWebWindowsManager::~TWebWindowsManager()
 bool ROOT::Experimental::TWebWindowsManager::CreateHttpServer(bool with_http)
 {
    if (!fServer)
-      fServer = new THttpServer("dummy");
+      fServer = std::make_unique<THttpServer>("dummy");
 
    if (!with_http || (fAddr.length() > 0))
       return true;
@@ -217,7 +220,7 @@ bool ROOT::Experimental::TWebWindowsManager::Show(ROOT::Experimental::TWebWindow
       printf("Show canvas in Qt5 window:  %s\n", addr.Data());
 
       FunctionQt5 func = (FunctionQt5)symbol_qt5;
-      func(addr.Data(), fServer, batch_mode, win.GetWidth(), win.GetHeight());
+      func(addr.Data(), fServer.get(), batch_mode, win.GetWidth(), win.GetHeight());
       return false;
    }
 
@@ -232,7 +235,7 @@ bool ROOT::Experimental::TWebWindowsManager::Show(ROOT::Experimental::TWebWindow
       printf("Show canvas in CEF window:  %s\n", addr.Data());
 
       FunctionCef3 func = (FunctionCef3)symbol_cef;
-      func(addr.Data(), fServer, batch_mode, rootsys, cef_path, win.GetWidth(), win.GetHeight());
+      func(addr.Data(), fServer.get(), batch_mode, rootsys, cef_path, win.GetWidth(), win.GetHeight());
 
       return true;
    }