GUI evolutions for salome gui without neither NS nor other servers.

[modules/gui.git] / src / Session / Session_Session_i.hxx

diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 1fbcc4d..1d9d5e8
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -31,21 +31,18 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include CORBA_SERVER_HEADER(SALOME_Session)
-class SALOME_NamingService;
+
+#include <memory>
 
 class QMutex;
 class QWaitCondition;
+class SALOME_NamingService_Abstract;
 
-class SESSION_EXPORT SALOME_Session_i:  public virtual POA_SALOME::Session,
-                         public virtual PortableServer::ServantBase
+class SESSION_EXPORT SALOME_Session_i :  public virtual POA_SALOME::Session, public virtual PortableServer::ServantBase
 {
 public:
-  SALOME_Session_i(int argc, 
-                   char ** argv, 
-                   CORBA::ORB_ptr orb, 
-                   PortableServer::POA_ptr poa, 
-                   QMutex* GUIMutex,
-                   QWaitCondition* GUILauncher);
+  SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, QMutex* GUIMutex, QWaitCondition* GUILauncher);
+  SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, QMutex* GUIMutex, QWaitCondition* GUILauncher, SALOME_NamingService_Abstract *NS);
   ~SALOME_Session_i();
 
   //! Launch Graphical User Interface
@@ -85,7 +82,7 @@ public:
 protected:
 
   //! Naming service interface
-  SALOME_NamingService *_NS;
+  std::unique_ptr<SALOME_NamingService_Abstract> _NS;
 
   int _argc ;
   char **_argv;
@@ -95,6 +92,8 @@ protected:
   CORBA::ORB_var _orb;
   PortableServer::POA_var _poa;
   bool _isShuttingDown;
+
+  void deleteContainersinNS();
 };
 
 #endif