X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Zone.h;h=a4293f4c8152ea94ebecf71cdd998d1b41420d77;hb=HEAD;hp=76e2e428ec929d43ab2381afc81f56b94c005b5e;hpb=d4cd71fc291a732783caf61bebde87fe5b4bfc92;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index 76e2e428..a4293f4c 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -72,28 +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() );
-  /**
-   * Set the merging type for conflict strickler types. 
-   * If the type is Merge_Object then use the second parameter to set the merge Strickler type.
-   */
-  void        setMergeStricklerType( int theMergeType, QString theStricklerTypeName = QString() );
+  void        setMergeType( int theMergeType, QString theMergeObjectName = QString() );
 
 private:
   QString getRefObjectNames() const;
-  QString getAltitudeName() const;
+  QString getObjectName() const;
 };
 #endif