getDesktop() method is changed: now it is NOT virtual, it is implemented in GEOMBase_...

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 0ac078075f9104d325e746a1e006d291bd78c0e3..8224cc58135a2a80ba16bcc709ea9fa966380923 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -62,7 +62,8 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, const char* name, bool modal, WFlags fl)
-  :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), GEOMBase_Helper(), myIsAllAdded( false ),
+  :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), myIsAllAdded( false ),
+   GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
    myGeometryGUI( GUI )
 {
   myGeometryGUI->SetActiveDialogBox(this);
@@ -1396,15 +1397,6 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject,
   return true;
 }
 
-//=================================================================================
-// function : getDesktop()
-// purpose  :
-//=================================================================================
-SUIT_Desktop* EntityGUI_SketcherDlg::getDesktop() const
-{
-  return dynamic_cast<SUIT_Desktop*>( parentWidget() );
-}
-
 
 
 

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h
index 4fc1149d5070f2341cf47121d24c7b60af9c8fb1..2546a5fe2b182b0c9c663b85983f994b64cc54a4 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.h
@@ -74,8 +74,6 @@ protected:
 
     void closeEvent( QCloseEvent* e );
 
-    virtual SUIT_Desktop* getDesktop() const;
-
 private :
     void Init();
     void enterEvent(QEvent* e);

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 8809a521c43d6c02e30988ddbac24bbe81d5cccb..c1824caccd5349f563e7d0a43c2f66be7ff4801e 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -92,8 +92,8 @@ GEOM::GEOM_Gen_ptr GEOMBase_Helper::getGeomEngine()
 // Function : GEOMBase_Helper
 // Purpose  :
 //================================================================
-GEOMBase_Helper::GEOMBase_Helper() 
-  : myViewWindow( 0 ), myDisplayer( 0 ), myCommand( 0 ), isPreview( false )
+GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop ) 
+  : myDesktop( desktop ), myViewWindow( 0 ), myDisplayer( 0 ), myCommand( 0 ), isPreview( false )
 {
 }
 
@@ -963,3 +963,12 @@ Handle(SALOME_InteractiveObject) GEOMBase_Helper::lastIObject()
   return aList.Extent() > 0 ? aList.Last() : Handle(SALOME_InteractiveObject)();
 }
 
+//================================================================
+// Function : getDesktop
+// Purpose  : Returns myDesktop field.  Initialized in constructor, usually as dynamic_cast<SUIT_Desktop*>(parentWidget())
+//================================================================
+SUIT_Desktop* GEOMBase_Helper::getDesktop() const
+{
+  return myDesktop;
+}
+

diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index 1667958dfce2f3d7f4d8d203d84643761d1caa71..ac07a3ede14c0a5a6c8708f786f0624e610968e8 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -58,7 +58,7 @@ class TColStd_MapOfInteger;
 class GEOMBase_Helper
 {
 public:
-  GEOMBase_Helper();
+  GEOMBase_Helper( SUIT_Desktop* );
   virtual ~GEOMBase_Helper();
 
 protected:
@@ -171,7 +171,7 @@ protected:
   bool IsPreview() {return isPreview;}
 
   GEOM_Displayer*             getDisplayer();
-  virtual SUIT_Desktop* getDesktop() const = 0;
+  SUIT_Desktop*               getDesktop() const;
 
 private:
   char* getEntry              ( GEOM::GEOM_Object_ptr ) const;
@@ -188,6 +188,7 @@ private:
   QString                     myPrefix;
   bool                        isPreview;
   SALOME_ListIO               mySelected;
+  SUIT_Desktop*               myDesktop;
 
 };
 

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index b2242cc24bd9d16d236f2e84a67a3d8673757a8e..a1a656ee0f2b960b196105eb91aa5e6c1d075d20 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -44,7 +44,8 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 GEOMBase_Skeleton::GEOMBase_Skeleton(QWidget* parent, const char* name, bool modal, WFlags fl)
-:DlgRef_Skeleton_QTD(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), GEOMBase_Helper()
+  :DlgRef_Skeleton_QTD( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), 
+   GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) )
 {
   if (!name)
     setName("GEOMBase_Skeleton");
@@ -215,12 +216,3 @@ int GEOMBase_Skeleton::getConstructorId() const
     return GroupConstructors->id( GroupConstructors->selected() );
   return -1;
 }
-
-//=================================================================================
-// function : getDesktop()
-// purpose  :
-//=================================================================================
-SUIT_Desktop* GEOMBase_Skeleton::getDesktop() const
-{
-  return dynamic_cast<SUIT_Desktop*>( parentWidget() );
-}

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index a6ca50f01c23bb08ab050234ee4ce8e07a9822c2..a4ae0b4dae3c58eb5c3b493ccc9395b2169df869 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -60,7 +60,6 @@ protected:
     void initName( const char* thePrefix = 0 ); // initialize "Name" field with a string "thePrefix_X" (Vertex_3)
     virtual const char* getNewObjectName() const; // returns contents of "Name" field
     int getConstructorId() const; // returns id of a selected "constructor" radio button or '-1' in case of error
-    virtual SUIT_Desktop* getDesktop() const;
 
     QLineEdit* myEditCurrentArgument;   /* Current LineEdit */
     GEOMBase* myGeomBase; // SAN -- TO BE REMOVED !!!

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 85eac7a0ad4d33525408e33d8da6a444c1c70b44..4e89cddc86f30f77e6bbb3685cdc0b3b9070aa4f 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -56,6 +56,7 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI*      GUI,
                                           const char*       name )
 : MeasureGUI_Skeleton_QTD( parent, name, false,
                           WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ),
+  GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
   myGeomGUI( GUI )
 {
 
@@ -341,11 +342,3 @@ GEOM::GEOM_IOperations_ptr MeasureGUI_Skeleton::createOperation()
   return getGeomEngine()->GetIMeasureOperations( getStudyId() );
 }
 
-//=================================================================================
-// function : getDesktop()
-// purpose  :
-//=================================================================================
-SUIT_Desktop*  MeasureGUI_Skeleton::getDesktop() const
-{
-  return dynamic_cast<SUIT_Desktop*>( parentWidget() );
-}

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h
index 8d3236814ccd4cbd3e84a5d697d75b8ba92e399b..bcf601a1e61b385c8e96866b3cf27820925d4363 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.h
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.h
@@ -74,8 +74,6 @@ protected:
 
     virtual GEOM::GEOM_IOperations_ptr createOperation();
 
-    virtual SUIT_Desktop* getDesktop() const;
-
 protected:    
     
     QPushButton*              mySelBtn;

diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
index 7d2c882888cb9a3bc8fef86542b46dcd029d5849..add5736ac87fb38ba162ab2c9802aea9a7a48894 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
@@ -60,6 +60,7 @@
 RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent )
 : QDialog( theParent, "RepairGUI_FreeBoundDlg", false,
           WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ),
+  GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( theParent ) ),
   myGeomGUI ( theGUI )
 {
   setCaption( tr( "CAPTION" ) );
@@ -277,14 +278,5 @@ bool RepairGUI_FreeBoundDlg::execute( ObjectList& objects )
   return result;
 }
 
-//=================================================================================
-// function : getDesktop()
-// purpose  :
-//=================================================================================
-SUIT_Desktop* RepairGUI_FreeBoundDlg::getDesktop() const
-{
-  return dynamic_cast<SUIT_Desktop*>( parentWidget() );
-}
-
 
 

diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
index cdf07980e2cde02d41b528fa9d5900ccfceb19f6..e317cc3a73af38d75ac54010fa00cbf14ec5f561 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
@@ -67,7 +67,6 @@ private:
   virtual GEOM::GEOM_IOperations_ptr    createOperation();
   virtual bool                          execute( ObjectList& objects );
   virtual bool                          isValid( QString& );
-  virtual SUIT_Desktop*                 getDesktop() const;
 
 private:
 

diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index fef1a3ac00df19e672de00a968077052cab70cf9..96b5c2a1e142da226165714f53fb5f3ae6d919bf 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -67,6 +67,7 @@ using namespace std;
 RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent, const char* name, bool modal, WFlags fl)
 :QDialog( parent, "RepairGUI_FreeBoundDlg", false,
          WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ),
+ GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
  myGeomGUI( GUI )
 {
   myDisplayer = 0;
@@ -327,11 +328,3 @@ void RepairGUI_FreeFacesDlg::onSetEditCurrentArgument()
   onSelectionDone();
 }
 
-//=================================================================================
-// function : getDesktop()
-// purpose  :
-//=================================================================================
-SUIT_Desktop* RepairGUI_FreeFacesDlg::getDesktop() const
-{
-  return dynamic_cast<SUIT_Desktop*>( parentWidget() );
-}

diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
index 80845f1d624c93aecfa99b90174a2113d98701e0..f42589b24d9291e3d87a2b78faa87b147124109c 100644 (file)
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
@@ -55,7 +55,6 @@ protected:
     virtual GEOM::GEOM_IOperations_ptr createOperation();
     virtual bool isValid( QString& );
     virtual bool execute( ObjectList& objects );
-    virtual SUIT_Desktop* getDesktop() const;
 
 private :