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.
#include <AdvApp2Var_Criterion.hxx>
#include <AdvApp2Var_Patch.hxx>
-void AdvApp2Var_Criterion::Delete()
+AdvApp2Var_Criterion::~AdvApp2Var_Criterion()
{}
//============================================================================
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;
#include <AdvApprox_Cutting.hxx>
-void AdvApprox_Cutting::Delete()
+AdvApprox_Cutting::~AdvApprox_Cutting()
{}
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:
-
-
-
-
-
};
{
public:
-
//! Modifies the window background.
Standard_EXPORT void SetBackground (const Aspect_Background& ABack);
//! 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;
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();
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();
{
}
-void BRepBuilderAPI_Command::Delete()
+//=======================================================================
+//function : ~BRepBuilderAPI_Command
+//purpose :
+//=======================================================================
+BRepBuilderAPI_Command::~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;
{
}
-void BRepBuilderAPI_MakeShape::Delete()
-{}
-
-
//=======================================================================
//function : Build
//purpose :
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();
}
//=======================================================================
-//function : Delete
-//purpose :
+//function : ~BRepClass3d_SolidExplorer
+//purpose :
//=======================================================================
-void BRepClass3d_SolidExplorer::Delete()
+BRepClass3d_SolidExplorer::~BRepClass3d_SolidExplorer()
{
Destroy() ;
}
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);
{
}
-void BRepLib_Command::Delete()
+BRepLib_Command::~BRepLib_Command()
{}
//=======================================================================
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;
}
//=======================================================================
-//function : Delete
+//function : ~BRepToIGES_BREntity
//purpose :
//=======================================================================
-void BRepToIGES_BREntity::Delete()
+BRepToIGES_BREntity::~BRepToIGES_BREntity()
{}
//! (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
{}
//=======================================================================
-//function : Delete
+//function : ~BinTools_ShapeSet
//purpose :
//=======================================================================
-void BinTools_ShapeSet::Delete()
+BinTools_ShapeSet::~BinTools_ShapeSet()
{}
//=======================================================================
//! 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);
//=======================================================================
-//function : Destroy
+//function : ~CDM_Document
//purpose :
//=======================================================================
-void CDM_Document::Destroy() {
+CDM_Document::~CDM_Document()
+{
if(!myMetaData.IsNull()) myMetaData->UnsetDocument();
}
Standard_EXPORT CDM_Document();
- Standard_EXPORT virtual void Destroy();
-~CDM_Document()
-{
- Destroy();
-}
+ Standard_EXPORT ~CDM_Document();
Standard_Boolean myResourcesAreLoaded;
}
}
-void ChFi3d_Builder::Delete()
+//=======================================================================
+//function : ~ChFi3d_Builder
+//purpose :
+//=======================================================================
+
+ChFi3d_Builder::~ChFi3d_Builder()
{}
//=======================================================================
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);
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;
}
// =======================================================================
-// function : Destroy
+// function : ~Cocoa_Window
// purpose :
// =======================================================================
-void Cocoa_Window::Destroy()
+Cocoa_Window::~Cocoa_Window()
{
#if !defined(HAVE_OBJC_ARC)
Cocoa_LocalPool aLocalPool;
Flatknots->ChangeArray1());
}
// ==================================================================
-void FairCurve_Batten::Delete()
+FairCurve_Batten::~FairCurve_Batten()
{}
// ==================================================================
void FairCurve_Batten::Angles(const gp_Pnt2d& P1,
//! 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
//-Constructors
Graphic3d_DataStructureManager::Graphic3d_DataStructureManager () {
}
-
-//-Destructors
-
-void Graphic3d_DataStructureManager::Destroy () {
-
-}
public:
-
- //! Deletes the manager <me>.
- Standard_EXPORT virtual void Destroy();
-~Graphic3d_DataStructureManager()
-{
- Destroy();
-}
-
-
-
DEFINE_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
protected:
}
//=============================================================================
-//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
//! 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();
//-Destructors
-void Graphic3d_StructureManager::Destroy () {
-
+Graphic3d_StructureManager::~Graphic3d_StructureManager ()
+{
myDisplayedStructure.Clear ();
myHighlightedStructure.Clear ();
myDefinedViews.Clear();
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.
}
//=======================================================================
-//function : Delete
+//function : ~IFGraph_SubPartsIterator
//purpose :
//=======================================================================
-void IFGraph_SubPartsIterator::Delete()
+IFGraph_SubPartsIterator::~IFGraph_SubPartsIterator()
{}
//! 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:
return thelist;
}
- void Interface_EntityIterator::Destroy ()
+void Interface_EntityIterator::Destroy ()
{ thecurr.Nullify(); } // redevient vide !
+
+Interface_EntityIterator::~Interface_EntityIterator()
+{
+ Destroy();
+}
+
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:
//=======================================================================
-//function : Destroy
+//function : ~Interface_FileReaderTool
//purpose :
//=======================================================================
-void Interface_FileReaderTool::Destroy()
+Interface_FileReaderTool::~Interface_FileReaderTool()
{}
void Interface_FileReaderTool::Clear()
//! 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
myHilightDrawer->SetDouble ( MeshVS_DA_MarkerScale, 2.0 );
}
-void MeshVS_Mesh::Destroy()
-{
-}
-
//================================================================
// Function : Compute
// Purpose :
//! 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;
{ val = theval; }
//=======================================================================
-//function : Delete
+//function : ~MoniTool_OptValue
//purpose :
//=======================================================================
-void MoniTool_OptValue::Delete()
+MoniTool_OptValue::~MoniTool_OptValue()
{}
//! 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
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;
}
//=======================================================================
-//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();
}
}
}
-void ProjLib_ProjectOnSurface::Delete()
+//=======================================================================
+//function : ~ProjLib_ProjectOnSurface
+//purpose :
+//=======================================================================
+
+ProjLib_ProjectOnSurface::~ProjLib_ProjectOnSurface()
{}
//=======================================================================
//! 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.
}
//=======================================================================
-//function : Destroy
+//function : ~PrsMgr_Presentation
//purpose :
//=======================================================================
-void PrsMgr_Presentation::Destroy()
+PrsMgr_Presentation::~PrsMgr_Presentation()
{
Erase();
}
//! Destructor
- Standard_EXPORT virtual void Destroy();
-~PrsMgr_Presentation()
-{
- Destroy();
-}
+ Standard_EXPORT ~PrsMgr_Presentation();
const Handle(Prs3d_Presentation)& Presentation() const;
}
-void QANewModTopOpe_Limitation::Delete()
+QANewModTopOpe_Limitation::~QANewModTopOpe_Limitation()
{
delete myCut;
delete myCommon;
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:
}
//=======================================================================
-//function : Delete
+//function : ~ShapeUpgrade_ShapeDivide
//purpose :
//=======================================================================
-void ShapeUpgrade_ShapeDivide::Delete()
+ShapeUpgrade_ShapeDivide::~ShapeUpgrade_ShapeDivide()
{}
//! 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);
static StepData_Field nulfild;
+StepData_FieldList::~StepData_FieldList()
+{
+}
+
StepData_FieldList::StepData_FieldList () { }
Standard_Integer StepData_FieldList::NbFields () const
DEFINE_STANDARD_ALLOC
+ //! Destructor is virtual
+ Standard_EXPORT virtual ~StepData_FieldList();
//! Creates a FieldList of 0 Field
Standard_EXPORT StepData_FieldList();
//! Fills an iterator with the entities shared by <me>
Standard_EXPORT void FillShared (Interface_EntityIterator& iter) const;
-
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
};
-
-
-
-
-
-
#endif // _StepData_FieldList_HeaderFile
if (num != 1) Standard_OutOfRange::Raise("StepData_FieldList1 : CField");
return thefield;
}
-
-void StepData_FieldList1::Destroy () {}
-
//! 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:
if (thefields.IsNull()) Standard_OutOfRange::Raise("StepData_FieldListD::Field");
return thefields->ChangeValue(num);
}
-
-void StepData_FieldListD::Destroy () {}
-
//! 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:
{
return thefields.ChangeValue(num);
}
-
-void StepData_FieldListN::Destroy() {}
-
//! 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:
thevalue = sm;
}
-void StepData_SelectType::Destroy(){}
+StepData_SelectType::~StepData_SelectType()
+{}
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:
Storage_BaseDriver::Storage_BaseDriver() : myOpenMode(Storage_VSNone)
{
}
-void Storage_BaseDriver::Delete()
+
+Storage_BaseDriver::~Storage_BaseDriver()
{}
TCollection_AsciiString Storage_BaseDriver::ReadMagicNumber (Standard_IStream& theIStream)
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;
//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;
Standard_EXPORT TopOpeBRep_DSFiller();
- Standard_EXPORT void Destroy();
-Standard_EXPORT ~TopOpeBRep_DSFiller() {Destroy();}
+ Standard_EXPORT ~TopOpeBRep_DSFiller();
//! return field myPShapeClassifier.
//! set field myPShapeClassifier.
myselectkeep = Standard_True;
}
-void TopOpeBRep_EdgesIntersector::Delete()
+TopOpeBRep_EdgesIntersector::~TopOpeBRep_EdgesIntersector()
{}
//=======================================================================
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);
InitAreaBuilder(LS,LC,ForceClass);
}
-void TopOpeBRepBuild_AreaBuilder::Delete()
+TopOpeBRepBuild_AreaBuilder::~TopOpeBRepBuild_AreaBuilder()
{}
//=======================================================================
//! 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>.
//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()
{
}
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();
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).
//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();
#include <TopOpeBRepBuild_Loop.hxx>
#include <TopOpeBRepBuild_LoopClassifier.hxx>
-void TopOpeBRepBuild_LoopClassifier::Delete()
+TopOpeBRepBuild_LoopClassifier::~TopOpeBRepBuild_LoopClassifier()
{}
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;
{
}
-void TopOpeBRepBuild_LoopSet::Delete()
+TopOpeBRepBuild_LoopSet::~TopOpeBRepBuild_LoopSet()
{}
//=======================================================================
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();
myCheckShape = Standard_False; // temporary NYI
}
-void TopOpeBRepBuild_ShapeSet::Delete()
+TopOpeBRepBuild_ShapeSet::~TopOpeBRepBuild_ShapeSet()
{}
//=======================================================================
//! <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);
//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();
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:
//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;
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);
{
}
-void TopTools_ShapeSet::Delete()
+TopTools_ShapeSet::~TopTools_ShapeSet()
{}
//=======================================================================
//! 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);
() const
{ return theProc; }
-void TransferBRep_Reader::Destroy() {}
+TransferBRep_Reader::~TransferBRep_Reader()
+{}
//! 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:
for(int i=0; i<ashift; i++)cout<<" ";
cout<<" move : "<<themove<<endl;
}
-
-void Units_ShiftedToken::Destroy () {
-
-}
//! 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;
{
return atoken1->IsGreaterOrEqual(atoken2);
}
-
-void Units_Token::Destroy () {
-
-}
//! 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;
} // end constructor
//=======================================================================
-//function : Destroy
+//function : ~WNT_WClass
//purpose :
//=======================================================================
-void WNT_WClass::Destroy ()
+WNT_WClass::~WNT_WClass ()
{
UnregisterClass ( lpszName, ( HINSTANCE )hInstance );
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;
}
// =======================================================================
-// function : Destroy
+// function : ~WNT_Window
// purpose :
// =======================================================================
-void WNT_Window::Destroy()
+WNT_Window::~WNT_Window()
{
if (myHWindow == NULL
|| myIsForeign)
//! 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.
Handle(TDataStd_TreeNode) aRootNode;
return RootL.FindAttribute (aRefGuid, aRootNode);
}
-
-
-//=======================================================================
-//function : Destroy
-//purpose : No longer required. Kept for binary compatibility only.
-//=======================================================================
-
-void XCAFDoc_DocumentTool::Destroy()
-{
-}
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:
}
// =======================================================================
-// function : Destroy
+// function : ~Xw_Window
// purpose :
// =======================================================================
-void Xw_Window::Destroy()
+Xw_Window::~Xw_Window()
{
if (myIsOwnWin && myXWindow != 0 && !myDisplay.IsNull())
{
const Window theXWin,
const Aspect_FBConfig theFBConfig = NULL);
- //! Destroies the Window and all resourses attached to it
- Standard_EXPORT virtual void Destroy() Standard_OVERRIDE;
-
- ~Xw_Window()
- {
- Destroy();
- }
+ //! Destroys the Window and all resourses attached to it
+ Standard_EXPORT ~Xw_Window();
//! Opens the window <me>
Standard_EXPORT virtual void Map() const Standard_OVERRIDE;
//! Is used to redifine the operator <<.
Standard_EXPORT void Dump (Standard_OStream& o) const;
- //! Destructor alias.
- void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_BissecNewton();
#include <StdFail_NotDone.hxx>
-inline void math_BissecNewton::Delete() const
-{
-}
-
inline Standard_Boolean math_BissecNewton::IsSolutionReached(math_FunctionWithDerivative&)
{
return Abs(dx) <= XTol;
//! It has to be used if F(Bx) is known.
Standard_EXPORT math_BrentMinimum(const Standard_Real TolX, const Standard_Real Fbx, const Standard_Integer NbIterations = 100, const Standard_Real ZEPS = 1.0e-12);
- //! Destructor alias.
- void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_BrentMinimum();
#include <StdFail_NotDone.hxx>
-inline void math_BrentMinimum::Delete() const
-{
-}
-
-
inline Standard_Boolean math_BrentMinimum::IsSolutionReached(math_Function&)
{
const Standard_Real TwoTol = 2.0 * (XTol * fabs(x) + EPSZ);
//! Warning: constructor does not perform computations.
Standard_EXPORT math_FRPR(const math_MultipleVarFunctionWithGradient& theFunction, const Standard_Real theTolerance, const Standard_Integer theNbIterations = 200, const Standard_Real theZEPS = 1.0e-12);
- //! Destructor alias.
- Standard_EXPORT void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_FRPR();
#include <StdFail_NotDone.hxx>
#include <math_Vector.hxx>
-inline void math_FRPR::Delete() const
-{
-}
-
inline Standard_Boolean math_FRPR::IsSolutionReached(math_MultipleVarFunctionWithGradient&)
{
return 2.0 * fabs(TheMinimum - PreviousMinimum) <=
//=======================================================================
math_FunctionSetRoot::~math_FunctionSetRoot()
{
- Delete();
}
//=======================================================================
//! constructor.
Standard_EXPORT math_FunctionSetRoot(math_FunctionSetWithDerivatives& F, const Standard_Integer NbIterations = 100);
- //! Destructor alias.
- Standard_EXPORT void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_FunctionSetRoot();
//! Initializes the tolerance values.
#include <StdFail_NotDone.hxx>
#include <Standard_DimensionError.hxx>
-inline void math_FunctionSetRoot::Delete() const
-{
-}
-
-
inline Standard_Boolean math_FunctionSetRoot::IsSolutionReached(math_FunctionSetWithDerivatives&)
{
for (Standard_Integer i = 1; i <= Sol.Length(); ++i)
//! The method SetTolerance must be called before performing the algorithm.
Standard_EXPORT math_NewtonFunctionSetRoot(math_FunctionSetWithDerivatives& theFunction, const Standard_Real theFTolerance, const Standard_Integer theNbIterations = 100);
- //! Destructor alias.
- Standard_EXPORT void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_NewtonFunctionSetRoot();
//! Initializes the tolerance values for the unknowns.
#include <StdFail_NotDone.hxx>
-inline void math_NewtonFunctionSetRoot::Delete() const
-{
-}
-
inline Standard_Boolean math_NewtonFunctionSetRoot::IsSolutionReached(math_FunctionSetWithDerivatives&)
{
for (Standard_Integer i = DeltaX.Lower(); i <= DeltaX.Upper(); ++i)
//! Search the solution.
Standard_EXPORT void Perform (math_MultipleVarFunctionWithHessian& theFunction, const math_Vector& theStartingPoint);
- //! Destructor alias.
- void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_NewtonMinimum();
#include <StdFail_NotDone.hxx>
-inline void math_NewtonMinimum::Delete() const
-{
-}
-
inline Standard_Boolean math_NewtonMinimum::IsConverged() const
{
return ( (TheStep.Norm() <= XTol ) ||
//! Constructor. Initialize new entity.
Standard_EXPORT math_Powell(const math_MultipleVarFunction& theFunction, const Standard_Real theTolerance, const Standard_Integer theNbIterations = 200, const Standard_Real theZEPS = 1.0e-12);
- //! Destructor alias
- void Delete() const;
+ //! Destructor
Standard_EXPORT virtual ~math_Powell();
#include <StdFail_NotDone.hxx>
#include <math_Vector.hxx>
-inline void math_Powell::Delete() const
-{
-}
-
inline Standard_Boolean math_Powell::IsSolutionReached(math_MultipleVarFunction&)
{
return 2.0 * fabs(PreviousMinimum - TheMinimum) <=