*** empty log message ***

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 );

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 )
+				  bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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  :

src/BasicGUI/BasicGUI_ArcDlg.h

@@ -40,8 +40,7 @@ class BasicGUI_ArcDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_ArcDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_ArcDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		   const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_ArcDlg();
 
 protected:
@@ -65,7 +64,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

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 )
+					bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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

src/BasicGUI/BasicGUI_CircleDlg.h

@@ -40,8 +40,7 @@ class BasicGUI_CircleDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_CircleDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_CircleDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		      const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_CircleDlg();
 
 protected:
@@ -65,7 +64,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

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 )
+				      bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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.

src/BasicGUI/BasicGUI_CurveDlg.h

@@ -40,8 +40,7 @@ class BasicGUI_CurveDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_CurveDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_CurveDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		     const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_CurveDlg();
   
 protected:
@@ -63,7 +62,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

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 )
+					  bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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

src/BasicGUI/BasicGUI_EllipseDlg.h

@@ -38,8 +38,7 @@ class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		      const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_EllipseDlg();
 
 protected:
@@ -61,7 +60,6 @@ private:
   
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

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 )
+				    bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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  :

src/BasicGUI/BasicGUI_LineDlg.h

@@ -39,8 +39,7 @@ class BasicGUI_LineDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_LineDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_LineDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		    const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_LineDlg();
   
 protected:
@@ -63,7 +62,6 @@ private:
     
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

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();
+    ClickOnCancel();
-}
-
-//=======================================================================
-// function : onClose()
-// purpose  :
-//=======================================================================
-void BasicGUI_MarkerDlg::onClose()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
 }
 
 //=================================================================================

src/BasicGUI/BasicGUI_MarkerDlg.h

@@ -64,7 +64,6 @@ private:
 
 private slots:
   void                          onOk();
-  void                          onClose();
   bool                          onApply();
   void                          onActivate();
   void                          onDeactivate();

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 )
+				      bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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

src/BasicGUI/BasicGUI_PlaneDlg.h

@@ -41,8 +41,7 @@ class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_PlaneDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_PlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		     const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_PlaneDlg();
   
 protected:
@@ -67,7 +66,6 @@ private:
 
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();

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 )
+				      bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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)

src/BasicGUI/BasicGUI_PointDlg.h

@@ -46,8 +46,7 @@ class BasicGUI_PointDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_PointDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_PointDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		     const char* = 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();

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 )
+					bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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  :

src/BasicGUI/BasicGUI_VectorDlg.h

@@ -40,8 +40,7 @@ class BasicGUI_VectorDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_VectorDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_VectorDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-		      const char* = 0, bool = false, Qt::WindowFlags = 0 );
   ~BasicGUI_VectorDlg();
   
 protected:
@@ -62,7 +61,6 @@ private:
     
 private slots:
   void                               ClickOnOk();
-  void                               ClickOnCancel();
   bool                               ClickOnApply();
 
   void                               ActivateThisDialog();

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 )
+						    bool modal, Qt::WindowFlags fl )
-  : GEOMBase_Skeleton( theGeometryGUI, parent, name, modal, 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  :

src/BasicGUI/BasicGUI_WorkingPlaneDlg.h

@@ -44,8 +44,7 @@ class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BasicGUI_WorkingPlaneDlg( GeometryGUI*, QWidget* = 0,
+  BasicGUI_WorkingPlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
-			    const char* = 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 );