Merge branch 'asl/hydro_porting_741'

[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
index 58f5fdb3126b02665c6e9910147124672fb37964..0bdab8ab6530948ec9ae76befa717514f4006272 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -1,45 +1,43 @@
-//  SALOME Session : implementation of Session.idl
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : Session_Session_i.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
 
 #ifndef _SESSION_SESSION_I_HXX_
 #define _SESSION_SESSION_I_HXX_
 
-#include <SALOME_Session.hxx>
-
-#include <qthread.h> 
+#include "SALOME_Session.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include CORBA_SERVER_HEADER(SALOME_Session)
 class SALOME_NamingService;
 
+class QMutex;
+class QWaitCondition;
+
 class SESSION_EXPORT SALOME_Session_i:  public virtual POA_SALOME::Session,
-                        public virtual PortableServer::ServantBase
+                         public virtual PortableServer::ServantBase
 {
 public:
   SALOME_Session_i(int argc, 
@@ -54,7 +52,7 @@ public:
   void GetInterface();
 
   //! Return VISU component
-  Engines::Component_ptr GetComponent(const char* theLibraryName);
+  Engines::EngineComponent_ptr GetComponent(const char* theLibraryName);
 
   //! Stop the Session (must be idle): kill servant & server
   void StopSession();
@@ -62,13 +60,19 @@ public:
   //! Get session state
   SALOME::StatSession GetStatSession();
 
+  //! Shutdown session
+  void Shutdown();
+
   //! Register the servant to Naming Service
   void NSregister();
+  //! Unregister the servant from Naming Service
+  void NSunregister();
 
   CORBA::Long GetActiveStudyId();
 
   void ping(){};
-  CORBA::Long getPID() { return (CORBA::Long)getpid(); };
+  CORBA::Long getPID();
+  char* getHostname();
 
   //! Restors a visual state of the study at theSavePoint
   bool restoreVisualState(CORBA::Long theSavePoint);
@@ -90,7 +94,7 @@ protected:
   int _runningStudies ;
   CORBA::ORB_var _orb;
   PortableServer::POA_var _poa;
+  bool _isShuttingDown;
 };
 
 #endif
-