Merge remote-tracking branch 'origin/master' into V8_5_BR

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_NodesDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.h b/src/SMESHGUI/SMESHGUI_NodesDlg.h
index de2058f5aed72ef2712347b640d67587950a18ad..9aae77f4463b18f21c7b8186c9dc8b4174a52e0c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_NodesDlg.h
+++ b/src/SMESHGUI/SMESHGUI_NodesDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -79,8 +79,6 @@ private:
 
   void                    Init();
   void                    enterEvent( QEvent* );
-  void                    closeEvent( QCloseEvent* );
-  void                    hideEvent ( QHideEvent* );
   void                    keyPressEvent( QKeyEvent* );
   
   bool                    isValid();
@@ -108,15 +106,19 @@ private:
 
   QString                 myHelpFileName;
 
+protected slots:
+  virtual void            reject();
+
 private slots:
   void                    ClickOnOk();
-  void                    ClickOnCancel();
   bool                    ClickOnApply();
   void                    ClickOnHelp();
   void                    DeactivateActiveDialog();
   void                    ActivateThisDialog();
   void                    SelectionIntoArgument();
   void                    ValueChangedInSpinBox( double );
+  void                    onOpenView();
+  void                    onCloseView();
 };
 
 #endif // SMESHGUI_NODESDLG_H