X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROGUI%2FHYDROGUI_Zone.h;h=4676d40a2076d846efcddd39c33cc4ca1394ad30;hb=474c2cd65280d793f1c81ca528bc92e1cff988e6;hp=e960de24508215749b4743f4ec5e2038690951e2;hpb=7ec27726afa16572a7cab1d7936c8e899674050b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index e960de24..4676d40a 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -76,23 +76,23 @@ public:
   bool        isMergingNeed() const;
 
   /**
-   * Returns the list of bathymetries names.
+   * Returns the list of altidude object names.
    */
-  QStringList getBathymetries() const;
+  QStringList getAltitudes() const;
 
   /**
-   * Returns the merging type for conflict bathymetries.
+   * Returns the merging type for conflict altidudes.
    */
-  HYDROData_Zone::MergeBathymetriesType getMergeType() const;
+  HYDROData_Zone::MergeAltitudesType getMergeType() const;
 
   /**
-   * Set the merging type for conflict bathymetries. 
+   * Set the merging type for conflict altidudes. 
    * If the type is Merge_Object then use the second parameter to set the merge bathymetry.
    */
-  void        setMergeType( int theMergeType, QString theBathymetryName = QString() );
+  void        setMergeType( int theMergeType, QString theAltitudeName = QString() );
 
 private:
   QString getRefObjectNames() const;
-  QString getBathimetryName() const;
+  QString getAltitudeName() const;
 };
 #endif