Clean-up deprecated OCCT-related code

diff --git a/src/HEXABLOCK/HexNewShape.cxx b/src/HEXABLOCK/HexNewShape.cxx
index fc4e23f64fe148e0418e5a54950b2dee073398ef..7de14881d2cf56d074906498565a10aa3126b9dc 100755 (executable)
--- a/src/HEXABLOCK/HexNewShape.cxx
+++ b/src/HEXABLOCK/HexNewShape.cxx
@@ -55,8 +55,6 @@
 #include <gp_Lin.hxx>
 #include <gp_Circ.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 BEGIN_NAMESPACE_HEXA
 
 static bool db  = on_debug ();  // == getenv ("HEXA_DB") > 0
@@ -179,12 +177,7 @@ int NewShape::transfoShape (Matrix& matrice, SubShape* shape)
    gp_Trsf transfo;
    double             a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34;
    matrice.getCoeff  (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34);
-#if OCC_VERSION_LARGE > 0x06070100
    transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34);
-#else
-   transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34,
-                      Epsil2, Epsil2);
-#endif
 
    TopoDS_Shape shape_orig = shape->getShape ();
    BRepBuilderAPI_Transform builder (shape_orig, transfo, Standard_True);

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
index 27a62c43d07076589a73b7ad9dad8a5c7d4bce46..2fed0c5e7d3f62bf475189e60ae161532a48ad90 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
@@ -28,8 +28,6 @@
 #include <vtkActorCollection.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <SUIT_Session.h>
 
 #include <SalomeApp_Study.h>
@@ -175,14 +173,10 @@ namespace GUI
                        Handle(SelectMgr_Selection) sel = theObj->Selection( m );
 
                        for ( sel->Init(); sel->More(); sel->Next() ) {
-#if OCC_VERSION_LARGE > 0x06080100
                                 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
                                 if ( aHSenEntity.IsNull() )
                                         continue;
                                 Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
-#else
-                               Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
-#endif
                                if ( entity.IsNull() )
                                        continue;