Porting to OCCT6.5.1

2024-11-15 01:58:36 +05:00 · 2011-08-12 13:08:51 +00:00 · 2011-08-12 13:08:51 +00:00 · 975caf67e2
commit 975caf67e2
parent e2ef963137
41 changed files with 35 additions and 42 deletions
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@ -32,7 +32,7 @@
 #include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
 #include "GEOM_PythonDump.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"

--- a/src/GEOM/GEOM_Engine.hxx
+++ b/src/GEOM/GEOM_Engine.hxx
@ -26,7 +26,7 @@
 #include "GEOM_Object.hxx"
 #include "GEOM_DataMapOfAsciiStringTransient.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 #include <TColStd_DataMapOfIntegerTransient.hxx>
--- a/src/GEOM/GEOM_Function.cxx
+++ b/src/GEOM/GEOM_Function.cxx
@ -26,7 +26,7 @@
 #include <GEOM_Solver.hxx>
 #include <GEOM_ISubShape.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"

--- a/src/GEOM/Makefile.am
+++ b/src/GEOM/Makefile.am
@ -66,7 +66,6 @@ libGEOMbasic_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
 	$(BOOST_CPPFLAGS)	\
-	$(GUI_CXXFLAGS)		\
 	-I$(top_builddir)/idl

 libGEOMbasic_la_LDFLAGS  =			\
--- a/src/GEOMAlgo/BlockFix_UnionFaces.cxx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.cxx
@ -25,7 +25,7 @@

 #include <BlockFix_UnionFaces.ixx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeAnalysis_Edge.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
@ -18,7 +18,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
@ -18,7 +18,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
@ -21,7 +21,7 @@

 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
--- a/src/GEOMAlgo/Makefile.am
+++ b/src/GEOMAlgo/Makefile.am
@ -360,7 +360,6 @@ salomeinclude_HEADERS =					\
 libGEOMAlgo_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
-	$(GUI_CXXFLAGS)		\
 	-I$(srcdir)/../NMTDS	\
 	-I$(srcdir)/../NMTTools

--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@ -47,7 +47,7 @@
 #include <SUIT_ViewManager.h>
 #include <SUIT_ResourceMgr.h>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@ -68,7 +68,7 @@
 #include <SALOMEDSClient_ClientFactory.hxx>
 #include <SALOMEDSClient_IParameters.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 // External includes
 #include <QMenu>
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@ -28,7 +28,7 @@

 #include "GEOM_GEOMGUI.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <SalomeApp_Module.h>

--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
@ -21,7 +21,7 @@

 #include <Standard_Stream.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <GEOMImpl_I3DPrimOperations.hxx>

--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
@ -34,7 +34,7 @@

 #include "GEOMImpl_Gen.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <utilities.h>
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
@ -23,7 +23,7 @@

 #include <GEOMImpl_IBasicOperations.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@ -45,7 +45,7 @@
 #include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
 #include <BlockFix_CheckTool.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
@ -34,7 +34,7 @@
 #include <GEOMImpl_PartitionDriver.hxx>
 #include <GEOMImpl_IPartition.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <TDF_Tool.hxx>

--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@ -57,7 +57,7 @@
 #include <GEOMImpl_ISketcher.hxx>
 #include <GEOMImpl_I3DSketcher.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"

--- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//

 #include <Standard_Stream.hxx>

--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@ -35,7 +35,7 @@
 #include <GEOMImpl_IHealing.hxx>
 #include <GEOMImpl_CopyDriver.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@ -33,7 +33,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
@ -26,7 +26,7 @@
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "Utils_SALOME_Exception.hxx"

--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
@ -44,7 +44,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@ -34,7 +34,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <utilities.h>
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@ -56,7 +56,7 @@
 #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx"
 #include "GEOMAlgo_ListOfCoupleOfShapes.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include "OpUtil.hxx"
--- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
@ -43,7 +43,7 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include "utilities.h"
 #include <OpUtil.hxx>
--- a/src/GEOMImpl/Makefile.am
+++ b/src/GEOMImpl/Makefile.am
@ -227,7 +227,6 @@ libGEOMimpl_la_CPPFLAGS =		\
        $(CORBA_INCLUDES)		\
 	$(CAS_CPPFLAGS)			\
 	$(KERNEL_CXXFLAGS)		\
-	$(GUI_CXXFLAGS)			\
 	$(BOOST_CPPFLAGS)		\
        $(PYTHON_INCLUDES)              \
 	-I$(srcdir)/../ShHealOper	\
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@ -38,7 +38,7 @@
 #include <GEOMBase.h>
 #include <GEOM_Actor.h>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <SALOME_ListIO.hxx>
 #include <SALOME_ListIteratorOfListIO.hxx>
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@ -24,7 +24,7 @@
 #include <GeometryGUI.h>
 #include <GEOM_Displayer.h>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <QtxComboBox.h>
 #include <SUIT_ResourceMgr.h>
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@ -34,7 +34,7 @@
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <TColStd_HSequenceOfAsciiString.hxx>

--- a/src/GEOM_I/Makefile.am
+++ b/src/GEOM_I/Makefile.am
@ -75,7 +75,6 @@ libGEOMEngine_la_CPPFLAGS =		\
 	$(CAS_CPPFLAGS)			\
 	$(BOOST_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)		\
-	$(GUI_CXXFLAGS)			\
 	-I$(srcdir)/../SKETCHER		\
 	-I$(srcdir)/../ARCHIMEDE	\
 	-I$(srcdir)/../GEOMImpl		\
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@ -27,7 +27,7 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
--- a/src/NMTTools/Makefile.am
+++ b/src/NMTTools/Makefile.am
@ -138,7 +138,6 @@ dist_libNMTTools_la_SOURCES = \
 libNMTTools_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
-	$(GUI_CXXFLAGS)		\
 	-I$(srcdir)/../NMTDS

 libNMTTools_la_LDFLAGS  =		\
--- a/src/NMTTools/NMTTools_PaveFiller_2.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_2.cxx
@ -27,7 +27,7 @@

 #include <NMTTools_PaveFiller.ixx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <Precision.hxx>

--- a/src/STEPImport/Makefile.am
+++ b/src/STEPImport/Makefile.am
@ -36,8 +36,7 @@ dist_libSTEPImport_la_SOURCES =	\

 libSTEPImport_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
-	$(KERNEL_CXXFLAGS)	\
-	$(GUI_CXXFLAGS)
+	$(KERNEL_CXXFLAGS)

 libSTEPImport_la_LDFLAGS  =			\
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@ -27,7 +27,7 @@

 #include <Basics_Utils.hxx>

-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>

 #include <BRep_Builder.hxx>