Porting to Qt4.

diff --git a/src/ARCHIMEDE/ARCHIMEDE.pro b/src/ARCHIMEDE/ARCHIMEDE.pro
new file mode 100644 (file)
index 0000000..680da56
--- /dev/null
+++ b/src/ARCHIMEDE/ARCHIMEDE.pro
@@ -0,0 +1,37 @@
+TEMPLATE = lib
+TARGET = GEOMArchimede
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+
+CAS_MODELER = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat
+
+STDLIB = -lstdc++
+
+INCLUDEPATH +=         $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${CAS_KERNEL} $${CAS_MODELER} -lTKMesh $${STDLIB} 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = Archimede_VolumeSection.hxx
+
+SOURCES  = Archimede_VolumeSection.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes

diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
index ec5fbdbea6c752d9841c72221219bcbe79f0fbc0..c488428afcaf820cabcfbcab09f8daa06dd39b4c 100644 (file)
--- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
@@ -26,8 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-#include <Standard_OStream.hxx>
-
 #include "Archimede_VolumeSection.hxx"
 #include "utilities.h"
 
@@ -41,14 +39,10 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <math_Matrix.hxx>
-#include <math.h>
-#include <GC_MakePlane.hxx>
-#include <stdlib.h>
 #include <gp_Trsf.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pln.hxx>
 
 #include <GeomAPI_ProjectPointOnSurf.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>

diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx
index 6dc4c8799255872a7752e7641a08879cc21b9bd3..afb7ea65c5da7ecd042e5f6b02c816d114c15844 100644 (file)
--- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx
@@ -33,7 +33,8 @@
 #include <gp_Dir.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Geom_Plane.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
+
+class Handle(Geom_RectangularTrimmedSurface);
 
 class VolumeSection{
 

diff --git a/src/src.pro b/src/src.pro
index e74364864a7334775fa215ffae32b9d9e528d8e9..dd0042d4cd6f937e44e051e5464d86738139d9d3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS  = OBJECT
-#SUBDIRS += ARCHIMEDE
+SUBDIRS += ARCHIMEDE
 #SUBDIRS += NMTDS
 #SUBDIRS += NMTTools
 #SUBDIRS += NMTAlgo