Merge branch 'V9_9_BR'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_RenumberingDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
index 923688cddc84a0bd61dd07c8034e7c6d3bc3939c..5281b91983f0e3aee6b315d48202e6e9224fccbf 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -99,8 +99,8 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
                                     tr("SMESH_ELEMENTS"), 
                                     this);
   myHelpFileName = unit == 0 ? 
-    "renumbering_nodes_and_elements_page.html#renumbering_nodes_anchor" :
-    "renumbering_nodes_and_elements_page.html#renumbering_elements_anchor";
+    "renumbering_nodes_and_elements.html#renumbering-nodes-anchor" :
+    "renumbering_nodes_and_elements.html#renumbering-elements-anchor";
 
   QButtonGroup* ButtonGroup = new QButtonGroup(this);
   QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
@@ -210,7 +210,7 @@ void SMESHGUI_RenumberingDlg::Init()
 //=================================================================================
 void SMESHGUI_RenumberingDlg::ClickOnApply()
 {
-  if (mySMESHGUI->isActiveStudyLocked())
+  if (SMESHGUI::isStudyLocked())
     return;
 
   if (!myMesh->_is_nil()) {
@@ -385,7 +385,7 @@ void SMESHGUI_RenumberingDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void SMESHGUI_RenumberingDlg::enterEvent(QEvent* e)
+void SMESHGUI_RenumberingDlg::enterEvent(QEvent* /*e*/)
 {
   if (GroupConstructors->isEnabled())
     return;