0031990: Coding, Draw Harness - Replace C-like pointers to function in Draw_SaveAndRe...

[occt.git] / src / HLRTest / HLRTest_Projector.hxx

diff --git a/src/HLRTest/HLRTest_Projector.hxx b/src/HLRTest/HLRTest_Projector.hxx
index bd967dd..93d75c0 100644 (file)
--- a/src/HLRTest/HLRTest_Projector.hxx
+++ b/src/HLRTest/HLRTest_Projector.hxx
@@ -17,68 +17,43 @@
 #ifndef _HLRTest_Projector_HeaderFile
 #define _HLRTest_Projector_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
 #include <HLRAlgo_Projector.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Standard_OStream.hxx>
 #include <Draw_Interpretor.hxx>
-class HLRAlgo_Projector;
-class Draw_Display;
-class Draw_Drawable3D;
-
 
-class HLRTest_Projector;
 DEFINE_STANDARD_HANDLE(HLRTest_Projector, Draw_Drawable3D)
 
 //! Draw Variable Projector to test.
 class HLRTest_Projector : public Draw_Drawable3D
 {
-
+  DEFINE_STANDARD_RTTIEXT(HLRTest_Projector, Draw_Drawable3D)
+  Draw_Drawable3D_FACTORY
 public:
 
-  
   Standard_EXPORT HLRTest_Projector(const HLRAlgo_Projector& P);
-  
-    const HLRAlgo_Projector& Projector() const;
-  
-  //! Does nothhing,
-  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
-  
+
+  const HLRAlgo_Projector& Projector() const { return myProjector; }
+
+  //! Does nothing,
+  Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+
   //! For variable copy.
   Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
-  
+
   //! For variable dump.
   Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
-  
+
+  //! Save drawable into stream.
+  Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
+
   //! For variable whatis command. Set  as a result  the
   //! type of the variable.
   Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
 
-
-
-
-  DEFINE_STANDARD_RTTIEXT(HLRTest_Projector,Draw_Drawable3D)
-
-protected:
-
-
-
-
 private:
 
-
   HLRAlgo_Projector myProjector;
 
-
 };
 
-
-#include <HLRTest_Projector.lxx>
-
-
-
-
-
 #endif // _HLRTest_Projector_HeaderFile