From: ouv Date: Mon, 26 Aug 2013 10:39:27 +0000 (+0000) Subject: Compilation on Linux. X-Git-Tag: BR_hydro_v_0_1~102 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=94ce56d6f7ffc055c2409af2c48d1278fe42d90e;p=modules%2Fhydro.git Compilation on Linux. --- diff --git a/src/HYDROGUI/HYDROGUI_Displayer.cxx b/src/HYDROGUI/HYDROGUI_Displayer.cxx index bb228021..e53d6bc7 100644 --- a/src/HYDROGUI/HYDROGUI_Displayer.cxx +++ b/src/HYDROGUI/HYDROGUI_Displayer.cxx @@ -189,7 +189,7 @@ void HYDROGUI_Displayer::Display( const HYDROData_SequenceOfObjects& theObjs, if( aPrs ) { - bool anIsVisible = anObj->IsVisible( (int)aViewer ); + bool anIsVisible = anObj->IsVisible( (size_t)aViewer ); aPrs->setVisible( anIsVisible ); } } diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx index 4dd19fe0..7d2197a1 100644 --- a/src/HYDROGUI/HYDROGUI_Module.cxx +++ b/src/HYDROGUI/HYDROGUI_Module.cxx @@ -139,7 +139,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, { HYDROGUI_DataModel* aModel = getDataModel(); - int aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( this ); + size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( this ); bool anIsSelection = false; bool anIsVisibleInSelection = false; diff --git a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx index 4fa7c8a3..04e60c72 100644 --- a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx @@ -55,7 +55,7 @@ void HYDROGUI_ShowHideOp::startOperation() { HYDROGUI_Operation::startOperation(); - int aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); + size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); // for all objects if( myId == ShowOnlyId || myId == ShowAllId || myId == HideAllId ) diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx index 39b6bb97..d98db72a 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.cxx +++ b/src/HYDROGUI/HYDROGUI_Tool.cxx @@ -288,21 +288,21 @@ QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module* theModule, return aName; } -int HYDROGUI_Tool::GetActiveGraphicsViewId( HYDROGUI_Module* theModule ) +size_t HYDROGUI_Tool::GetActiveGraphicsViewId( HYDROGUI_Module* theModule ) { - int aViewId = 0; + size_t aViewId = 0; SUIT_ViewManager* aViewMgr = theModule->getApp()->activeViewManager(); if( !aViewMgr || aViewMgr->getType() != GraphicsView_Viewer::Type() ) return aViewId; if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() ) - aViewId = (int)aViewer; + aViewId = (size_t)aViewer; return aViewId; } -QList HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule ) +QList HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule ) { - QList aList; + QList aList; ViewManagerList aViewMgrs; theModule->getApp()->viewManagers( GraphicsView_Viewer::Type(), aViewMgrs ); QListIterator anIter( aViewMgrs ); @@ -311,7 +311,7 @@ QList HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule ) if( SUIT_ViewManager* aViewMgr = anIter.next() ) { if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() ) - aList.append( (int)aViewer ); + aList.append( (size_t)aViewer ); } } return aList; diff --git a/src/HYDROGUI/HYDROGUI_Tool.h b/src/HYDROGUI/HYDROGUI_Tool.h index e67274fc..e713e7d6 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.h +++ b/src/HYDROGUI/HYDROGUI_Tool.h @@ -173,14 +173,14 @@ public: * \param theModule module * \return view id */ - static int GetActiveGraphicsViewId( HYDROGUI_Module* theModule ); + static size_t GetActiveGraphicsViewId( HYDROGUI_Module* theModule ); /** * \brief Get list of ids of existing GraphicsView views. * \param theModule module * \return list of view ids */ - static QList GetGraphicsViewIdList( HYDROGUI_Module* theModule ); + static QList GetGraphicsViewIdList( HYDROGUI_Module* theModule ); }; #endif diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx index 6a4268c6..70437263 100644 --- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx +++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx @@ -118,7 +118,7 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, aResult->AppendReference( anImage2 ); aFactory->UpdateImage( doc(), aResult ); - int aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); + size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); anImage1->SetVisible( aViewId, false ); anImage2->SetVisible( aViewId, false ); aResult->SetVisible( aViewId, true ); diff --git a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx index 326b5ab8..dd0523aa 100644 --- a/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx +++ b/src/HYDROGUI/HYDROGUI_VisualStateOp.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include HYDROGUI_VisualStateOp::HYDROGUI_VisualStateOp( HYDROGUI_Module* theModule, const bool theIsLoad ) @@ -109,7 +109,7 @@ bool HYDROGUI_VisualStateOp::saveVisualState() { if( SUIT_ViewManager* aViewManager = anIter.next() ) { - int aViewId = (int)aViewManager->getViewModel(); + size_t aViewId = (size_t)aViewManager->getViewModel(); if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() ) { QString aType = aViewManager->getType(); @@ -198,7 +198,7 @@ bool HYDROGUI_VisualStateOp::loadVisualState() QString aViewerId = aViewerEntry.section( '_', -1 ); // unused if( SUIT_ViewManager* aViewManager = anApp->createViewManager( aType ) ) { - int aViewId = (int)aViewManager->getViewModel(); + size_t aViewId = (size_t)aViewManager->getViewModel(); if( SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView() ) { // Wait until the window is really shown. This step fixes MANY bugs.