Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/geom.git] / src / PrimitiveGUI / PrimitiveGUI_TorusDlg.h

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
index 00d6a46b679dfcc140e8f9c963eae1acf440101c..1703b6a43fa573bada4cf3568c326f2046dbab8e 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -51,12 +51,12 @@ protected:
     virtual GEOM::GEOM_IOperations_ptr createOperation();
     virtual bool isValid( QString& );
     virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
+    virtual void addSubshapesToStudy();
 
 private:
     void Init();
     void enterEvent(QEvent* e);
+
     double getRadius1() const;
     double getRadius2() const;
 
@@ -65,12 +65,11 @@ private:
     DlgRef_2Sel2Spin* GroupPoints;
     DlgRef_2Spin* GroupDimensions;
 
-    private slots:
+private slots:
     void ClickOnOk();
     bool ClickOnApply();
-    void ClickOnCancel();
+
     void ActivateThisDialog();
-    void DeactivateActiveDialog();
     void LineEditReturnPressed();
     void SelectionIntoArgument();
     void SetEditCurrentArgument();