Merge from V6_main 06/03/2013

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

diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx
index de87612edb8aaa2634a61b0935f080c15a8bfa40..7811af57e0c94238e1111b80cb8c009d8836a173 100755 (executable)
--- a/src/Session/Session_ServerThread.hxx
+++ b/src/Session/Session_ServerThread.hxx
@@ -1,46 +1,43 @@
-//  SALOME Session : implementation of Session_ServerThread.hxx
+// 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  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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
+//
+
+//  SALOME Session : implementation of Session_ServerThread.hxx
 //  File   : Session_ServerThread.hxx
 //  Author : Paul RASCLE, EDF
-//  Module : SALOME
-//  $Header$
 
 #ifndef _SESSION_SERVERTHREAD_HXX_
 #define _SESSION_SERVERTHREAD_HXX_
 
-#include <CORBA.h> 
-#include <string>
-
-#include "SALOME_NamingService.hxx"
-#include <qthread.h>
+#include "SALOME_Session.hxx"
 
-using namespace std;
+#include <omniORB4/CORBA.h> 
+#include <string>
 
-void WaitForServerReadiness(string serverName);
+void WaitForServerReadiness(std::string serverName);
 
+class SALOME_NamingService;
+class Engines_Container_i;
 
-class Session_ServerThread
+class SESSION_EXPORT Session_ServerThread
 {
 public:
   static const int NB_SRV_TYP;
@@ -48,11 +45,12 @@ public:
 
   Session_ServerThread();
   Session_ServerThread(int argc,
-                      char ** argv, 
-                      CORBA::ORB_ptr orb, 
-                      PortableServer::POA_ptr poa);
+                       char ** argv, 
+                       CORBA::ORB_ptr orb, 
+                       PortableServer::POA_ptr poa);
   virtual ~Session_ServerThread();
   void         Init();
+  void         Shutdown();
 protected:
   void         ActivateModuleCatalog   ( int argc, char ** argv );
   void         ActivateSALOMEDS        ( int argc, char ** argv );
@@ -68,19 +66,22 @@ protected:
   CORBA::ORB_var          _orb;
   PortableServer::POA_var _root_poa;
   SALOME_NamingService *  _NS;
+  Engines_Container_i*    _container;
 };
 
+class QMutex;
+class QWaitCondition;
 
-class Session_SessionThread : public Session_ServerThread
+class SESSION_EXPORT Session_SessionThread : public Session_ServerThread
 {
 public:
   Session_SessionThread() {}
   Session_SessionThread(int argc,
-                      char** argv, 
-                      CORBA::ORB_ptr orb, 
-                      PortableServer::POA_ptr poa,
-                      QMutex* GUIMutex,
-                       QWaitCondition* GUILauncher);
+                       char** argv, 
+                       CORBA::ORB_ptr orb, 
+                       PortableServer::POA_ptr poa,
+                       QMutex* GUIMutex,
+                       QWaitCondition* GUILauncher);
   virtual ~Session_SessionThread();  
 
 protected: