From 94691bb0b87a1ddac1ce2ae70b32ad5e02adcba6 Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Mon, 17 Oct 2005 07:10:47 +0000
Subject: [PATCH] Virtual method QDialog::done() reimplemented.

---
 src/SVTK/SVTK_CubeAxesDlg.cxx     | 3 ++-
 src/SVTK/SVTK_CubeAxesDlg.h       | 5 ++---
 src/SVTK/SVTK_NonIsometricDlg.cxx | 3 ++-
 src/SVTK/SVTK_NonIsometricDlg.h   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index ea959790e..daed6845e 100644
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -565,7 +565,8 @@ void SVTK_CubeAxesDlg::onClose()
   myAction->setOn( false );
 }
 
-void SVTK_CubeAxesDlg::closeEvent( QCloseEvent* )
+void SVTK_CubeAxesDlg::done( int r )
 {
   myAction->setOn( false );
+  QDialog::done( r );
 }
diff --git a/src/SVTK/SVTK_CubeAxesDlg.h b/src/SVTK/SVTK_CubeAxesDlg.h
index dc838217b..bd7e5254c 100644
--- a/src/SVTK/SVTK_CubeAxesDlg.h
+++ b/src/SVTK/SVTK_CubeAxesDlg.h
@@ -63,14 +63,13 @@ public:
 
   void            Update();
 
-protected:
-  virtual void    closeEvent( QCloseEvent* );
-
 private slots:
   void            onOk();
   bool            onApply();
   void            onClose();
 
+  virtual void    done( int );
+
 private:
   QWidget*        createButtonFrame( QWidget* );
   QWidget*        createMainFrame  ( QWidget* );
diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx
index 82c91d45f..10af3818d 100644
--- a/src/SVTK/SVTK_NonIsometricDlg.cxx
+++ b/src/SVTK/SVTK_NonIsometricDlg.cxx
@@ -195,7 +195,8 @@ SVTK_NonIsometricDlg
 
 void 
 SVTK_NonIsometricDlg
-::closeEvent( QCloseEvent* )
+::done( int r )
 {
   m_Action->setOn( false );
+  QDialog::done( r );
 }
diff --git a/src/SVTK/SVTK_NonIsometricDlg.h b/src/SVTK/SVTK_NonIsometricDlg.h
index 1b1105ec2..6a11a14f6 100644
--- a/src/SVTK/SVTK_NonIsometricDlg.h
+++ b/src/SVTK/SVTK_NonIsometricDlg.h
@@ -53,8 +53,6 @@ public:
   void Update();
 
 protected:
-  virtual void closeEvent( QCloseEvent* );
-
   SVTK_MainWindow *m_MainWindow;
   QtxAction* m_Action;
 
@@ -68,6 +66,8 @@ protected slots:
   void onClickReset();
   void onClickOk();
   void onClickClose();
+
+  virtual void done( int );
 };
 
 #endif // SVTK_NONISOMETRICDLG_H
-- 
2.39.2