Porting to Qt4.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c72ce588c13fdb95f43bd5163bebfb18f3778cf..db733d24b1b939b258e612b0f12ec5a3c997c83d 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,7 @@ if ENABLE_SALOMEOBJECT
 # VSR: this is the original packages list
 #    SUBDIRS += SOCC
 # VSR: already migrated to Qt4 packages
-    SUBDIRS += 
+    SUBDIRS += SOCC
 endif
 endif
 if ENABLE_PYCONSOLE

diff --git a/src/SOCC/SOCC.pro b/src/SOCC/SOCC.pro
new file mode 100644 (file)
index 0000000..44e4938
--- /dev/null
+++ b/src/SOCC/SOCC.pro
@@ -0,0 +1,33 @@
+TEMPLATE = lib
+TARGET = SOCC
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${BOOST_CPPFLAGS} ../Qtx ../SUIT ../OBJECT ../Prs ../OCCViewer
+LIBS += -L../../lib -lsuit -lSalomeObject -lSalomePrs -lOCCViewer
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += SOCC_EXPORTS 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  = SOCC.h
+HEADERS += SOCC_ViewModel.h
+HEADERS += SOCC_Prs.h
+HEADERS += SOCC_ViewWindow.h
+
+SOURCES  = SOCC_ViewModel.cxx
+SOURCES += SOCC_Prs.cxx
+SOURCES += SOCC_ViewWindow.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes

diff --git a/src/SOCC/SOCC_Prs.cxx b/src/SOCC/SOCC_Prs.cxx
index eb2cb6821bdfe493c4af96a80e8084845c5ba1cc..ad6f3154de203e7a8bb96244601de3f0c9849075 100644 (file)
--- a/src/SOCC/SOCC_Prs.cxx
+++ b/src/SOCC/SOCC_Prs.cxx
@@ -27,6 +27,9 @@
 //  $Header$
 
 #include "SOCC_Prs.h"
+
+#include <AIS_InteractiveObject.hxx>
+
 using namespace std;
 
 /*!

diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h
index 06fbce141a890e131b8cc45405fce4ccb69e7356..60dca4b3b7290dfb4ce5d3b7963abe3089eb005f 100644 (file)
--- a/src/SOCC/SOCC_Prs.h
+++ b/src/SOCC/SOCC_Prs.h
@@ -33,9 +33,10 @@
 
 #include <SALOME_Prs.h>
 
-#include <AIS_InteractiveObject.hxx>
 #include <AIS_ListOfInteractive.hxx>
 
+class Handle(AIS_InteractiveObject);
+
 class SOCC_EXPORT SOCC_Prs : public SALOME_OCCPrs
 {
 public:

diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index 8d27c10a7f94d19a83938200a8eb4c5dba11a2b0..fd046f6622878e4327eaf34e1800ef3534d6c710 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.cxx
@@ -22,7 +22,8 @@
 #include "SOCC_ViewWindow.h"
 
 #include "SUIT_Session.h"
-#include "SUIT_Application.h"
+#include "SUIT_ResourceMgr.h"
+//#include "SUIT_Application.h"
 
 //#include "ToolsGUI.h"
 
@@ -37,6 +38,7 @@
 
 #include <SALOME_AISShape.hxx>
 #include <SALOME_AISObject.hxx>
+#include <SALOME_InteractiveObject.hxx>
 
 // Temporarily commented to avoid awful dependecy on SALOMEDS
 // TODO: better mechanism of storing display/erse status in a study
@@ -289,7 +291,7 @@ void SOCC_Viewer::rename( const Handle(SALOME_InteractiveObject)& obj,
         Handle(SALOME_InteractiveObject) IO = aSh->getIO();
         if ( IO->isSame( obj ) )
         {
-          aSh->setName( (char*)name.latin1() );
+          aSh->setName( name.toLatin1().data() );
           break;
         }
       }

diff --git a/src/SOCC/SOCC_ViewModel.h b/src/SOCC/SOCC_ViewModel.h
index 6d2d040258bbdba80f30c9e67bfdc751962237f5..792616a6271f608dfcfbc2447d3dd10e603edaaa 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.h
+++ b/src/SOCC/SOCC_ViewModel.h
@@ -26,7 +26,8 @@
 #include "SOCC.h"
 #include "SALOME_Prs.h"
 #include "OCCViewer_ViewModel.h"
-#include "SALOME_InteractiveObject.hxx"
+
+class Handle(SALOME_InteractiveObject);
 
 class SOCC_EXPORT SOCC_Viewer: public OCCViewer_Viewer, public SALOME_View
 {

diff --git a/src/src.pro b/src/src.pro
index 3ef5689f0ced6d3bdda4ce084d10b3df5d183f9e..67b89f2931adc6335bdc874604bcb04f95c2ca17 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -16,5 +16,6 @@ SUBDIRS += Prs
 SUBDIRS += OBJECT
 SUBDIRS += VTKViewer
 SUBDIRS += OCCViewer
+SUBDIRS += SOCC
 SUBDIRS += Event