Porting on OCCT 7.0 and Qt 5. Make compilable version.

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

diff --git a/src/HYDROData/HYDROData_Profile.h b/src/HYDROData/HYDROData_Profile.h
index 997c617cd316caf42dc1cb8ae110e4347bcadb12..1809a02c780c7ced463a9eb7d3f34d1dfdc4003f 100644 (file)
--- a/src/HYDROData/HYDROData_Profile.h
+++ b/src/HYDROData/HYDROData_Profile.h
@@ -23,11 +23,9 @@
 
 #include "HYDROData_ProfileUZ.h"
 
-DEFINE_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
-
 class gp_XYZ;
 class OSD_File;
-class Handle(HYDROData_Document);
+class HYDROData_Document;
 
 /**\class HYDROData_Profile
  * \brief Class that stores/retreives information about the profile.
@@ -53,7 +51,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Profile);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -63,7 +61,8 @@ public:
   /**
    * Dump object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Returns the top shape of the object.
@@ -87,12 +86,12 @@ public:
   /**
    * Returns default filling color for new profile.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new profile.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
 public:
@@ -247,17 +246,6 @@ public:
                                                 bool*      theIsRead = 0 );
 
 protected:
-
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
-
   /**
    * Checks and if necessary create child 3D object.
    * Reimplemented to prevent creation of 3D child object.