From df32cae90edf9d1c3a430711d2dcce43a6198c9c Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 17 May 2007 15:42:21 +0000 Subject: [PATCH] Porting to Qt4 --- src/CAM/CAM_Application.cxx | 4 ++-- src/CAM/CAM_Module.cxx | 2 +- src/CAM/CAM_Module.h | 2 +- src/Makefile.am | 2 +- src/Prs/Prs.pro | 20 ++++++++++++++++++++ src/Prs/SALOME_Prs.cxx | 8 ++++---- src/Prs/SALOME_Prs.h | 6 +++--- src/src.pro | 2 ++ 8 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 src/Prs/Prs.pro diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx index 3ca915241..5a3bad8eb 100755 --- 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 ca9fc7d9e..85d75df5b 100755 --- 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 1922955e1..2b62f768a 100755 --- 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 eaad1e7db..88d4f1cac 100755 --- 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 index 000000000..b8ea761ab --- /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 b022d2573..2e685e8c6 100755 --- 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 e8465a9b5..ba8562c9f 100755 --- 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 d71f68118..42a258fc9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,3 +9,5 @@ SUBDIRS += CAM SUBDIRS += LogWindow SUBDIRS += PyInterp SUBDIRS += PyConsole +SUBDIRS += Prs + -- 2.39.2