This commit was generated by cvs2git to track changes on a CVS vendor

[modules/geom.git] / src / GEOMGUI / GeometryGUI_PointDlg.cxx

diff --git a/src/GEOMGUI/GeometryGUI_PointDlg.cxx b/src/GEOMGUI/GeometryGUI_PointDlg.cxx
index f99257df56eb74145592cf2f1765d06f51c9a0b6..2423b809f1f18e1d671db8226f0db63419d1feb5 100644 (file)
--- a/src/GEOMGUI/GeometryGUI_PointDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PointDlg.cxx
@@ -40,11 +40,7 @@ using namespace std;
 
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRep_Tool.hxx>
-#if OCC_VERSION_MAJOR >= 5
-#include <BRepAlgo.hxx>
-#else
 #include <BRepAlgoAPI.hxx>
-#endif
 #include <Geom_Curve.hxx>
 
 #include <qbuttongroup.h>
@@ -81,9 +77,9 @@ GeometryGUI_PointDlg::GeometryGUI_PointDlg( QWidget* parent,
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT_EDGE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT_EDGE")));
 
     if ( !name )
        setName( "GeometryGUI_PointDlg" );
@@ -282,7 +278,7 @@ void GeometryGUI_PointDlg::Init(SALOME_Selection* Sel, const Handle(AIS_Interact
   Constructor1->setChecked( TRUE );
 
   /* filter for the second constructor */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
   
@@ -767,11 +763,7 @@ void GeometryGUI_PointDlg::ActivateThisDialog( )
 //=================================================================================
 bool GeometryGUI_PointDlg::CalculateVertexOnCurve(const TopoDS_Edge& anEdge, const Standard_Real aParameter, TopoDS_Shape& resultVertex) 
 {
-#if OCC_VERSION_MAJOR >= 5
-  if( anEdge.IsNull() || !BRepAlgo::IsValid(anEdge) )
-#else
   if( anEdge.IsNull() || !BRepAlgoAPI::IsValid(anEdge) )
-#endif
     return false ;
 
   Standard_Real first, last ;