Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights 2014.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h
index ec3b4c2f5e28b8365c67d764386040a1e0b78df3..db086cd79e45926ab53e307d65541f5c251b94bb 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-92,13
+92,14
@@
protected:
bool isApplyAndClose() const;
private:
bool isApplyAndClose() const;
private:
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
+protected slots:
+ virtual void reject();
+
private slots:
void onOk();
private slots:
void onOk();
- void onClose();
void onHelp();
void onDeactivate();
void onHelp();
void onDeactivate();