[cgma-dev] r3199 - cgm/trunk/geom/OCC

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-10-12 14:06:06 -0500 (Mon, 12 Oct 2009)
New Revision: 3199

Modified:
   cgm/trunk/geom/OCC/Makefile.am
   cgm/trunk/geom/OCC/OCCBody.cpp
   cgm/trunk/geom/OCC/OCCCurve.cpp
   cgm/trunk/geom/OCC/OCCLump.cpp
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
   cgm/trunk/geom/OCC/OCCSurface.cpp
Log:
remove unused includes (mostly Cholla stuff)

Modified: cgm/trunk/geom/OCC/Makefile.am
===================================================================
--- cgm/trunk/geom/OCC/Makefile.am	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/Makefile.am	2009-10-12 19:06:06 UTC (rev 3199)
@@ -6,8 +6,6 @@
 DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN)
 INCLUDES = -I$(top_srcdir)/util \
            -I$(top_srcdir)/geom \
-           -I$(top_srcdir)/geom/Cholla \
-           -I$(top_srcdir)/geom/facetbool \
            $(OCC_INC_FLAG)
 
 # The name of the library to build

Modified: cgm/trunk/geom/OCC/OCCBody.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCBody.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCBody.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -18,7 +18,6 @@
 // ********** BEGIN CUBIT INCLUDES         **********
 #include "CubitDefines.h"
 #include "CubitString.hpp"
-#include "CubitPoint.hpp"
 #include "CastTo.hpp"
 #include "BodySM.hpp"
 #include "Body.hpp"

Modified: cgm/trunk/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCurve.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCCurve.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -25,7 +25,6 @@
 #include "GeometryQueryEngine.hpp"
 #include "OCCQueryEngine.hpp"
 #include "CoEdgeSM.hpp"
-#include "CubitPoint.hpp"
 
 #include "OCCBody.hpp"
 #include "OCCLump.hpp"

Modified: cgm/trunk/geom/OCC/OCCLump.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCLump.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCLump.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -18,8 +18,6 @@
 #include "CastTo.hpp"
 #include "Surface.hpp"
 #include "DLIList.hpp"
-#include "CubitFacet.hpp"
-#include "CubitPoint.hpp"
 #include "CubitVector.hpp"
 #include "CubitString.hpp"
 #include "ShellSM.hpp"

Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -116,40 +116,20 @@
 #include "TopOpeBRep_ShapeIntersector.hxx"
 #include "TopTools_ListIteratorOfListOfShape.hxx"
 #include "CubitUtil.hpp"
-#include "CubitPoint.hpp"
-#include "CubitPointData.hpp"
-#include "CubitFacet.hpp"
-#include "CubitQuadFacet.hpp"
-#include "CubitFacetData.hpp"
-#include "CubitFacetEdge.hpp"
-#include "CubitFacetEdgeData.hpp"
 #include "GeometryQueryTool.hpp"
 #include "GeometryModifyTool.hpp"
-#include "ChollaSurface.hpp"
-#include "ChollaCurve.hpp"
-#include "ChollaPoint.hpp"
-#include "OCCPoint.hpp"
-#include "OCCCurve.hpp"
-#include "CurveFacetEvalTool.hpp"
-#include "FacetEvalTool.hpp"
 #include "OCCCoEdge.hpp"
 #include "OCCLoop.hpp"
 #include "OCCSurface.hpp"
 #include "OCCShell.hpp"
 #include "OCCLump.hpp"
 #include "OCCBody.hpp"
-#include "ChollaEngine.hpp"
-#include "TDGeomFacet.hpp"
+#include "OCCCurve.hpp"
+#include "OCCPoint.hpp"
 #include "CubitFileIOWrapper.hpp"
-#include "TDFacetBoundaryPoint.hpp"
-#include "Cholla.h"
 #include "Body.hpp"
 #include "GfxDebug.hpp"
 #include "RefFace.hpp"
-#include "FacetDataUtil.hpp"
-#include "FBDataUtil.hpp"
-#include "FBIntersect.hpp"
-#include "IntegerHash.hpp"
 #include "CpuTimer.hpp"
 #include "AppUtil.hpp"
 #include "SphereEvaluator.hpp"

Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -76,23 +76,10 @@
 #include "OCCShell.hpp"
 #include "OCCLump.hpp"
 #include "OCCBody.hpp"
-#include "CubitFacetEdge.hpp"
-#include "CubitFacetEdgeData.hpp"
-#include "CubitFacet.hpp"
-#include "CubitFacetData.hpp"
-#include "CubitQuadFacet.hpp"
-#include "CubitQuadFacetData.hpp"
-#include "CubitPoint.hpp"
 #include "GMem.hpp"
-#include "FacetEvalTool.hpp"
-#include "CurveFacetEvalTool.hpp"
-#include "CubitPointData.hpp"
 #include "GeometryQueryTool.hpp"
-#include "debug.hpp"
 #include "CubitObserver.hpp"
 #include "GfxDebug.hpp"
-#include "KDDTree.hpp"
-#include "RTree.hpp"
 #include <stdio.h>
 #include <errno.h>
 

Modified: cgm/trunk/geom/OCC/OCCSurface.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCSurface.cpp	2009-10-12 19:05:29 UTC (rev 3198)
+++ cgm/trunk/geom/OCC/OCCSurface.cpp	2009-10-12 19:06:06 UTC (rev 3199)
@@ -14,7 +14,6 @@
 
 // ********** BEGIN OCC INCLUDES           **********
 #include "OCCSurface.hpp"
-#include "RefFace.hpp"
 #include "OCCQueryEngine.hpp"
 
 #include "OCCBody.hpp"
@@ -34,13 +33,11 @@
 #include "GeometryDefines.h"
 #include "CubitUtil.hpp"
 #include "CastTo.hpp"
-#include "RefVolume.hpp"
 #include "GeometryQueryEngine.hpp"
 #include "DLIList.hpp"
 #include "ShellSM.hpp"
 #include "Lump.hpp"
 #include "LoopSM.hpp"
-#include "CubitPointData.hpp"
 #include "BRepAlgoAPI_BooleanOperation.hxx"
 #include "BRepBuilderAPI_MakeShape.hxx"
 #include "BRepFilletAPI_MakeFillet2d.hxx"