Merge from V6_main_20120808 08Aug12

[samples/component.git] / src / AddComponent / Adder_Impl.cxx

diff --git a/src/AddComponent/Adder_Impl.cxx b/src/AddComponent/Adder_Impl.cxx
index f78a4bcabf64d39f401bcefc0bdd9f2a9203b75d..84dbc86835d2b4a2d09ba8886261b19d3ae8b6bc 100644 (file)
--- a/src/AddComponent/Adder_Impl.cxx
+++ b/src/AddComponent/Adder_Impl.cxx
@@ -1,24 +1,25 @@
-//  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
 //
+
 //  SuperVisionTest AddComponent : example of component that adds two numbers
 //  File   : AddComponent_Impl.cxx
 //  Author : Jean Rahuel, CEA
@@ -161,11 +162,11 @@ void Adder_Impl::LastResult( CORBA::Double & z ) {
   return ;
 }
 
-Engines::Component_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
-                                                    const char * aComponentName ) {
+Engines::EngineComponent_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
+                                                          const char * aComponentName ) {
   beginService( "Adder_Impl::LccAddComponent" );
-  Engines::Component_ptr objComponent ;
-  objComponent = Engines::Component::_nil() ;
+  Engines::EngineComponent_ptr objComponent ;
+  objComponent = Engines::EngineComponent::_nil() ;
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
@@ -180,4 +181,3 @@ Engines::Component_ptr Adder_Impl::LccAddComponent( const char * aContainer ,
   endService( "Adder_Impl::LccAddComponent"  );
   return objComponent ;
 }
-