Merge from V6_main 01/04/2013

[modules/med.git] / src / MEDOP / cmp / MEDDataManager_i.hxx

diff --git a/src/MEDOP/cmp/MEDDataManager_i.hxx b/src/MEDOP/cmp/MEDDataManager_i.hxx
index d562e5e29f589058b380fbff3e87cab15f02d6c7..7c54bf5d9e7a0f10b413b44fa6169eaefd4f27b3 100644 (file)
--- a/src/MEDOP/cmp/MEDDataManager_i.hxx
+++ b/src/MEDOP/cmp/MEDDataManager_i.hxx
@@ -1,7 +1,4 @@
-// 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) 2007-2013  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -60,7 +57,7 @@ typedef map<long,MEDCouplingUMesh*>::iterator MeshMapIterator;
 
 #include "MEDOP.hxx"
 class MEDOP_EXPORT MEDDataManager_i: public POA_MEDOP::MEDDataManager,
-                                    public SALOME::GenericObj_i
+             public SALOME::GenericObj_i
 {
 public:
 
@@ -88,16 +85,16 @@ public:
   MEDOP::FieldHandlerList * getFieldHandlerList();
 
   void                      saveFields(const char * filepath,
-                                      const MEDOP::FieldIdList & fieldIdList);
+               const MEDOP::FieldIdList & fieldIdList);
   void                      markAsPersistent(CORBA::Long fieldHandlerId, bool persistent);
   void                      savePersistentFields(const char * filepath);
 
 
   void updateFieldMetadata(CORBA::Long  fieldHandlerId,
-                          const char * fieldname,
-                          CORBA::Long  iteration,
-                          CORBA::Long  order,
-                          const char * source);
+         const char * fieldname,
+         CORBA::Long  iteration,
+         CORBA::Long  order,
+         const char * source);
 
   void changeUnderlyingMesh(CORBA::Long fieldHandlerId, CORBA::Long meshHandlerId);
 
@@ -115,7 +112,7 @@ public:
   static MEDDataManager_i * getInstance();
   MEDCouplingFieldDouble *  getFieldDouble(const MEDOP::FieldHandler * fieldHandler);
   MEDOP::FieldHandler *     addField(MEDCouplingFieldDouble * fieldDouble,
-                                    long meshHandlerId=LONG_UNDEFINED);
+             long meshHandlerId=LONG_UNDEFINED);
 
 private:
   MEDDataManager_i();
@@ -140,17 +137,17 @@ private:
   string _medEventListenerIOR;
 
   MEDOP::FieldHandler * newFieldHandler(const char * fieldname,
-                                       const char * meshname,
-                                       TypeOfField  type,
-                                       long         iteration,
-                                       long         order,
-                                       const char * source);
+          const char * meshname,
+          TypeOfField  type,
+          long         iteration,
+          long         order,
+          const char * source);
 
   MEDOP::FieldHandler * updateFieldHandler(CORBA::Long fieldHandlerId,
-                                          const char * fieldname,
-                                          long         iteration,
-                                          long         order,
-                                          const char * source);
+             const char * fieldname,
+             long         iteration,
+             long         order,
+             const char * source);
 
   const char * file_to_source(const char * filepath);
   const char * source_to_file(const char * source);