Porting SALOME KERNEL to CMake

[modules/kernel.git] / src / LifeCycleCORBA / SALOME_LifeCycleCORBA.hxx

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index c2d7a825a427cd9e7b332405a25477bc285d9d6b..be24867f0cdc723ff86818e3a9cff511163ff7df 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.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 LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
 //  File   : SALOME_LifeCycleCORBA.hxx
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
 //  Module : SALOME
-//  $Header$
-//
+
 #ifndef _SALOME_LIFECYCLECORBA_HXX_
 #define _SALOME_LIFECYCLECORBA_HXX_
 
@@ -66,33 +64,33 @@ public:
   SALOME_LifeCycleCORBA(SALOME_NamingService *ns = 0);
   virtual ~SALOME_LifeCycleCORBA();
 
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindComponent(const Engines::MachineParameters& params,
                 const char *componentName,
                 int studyId=0);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   LoadComponent(const Engines::MachineParameters& params,
                 const char *componentName,
                 int studyId=0);
 
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindOrLoad_Component(const Engines::MachineParameters& params,
                        const char *componentName,
                        int studyId =0);
 
   // SALOME 6 - Interface
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindOrLoad_Component(const Engines::ContainerParameters& params,
                        const char *componentName,
                        int studyId =0);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   FindOrLoad_Component(const char *containerName,
                        const char *componentName); // for compatibility
   
   // Parallel extension
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
     Load_ParallelComponent(const Engines::ContainerParameters& params,
                            const char *componentName,
                            int studyId);
@@ -128,13 +126,13 @@ protected:
    *  exists among the list of resources in "listOfMachines".
    *  This method uses Naming Service to find the component.
    */
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   _FindComponent(const Engines::ContainerParameters& params,
                  const char *componentName,
                  int studyId,
                  const Engines::ResourceList& listOfResources);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   _LoadComponent(const Engines::ContainerParameters& params,
                  const char *componentName,
                  int studyId);