merge BR_v14_rc

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

diff --git a/src/HYDROData/HYDROData_StricklerTable.cxx b/src/HYDROData/HYDROData_StricklerTable.cxx
index 564b65f17663ff834c03a37aef50e267ad0775a9..5d7623d8047cedf9f153be9b5e9d86a77f25fae4 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.cxx
+++ b/src/HYDROData/HYDROData_StricklerTable.cxx
@@ -32,7 +32,8 @@
 IMPLEMENT_STANDARD_HANDLE( HYDROData_StricklerTable, HYDROData_Entity )
     IMPLEMENT_STANDARD_RTTIEXT( HYDROData_StricklerTable, HYDROData_Entity )
 
-    HYDROData_StricklerTable::HYDROData_StricklerTable()
+HYDROData_StricklerTable::HYDROData_StricklerTable()
+: HYDROData_Entity( Geom_No )
 {
 }
 
@@ -161,11 +162,12 @@ QStringList HYDROData_StricklerTable::GetTypes() const
     return aSeq;
 }
 
-bool HYDROData_StricklerTable::HasType( const TCollection_ExtendedString& theType ) const
+bool HYDROData_StricklerTable::HasType( const QString& theType ) const
 {
   Handle(TDataStd_NamedData) aMap = Map();
   
-  return !aMap.IsNull() && aMap->HasReal( theType );
+  TCollection_ExtendedString aType = toExtString( theType );
+  return !aMap.IsNull() && aMap->HasReal( aType );
 }
 
 void HYDROData_StricklerTable::Clear()