0027067: Avoid use of virtual methods for implementation of destructors in legacy classes

Redundant methods Delete() and Desroy(), created in CDL as a hack to define destructor for the class, are removed; their definitions are converted to definition of destructors. In a couple of places methods Destroy() are preserved (bug made non-virtual) because they are called explicitly.

src/AdvApp2Var/AdvApp2Var_Criterion.cxx

@@ -19,7 +19,7 @@
 #include <AdvApp2Var_Criterion.hxx>
 #include <AdvApp2Var_Patch.hxx>
 
-void AdvApp2Var_Criterion::Delete()
+AdvApp2Var_Criterion::~AdvApp2Var_Criterion()
 {}
 
 //============================================================================

src/AdvApp2Var/AdvApp2Var_Criterion.hxx

@@ -37,9 +37,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~AdvApp2Var_Criterion(){Delete() ; }
+  Standard_EXPORT virtual ~AdvApp2Var_Criterion();
   
   Standard_EXPORT virtual void Value (AdvApp2Var_Patch& P, const AdvApp2Var_Context& C) const = 0;
   

src/AdvApprox/AdvApprox_Cutting.cxx

@@ -17,5 +17,5 @@
 
 #include <AdvApprox_Cutting.hxx>
 
-void AdvApprox_Cutting::Delete()
+AdvApprox_Cutting::~AdvApprox_Cutting()
 {}

src/AdvApprox/AdvApprox_Cutting.hxx

@@ -32,27 +32,10 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~AdvApprox_Cutting(){Delete();}
+  Standard_EXPORT virtual ~AdvApprox_Cutting();
   
   Standard_EXPORT virtual Standard_Boolean Value (const Standard_Real a, const Standard_Real b, Standard_Real& cuttingvalue) const = 0;
 
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
 };
 
 

src/Aspect/Aspect_Window.hxx

@@ -46,7 +46,6 @@ class Aspect_Window : public MMgt_TShared
 {
 
 public:
-
   
   //! Modifies the window background.
   Standard_EXPORT void SetBackground (const Aspect_Background& ABack);
@@ -76,9 +75,6 @@ public:
   //! and returns TRUE if the window is mapped at screen.
   Standard_EXPORT virtual Standard_Boolean DoMapping() const = 0;
   
-  //! Destroy the Window
-  Standard_EXPORT virtual void Destroy() = 0;
-  
   //! Returns the window background.
   Standard_EXPORT Aspect_Background Background() const;
   

src/BRepAlgo/BRepAlgo_BooleanOperation.cxx

@@ -77,10 +77,10 @@ extern void FDSCNX_Close();// see TopOpeBRepDS_connex.cxx
 extern void FDSSDM_Close();// see TopOpeBRepDS_samdom.cxx
 
 //=======================================================================
-//function : Delete 
-//purpose  : alias ~BRepAlgoAPI_BooleanOperation
+//function : ~BRepAlgo_BooleanOperation
+//purpose  : 
 //=======================================================================
-  void BRepAlgo_BooleanOperation::Delete()
+BRepAlgo_BooleanOperation::~BRepAlgo_BooleanOperation()
 {
   FDSSDM_Close();
   FDSCNX_Close();

src/BRepAlgo/BRepAlgo_BooleanOperation.hxx

@@ -47,9 +47,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete() Standard_OVERRIDE;
-Standard_EXPORT virtual ~BRepAlgo_BooleanOperation() {Delete();}
+  Standard_EXPORT virtual ~BRepAlgo_BooleanOperation();
   
   Standard_EXPORT void PerformDS();
   

src/BRepBuilderAPI/BRepBuilderAPI_Command.cxx

@@ -27,7 +27,11 @@ BRepBuilderAPI_Command::BRepBuilderAPI_Command() :
 {
 }
 
-void BRepBuilderAPI_Command::Delete()
+//=======================================================================
+//function : ~BRepBuilderAPI_Command
+//purpose  : 
+//=======================================================================
+BRepBuilderAPI_Command::~BRepBuilderAPI_Command()
 {}
 
 //=======================================================================

src/BRepBuilderAPI/BRepBuilderAPI_Command.hxx

@@ -39,10 +39,8 @@ class BRepBuilderAPI_Command
 public:
 
   DEFINE_STANDARD_ALLOC
-
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~BRepBuilderAPI_Command(){Delete() ; }
+  Standard_EXPORT virtual ~BRepBuilderAPI_Command();
   
   Standard_EXPORT virtual Standard_Boolean IsDone() const;
   

src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx

@@ -31,10 +31,6 @@ BRepBuilderAPI_MakeShape::BRepBuilderAPI_MakeShape()
 {
 }
 
-void BRepBuilderAPI_MakeShape::Delete()
-{}
-
-
 //=======================================================================
 //function : Build
 //purpose  : 

src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.hxx

@@ -40,10 +40,6 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete() Standard_OVERRIDE;
-Standard_EXPORT virtual ~BRepBuilderAPI_MakeShape(){Delete() ; }
-  
   //! This is  called by  Shape().  It does  nothing but
   //! may be redefined.
   Standard_EXPORT virtual void Build();

src/BRepClass3d/BRepClass3d_SolidExplorer.cxx

@@ -771,11 +771,11 @@ BRepClass3d_SolidExplorer::BRepClass3d_SolidExplorer(const TopoDS_Shape& S)
 }
 
 //=======================================================================
-//function : Delete
-//purpose  : 
+//function : ~BRepClass3d_SolidExplorer
+//purpose  :
 //=======================================================================
 
-void BRepClass3d_SolidExplorer::Delete()
+BRepClass3d_SolidExplorer::~BRepClass3d_SolidExplorer()
 {
  Destroy() ;
 }

src/BRepClass3d/BRepClass3d_SolidExplorer.hxx

@@ -56,8 +56,7 @@ public:
   
   Standard_EXPORT BRepClass3d_SolidExplorer(const TopoDS_Shape& S);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~BRepClass3d_SolidExplorer(){Destroy() ; }
+  Standard_EXPORT virtual ~BRepClass3d_SolidExplorer();
   
   Standard_EXPORT void InitShape (const TopoDS_Shape& S);
   

src/BRepLib/BRepLib_Command.cxx

@@ -27,7 +27,7 @@ BRepLib_Command::BRepLib_Command() :
 {
 }
 
-void BRepLib_Command::Delete()
+BRepLib_Command::~BRepLib_Command()
 {}
 
 //=======================================================================

src/BRepLib/BRepLib_Command.hxx

@@ -40,9 +40,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~BRepLib_Command(){Delete() ; }
+  Standard_EXPORT virtual ~BRepLib_Command();
   
   Standard_EXPORT Standard_Boolean IsDone() const;
   

src/BRepToIGES/BRepToIGES_BREntity.cxx

@@ -374,9 +374,9 @@ Standard_Boolean BRepToIGES_BREntity::GetPCurveMode () const
 }
 	    
 //=======================================================================
-//function : Delete
+//function : ~BRepToIGES_BREntity
 //purpose  : 
 //=======================================================================
 
-void BRepToIGES_BREntity::Delete() 
+BRepToIGES_BREntity::~BRepToIGES_BREntity() 
 {} 

src/BRepToIGES/BRepToIGES_BREntity.hxx

@@ -108,35 +108,14 @@ public:
   //! (value of parameter write.surfacecurve.mode)
   Standard_EXPORT Standard_Boolean GetPCurveMode() const;
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~BRepToIGES_BREntity() { Delete(); }
-
-
-
-
-protected:
-
-
-
-
+  Standard_EXPORT virtual ~BRepToIGES_BREntity();
 
 private:
-
-
-
   Handle(IGESData_IGESModel) TheModel;
   Standard_Real TheUnitFactor;
   Standard_Boolean myConvSurface;
   Standard_Boolean myPCurveMode;
   Handle(Transfer_FinderProcess) TheMap;
-
-
 };
 
-
-
-
-
-
-
 #endif // _BRepToIGES_BREntity_HeaderFile

src/BinTools/BinTools_ShapeSet.cxx

@@ -79,11 +79,11 @@ BinTools_ShapeSet::BinTools_ShapeSet(const Standard_Boolean isWithTriangles)
 {}
 
 //=======================================================================
-//function : Delete
+//function : ~BinTools_ShapeSet
 //purpose  : 
 //=======================================================================
 
-void BinTools_ShapeSet::Delete()
+BinTools_ShapeSet::~BinTools_ShapeSet()
 {}
 
 //=======================================================================

src/BinTools/BinTools_ShapeSet.hxx

@@ -48,8 +48,7 @@ public:
   //! Parameter <isWithTriangles> is added for XML Persistence
   Standard_EXPORT BinTools_ShapeSet(const Standard_Boolean isWithTriangles = Standard_False);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~BinTools_ShapeSet(){Delete() ; }
+  Standard_EXPORT virtual ~BinTools_ShapeSet();
   
   //! Define if shape will be stored with triangles
   Standard_EXPORT void SetWithTriangles (const Standard_Boolean isWithTriangles);

src/CDM/CDM_Document.cxx

@@ -70,11 +70,12 @@ CDM_Document::CDM_Document():
 
 
 //=======================================================================
-//function : Destroy
+//function : ~CDM_Document
 //purpose  : 
 //=======================================================================
 
-void CDM_Document::Destroy() {
+CDM_Document::~CDM_Document()
+{
   if(!myMetaData.IsNull()) myMetaData->UnsetDocument();
 }
 

src/CDM/CDM_Document.hxx

@@ -384,11 +384,7 @@ protected:
   
   Standard_EXPORT CDM_Document();
   
-  Standard_EXPORT virtual void Destroy();
-~CDM_Document()
-{
-  Destroy();
-}
+  Standard_EXPORT ~CDM_Document();
 
   Standard_Boolean myResourcesAreLoaded;
 

src/ChFi3d/ChFi3d_Builder.cxx

@@ -167,7 +167,12 @@ static void CompleteDS(TopOpeBRepDS_DataStructure& DStr,
   }
 }
 
-void ChFi3d_Builder::Delete()
+//=======================================================================
+//function : ~ChFi3d_Builder
+//purpose  : 
+//=======================================================================
+
+ChFi3d_Builder::~ChFi3d_Builder()
 {}
 
 //=======================================================================

src/ChFi3d/ChFi3d_Builder.hxx

@@ -80,9 +80,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~ChFi3d_Builder(){Delete() ; }
+  Standard_EXPORT virtual ~ChFi3d_Builder();
   
   Standard_EXPORT void SetParams (const Standard_Real Tang, const Standard_Real Tesp, const Standard_Real T2d, const Standard_Real TApp3d, const Standard_Real TolApp2d, const Standard_Real Fleche);
   

src/Cocoa/Cocoa_Window.hxx

@@ -78,13 +78,8 @@ public:
   Standard_EXPORT Cocoa_Window (NSView* theViewNS);
 #endif
 
-  //! Destroies the Window and all resourses attached to it
-  Standard_EXPORT virtual  void Destroy();
-
-  ~Cocoa_Window()
-  {
-    Destroy();
-  }
+  //! Destroys the Window and all resourses attached to it
+  Standard_EXPORT ~Cocoa_Window();
 
   //! Opens the window <me>
   Standard_EXPORT virtual void Map() const Standard_OVERRIDE;

src/Cocoa/Cocoa_Window.mm

@@ -143,10 +143,10 @@ Cocoa_Window::Cocoa_Window (NSView* theViewNS)
 }
 
 // =======================================================================
-// function : Destroy
+// function : ~Cocoa_Window
 // purpose  :
 // =======================================================================
-void Cocoa_Window::Destroy()
+Cocoa_Window::~Cocoa_Window()
 {
 #if !defined(HAVE_OBJC_ARC)
   Cocoa_LocalPool aLocalPool;

src/FairCurve/FairCurve_Batten.cxx

@@ -117,7 +117,7 @@ FairCurve_Batten::FairCurve_Batten(const gp_Pnt2d& P1,
 			  Flatknots->ChangeArray1());     
 }
 // ==================================================================
-void FairCurve_Batten::Delete()
+FairCurve_Batten::~FairCurve_Batten()
 {}
 // ==================================================================
 void FairCurve_Batten::Angles(const gp_Pnt2d& P1, 

src/FairCurve/FairCurve_Batten.hxx

@@ -69,8 +69,7 @@ public:
   //! gp_Pnt2d::IsEqual tests to see if this is the case.
   Standard_EXPORT FairCurve_Batten(const gp_Pnt2d& P1, const gp_Pnt2d& P2, const Standard_Real Height, const Standard_Real Slope = 0);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~FairCurve_Batten(){Delete();}
+  Standard_EXPORT virtual ~FairCurve_Batten();
   
   //! Freesliding is initialized with the default setting false.
   //! When Freesliding is set to true and, as a result, sliding

src/Graphic3d/Graphic3d_DataStructureManager.cxx

@@ -32,9 +32,3 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
 //-Constructors
 Graphic3d_DataStructureManager::Graphic3d_DataStructureManager () {
 }
-
-//-Destructors
-
-void Graphic3d_DataStructureManager::Destroy () {
-
-}

src/Graphic3d/Graphic3d_DataStructureManager.hxx

@@ -34,16 +34,6 @@ class Graphic3d_DataStructureManager : public MMgt_TShared
 
 public:
 
-  
-  //! Deletes the manager <me>.
-  Standard_EXPORT virtual void Destroy();
-~Graphic3d_DataStructureManager()
-{
-  Destroy();
-}
-
-
-
   DEFINE_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
 
 protected:

src/Graphic3d/Graphic3d_Structure.cxx

@@ -98,10 +98,10 @@ Graphic3d_Structure::Graphic3d_Structure (const Handle(Graphic3d_StructureManage
 }
 
 //=============================================================================
-//function : Destroy
+//function : ~Graphic3d_Structure
 //purpose  :
 //=============================================================================
-void Graphic3d_Structure::Destroy()
+Graphic3d_Structure::~Graphic3d_Structure()
 {
   // as myFirstStructureManager can be already destroyed,
   // avoid attempts to access it

src/Graphic3d/Graphic3d_Structure.hxx

@@ -99,11 +99,7 @@ public:
   
   //! Suppresses the structure <me>.
   //! It will be erased at the next screen update.
-  Standard_EXPORT virtual void Destroy();
-~Graphic3d_Structure()
-{
-  Destroy();
-}
+  Standard_EXPORT ~Graphic3d_Structure();
   
   //! Displays the structure <me> in all the views of the visualiser.
   Standard_EXPORT virtual void Display();

src/Graphic3d/Graphic3d_StructureManager.cxx

@@ -101,8 +101,8 @@ Standard_Integer Limit  = Graphic3d_StructureManager::Limit ();
 
 //-Destructors
 
-void Graphic3d_StructureManager::Destroy () {
-
+Graphic3d_StructureManager::~Graphic3d_StructureManager ()
+{
         myDisplayedStructure.Clear ();
         myHighlightedStructure.Clear ();
         myDefinedViews.Clear();

src/Graphic3d/Graphic3d_StructureManager.hxx

@@ -70,11 +70,7 @@ public:
   Standard_EXPORT Graphic3d_StructureManager (const Handle(Graphic3d_GraphicDriver)& theDriver);
 
   //! Deletes the manager <me>.
-  Standard_EXPORT virtual void Destroy();
-~Graphic3d_StructureManager()
-{
-  Destroy();
-}
+  Standard_EXPORT ~Graphic3d_StructureManager();
 
   //! Modifies the default attributes for lines
   //! in the visualiser.

src/IFGraph/IFGraph_SubPartsIterator.cxx

@@ -253,9 +253,9 @@ IFGraph_SubPartsIterator::IFGraph_SubPartsIterator
 }
 
 //=======================================================================
-//function : Delete
+//function : ~IFGraph_SubPartsIterator
 //purpose  : 
 //=======================================================================
 
-void IFGraph_SubPartsIterator::Delete() 
+IFGraph_SubPartsIterator::~IFGraph_SubPartsIterator() 
 {} 

src/IFGraph/IFGraph_SubPartsIterator.hxx

@@ -150,11 +150,7 @@ public:
   //! Error : same as above (end of iteration)
   Standard_EXPORT Interface_EntityIterator Entities() const;
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~IFGraph_SubPartsIterator() { Delete(); }
-
-
-
+  Standard_EXPORT virtual ~IFGraph_SubPartsIterator();
 
 protected:
 

src/Interface/Interface_EntityIterator.cxx

@@ -150,5 +150,11 @@ Interface_EntityIterator::Interface_EntityIterator ()
   return thelist;
 }
 
-    void  Interface_EntityIterator::Destroy ()
+void  Interface_EntityIterator::Destroy ()
       {  thecurr.Nullify();  }  // redevient vide !
+
+Interface_EntityIterator::~Interface_EntityIterator()
+{
+  Destroy();
+}
+

src/Interface/Interface_EntityIterator.hxx

@@ -90,11 +90,10 @@ public:
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Content() const;
   
   //! Clears data of iteration
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~Interface_EntityIterator() { Destroy();}
-
-
+  Standard_EXPORT void Destroy();
 
+  //! Destructor
+  Standard_EXPORT virtual ~Interface_EntityIterator();
 
 protected:
 

src/Interface/Interface_FileReaderTool.cxx

@@ -566,11 +566,11 @@ Handle(Standard_Transient) Interface_FileReaderTool::LoadedEntity
 
 
 //=======================================================================
-//function : Destroy
+//function : ~Interface_FileReaderTool
 //purpose  : 
 //=======================================================================
 
-void Interface_FileReaderTool::Destroy()
+Interface_FileReaderTool::~Interface_FileReaderTool()
 {}
      
 void Interface_FileReaderTool::Clear()

src/Interface/Interface_FileReaderTool.hxx

@@ -175,8 +175,7 @@ public:
   //! else (in case of syntactic fail)
   Standard_EXPORT virtual Standard_Boolean AnalyseRecord (const Standard_Integer num, const Handle(Standard_Transient)& anent, Handle(Interface_Check)& acheck) = 0;
   
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~Interface_FileReaderTool() { Destroy(); }
+  Standard_EXPORT virtual ~Interface_FileReaderTool();
   
   //! Ends file reading after reading all the entities
   //! default is doing nothing; redefinable as necessary

src/MeshVS/MeshVS_Mesh.cxx

@@ -133,10 +133,6 @@ MeshVS_Mesh::MeshVS_Mesh (const Standard_Boolean theIsAllowOverlapped )
   myHilightDrawer->SetDouble  ( MeshVS_DA_MarkerScale, 2.0 );
 }
 
-void MeshVS_Mesh::Destroy()
-{
-}
-
 //================================================================
 // Function : Compute
 // Purpose  :

src/MeshVS/MeshVS_Mesh.hxx

@@ -53,12 +53,6 @@ public:
   //! Its value is stored in drawer
   Standard_EXPORT MeshVS_Mesh(const Standard_Boolean theIsAllowOverlapped = Standard_False);
   
-  Standard_EXPORT virtual void Destroy();
-~MeshVS_Mesh()
-{
-  Destroy();
-}
-  
   //! Computes presentation using builders added to sequence. Each builder computes
   //! own part of mesh presentation according to its type.
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& PM, const Handle(Prs3d_Presentation)& Prs, const Standard_Integer DisplayMode) Standard_OVERRIDE;

src/MoniTool/MoniTool_OptValue.cxx

@@ -56,9 +56,9 @@ MoniTool_OptValue::MoniTool_OptValue (const Standard_CString opt)
       {  val = theval;  }
 
 //=======================================================================
-//function : Delete
+//function : ~MoniTool_OptValue
 //purpose  : 
 //=======================================================================
 
-void MoniTool_OptValue::Delete() 
+MoniTool_OptValue::~MoniTool_OptValue() 
 {} 

src/MoniTool/MoniTool_OptValue.hxx

@@ -95,32 +95,11 @@ public:
   //! Warning : type is not controlled
   Standard_EXPORT void Value (Handle(Standard_Transient)& val) const;
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~MoniTool_OptValue() { Delete(); }
-
-
-
-
-protected:
-
-
-
-
+  Standard_EXPORT virtual ~MoniTool_OptValue();
 
 private:
-
-
-
   TCollection_AsciiString theopt;
   Handle(Standard_Transient) theval;
-
-
 };
 
-
-
-
-
-
-
 #endif // _MoniTool_OptValue_HeaderFile

src/MoniTool/MoniTool_TimerSentry.hxx

@@ -44,8 +44,7 @@ public:
     MoniTool_TimerSentry(const Handle(MoniTool_Timer)& timer);
   
   //! Destructor stops the associated timer
-    void Destroy();
-Standard_EXPORT ~MoniTool_TimerSentry () { Destroy(); }
+    ~MoniTool_TimerSentry ();
   
     Handle(MoniTool_Timer) Timer() const;
   

src/MoniTool/MoniTool_TimerSentry.lxx

@@ -36,11 +36,11 @@ inline MoniTool_TimerSentry::MoniTool_TimerSentry (const Handle(MoniTool_Timer)&
 }
 
 //=======================================================================
-//function : Destroy
+//function : Destructor
 //purpose  : make stop for corresponding timer before destroying
 //=======================================================================
 
-inline void MoniTool_TimerSentry::Destroy() 
+inline MoniTool_TimerSentry::~MoniTool_TimerSentry() 
 {
   if ( ! myTimer.IsNull() ) myTimer->Stop();
 }

src/ProjLib/ProjLib_ProjectOnSurface.cxx

@@ -246,7 +246,12 @@ void ProjLib_ProjectOnSurface::Load(const Handle(Adaptor3d_HCurve)& C,
   }
 }
 
-void ProjLib_ProjectOnSurface::Delete()
+//=======================================================================
+//function : ~ProjLib_ProjectOnSurface
+//purpose  : 
+//=======================================================================
+
+ProjLib_ProjectOnSurface::~ProjLib_ProjectOnSurface()
 {}
 
 //=======================================================================

src/ProjLib/ProjLib_ProjectOnSurface.hxx

@@ -43,8 +43,7 @@ public:
   //! Create a projector normaly to the surface <S>.
   Standard_EXPORT ProjLib_ProjectOnSurface(const Handle(Adaptor3d_HSurface)& S);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~ProjLib_ProjectOnSurface(){Delete() ; }
+  Standard_EXPORT virtual ~ProjLib_ProjectOnSurface();
   
   //! Set the Surface to <S>.
   //! To compute the projection, you have to Load the Curve.

src/PrsMgr/PrsMgr_Presentation.cxx

@@ -389,10 +389,10 @@ Handle(Prs3d_Projector) PrsMgr_Presentation::Projector (const Handle(Graphic3d_D
 }
 
 //=======================================================================
-//function : Destroy
+//function : ~PrsMgr_Presentation
 //purpose  :
 //=======================================================================
-void PrsMgr_Presentation::Destroy()
+PrsMgr_Presentation::~PrsMgr_Presentation()
 {
   Erase();
 }

src/PrsMgr/PrsMgr_Presentation.hxx

@@ -49,11 +49,7 @@ public:
 
   
   //! Destructor
-  Standard_EXPORT virtual void Destroy();
-~PrsMgr_Presentation()
-{
-  Destroy();
-}
+  Standard_EXPORT ~PrsMgr_Presentation();
   
     const Handle(Prs3d_Presentation)& Presentation() const;
   

src/QANewModTopOpe/QANewModTopOpe_Limitation.cxx

@@ -295,7 +295,7 @@ Standard_Boolean QANewModTopOpe_Limitation::IsDeleted(const TopoDS_Shape& S)
 
 }
 
-void QANewModTopOpe_Limitation::Delete()
+QANewModTopOpe_Limitation::~QANewModTopOpe_Limitation()
 {
   delete myCut;
   delete myCommon;

src/QANewModTopOpe/QANewModTopOpe_Limitation.hxx

@@ -81,17 +81,7 @@ public:
   
   Standard_EXPORT virtual Standard_Boolean IsDeleted (const TopoDS_Shape& S) Standard_OVERRIDE;
   
-  Standard_EXPORT virtual void Delete() Standard_OVERRIDE;
-Standard_EXPORT  ~QANewModTopOpe_Limitation()  {Delete();}
-
-
-
-
-protected:
-
-
-
-
+  Standard_EXPORT  ~QANewModTopOpe_Limitation();
 
 private:
 

src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx

@@ -80,11 +80,11 @@ void ShapeUpgrade_ShapeDivide::Init(const TopoDS_Shape &S)
 }
 
 //=======================================================================
-//function : Delete
+//function : ~ShapeUpgrade_ShapeDivide
 //purpose  : 
 //=======================================================================
 
-void ShapeUpgrade_ShapeDivide::Delete()
+ShapeUpgrade_ShapeDivide::~ShapeUpgrade_ShapeDivide()
 {}
 
 

src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx

@@ -50,8 +50,7 @@ public:
   //! Initialize by a Shape.
   Standard_EXPORT void Init (const TopoDS_Shape& S);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~ShapeUpgrade_ShapeDivide(){Delete();}
+  Standard_EXPORT virtual ~ShapeUpgrade_ShapeDivide();
   
   //! Defines the spatial precision used for splitting
   Standard_EXPORT void SetPrecision (const Standard_Real Prec);

src/StepData/StepData_FieldList.cxx

@@ -19,6 +19,10 @@
 
 static StepData_Field nulfild;
 
+StepData_FieldList::~StepData_FieldList()
+{
+}
+
 StepData_FieldList::StepData_FieldList  ()    {  }
 
 Standard_Integer  StepData_FieldList::NbFields () const

src/StepData/StepData_FieldList.hxx

@@ -36,6 +36,8 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
+  //! Destructor is virtual
+  Standard_EXPORT virtual ~StepData_FieldList();
   
   //! Creates a FieldList of 0 Field
   Standard_EXPORT StepData_FieldList();
@@ -52,28 +54,6 @@ public:
   
   //! Fills an iterator with the entities shared by <me>
   Standard_EXPORT void FillShared (Interface_EntityIterator& iter) const;
-
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
 };
 
-
-
-
-
-
-
 #endif // _StepData_FieldList_HeaderFile

src/StepData/StepData_FieldList1.cxx

@@ -32,6 +32,3 @@ StepData_Field&  StepData_FieldList1::CField (const Standard_Integer num)
   if (num != 1) Standard_OutOfRange::Raise("StepData_FieldList1 : CField");
   return thefield;
 }
-
-void StepData_FieldList1::Destroy () {}
-     

src/StepData/StepData_FieldList1.hxx

@@ -49,18 +49,6 @@ public:
   //! modify its content
   Standard_EXPORT virtual StepData_Field& CField (const Standard_Integer num) Standard_OVERRIDE;
   
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~StepData_FieldList1() { Destroy(); }
-
-
-
-
-protected:
-
-
-
-
-
 private:
 
 

src/StepData/StepData_FieldListD.cxx

@@ -39,6 +39,3 @@ StepData_Field&  StepData_FieldListD::CField (const Standard_Integer num)
   if (thefields.IsNull()) Standard_OutOfRange::Raise("StepData_FieldListD::Field");
   return thefields->ChangeValue(num);
 }
-
-void StepData_FieldListD::Destroy () {}
-     

src/StepData/StepData_FieldListD.hxx

@@ -53,18 +53,6 @@ public:
   //! Returns the field n0 <num> between 1 and NbFields, in order to
   //! modify its content
   Standard_EXPORT virtual StepData_Field& CField (const Standard_Integer num) Standard_OVERRIDE;
-  
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~StepData_FieldListD() { Destroy(); }
-
-
-
-
-protected:
-
-
-
-
 
 private:
 

src/StepData/StepData_FieldListN.cxx

@@ -31,6 +31,3 @@ StepData_Field&  StepData_FieldListN::CField (const Standard_Integer num)
 {
   return thefields.ChangeValue(num);
 }
-
-void StepData_FieldListN::Destroy() {}
-     

src/StepData/StepData_FieldListN.hxx

@@ -50,18 +50,6 @@ public:
   //! Returns the field n0 <num> between 1 and NbFields, in order to
   //! modify its content
   Standard_EXPORT virtual StepData_Field& CField (const Standard_Integer num) Standard_OVERRIDE;
-  
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~StepData_FieldListN() { Destroy(); }
-
-
-
-
-protected:
-
-
-
-
 
 private:
 

src/StepData/StepData_SelectType.cxx

@@ -188,4 +188,5 @@ Standard_Real  StepData_SelectType::Real () const
   thevalue = sm;
 }
 
-void StepData_SelectType::Destroy(){}
+StepData_SelectType::~StepData_SelectType()
+{}

src/StepData/StepData_SelectType.hxx

@@ -157,17 +157,7 @@ public:
   
   Standard_EXPORT void SetReal (const Standard_Real val, const Standard_CString name = "");
   
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~StepData_SelectType() { Destroy(); }
-
-
-
-
-protected:
-
-
-
-
+  Standard_EXPORT virtual ~StepData_SelectType();
 
 private:
 

src/Storage/Storage_BaseDriver.cxx

@@ -24,7 +24,8 @@
 Storage_BaseDriver::Storage_BaseDriver() : myOpenMode(Storage_VSNone)
 {
 }
-void Storage_BaseDriver::Delete()
+
+Storage_BaseDriver::~Storage_BaseDriver()
 {}
 
 TCollection_AsciiString Storage_BaseDriver::ReadMagicNumber (Standard_IStream& theIStream)

src/Storage/Storage_BaseDriver.hxx

@@ -53,9 +53,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT void Delete();
-Standard_EXPORT virtual ~Storage_BaseDriver(){Delete();}
+  Standard_EXPORT virtual ~Storage_BaseDriver();
   
   Standard_EXPORT virtual Storage_Error Open (const TCollection_AsciiString& aName, const Storage_OpenMode aMode) = 0;
   

src/TopOpeBRep/TopOpeBRep_DSFiller.cxx

@@ -100,10 +100,10 @@ TopOpeBRep_DSFiller::TopOpeBRep_DSFiller()
 
 //modified by NIZNHY-PKV Mon Dec 16 11:12:38 2002 f
 //=======================================================================
-//function : Destroy
-//purpose  : alias ~TopOpeBRep_DSFiller
+//function : ~TopOpeBRep_DSFiller
+//purpose  : 
 //=======================================================================
-void TopOpeBRep_DSFiller::Destroy() 
+TopOpeBRep_DSFiller::~TopOpeBRep_DSFiller() 
 {
   if (myPShapeClassifier) {
     delete myPShapeClassifier;

src/TopOpeBRep/TopOpeBRep_DSFiller.hxx

@@ -58,8 +58,7 @@ public:
   
   Standard_EXPORT TopOpeBRep_DSFiller();
   
-  Standard_EXPORT void Destroy();
-Standard_EXPORT ~TopOpeBRep_DSFiller() {Destroy();}
+  Standard_EXPORT ~TopOpeBRep_DSFiller();
   
   //! return field myPShapeClassifier.
   //! set field myPShapeClassifier.

src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx

@@ -108,7 +108,7 @@ TopOpeBRep_EdgesIntersector::TopOpeBRep_EdgesIntersector()
   myselectkeep = Standard_True;
 }
 
-void TopOpeBRep_EdgesIntersector::Delete()
+TopOpeBRep_EdgesIntersector::~TopOpeBRep_EdgesIntersector()
 {}
 
 //=======================================================================

src/TopOpeBRep/TopOpeBRep_EdgesIntersector.hxx

@@ -60,8 +60,7 @@ public:
   
   Standard_EXPORT TopOpeBRep_EdgesIntersector();
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopOpeBRep_EdgesIntersector(){Delete() ; }
+  Standard_EXPORT virtual ~TopOpeBRep_EdgesIntersector();
   
   Standard_EXPORT void SetFaces (const TopoDS_Shape& F1, const TopoDS_Shape& F2);
   

src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.cxx

@@ -55,7 +55,7 @@ myUNKNOWNRaise(Standard_False) // no raise if UNKNOWN state found
   InitAreaBuilder(LS,LC,ForceClass);
 }
 
-void TopOpeBRepBuild_AreaBuilder::Delete()
+TopOpeBRepBuild_AreaBuilder::~TopOpeBRepBuild_AreaBuilder()
 {}
 
 //=======================================================================

src/TopOpeBRepBuild/TopOpeBRepBuild_AreaBuilder.hxx

@@ -66,8 +66,7 @@ public:
   //! the shapes described by <LS> using the classifier <LC>.
   Standard_EXPORT TopOpeBRepBuild_AreaBuilder(TopOpeBRepBuild_LoopSet& LS, TopOpeBRepBuild_LoopClassifier& LC, const Standard_Boolean ForceClass = Standard_False);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopOpeBRepBuild_AreaBuilder(){Delete() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_AreaBuilder();
   
   //! Sets a AreaBuilder to find the areas on
   //! the shapes described by <LS> using the classifier <LC>.

src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx

@@ -99,10 +99,10 @@ TopOpeBRepBuild_Builder::TopOpeBRepBuild_Builder(const TopOpeBRepDS_BuildTool& B
 
 //modified by NIZHNY-MZV  Sat May  6 10:04:49 2000
 //=======================================================================
-//function : Destroy
+//function : ~TopOpeBRepBuild_Builder
 //purpose  : virtual destructor
 //=======================================================================
-void TopOpeBRepBuild_Builder::Destroy()
+TopOpeBRepBuild_Builder::~TopOpeBRepBuild_Builder()
 {
 } 
 

src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.hxx

@@ -89,8 +89,7 @@ public:
   
   Standard_EXPORT TopOpeBRepBuild_Builder(const TopOpeBRepDS_BuildTool& BT);
   
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~TopOpeBRepBuild_Builder()  {  Destroy() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_Builder();
   
   Standard_EXPORT TopOpeBRepDS_BuildTool& ChangeBuildTool();
   

src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.hxx

@@ -58,8 +58,7 @@ public:
   
   Standard_EXPORT TopOpeBRepBuild_Builder1(const TopOpeBRepDS_BuildTool& BT);
   
-  Standard_EXPORT virtual void Destroy() Standard_OVERRIDE;
-Standard_EXPORT virtual ~TopOpeBRepBuild_Builder1()  {  Destroy() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_Builder1();
   
   //! Removes all splits and merges already performed.
   //! Does NOT clear the handled DS  (except  ShapeWithStatesMaps).

src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_1.cxx

@@ -87,10 +87,10 @@ extern Standard_Boolean GLOBAL_faces2d;
 
 //modified by NIZNHY-PKV Mon Dec 16 11:38:55 2002 f
 //=======================================================================
-//function : Destroy
+//function : ~TopOpeBRepBuild_Builder1
 //purpose  : 
 //=======================================================================
-void TopOpeBRepBuild_Builder1::Destroy()
+TopOpeBRepBuild_Builder1::~TopOpeBRepBuild_Builder1()
 {
   processedEdges.Clear();
   theUsedVertexMap.Clear();

src/TopOpeBRepBuild/TopOpeBRepBuild_LoopClassifier.cxx

@@ -18,5 +18,5 @@
 #include <TopOpeBRepBuild_Loop.hxx>
 #include <TopOpeBRepBuild_LoopClassifier.hxx>
 
-void TopOpeBRepBuild_LoopClassifier::Delete()
+TopOpeBRepBuild_LoopClassifier::~TopOpeBRepBuild_LoopClassifier()
 {}

src/TopOpeBRepBuild/TopOpeBRepBuild_LoopClassifier.hxx

@@ -32,9 +32,7 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopOpeBRepBuild_LoopClassifier(){Delete() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_LoopClassifier();
   
   //! Returns the state of loop <L1> compared with loop <L2>.
   Standard_EXPORT virtual TopAbs_State Compare (const Handle(TopOpeBRepBuild_Loop)& L1, const Handle(TopOpeBRepBuild_Loop)& L2) = 0;

src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.cxx

@@ -27,7 +27,7 @@ myLoopIndex(1), myNbLoop(0)
 {
 }
 
-void TopOpeBRepBuild_LoopSet::Delete()
+TopOpeBRepBuild_LoopSet::~TopOpeBRepBuild_LoopSet()
 {}
 
 //=======================================================================

src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.hxx

@@ -38,8 +38,7 @@ public:
   
   Standard_EXPORT TopOpeBRepBuild_LoopSet();
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopOpeBRepBuild_LoopSet(){Delete() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_LoopSet();
   
   Standard_EXPORT TopOpeBRepBuild_ListOfLoop& ChangeListOfLoop();
   

src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.cxx

@@ -56,7 +56,7 @@ TopOpeBRepBuild_ShapeSet::TopOpeBRepBuild_ShapeSet(const TopAbs_ShapeEnum SubSha
   myCheckShape = Standard_False; // temporary NYI
 }
 
-void TopOpeBRepBuild_ShapeSet::Delete()
+TopOpeBRepBuild_ShapeSet::~TopOpeBRepBuild_ShapeSet()
 {}
 
 //=======================================================================

src/TopOpeBRepBuild/TopOpeBRepBuild_ShapeSet.hxx

@@ -70,8 +70,7 @@ public:
   //! <checkshape>:check (or not) the shapes, startelements, elements added.
   Standard_EXPORT TopOpeBRepBuild_ShapeSet(const TopAbs_ShapeEnum SubShapeType, const Standard_Boolean checkshape = Standard_True);
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopOpeBRepBuild_ShapeSet(){Delete() ; }
+  Standard_EXPORT virtual ~TopOpeBRepBuild_ShapeSet();
   
   //! Adds <S> to the list of shapes. (wires or shells).
   Standard_EXPORT virtual void AddShape (const TopoDS_Shape& S);

src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.cxx

@@ -60,10 +60,10 @@ TopOpeBRepTool_BoxSort::TopOpeBRepTool_BoxSort(const MTOhbt& HBT)
 
 //modified by NIZNHY-PKV Mon Dec 16 10:26:00 2002 f
 //=======================================================================
-//function : Destroy
-//purpose  : alias ~TopOpeBRepTool_BoxSort
+//function : ~TopOpeBRepTool_BoxSort
+//purpose  : 
 //=======================================================================
-void TopOpeBRepTool_BoxSort::Destroy()
+TopOpeBRepTool_BoxSort::~TopOpeBRepTool_BoxSort()
 {
   if (!myHBT.IsNull()) {
     myHBT->Clear();

src/TopOpeBRepTool/TopOpeBRepTool_BoxSort.hxx

@@ -72,17 +72,7 @@ public:
   
   Standard_EXPORT const Bnd_Box& Box (const TopoDS_Shape& S) const;
   
-  Standard_EXPORT void Destroy();
-Standard_EXPORT ~TopOpeBRepTool_BoxSort() {Destroy();}
-
-
-
-
-protected:
-
-
-
-
+  Standard_EXPORT ~TopOpeBRepTool_BoxSort();
 
 private:
 

src/TopOpeBRepTool/TopOpeBRepTool_SolidClassifier.cxx

@@ -32,10 +32,10 @@ TopOpeBRepTool_SolidClassifier::TopOpeBRepTool_SolidClassifier()
 
 //modified by NIZNHY-PKV Mon Dec 16 10:39:00 2002 f
 //=======================================================================
-//function : Destroy
-//purpose  : alias ~TopOpeBRepTool_SolidClassifier
+//function : ~TopOpeBRepTool_SolidClassifier
+//purpose  : 
 //=======================================================================
-void TopOpeBRepTool_SolidClassifier::Destroy() 
+TopOpeBRepTool_SolidClassifier::~TopOpeBRepTool_SolidClassifier() 
 {
   Standard_Integer i, aNb;
   

src/TopOpeBRepTool/TopOpeBRepTool_SolidClassifier.hxx

@@ -45,8 +45,7 @@ public:
   
   Standard_EXPORT void Clear();
   
-  Standard_EXPORT void Destroy();
-Standard_EXPORT  ~TopOpeBRepTool_SolidClassifier() {Destroy();}
+  Standard_EXPORT ~TopOpeBRepTool_SolidClassifier();
   
   Standard_EXPORT void LoadSolid (const TopoDS_Solid& S);
   

src/TopTools/TopTools_ShapeSet.cxx

@@ -44,7 +44,7 @@ TopTools_ShapeSet::TopTools_ShapeSet() : myFormatNb(1)
 {
 }
 
-void TopTools_ShapeSet::Delete()
+TopTools_ShapeSet::~TopTools_ShapeSet()
 {}
 
 //=======================================================================

src/TopTools/TopTools_ShapeSet.hxx

@@ -48,8 +48,7 @@ public:
   //! Builds an empty ShapeSet.
   Standard_EXPORT TopTools_ShapeSet();
   
-  Standard_EXPORT virtual void Delete();
-Standard_EXPORT virtual ~TopTools_ShapeSet(){Delete() ; }
+  Standard_EXPORT virtual ~TopTools_ShapeSet();
   
   Standard_EXPORT void SetFormatNb (const Standard_Integer theFormatNb);
   

src/TransferBRep/TransferBRep_Reader.cxx

@@ -252,5 +252,6 @@ TransferBRep_Reader::TransferBRep_Reader ()
   () const
       {  return theProc;  }
 
-void TransferBRep_Reader::Destroy() {}
+TransferBRep_Reader::~TransferBRep_Reader()
+{}
      

src/TransferBRep/TransferBRep_Reader.hxx

@@ -182,11 +182,7 @@ public:
   //! Can be used for queries more accurate than the default ones.
   Standard_EXPORT Handle(Transfer_TransientProcess) TransientProcess() const;
   
-  Standard_EXPORT virtual void Destroy();
-Standard_EXPORT virtual ~TransferBRep_Reader() { Destroy(); }
-
-
-
+  Standard_EXPORT virtual ~TransferBRep_Reader();
 
 protected:
 

src/Units/Units_ShiftedToken.cxx

@@ -91,7 +91,3 @@ void Units_ShiftedToken::Dump(const Standard_Integer ashift,
   for(int i=0; i<ashift; i++)cout<<"  ";
   cout<<"  move  : "<<themove<<endl;
 }
-
-void Units_ShiftedToken::Destroy () {
-
-}

src/Units/Units_ShiftedToken.hxx

@@ -75,13 +75,6 @@ public:
   //! conversion.
   Standard_EXPORT virtual Standard_Real Divided (const Standard_Real avalue) const Standard_OVERRIDE;
   
-  //! Destroies the Token
-  Standard_EXPORT virtual void Destroy() Standard_OVERRIDE;
-~Units_ShiftedToken()
-{
-  Destroy();
-}
-  
   Standard_EXPORT virtual void Dump (const Standard_Integer ashift, const Standard_Integer alevel) const Standard_OVERRIDE;
 
 

src/Units/Units_Token.cxx

@@ -524,7 +524,3 @@ Standard_Boolean operator >=(const Handle(Units_Token)& atoken1,const Handle(Uni
 {
   return atoken1->IsGreaterOrEqual(atoken2);
 }
-
-void Units_Token::Destroy () {
-
-}

src/Units/Units_Token.hxx

@@ -183,13 +183,6 @@ public:
   //! false otherwise.
     Standard_Boolean IsGreaterOrEqual (const Handle(Units_Token)& atoken) const;
   
-  //! Destroies the Token
-  Standard_EXPORT virtual void Destroy();
-~Units_Token()
-{
-  Destroy();
-}
-  
   //! Useful for debugging
   Standard_EXPORT virtual void Dump (const Standard_Integer ashift, const Standard_Integer alevel) const;
 

src/WNT/WNT_WClass.cxx

@@ -68,11 +68,11 @@ WNT_WClass::WNT_WClass (
 }  // end constructor
 
 //=======================================================================
-//function : Destroy
+//function : ~WNT_WClass
 //purpose  : 
 //=======================================================================
 
-void WNT_WClass::Destroy ()
+WNT_WClass::~WNT_WClass ()
 {
 
  UnregisterClass (  lpszName, ( HINSTANCE )hInstance  );

src/WNT/WNT_WClass.hxx

@@ -62,11 +62,7 @@ public:
   Standard_EXPORT WNT_WClass(const Standard_CString aClassName, const Standard_Address aWndProc, const WNT_Uint& aStyle, const Standard_Integer aClassExtra = 0, const Standard_Integer aWindowExtra = 0, const Aspect_Handle aCursor = 0, const Aspect_Handle anIcon = 0, const Standard_CString aMenuName = 0);
   
   //! Destroys all resources attached to the class
-  Standard_EXPORT virtual void Destroy();
-~WNT_WClass()
-{
-  Destroy();
-}
+  Standard_EXPORT ~WNT_WClass();
   
   //! Returns address of window procedure.
     Standard_Address WndProc() const;

src/WNT/WNT_Window.cxx

@@ -123,10 +123,10 @@ WNT_Window::WNT_Window (const Aspect_Handle        theHandle,
 }
 
 // =======================================================================
-// function : Destroy
+// function : ~WNT_Window
 // purpose  :
 // =======================================================================
-void WNT_Window::Destroy()
+WNT_Window::~WNT_Window()
 {
   if (myHWindow == NULL
    || myIsForeign)

src/WNT/WNT_Window.hxx

@@ -56,12 +56,8 @@ public:
   //! This handle equals ( aPart1 << 16 ) + aPart2.
   Standard_EXPORT WNT_Window(const Aspect_Handle aHandle, const Quantity_NameOfColor aBackColor = Quantity_NOC_MATRAGRAY);
   
-  //! Destroies the Window and all resourses attached to it.
-  Standard_EXPORT virtual void Destroy();
-~WNT_Window()
-{
-  Destroy();
-}
+  //! Destroys the Window and all resourses attached to it.
+  Standard_EXPORT ~WNT_Window();
   
   //! Sets cursor <aCursor> for ENTIRE WINDOW CLASS to which
   //! the Window belongs.

src/XCAFDoc/XCAFDoc_DocumentTool.cxx

@@ -313,13 +313,3 @@ Standard_Boolean XCAFDoc_DocumentTool::IsXCAFDocument(const  Handle(TDocStd_Docu
   Handle(TDataStd_TreeNode) aRootNode;
   return RootL.FindAttribute (aRefGuid, aRootNode);
 }
-
-
-//=======================================================================
-//function : Destroy
-//purpose  : No longer required. Kept for binary compatibility only.
-//=======================================================================
-
-void XCAFDoc_DocumentTool::Destroy()
-{
-}

src/XCAFDoc/XCAFDoc_DocumentTool.hxx

@@ -104,17 +104,7 @@ public:
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   
   Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE;
-  
-  //! Unregisters the document holding this attribute from an
-  //! internal global map of XDE documents.
-  Standard_EXPORT virtual void Destroy();
-~XCAFDoc_DocumentTool()
-{
-  Destroy();
-}
-
-
-
+ 
   DEFINE_STANDARD_RTTIEXT(XCAFDoc_DocumentTool,TDF_Attribute)
 
 protected:

src/Xw/Xw_Window.cxx

@@ -229,10 +229,10 @@ Xw_Window::Xw_Window (const Handle(Aspect_DisplayConnection)& theXDisplay,
 }
 
 // =======================================================================
-// function : Destroy
+// function : ~Xw_Window
 // purpose  :
 // =======================================================================
-void Xw_Window::Destroy()
+Xw_Window::~Xw_Window()
 {
   if (myIsOwnWin && myXWindow != 0 && !myDisplay.IsNull())
   {