Salome HOME
test Strickler
[modules/hydro.git] / src / HYDROData / HYDROData_Bathymetry.cxx
index 742acbd5f5c68e401f6a30ab338690a942b3daf4..2e6ac1cc2638a741eeb9f8880fe14b1c1be83cb7 100644 (file)
@@ -60,7 +60,6 @@
 
 const int BLOCK_SIZE = 1000;
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 //HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
@@ -610,7 +609,7 @@ bool HYDROData_Bathymetry::ImportFromFiles( const QStringList& theFileNames )
   }
 
   // Convert from global to local CS
-  Handle_HYDROData_Document aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
   HYDROData_Bathymetry::AltitudePoints::iterator anIter = AllPoints.begin(), aLast = AllPoints.end();
   for ( ; anIter!=aLast; ++anIter )
   {
@@ -786,11 +785,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;