merge master

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

diff --git a/src/HYDROData/HYDROData_StricklerTable.h b/src/HYDROData/HYDROData_StricklerTable.h
index 5cf2e7f57caa79e15b515a234ecf1d8336d3b29c..f50f4546e6303a21b162c6b7ed722da059d3b4a7 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.h
+++ b/src/HYDROData/HYDROData_StricklerTable.h
@@ -46,8 +46,8 @@ public:
 
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const;
 
-  HYDRODATA_EXPORT bool Import( const TCollection_AsciiString& theFileName );
-  HYDRODATA_EXPORT bool Export( const TCollection_AsciiString& theFileName );
+  HYDRODATA_EXPORT bool Import( const QString& theFileName );
+  HYDRODATA_EXPORT bool Export( const QString& theFileName );
 
   HYDRODATA_EXPORT double Get( const QString& theType, double theDefault ) const;
   HYDRODATA_EXPORT void Set( const QString& theType, double theCoefficient );
@@ -59,10 +59,11 @@ public:
 
   HYDRODATA_EXPORT void Clear();
 
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   HYDRODATA_EXPORT QString GetAttrName() const;
-  HYDRODATA_EXPORT void    SetAttrName( const QString& ) const;
+  HYDRODATA_EXPORT bool    SetAttrName( const QString& ) const;
 
   HYDRODATA_EXPORT QString GetAttrValue( const QString& theType ) const;
   HYDRODATA_EXPORT void    SetAttrValue( const QString& theType, const QString& theAttrValue ) const;
@@ -72,10 +73,6 @@ public:
   HYDRODATA_EXPORT QColor GetColor( const QString& theType ) const;
   HYDRODATA_EXPORT void SetColor( const QString& theType, const QColor& theColor ) const;
 
-private:
-  TCollection_ExtendedString toExtString( const QString& ) const;
-  QString                    toQString( const TCollection_ExtendedString& ) const;
-
 private:
   Handle(TDataStd_NamedData) Map() const;
 };