*** empty log message ***

diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index 107e6572f120dadb01c090b2c03768126dee6112..912846e061991c89eb6ffd3ea0e2c569ef7e82ee 100644 (file)
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -82,31 +82,31 @@ bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 
   switch ( theCommandID ) {
   case 4011: // POINT
-    aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent, "" ); 
+    aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent ); 
     break;
   case 4012:  // LINE
-    aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent );
     break;
   case 4013:  // CIRCLE
-    aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent, "");
+    aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent );
     break;
   case 4014:  // ELLIPSE
-    aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent );
     break;
   case 4015:  // ARC
-    aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent );
     break ;
   case 4016: // VECTOR
-    aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent );
     break;
   case 4017: // PLANE
-    aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent, "");
+    aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent );
     break;
   case 4018: // WORKING PLANE
-    aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent );
     break;
   case 4019: // CURVE
-    aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent, "" );
+    aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent );
     break;
   case 4020: // REPAIR
     aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );

diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx
index 4693d85245b7482bf3783a74e4a1d3b99c864b99..931b13631519fa6e2df6485c5e3ea9f8c25e51c5 100644 (file)
--- a/src/BasicGUI/BasicGUI_ArcDlg.cxx
+++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx
@@ -44,8 +44,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_ArcDlg::BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                 const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                 bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_ArcDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_ARC" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_ARC_CENTER" ) ) );
@@ -136,7 +136,6 @@ void BasicGUI_ArcDlg::Init()
  
   connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
  
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -178,15 +177,6 @@ void BasicGUI_ArcDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_ArcDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :

diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h
index 66d8b599897c1b71c76d6dd214d1254c5ace837c..df31e8877e084a0f06675fb7708c449ea5396d3d 100644 (file)
--- a/src/BasicGUI/BasicGUI_ArcDlg.h
+++ b/src/BasicGUI/BasicGUI_ArcDlg.h
@@ -40,8 +40,7 @@ class BasicGUI_ArcDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_ArcDlg( GeometryGUI*, QWidget* = 0,
-                  const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_ArcDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_ArcDlg();
 
 protected:
@@ -65,7 +64,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx
index cf82cb08caeff0070c09f49e6a9d7367a6b155ed..35ff7a8158f0822ceb6eef7073f4834dd8b86459 100644 (file)
--- a/src/BasicGUI/BasicGUI_CircleDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx
@@ -45,8 +45,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_CircleDlg::BasicGUI_CircleDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                       const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                       bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_CircleDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_CIRCLE_PV" ) ) );
   QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_CIRCLE_PNTS" ) ) );
@@ -133,7 +133,6 @@ void BasicGUI_CircleDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
   
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -228,15 +227,6 @@ bool BasicGUI_CircleDlg::ClickOnApply()
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_CircleDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case

diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h
index c7c5f1dbcde494abd311960503328dcbc4ad4986..08597151ae52ba054cb3888693ce48da2dd35d00 100644 (file)
--- a/src/BasicGUI/BasicGUI_CircleDlg.h
+++ b/src/BasicGUI/BasicGUI_CircleDlg.h
@@ -40,8 +40,7 @@ class BasicGUI_CircleDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_CircleDlg( GeometryGUI*, QWidget* = 0,
-                     const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_CircleDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_CircleDlg();
 
 protected:
@@ -65,7 +64,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 515183c22d3f048b6d63c9558e464b5cdfdaae6c..e8255f369c8cd483b51759bf39f72f54b4b0ce3e 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -46,8 +46,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_CurveDlg::BasicGUI_CurveDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_CurveDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POLYLINE" ) ) );
   QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SPLINE" ) ) );
@@ -107,7 +107,6 @@ void BasicGUI_CurveDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog( ) ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
   
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -189,15 +188,6 @@ bool BasicGUI_CurveDlg::ClickOnApply()
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_CurveDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 /*! function : isPointInList()
  *  purpose  : Check is point (theObject) in the list \a thePoints.

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index 833c2809cae2ad345dba9c88e733e45705dbbe0b..1aa2beac953ba58c141c37711de000ecbb4ab619 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.h
+++ b/src/BasicGUI/BasicGUI_CurveDlg.h
@@ -40,8 +40,7 @@ class BasicGUI_CurveDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_CurveDlg( GeometryGUI*, QWidget* = 0,
-                    const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_CurveDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_CurveDlg();
   
 protected:
@@ -63,7 +62,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
index e8609776c4dd43ee2c037473db7e8d2984a0ed71..d79c91e4b9766ebbda404cbb9ad18eb0084f4366 100644 (file)
--- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
@@ -44,8 +44,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_EllipseDlg::BasicGUI_EllipseDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                         const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                         bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_EllipseDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_ELLIPSE_PV" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
@@ -122,7 +122,6 @@ void BasicGUI_EllipseDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -179,15 +178,6 @@ bool BasicGUI_EllipseDlg::ClickOnApply()
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_EllipseDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case

diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h
index 62a32fb0320f320de5d7c9e8b4d1affa7265cf87..060c6f4777bb2e9c00cea69479540f355ef3bb1f 100644 (file)
--- a/src/BasicGUI/BasicGUI_EllipseDlg.h
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.h
@@ -38,8 +38,7 @@ class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0,
-                     const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_EllipseDlg();
 
 protected:
@@ -61,7 +60,6 @@ private:
   
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx
index 19038a6f373f30fd1b2dcf6fae4be91b67370832..be317e3ffda665fd9cde4b949ddbbbee64bf95d4 100644 (file)
--- a/src/BasicGUI/BasicGUI_LineDlg.cxx
+++ b/src/BasicGUI/BasicGUI_LineDlg.cxx
@@ -44,8 +44,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_LineDlg::BasicGUI_LineDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                   const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_LineDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_LINE_2P" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
@@ -110,7 +110,6 @@ void BasicGUI_LineDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -137,15 +136,6 @@ void BasicGUI_LineDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_LineDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :

diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h
index a15878501308d0ef21f87001bc6ca5d50e80ac4f..25623eff187f6549757410c0494de5737f43ddd1 100644 (file)
--- a/src/BasicGUI/BasicGUI_LineDlg.h
+++ b/src/BasicGUI/BasicGUI_LineDlg.h
@@ -39,8 +39,7 @@ class BasicGUI_LineDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_LineDlg( GeometryGUI*, QWidget* = 0,
-                   const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_LineDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_LineDlg();
   
 protected:
@@ -63,7 +62,6 @@ private:
     
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index ea3bd17fe50cd51ae26ac2d2d4931b090de08be2..20b2d85c6ce8a9a7056269ac5b9ada6eadba61c1 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@ -186,9 +186,8 @@ void BasicGUI_MarkerDlg::Init()
   connect( Group2->LineEdit3,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
   connect( myGeomGUI,           SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) );
-  connect( myGeomGUI,           SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( onClose() ) );
+  connect( myGeomGUI,           SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(),      SIGNAL( clicked() ), this, SLOT( onClose() ) );
   connect( buttonOk(),          SIGNAL( clicked() ), this, SLOT( onOk() ) );
   connect( buttonApply(),       SIGNAL( clicked() ), this, SLOT( onApply() ) );
 
@@ -303,16 +302,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 void BasicGUI_MarkerDlg::onOk()
 {
   if ( onApply() )
-    onClose();
-}
-
-//=======================================================================
-// function : onClose()
-// purpose  :
-//=======================================================================
-void BasicGUI_MarkerDlg::onClose()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
+    ClickOnCancel();
 }
 
 //=================================================================================

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 6df47fd6bf306f925356535d97ff2392a3dbc39e..104040e7647a3835debbff6dcf68d46abb186cb6 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -64,7 +64,6 @@ private:
 
 private slots:
   void                          onOk();
-  void                          onClose();
   bool                          onApply();
   void                          onActivate();
   void                          onDeactivate();

diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
index 8a2681ce3ee3946b59d196a9a90c975ce11f81c5..b3f4e67f0707122c48ba526fcdd87dc2d2c00bae 100644 (file)
--- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
@@ -47,8 +47,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_PlaneDlg::BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_PlaneDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_PLANE_PV" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_PLANE_3PNTS" ) ) );
@@ -148,7 +148,6 @@ void BasicGUI_PlaneDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -279,15 +278,6 @@ bool BasicGUI_PlaneDlg::ClickOnApply()
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_PlaneDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection has changed

diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h
index dc2c83d5282f1e3095b3502f8309667511d020dc..f8c81a2f97a2b6b182e0db9f4c00093a689b8953 100644 (file)
--- a/src/BasicGUI/BasicGUI_PlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.h
@@ -41,8 +41,7 @@ class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_PlaneDlg( GeometryGUI*, QWidget* = 0,
-                    const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_PlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_PlaneDlg();
   
 protected:
@@ -67,7 +66,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 73ea6e16af9f021cf262da699697774a005305b3..9e422b25bf8f6f415b48ee578dd9002b47b06062 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -57,8 +57,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_PointDlg::BasicGUI_PointDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_PointDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT") ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_EDGE" ) ) );
@@ -183,7 +183,6 @@ void BasicGUI_PointDlg::Init()
   connect( myGeomGUI,      SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI,      SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -310,16 +309,6 @@ bool BasicGUI_PointDlg::ClickOnApply()
 }
 
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_PointDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed (for constructors not using local context)

diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h
index eb4d1c6f34ce0363e1d741838ffb923d0a2d7fc0..064b5b954e858c753f225c4ddfd935a49128c234 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.h
+++ b/src/BasicGUI/BasicGUI_PointDlg.h
@@ -46,8 +46,7 @@ class BasicGUI_PointDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_PointDlg( GeometryGUI*, QWidget* = 0,
-                    const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_PointDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
 
   ~BasicGUI_PointDlg();
 
@@ -82,7 +81,6 @@ private:
   
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
   void                               DeactivateActiveDialog();

diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx
index 6dd3e27848780d967d5b73553eeecb4f47192ea2..6daee534596477c0be959e22fc46f836e07ba081 100644 (file)
--- a/src/BasicGUI/BasicGUI_VectorDlg.cxx
+++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx
@@ -44,8 +44,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_VectorDlg::BasicGUI_VectorDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                       const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                       bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_VectorDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_VECTOR_2P" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_VECTOR_DXYZ" ) ) );
@@ -132,7 +132,6 @@ void BasicGUI_VectorDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
   
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -223,15 +222,6 @@ void BasicGUI_VectorDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_VectorDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :

diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h
index c5169596d590a387a7169d6294f9e20a4585f109..bfb33b5786641aab8b9665762e38b57a9eeca1f5 100644 (file)
--- a/src/BasicGUI/BasicGUI_VectorDlg.h
+++ b/src/BasicGUI/BasicGUI_VectorDlg.h
@@ -40,8 +40,7 @@ class BasicGUI_VectorDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_VectorDlg( GeometryGUI*, QWidget* = 0,
-                     const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_VectorDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_VectorDlg();
   
 protected:
@@ -62,7 +61,6 @@ private:
     
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index c7b8e4e30f708cde3401749422571aca6764e4c2..262c3a7d69baf849ab12dcb75c3171c6e4647b06 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -56,8 +56,8 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
-                                                   const char* name, bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, fl )
+                                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, "BasicGUI_WorkingPlaneDlg", modal, fl )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_WPLANE_FACE" ) ) );
@@ -151,7 +151,6 @@ void BasicGUI_WorkingPlaneDlg::Init()
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
   connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
   connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
@@ -394,15 +393,6 @@ void BasicGUI_WorkingPlaneDlg::DeactivateActiveDialog()
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_WorkingPlaneDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
index fd86690eaef8618216bbc47726fdfe1c19787537..ec931736feb55dca588ac55ae0817f35aef8c18a 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
@@ -44,8 +44,7 @@ class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_WorkingPlaneDlg( GeometryGUI*, QWidget* = 0,
-                           const char* = 0, bool = false, Qt::WindowFlags = 0 );
+  BasicGUI_WorkingPlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_WorkingPlaneDlg();
 
 protected:
@@ -73,7 +72,6 @@ private:
   
 private slots:
   void                  ClickOnOk();
-  void                  ClickOnCancel();
   bool                  ClickOnApply();
   
   void                  ConstructorsClicked( int );