Porting to Qt4

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 3ca915241913567d1a2b7a4d73de4600635e942a..5a3bad8eb2a302fd29931d951406e93d11684938 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -449,7 +449,7 @@ void CAM_Application::setActiveStudy( SUIT_Study* study )
 
   \param mod module being added
 */
-void CAM_Application::moduleAdded( CAM_Module* mod )
+void CAM_Application::moduleAdded( CAM_Module* /*mod*/ )
 {
 }
 
@@ -540,7 +540,7 @@ void CAM_Application::readModuleList()
   if ( rx.indexIn( args.join(" ") ) >= 0 && rx.numCaptures() > 0 ) {
     QString modules = rx.cap(1);
     QStringList mods = modules.split( ":", QString::SkipEmptyParts );
-    for ( uint i = 0; i < mods.count(); i++ ) {
+    for ( int i = 0; i < mods.count(); i++ ) {
       if ( !mods[i].trimmed().isEmpty() )
        modList.append( mods[i].trimmed() );
     }

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index ca9fc7d9e84f752b6beb5daf8e04f08c779cada0..85d75df5bfd2128ea7304167409ba033b76dba2e 100755 (executable)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -213,7 +213,7 @@ CAM_Application* CAM_Module::application() const
   \return \c true if module is activated successfully.
   \sa initialize(), deactivateModule()
  */
-bool CAM_Module::activateModule( SUIT_Study* study )
+bool CAM_Module::activateModule( SUIT_Study* /*study*/ )
 {
   return true;
 }

diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index 1922955e1dc76928f1e88cc43621199b4ea6b87e..2b62f768a9d05ce745a8a3372614d464d591b6db 100755 (executable)
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_Module.h
@@ -62,7 +62,7 @@ public:
 
   virtual QString        iconName() const;
 
-  virtual void           contextMenuPopup( const QString&, QMenu*, QString& title ) {};
+  virtual void           contextMenuPopup( const QString&, QMenu*, QString& ) {};
   virtual void           updateCommandsStatus() {};
 
   virtual void           putInfo( const QString&, const int = -1 );

diff --git a/src/Makefile.am b/src/Makefile.am
index eaad1e7db77f8d38bb5cb4c5e197bd9c2997cb49..88d4f1cac885fc2c2f3135dbe4ec2e200376d2b2 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@
 # VSR: this is the original packages list
 #SUBDIRS = Qtx Style DDS QDS SUIT STD CAF SUITApp LogWindow ObjBrowser Prs
 # VSR: already migrated to Qt4 packages
-SUBDIRS = Qtx SUIT SUITApp STD CAM LogWindow
+SUBDIRS = Qtx SUIT SUITApp STD CAM LogWindow Prs
 
 if ENABLE_SALOMEOBJECT
 # VSR: this is the original packages list

diff --git a/src/Prs/Prs.pro b/src/Prs/Prs.pro
new file mode 100644 (file)
index 0000000..b8ea761
--- /dev/null
+++ b/src/Prs/Prs.pro
@@ -0,0 +1,20 @@
+TEMPLATE = lib
+TARGET = SalomePrs
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32
+DEFINES += PRS_EXPORTS
+
+HEADERS  = SALOME_Prs.h
+
+SOURCES  = SALOME_Prs.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes

diff --git a/src/Prs/SALOME_Prs.cxx b/src/Prs/SALOME_Prs.cxx
index b022d25730f11350229caf0345dc9d4f1b57674a..2e685e8c65cd30a7bd507ff0811c42e4f7b6d7f8 100755 (executable)
--- a/src/Prs/SALOME_Prs.cxx
+++ b/src/Prs/SALOME_Prs.cxx
@@ -209,7 +209,7 @@ void SALOME_View::EraseAll( const bool )
 */
 void SALOME_View::LocalSelection( const SALOME_OCCPrs*, const int )
 {
-//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_OCCPrs* ) called! \
+//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_OCCPrs* ) called!
 //   Probably, selection is being activated in uncompatible viewframe." );
 }
 
@@ -218,7 +218,7 @@ void SALOME_View::LocalSelection( const SALOME_OCCPrs*, const int )
 */
 void SALOME_View::LocalSelection( const SALOME_VTKPrs*, const int )
 {
-//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_VTKPrs* ) called! \
+//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_VTKPrs* ) called!
 //   Probably, selection is being activated in uncompatible viewframe." );
 }
 
@@ -227,7 +227,7 @@ void SALOME_View::LocalSelection( const SALOME_VTKPrs*, const int )
 */
 void SALOME_View::LocalSelection( const SALOME_Prs2d*, const int )
 {
-//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_Prs2d* ) called! \
+//  MESSAGE( "SALOME_View::LocalSelection( const SALOME_Prs2d* ) called!
 //   Probably, selection is being activated in uncompatible viewframe." );
 }
 
@@ -236,7 +236,7 @@ void SALOME_View::LocalSelection( const SALOME_Prs2d*, const int )
 */
 void SALOME_View::GlobalSelection( const bool ) const
 {
-//  MESSAGE( "SALOME_View::GlobalSelection() called! \
+//  MESSAGE( "SALOME_View::GlobalSelection() called!
 //   Probably, selection is being activated in uncompatible viewframe." );
 }
 

diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h
index e8465a9b527167c7d49712135293742d08646788..ba8562c9f361b191c829adc4fe9c0f59a149ec51 100755 (executable)
--- a/src/Prs/SALOME_Prs.h
+++ b/src/Prs/SALOME_Prs.h
@@ -185,11 +185,11 @@ public:
   virtual void GlobalSelection( const bool = false ) const;
 
   //! Creates empty presenation of corresponding type
-  virtual SALOME_Prs* CreatePrs( const char* entry = 0 ) { return 0; }
+  virtual SALOME_Prs* CreatePrs( const char* /*entry*/ = 0 ) { return 0; }
 
   // Axiluary methods called before and after displaying of objects
-  virtual void BeforeDisplay( SALOME_Displayer* d ) {} //!< Null body here
-  virtual void AfterDisplay ( SALOME_Displayer* d ) {} //!< Null body here
+  virtual void BeforeDisplay( SALOME_Displayer* ) {} //!< Null body here
+  virtual void AfterDisplay ( SALOME_Displayer* ) {} //!< Null body here
 
   // New methods (asv)
   //! \retval Return false.

diff --git a/src/src.pro b/src/src.pro
index d71f68118932ad89ea311edf3199e7aea2d6a1c6..42a258fc9a0c3474c2f46e2d555d73b1ead57554 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,3 +9,5 @@ SUBDIRS += CAM
 SUBDIRS += LogWindow
 SUBDIRS += PyInterp
 SUBDIRS += PyConsole
+SUBDIRS += Prs
+