Merge from V6_main_20120808 08Aug12

[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 c691a2ba28ad59d6c9ba922eeb54fde735f9ac9b..b03803d5bd32c3509f24b01b3d993bcbf7d8661a 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -1,30 +1,28 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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.
+// 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  SALOME Session : implementation of Session.idl
 //  File   : Session_Session_i.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
-//
+
 #ifndef _SESSION_SESSION_I_HXX_
 #define _SESSION_SESSION_I_HXX_
 
@@ -39,7 +37,7 @@ 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();
+  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
-