latests developments debug and porting Python3

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Zone.h

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index aaf7a2ded1b9e165a1085e08198978fe77bba1d4..a4293f4c8152ea94ebecf71cdd998d1b41420d77 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -72,23 +72,23 @@ public:
   bool        isMergingNeed() const;
 
   /**
-   * Returns the list of altidude object names.
+   * Returns the list of source object names.
    */
-  QStringList getAltitudes() const;
+  QStringList getObjects() const;
 
   /**
    * Returns the merging type for conflict altidudes.
    */
-  HYDROData_Zone::MergeAltitudesType getMergeType() const;
+  HYDROData_Zone::MergeType getMergeType() const;
 
   /**
-   * Set the merging type for conflict altidudes. 
-   * If the type is Merge_Object then use the second parameter to set the merge bathymetry.
+   * Set the merging type for conflict altidudes/types. 
+   * If the type is Merge_Object then use the second parameter to set the merge bathymetry/land cover.
    */
-  void        setMergeType( int theMergeType, QString theAltitudeName = QString() );
+  void        setMergeType( int theMergeType, QString theMergeObjectName = QString() );
 
 private:
   QString getRefObjectNames() const;
-  QString getAltitudeName() const;
+  QString getObjectName() const;
 };
 #endif