getSMESHGUI()->isActiveStudyLocked() is replaced by

isStudyLocked()
In all other operations the second variant must be used

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx
index 5942cd6b65bb2ce6e7282bea4f8cbd1cf4a88d31..8afb8ce2f6f7c976f6992cd3fb5968354a5774e9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx
@@ -274,7 +274,7 @@ bool SMESHGUI_AddMeshElementOp::onApply()
     return false;
 
   IdList ids; selectedIds( 0, ids );
-  if( ids.count()>=myNbNodes && !getSMESHGUI()->isActiveStudyLocked() ) {
+  if( ids.count()>=myNbNodes && !isStudyLocked() ) {
     //myBusy = true;
     SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
     anArrayOfIdeces->length(myNbNodes);

diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
index ddc14b47d0be68da3af3fccf4b1da85f76daedc9..d43d475864c9c4ffb788da5e46bd56290ecc09c2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
@@ -141,7 +141,7 @@ SUIT_SelectionFilter* SMESHGUI_AddSubMeshOp::createFilter( const int id ) const
 //=================================================================================
 bool SMESHGUI_AddSubMeshOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   QString myNameSubMesh = myDlg->subMeshName();

diff --git a/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx b/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx
index 115ce0e14d162fb985f0432d600dfa0f216a01a7..ceef91df8a9192693b0ec9edaf68fd8ff6e1c84f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx
@@ -109,7 +109,7 @@ void SMESHGUI_EditHypothesesOp::selectionDone()
 //=================================================================================
 bool SMESHGUI_EditHypothesesOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   bool aRes = false;

diff --git a/src/SMESHGUI/SMESHGUI_GroupOp.cxx b/src/SMESHGUI/SMESHGUI_GroupOp.cxx
index 2b96f1c6837de872d9c3a067d3998a2eb9b9f5ba..d95aa5604b756e043ce548083adbba311b8e6971 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOp.cxx
@@ -80,7 +80,7 @@ SalomeApp_Dialog* SMESHGUI_GroupOp::dlg() const
 //=======================================================================
 bool SMESHGUI_GroupOp::onApply()
 {
-  if( !myDlg || !isValid() || getSMESHGUI()->isActiveStudyLocked() )
+  if( !myDlg || !isValid() || isStudyLocked() )
     return false;
 
   QStringList selGroup[2];

diff --git a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
index 0ae7d92aab15c84c2b55144d97decf8102f60093..97467a25d7131c477ce4044cecc7c946ff770b9a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
@@ -137,7 +137,7 @@ SUIT_SelectionFilter* SMESHGUI_InitMeshOp::createFilter( const int id ) const
 //=================================================================================
 bool SMESHGUI_InitMeshOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   QString myNameMesh = myDlg->meshName();

diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx
index 09a65cc436dde8413fe5393229091c44046fc3b3..30cdb754364efe12ef42dc0dcf0ae04e9d6d2fbc 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx
@@ -151,7 +151,7 @@ void SMESHGUI_MoveNodesOp::initDialog()
 //=======================================================================
 bool SMESHGUI_MoveNodesOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   if( !myDlg->hasSelection( 0 ) )

diff --git a/src/SMESHGUI/SMESHGUI_NodesOp.cxx b/src/SMESHGUI/SMESHGUI_NodesOp.cxx
index 4e2f6ae3ceb65ad7d9396803a694882bf1d617cb..c2082bd864980b8bc55e02e2978de7710ad2c0e4 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_NodesOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_NodesOp.cxx
@@ -309,7 +309,7 @@ void SMESHGUI_NodesOp::initDialog()
 //=================================================================================
 bool SMESHGUI_NodesOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() || !mySimulation )
+  if( isStudyLocked() || !mySimulation )
     return false;
 
   if( mesh()->_is_nil()) {

diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx
index 15c443e65df5d2223e8fac5ae2c95a6cd43bd160..795c622e41aa61c8976b0c8767d1aec761dd1913 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx
@@ -106,7 +106,7 @@ void SMESHGUI_RemoveNodesOp::updateDialog()
 //=================================================================================
 bool SMESHGUI_RemoveNodesOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   IdList ids; selectedIds( 0, ids );

diff --git a/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx b/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx
index a77c9a3cd6af2293c4e921f43f757c8fb7d42ca9..f24640e3f86dee5115586e367c1a93fdc225513e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx
@@ -125,7 +125,7 @@ void SMESHGUI_RenumberingOp::updateDialog()
 //=================================================================================
 bool SMESHGUI_RenumberingOp::onApply()
 {
-  if( getSMESHGUI()->isActiveStudyLocked() )
+  if( isStudyLocked() )
     return false;
 
   if( myDlg->hasSelection( 0 ) )