Merge from V6_main 13/12/2012

[samples/hello.git] / src / HELLO / HELLO.hxx

diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index 363ea27ac98cc738c88e4796a18e1ee2145dd32d..25d869f58f74eb3adb3bff3359d3ee776f78d2d2 100644 (file)
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -1,11 +1,14 @@
-// Copyright (C) 2005  CEA/DEN, EDF R&D
+// 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
 //
 // 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
+// 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.
@@ -14,41 +17,41 @@
 // 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef _HELLO_HXX_
 #define _HELLO_HXX_
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(HELLO_Gen)
-#include "SALOME_Component_i.hxx"
+#include <SALOME_Component_i.hxx>
 
 class HELLO:
   public POA_HELLO_ORB::HELLO_Gen,
   public Engines_Component_i 
 {
-
 public:
-    HELLO(CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           PortableServer::ObjectId * contId, 
-           const char *instanceName, 
-           const char *interfaceName);
-    virtual ~HELLO();
-
-    //
-
-    char* makeBanner(const char* name);
-
+  HELLO( CORBA::ORB_ptr orb,
+        PortableServer::POA_ptr poa,
+        PortableServer::ObjectId* contId, 
+        const char* instanceName, 
+        const char* interfaceName );
+  virtual ~HELLO();
+
+  HELLO_ORB::status hello  ( SALOMEDS::Study_ptr study, const char* name );
+  HELLO_ORB::status goodbye( SALOMEDS::Study_ptr study, const char* name );
+  void              copyOrMove( const HELLO_ORB::object_list& what,
+                               SALOMEDS::SObject_ptr where,
+                               CORBA::Long row, CORBA::Boolean isCopy );
+  virtual char*     getVersion();
 };
 
 extern "C"
-    PortableServer::ObjectId * HELLOEngine_factory(
-           CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           PortableServer::ObjectId * contId,
-           const char *instanceName,
-           const char *interfaceName);
-
+PortableServer::ObjectId* HELLOEngine_factory( CORBA::ORB_ptr orb,
+                                              PortableServer::POA_ptr poa,
+                                              PortableServer::ObjectId* contId,
+                                              const char* instanceName,
+                                              const char* interfaceName );
 
 #endif