Fix usage of SUIT_OverrideCursor

-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;

diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx
index 88a717ef2c36bdf023d4d095335e33795af1b027..05cfca53d3836b5698966dcaf772e2d04741b4d9 100644 (file)
--- a/src/DisplayGUI/DisplayGUI.cxx
+++ b/src/DisplayGUI/DisplayGUI.cxx
@@ -189,7 +189,7 @@ void DisplayGUI::DisplayAll()
   _PTR(ChildIterator) anIter ( aStudy->NewChildIterator( SC ) );
   anIter->InitEx( true );
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   while( anIter->More() ) {
     _PTR(SObject) valSO ( anIter->Value() );
@@ -210,7 +210,7 @@ void DisplayGUI::DisplayAll()
 //=====================================================================================
 void DisplayGUI::EraseAll()
 {
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   SUIT_Application* app = getGeometryGUI()->getApp();
   if ( app ) {
@@ -261,7 +261,7 @@ void DisplayGUI::DisplayOnlyChildren()
   aSelMgr->selectedObjects(aList, "ObjectBrowser", false);
   SALOME_ListIteratorOfListIO It (aList);
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   for (; It.More(); It.Next()) {
     Handle(SALOME_InteractiveObject) anIObject = It.Value();
@@ -314,7 +314,7 @@ void DisplayGUI::Display()
   aSelMgr->selectedObjects( aList );
   SALOME_ListIteratorOfListIO It( aList );
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   for( ;It.More();It.Next() ) {
     Handle(SALOME_InteractiveObject) anIObject = It.Value();
@@ -372,7 +372,7 @@ void DisplayGUI::Erase()
   aSelMgr->selectedObjects( aList );
   SALOME_ListIteratorOfListIO It( aList );
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   for( ; It.More(); It.Next() ) {
     Handle(SALOME_InteractiveObject) anIObject = It.Value();
@@ -420,7 +420,7 @@ void DisplayGUI::Erase()
 //=====================================================================================
 void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow )
 {
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
@@ -453,7 +453,7 @@ void DisplayGUI::SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow )
 //=====================================================================================
 void DisplayGUI::SetVectorMode( const bool mode, SUIT_ViewWindow* viewWindow )
 {
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
@@ -499,7 +499,7 @@ int DisplayGUI::GetVectorMode( SUIT_ViewWindow* viewWindow )
 //=====================================================================================
 void DisplayGUI::SetVerticesMode( const bool mode, SUIT_ViewWindow* viewWindow )
 {
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
@@ -558,7 +558,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
   SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( app->activeStudy() );
   if ( !aStudy ) return;
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   SALOME_ListIO selected;
   aSelMgr->selectedObjects( selected );

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index 21dafed1275f0ea19cf372ad5275f100844e37c2..d00c98d24103826add3fc3a30139ac1243ef09df 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@@ -191,7 +191,7 @@ void GEOMToolsGUI::OnAutoColor()
   
     QColor c( (int)( aColor.R * 255.0 ), (int)( aColor.G * 255.0 ), (int)( aColor.B * 255.0 ) );
 
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     
     appStudy->setObjectProperty( aMgrId, aChildObject->GetStudyEntry(), GEOM::propertyName( GEOM::Color ), c );
     Handle( SALOME_InteractiveObject ) io = new SALOME_InteractiveObject( aChildObject->GetStudyEntry(), "GEOM", "" );
@@ -272,7 +272,7 @@ void GEOMToolsGUI::OnColor()
   aSColor.B = (double)color.blue() / 255.0;
 
   // iterate through list of objects and assign new color
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
   for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
     Handle( SALOME_InteractiveObject ) io = It.Value();
     GEOM::GEOM_Object_var aObject = GEOMBase::ConvertIOinGEOMObject( io );
@@ -417,7 +417,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
     NbIsosDlg->setV( VIso );
 
     if ( NbIsosDlg->exec() ) {
-      SUIT_OverrideCursor();     
+      SUIT_OverrideCursor wc;     
       newNbUIso = NbIsosDlg->getU();
       newNbVIso = NbIsosDlg->getV();
     } else //Cancel case
@@ -473,7 +473,7 @@ void GEOMToolsGUI::OnDeflection()
     ( SUIT_Session::session()->activeApplication()->desktop() );
   DeflectionDlg->setTheDC( aDC );
   if ( DeflectionDlg->exec() ) {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     aDC = DeflectionDlg->getTheDC();
 
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
@@ -674,7 +674,7 @@ void GEOMToolsGUI::OnEdgeWidth()
 
   Dlg->setTheLW( aWidth );
   if ( Dlg->exec() ) {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     aWidth = Dlg->getTheLW();
   } else
     return; //Cancel case
@@ -717,7 +717,7 @@ void GEOMToolsGUI::OnIsosWidth() {
 
   Dlg->setTheLW( aWidth );
   if ( Dlg->exec() ) {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     aWidth = Dlg->getTheLW();
   } else
     return; //Cancel case

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index 6a0ebc6f8e9d834611016c52589dc88e5c14a921..7a2db93058035f4d8e866adaa760130978e64f41 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -282,7 +282,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
       return;
     }
 
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
       aView->SetTransparency( It.Value(), newValue );
       aStudy->setObjectProperty( aMgrId , It.Value()->getEntry(), GEOM::propertyName( GEOM::Transparency ) , newValue );
@@ -306,7 +306,7 @@ void GEOMToolsGUI_TransparencyDlg::SetTransparency()
       return;
     }
     
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
     OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*>( window->getViewManager()->getViewModel() );
     if ( !vm )
       return;

diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx
index edbb4b9a682917e4c5dfb42efed9965ba28c011e..37c8ed4b22d5b03ed74dec05fd373ec70be0c2af 100644 (file)
--- a/src/MeasureGUI/MeasureGUI.cxx
+++ b/src/MeasureGUI/MeasureGUI.cxx
@@ -195,7 +195,7 @@ void MeasureGUI::ChangeDimensionsVisibility( const bool theIsVisible )
     return;
   }
 
-  SUIT_OverrideCursor();
+  SUIT_OverrideCursor wc;
 
   GEOMGUI_DimensionProperty aDimensions( anActiveStudy, anIObject->getEntry() );
 

diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
index 9a3567ce9fc14b779bca51525c557f0aef199238..56b10a09266558c06319c3dd6100fa6ed24c42b2 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
@@ -329,7 +329,7 @@ void MeasureGUI_BndBoxDlg::redisplayPreview()
   erasePreview(false);
 
   try {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
 
     getDisplayer()->SetColor(Quantity_NOC_VIOLET);
     getDisplayer()->SetToActivate(false);

diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
index f58b0c3a86b7a059dda343efb223bbf24a255e0d..a07e919e5be3e09e1e073d784fc593d011e49051 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx
@@ -410,6 +410,8 @@ bool MeasureGUI_CheckSelfIntersectionsDlg::findSelfIntersections
   int  nbPairs  = 0;
   int aLevel = myLevelBox->currentIndex();
 
+  SUIT_OverrideCursor wc;
+
   try {
     HasSelfInte = !anOper->CheckSelfIntersections(myObj, aLevel, myInters);
     nbPairs = myInters->length()/2;

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
index e92d455900971491693175b014d629e5dff335e1..a2b0dc16c54a8f6c07a5ede7670a03219715e2a0 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
@@ -511,7 +511,7 @@ void MeasureGUI_DistanceDlg::redisplayPreview()
   erasePreview(false);
 
   try {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
 
     getDisplayer()->SetColor(Quantity_NOC_VIOLET);
     getDisplayer()->SetToActivate(false);

diff --git a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
index a12434301e1ccd5d1d5229f5ecb0dd3178675953..459501c3c317cc91fab546f9ae1339bb9aaeee26 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
@@ -228,6 +228,8 @@ void MeasureGUI_FastCheckIntersectionsDlg::clear()
 //=================================================================================
 void MeasureGUI_FastCheckIntersectionsDlg::onCompute()
 {
+  SUIT_OverrideCursor wc;
+
   myShapeList1->clear();
   myShapeList2->clear();
 

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 6bcfe743b6e8b308a4f21b9096d0132b0cd58afd..50667f49105a92749ac9589d1f1093b6e73b0d1c 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -324,7 +324,7 @@ void MeasureGUI_Skeleton::redisplayPreview()
   erasePreview( false );
 
   try {
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
 
     getDisplayer()->SetColor( Quantity_NOC_VIOLET );
     getDisplayer()->SetToActivate( false );

diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index bc7aa61a8b62c064425961d77c6d41745208307f..395bf5301039b266ac3e0825174d262decdd752b 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -286,7 +286,7 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects )
       return false;
     }
     
-    SUIT_OverrideCursor();
+    SUIT_OverrideCursor wc;
 
     TopExp::MapShapes( aSelShape, anIndices);
     SALOME_Prs* aPrs = 0;