Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h
index e009351a2baa6e20176ca49c3baa0b7218103401..e00eaebd9be20760f0dbfa058d8e1c6b3c77e3a0 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@ -28,19 +28,16 @@
 #include <vector>
 #include <set>
 
-class Handle_HYDROData_StricklerTable;
+class HYDROData_StricklerTable;
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 typedef NCollection_IndexedDataMap<TopoDS_Face, QString> HYDROData_MapOfFaceToStricklerType;
 
-DEFINE_STANDARD_HANDLE( HYDROData_LandCoverMap, HYDROData_Entity )
-
 class TopoDS_Shape;
 class TopoDS_Wire;
 class TopoDS_Iterator;
-class TopTools_ListOfShape;
-class Handle( HYDROData_PolylineXY );
-class Handle( HYDROData_Object );
+class HYDROData_PolylineXY;
+class HYDROData_Object;
 class gp_XY;
 
 class HYDROData_LandCoverMap : public HYDROData_Entity
@@ -111,11 +108,13 @@ public:
 
   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName,
                                        double theDeflection,
-                                       const Handle_HYDROData_StricklerTable& theTable ) const;
+                                       const Handle(HYDROData_StricklerTable)& theTable,
+                                       QString& statMessage) const;
 
   HYDRODATA_EXPORT bool Add( const Handle( HYDROData_Object )&, const QString& theType );
   HYDRODATA_EXPORT bool Add( const Handle( HYDROData_PolylineXY )&, const QString& theType );
 
+  using HYDROData_Entity::Remove;
   HYDRODATA_EXPORT bool Remove( const TopoDS_Face& );
   HYDRODATA_EXPORT bool Remove( const TopTools_ListOfShape& );
 
@@ -169,7 +168,7 @@ protected:
                                  double theTolerance = 1E-5 );
 
 public:
-  DEFINE_STANDARD_RTTI( HYDROData_LandCoverMap );
+  DEFINE_STANDARD_RTTIEXT( HYDROData_LandCoverMap, HYDROData_Entity );
 
 private:
   friend class Explorer;