Merge from PHASE_25_BR 09/12/2010

[modules/smesh.git] / src / SMESH_I / SMESH_MEDFamily_i.hxx

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx
index 4dd63f3a1f99d0cd599e4a4fa75ff423f7fb80ab..27f4d80b585d0317aaa991daa2fdbf2b4aedc112 100644 (file)
--- a/src/SMESH_I/SMESH_MEDFamily_i.hxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx
@@ -1,29 +1,29 @@
-//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+//  Copyright (C) 2007-2010  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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
+//
+
+//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
 //  File   : SMESH_MEDFamily_i.hxx
 //  Module : SMESH
-
+//
 #ifndef SMESH_MED_FAMILY_I_HXX_
 #define SMESH_MED_FAMILY_I_HXX_
 
@@ -48,16 +48,16 @@ protected :
   int       _numberOfAttribute;
   int    *  _attributeIdentifier;
   int    *  _attributeValue;
-  string *  _attributeDescription;
+  std::string *  _attributeDescription;
   int       _numberOfGroup ;
-  string *  _groupName ;
+  std::string *  _groupName ;
   
 
 public :
   
   // Constructors and associated internal methods
   SMESH_MEDFamily_i(int identifier, SMESH_subMesh_i* sm,
-                   string name, string description, SALOME_MED::medEntityMesh entity );
+                    std::string name, std::string description, SALOME_MED::medEntityMesh entity );
   SMESH_MEDFamily_i(const SMESH_MEDFamily_i & f);
   
   // IDL Methods
@@ -70,15 +70,15 @@ public :
     throw (SALOME::SALOME_Exception);
   CORBA::Long            getNumberOfAttributes() 
     throw (SALOME::SALOME_Exception);
-  SALOME_MED::long_array*   getAttributesIdentifiers() 
+  SALOME_TYPES::ListOfLong*   getAttributesIdentifiers() 
     throw (SALOME::SALOME_Exception);
   CORBA::Long            getAttributeIdentifier(CORBA::Long i) 
     throw (SALOME::SALOME_Exception);
-  SALOME_MED::long_array*   getAttributesValues() 
+  SALOME_TYPES::ListOfLong*   getAttributesValues() 
     throw (SALOME::SALOME_Exception);
   CORBA::Long            getAttributeValue(CORBA::Long i) 
     throw (SALOME::SALOME_Exception);
-  SALOME_MED::string_array* getAttributesDescriptions() 
+  SALOME_TYPES::ListOfString* getAttributesDescriptions() 
     throw (SALOME::SALOME_Exception);
   char*                  getAttributeDescription( CORBA::Long i) 
     throw (SALOME::SALOME_Exception);
@@ -86,7 +86,7 @@ public :
     throw (SALOME::SALOME_Exception);
   char *                    getGroupName( CORBA::Long i)
     throw (SALOME::SALOME_Exception);
-  SALOME_MED::string_array* getGroupsNames()
+  SALOME_TYPES::ListOfString* getGroupsNames()
     throw (SALOME::SALOME_Exception);  
 };
 #endif /* MED_FAMILY_I_HXX_ */