merge BR_v14_rc

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

diff --git a/src/HYDROData/HYDROData_StricklerTable.h b/src/HYDROData/HYDROData_StricklerTable.h
index 856786c7d574a34af32be557b306b688abf39f3b..76a7241e7c45de5f50bc153a85ac41d340c3ff34 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.h
+++ b/src/HYDROData/HYDROData_StricklerTable.h
@@ -48,19 +48,22 @@ public:
   HYDRODATA_EXPORT bool Import( const TCollection_AsciiString& theFileName );
   HYDRODATA_EXPORT bool Export( const TCollection_AsciiString& theFileName );
 
-  HYDRODATA_EXPORT double Get( const TCollection_ExtendedString& theType, double theDefault ) const;
-  HYDRODATA_EXPORT void Set( const TCollection_ExtendedString& theType, double theCoefficient );
+  HYDRODATA_EXPORT double Get( const QString& theType, double theDefault ) const;
+  HYDRODATA_EXPORT void Set( const QString& theType, double theCoefficient );
 
+  HYDRODATA_EXPORT QStringList GetTypes() const;
   HYDRODATA_EXPORT void GetCoefficientRange( double& theMin, double& theMax ) const;
 
-  HYDRODATA_EXPORT TColStd_SequenceOfExtendedString GetTypes() const;
-
-  HYDRODATA_EXPORT bool HasType( const TCollection_ExtendedString& theType ) const;
+  HYDRODATA_EXPORT bool HasType( const QString& theType ) const;
 
   HYDRODATA_EXPORT void Clear();
 
   HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
 
+private:
+    TCollection_ExtendedString     toExtString( const QString& ) const;
+    QString                        toQString( const TCollection_ExtendedString& ) const;
+
 private:
   Handle(TDataStd_NamedData) Map() const;
 };