Porting to OCCT6.5.1

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 028fed2663c048024d6f5936be3abdaad25e6d8d..9bb45f6f357b52e7fc2862b8435dba2d1b96a8b4 100644 (file)
--- 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"
 

diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx
index 07d52ff9b8c029b99b6e3d9107e82385f93fff98..70152563ccbbb10af33cb0df198804d2daed4962 100644 (file)
--- 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>

diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx
index fc43757d45b921330b1da378a6157680dbfec274..2dc3133187513a9a46fee0038e91a8ce62759016 100644 (file)
--- 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"
 

diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am
index a3ed8987055be047920ef1f0a52ca96e85d13372..a3924d8ad39a193c5c4032977ca2884c4a931a4f 100644 (file)
--- 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  =                     \

diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.cxx b/src/GEOMAlgo/BlockFix_UnionFaces.cxx
index 7bdb749084070b7c77e914cf3e9c811887d6cd74..e2f9f32fd8a2dfa7434aadb4c33163dd1e6e22e8 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
index 47e143cac5fb34827368391a3ee04fb993337f02..7a73f4f174b20de6ae97fd0900998114684a4f42 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
index 18727a0a397c7adc4455dbc62bbf6e662bc3983b..a96b1015247f75a819df7abb46f2837bf92a9c58 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
index 6c7ffb345281fd1838196f95e6890e1bd5171367..70b97bd2d28b0cb32a71aaee1d4ee908b1ef938a 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
index 6bc507f8a6cf4392de5a74b48eab34f5e4aa9620..e6413628ac0042f2507222086acbe3811d7271c5 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
index f6cd358f384e5cedadc5271699dc1a6f063974f6..30f0fb5a5f25e8f4ce5f3ed1cbe06ffc69c05d00 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
@@ -21,7 +21,7 @@
 \r
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx>\r
 \r
-#include <CASCatch_OCCTVersion.hxx>\r
+#include <Basics_OCCTVersion.hxx>\r
 \r
 #ifndef _Standard_TypeMismatch_HeaderFile\r
 #include <Standard_TypeMismatch.hxx>\r

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
index 3bd7fe8e124995f9919418a41ba9ed3cca340ce5..e22ab54cbbef059da5764efabfa587b586d1a637 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
@@ -21,7 +21,7 @@
 \r
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx>\r
 \r
-#include <CASCatch_OCCTVersion.hxx>\r
+#include <Basics_OCCTVersion.hxx>\r
 \r
 #ifndef _Standard_TypeMismatch_HeaderFile\r
 #include <Standard_TypeMismatch.hxx>\r

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
index 5c7a2b15e254b3c5c5a785a165ac77fd03832abe..2c9e6d3f6d0283c40fc6a23fb8e4c479cba89c14 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
index e8a2a9ec95a1d2fdc3b1f8dfb132694cc27582a8..c8d7c13c9b505551d1cec6ad3160864056608378 100644 (file)
--- 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>

diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am
index 5ea1067bccbb1f26b9f1d7da57235739c2a14b99..90975da2bfce98d9550b9f64da1d4fc76a9fe350 100644 (file)
--- 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
 

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 9039393aaa53cb9617b21b0403db0bc7b1789839..21cc4e27a66450fb28d6b7537e63c26f60460e30 100644 (file)
--- 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>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 17218aa0c66e4ca35617cb43bc5651cf761c94d9..969ce28d300470c7157bbde0c5273fde3100304f 100644 (file)
--- 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>

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 187f15d0e33d771c9e5715c7c43705bc0f140556..1f0bff2bcb7e4c54adc3ac9eff8478a6eb26a480 100644 (file)
--- 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>
 

diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
index cbadd3a4996d9cd6e4e636ab8e3add3e1e53c63a..bbd8a69628c79e3a429023c2dbb94e4a73a27444 100644 (file)
--- 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>
 

diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
index 4135fe8e1d5802df71a267315dda70ad66051b88..da5d459015f6eeb0cd11492c8735b19239b501af 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
index 2ff701022f46b15b708cd3edc98fcf6931a5b253..9d8799c6d314894cf6f0671a0ab0f467714d1f81 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index 54af52c8714af6af92f2abf7439350470fa73422..3178b013ca6ac2e76dff2c5cfb1763bf189eaac9 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
index 15573add01710bd97ffff8784b8bbff277a20d09..c2c1164fe5389e54f691a6c569a6f67218fca778 100644 (file)
--- 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>
 

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index cdee1c01eff9d15b558d30337f28ba69aab8473d..1f1075185393671af6d46013bd266b435138bb85 100644 (file)
--- 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"
 

diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
index 098f73bb42e5618918a80aeb21488bab3d4939a4..09f7a400e0968d1f6369dbcca6764c4963bcfd44 100644 (file)
--- 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>
 

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index b0206f4cd4abd3f95531171026cda4d11fea5982..0cbce375b05026f191cf7c383950c7cd39548204 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 55dc21581299c1c7b534f36f1029e2204567ef53..1d262172b1eb76cc6845710510c3ffdc5af9c4e6 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
index b4566e251c2cd0b31ff6e282099b4e928793cd40..57fa8b1a6e6bdf76a10314160b1b8170fee33e1f 100644 (file)
--- 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"
 

diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
index 3733e20dda99bf591a0fa20bd433a390413503fb..5715b5c50efbed172f2f6f24d95b359b118fbaa6 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index ea7b453ce12f995c676fb248867a47479514d1ce..9dbdcf6be79f5b68c0ef35f6395ef80caa198139 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index e9341afa857d93faade2445e3b0c0bc270e8a7e5..5ca5029fb3ee5031309cc5f5dcc666f34af0282f 100644 (file)
--- 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"

diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
index f9d4d9537fa05c876cbc82335128ea7adc699d70..14cf1077491ac7d0bf972d105573fd49c2277159 100644 (file)
--- 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>

diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am
index c54537056ecb984afe25d89e5f1b202ef0e74fcb..c4bc7cec7d7f0ae3b3fb3b093214770909b19997 100644 (file)
--- 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       \

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index 5c64927a48e2b0a582c259938c17254669fcf81c..f9d1c20b072f1eef8c4d1a6bc1cdd935a633cf16 100644 (file)
--- 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>

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 65135221a3488d2b9e215c6b3d6b9d9a1a967bcd..bf70a697f3156da53065a1bb5207544f1e748dda 100644 (file)
--- 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>

diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index 4a7c2ed3216998d4b3a7153a234b836e5deff051..406a2a3b8b02cd77468f7c1663b9c8625d927c9c 100644 (file)
--- 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>
 

diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am
index 359eed47c81003e43a43214532d6d3edfc969ed8..a0c8d2c0488c32425d2cccaefe4b6628931c60b8 100644 (file)
--- 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         \

diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index 5b9df681195c47665879c2b25418bce2c11dbd05..38e00c508671d36f220ac2412007867b7692731b 100644 (file)
--- 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>

diff --git a/src/NMTTools/Makefile.am b/src/NMTTools/Makefile.am
index 53331c40b5e86d93a38ba3001dc1d0a6cae208d0..53a29d44e3a59d93dbef2eb83dbaa907add542de 100644 (file)
--- 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  =              \

diff --git a/src/NMTTools/NMTTools_PaveFiller_2.cxx b/src/NMTTools/NMTTools_PaveFiller_2.cxx
index 73cb875017dfe4ff19ca1905183e3cabd0d5ce57..96d6f2493550947652d58eb33040ad28e5fd9a07 100644 (file)
--- 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>
 

diff --git a/src/STEPImport/Makefile.am b/src/STEPImport/Makefile.am
index 7e7b478dc434d619da213e7ce987967ffbbe840e..7b8b8e0cce9272856615541364f898d662c67044 100644 (file)
--- 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 \

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index b08e0885ab70a31b18e9a33453c415eefac2c4bc..90e687430aad1a1c4608a3e0d5d81b1e6159ab7d 100644 (file)
--- 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>