X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGEOMImpl%2FGEOMImpl_BooleanDriver.hxx;h=033e21b14697fd91701408d3e130053c0142d453;hb=7a3c2d25cc85b5c75acf2c8df92e4373af480d42;hp=0ee96d77c8d05823ef7d2140973350de06bd3a41;hpb=bd2042b4d19d69deaf182edda40bbff83e53490a;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
index 0ee96d77c..033e21b14 100644
--- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
@@ -26,53 +26,9 @@
 #ifndef _GEOMImpl_BooleanDriver_HeaderFile
 #define _GEOMImpl_BooleanDriver_HeaderFile
 
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif 
-
-#ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
-#endif
-
 
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_BooleanDriver;
-
-
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
 
 DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver );
 
@@ -80,17 +36,15 @@ class GEOMImpl_BooleanDriver : public GEOM_BaseDriver {
 
 public:
 
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOMImpl_BooleanDriver();
-Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
+  Standard_EXPORT GEOMImpl_BooleanDriver();
+  Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+  Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+  Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+  Standard_EXPORT static const Standard_GUID& GetID();
+  Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
 
-Standard_EXPORT virtual bool GetCreationInformation(std::string&             theOperationName,
-                                                    std::vector<GEOM_Param>& params);
+  Standard_EXPORT virtual bool GetCreationInformation(std::string&             theOperationName,
+                                                      std::vector<GEOM_Param>& params);
 
 private:
 
@@ -98,7 +52,9 @@ private:
                                 const TopoDS_Shape theShape2,
                                 const Standard_Integer theType) const;
 
-DEFINE_STANDARD_RTTI( GEOMImpl_BooleanDriver )
+  TopoDS_Shape makeCompoundShellFromFaces(const TopoDS_Shape theShape) const;
+
+  OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver)
 };
 
 #endif