Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROData / HYDROData_Digue.h

diff --git a/src/HYDROData/HYDROData_Digue.h b/src/HYDROData/HYDROData_Digue.h
index 3fe73d5c736a2867e71041bba1f8f4cde17bfcdf..f05e03fa9551277eb778b6b6212b8de2938815a1 100644 (file)
--- a/src/HYDROData/HYDROData_Digue.h
+++ b/src/HYDROData/HYDROData_Digue.h
@@ -21,8 +21,6 @@
 
 #include "HYDROData_Channel.h"
 
-DEFINE_STANDARD_HANDLE(HYDROData_Digue, HYDROData_Channel)
-
 /**\class HYDROData_Digue
  * \brief 
  *
@@ -39,7 +37,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Digue);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Digue, HYDROData_Channel);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -49,24 +47,12 @@ public:
   /**
    * Returns default filling color for new digue.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new digue.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
-
-protected:
-
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 protected: