Porting on OCCT 7.0 and Qt 5. Make compilable version.

[modules/hydro.git] / src / HYDROData / HYDROData_Bathymetry.cxx

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index 34bd4a21d2c0dff8e6a939c9bbdaf48137852717..451234725c11a00444054287e044468dfef271bd 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -53,7 +53,6 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 //HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
@@ -503,7 +502,7 @@ bool HYDROData_Bathymetry::ImportFromFile( const TCollection_AsciiString& theFil
   
 
   // Convert from global to local CS
-  Handle_HYDROData_Document aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
   AltitudePoints::Iterator anIter( aPoints );
   for ( ; anIter.More(); anIter.Next() )
   {
@@ -676,11 +675,11 @@ bool HYDROData_Bathymetry::importFromASCFile( QFile&          theFile,
 }
 
 
-Handle_HYDROData_PolylineXY HYDROData_Bathymetry::CreateBoundaryPolyline() const
+Handle(HYDROData_PolylineXY) HYDROData_Bathymetry::CreateBoundaryPolyline() const
 {
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  Handle_HYDROData_PolylineXY aResult = 
-    Handle_HYDROData_PolylineXY::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
+  Handle(HYDROData_PolylineXY) aResult = 
+    Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
 
   if( aResult.IsNull() )
     return aResult;