X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_LandCoverMap.h;h=7ee8ff1767747e19793e8b697461cbc1b3a2f475;hb=7ab1a585bb3c17efb1cc89fa4c29b20dff44420b;hp=1e05c6f3121dbdddc0a95f90d6db8afb94be7342;hpb=fcfcc15c75f88e23a693f22a19bea000ae9c488a;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h
index 1e05c6f3..7ee8ff17 100644
--- 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
@@ -67,7 +64,7 @@ public:
     void Init( const HYDROData_LandCoverMap& );
     HYDRODATA_EXPORT bool More() const;
     HYDRODATA_EXPORT void Next();
-    
+
     int Index() const;
     HYDRODATA_EXPORT TopoDS_Face Face() const;
     HYDRODATA_EXPORT QString StricklerType() const;
@@ -95,28 +92,29 @@ public:
 
   HYDRODATA_EXPORT bool ImportSHP( const QString& theSHPFileName,
                                    const QList<int>& theIndices = QList<int>() );
- 
+
   HYDRODATA_EXPORT bool ExportSHP( const QString& theSHPFileName, bool bUseDiscr = false, double theDefl = 0.1) const;
 
-  HYDRODATA_EXPORT DBFStatus ImportDBF( const QString& theDBFFileName, 
-                                        const QString& theFieldName, 
+  HYDRODATA_EXPORT DBFStatus ImportDBF( const QString& theDBFFileName,
+                                        const QString& theFieldName,
                                         const QStringList& DBFValues,
                                         const QStringList& StricklerTypes,
                                         const QList<int>& theIndices = QList<int>() );
 
   HYDRODATA_EXPORT void ExportDBF( const QString& theDBFFileName,
-                                   const QString& theFieldName, 
+                                   const QString& theFieldName,
                                    const QStringList& theDBFValues,
                                    const QStringList& theStricklerTypes ) const;
 
   HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName,
                                        double theDeflection,
-                                       const Handle_HYDROData_StricklerTable& theTable,
+                                       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& );
 
@@ -159,7 +157,7 @@ public:
                                         std::vector<int>& theTypes ) const;
 
   HYDRODATA_EXPORT void ClassifyPoints( const std::vector<gp_XY>& thePoints,
-                                        const Handle(HYDROData_StricklerTable)& theTable, 
+                                        const Handle(HYDROData_StricklerTable)& theTable,
                                         std::vector<double>& theCoeffs, double DefValue, bool UseMax ) const;
 
 protected:
@@ -171,11 +169,11 @@ protected:
 
   static TopoDS_Shape MergeFaces(const TopTools_ListOfShape& theFaces,
                                  bool IsToUnify,
-                                 TopTools_IndexedDataMapOfShapeListOfShape* theShHistory = NULL, 
+                                 TopTools_IndexedDataMapOfShapeListOfShape* theShHistory = NULL,
                                  double theTolerance = 1E-5 );
 
 public:
-  DEFINE_STANDARD_RTTI( HYDROData_LandCoverMap );
+  DEFINE_STANDARD_RTTIEXT( HYDROData_LandCoverMap, HYDROData_Entity );
 
 private:
   friend class Explorer;