Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017

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

diff --git a/src/HYDROData/HYDROData_StricklerTable.h b/src/HYDROData/HYDROData_StricklerTable.h
index 62323e328fae9465f95bff4f17cffff637735bcc..de409785d67571b276aa9650ba49a4b49abf2531 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.h
+++ b/src/HYDROData/HYDROData_StricklerTable.h
@@ -23,9 +23,7 @@
 
 #include <TColStd_SequenceOfExtendedString.hxx>
 
-class Handle( TDataStd_NamedData );
-
-DEFINE_STANDARD_HANDLE( HYDROData_StricklerTable, HYDROData_Entity )
+class TDataStd_NamedData;
 
 class HYDROData_StricklerTable : public HYDROData_Entity
 {
@@ -42,7 +40,7 @@ protected:
   HYDRODATA_EXPORT ~HYDROData_StricklerTable();
 
 public:
-  DEFINE_STANDARD_RTTI( HYDROData_StricklerTable );
+  DEFINE_STANDARD_RTTIEXT( HYDROData_StricklerTable, HYDROData_Entity );
 
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const;
 
@@ -59,10 +57,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 +71,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;
 };