From 79104795a1bbd405d476648fe2a2eb4208c5a5ee Mon Sep 17 00:00:00 2001 From: abv Date: Fri, 20 Nov 2015 21:04:11 +0300 Subject: [PATCH] 0026912: CLang 3.6.2 compiler warning [-Winconsistent-missing-override] --- src/AIS/AIS_AngleDimension.hxx | 22 +++--- src/AIS/AIS_Axis.hxx | 2 +- src/AIS/AIS_Circle.hxx | 2 +- src/AIS/AIS_ColorScale.hxx | 5 +- src/AIS/AIS_DiameterDimension.hxx | 22 +++--- src/AIS/AIS_Dimension.hxx | 6 +- src/AIS/AIS_EqualDistanceRelation.hxx | 2 +- src/AIS/AIS_EqualRadiusRelation.hxx | 2 +- src/AIS/AIS_LengthDimension.hxx | 20 +++--- src/AIS/AIS_Line.hxx | 2 +- src/AIS/AIS_MidPointRelation.hxx | 2 +- src/AIS/AIS_ParallelRelation.hxx | 2 +- src/AIS/AIS_PerpendicularRelation.hxx | 2 +- src/AIS/AIS_PlaneTrihedron.hxx | 2 +- src/AIS/AIS_Point.hxx | 2 +- src/AIS/AIS_PointCloud.hxx | 16 ++--- src/AIS/AIS_RadiusDimension.hxx | 20 +++--- src/AIS/AIS_SymmetricRelation.hxx | 2 +- src/AIS/AIS_TangentRelation.hxx | 2 +- src/AIS/AIS_TexturedShape.hxx | 10 +-- src/AIS/AIS_Trihedron.hxx | 2 +- .../APIHeaderSection_EditHeader.hxx | 10 +-- src/Adaptor2d/Adaptor2d_HLine2d.hxx | 2 +- src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx | 2 +- src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx | 4 +- src/Adaptor3d/Adaptor3d_HIsoCurve.hxx | 4 +- src/AppDef/AppDef_LinearCriteria.hxx | 32 ++++----- src/AppStd/AppStd_Application.hxx | 2 +- src/AppStdL/AppStdL_Application.hxx | 2 +- src/Aspect/Aspect_CircularGrid.hxx | 2 +- src/Aspect/Aspect_RectangularGrid.hxx | 2 +- src/BOPAlgo/BOPAlgo_CellsBuilder.hxx | 2 +- src/BRep/BRep_Curve3D.hxx | 4 +- src/BRep/BRep_CurveOn2Surfaces.hxx | 2 +- src/BRep/BRep_CurveOnSurface.hxx | 4 +- src/BRep/BRep_Polygon3D.hxx | 2 +- src/BRep/BRep_PolygonOnTriangulation.hxx | 2 +- src/BRep/BRep_TEdge.hxx | 2 +- src/BRep/BRep_TVertex.hxx | 2 +- src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx | 4 +- src/BRepAdaptor/BRepAdaptor_HCurve.hxx | 4 +- src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx | 2 +- src/BRepAdaptor/BRepAdaptor_HSurface.hxx | 2 +- src/BRepBlend/BRepBlend_AppFunc.hxx | 4 +- src/BRepBlend/BRepBlend_AppFuncRst.hxx | 4 +- src/BRepBlend/BRepBlend_AppFuncRstRst.hxx | 4 +- src/BRepBlend/BRepBlend_RstRstConstRad.hxx | 70 +++++++++---------- src/BRepBlend/BRepBlend_RstRstEvolRad.hxx | 70 +++++++++---------- src/BRepBlend/BRepBlend_SurfRstConstRad.hxx | 68 +++++++++--------- src/BRepBlend/BRepBlend_SurfRstEvolRad.hxx | 68 +++++++++--------- src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx | 14 ++-- src/BRepCheck/BRepCheck_Edge.hxx | 6 +- src/BRepCheck/BRepCheck_Face.hxx | 6 +- src/BRepCheck/BRepCheck_Shell.hxx | 6 +- src/BRepCheck/BRepCheck_Vertex.hxx | 6 +- src/BRepCheck/BRepCheck_Wire.hxx | 6 +- src/BRepExtrema/BRepExtrema_TriangleSet.hxx | 8 +-- .../BRepFilletAPI_MakeChamfer.hxx | 36 +++++----- .../BRepFilletAPI_MakeFillet.hxx | 36 +++++----- .../BRepMesh_EdgeTessellationExtractor.hxx | 4 +- src/BRepMesh/BRepMesh_EdgeTessellator.hxx | 4 +- src/BRepMesh/BRepMesh_IncrementalMesh.hxx | 4 +- src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx | 4 +- src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx | 4 +- src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx | 4 +- src/BRepSweep/BRepSweep_Rotation.hxx | 32 ++++----- src/BRepTools/BRepTools_GTrsfModification.hxx | 12 ++-- .../BRepTools_NurbsConvertModification.hxx | 12 ++-- src/BRepTools/BRepTools_TrsfModification.hxx | 12 ++-- src/BiTgte/BiTgte_HCurveOnEdge.hxx | 4 +- src/BiTgte/BiTgte_HCurveOnVertex.hxx | 4 +- src/BinMDF/BinMDF_TagSourceDriver.hxx | 6 +- .../BinMDataStd_AsciiStringDriver.hxx | 6 +- src/BinMDataStd/BinMDataStd_CommentDriver.hxx | 6 +- .../BinMDataStd_ExpressionDriver.hxx | 6 +- .../BinMDataStd_IntPackedMapDriver.hxx | 6 +- src/BinMDataStd/BinMDataStd_NameDriver.hxx | 6 +- .../BinMDataStd_RelationDriver.hxx | 6 +- .../BinMDataStd_TreeNodeDriver.hxx | 6 +- .../BinMDataStd_UAttributeDriver.hxx | 6 +- .../BinMDataStd_VariableDriver.hxx | 6 +- .../BinMDataXtd_ConstraintDriver.hxx | 6 +- .../BinMDataXtd_GeometryDriver.hxx | 6 +- .../BinMDataXtd_PatternStdDriver.hxx | 6 +- .../BinMNaming_NamedShapeDriver.hxx | 6 +- src/BinMNaming/BinMNaming_NamingDriver.hxx | 6 +- .../BinMPrsStd_AISPresentationDriver.hxx | 6 +- src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx | 6 +- ...BinTObjDrivers_DocumentRetrievalDriver.hxx | 2 +- .../BinTObjDrivers_DocumentStorageDriver.hxx | 2 +- .../BinTObjDrivers_IntSparseArrayDriver.hxx | 6 +- .../BinTObjDrivers_ModelDriver.hxx | 6 +- .../BinTObjDrivers_ObjectDriver.hxx | 6 +- .../BinTObjDrivers_ReferenceDriver.hxx | 6 +- .../BinTObjDrivers_XYZDriver.hxx | 6 +- src/BinTools/BinTools_ShapeSet.cxx | 6 +- src/Bisector/Bisector_BisecAna.hxx | 42 +++++------ src/Bisector/Bisector_BisecCC.hxx | 42 +++++------ src/Bisector/Bisector_BisecPC.hxx | 42 +++++------ src/Blend/Blend_CSFunction.hxx | 32 ++++----- src/Blend/Blend_Function.hxx | 32 ++++----- src/BlendFunc/BlendFunc_CSCircular.hxx | 60 ++++++++-------- src/BlendFunc/BlendFunc_CSConstRad.hxx | 60 ++++++++-------- src/BlendFunc/BlendFunc_ChAsym.hxx | 50 ++++++------- src/BlendFunc/BlendFunc_ChAsymInv.hxx | 8 +-- src/BlendFunc/BlendFunc_ChamfInv.hxx | 8 +-- src/BlendFunc/BlendFunc_Chamfer.hxx | 54 +++++++------- src/BlendFunc/BlendFunc_ConstRad.hxx | 50 ++++++------- src/BlendFunc/BlendFunc_ConstRadInv.hxx | 8 +-- src/BlendFunc/BlendFunc_EvolRad.hxx | 50 ++++++------- src/BlendFunc/BlendFunc_Ruled.hxx | 54 +++++++------- src/BlendFunc/BlendFunc_RuledInv.hxx | 8 +-- src/CDF/CDF_Application.hxx | 4 +- src/CDF/CDF_FWOSDriver.hxx | 14 ++-- src/CDM/CDM_COutMessageDriver.hxx | 2 +- src/CDM/CDM_NullMessageDriver.hxx | 2 +- src/ChFi3d/ChFi3d_ChBuilder.hxx | 18 ++--- src/ChFi3d/ChFi3d_FilBuilder.hxx | 20 +++--- src/ChFiDS/ChFiDS_HElSpine.hxx | 4 +- src/Contap/Contap_ArcFunction.hxx | 6 +- src/DBRep/DBRep_DrawableShape.hxx | 2 +- src/DDF/DDF_Browser.hxx | 2 +- src/DDF/DDF_Data.hxx | 2 +- src/DDataStd/DDataStd_DrawPresentation.hxx | 8 +-- src/DDataStd/DDataStd_TreeBrowser.hxx | 2 +- src/DDocStd/DDocStd_DrawDocument.hxx | 2 +- src/Draft/Draft_Modification.hxx | 12 ++-- src/Draw/Draw_Axis2D.hxx | 2 +- src/Draw/Draw_Axis3D.hxx | 2 +- src/Draw/Draw_Box.hxx | 2 +- src/Draw/Draw_Chronometer.hxx | 2 +- src/Draw/Draw_Circle2D.hxx | 2 +- src/Draw/Draw_Circle3D.hxx | 2 +- src/Draw/Draw_Grid.hxx | 2 +- src/Draw/Draw_Marker2D.hxx | 2 +- src/Draw/Draw_Marker3D.hxx | 2 +- src/Draw/Draw_Number.hxx | 2 +- src/Draw/Draw_Segment2D.hxx | 2 +- src/Draw/Draw_Segment3D.hxx | 2 +- src/Draw/Draw_Text2D.hxx | 2 +- src/Draw/Draw_Text3D.hxx | 2 +- src/DrawDim/DrawDim_Angle.hxx | 2 +- src/DrawDim/DrawDim_Distance.hxx | 2 +- src/DrawDim/DrawDim_PlanarAngle.hxx | 2 +- src/DrawDim/DrawDim_PlanarDiameter.hxx | 2 +- src/DrawDim/DrawDim_PlanarDistance.hxx | 2 +- src/DrawDim/DrawDim_PlanarRadius.hxx | 2 +- src/DrawDim/DrawDim_Radius.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Curve.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Curve2d.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Drawable.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Point.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Surface.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Triangulation.hxx | 2 +- src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx | 2 +- src/Expr/Expr_Absolute.hxx | 14 ++-- src/Expr/Expr_ArcCosine.hxx | 14 ++-- src/Expr/Expr_ArcSine.hxx | 14 ++-- src/Expr/Expr_ArcTangent.hxx | 14 ++-- src/Expr/Expr_ArgCosh.hxx | 14 ++-- src/Expr/Expr_ArgSinh.hxx | 14 ++-- src/Expr/Expr_ArgTanh.hxx | 14 ++-- src/Expr/Expr_BinaryExpression.hxx | 12 ++-- src/Expr/Expr_BinaryFunction.hxx | 14 ++-- src/Expr/Expr_Cosh.hxx | 14 ++-- src/Expr/Expr_Cosine.hxx | 14 ++-- src/Expr/Expr_Difference.hxx | 14 ++-- src/Expr/Expr_Different.hxx | 10 +-- src/Expr/Expr_Division.hxx | 14 ++-- src/Expr/Expr_Equal.hxx | 10 +-- src/Expr/Expr_Exponential.hxx | 14 ++-- src/Expr/Expr_Exponentiate.hxx | 14 ++-- src/Expr/Expr_FunctionDerivative.hxx | 18 ++--- src/Expr/Expr_GreaterThan.hxx | 10 +-- src/Expr/Expr_GreaterThanOrEqual.hxx | 10 +-- src/Expr/Expr_LessThan.hxx | 10 +-- src/Expr/Expr_LessThanOrEqual.hxx | 10 +-- src/Expr/Expr_LogOf10.hxx | 14 ++-- src/Expr/Expr_LogOfe.hxx | 14 ++-- src/Expr/Expr_NamedConstant.hxx | 22 +++--- src/Expr/Expr_NamedExpression.hxx | 4 +- src/Expr/Expr_NamedFunction.hxx | 18 ++--- src/Expr/Expr_NamedUnknown.hxx | 22 +++--- src/Expr/Expr_NumericValue.hxx | 26 +++---- src/Expr/Expr_PolyExpression.hxx | 12 ++-- src/Expr/Expr_PolyFunction.hxx | 14 ++-- src/Expr/Expr_Product.hxx | 14 ++-- src/Expr/Expr_Sign.hxx | 14 ++-- src/Expr/Expr_Sine.hxx | 14 ++-- src/Expr/Expr_SingleRelation.hxx | 12 ++-- src/Expr/Expr_Sinh.hxx | 14 ++-- src/Expr/Expr_Square.hxx | 14 ++-- src/Expr/Expr_SquareRoot.hxx | 14 ++-- src/Expr/Expr_Sum.hxx | 14 ++-- src/Expr/Expr_SystemRelation.hxx | 22 +++--- src/Expr/Expr_Tangent.hxx | 14 ++-- src/Expr/Expr_Tanh.hxx | 14 ++-- src/Expr/Expr_UnaryExpression.hxx | 12 ++-- src/Expr/Expr_UnaryFunction.hxx | 14 ++-- src/Expr/Expr_UnaryMinus.hxx | 14 ++-- src/Extrema/Extrema_CCLocFOfLocECC.hxx | 4 +- src/Extrema/Extrema_CCLocFOfLocECC2d.hxx | 4 +- src/Extrema/Extrema_FuncExtCS.hxx | 10 +-- src/Extrema/Extrema_FuncExtPS.hxx | 10 +-- src/Extrema/Extrema_FuncExtSS.hxx | 10 +-- .../Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx | 6 +- .../Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx | 6 +- src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx | 6 +- src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx | 6 +- .../Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx | 6 +- .../Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx | 6 +- src/FEmTool/FEmTool_ProfileMatrix.hxx | 18 ++--- src/FWOSDriver/FWOSDriver_DriverFactory.hxx | 2 +- src/Font/Font_BRepFont.hxx | 2 +- src/GccInt/GccInt_BCirc.hxx | 2 +- src/GccInt/GccInt_BElips.hxx | 2 +- src/GccInt/GccInt_BHyper.hxx | 2 +- src/GccInt/GccInt_BLine.hxx | 2 +- src/GccInt/GccInt_BParab.hxx | 2 +- src/GccInt/GccInt_BPoint.hxx | 2 +- src/Geom/Geom_Axis1Placement.hxx | 6 +- src/Geom/Geom_Axis2Placement.hxx | 6 +- src/Geom/Geom_BSplineCurve.hxx | 34 ++++----- src/Geom/Geom_BSplineSurface.hxx | 42 +++++------ src/Geom/Geom_BezierCurve.hxx | 34 ++++----- src/Geom/Geom_BezierSurface.hxx | 42 +++++------ src/Geom/Geom_CartesianPoint.hxx | 14 ++-- src/Geom/Geom_Conic.hxx | 8 +-- src/Geom/Geom_ConicalSurface.hxx | 32 ++++----- src/Geom/Geom_CylindricalSurface.hxx | 32 ++++----- src/Geom/Geom_Direction.hxx | 16 ++--- src/Geom/Geom_ElementarySurface.hxx | 14 ++-- src/Geom/Geom_Line.hxx | 30 ++++---- src/Geom/Geom_OffsetCurve.hxx | 30 ++++---- src/Geom/Geom_OffsetSurface.hxx | 42 +++++------ src/Geom/Geom_Plane.hxx | 32 ++++----- src/Geom/Geom_RectangularTrimmedSurface.hxx | 42 +++++------ src/Geom/Geom_SphericalSurface.hxx | 32 ++++----- src/Geom/Geom_SurfaceOfLinearExtrusion.hxx | 40 +++++------ src/Geom/Geom_SurfaceOfRevolution.hxx | 40 +++++------ src/Geom/Geom_SweptSurface.hxx | 2 +- src/Geom/Geom_ToroidalSurface.hxx | 32 ++++----- src/Geom/Geom_TrimmedCurve.hxx | 34 ++++----- src/Geom/Geom_VectorWithMagnitude.hxx | 16 ++--- src/Geom2d/Geom2d_AxisPlacement.hxx | 4 +- src/Geom2d/Geom2d_BSplineCurve.hxx | 34 ++++----- src/Geom2d/Geom2d_BezierCurve.hxx | 34 ++++----- src/Geom2d/Geom2d_CartesianPoint.hxx | 12 ++-- src/Geom2d/Geom2d_Conic.hxx | 8 +-- src/Geom2d/Geom2d_Direction.hxx | 10 +-- src/Geom2d/Geom2d_Line.hxx | 30 ++++---- src/Geom2d/Geom2d_OffsetCurve.hxx | 30 ++++---- src/Geom2d/Geom2d_TrimmedCurve.hxx | 34 ++++----- src/Geom2d/Geom2d_VectorWithMagnitude.hxx | 10 +-- src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx | 2 +- ...FOfTheLocateExtPCOfTheProjPCurOfGInter.hxx | 6 +- src/GeomAdaptor/GeomAdaptor_GHCurve.hxx | 4 +- src/GeomAdaptor/GeomAdaptor_GHSurface.hxx | 2 +- .../GeomAdaptor_HSurfaceOfLinearExtrusion.hxx | 2 +- .../GeomAdaptor_HSurfaceOfRevolution.hxx | 2 +- src/GeomFill/GeomFill_BoundWithSurf.hxx | 10 +-- src/GeomFill/GeomFill_DegeneratedBound.hxx | 10 +-- src/GeomFill/GeomFill_SimpleBound.hxx | 10 +-- src/GeomFill/GeomFill_TgtOnCoons.hxx | 6 +- src/GeomPlate/GeomPlate_Surface.hxx | 42 +++++------ ...FOfTheLocateExtPCOfTheProjPCurOfCInter.hxx | 6 +- src/HLRTest/HLRTest_DrawableEdgeTool.hxx | 2 +- src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx | 2 +- src/HLRTest/HLRTest_OutLiner.hxx | 2 +- src/HLRTest/HLRTest_Projector.hxx | 2 +- .../HeaderSection_HeaderRecognizer.hxx | 2 +- src/IFSelect/IFSelect_Act.hxx | 4 +- src/IFSelect/IFSelect_BasicDumper.hxx | 4 +- src/IFSelect/IFSelect_DispGlobal.hxx | 4 +- src/IFSelect/IFSelect_DispPerCount.hxx | 4 +- src/IFSelect/IFSelect_DispPerFiles.hxx | 4 +- src/IFSelect/IFSelect_DispPerOne.hxx | 4 +- src/IFSelect/IFSelect_DispPerSignature.hxx | 4 +- src/IFSelect/IFSelect_ModifEditForm.hxx | 4 +- src/IFSelect/IFSelect_ModifReorder.hxx | 4 +- src/IFSelect/IFSelect_ParamEditor.hxx | 10 +-- src/IFSelect/IFSelect_SelectAnyList.hxx | 4 +- src/IFSelect/IFSelect_SelectAnyType.hxx | 2 +- src/IFSelect/IFSelect_SelectBase.hxx | 2 +- src/IFSelect/IFSelect_SelectCombine.hxx | 2 +- src/IFSelect/IFSelect_SelectControl.hxx | 2 +- src/IFSelect/IFSelect_SelectDeduct.hxx | 2 +- src/IFSelect/IFSelect_SelectDiff.hxx | 4 +- src/IFSelect/IFSelect_SelectEntityNumber.hxx | 4 +- src/IFSelect/IFSelect_SelectErrorEntities.hxx | 4 +- src/IFSelect/IFSelect_SelectExplore.hxx | 4 +- src/IFSelect/IFSelect_SelectExtract.hxx | 4 +- src/IFSelect/IFSelect_SelectFlag.hxx | 4 +- src/IFSelect/IFSelect_SelectInList.hxx | 2 +- src/IFSelect/IFSelect_SelectIntersection.hxx | 4 +- src/IFSelect/IFSelect_SelectModelEntities.hxx | 4 +- src/IFSelect/IFSelect_SelectModelRoots.hxx | 4 +- src/IFSelect/IFSelect_SelectPointed.hxx | 4 +- src/IFSelect/IFSelect_SelectRange.hxx | 4 +- src/IFSelect/IFSelect_SelectRootComps.hxx | 4 +- src/IFSelect/IFSelect_SelectRoots.hxx | 4 +- src/IFSelect/IFSelect_SelectSent.hxx | 4 +- src/IFSelect/IFSelect_SelectShared.hxx | 4 +- src/IFSelect/IFSelect_SelectSharing.hxx | 4 +- src/IFSelect/IFSelect_SelectSignature.hxx | 4 +- src/IFSelect/IFSelect_SelectSignedShared.hxx | 4 +- src/IFSelect/IFSelect_SelectSignedSharing.hxx | 4 +- src/IFSelect/IFSelect_SelectSuite.hxx | 4 +- src/IFSelect/IFSelect_SelectType.hxx | 4 +- src/IFSelect/IFSelect_SelectUnion.hxx | 4 +- .../IFSelect_SelectUnknownEntities.hxx | 4 +- src/IFSelect/IFSelect_SessionPilot.hxx | 4 +- src/IFSelect/IFSelect_SignCategory.hxx | 2 +- src/IFSelect/IFSelect_SignMultiple.hxx | 2 +- src/IFSelect/IFSelect_SignType.hxx | 2 +- src/IFSelect/IFSelect_SignValidity.hxx | 2 +- src/IFSelect/IFSelect_Signature.hxx | 2 +- src/IFSelect/IFSelect_TransformStandard.hxx | 6 +- src/IGESAppli/IGESAppli_GeneralModule.hxx | 10 +-- src/IGESAppli/IGESAppli_ReadWriteModule.hxx | 6 +- src/IGESAppli/IGESAppli_SpecificModule.hxx | 2 +- src/IGESBasic/IGESBasic_GeneralModule.hxx | 10 +-- src/IGESBasic/IGESBasic_Name.hxx | 2 +- src/IGESBasic/IGESBasic_ReadWriteModule.hxx | 6 +- src/IGESBasic/IGESBasic_SingleParent.hxx | 6 +- src/IGESBasic/IGESBasic_SpecificModule.hxx | 2 +- src/IGESControl/IGESControl_Controller.hxx | 4 +- src/IGESData/IGESData_DefaultGeneral.hxx | 10 +-- src/IGESData/IGESData_DefaultSpecific.hxx | 2 +- src/IGESData/IGESData_GeneralModule.hxx | 8 +-- src/IGESData/IGESData_IGESModel.hxx | 14 ++-- src/IGESData/IGESData_IGESReaderData.hxx | 2 +- src/IGESData/IGESData_IGESReaderTool.hxx | 6 +- src/IGESData/IGESData_Protocol.hxx | 14 ++-- src/IGESData/IGESData_ReadWriteModule.hxx | 4 +- src/IGESDefs/IGESDefs_GeneralModule.hxx | 10 +-- src/IGESDefs/IGESDefs_ReadWriteModule.hxx | 6 +- src/IGESDefs/IGESDefs_SpecificModule.hxx | 2 +- src/IGESDimen/IGESDimen_GeneralModule.hxx | 10 +-- src/IGESDimen/IGESDimen_ReadWriteModule.hxx | 6 +- src/IGESDimen/IGESDimen_SpecificModule.hxx | 2 +- src/IGESDraw/IGESDraw_GeneralModule.hxx | 10 +-- src/IGESDraw/IGESDraw_PerspectiveView.hxx | 6 +- src/IGESDraw/IGESDraw_ReadWriteModule.hxx | 6 +- .../IGESDraw_SegmentedViewsVisible.hxx | 6 +- src/IGESDraw/IGESDraw_SpecificModule.hxx | 2 +- src/IGESDraw/IGESDraw_View.hxx | 6 +- src/IGESDraw/IGESDraw_ViewsVisible.hxx | 6 +- .../IGESDraw_ViewsVisibleWithAttr.hxx | 6 +- src/IGESGeom/IGESGeom_GeneralModule.hxx | 10 +-- src/IGESGeom/IGESGeom_ReadWriteModule.hxx | 6 +- src/IGESGeom/IGESGeom_SpecificModule.hxx | 2 +- .../IGESGeom_TransformationMatrix.hxx | 2 +- src/IGESGraph/IGESGraph_DefinitionLevel.hxx | 4 +- src/IGESGraph/IGESGraph_GeneralModule.hxx | 10 +-- src/IGESGraph/IGESGraph_ReadWriteModule.hxx | 6 +- src/IGESGraph/IGESGraph_SpecificModule.hxx | 2 +- src/IGESSelect/IGESSelect_Activator.hxx | 4 +- src/IGESSelect/IGESSelect_AddFileComment.hxx | 4 +- src/IGESSelect/IGESSelect_AddGroup.hxx | 4 +- src/IGESSelect/IGESSelect_AutoCorrect.hxx | 4 +- src/IGESSelect/IGESSelect_ChangeLevelList.hxx | 4 +- .../IGESSelect_ChangeLevelNumber.hxx | 4 +- src/IGESSelect/IGESSelect_ComputeStatus.hxx | 4 +- src/IGESSelect/IGESSelect_DispPerDrawing.hxx | 4 +- .../IGESSelect_DispPerSingleView.hxx | 4 +- src/IGESSelect/IGESSelect_Dumper.hxx | 4 +- src/IGESSelect/IGESSelect_EditDirPart.hxx | 10 +-- src/IGESSelect/IGESSelect_EditHeader.hxx | 10 +-- src/IGESSelect/IGESSelect_FloatFormat.hxx | 4 +- src/IGESSelect/IGESSelect_IGESName.hxx | 2 +- src/IGESSelect/IGESSelect_IGESTypeForm.hxx | 2 +- src/IGESSelect/IGESSelect_ModelModifier.hxx | 2 +- src/IGESSelect/IGESSelect_RebuildDrawings.hxx | 4 +- src/IGESSelect/IGESSelect_RebuildGroups.hxx | 4 +- src/IGESSelect/IGESSelect_RemoveCurves.hxx | 4 +- src/IGESSelect/IGESSelect_SelectBasicGeom.hxx | 4 +- .../IGESSelect_SelectBypassGroup.hxx | 4 +- .../IGESSelect_SelectBypassSubfigure.hxx | 4 +- .../IGESSelect_SelectDrawingFrom.hxx | 4 +- src/IGESSelect/IGESSelect_SelectFaces.hxx | 4 +- .../IGESSelect_SelectFromDrawing.hxx | 4 +- .../IGESSelect_SelectFromSingleView.hxx | 4 +- .../IGESSelect_SelectLevelNumber.hxx | 4 +- src/IGESSelect/IGESSelect_SelectName.hxx | 4 +- src/IGESSelect/IGESSelect_SelectPCurves.hxx | 4 +- .../IGESSelect_SelectSingleViewFrom.hxx | 4 +- .../IGESSelect_SelectSubordinate.hxx | 4 +- .../IGESSelect_SelectVisibleStatus.hxx | 4 +- .../IGESSelect_SetGlobalParameter.hxx | 4 +- src/IGESSelect/IGESSelect_SetLabel.hxx | 4 +- src/IGESSelect/IGESSelect_SetVersion5.hxx | 4 +- src/IGESSelect/IGESSelect_SignColor.hxx | 2 +- src/IGESSelect/IGESSelect_SignLevelNumber.hxx | 2 +- src/IGESSelect/IGESSelect_SignStatus.hxx | 2 +- src/IGESSelect/IGESSelect_SplineToBSpline.hxx | 6 +- .../IGESSelect_UpdateCreationDate.hxx | 4 +- src/IGESSelect/IGESSelect_UpdateFileName.hxx | 4 +- .../IGESSelect_UpdateLastChange.hxx | 4 +- src/IGESSelect/IGESSelect_WorkLibrary.hxx | 6 +- src/IGESSolid/IGESSolid_GeneralModule.hxx | 10 +-- src/IGESSolid/IGESSolid_ReadWriteModule.hxx | 6 +- src/IGESSolid/IGESSolid_SpecificModule.hxx | 2 +- src/Image/Image_AlienPixMap.hxx | 8 +-- src/IntPatch/IntPatch_ArcFunction.hxx | 6 +- src/IntPatch/IntPatch_PolyArc.hxx | 4 +- src/IntPatch/IntPatch_RLine.hxx | 4 +- src/IntPatch/IntPatch_WLine.hxx | 4 +- src/Interface/Interface_CopyMap.hxx | 6 +- src/Interface/Interface_SignLabel.hxx | 4 +- src/Interface/Interface_SignType.hxx | 2 +- src/Law/Law_BSpFunc.hxx | 8 +-- src/Law/Law_Composite.hxx | 8 +-- src/Law/Law_Constant.hxx | 8 +-- src/Law/Law_Linear.hxx | 8 +-- src/LocOpe/LocOpe_GluedShape.hxx | 8 +-- src/MeshTest/MeshTest_DrawableMesh.hxx | 8 +-- .../MeshVS_ElementalColorPrsBuilder.hxx | 2 +- src/MeshVS/MeshVS_MeshPrsBuilder.hxx | 2 +- src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx | 2 +- src/MeshVS/MeshVS_TextPrsBuilder.hxx | 2 +- src/MeshVS/MeshVS_VectorPrsBuilder.hxx | 2 +- src/MoniTool/MoniTool_SignShape.hxx | 4 +- src/MoniTool/MoniTool_TransientElem.hxx | 2 +- src/NCollection/NCollection_AccAllocator.hxx | 4 +- .../NCollection_AlignedAllocator.hxx | 4 +- src/NCollection/NCollection_HeapAllocator.hxx | 4 +- src/NCollection/NCollection_IncAllocator.hxx | 4 +- .../NCollection_WinHeapAllocator.hxx | 4 +- src/OpenGl/OpenGl_CappingAlgo.hxx | 2 +- src/OpenGl/OpenGl_Font.hxx | 2 +- src/OpenGl/OpenGl_FrameBuffer.hxx | 2 +- src/OpenGl/OpenGl_GraphicDriver.hxx | 14 ++-- src/OpenGl/OpenGl_Group.hxx | 18 ++--- src/OpenGl/OpenGl_IndexBuffer.hxx | 2 +- src/OpenGl/OpenGl_LineAttributes.hxx | 2 +- src/OpenGl/OpenGl_PointSprite.hxx | 2 +- src/OpenGl/OpenGl_Sampler.hxx | 2 +- src/OpenGl/OpenGl_ShaderObject.hxx | 2 +- src/OpenGl/OpenGl_ShaderProgram.hxx | 2 +- src/OpenGl/OpenGl_Structure.hxx | 20 +++--- src/OpenGl/OpenGl_StructureShadow.hxx | 3 +- src/OpenGl/OpenGl_Texture.hxx | 2 +- src/OpenGl/OpenGl_TextureBufferArb.hxx | 6 +- src/OpenGl/OpenGl_VertexBuffer.hxx | 2 +- src/OpenGl/OpenGl_VertexBufferCompat.hxx | 2 +- src/OpenGl/OpenGl_View.hxx | 9 ++- src/OpenGl/OpenGl_Workspace.hxx | 2 +- src/PCDM/PCDM_ReadWriter_1.hxx | 18 ++--- src/PLib/PLib_HermitJacobi.hxx | 16 ++--- src/PLib/PLib_JacobiPolynomial.hxx | 16 ++--- src/ProjLib/ProjLib_HCompProjectedCurve.hxx | 2 +- src/ProjLib/ProjLib_HProjectedCurve.hxx | 2 +- src/QANCollection/QANCollection_Handle.cxx | 23 ++++-- .../RWHeaderSection_GeneralModule.hxx | 8 +-- .../RWHeaderSection_ReadWriteModule.hxx | 8 +-- src/RWStepAP214/RWStepAP214_GeneralModule.hxx | 8 +-- .../RWStepAP214_ReadWriteModule.hxx | 8 +-- src/STEPControl/STEPControl_Controller.hxx | 4 +- src/STEPEdit/STEPEdit_EditContext.hxx | 10 +-- src/STEPEdit/STEPEdit_EditSDR.hxx | 10 +-- .../STEPSelections_SelectAssembly.hxx | 4 +- .../STEPSelections_SelectFaces.hxx | 4 +- .../STEPSelections_SelectGSCurves.hxx | 4 +- .../STEPSelections_SelectInstances.hxx | 6 +- src/Select3D/Select3D_SensitiveEntity.hxx | 6 +- src/Select3D/Select3D_SensitiveGroup.hxx | 4 +- src/Select3D/Select3D_SensitiveSet.hxx | 2 +- src/Select3D/Select3D_SensitiveWire.hxx | 2 +- src/SelectMgr/SelectMgr_AndFilter.hxx | 2 +- src/SelectMgr/SelectMgr_OrFilter.hxx | 2 +- .../ShapeCustom_BSplineRestriction.hxx | 12 ++-- .../ShapeCustom_ConvertToBSpline.hxx | 12 ++-- .../ShapeCustom_ConvertToRevolution.hxx | 12 ++-- .../ShapeCustom_DirectModification.hxx | 12 ++-- .../ShapeCustom_SweptToElementary.hxx | 12 ++-- .../ShapeCustom_TrsfModification.hxx | 10 +-- src/Standard/Standard_DefineException.hxx | 2 +- src/Standard/Standard_Type.hxx | 3 +- src/StepBasic/StepBasic_SizeSelect.hxx | 2 +- src/StepBasic/StepBasic_SourceItem.hxx | 2 +- src/StepData/StepData_DefaultGeneral.hxx | 8 +-- src/StepData/StepData_DescrGeneral.hxx | 8 +-- src/StepData/StepData_DescrReadWrite.hxx | 8 +-- src/StepData/StepData_ECDescr.hxx | 6 +- src/StepData/StepData_ESDescr.hxx | 6 +- src/StepData/StepData_GeneralModule.hxx | 6 +- src/StepData/StepData_Plex.hxx | 16 ++--- src/StepData/StepData_Protocol.hxx | 14 ++-- src/StepData/StepData_ReadWriteModule.hxx | 4 +- src/StepData/StepData_Simple.hxx | 16 ++--- src/StepData/StepData_StepModel.hxx | 14 ++-- src/StepData/StepData_StepReaderData.hxx | 2 +- src/StepData/StepData_StepReaderTool.hxx | 6 +- ...Tol_SimpleDatumReferenceModifierMember.hxx | 10 +-- .../StepElement_CurveElementFreedom.hxx | 2 +- .../StepElement_CurveElementPurpose.hxx | 2 +- src/StepElement/StepElement_ElementAspect.hxx | 2 +- .../StepElement_MeasureOrUnspecifiedValue.hxx | 2 +- .../StepElement_SurfaceElementPurpose.hxx | 2 +- .../StepElement_VolumeElementPurpose.hxx | 2 +- src/StepFEA/StepFEA_DegreeOfFreedom.hxx | 2 +- src/StepFEA/StepFEA_SymmetricTensor23d.hxx | 2 +- src/StepFEA/StepFEA_SymmetricTensor43d.hxx | 2 +- src/StepGeom/StepGeom_TrimmingSelect.hxx | 2 +- src/StepSelect/StepSelect_Activator.hxx | 4 +- src/StepSelect/StepSelect_FloatFormat.hxx | 4 +- src/StepSelect/StepSelect_ModelModifier.hxx | 2 +- src/StepSelect/StepSelect_StepType.hxx | 2 +- src/StepSelect/StepSelect_WorkLibrary.hxx | 6 +- ...StepShape_ShapeDimensionRepresentation.hxx | 2 +- src/StepVisual/StepVisual_MarkerSelect.hxx | 2 +- src/Storage/Storage_DefaultCallBack.hxx | 8 +-- src/TDF/TDF_Reference.hxx | 8 +-- src/TDF/TDF_TagSource.hxx | 8 +-- src/TDataStd/TDataStd_AsciiString.hxx | 8 +-- src/TDataStd/TDataStd_BooleanArray.hxx | 8 +-- src/TDataStd/TDataStd_BooleanList.hxx | 8 +-- src/TDataStd/TDataStd_ByteArray.hxx | 8 +-- src/TDataStd/TDataStd_Comment.hxx | 8 +-- src/TDataStd/TDataStd_Current.hxx | 8 +-- src/TDataStd/TDataStd_Directory.hxx | 8 +-- src/TDataStd/TDataStd_Expression.hxx | 8 +-- src/TDataStd/TDataStd_ExtStringArray.hxx | 8 +-- src/TDataStd/TDataStd_ExtStringList.hxx | 8 +-- src/TDataStd/TDataStd_IntPackedMap.hxx | 8 +-- src/TDataStd/TDataStd_Integer.hxx | 8 +-- src/TDataStd/TDataStd_IntegerArray.hxx | 8 +-- src/TDataStd/TDataStd_IntegerList.hxx | 8 +-- src/TDataStd/TDataStd_Name.hxx | 8 +-- src/TDataStd/TDataStd_NamedData.hxx | 8 +-- src/TDataStd/TDataStd_NoteBook.hxx | 8 +-- src/TDataStd/TDataStd_Real.hxx | 8 +-- src/TDataStd/TDataStd_RealArray.hxx | 8 +-- src/TDataStd/TDataStd_RealList.hxx | 8 +-- src/TDataStd/TDataStd_ReferenceArray.hxx | 8 +-- src/TDataStd/TDataStd_ReferenceList.hxx | 8 +-- src/TDataStd/TDataStd_Relation.hxx | 8 +-- src/TDataStd/TDataStd_Tick.hxx | 8 +-- src/TDataStd/TDataStd_TreeNode.hxx | 6 +- src/TDataStd/TDataStd_UAttribute.hxx | 8 +-- src/TDataStd/TDataStd_Variable.hxx | 8 +-- src/TDataXtd/TDataXtd_Axis.hxx | 8 +-- src/TDataXtd/TDataXtd_Constraint.hxx | 8 +-- src/TDataXtd/TDataXtd_Geometry.hxx | 8 +-- src/TDataXtd/TDataXtd_PatternStd.hxx | 12 ++-- src/TDataXtd/TDataXtd_Placement.hxx | 8 +-- src/TDataXtd/TDataXtd_Plane.hxx | 8 +-- src/TDataXtd/TDataXtd_Point.hxx | 8 +-- src/TDataXtd/TDataXtd_Shape.hxx | 8 +-- src/TDocStd/TDocStd_Document.hxx | 2 +- src/TDocStd/TDocStd_Modified.hxx | 8 +-- src/TDocStd/TDocStd_Owner.hxx | 8 +-- src/TFunction/TFunction_Function.hxx | 6 +- src/TFunction/TFunction_GraphNode.hxx | 6 +- src/TFunction/TFunction_Scope.hxx | 6 +- src/TNaming/TNaming_Naming.hxx | 6 +- src/TObj/TObj_Application.hxx | 6 +- src/TObj/TObj_HiddenPartition.hxx | 2 +- src/TObj/TObj_LabelIterator.hxx | 6 +- src/TObj/TObj_ModelIterator.hxx | 6 +- src/TObj/TObj_OcafObjectIterator.hxx | 2 +- src/TObj/TObj_Partition.hxx | 6 +- src/TObj/TObj_ReferenceIterator.hxx | 2 +- src/TObj/TObj_SequenceIterator.hxx | 6 +- src/TObj/TObj_TIntSparseArray.hxx | 16 ++--- src/TObj/TObj_TModel.hxx | 8 +-- src/TObj/TObj_TNameContainer.hxx | 8 +-- src/TObj/TObj_TObject.hxx | 12 ++-- src/TObj/TObj_TReference.hxx | 18 ++--- src/TObj/TObj_TXYZ.hxx | 10 +-- src/TObjDRAW/TObjDRAW.cxx | 2 +- src/TPrsStd/TPrsStd_AISPresentation.hxx | 8 +-- src/TPrsStd/TPrsStd_AISViewer.hxx | 8 +-- .../TopOpeBRepBuild_WireEdgeClassifier.hxx | 12 ++-- src/TopoDS/TopoDS_TCompSolid.hxx | 4 +- src/TopoDS/TopoDS_TCompound.hxx | 4 +- src/TopoDS/TopoDS_TEdge.hxx | 2 +- src/TopoDS/TopoDS_TFace.hxx | 4 +- src/TopoDS/TopoDS_TShell.hxx | 4 +- src/TopoDS/TopoDS_TSolid.hxx | 4 +- src/TopoDS/TopoDS_TVertex.hxx | 2 +- src/TopoDS/TopoDS_TWire.hxx | 4 +- src/Transfer/Transfer_DispatchControl.hxx | 6 +- src/Transfer/Transfer_MultipleBinder.hxx | 4 +- .../Transfer_SimpleBinderOfTransient.hxx | 4 +- src/Transfer/Transfer_TransientListBinder.hxx | 4 +- src/Transfer/Transfer_TransientMapper.hxx | 2 +- src/Transfer/Transfer_VoidBinder.hxx | 4 +- .../TransferBRep_BinderOfShape.hxx | 4 +- .../TransferBRep_OrientedShapeMapper.hxx | 2 +- .../TransferBRep_ShapeListBinder.hxx | 4 +- src/TransferBRep/TransferBRep_ShapeMapper.hxx | 2 +- src/ViewerTest/ViewerTest_ObjectCommands.cxx | 20 +++--- src/ViewerTest/ViewerTest_OpenGlCommands.cxx | 4 +- src/ViewerTest/ViewerTest_ViewerCommands.cxx | 5 +- src/VrmlData/VrmlData_Appearance.hxx | 8 +-- src/VrmlData/VrmlData_ArrayVec3d.hxx | 2 +- src/VrmlData/VrmlData_Box.hxx | 8 +-- src/VrmlData/VrmlData_Color.hxx | 6 +- src/VrmlData/VrmlData_Cone.hxx | 8 +-- src/VrmlData/VrmlData_Coordinate.hxx | 6 +- src/VrmlData/VrmlData_Cylinder.hxx | 8 +-- src/VrmlData/VrmlData_Group.hxx | 6 +- src/VrmlData/VrmlData_ImageTexture.hxx | 6 +- src/VrmlData/VrmlData_IndexedFaceSet.hxx | 10 +-- src/VrmlData/VrmlData_IndexedLineSet.hxx | 10 +-- src/VrmlData/VrmlData_Material.hxx | 8 +-- src/VrmlData/VrmlData_Normal.hxx | 6 +- src/VrmlData/VrmlData_ShapeNode.hxx | 8 +-- src/VrmlData/VrmlData_Sphere.hxx | 8 +-- src/VrmlData/VrmlData_TextureCoordinate.hxx | 4 +- src/VrmlData/VrmlData_UnknownNode.hxx | 4 +- src/VrmlData/VrmlData_WorldInfo.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Area.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Centroid.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Color.hxx | 8 +-- src/XCAFDoc/XCAFDoc_ColorTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Datum.hxx | 8 +-- src/XCAFDoc/XCAFDoc_DimTol.hxx | 8 +-- src/XCAFDoc/XCAFDoc_DimTolTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Dimension.hxx | 8 +-- src/XCAFDoc/XCAFDoc_DocumentTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_GeomTolerance.hxx | 8 +-- src/XCAFDoc/XCAFDoc_GraphNode.hxx | 6 +- src/XCAFDoc/XCAFDoc_LayerTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Location.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Material.hxx | 8 +-- src/XCAFDoc/XCAFDoc_MaterialTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_ShapeTool.hxx | 8 +-- src/XCAFDoc/XCAFDoc_Volume.hxx | 8 +-- src/XCAFPrs/XCAFPrs_AISObject.hxx | 2 +- src/XSControl/XSControl_ConnectedShapes.hxx | 4 +- src/XSControl/XSControl_SelectForTransfer.hxx | 4 +- .../XSControl_SignTransferStatus.hxx | 2 +- .../XSDRAWSTLVRML_DataSource.hxx | 10 +-- .../XSDRAWSTLVRML_DataSource3D.hxx | 10 +-- src/XmlMDF/XmlMDF_ReferenceDriver.hxx | 6 +- src/XmlMDF/XmlMDF_TagSourceDriver.hxx | 6 +- .../XmlMDataStd_AsciiStringDriver.hxx | 6 +- .../XmlMDataStd_BooleanArrayDriver.hxx | 6 +- .../XmlMDataStd_BooleanListDriver.hxx | 6 +- .../XmlMDataStd_ByteArrayDriver.hxx | 6 +- src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx | 6 +- .../XmlMDataStd_DirectoryDriver.hxx | 6 +- .../XmlMDataStd_ExpressionDriver.hxx | 6 +- .../XmlMDataStd_ExtStringArrayDriver.hxx | 6 +- .../XmlMDataStd_ExtStringListDriver.hxx | 6 +- .../XmlMDataStd_IntPackedMapDriver.hxx | 6 +- .../XmlMDataStd_IntegerArrayDriver.hxx | 6 +- src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx | 6 +- .../XmlMDataStd_IntegerListDriver.hxx | 6 +- src/XmlMDataStd/XmlMDataStd_NameDriver.hxx | 6 +- .../XmlMDataStd_NamedDataDriver.hxx | 6 +- .../XmlMDataStd_NoteBookDriver.hxx | 6 +- .../XmlMDataStd_RealArrayDriver.hxx | 6 +- src/XmlMDataStd/XmlMDataStd_RealDriver.hxx | 6 +- .../XmlMDataStd_RealListDriver.hxx | 6 +- .../XmlMDataStd_ReferenceArrayDriver.hxx | 6 +- .../XmlMDataStd_ReferenceListDriver.hxx | 6 +- .../XmlMDataStd_RelationDriver.hxx | 6 +- src/XmlMDataStd/XmlMDataStd_TickDriver.hxx | 6 +- .../XmlMDataStd_TreeNodeDriver.hxx | 6 +- .../XmlMDataStd_UAttributeDriver.hxx | 6 +- .../XmlMDataStd_VariableDriver.hxx | 6 +- src/XmlMDataXtd/XmlMDataXtd_AxisDriver.hxx | 6 +- .../XmlMDataXtd_ConstraintDriver.hxx | 6 +- .../XmlMDataXtd_GeometryDriver.hxx | 6 +- .../XmlMDataXtd_PatternStdDriver.hxx | 6 +- .../XmlMDataXtd_PlacementDriver.hxx | 6 +- src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.hxx | 6 +- src/XmlMDataXtd/XmlMDataXtd_PointDriver.hxx | 6 +- src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.hxx | 6 +- src/XmlMDocStd/XmlMDocStd_XLinkDriver.hxx | 6 +- .../XmlMFunction_FunctionDriver.hxx | 6 +- .../XmlMFunction_GraphNodeDriver.hxx | 6 +- src/XmlMFunction/XmlMFunction_ScopeDriver.hxx | 6 +- src/XmlMNaming/XmlMNaming_NamingDriver.hxx | 6 +- .../XmlMPrsStd_AISPresentationDriver.hxx | 6 +- src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx | 6 +- src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.hxx | 6 +- .../XmlMXCAFDoc_CentroidDriver.hxx | 6 +- src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.hxx | 6 +- src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.hxx | 6 +- src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.hxx | 6 +- .../XmlMXCAFDoc_GraphNodeDriver.hxx | 6 +- .../XmlMXCAFDoc_LocationDriver.hxx | 6 +- .../XmlMXCAFDoc_MaterialDriver.hxx | 6 +- src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.hxx | 6 +- ...XmlTObjDrivers_DocumentRetrievalDriver.hxx | 2 +- .../XmlTObjDrivers_DocumentStorageDriver.hxx | 2 +- .../XmlTObjDrivers_IntSparseArrayDriver.hxx | 6 +- .../XmlTObjDrivers_ModelDriver.hxx | 6 +- .../XmlTObjDrivers_ObjectDriver.hxx | 6 +- .../XmlTObjDrivers_ReferenceDriver.hxx | 6 +- .../XmlTObjDrivers_XYZDriver.hxx | 6 +- src/Xw/Xw_Window.hxx | 2 +- 700 files changed, 2920 insertions(+), 2904 deletions(-) diff --git a/src/AIS/AIS_AngleDimension.hxx b/src/AIS/AIS_AngleDimension.hxx index 1020029d2e..b53e6e03f6 100755 --- a/src/AIS/AIS_AngleDimension.hxx +++ b/src/AIS/AIS_AngleDimension.hxx @@ -189,14 +189,14 @@ public: const gp_Pnt& thePoint); //! @return the display units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE; //! @return the model units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE; - Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; //! Principle of horizontal text alignment settings: //! - divide circle into two halves according to attachment points @@ -204,9 +204,9 @@ public: //! - if aTextPos is not between attach points but in this half -> Left or Right + positive flyout //! - if aTextPos is between reflections of attach points -> Center + negative flyout //! - if aTextPos is not between reflections of attach points -> Left or Right + negative flyout - Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos); + Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE; - Standard_EXPORT virtual const gp_Pnt GetTextPosition () const; + Standard_EXPORT virtual const gp_Pnt GetTextPosition () const Standard_OVERRIDE; public: @@ -284,19 +284,19 @@ protected: protected: - Standard_EXPORT virtual void ComputePlane(); + Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE; //! Checks if the plane includes three angle points to build dimension. - Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE; - Standard_EXPORT virtual Standard_Real ComputeValue() const; + Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePM, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); + const Standard_Integer theMode = 0) Standard_OVERRIDE; Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theOwner); + const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; protected: diff --git a/src/AIS/AIS_Axis.hxx b/src/AIS/AIS_Axis.hxx index 4884034c77..e4efb06eaf 100644 --- a/src/AIS/AIS_Axis.hxx +++ b/src/AIS/AIS_Axis.hxx @@ -147,7 +147,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeFields(); diff --git a/src/AIS/AIS_Circle.hxx b/src/AIS/AIS_Circle.hxx index e772807402..57a5a4e3c3 100644 --- a/src/AIS/AIS_Circle.hxx +++ b/src/AIS/AIS_Circle.hxx @@ -126,7 +126,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeCircle (const Handle(Prs3d_Presentation)& aPresentation); diff --git a/src/AIS/AIS_ColorScale.hxx b/src/AIS/AIS_ColorScale.hxx index 91216611e6..acb6022da9 100644 --- a/src/AIS/AIS_ColorScale.hxx +++ b/src/AIS/AIS_ColorScale.hxx @@ -245,10 +245,11 @@ private: void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/, - const Standard_Integer /*aMode*/){}; + const Standard_Integer /*aMode*/) Standard_OVERRIDE + {} //! Returns the format of text. TCollection_AsciiString Format() const; diff --git a/src/AIS/AIS_DiameterDimension.hxx b/src/AIS/AIS_DiameterDimension.hxx index 3547b52a00..b76e1db042 100644 --- a/src/AIS/AIS_DiameterDimension.hxx +++ b/src/AIS/AIS_DiameterDimension.hxx @@ -115,18 +115,18 @@ public: Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Shape& theShape); //! @return the display units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE; //! @return the model units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE; - Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos); + Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE; - Standard_EXPORT virtual const gp_Pnt GetTextPosition() const; + Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE; public: @@ -143,19 +143,19 @@ protected: //! 2) The plane should inclide th ecircle center to be valid. Standard_EXPORT virtual void ComputeAnchorPoint(); - Standard_EXPORT virtual void ComputePlane(); + Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE; //! Checks if the center of the circle is on the plane. - Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE; - Standard_EXPORT virtual Standard_Real ComputeValue() const; + Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); + const Standard_Integer theMode = 0) Standard_OVERRIDE; Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theEntityOwner); + const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE; protected: diff --git a/src/AIS/AIS_Dimension.hxx b/src/AIS/AIS_Dimension.hxx index 9ec65911f1..bdc7a12355 100755 --- a/src/AIS/AIS_Dimension.hxx +++ b/src/AIS/AIS_Dimension.hxx @@ -298,7 +298,7 @@ public: } //! @return the kind of interactive. - virtual AIS_KindOfInteractive Type() const + virtual AIS_KindOfInteractive Type() const Standard_OVERRIDE { return AIS_KOI_Dimension; } @@ -306,7 +306,7 @@ public: //! Returns true if the class of objects accepts the display mode theMode. //! The interactive context can have a default mode of representation for //! the set of Interactive Objects. This mode may not be accepted by object. - virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const + virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == ComputeMode_All; } @@ -580,7 +580,7 @@ protected: //! @name Behavior to implement //! @param theSelection [in] the selection structure to will with primitives. //! @param theMode [in] the selection mode. Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; protected: //! @name Selection geometry diff --git a/src/AIS/AIS_EqualDistanceRelation.hxx b/src/AIS/AIS_EqualDistanceRelation.hxx index 3866740f5b..7ab7e0b7c2 100644 --- a/src/AIS/AIS_EqualDistanceRelation.hxx +++ b/src/AIS/AIS_EqualDistanceRelation.hxx @@ -122,7 +122,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; TopoDS_Shape myShape3; TopoDS_Shape myShape4; diff --git a/src/AIS/AIS_EqualRadiusRelation.hxx b/src/AIS/AIS_EqualRadiusRelation.hxx index e7d93a771e..fd9b7f6f04 100644 --- a/src/AIS/AIS_EqualRadiusRelation.hxx +++ b/src/AIS/AIS_EqualRadiusRelation.hxx @@ -73,7 +73,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeRadiusPosition(); diff --git a/src/AIS/AIS_LengthDimension.hxx b/src/AIS/AIS_LengthDimension.hxx index 01ae8fa37c..3416df3e69 100755 --- a/src/AIS/AIS_LengthDimension.hxx +++ b/src/AIS/AIS_LengthDimension.hxx @@ -181,18 +181,18 @@ public: const TopoDS_Shape& theSecondShape); //! @return the display units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE; //! @return the model units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE; - Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos); + Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE; - Standard_EXPORT virtual const gp_Pnt GetTextPosition() const; + Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE; public: @@ -201,18 +201,18 @@ public: protected: //! Checks if the plane includes first and second points to build dimension. - Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE; Standard_EXPORT virtual gp_Pln ComputePlane(const gp_Dir& theAttachDir) const; - Standard_EXPORT Standard_Real ComputeValue() const; + Standard_EXPORT Standard_Real ComputeValue() const Standard_OVERRIDE; Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); + const Standard_Integer theMode = 0) Standard_OVERRIDE; Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theEntityOwner); + const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE; protected: diff --git a/src/AIS/AIS_Line.hxx b/src/AIS/AIS_Line.hxx index 2d5726fe98..6f09b8520e 100644 --- a/src/AIS/AIS_Line.hxx +++ b/src/AIS/AIS_Line.hxx @@ -117,7 +117,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation); diff --git a/src/AIS/AIS_MidPointRelation.hxx b/src/AIS/AIS_MidPointRelation.hxx index b527d86dd8..545f15f500 100644 --- a/src/AIS/AIS_MidPointRelation.hxx +++ b/src/AIS/AIS_MidPointRelation.hxx @@ -81,7 +81,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeFaceFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first); diff --git a/src/AIS/AIS_ParallelRelation.hxx b/src/AIS/AIS_ParallelRelation.hxx index 9e36859a2b..f1a65f58cc 100644 --- a/src/AIS/AIS_ParallelRelation.hxx +++ b/src/AIS/AIS_ParallelRelation.hxx @@ -90,7 +90,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeTwoFacesParallel (const Handle(Prs3d_Presentation)& aPresentation); diff --git a/src/AIS/AIS_PerpendicularRelation.hxx b/src/AIS/AIS_PerpendicularRelation.hxx index d0271edf7e..e1b0b1f81d 100644 --- a/src/AIS/AIS_PerpendicularRelation.hxx +++ b/src/AIS/AIS_PerpendicularRelation.hxx @@ -85,7 +85,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeTwoFacesPerpendicular (const Handle(Prs3d_Presentation)& aPresentation); diff --git a/src/AIS/AIS_PlaneTrihedron.hxx b/src/AIS/AIS_PlaneTrihedron.hxx index a7182d55c7..8440f99be5 100644 --- a/src/AIS/AIS_PlaneTrihedron.hxx +++ b/src/AIS/AIS_PlaneTrihedron.hxx @@ -134,7 +134,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Handle(Geom_Plane) myPlane; Handle(AIS_InteractiveObject) myShapes[3]; diff --git a/src/AIS/AIS_Point.hxx b/src/AIS/AIS_Point.hxx index db56f97295..de86803338 100644 --- a/src/AIS/AIS_Point.hxx +++ b/src/AIS/AIS_Point.hxx @@ -116,7 +116,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void UpdatePointValues(); diff --git a/src/AIS/AIS_PointCloud.hxx b/src/AIS/AIS_PointCloud.hxx index fa38a5c093..c762880c64 100644 --- a/src/AIS/AIS_PointCloud.hxx +++ b/src/AIS/AIS_PointCloud.hxx @@ -87,33 +87,33 @@ public: public: //! Setup custom color. Affects presentation only when no per-point color attribute has been assigned. - Standard_EXPORT virtual void SetColor (const Quantity_NameOfColor theColor); + Standard_EXPORT virtual void SetColor (const Quantity_NameOfColor theColor) Standard_OVERRIDE; //! Setup custom color. Affects presentation only when no per-point color attribute has been assigned. - Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor); + Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE; //! Restore default color. - Standard_EXPORT virtual void UnsetColor(); + Standard_EXPORT virtual void UnsetColor() Standard_OVERRIDE; //! Setup custom material. Affects presentation only when normals are defined. - Standard_EXPORT virtual void SetMaterial (const Graphic3d_NameOfMaterial theMatName); + Standard_EXPORT virtual void SetMaterial (const Graphic3d_NameOfMaterial theMatName) Standard_OVERRIDE; //! Setup custom material. Affects presentation only when normals are defined. - Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theMat); + Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theMat) Standard_OVERRIDE; //! Restore default material. - Standard_EXPORT virtual void UnsetMaterial(); + Standard_EXPORT virtual void UnsetMaterial() Standard_OVERRIDE; protected: //! Prepare presentation for this object. Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; //! Prepare selection for this object. Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/AIS/AIS_RadiusDimension.hxx b/src/AIS/AIS_RadiusDimension.hxx index b484a0988a..8e97dbb8aa 100644 --- a/src/AIS/AIS_RadiusDimension.hxx +++ b/src/AIS/AIS_RadiusDimension.hxx @@ -103,18 +103,18 @@ public: Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Shape& theShape); //! @return the display units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE; //! @return the model units string. - Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE; - Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE; - Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos); + Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE; - Standard_EXPORT virtual const gp_Pnt GetTextPosition() const; + Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE; public: @@ -122,16 +122,16 @@ public: protected: - Standard_EXPORT virtual void ComputePlane(); + Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE; //! Checks if anchor point and the center of the circle are on the plane. - Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE; - Standard_EXPORT virtual Standard_Real ComputeValue() const; + Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); + const Standard_Integer theMode = 0) Standard_OVERRIDE; protected: diff --git a/src/AIS/AIS_SymmetricRelation.hxx b/src/AIS/AIS_SymmetricRelation.hxx index fd718bdba3..0bac468466 100644 --- a/src/AIS/AIS_SymmetricRelation.hxx +++ b/src/AIS/AIS_SymmetricRelation.hxx @@ -96,7 +96,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeTwoFacesSymmetric (const Handle(Prs3d_Presentation)& aprs); diff --git a/src/AIS/AIS_TangentRelation.hxx b/src/AIS/AIS_TangentRelation.hxx index 4b02478909..280c0d9dca 100644 --- a/src/AIS/AIS_TangentRelation.hxx +++ b/src/AIS/AIS_TangentRelation.hxx @@ -96,7 +96,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void ComputeTwoFacesTangent (const Handle(Prs3d_Presentation)& aPresentation); diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx index 7507914df4..34b7d44684 100644 --- a/src/AIS/AIS_TexturedShape.hxx +++ b/src/AIS/AIS_TexturedShape.hxx @@ -99,16 +99,16 @@ public: //! @name methods to alter texture mapping properties Standard_EXPORT void UpdateAttributes(); //! Sets the color. - Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor); + Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE; //! Removes settings for the color. - Standard_EXPORT virtual void UnsetColor(); + Standard_EXPORT virtual void UnsetColor() Standard_OVERRIDE; //! Sets the material aspect. - Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect); + Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE; //! Removes settings for material aspect. - Standard_EXPORT virtual void UnsetMaterial(); + Standard_EXPORT virtual void UnsetMaterial() Standard_OVERRIDE; //! Enables texture modulation Standard_EXPORT void EnableTextureModulate(); @@ -177,7 +177,7 @@ protected: //! @name overridden methods //! Compute presentation with texture mapping support. Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; Standard_EXPORT void updateAttributes (const Handle(Prs3d_Presentation)& thePrs); diff --git a/src/AIS/AIS_Trihedron.hxx b/src/AIS/AIS_Trihedron.hxx index 7cbe30c5eb..b89e105770 100644 --- a/src/AIS/AIS_Trihedron.hxx +++ b/src/AIS/AIS_Trihedron.hxx @@ -182,7 +182,7 @@ private: Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE; - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode); + Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; Standard_EXPORT void LoadSubObjects(); diff --git a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx index 52c8c414c7..6b54e28eed 100644 --- a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx +++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx @@ -42,15 +42,15 @@ public: Standard_EXPORT APIHeaderSection_EditHeader(); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/Adaptor2d/Adaptor2d_HLine2d.hxx b/src/Adaptor2d/Adaptor2d_HLine2d.hxx index ebe4cf544b..ed7aaf5dcd 100644 --- a/src/Adaptor2d/Adaptor2d_HLine2d.hxx +++ b/src/Adaptor2d/Adaptor2d_HLine2d.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. Adaptor2d_Line2d& ChangeCurve2d(); diff --git a/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx b/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx index e613cb8740..52e942ccd2 100644 --- a/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx +++ b/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. Adaptor2d_OffsetCurve& ChangeCurve2d(); diff --git a/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx b/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx index 474158af84..832a7016e0 100644 --- a/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx +++ b/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. Adaptor3d_CurveOnSurface& ChangeCurve(); diff --git a/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx b/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx index 7882705e9e..8d2cbc83e8 100644 --- a/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx +++ b/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. Adaptor3d_IsoCurve& ChangeCurve(); diff --git a/src/AppDef/AppDef_LinearCriteria.hxx b/src/AppDef/AppDef_LinearCriteria.hxx index 2163021f78..5868ea59db 100644 --- a/src/AppDef/AppDef_LinearCriteria.hxx +++ b/src/AppDef/AppDef_LinearCriteria.hxx @@ -50,38 +50,38 @@ public: Standard_EXPORT AppDef_LinearCriteria(const AppDef_MultiLine& SSP, const Standard_Integer FirstPoint, const Standard_Integer LastPoint); - Standard_EXPORT void SetParameters (const Handle(TColStd_HArray1OfReal)& Parameters); + Standard_EXPORT void SetParameters (const Handle(TColStd_HArray1OfReal)& Parameters) Standard_OVERRIDE; - Standard_EXPORT void SetCurve (const Handle(FEmTool_Curve)& C); + Standard_EXPORT void SetCurve (const Handle(FEmTool_Curve)& C) Standard_OVERRIDE; - Standard_EXPORT void GetCurve (Handle(FEmTool_Curve)& C) const; + Standard_EXPORT void GetCurve (Handle(FEmTool_Curve)& C) const Standard_OVERRIDE; - Standard_EXPORT void SetEstimation (const Standard_Real E1, const Standard_Real E2, const Standard_Real E3); + Standard_EXPORT void SetEstimation (const Standard_Real E1, const Standard_Real E2, const Standard_Real E3) Standard_OVERRIDE; - Standard_EXPORT Standard_Real& EstLength(); + Standard_EXPORT Standard_Real& EstLength() Standard_OVERRIDE; - Standard_EXPORT void GetEstimation (Standard_Real& E1, Standard_Real& E2, Standard_Real& E3) const; + Standard_EXPORT void GetEstimation (Standard_Real& E1, Standard_Real& E2, Standard_Real& E3) const Standard_OVERRIDE; - Standard_EXPORT Handle(FEmTool_HAssemblyTable) AssemblyTable() const; + Standard_EXPORT Handle(FEmTool_HAssemblyTable) AssemblyTable() const Standard_OVERRIDE; - Standard_EXPORT Handle(TColStd_HArray2OfInteger) DependenceTable() const; + Standard_EXPORT Handle(TColStd_HArray2OfInteger) DependenceTable() const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer QualityValues (const Standard_Real J1min, const Standard_Real J2min, const Standard_Real J3min, Standard_Real& J1, Standard_Real& J2, Standard_Real& J3); + Standard_EXPORT Standard_Integer QualityValues (const Standard_Real J1min, const Standard_Real J2min, const Standard_Real J3min, Standard_Real& J1, Standard_Real& J2, Standard_Real& J3) Standard_OVERRIDE; - Standard_EXPORT void ErrorValues (Standard_Real& MaxError, Standard_Real& QuadraticError, Standard_Real& AverageError); + Standard_EXPORT void ErrorValues (Standard_Real& MaxError, Standard_Real& QuadraticError, Standard_Real& AverageError) Standard_OVERRIDE; - Standard_EXPORT void Hessian (const Standard_Integer Element, const Standard_Integer Dimension1, const Standard_Integer Dimension2, math_Matrix& H); + Standard_EXPORT void Hessian (const Standard_Integer Element, const Standard_Integer Dimension1, const Standard_Integer Dimension2, math_Matrix& H) Standard_OVERRIDE; - Standard_EXPORT void Gradient (const Standard_Integer Element, const Standard_Integer Dimension, math_Vector& G); + Standard_EXPORT void Gradient (const Standard_Integer Element, const Standard_Integer Dimension, math_Vector& G) Standard_OVERRIDE; //! Convert the assembly Vector in an Curve; - Standard_EXPORT void InputVector (const math_Vector& X, const Handle(FEmTool_HAssemblyTable)& AssTable); + Standard_EXPORT void InputVector (const math_Vector& X, const Handle(FEmTool_HAssemblyTable)& AssTable) Standard_OVERRIDE; - Standard_EXPORT void SetWeight (const Standard_Real QuadraticWeight, const Standard_Real QualityWeight, const Standard_Real percentJ1, const Standard_Real percentJ2, const Standard_Real percentJ3); + Standard_EXPORT void SetWeight (const Standard_Real QuadraticWeight, const Standard_Real QualityWeight, const Standard_Real percentJ1, const Standard_Real percentJ2, const Standard_Real percentJ3) Standard_OVERRIDE; - Standard_EXPORT void GetWeight (Standard_Real& QuadraticWeight, Standard_Real& QualityWeight) const; + Standard_EXPORT void GetWeight (Standard_Real& QuadraticWeight, Standard_Real& QualityWeight) const Standard_OVERRIDE; - Standard_EXPORT void SetWeight (const TColStd_Array1OfReal& Weight); + Standard_EXPORT void SetWeight (const TColStd_Array1OfReal& Weight) Standard_OVERRIDE; diff --git a/src/AppStd/AppStd_Application.hxx b/src/AppStd/AppStd_Application.hxx index e78ad2442e..548384ba56 100644 --- a/src/AppStd/AppStd_Application.hxx +++ b/src/AppStd/AppStd_Application.hxx @@ -44,7 +44,7 @@ public: //! returns the file name which contains application //! resources - Standard_EXPORT Standard_CString ResourcesName(); + Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; diff --git a/src/AppStdL/AppStdL_Application.hxx b/src/AppStdL/AppStdL_Application.hxx index adea61dbae..a7ca50de80 100644 --- a/src/AppStdL/AppStdL_Application.hxx +++ b/src/AppStdL/AppStdL_Application.hxx @@ -44,7 +44,7 @@ public: //! returns the file name which contains application //! resources - Standard_EXPORT Standard_CString ResourcesName(); + Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; diff --git a/src/Aspect/Aspect_CircularGrid.hxx b/src/Aspect/Aspect_CircularGrid.hxx index ea8989716c..91cf9e76f4 100644 --- a/src/Aspect/Aspect_CircularGrid.hxx +++ b/src/Aspect/Aspect_CircularGrid.hxx @@ -53,7 +53,7 @@ public: Standard_EXPORT void SetGridValues (const Quantity_Length XOrigin, const Quantity_Length YOrigin, const Quantity_Length RadiusStep, const Standard_Integer DivisionNumber, const Quantity_PlaneAngle RotationAngle); //! returns the point of the grid the closest to the point X,Y - Standard_EXPORT void Compute (const Quantity_Length X, const Quantity_Length Y, Quantity_Length& gridX, Quantity_Length& gridY) const; + Standard_EXPORT void Compute (const Quantity_Length X, const Quantity_Length Y, Quantity_Length& gridX, Quantity_Length& gridY) const Standard_OVERRIDE; //! returns the x step of the grid. Standard_EXPORT Quantity_Length RadiusStep() const; diff --git a/src/Aspect/Aspect_RectangularGrid.hxx b/src/Aspect/Aspect_RectangularGrid.hxx index a9525193c4..3481b99af4 100644 --- a/src/Aspect/Aspect_RectangularGrid.hxx +++ b/src/Aspect/Aspect_RectangularGrid.hxx @@ -60,7 +60,7 @@ public: Standard_EXPORT void SetGridValues (const Quantity_Length XOrigin, const Quantity_Length YOrigin, const Quantity_Length XStep, const Quantity_Length YStep, const Quantity_PlaneAngle RotationAngle); //! returns the point of the grid the closest to the point X,Y - Standard_EXPORT void Compute (const Quantity_Length X, const Quantity_Length Y, Quantity_Length& gridX, Quantity_Length& gridY) const; + Standard_EXPORT void Compute (const Quantity_Length X, const Quantity_Length Y, Quantity_Length& gridX, Quantity_Length& gridY) const Standard_OVERRIDE; //! returns the x step of the grid. Standard_EXPORT Quantity_Length XStep() const; diff --git a/src/BOPAlgo/BOPAlgo_CellsBuilder.hxx b/src/BOPAlgo/BOPAlgo_CellsBuilder.hxx index 49c7f92639..375f0742b3 100644 --- a/src/BOPAlgo/BOPAlgo_CellsBuilder.hxx +++ b/src/BOPAlgo/BOPAlgo_CellsBuilder.hxx @@ -231,7 +231,7 @@ class BOPAlgo_CellsBuilder : public BOPAlgo_Builder //! Redefined method PerformInternal1 - makes all split parts, //! nullifies the result , and index all parts. - Standard_EXPORT virtual void PerformInternal1 (const BOPAlgo_PaveFiller& thePF); + Standard_EXPORT virtual void PerformInternal1 (const BOPAlgo_PaveFiller& thePF) Standard_OVERRIDE; //! Saves all split parts in myAllParts. Standard_EXPORT void TakeAllParts(); diff --git a/src/BRep/BRep_Curve3D.hxx b/src/BRep/BRep_Curve3D.hxx index 7105da4f99..84a725d672 100644 --- a/src/BRep/BRep_Curve3D.hxx +++ b/src/BRep/BRep_Curve3D.hxx @@ -42,7 +42,7 @@ public: Standard_EXPORT BRep_Curve3D(const Handle(Geom_Curve)& C, const TopLoc_Location& L); //! Computes the point at parameter U. - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Returns True. Standard_EXPORT virtual Standard_Boolean IsCurve3D() const Standard_OVERRIDE; @@ -52,7 +52,7 @@ public: Standard_EXPORT virtual void Curve3D (const Handle(Geom_Curve)& C) Standard_OVERRIDE; //! Return a copy of this representation. - Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const; + Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; diff --git a/src/BRep/BRep_CurveOn2Surfaces.hxx b/src/BRep/BRep_CurveOn2Surfaces.hxx index d70e2a0a9c..7f64f34959 100644 --- a/src/BRep/BRep_CurveOn2Surfaces.hxx +++ b/src/BRep/BRep_CurveOn2Surfaces.hxx @@ -64,7 +64,7 @@ public: Standard_EXPORT virtual void Continuity (const GeomAbs_Shape C) Standard_OVERRIDE; //! Return a copy of this representation. - Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const; + Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; diff --git a/src/BRep/BRep_CurveOnSurface.hxx b/src/BRep/BRep_CurveOnSurface.hxx index cb5e07f8d6..1f0e011170 100644 --- a/src/BRep/BRep_CurveOnSurface.hxx +++ b/src/BRep/BRep_CurveOnSurface.hxx @@ -50,7 +50,7 @@ public: void UVPoints (gp_Pnt2d& P1, gp_Pnt2d& P2) const; //! Computes the point at parameter U. - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Returns True. Standard_EXPORT virtual Standard_Boolean IsCurveOnSurface() const Standard_OVERRIDE; @@ -65,7 +65,7 @@ public: Standard_EXPORT virtual void PCurve (const Handle(Geom2d_Curve)& C) Standard_OVERRIDE; //! Return a copy of this representation. - Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const; + Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; //! Recomputes any derived data after a modification. //! This is called when the range is modified. diff --git a/src/BRep/BRep_Polygon3D.hxx b/src/BRep/BRep_Polygon3D.hxx index 743faa145c..c07359276e 100644 --- a/src/BRep/BRep_Polygon3D.hxx +++ b/src/BRep/BRep_Polygon3D.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT virtual void Polygon3D (const Handle(Poly_Polygon3D)& P) Standard_OVERRIDE; //! Return a copy of this representation. - Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const; + Standard_EXPORT Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; diff --git a/src/BRep/BRep_PolygonOnTriangulation.hxx b/src/BRep/BRep_PolygonOnTriangulation.hxx index f233f3adf6..fdfefce73b 100644 --- a/src/BRep/BRep_PolygonOnTriangulation.hxx +++ b/src/BRep/BRep_PolygonOnTriangulation.hxx @@ -56,7 +56,7 @@ public: Standard_EXPORT virtual const Handle(Poly_PolygonOnTriangulation)& PolygonOnTriangulation() const Standard_OVERRIDE; //! Return a copy of this representation. - Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const; + Standard_EXPORT virtual Handle(BRep_CurveRepresentation) Copy() const Standard_OVERRIDE; diff --git a/src/BRep/BRep_TEdge.hxx b/src/BRep/BRep_TEdge.hxx index 4b6d014870..93754d06a8 100644 --- a/src/BRep/BRep_TEdge.hxx +++ b/src/BRep/BRep_TEdge.hxx @@ -79,7 +79,7 @@ public: BRep_ListOfCurveRepresentation& ChangeCurves(); //! Returns a copy of the TShape with no sub-shapes. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/BRep/BRep_TVertex.hxx b/src/BRep/BRep_TVertex.hxx index 61ca8604e3..c729e64908 100644 --- a/src/BRep/BRep_TVertex.hxx +++ b/src/BRep/BRep_TVertex.hxx @@ -60,7 +60,7 @@ public: BRep_ListOfPointRepresentation& ChangePoints(); //! Returns a copy of the TShape with no sub-shapes. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx b/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx index b584ad49d0..1937c5a077 100644 --- a/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx +++ b/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. BRepAdaptor_CompCurve& ChangeCurve(); diff --git a/src/BRepAdaptor/BRepAdaptor_HCurve.hxx b/src/BRepAdaptor/BRepAdaptor_HCurve.hxx index a68c385393..c2a14db99c 100644 --- a/src/BRepAdaptor/BRepAdaptor_HCurve.hxx +++ b/src/BRepAdaptor/BRepAdaptor_HCurve.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. BRepAdaptor_Curve& ChangeCurve(); diff --git a/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx b/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx index 229a4b4755..65ea34cd21 100644 --- a/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx +++ b/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. BRepAdaptor_Curve2d& ChangeCurve2d(); diff --git a/src/BRepAdaptor/BRepAdaptor_HSurface.hxx b/src/BRepAdaptor/BRepAdaptor_HSurface.hxx index 604d8d4660..dc30043d26 100644 --- a/src/BRepAdaptor/BRepAdaptor_HSurface.hxx +++ b/src/BRepAdaptor/BRepAdaptor_HSurface.hxx @@ -50,7 +50,7 @@ public: //! Returns a reference to the Surface inside the HSurface. //! This is redefined from HSurface, cannot be inline. - Standard_EXPORT const Adaptor3d_Surface& Surface() const; + Standard_EXPORT const Adaptor3d_Surface& Surface() const Standard_OVERRIDE; //! Returns the surface used to create the GenHSurface. BRepAdaptor_Surface& ChangeSurface(); diff --git a/src/BRepBlend/BRepBlend_AppFunc.hxx b/src/BRepBlend/BRepBlend_AppFunc.hxx index a9f3407512..e137aab76a 100644 --- a/src/BRepBlend/BRepBlend_AppFunc.hxx +++ b/src/BRepBlend/BRepBlend_AppFunc.hxx @@ -43,9 +43,9 @@ public: Standard_EXPORT BRepBlend_AppFunc(Handle(BRepBlend_Line)& Line, Blend_Function& Func, const Standard_Real Tol3d, const Standard_Real Tol2d); - Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const; + Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const Standard_OVERRIDE; - Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const; + Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_AppFuncRst.hxx b/src/BRepBlend/BRepBlend_AppFuncRst.hxx index 9454960832..cdf3c7022a 100644 --- a/src/BRepBlend/BRepBlend_AppFuncRst.hxx +++ b/src/BRepBlend/BRepBlend_AppFuncRst.hxx @@ -42,9 +42,9 @@ public: Standard_EXPORT BRepBlend_AppFuncRst(Handle(BRepBlend_Line)& Line, Blend_SurfRstFunction& Func, const Standard_Real Tol3d, const Standard_Real Tol2d); - Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const; + Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const Standard_OVERRIDE; - Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const; + Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx b/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx index 1654e173fc..3cbe5fe3aa 100644 --- a/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx +++ b/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx @@ -42,9 +42,9 @@ public: Standard_EXPORT BRepBlend_AppFuncRstRst(Handle(BRepBlend_Line)& Line, Blend_RstRstFunction& Func, const Standard_Real Tol3d, const Standard_Real Tol2d); - Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const; + Standard_EXPORT void Point (const Blend_AppFunction& Func, const Standard_Real Param, const math_Vector& Sol, Blend_Point& Pnt) const Standard_OVERRIDE; - Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const; + Standard_EXPORT void Vec (math_Vector& Sol, const Blend_Point& Pnt) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_RstRstConstRad.hxx b/src/BRepBlend/BRepBlend_RstRstConstRad.hxx index 8832ff1df2..43c2388197 100644 --- a/src/BRepBlend/BRepBlend_RstRstConstRad.hxx +++ b/src/BRepBlend/BRepBlend_RstRstConstRad.hxx @@ -65,79 +65,79 @@ public: Standard_EXPORT BRepBlend_RstRstConstRad(const Handle(Adaptor3d_HSurface)& Surf1, const Handle(Adaptor2d_HCurve2d)& Rst1, const Handle(Adaptor3d_HSurface)& Surf2, const Handle(Adaptor2d_HCurve2d)& Rst2, const Handle(Adaptor3d_HCurve)& CGuide); //! Returns 2. - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; //! Returns 2. - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& SurfRef1, const Handle(Adaptor2d_HCurve2d)& RstRef1, const Handle(Adaptor3d_HSurface)& SurfRef2, const Handle(Adaptor2d_HCurve2d)& RstRef2); - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. Standard_EXPORT virtual Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst1() const; + Standard_EXPORT const gp_Pnt& PointOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst2() const; + Standard_EXPORT const gp_Pnt& PointOnRst2() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst1() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst1() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the curve on //! surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst2() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst2() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst1() const; + Standard_EXPORT Standard_Real ParameterOnRst1() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst2() const; + Standard_EXPORT Standard_Real ParameterOnRst2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst1() const; + Standard_EXPORT const gp_Vec& TangentOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst2() const; + Standard_EXPORT const gp_Vec& TangentOnRst2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst2() const Standard_OVERRIDE; //! Permet d ' implementer un critere de decrochage //! specifique a la fonction. - Standard_EXPORT Blend_DecrochStatus Decroch (const math_Vector& Sol, gp_Vec& NRst1, gp_Vec& TgRst1, gp_Vec& NRst2, gp_Vec& TgRst2) const; + Standard_EXPORT Blend_DecrochStatus Decroch (const math_Vector& Sol, gp_Vec& NRst1, gp_Vec& TgRst1, gp_Vec& NRst2, gp_Vec& TgRst2) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Real Radius, const Standard_Integer Choix); @@ -152,49 +152,49 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_RstRstEvolRad.hxx b/src/BRepBlend/BRepBlend_RstRstEvolRad.hxx index 6557dc0448..13c5810c1f 100644 --- a/src/BRepBlend/BRepBlend_RstRstEvolRad.hxx +++ b/src/BRepBlend/BRepBlend_RstRstEvolRad.hxx @@ -66,79 +66,79 @@ public: Standard_EXPORT BRepBlend_RstRstEvolRad(const Handle(Adaptor3d_HSurface)& Surf1, const Handle(Adaptor2d_HCurve2d)& Rst1, const Handle(Adaptor3d_HSurface)& Surf2, const Handle(Adaptor2d_HCurve2d)& Rst2, const Handle(Adaptor3d_HCurve)& CGuide, const Handle(Law_Function)& Evol); //! Returns 2. - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; //! Returns 2. - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& SurfRef1, const Handle(Adaptor2d_HCurve2d)& RstRef1, const Handle(Adaptor3d_HSurface)& SurfRef2, const Handle(Adaptor2d_HCurve2d)& RstRef2); - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. Standard_EXPORT virtual Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst1() const; + Standard_EXPORT const gp_Pnt& PointOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst2() const; + Standard_EXPORT const gp_Pnt& PointOnRst2() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst1() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst1() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the curve on //! surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst2() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst2() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst1() const; + Standard_EXPORT Standard_Real ParameterOnRst1() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst2() const; + Standard_EXPORT Standard_Real ParameterOnRst2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst1() const; + Standard_EXPORT const gp_Vec& TangentOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst2() const; + Standard_EXPORT const gp_Vec& TangentOnRst2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst2() const Standard_OVERRIDE; //! Enables implementation of a criterion of decrochage //! specific to the function. - Standard_EXPORT Blend_DecrochStatus Decroch (const math_Vector& Sol, gp_Vec& NRst1, gp_Vec& TgRst1, gp_Vec& NRst2, gp_Vec& TgRst2) const; + Standard_EXPORT Blend_DecrochStatus Decroch (const math_Vector& Sol, gp_Vec& NRst1, gp_Vec& TgRst1, gp_Vec& NRst2, gp_Vec& TgRst2) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Integer Choix); @@ -153,49 +153,49 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_SurfRstConstRad.hxx b/src/BRepBlend/BRepBlend_SurfRstConstRad.hxx index b134a074c8..64797d6d3c 100644 --- a/src/BRepBlend/BRepBlend_SurfRstConstRad.hxx +++ b/src/BRepBlend/BRepBlend_SurfRstConstRad.hxx @@ -64,78 +64,78 @@ public: Standard_EXPORT BRepBlend_SurfRstConstRad(const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_HSurface)& SurfRst, const Handle(Adaptor2d_HCurve2d)& Rst, const Handle(Adaptor3d_HCurve)& CGuide); //! Returns 3. - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; //! Returns 3. - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& SurfRef, const Handle(Adaptor2d_HCurve2d)& RstRef); - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. Standard_EXPORT virtual Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS() const; + Standard_EXPORT const gp_Pnt& PointOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst() const; + Standard_EXPORT const gp_Pnt& PointOnRst() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnS() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnS() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the curve on //! surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst() const; + Standard_EXPORT Standard_Real ParameterOnRst() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS() const; + Standard_EXPORT const gp_Vec& TangentOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst() const; + Standard_EXPORT const gp_Vec& TangentOnRst() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst() const Standard_OVERRIDE; //! Enables implementation of a criterion of decrochage //! specific to the function. //! Warning: Can be called without previous call of issolution //! but the values calculated can be senseless. - Standard_EXPORT Standard_Boolean Decroch (const math_Vector& Sol, gp_Vec& NS, gp_Vec& TgS) const; + Standard_EXPORT Standard_Boolean Decroch (const math_Vector& Sol, gp_Vec& NS, gp_Vec& TgS) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Real Radius, const Standard_Integer Choix); @@ -146,49 +146,49 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BRepBlend/BRepBlend_SurfRstEvolRad.hxx b/src/BRepBlend/BRepBlend_SurfRstEvolRad.hxx index 8b79708eba..67f3f2fa41 100644 --- a/src/BRepBlend/BRepBlend_SurfRstEvolRad.hxx +++ b/src/BRepBlend/BRepBlend_SurfRstEvolRad.hxx @@ -65,76 +65,76 @@ public: Standard_EXPORT BRepBlend_SurfRstEvolRad(const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_HSurface)& SurfRst, const Handle(Adaptor2d_HCurve2d)& Rst, const Handle(Adaptor3d_HCurve)& CGuide, const Handle(Law_Function)& Evol); //! Returns 3. - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; //! Returns 3. - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& SurfRef, const Handle(Adaptor2d_HCurve2d)& RstRef); - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. Standard_EXPORT virtual Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS() const; + Standard_EXPORT const gp_Pnt& PointOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnRst() const; + Standard_EXPORT const gp_Pnt& PointOnRst() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnS() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnS() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the curve on //! surface. - Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst() const; + Standard_EXPORT const gp_Pnt2d& Pnt2dOnRst() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnRst() const; + Standard_EXPORT Standard_Real ParameterOnRst() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS() const; + Standard_EXPORT const gp_Vec& TangentOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnRst() const; + Standard_EXPORT const gp_Vec& TangentOnRst() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnRst() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnRst() const Standard_OVERRIDE; //! Permet d ' implementer un critere de decrochage //! specifique a la fonction. - Standard_EXPORT Standard_Boolean Decroch (const math_Vector& Sol, gp_Vec& NS, gp_Vec& TgS) const; + Standard_EXPORT Standard_Boolean Decroch (const math_Vector& Sol, gp_Vec& NS, gp_Vec& TgS) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Integer Choix); @@ -145,49 +145,49 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx index 98a20defff..76eec33383 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx @@ -43,7 +43,7 @@ public: //! copies surface if requested Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, - Standard_Boolean& RevWires, Standard_Boolean& RevFace) + Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE { S = BRep_Tool::Surface(F,L); Tol = BRep_Tool::Tolerance(F); @@ -57,7 +57,7 @@ public: //! Returns true to indicate the need to copy triangulation; //! copies it if required - Standard_Boolean NewTriangulation(const TopoDS_Face& F, Handle(Poly_Triangulation)& T) + Standard_Boolean NewTriangulation(const TopoDS_Face& F, Handle(Poly_Triangulation)& T) Standard_OVERRIDE { if (!myCopyMesh) return Standard_False; @@ -76,7 +76,7 @@ public: //! Returns true to indicate the need to copy edge; //! copies curves if requested Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, - TopLoc_Location& L, Standard_Real& Tol) + TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE { Standard_Real f,l; C = BRep_Tool::Curve (E, L, f, l); @@ -90,7 +90,7 @@ public: //! Returns true to indicate the need to copy vertex Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, - Standard_Real& Tol) + Standard_Real& Tol) Standard_OVERRIDE { P = BRep_Tool::Pnt(V); Tol = BRep_Tool::Tolerance(V); @@ -104,7 +104,7 @@ public: const TopoDS_Edge& /*NewE*/, const TopoDS_Face& /*NewF*/, Handle(Geom2d_Curve)& C, - Standard_Real& Tol) + Standard_Real& Tol) Standard_OVERRIDE { Tol = BRep_Tool::Tolerance(E); Standard_Real f, l; @@ -118,7 +118,7 @@ public: //! Returns true to indicate the need to copy vertex Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, - Standard_Real& P, Standard_Real& Tol) + Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE { if (V.IsNull()) return Standard_False; // infinite edge may have Null vertex @@ -131,7 +131,7 @@ public: //! Returns the continuity of E between F1 and F2 GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge&, - const TopoDS_Face&, const TopoDS_Face&) + const TopoDS_Face&, const TopoDS_Face&) Standard_OVERRIDE { return BRep_Tool::Continuity (E, F1, F2); } diff --git a/src/BRepCheck/BRepCheck_Edge.hxx b/src/BRepCheck/BRepCheck_Edge.hxx index 2a4742ca6e..74eeeec3c5 100644 --- a/src/BRepCheck/BRepCheck_Edge.hxx +++ b/src/BRepCheck/BRepCheck_Edge.hxx @@ -42,11 +42,11 @@ public: Standard_EXPORT BRepCheck_Edge(const TopoDS_Edge& E); - Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape); + Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape) Standard_OVERRIDE; - Standard_EXPORT void Minimum(); + Standard_EXPORT void Minimum() Standard_OVERRIDE; - Standard_EXPORT void Blind(); + Standard_EXPORT void Blind() Standard_OVERRIDE; Standard_EXPORT Standard_Boolean GeometricControls() const; diff --git a/src/BRepCheck/BRepCheck_Face.hxx b/src/BRepCheck/BRepCheck_Face.hxx index b4adf28583..d6c9196822 100644 --- a/src/BRepCheck/BRepCheck_Face.hxx +++ b/src/BRepCheck/BRepCheck_Face.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BRepCheck_Face(const TopoDS_Face& F); - Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape); + Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape) Standard_OVERRIDE; - Standard_EXPORT void Minimum(); + Standard_EXPORT void Minimum() Standard_OVERRIDE; - Standard_EXPORT void Blind(); + Standard_EXPORT void Blind() Standard_OVERRIDE; Standard_EXPORT BRepCheck_Status IntersectWires (const Standard_Boolean Update = Standard_False); diff --git a/src/BRepCheck/BRepCheck_Shell.hxx b/src/BRepCheck/BRepCheck_Shell.hxx index aea6221489..eef7345f15 100644 --- a/src/BRepCheck/BRepCheck_Shell.hxx +++ b/src/BRepCheck/BRepCheck_Shell.hxx @@ -42,11 +42,11 @@ public: Standard_EXPORT BRepCheck_Shell(const TopoDS_Shell& S); - Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape); + Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape) Standard_OVERRIDE; - Standard_EXPORT void Minimum(); + Standard_EXPORT void Minimum() Standard_OVERRIDE; - Standard_EXPORT void Blind(); + Standard_EXPORT void Blind() Standard_OVERRIDE; //! Checks if the oriented faces of the shell give a //! closed shell. If the wire is closed, returns diff --git a/src/BRepCheck/BRepCheck_Vertex.hxx b/src/BRepCheck/BRepCheck_Vertex.hxx index c436386319..6400836330 100644 --- a/src/BRepCheck/BRepCheck_Vertex.hxx +++ b/src/BRepCheck/BRepCheck_Vertex.hxx @@ -38,11 +38,11 @@ public: Standard_EXPORT BRepCheck_Vertex(const TopoDS_Vertex& V); - Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape); + Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape) Standard_OVERRIDE; - Standard_EXPORT void Minimum(); + Standard_EXPORT void Minimum() Standard_OVERRIDE; - Standard_EXPORT void Blind(); + Standard_EXPORT void Blind() Standard_OVERRIDE; Standard_EXPORT Standard_Real Tolerance(); diff --git a/src/BRepCheck/BRepCheck_Wire.hxx b/src/BRepCheck/BRepCheck_Wire.hxx index ed1c394cab..19bcadbb53 100644 --- a/src/BRepCheck/BRepCheck_Wire.hxx +++ b/src/BRepCheck/BRepCheck_Wire.hxx @@ -45,14 +45,14 @@ public: //! if is a face, consequently checks //! SelfIntersect(), Closed(), Orientation() and //! Closed2d until faulty is found - Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape); + Standard_EXPORT void InContext (const TopoDS_Shape& ContextShape) Standard_OVERRIDE; //! checks that the wire is not empty and "connex". //! Called by constructor - Standard_EXPORT void Minimum(); + Standard_EXPORT void Minimum() Standard_OVERRIDE; //! Does nothing - Standard_EXPORT void Blind(); + Standard_EXPORT void Blind() Standard_OVERRIDE; //! Checks if the oriented edges of the wire give a //! closed wire. If the wire is closed, returns diff --git a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx index b63910dfa0..b60a22bf59 100644 --- a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx +++ b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx @@ -39,16 +39,16 @@ public: public: //! @name methods implementing BVH set interface //! Returns total number of triangles. - Standard_Integer Size() const; + Standard_Integer Size() const Standard_OVERRIDE; //! Returns AABB of the given triangle. - BVH_Box Box (const Standard_Integer theIndex) const; + BVH_Box Box (const Standard_Integer theIndex) const Standard_OVERRIDE; //! Returns centroid position along specified axis. - Standard_Real Center (const Standard_Integer theIndex, const Standard_Integer theAxis) const; + Standard_Real Center (const Standard_Integer theIndex, const Standard_Integer theAxis) const Standard_OVERRIDE; //! Swaps indices of two specified triangles. - void Swap (const Standard_Integer theIndex1, const Standard_Integer theIndex2); + void Swap (const Standard_Integer theIndex1, const Standard_Integer theIndex2) Standard_OVERRIDE; public: diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx index 75b74c1545..421c69aa7d 100644 --- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx +++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx @@ -58,7 +58,7 @@ public: //! Adds edge E to the table of edges used by this //! algorithm to build chamfers, where the parameters //! of the chamfer must be set after the - Standard_EXPORT void Add (const TopoDS_Edge& E); + Standard_EXPORT void Add (const TopoDS_Edge& E) Standard_OVERRIDE; //! Adds edge E to the table of edges used by this //! algorithm to build chamfers, where @@ -138,11 +138,11 @@ public: //! Use the SetDists function to reset this data. //! Warning //! Nothing is done if IC is outside the bounds of the table of contours. - Standard_EXPORT void ResetContour (const Standard_Integer IC); + Standard_EXPORT void ResetContour (const Standard_Integer IC) Standard_OVERRIDE; //! Returns the number of contours generated using the //! Add function in the internal data structure of this algorithm. - Standard_EXPORT Standard_Integer NbContours() const; + Standard_EXPORT Standard_Integer NbContours() const Standard_OVERRIDE; //! Returns the index of the contour in the internal data //! structure of this algorithm, which contains the edge E of the shape. @@ -150,13 +150,13 @@ public: //! Warning //! This index can change if a contour is removed from the //! internal data structure of this algorithm using the function Remove. - Standard_EXPORT Standard_Integer Contour (const TopoDS_Edge& E) const; + Standard_EXPORT Standard_Integer Contour (const TopoDS_Edge& E) const Standard_OVERRIDE; //! Returns the number of edges in the contour of index I in //! the internal data structure of this algorithm. //! Warning //! Returns 0 if I is outside the bounds of the table of contours. - Standard_EXPORT Standard_Integer NbEdges (const Standard_Integer I) const; + Standard_EXPORT Standard_Integer NbEdges (const Standard_Integer I) const Standard_OVERRIDE; //! Returns the edge of index J in the contour of index I in //! the internal data structure of this algorithm. @@ -164,32 +164,32 @@ public: //! Returns a null shape if: //! - I is outside the bounds of the table of contours, or //! - J is outside the bounds of the table of edges of the contour of index I. - Standard_EXPORT const TopoDS_Edge& Edge (const Standard_Integer I, const Standard_Integer J) const; + Standard_EXPORT const TopoDS_Edge& Edge (const Standard_Integer I, const Standard_Integer J) const Standard_OVERRIDE; //! Removes the contour in the internal data structure of //! this algorithm which contains the edge E of the shape. //! Warning //! Nothing is done if the edge E does not belong to the //! contour in the internal data structure of this algorithm. - Standard_EXPORT void Remove (const TopoDS_Edge& E); + Standard_EXPORT void Remove (const TopoDS_Edge& E) Standard_OVERRIDE; //! Returns the length of the contour of index IC in the //! internal data structure of this algorithm. //! Warning //! Returns -1. if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Real Length (const Standard_Integer IC) const; + Standard_EXPORT Standard_Real Length (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the first vertex of the contour of index IC //! in the internal data structure of this algorithm. //! Warning //! Returns a null shape if IC is outside the bounds of the table of contours. - Standard_EXPORT TopoDS_Vertex FirstVertex (const Standard_Integer IC) const; + Standard_EXPORT TopoDS_Vertex FirstVertex (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the last vertex of the contour of index IC //! in the internal data structure of this algorithm. //! Warning //! Returns a null shape if IC is outside the bounds of the table of contours. - Standard_EXPORT TopoDS_Vertex LastVertex (const Standard_Integer IC) const; + Standard_EXPORT TopoDS_Vertex LastVertex (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the curvilinear abscissa of the vertex V on the //! contour of index IC in the internal data structure of this algorithm. @@ -197,7 +197,7 @@ public: //! Returns -1. if: //! - IC is outside the bounds of the table of contours, or //! - V is not on the contour of index IC. - Standard_EXPORT Standard_Real Abscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const; + Standard_EXPORT Standard_Real Abscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const Standard_OVERRIDE; //! Returns the relative curvilinear abscissa (i.e. between 0 //! and 1) of the vertex V on the contour of index IC in the @@ -206,19 +206,19 @@ public: //! Returns -1. if: //! - IC is outside the bounds of the table of contours, or //! - V is not on the contour of index IC. - Standard_EXPORT Standard_Real RelativeAbscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const; + Standard_EXPORT Standard_Real RelativeAbscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const Standard_OVERRIDE; //! eturns true if the contour of index IC in the internal //! data structure of this algorithm is closed and tangential at the point of closure. //! Warning //! Returns false if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Boolean ClosedAndTangent (const Standard_Integer IC) const; + Standard_EXPORT Standard_Boolean ClosedAndTangent (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns true if the contour of index IC in the internal //! data structure of this algorithm is closed. //! Warning //! Returns false if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Boolean Closed (const Standard_Integer IC) const; + Standard_EXPORT Standard_Boolean Closed (const Standard_Integer IC) const Standard_OVERRIDE; //! Builds the chamfers on all the contours in the internal //! data structure of this algorithm and constructs the resulting shape. @@ -243,7 +243,7 @@ public: //! Reinitializes this algorithm, thus canceling the effects of the Build function. //! This function allows modifications to be made to the //! contours and chamfer parameters in order to rebuild the shape. - Standard_EXPORT void Reset(); + Standard_EXPORT void Reset() Standard_OVERRIDE; //! Returns the internal filleting algorithm. Standard_EXPORT Handle(TopOpeBRepBuild_HBuilder) Builder() const; @@ -258,11 +258,11 @@ public: Standard_EXPORT virtual Standard_Boolean IsDeleted (const TopoDS_Shape& F) Standard_OVERRIDE; - Standard_EXPORT void Simulate (const Standard_Integer IC); + Standard_EXPORT void Simulate (const Standard_Integer IC) Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbSurf (const Standard_Integer IC) const; + Standard_EXPORT Standard_Integer NbSurf (const Standard_Integer IC) const Standard_OVERRIDE; - Standard_EXPORT Handle(ChFiDS_SecHArray1) Sect (const Standard_Integer IC, const Standard_Integer IS) const; + Standard_EXPORT Handle(ChFiDS_SecHArray1) Sect (const Standard_Integer IC, const Standard_Integer IS) const Standard_OVERRIDE; diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx index 331250adb7..8c22d8a09c 100644 --- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx +++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx @@ -79,7 +79,7 @@ public: //! Adds a fillet contour in the builder (builds a //! contour of tangent edges). //! The Radius must be set after. - Standard_EXPORT void Add (const TopoDS_Edge& E); + Standard_EXPORT void Add (const TopoDS_Edge& E) Standard_OVERRIDE; //! Adds a fillet description in the builder //! - builds a contour of tangent edges, @@ -144,7 +144,7 @@ public: //! Use the SetRadius function to reset this data. //! Warning //! Nothing is done if IC is outside the bounds of the table of contours. - Standard_EXPORT void ResetContour (const Standard_Integer IC); + Standard_EXPORT void ResetContour (const Standard_Integer IC) Standard_OVERRIDE; //! Returns true if the radius of the fillet along the contour of index IC //! in the internal data structure of this algorithm is constant, @@ -196,7 +196,7 @@ public: //! Returns the number of contours generated using the //! Add function in the internal data structure of this algorithm. - Standard_EXPORT Standard_Integer NbContours() const; + Standard_EXPORT Standard_Integer NbContours() const Standard_OVERRIDE; //! Returns the index of the contour in the internal data //! structure of this algorithm which contains the edge E of the shape. @@ -204,13 +204,13 @@ public: //! Warning //! This index can change if a contour is removed from the //! internal data structure of this algorithm using the function Remove. - Standard_EXPORT Standard_Integer Contour (const TopoDS_Edge& E) const; + Standard_EXPORT Standard_Integer Contour (const TopoDS_Edge& E) const Standard_OVERRIDE; //! Returns the number of edges in the contour of index I in //! the internal data structure of this algorithm. //! Warning //! Returns 0 if I is outside the bounds of the table of contours. - Standard_EXPORT Standard_Integer NbEdges (const Standard_Integer I) const; + Standard_EXPORT Standard_Integer NbEdges (const Standard_Integer I) const Standard_OVERRIDE; //! Returns the edge of index J in the contour of index I in //! the internal data structure of this algorithm. @@ -218,32 +218,32 @@ public: //! Returns a null shape if: //! - I is outside the bounds of the table of contours, or //! - J is outside the bounds of the table of edges of the index I contour. - Standard_EXPORT const TopoDS_Edge& Edge (const Standard_Integer I, const Standard_Integer J) const; + Standard_EXPORT const TopoDS_Edge& Edge (const Standard_Integer I, const Standard_Integer J) const Standard_OVERRIDE; //! Removes the contour in the internal data structure of //! this algorithm which contains the edge E of the shape. //! Warning //! Nothing is done if the edge E does not belong to the //! contour in the internal data structure of this algorithm. - Standard_EXPORT void Remove (const TopoDS_Edge& E); + Standard_EXPORT void Remove (const TopoDS_Edge& E) Standard_OVERRIDE; //! Returns the length of the contour of index IC in the //! internal data structure of this algorithm. //! Warning //! Returns -1. if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Real Length (const Standard_Integer IC) const; + Standard_EXPORT Standard_Real Length (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the first vertex of the contour of index IC //! in the internal data structure of this algorithm. //! Warning //! Returns a null shape if IC is outside the bounds of the table of contours. - Standard_EXPORT TopoDS_Vertex FirstVertex (const Standard_Integer IC) const; + Standard_EXPORT TopoDS_Vertex FirstVertex (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the last vertex of the contour of index IC //! in the internal data structure of this algorithm. //! Warning //! Returns a null shape if IC is outside the bounds of the table of contours. - Standard_EXPORT TopoDS_Vertex LastVertex (const Standard_Integer IC) const; + Standard_EXPORT TopoDS_Vertex LastVertex (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns the curvilinear abscissa of the vertex V on the //! contour of index IC in the internal data structure of this algorithm. @@ -251,7 +251,7 @@ public: //! Returns -1. if: //! - IC is outside the bounds of the table of contours, or //! - V is not on the contour of index IC. - Standard_EXPORT Standard_Real Abscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const; + Standard_EXPORT Standard_Real Abscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const Standard_OVERRIDE; //! Returns the relative curvilinear abscissa (i.e. between 0 //! and 1) of the vertex V on the contour of index IC in the @@ -260,20 +260,20 @@ public: //! Returns -1. if: //! - IC is outside the bounds of the table of contours, or //! - V is not on the contour of index IC. - Standard_EXPORT Standard_Real RelativeAbscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const; + Standard_EXPORT Standard_Real RelativeAbscissa (const Standard_Integer IC, const TopoDS_Vertex& V) const Standard_OVERRIDE; //! Returns true if the contour of index IC in the internal //! data structure of this algorithm is closed and tangential //! at the point of closure. //! Warning //! Returns false if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Boolean ClosedAndTangent (const Standard_Integer IC) const; + Standard_EXPORT Standard_Boolean ClosedAndTangent (const Standard_Integer IC) const Standard_OVERRIDE; //! Returns true if the contour of index IC in the internal //! data structure of this algorithm is closed. //! Warning //! Returns false if IC is outside the bounds of the table of contours. - Standard_EXPORT Standard_Boolean Closed (const Standard_Integer IC) const; + Standard_EXPORT Standard_Boolean Closed (const Standard_Integer IC) const Standard_OVERRIDE; //! Builds the fillets on all the contours in the internal data //! structure of this algorithm and constructs the resulting shape. @@ -298,7 +298,7 @@ public: //! Reinitializes this algorithm, thus canceling the effects of the Build function. //! This function allows modifications to be made to the //! contours and fillet parameters in order to rebuild the shape. - Standard_EXPORT void Reset(); + Standard_EXPORT void Reset() Standard_OVERRIDE; //! Returns the internal topology building algorithm. Standard_EXPORT Handle(TopOpeBRepBuild_HBuilder) Builder() const; @@ -320,11 +320,11 @@ public: //! Return the faces created for surface . Standard_EXPORT const TopTools_ListOfShape& NewFaces (const Standard_Integer I); - Standard_EXPORT void Simulate (const Standard_Integer IC); + Standard_EXPORT void Simulate (const Standard_Integer IC) Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbSurf (const Standard_Integer IC) const; + Standard_EXPORT Standard_Integer NbSurf (const Standard_Integer IC) const Standard_OVERRIDE; - Standard_EXPORT Handle(ChFiDS_SecHArray1) Sect (const Standard_Integer IC, const Standard_Integer IS) const; + Standard_EXPORT Handle(ChFiDS_SecHArray1) Sect (const Standard_Integer IC, const Standard_Integer IS) const Standard_OVERRIDE; //! Returns the number of contours where the computation //! of the fillet failed diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx index 432e075516..f37ba8af9c 100644 --- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx +++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx @@ -47,7 +47,7 @@ public: const TopLoc_Location& theLocation); //! Returns number of dicretization points. - virtual Standard_Integer NbPoints() const + virtual Standard_Integer NbPoints() const Standard_OVERRIDE { return myIndices.Length(); } @@ -60,7 +60,7 @@ public: virtual void Value(const Standard_Integer theIndex, Standard_Real& theParameter, gp_Pnt& thePoint, - gp_Pnt2d& theUV); + gp_Pnt2d& theUV) Standard_OVERRIDE; DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool) diff --git a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx index cd64a38b1f..0ef64ac96a 100644 --- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx +++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx @@ -48,7 +48,7 @@ public: const Standard_Real theMinSize); //! Returns number of dicretization points. - virtual Standard_Integer NbPoints() const + virtual Standard_Integer NbPoints() const Standard_OVERRIDE { return myTool->NbPoints(); } @@ -61,7 +61,7 @@ public: virtual void Value(const Standard_Integer theIndex, Standard_Real& theParameter, gp_Pnt& thePoint, - gp_Pnt2d& theUV); + gp_Pnt2d& theUV) Standard_OVERRIDE; DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool) diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx index cd6a9a5554..897794e4cf 100644 --- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx +++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx @@ -67,7 +67,7 @@ public: //! @name mesher API const BRepMesh_FastDiscret::Parameters& theParameters); //! Performs meshing ot the shape. - Standard_EXPORT virtual void Perform(); + Standard_EXPORT virtual void Perform() Standard_OVERRIDE; public: //! @name accessing to parameters. @@ -121,7 +121,7 @@ public: //! @name plugin API protected: - Standard_EXPORT virtual void init(); + Standard_EXPORT virtual void init() Standard_OVERRIDE; private: diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx index bfdc02fbfb..c9aaa43067 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx @@ -74,10 +74,10 @@ public: Standard_EXPORT virtual void Build() Standard_OVERRIDE; //! Returns the TopoDS Shape of the bottom of the prism. - Standard_EXPORT TopoDS_Shape FirstShape(); + Standard_EXPORT TopoDS_Shape FirstShape() Standard_OVERRIDE; //! Returns the TopoDS Shape of the top of the prism. - Standard_EXPORT TopoDS_Shape LastShape(); + Standard_EXPORT TopoDS_Shape LastShape() Standard_OVERRIDE; Standard_EXPORT TopoDS_Shape Generated (const TopoDS_Shape& SSpine, const TopoDS_Shape& SProfile); diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx index f2fee3f30c..70f47a9989 100644 --- a/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx +++ b/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx @@ -75,7 +75,7 @@ public: Standard_EXPORT virtual void Build() Standard_OVERRIDE; //! Returns the TopoDS Shape of the bottom of the prism. - Standard_EXPORT TopoDS_Shape FirstShape(); + Standard_EXPORT TopoDS_Shape FirstShape() Standard_OVERRIDE; //! Returns the TopoDS Shape of the top of the prism. //! In the case of a finite prism, FirstShape returns the @@ -83,7 +83,7 @@ public: //! otherwise, the copy of S belonging to the prism. //! LastShape returns the copy of S translated by V at the //! time of construction. - Standard_EXPORT TopoDS_Shape LastShape(); + Standard_EXPORT TopoDS_Shape LastShape() Standard_OVERRIDE; //! Returns ListOfShape from TopTools. Standard_EXPORT virtual const TopTools_ListOfShape& Generated (const TopoDS_Shape& S) Standard_OVERRIDE; diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx index 70155ea183..e6b5436c6e 100644 --- a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx +++ b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx @@ -85,10 +85,10 @@ public: //! Returns the first shape of the revol (coinciding with //! the generating shape). - Standard_EXPORT TopoDS_Shape FirstShape(); + Standard_EXPORT TopoDS_Shape FirstShape() Standard_OVERRIDE; //! Returns the TopoDS Shape of the end of the revol. - Standard_EXPORT TopoDS_Shape LastShape(); + Standard_EXPORT TopoDS_Shape LastShape() Standard_OVERRIDE; Standard_EXPORT virtual const TopTools_ListOfShape& Generated (const TopoDS_Shape& S) Standard_OVERRIDE; diff --git a/src/BRepSweep/BRepSweep_Rotation.hxx b/src/BRepSweep/BRepSweep_Rotation.hxx index ee2754f78a..58b4b6451d 100644 --- a/src/BRepSweep/BRepSweep_Rotation.hxx +++ b/src/BRepSweep/BRepSweep_Rotation.hxx @@ -49,75 +49,75 @@ public: //! Builds the vertex addressed by [aGenV,aDirV], with its //! geometric part, but without subcomponents. - Standard_EXPORT TopoDS_Shape MakeEmptyVertex (const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV); + Standard_EXPORT TopoDS_Shape MakeEmptyVertex (const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV) Standard_OVERRIDE; //! Builds the edge addressed by [aGenV,aDirE], with its //! geometric part, but without subcomponents. - Standard_EXPORT TopoDS_Shape MakeEmptyDirectingEdge (const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE); + Standard_EXPORT TopoDS_Shape MakeEmptyDirectingEdge (const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE) Standard_OVERRIDE; //! Builds the edge addressed by [aGenE,aDirV], with its //! geometric part, but without subcomponents. - Standard_EXPORT TopoDS_Shape MakeEmptyGeneratingEdge (const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirV); + Standard_EXPORT TopoDS_Shape MakeEmptyGeneratingEdge (const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirV) Standard_OVERRIDE; //! Sets the parameters of the new vertex on the new //! face. The new face and new vertex where generated //! from aGenF, aGenV and aDirV . - Standard_EXPORT void SetParameters (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenF, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV); + Standard_EXPORT void SetParameters (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenF, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV) Standard_OVERRIDE; //! Sets the parameter of the new vertex on the new //! edge. The new edge and new vertex where generated //! from aGenV aDirE, and aDirV. - Standard_EXPORT void SetDirectingParameter (const TopoDS_Shape& aNewEdge, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE, const Sweep_NumShape& aDirV); + Standard_EXPORT void SetDirectingParameter (const TopoDS_Shape& aNewEdge, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE, const Sweep_NumShape& aDirV) Standard_OVERRIDE; //! Sets the parameter of the new vertex on the new //! edge. The new edge and new vertex where generated //! from aGenE, aGenV and aDirV . - Standard_EXPORT void SetGeneratingParameter (const TopoDS_Shape& aNewEdge, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenE, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV); + Standard_EXPORT void SetGeneratingParameter (const TopoDS_Shape& aNewEdge, TopoDS_Shape& aNewVertex, const TopoDS_Shape& aGenE, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirV) Standard_OVERRIDE; //! Builds the face addressed by [aGenS,aDirS], with //! its geometric part, but without subcomponents. The //! couple aGenS, aDirS can be a "generating face and //! a directing vertex" or "a generating edge and a //! directing edge". - Standard_EXPORT TopoDS_Shape MakeEmptyFace (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS); + Standard_EXPORT TopoDS_Shape MakeEmptyFace (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS) Standard_OVERRIDE; //! Sets the PCurve for a new edge on a new face. The //! new edge and the new face were generated using //! aGenF, aGenE and aDirV. - Standard_EXPORT void SetPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenF, const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirV, const TopAbs_Orientation orien); + Standard_EXPORT void SetPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenF, const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirV, const TopAbs_Orientation orien) Standard_OVERRIDE; //! Sets the PCurve for a new edge on a new face. The //! new edge and the new face were generated using //! aGenE, aDirE and aDirV. - Standard_EXPORT void SetGeneratingPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirE, const Sweep_NumShape& aDirV, const TopAbs_Orientation orien); + Standard_EXPORT void SetGeneratingPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenE, const Sweep_NumShape& aDirE, const Sweep_NumShape& aDirV, const TopAbs_Orientation orien) Standard_OVERRIDE; //! Sets the PCurve for a new edge on a new face. The //! new edge and the new face were generated using //! aGenE, aDirE and aGenV. - Standard_EXPORT void SetDirectingPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenE, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE, const TopAbs_Orientation orien); + Standard_EXPORT void SetDirectingPCurve (const TopoDS_Shape& aNewFace, TopoDS_Shape& aNewEdge, const TopoDS_Shape& aGenE, const TopoDS_Shape& aGenV, const Sweep_NumShape& aDirE, const TopAbs_Orientation orien) Standard_OVERRIDE; //! Returns the Orientation of the shell in the solid //! generated by the face aGenS with the edge aDirS. //! It is REVERSED if the surface is swept in the //! direction of the normal. - Standard_EXPORT TopAbs_Orientation DirectSolid (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS); + Standard_EXPORT TopAbs_Orientation DirectSolid (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS) Standard_OVERRIDE; //! Returns true if aNewSubShape (addressed by //! aSubGenS and aDirS) must be added in aNewShape //! (addressed by aGenS and aDirS). - Standard_EXPORT Standard_Boolean GGDShapeIsToAdd (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const TopoDS_Shape& aSubGenS, const Sweep_NumShape& aDirS) const; + Standard_EXPORT Standard_Boolean GGDShapeIsToAdd (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const TopoDS_Shape& aSubGenS, const Sweep_NumShape& aDirS) const Standard_OVERRIDE; //! Returns true if aNewSubShape (addressed by //! aGenS and aSubDirS) must be added in aNewShape //! (addressed by aGenS and aDirS). - Standard_EXPORT Standard_Boolean GDDShapeIsToAdd (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS, const Sweep_NumShape& aSubDirS) const; + Standard_EXPORT Standard_Boolean GDDShapeIsToAdd (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS, const Sweep_NumShape& aSubDirS) const Standard_OVERRIDE; //! In some particular cases the topology of a //! generated face must be composed of independant //! closed wires, in this case this function returns //! true. The only case in whitch the function may //! return true is a planar face in a closed revol. - Standard_EXPORT Standard_Boolean SeparatedWires (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const TopoDS_Shape& aSubGenS, const Sweep_NumShape& aDirS) const; + Standard_EXPORT Standard_Boolean SeparatedWires (const TopoDS_Shape& aNewShape, const TopoDS_Shape& aNewSubShape, const TopoDS_Shape& aGenS, const TopoDS_Shape& aSubGenS, const Sweep_NumShape& aDirS) const Standard_OVERRIDE; //! In some particular cases the topology of a //! generated Shell must be composed of independant @@ -129,11 +129,11 @@ public: //! resulting Shape. In some specific cases the shape //! can be geometrically inexsistant, then this //! function returns false. - Standard_EXPORT Standard_Boolean HasShape (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS) const; + Standard_EXPORT Standard_Boolean HasShape (const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS) const Standard_OVERRIDE; //! Returns true when the geometry of aGenS is not //! modified by the rotation. - Standard_EXPORT Standard_Boolean IsInvariant (const TopoDS_Shape& aGenS) const; + Standard_EXPORT Standard_Boolean IsInvariant (const TopoDS_Shape& aGenS) const Standard_OVERRIDE; //! returns the axis Standard_EXPORT gp_Ax1 Axe() const; diff --git a/src/BRepTools/BRepTools_GTrsfModification.hxx b/src/BRepTools/BRepTools_GTrsfModification.hxx index fe2576e78f..869c570164 100644 --- a/src/BRepTools/BRepTools_GTrsfModification.hxx +++ b/src/BRepTools/BRepTools_GTrsfModification.hxx @@ -64,7 +64,7 @@ public: //! face changes in the shells which contain it. -- //! Here, will return Standard_True if the //! -- gp_Trsf is negative. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -72,14 +72,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -87,14 +87,14 @@ public: //! new location, the new tolerance. //! Otherwise, returns Standard_False, and , , //! are not significant. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -102,7 +102,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.hxx b/src/BRepTools/BRepTools_NurbsConvertModification.hxx index 35962ac5f4..1e7c0aa34a 100644 --- a/src/BRepTools/BRepTools_NurbsConvertModification.hxx +++ b/src/BRepTools/BRepTools_NurbsConvertModification.hxx @@ -62,7 +62,7 @@ public: //! face changes in the shells which contain it. -- //! Here, will return Standard_True if the //! -- gp_Trsf is negative. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -70,14 +70,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -85,14 +85,14 @@ public: //! new location, the new tolerance. //! Otherwise, returns Standard_False, and , , //! are not significant. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -100,7 +100,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; Standard_EXPORT const TopTools_ListOfShape& GetUpdatedEdges() const; diff --git a/src/BRepTools/BRepTools_TrsfModification.hxx b/src/BRepTools/BRepTools_TrsfModification.hxx index 8e2ced4fb6..4139611bf3 100644 --- a/src/BRepTools/BRepTools_TrsfModification.hxx +++ b/src/BRepTools/BRepTools_TrsfModification.hxx @@ -65,7 +65,7 @@ public: //! modified face changes in the shells which contain it. //! For this class, RevFace returns true if the gp_Trsf //! associated with this modification is negative. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns true if the edge E has been modified. //! If the edge has been modified: @@ -74,7 +74,7 @@ public: //! - Tol is the new tolerance. //! If the edge has not been modified, this function //! returns false, and the values of C, L and Tol are not significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns true if the vertex V has been modified. //! If the vertex has been modified: @@ -82,7 +82,7 @@ public: //! - Tol is the new tolerance. //! If the vertex has not been modified this function //! returns false, and the values of P and Tol are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns true if the edge E has a new curve on surface on the face F. //! If a new curve exists: @@ -91,7 +91,7 @@ public: //! - Tol the new tolerance. //! If no new curve exists, this function returns false, and //! the values of C, L and Tol are not significant. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns true if the Vertex V has a new parameter on the edge E. //! If a new parameter exists: @@ -99,7 +99,7 @@ public: //! - Tol is the new tolerance. //! If no new parameter exists, this function returns false, //! and the values of P and Tol are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -107,7 +107,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/BiTgte/BiTgte_HCurveOnEdge.hxx b/src/BiTgte/BiTgte_HCurveOnEdge.hxx index 3a342d7456..82ae24b1b0 100644 --- a/src/BiTgte/BiTgte_HCurveOnEdge.hxx +++ b/src/BiTgte/BiTgte_HCurveOnEdge.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. BiTgte_CurveOnEdge& ChangeCurve(); diff --git a/src/BiTgte/BiTgte_HCurveOnVertex.hxx b/src/BiTgte/BiTgte_HCurveOnVertex.hxx index dd11d7f813..f5fa4585bd 100644 --- a/src/BiTgte/BiTgte_HCurveOnVertex.hxx +++ b/src/BiTgte/BiTgte_HCurveOnVertex.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. BiTgte_CurveOnVertex& ChangeCurve(); diff --git a/src/BinMDF/BinMDF_TagSourceDriver.hxx b/src/BinMDF/BinMDF_TagSourceDriver.hxx index 70dac2de61..822ed70cc4 100644 --- a/src/BinMDF/BinMDF_TagSourceDriver.hxx +++ b/src/BinMDF/BinMDF_TagSourceDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDF_TagSourceDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx index 99ce7f0707..67d5a98968 100644 --- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx @@ -40,13 +40,13 @@ public: Standard_EXPORT BinMDataStd_AsciiStringDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! persistent -> transient (retrieve) - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; //! transient -> persistent (store) - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx b/src/BinMDataStd/BinMDataStd_CommentDriver.hxx index 4c89d484e5..3d3ed351fa 100644 --- a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_CommentDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_CommentDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx b/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx index 941c2a3aec..f28f6e81be 100644 --- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_ExpressionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx index be5eeb4591..9aac74d792 100644 --- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx @@ -40,13 +40,13 @@ public: Standard_EXPORT BinMDataStd_IntPackedMapDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! persistent -> transient (retrieve) - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; //! transient -> persistent (store) - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.hxx b/src/BinMDataStd/BinMDataStd_NameDriver.hxx index 23c35f4599..9ce675f988 100644 --- a/src/BinMDataStd/BinMDataStd_NameDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_NameDriver.hxx @@ -40,13 +40,13 @@ public: Standard_EXPORT BinMDataStd_NameDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! persistent -> transient (retrieve) - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; //! transient -> persistent (store) - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx b/src/BinMDataStd/BinMDataStd_RelationDriver.hxx index 20cc1d6a93..4021bcf09c 100644 --- a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_RelationDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_RelationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx index 6a4832d8fd..65d1ca57fd 100644 --- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_TreeNodeDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx b/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx index 7a36b321be..4d3bb6d660 100644 --- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_UAttributeDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx b/src/BinMDataStd/BinMDataStd_VariableDriver.hxx index 6e66825f3a..e9f3bfe705 100644 --- a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx +++ b/src/BinMDataStd/BinMDataStd_VariableDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataStd_VariableDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx index 69876664f3..f9d0aea73c 100644 --- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx +++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataXtd_ConstraintDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx index e008899c4a..ef2a317779 100644 --- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx +++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataXtd_GeometryDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx index c62d57041b..b188ee411c 100644 --- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx +++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMDataXtd_PatternStdDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx index cd9bfa020f..531cc366eb 100644 --- a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx +++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx @@ -45,11 +45,11 @@ public: Standard_EXPORT BinMNaming_NamedShapeDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; //! Input the shapes from Bin Document file Standard_EXPORT void ReadShapeSection (Standard_IStream& theIS); diff --git a/src/BinMNaming/BinMNaming_NamingDriver.hxx b/src/BinMNaming/BinMNaming_NamingDriver.hxx index 61568c1781..5ad53ed0b8 100644 --- a/src/BinMNaming/BinMNaming_NamingDriver.hxx +++ b/src/BinMNaming/BinMNaming_NamingDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMNaming_NamingDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx index 095a99d101..c245d21be7 100644 --- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx +++ b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMPrsStd_AISPresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx b/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx index c527f3dae9..47d0340b1e 100644 --- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx +++ b/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT BinMPrsStd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const; + Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx index d9e318a5d7..b1b4162ec5 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx @@ -36,7 +36,7 @@ class BinTObjDrivers_DocumentRetrievalDriver : // Constructor Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers - (const Handle(CDM_MessageDriver)& theMsgDriver); + (const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE; public: // Declaration of CASCADE RTTI diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx index 29d0c04e8a..9f999bcc1d 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx @@ -36,7 +36,7 @@ class BinTObjDrivers_DocumentStorageDriver : // Constructor Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers - (const Handle(CDM_MessageDriver)& theMsgDriver); + (const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE; public: // Declaration of CASCADE RTTI diff --git a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx index 2fa97953e1..35a783a099 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx @@ -30,20 +30,20 @@ class BinTObjDrivers_IntSparseArrayDriver : public BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMessageDriver); // constructor - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; // Creates a new attribute Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& theSource, const Handle(TDF_Attribute)& theTarget, - BinObjMgt_RRelocationTable& theRelocTable) const; + BinObjMgt_RRelocationTable& theRelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into Standard_EXPORT void Paste (const Handle(TDF_Attribute)& theSource, BinObjMgt_Persistent& theTarget, - BinObjMgt_SRelocationTable& theRelocTable) const; + BinObjMgt_SRelocationTable& theRelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into diff --git a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx index a187de8627..8c7b3f4a94 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx @@ -30,13 +30,13 @@ class BinTObjDrivers_ModelDriver : public BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMessageDriver); // constructor - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; // Creates a new attribute Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, - BinObjMgt_RRelocationTable& RelocTable) const; + BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. @@ -46,7 +46,7 @@ class BinTObjDrivers_ModelDriver : public BinMDF_ADriver Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, - BinObjMgt_SRelocationTable& RelocTable) const; + BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. diff --git a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx index 0969b3f756..b2431891fb 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx @@ -31,13 +31,13 @@ class BinTObjDrivers_ObjectDriver : public BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMessageDriver); // constructor - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; // Creates a new attribute Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, - BinObjMgt_RRelocationTable& RelocTable) const; + BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. @@ -47,7 +47,7 @@ class BinTObjDrivers_ObjectDriver : public BinMDF_ADriver Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, - BinObjMgt_SRelocationTable& RelocTable) const; + BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. diff --git a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx index 458843dfc8..dd0c5f8eab 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx @@ -31,13 +31,13 @@ class BinTObjDrivers_ReferenceDriver : public BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMessageDriver); // constructor - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; // Creates a new attribute Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& Source, const Handle(TDF_Attribute)& Target, - BinObjMgt_RRelocationTable& RelocTable) const; + BinObjMgt_RRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. @@ -45,7 +45,7 @@ class BinTObjDrivers_ReferenceDriver : public BinMDF_ADriver Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Source, BinObjMgt_Persistent& Target, - BinObjMgt_SRelocationTable& RelocTable) const; + BinObjMgt_SRelocationTable& RelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into , using the relocation table // to keep the sharings. diff --git a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx index a98ad49736..794097a5fd 100644 --- a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx +++ b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx @@ -31,20 +31,20 @@ class BinTObjDrivers_XYZDriver : public BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMessageDriver); // constructor - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; // Creates a new attribute Standard_EXPORT Standard_Boolean Paste (const BinObjMgt_Persistent& theSource, const Handle(TDF_Attribute)& theTarget, - BinObjMgt_RRelocationTable& theRelocTable) const; + BinObjMgt_RRelocationTable& theRelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into Standard_EXPORT void Paste (const Handle(TDF_Attribute)& theSource, BinObjMgt_Persistent& theTarget, - BinObjMgt_SRelocationTable& theRelocTable) const; + BinObjMgt_SRelocationTable& theRelocTable) const Standard_OVERRIDE; // Translate the contents of and put it // into diff --git a/src/BinTools/BinTools_ShapeSet.cxx b/src/BinTools/BinTools_ShapeSet.cxx index 0e0b1700b4..250e821b41 100644 --- a/src/BinTools/BinTools_ShapeSet.cxx +++ b/src/BinTools/BinTools_ShapeSet.cxx @@ -433,11 +433,11 @@ void BinTools_ShapeSet::Read(Standard_IStream& IS) return; } - Standard_Integer i, nbShapes; + Standard_Integer nbShapes = 0; IS >> nbShapes; IS.get();//remove lf - for (i = 1; i <= nbShapes; i++) { + for (int i = 1; i <= nbShapes; i++) { TopoDS_Shape S; @@ -512,7 +512,7 @@ void BinTools_ShapeSet::Write(const TopoDS_Shape& S, Standard_OStream& OS)const void BinTools_ShapeSet::Read(TopoDS_Shape& S, Standard_IStream& IS, const Standard_Integer nbshapes)const { - Standard_Character aChar; + Standard_Character aChar = '\0'; IS >> aChar; if(aChar == '*') S = TopoDS_Shape(); diff --git a/src/Bisector/Bisector_BisecAna.hxx b/src/Bisector/Bisector_BisecAna.hxx index df7ae2ee24..9eb30cbb64 100644 --- a/src/Bisector/Bisector_BisecAna.hxx +++ b/src/Bisector/Bisector_BisecAna.hxx @@ -74,9 +74,9 @@ public: Standard_EXPORT void Init (const Handle(Geom2d_TrimmedCurve)& bisector); - Standard_EXPORT Standard_Boolean IsExtendAtStart() const; + Standard_EXPORT Standard_Boolean IsExtendAtStart() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsExtendAtEnd() const; + Standard_EXPORT Standard_Boolean IsExtendAtEnd() const Standard_OVERRIDE; //! Trim by a domain defined by the curve . //! This domain is the set of the points which are @@ -86,41 +86,41 @@ public: //! Trim by a domain defined by uf and ul Standard_EXPORT void SetTrim (const Standard_Real uf, const Standard_Real ul); - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Returns the order of continuity of the curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; Standard_EXPORT Handle(Geom2d_Curve) Geom2dCurve() const; - Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const; + Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const Standard_OVERRIDE; Standard_EXPORT Standard_Real ParameterOfStartPoint() const; @@ -129,15 +129,15 @@ public: //! If necessary, breaks the curve in intervals of //! continuity . And returns the number of //! intervals. - Standard_EXPORT Standard_Integer NbIntervals() const; + Standard_EXPORT Standard_Integer NbIntervals() const Standard_OVERRIDE; //! Returns the first parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const Standard_OVERRIDE; //! Returns the last parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const Standard_OVERRIDE; Standard_EXPORT void Dump (const Standard_Integer Deep = 0, const Standard_Integer Offset = 0) const; diff --git a/src/Bisector/Bisector_BisecCC.hxx b/src/Bisector/Bisector_BisecCC.hxx index 94ad81396e..6ddedf6bd3 100644 --- a/src/Bisector/Bisector_BisecCC.hxx +++ b/src/Bisector/Bisector_BisecCC.hxx @@ -78,56 +78,56 @@ public: //! than . Standard_EXPORT void Perform (const Handle(Geom2d_Curve)& Cu1, const Handle(Geom2d_Curve)& Cu2, const Standard_Real Side1, const Standard_Real Side2, const gp_Pnt2d& Origin, const Standard_Real DistMax = 500); - Standard_EXPORT Standard_Boolean IsExtendAtStart() const; + Standard_EXPORT Standard_Boolean IsExtendAtStart() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsExtendAtEnd() const; + Standard_EXPORT Standard_Boolean IsExtendAtEnd() const Standard_OVERRIDE; - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Returns the order of continuity of the curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! The parameter on is linked to the parameter //! on the first curve. This method creates the same bisector //! where the curves are inversed. Standard_EXPORT Handle(Bisector_BisecCC) ChangeGuide() const; - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; //! Transformation of a geometric object. This tansformation //! can be a translation, a rotation, a symmetry, a scaling //! or a complex transformation obtained by combination of //! the previous elementaries transformations. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! If necessary, breaks the curve in intervals of //! continuity . And returns the number of //! intervals. - Standard_EXPORT Standard_Integer NbIntervals() const; + Standard_EXPORT Standard_Integer NbIntervals() const Standard_OVERRIDE; //! Returns the first parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const Standard_OVERRIDE; //! Returns the last parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const Standard_OVERRIDE; Standard_EXPORT GeomAbs_Shape IntervalContinuity() const; - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the point of parameter U. //! Computes the distance between the current point and @@ -143,15 +143,15 @@ public: //! of the projection of the current point. Standard_EXPORT gp_Pnt2d ValueByInt (const Standard_Real U, Standard_Real& U1, Standard_Real& U2, Standard_Real& Distance) const; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; Standard_EXPORT Standard_Boolean IsEmpty() const; @@ -162,7 +162,7 @@ public: //! Returns the reciproque of LinkBisCurve. Standard_EXPORT Standard_Real LinkCurveBis (const Standard_Real U) const; - Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const; + Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const Standard_OVERRIDE; Standard_EXPORT Handle(Geom2d_Curve) Curve (const Standard_Integer IndCurve) const; diff --git a/src/Bisector/Bisector_BisecPC.hxx b/src/Bisector/Bisector_BisecPC.hxx index 488902dd92..b71fb32dda 100644 --- a/src/Bisector/Bisector_BisecPC.hxx +++ b/src/Bisector/Bisector_BisecPC.hxx @@ -77,10 +77,10 @@ public: Standard_EXPORT void Perform (const Handle(Geom2d_Curve)& Cu, const gp_Pnt2d& P, const Standard_Real Side, const Standard_Real DistMax = 500); //! Returns True if the bisector is extended at start. - Standard_EXPORT Standard_Boolean IsExtendAtStart() const; + Standard_EXPORT Standard_Boolean IsExtendAtStart() const Standard_OVERRIDE; //! Returns True if the bisector is extended at end. - Standard_EXPORT Standard_Boolean IsExtendAtEnd() const; + Standard_EXPORT Standard_Boolean IsExtendAtEnd() const Standard_OVERRIDE; //! Changes the direction of parametrization of . @@ -88,65 +88,65 @@ public: //! is bounded the StartPoint of the initial curve becomes the //! EndPoint of the reversed curve and the EndPoint of the initial //! curve becomes the StartPoint of the reversed curve. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; //! Transformation of a geometric object. This tansformation //! can be a translation, a rotation, a symmetry, a scaling //! or a complex transformation obtained by combination of //! the previous elementaries transformations. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Returns the order of continuity of the curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Value of the first parameter. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Value of the last parameter. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! If necessary, breaks the curve in intervals of //! continuity . And returns the number of //! intervals. - Standard_EXPORT Standard_Integer NbIntervals() const; + Standard_EXPORT Standard_Integer NbIntervals() const Standard_OVERRIDE; //! Returns the first parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalFirst (const Standard_Integer Index) const Standard_OVERRIDE; //! Returns the last parameter of the current //! interval. - Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real IntervalLast (const Standard_Integer Index) const Standard_OVERRIDE; Standard_EXPORT GeomAbs_Shape IntervalContinuity() const; - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the distance between the point of //! parameter U on and my point or my curve. Standard_EXPORT Standard_Real Distance (const Standard_Real U) const; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; Standard_EXPORT void Dump (const Standard_Integer Deep = 0, const Standard_Integer Offset = 0) const; @@ -158,7 +158,7 @@ public: Standard_EXPORT Standard_Real LinkCurveBis (const Standard_Real U) const; //! Returns the parameter on corresponding to

. - Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const; + Standard_EXPORT Standard_Real Parameter (const gp_Pnt2d& P) const Standard_OVERRIDE; //! Returns if the bisector is empty. Standard_EXPORT Standard_Boolean IsEmpty() const; diff --git a/src/Blend/Blend_CSFunction.hxx b/src/Blend/Blend_CSFunction.hxx index 45b694c6e7..cee9e0ce9a 100644 --- a/src/Blend/Blend_CSFunction.hxx +++ b/src/Blend/Blend_CSFunction.hxx @@ -55,56 +55,56 @@ public: //! Returns 3 (default value). Can be redefined. - Standard_EXPORT virtual Standard_Integer NbVariables() const; + Standard_EXPORT virtual Standard_Integer NbVariables() const Standard_OVERRIDE; //! returns the number of equations of the function. - Standard_EXPORT virtual Standard_Integer NbEquations() const = 0; + Standard_EXPORT virtual Standard_Integer NbEquations() const Standard_OVERRIDE = 0; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& X, math_Vector& F) = 0; + Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE = 0; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) = 0; + Standard_EXPORT virtual Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE = 0; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) = 0; + Standard_EXPORT virtual Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE = 0; //! Sets the value of the parameter along the guide line. //! This determines the plane in which the solution has //! to be found. - Standard_EXPORT virtual void Set (const Standard_Real Param) = 0; + Standard_EXPORT virtual void Set (const Standard_Real Param) Standard_OVERRIDE = 0; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT virtual void Set (const Standard_Real First, const Standard_Real Last) = 0; + Standard_EXPORT virtual void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE = 0; //! Returns in the vector Tolerance the parametric tolerance //! for each of the 3 variables; //! Tol is the tolerance used in 3d space. - Standard_EXPORT virtual void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const = 0; + Standard_EXPORT virtual void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE = 0; //! Returns in the vector InfBound the lowest values allowed //! for each of the 3 variables. //! Returns in the vector SupBound the greatest values allowed //! for each of the 3 variables. - Standard_EXPORT virtual void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const = 0; + Standard_EXPORT virtual void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE = 0; //! Returns Standard_True if Sol is a zero of the function. //! Tol is the tolerance used in 3d space. //! The computation is made at the current value of //! the parameter on the guide line. - Standard_EXPORT virtual Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) = 0; + Standard_EXPORT virtual Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE = 0; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. @@ -148,25 +148,25 @@ public: //! these points. Standard_EXPORT virtual void Tangent (const Standard_Real U, const Standard_Real V, gp_Vec& TgS, gp_Vec& NormS) const = 0; - Standard_EXPORT virtual void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) = 0; + Standard_EXPORT virtual void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE = 0; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT virtual void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const = 0; + Standard_EXPORT virtual void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Knots (TColStd_Array1OfReal& TKnots) = 0; + Standard_EXPORT virtual void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) = 0; + Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE = 0; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) = 0; + Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) = 0; + Standard_EXPORT virtual void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE = 0; //! Used for the first and last section //! The method returns Standard_True if the derivatives diff --git a/src/Blend/Blend_Function.hxx b/src/Blend/Blend_Function.hxx index e326a88261..7374b3139e 100644 --- a/src/Blend/Blend_Function.hxx +++ b/src/Blend/Blend_Function.hxx @@ -54,56 +54,56 @@ public: //! Returns 4. - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; //! returns the number of equations of the function. - Standard_EXPORT virtual Standard_Integer NbEquations() const = 0; + Standard_EXPORT virtual Standard_Integer NbEquations() const Standard_OVERRIDE = 0; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& X, math_Vector& F) = 0; + Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE = 0; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) = 0; + Standard_EXPORT virtual Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE = 0; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT virtual Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) = 0; + Standard_EXPORT virtual Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE = 0; //! Sets the value of the parameter along the guide line. //! This determines the plane in which the solution has //! to be found. - Standard_EXPORT virtual void Set (const Standard_Real Param) = 0; + Standard_EXPORT virtual void Set (const Standard_Real Param) Standard_OVERRIDE = 0; //! Sets the bounds of the parametric interval on //! the guide line. //! This determines the derivatives in these values if the //! function is not Cn. - Standard_EXPORT virtual void Set (const Standard_Real First, const Standard_Real Last) = 0; + Standard_EXPORT virtual void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE = 0; //! Returns in the vector Tolerance the parametric tolerance //! for each of the 4 variables; //! Tol is the tolerance used in 3d space. - Standard_EXPORT virtual void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const = 0; + Standard_EXPORT virtual void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE = 0; //! Returns in the vector InfBound the lowest values allowed //! for each of the 4 variables. //! Returns in the vector SupBound the greatest values allowed //! for each of the 4 variables. - Standard_EXPORT virtual void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const = 0; + Standard_EXPORT virtual void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE = 0; //! Returns Standard_True if Sol is a zero of the function. //! Tol is the tolerance used in 3d space. //! The computation is made at the current value of //! the parameter on the guide line. - Standard_EXPORT virtual Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) = 0; + Standard_EXPORT virtual Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE = 0; //! Returns the point on the first support. Standard_EXPORT const gp_Pnt& Pnt1() const Standard_OVERRIDE; @@ -149,25 +149,25 @@ public: Standard_EXPORT virtual Standard_Boolean TwistOnS2() const; - Standard_EXPORT virtual void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) = 0; + Standard_EXPORT virtual void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE = 0; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT virtual void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const = 0; + Standard_EXPORT virtual void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Knots (TColStd_Array1OfReal& TKnots) = 0; + Standard_EXPORT virtual void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) = 0; + Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE = 0; //! Used for the first and last section //! The method returns Standard_True if the derivatives //! are computed, otherwise it returns Standard_False. - Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) = 0; + Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE = 0; - Standard_EXPORT virtual void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) = 0; + Standard_EXPORT virtual void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE = 0; //! Used for the first and last section //! The method returns Standard_True if the derivatives diff --git a/src/BlendFunc/BlendFunc_CSCircular.hxx b/src/BlendFunc/BlendFunc_CSCircular.hxx index f8f97fb7a3..2bced6ff28 100644 --- a/src/BlendFunc/BlendFunc_CSCircular.hxx +++ b/src/BlendFunc/BlendFunc_CSCircular.hxx @@ -73,59 +73,59 @@ public: Standard_EXPORT virtual Standard_Integer NbVariables() const Standard_OVERRIDE; //! returns the number of equations of the function (3). - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS() const; + Standard_EXPORT const gp_Pnt& PointOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnC() const; + Standard_EXPORT const gp_Pnt& PointOnC() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2d() const; + Standard_EXPORT const gp_Pnt2d& Pnt2d() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnC() const; + Standard_EXPORT Standard_Real ParameterOnC() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS() const; + Standard_EXPORT const gp_Vec& TangentOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2d() const; + Standard_EXPORT const gp_Vec2d& Tangent2d() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnC() const; + Standard_EXPORT const gp_Vec& TangentOnC() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surface) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U, const Standard_Real V, gp_Vec& TgS, gp_Vec& NormS) const; + Standard_EXPORT void Tangent (const Standard_Real U, const Standard_Real V, gp_Vec& TgS, gp_Vec& NormS) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Real Radius, const Standard_Integer Choix); @@ -143,18 +143,18 @@ public: Standard_EXPORT Standard_Boolean GetSection (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, TColgp_Array1OfPnt& tabP, TColgp_Array1OfVec& tabV); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . @@ -163,27 +163,27 @@ public: //! for the parameters. i.e. T.Length() > NbIntervals() //! raises //! OutOfRange from Standard - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_CSConstRad.hxx b/src/BlendFunc/BlendFunc_CSConstRad.hxx index 32f5e9ab80..22a899db77 100644 --- a/src/BlendFunc/BlendFunc_CSConstRad.hxx +++ b/src/BlendFunc/BlendFunc_CSConstRad.hxx @@ -61,59 +61,59 @@ public: Standard_EXPORT BlendFunc_CSConstRad(const Handle(Adaptor3d_HSurface)& S, const Handle(Adaptor3d_HCurve)& C, const Handle(Adaptor3d_HCurve)& CGuide); //! returns the number of equations of the function (3). - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! computes the values of the Functions for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& X, math_Vector& F) Standard_OVERRIDE; //! returns the values of the derivatives for the //! variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& X, math_Matrix& D) Standard_OVERRIDE; //! returns the values of the functions and the derivatives //! for the variable . //! Returns True if the computation was done successfully, //! False otherwise. - Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D); + Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS() const; + Standard_EXPORT const gp_Pnt& PointOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnC() const; + Standard_EXPORT const gp_Pnt& PointOnC() const Standard_OVERRIDE; //! Returns U,V coordinates of the point on the surface. - Standard_EXPORT const gp_Pnt2d& Pnt2d() const; + Standard_EXPORT const gp_Pnt2d& Pnt2d() const Standard_OVERRIDE; //! Returns parameter of the point on the curve. - Standard_EXPORT Standard_Real ParameterOnC() const; + Standard_EXPORT Standard_Real ParameterOnC() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS() const; + Standard_EXPORT const gp_Vec& TangentOnS() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2d() const; + Standard_EXPORT const gp_Vec2d& Tangent2d() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnC() const; + Standard_EXPORT const gp_Vec& TangentOnC() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surface) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U, const Standard_Real V, gp_Vec& TgS, gp_Vec& NormS) const; + Standard_EXPORT void Tangent (const Standard_Real U, const Standard_Real V, gp_Vec& TgS, gp_Vec& NormS) const Standard_OVERRIDE; Standard_EXPORT void Set (const Standard_Real Radius, const Standard_Integer Choix); @@ -131,18 +131,18 @@ public: Standard_EXPORT Standard_Boolean GetSection (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, TColgp_Array1OfPnt& tabP, TColgp_Array1OfVec& tabV); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . @@ -150,27 +150,27 @@ public: //! for the parameters. i.e. T.Length() > NbIntervals() //! raises //! OutOfRange from Standard - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_ChAsym.hxx b/src/BlendFunc/BlendFunc_ChAsym.hxx index b26ed59539..7a9db5c56f 100644 --- a/src/BlendFunc/BlendFunc_ChAsym.hxx +++ b/src/BlendFunc/BlendFunc_ChAsym.hxx @@ -60,19 +60,19 @@ public: //! returns the number of equations of the function. Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. - Standard_EXPORT Standard_Real GetMinimalDistance() const; + Standard_EXPORT Standard_Real GetMinimalDistance() const Standard_OVERRIDE; //! computes the values of the derivatives for the //! variable between DegF and DegL. @@ -98,19 +98,19 @@ public: //! False otherwise. Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS1() const; + Standard_EXPORT const gp_Pnt& PointOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS2() const; + Standard_EXPORT const gp_Pnt& PointOnS2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS1() const; + Standard_EXPORT const gp_Vec& TangentOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS2() const; + Standard_EXPORT const gp_Vec& TangentOnS2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean TwistOnS1() const Standard_OVERRIDE; @@ -120,46 +120,46 @@ public: //! at the beginning and the end of the section, and //! returns the normal (of the surfaces) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const; + Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const Standard_OVERRIDE; //! Utile pour une visu rapide et approximative de la surface. Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Lin& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; @@ -167,7 +167,7 @@ public: //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; //! Sets the distances and the angle. Standard_EXPORT void Set (const Standard_Real Dist1, const Standard_Real Angle, const Standard_Integer Choix); diff --git a/src/BlendFunc/BlendFunc_ChAsymInv.hxx b/src/BlendFunc/BlendFunc_ChAsymInv.hxx index 6f20040da5..93539be24e 100644 --- a/src/BlendFunc/BlendFunc_ChAsymInv.hxx +++ b/src/BlendFunc/BlendFunc_ChAsymInv.hxx @@ -43,13 +43,13 @@ public: Standard_EXPORT BlendFunc_ChAsymInv(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const Handle(Adaptor3d_HCurve)& C); - Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf); + Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! returns the number of equations of the function. Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_ChamfInv.hxx b/src/BlendFunc/BlendFunc_ChamfInv.hxx index ed3c87bb26..c8cedca4c7 100644 --- a/src/BlendFunc/BlendFunc_ChamfInv.hxx +++ b/src/BlendFunc/BlendFunc_ChamfInv.hxx @@ -43,13 +43,13 @@ public: Standard_EXPORT BlendFunc_ChamfInv(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const Handle(Adaptor3d_HCurve)& C); - Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf); + Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! returns the number of equations of the function. Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_Chamfer.hxx b/src/BlendFunc/BlendFunc_Chamfer.hxx index 358a7f279a..30a98b9a7c 100644 --- a/src/BlendFunc/BlendFunc_Chamfer.hxx +++ b/src/BlendFunc/BlendFunc_Chamfer.hxx @@ -75,56 +75,56 @@ public: //! False otherwise. Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. - Standard_EXPORT Standard_Real GetMinimalDistance() const; + Standard_EXPORT Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS1() const; + Standard_EXPORT const gp_Pnt& PointOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS2() const; + Standard_EXPORT const gp_Pnt& PointOnS2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS1() const; + Standard_EXPORT const gp_Vec& TangentOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS2() const; + Standard_EXPORT const gp_Vec& TangentOnS2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surfaces) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const; + Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const Standard_OVERRIDE; //! Sets the distances and the "quadrant". Standard_EXPORT void Set (const Standard_Real Dist1, const Standard_Real Dist2, const Standard_Integer Choix); //! Returns False - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . @@ -133,33 +133,33 @@ public: //! for the parameters. i.e. T.Length() > NbIntervals() //! raises //! OutOfRange from Standard - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Obsolete method Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Lin& C); //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_ConstRad.hxx b/src/BlendFunc/BlendFunc_ConstRad.hxx index bd7c58640e..bc64cccf26 100644 --- a/src/BlendFunc/BlendFunc_ConstRad.hxx +++ b/src/BlendFunc/BlendFunc_ConstRad.hxx @@ -82,39 +82,39 @@ public: //! False otherwise. Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. - Standard_EXPORT Standard_Real GetMinimalDistance() const; + Standard_EXPORT Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS1() const; + Standard_EXPORT const gp_Pnt& PointOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS2() const; + Standard_EXPORT const gp_Pnt& PointOnS2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS1() const; + Standard_EXPORT const gp_Vec& TangentOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS2() const; + Standard_EXPORT const gp_Vec& TangentOnS2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surfaces) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const; + Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean TwistOnS1() const Standard_OVERRIDE; @@ -131,38 +131,38 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; @@ -170,11 +170,11 @@ public: //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; Standard_EXPORT gp_Ax1 AxeRot (const Standard_Real Prm); - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_ConstRadInv.hxx b/src/BlendFunc/BlendFunc_ConstRadInv.hxx index 6efe765c67..3fec90efe8 100644 --- a/src/BlendFunc/BlendFunc_ConstRadInv.hxx +++ b/src/BlendFunc/BlendFunc_ConstRadInv.hxx @@ -42,13 +42,13 @@ public: Standard_EXPORT BlendFunc_ConstRadInv(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const Handle(Adaptor3d_HCurve)& C); - Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf); + Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! returns the number of equations of the function. Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_EvolRad.hxx b/src/BlendFunc/BlendFunc_EvolRad.hxx index d7637fa6a5..0dcbb2b1bb 100644 --- a/src/BlendFunc/BlendFunc_EvolRad.hxx +++ b/src/BlendFunc/BlendFunc_EvolRad.hxx @@ -82,39 +82,39 @@ public: //! False otherwise. Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. - Standard_EXPORT Standard_Real GetMinimalDistance() const; + Standard_EXPORT Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS1() const; + Standard_EXPORT const gp_Pnt& PointOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS2() const; + Standard_EXPORT const gp_Pnt& PointOnS2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS1() const; + Standard_EXPORT const gp_Vec& TangentOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS2() const; + Standard_EXPORT const gp_Vec& TangentOnS2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surfaces) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const; + Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean TwistOnS1() const Standard_OVERRIDE; @@ -130,38 +130,38 @@ public: Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C); //! Returns if the section is rationnal - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . //! //! The array must provide enough room to accomodate //! for the parameters. i.e. T.Length() > NbIntervals() - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; @@ -169,9 +169,9 @@ public: //! Used for the first and last section Standard_EXPORT virtual Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_Ruled.hxx b/src/BlendFunc/BlendFunc_Ruled.hxx index 0f7adee32c..c17738badb 100644 --- a/src/BlendFunc/BlendFunc_Ruled.hxx +++ b/src/BlendFunc/BlendFunc_Ruled.hxx @@ -77,55 +77,55 @@ public: //! False otherwise. Standard_EXPORT Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real Param); + Standard_EXPORT void Set (const Standard_Real Param) Standard_OVERRIDE; - Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last); + Standard_EXPORT void Set (const Standard_Real First, const Standard_Real Last) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! Returns the minimal Distance beetween two //! extremitys of calculed sections. - Standard_EXPORT Standard_Real GetMinimalDistance() const; + Standard_EXPORT Standard_Real GetMinimalDistance() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS1() const; + Standard_EXPORT const gp_Pnt& PointOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Pnt& PointOnS2() const; + Standard_EXPORT const gp_Pnt& PointOnS2() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsTangencyPoint() const; + Standard_EXPORT Standard_Boolean IsTangencyPoint() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS1() const; + Standard_EXPORT const gp_Vec& TangentOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS1() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec& TangentOnS2() const; + Standard_EXPORT const gp_Vec& TangentOnS2() const Standard_OVERRIDE; - Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const; + Standard_EXPORT const gp_Vec2d& Tangent2dOnS2() const Standard_OVERRIDE; //! Returns the tangent vector at the section, //! at the beginning and the end of the section, and //! returns the normal (of the surfaces) at //! these points. - Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const; + Standard_EXPORT void Tangent (const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, gp_Vec& TgFirst, gp_Vec& TgLast, gp_Vec& NormFirst, gp_Vec& NormLast) const Standard_OVERRIDE; Standard_EXPORT Standard_Boolean GetSection (const Standard_Real Param, const Standard_Real U1, const Standard_Real V1, const Standard_Real U2, const Standard_Real V2, TColgp_Array1OfPnt& tabP, TColgp_Array1OfVec& tabV); //! Returns False - Standard_EXPORT Standard_Boolean IsRational() const; + Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE; //! Returns the length of the maximum section - Standard_EXPORT Standard_Real GetSectionSize() const; + Standard_EXPORT Standard_Real GetSectionSize() const Standard_OVERRIDE; //! Compute the minimal value of weight for each poles //! of all sections. - Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const; + Standard_EXPORT void GetMinimalWeight (TColStd_Array1OfReal& Weigths) const Standard_OVERRIDE; //! Returns the number of intervals for continuity //! . May be one if Continuity(me) >= - Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const; + Standard_EXPORT Standard_Integer NbIntervals (const GeomAbs_Shape S) const Standard_OVERRIDE; //! Stores in the parameters bounding the intervals //! of continuity . @@ -134,32 +134,32 @@ public: //! for the parameters. i.e. T.Length() > NbIntervals() //! raises //! OutOfRange from Standard - Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; + Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d); + Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE; //! Returns the tolerance to reach in approximation //! to respecte //! BoundTol error at the Boundary //! AngleTol tangent error at the Boundary //! SurfTol error inside the surface. - Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const; + Standard_EXPORT void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, math_Vector& Tol3d, math_Vector& Tol1D) const Standard_OVERRIDE; - Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots); + Standard_EXPORT void Knots (TColStd_Array1OfReal& TKnots) Standard_OVERRIDE; - Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults); + Standard_EXPORT void Mults (TColStd_Array1OfInteger& TMults) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths) Standard_OVERRIDE; //! Used for the first and last section - Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); + Standard_EXPORT Standard_Boolean Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths) Standard_OVERRIDE; - Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths); + Standard_EXPORT void Section (const Blend_Point& P, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) Standard_OVERRIDE; Standard_EXPORT gp_Ax1 AxeRot (const Standard_Real Prm); - Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; + Standard_EXPORT void Resolution (const Standard_Integer IC2d, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE; diff --git a/src/BlendFunc/BlendFunc_RuledInv.hxx b/src/BlendFunc/BlendFunc_RuledInv.hxx index e5d37f8b8c..68cd079eb4 100644 --- a/src/BlendFunc/BlendFunc_RuledInv.hxx +++ b/src/BlendFunc/BlendFunc_RuledInv.hxx @@ -42,13 +42,13 @@ public: Standard_EXPORT BlendFunc_RuledInv(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const Handle(Adaptor3d_HCurve)& C); - Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf); + Standard_EXPORT void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf) Standard_OVERRIDE; - Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const; + Standard_EXPORT void GetTolerance (math_Vector& Tolerance, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const; + Standard_EXPORT void GetBounds (math_Vector& InfBound, math_Vector& SupBound) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol); + Standard_EXPORT Standard_Boolean IsSolution (const math_Vector& Sol, const Standard_Real Tol) Standard_OVERRIDE; //! returns the number of equations of the function. Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; diff --git a/src/CDF/CDF_Application.hxx b/src/CDF/CDF_Application.hxx index 8a35dde67b..5d0f63db72 100644 --- a/src/CDF/CDF_Application.hxx +++ b/src/CDF/CDF_Application.hxx @@ -167,11 +167,11 @@ private: //! this method to implement application specific behavior. Standard_EXPORT virtual void Activate (const Handle(CDM_Document)& aDocument, const CDF_TypeOfActivation aTypeOfActivation); - Standard_EXPORT Handle(CDM_Document) Retrieve (const Handle(CDM_MetaData)& aMetaData, const Standard_Boolean UseStorageConfiguration); + Standard_EXPORT Handle(CDM_Document) Retrieve (const Handle(CDM_MetaData)& aMetaData, const Standard_Boolean UseStorageConfiguration) Standard_OVERRIDE; Standard_EXPORT Handle(CDM_Document) Retrieve (const Handle(CDM_MetaData)& aMetaData, const Standard_Boolean UseStorageConfiguration, const Standard_Boolean IsComponent); - Standard_EXPORT Standard_Integer DocumentVersion (const Handle(CDM_MetaData)& theMetaData); + Standard_EXPORT Standard_Integer DocumentVersion (const Handle(CDM_MetaData)& theMetaData) Standard_OVERRIDE; Standard_EXPORT Standard_Boolean FindReader (const TCollection_ExtendedString& aFileName, Standard_GUID& PluginIn, TCollection_ExtendedString& ResourceName); diff --git a/src/CDF/CDF_FWOSDriver.hxx b/src/CDF/CDF_FWOSDriver.hxx index d730ab8fb2..e7f06ff0e5 100644 --- a/src/CDF/CDF_FWOSDriver.hxx +++ b/src/CDF/CDF_FWOSDriver.hxx @@ -41,15 +41,15 @@ public: Standard_EXPORT CDF_FWOSDriver(); //! indicate whether a file exists corresponding to the folder and the name - Standard_EXPORT Standard_Boolean Find (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion); + Standard_EXPORT Standard_Boolean Find (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean HasReadPermission (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion); + Standard_EXPORT Standard_Boolean HasReadPermission (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean FindFolder (const TCollection_ExtendedString& aFolder); + Standard_EXPORT Standard_Boolean FindFolder (const TCollection_ExtendedString& aFolder) Standard_OVERRIDE; - Standard_EXPORT TCollection_ExtendedString DefaultFolder(); + Standard_EXPORT TCollection_ExtendedString DefaultFolder() Standard_OVERRIDE; - Standard_EXPORT TCollection_ExtendedString BuildFileName (const Handle(CDM_Document)& aDocument); + Standard_EXPORT TCollection_ExtendedString BuildFileName (const Handle(CDM_Document)& aDocument) Standard_OVERRIDE; Standard_EXPORT virtual TCollection_ExtendedString SetName (const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aName) Standard_OVERRIDE; @@ -66,9 +66,9 @@ protected: private: - Standard_EXPORT Handle(CDM_MetaData) MetaData (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion); + Standard_EXPORT Handle(CDM_MetaData) MetaData (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName, const TCollection_ExtendedString& aVersion) Standard_OVERRIDE; - Standard_EXPORT Handle(CDM_MetaData) CreateMetaData (const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aFileName); + Standard_EXPORT Handle(CDM_MetaData) CreateMetaData (const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aFileName) Standard_OVERRIDE; Standard_EXPORT static TCollection_ExtendedString Concatenate (const TCollection_ExtendedString& aFolder, const TCollection_ExtendedString& aName); diff --git a/src/CDM/CDM_COutMessageDriver.hxx b/src/CDM/CDM_COutMessageDriver.hxx index 3f15d023de..c13e352ad9 100644 --- a/src/CDM/CDM_COutMessageDriver.hxx +++ b/src/CDM/CDM_COutMessageDriver.hxx @@ -33,7 +33,7 @@ class CDM_COutMessageDriver : public CDM_MessageDriver public: - Standard_EXPORT void Write (const Standard_ExtString aString); + Standard_EXPORT void Write (const Standard_ExtString aString) Standard_OVERRIDE; diff --git a/src/CDM/CDM_NullMessageDriver.hxx b/src/CDM/CDM_NullMessageDriver.hxx index 419f5f1b0f..325d54799e 100644 --- a/src/CDM/CDM_NullMessageDriver.hxx +++ b/src/CDM/CDM_NullMessageDriver.hxx @@ -36,7 +36,7 @@ public: Standard_EXPORT CDM_NullMessageDriver(); - Standard_EXPORT void Write (const Standard_ExtString aString); + Standard_EXPORT void Write (const Standard_ExtString aString) Standard_OVERRIDE; diff --git a/src/ChFi3d/ChFi3d_ChBuilder.hxx b/src/ChFi3d/ChFi3d_ChBuilder.hxx index 160882b79b..1197ece7ce 100644 --- a/src/ChFi3d/ChFi3d_ChBuilder.hxx +++ b/src/ChFi3d/ChFi3d_ChBuilder.hxx @@ -160,34 +160,34 @@ public: protected: - Standard_EXPORT void SimulKPart (const Handle(ChFiDS_SurfData)& SD) const; + Standard_EXPORT void SimulKPart (const Handle(ChFiDS_SurfData)& SD) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl); + Standard_EXPORT Standard_Boolean SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean PerformFirstSection (const Handle(ChFiDS_Spine)& S, const Handle(ChFiDS_HElSpine)& HGuide, const Standard_Integer Choix, Handle(BRepAdaptor_HSurface)& S1, Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I1, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real Par, math_Vector& SolDep, TopAbs_State& Pos1, TopAbs_State& Pos2) const; + Standard_EXPORT Standard_Boolean PerformFirstSection (const Handle(ChFiDS_Spine)& S, const Handle(ChFiDS_HElSpine)& HGuide, const Standard_Integer Choix, Handle(BRepAdaptor_HSurface)& S1, Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I1, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real Par, math_Vector& SolDep, TopAbs_State& Pos1, TopAbs_State& Pos2) const Standard_OVERRIDE; //! computes the intersection of two chamfers on //! the vertex of index in myVDataMap. - Standard_EXPORT void PerformTwoCorner (const Standard_Integer Index); + Standard_EXPORT void PerformTwoCorner (const Standard_Integer Index) Standard_OVERRIDE; //! computes the intersection of three chamfers on //! the vertex of index in myVDataMap. - Standard_EXPORT void PerformThreeCorner (const Standard_Integer Index); + Standard_EXPORT void PerformThreeCorner (const Standard_Integer Index) Standard_OVERRIDE; //! extends the spine of the Stripe at the //! extremity of the vertex . - Standard_EXPORT void ExtentOneCorner (const TopoDS_Vertex& V, const Handle(ChFiDS_Stripe)& S); + Standard_EXPORT void ExtentOneCorner (const TopoDS_Vertex& V, const Handle(ChFiDS_Stripe)& S) Standard_OVERRIDE; //! extends the spine of the 2 stripes of at the //! extremity of the vertex - Standard_EXPORT void ExtentTwoCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS); + Standard_EXPORT void ExtentTwoCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) Standard_OVERRIDE; //! extends the spine of the 2 stripes of at the //! extremity of the vertex - Standard_EXPORT void ExtentThreeCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS); + Standard_EXPORT void ExtentThreeCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) Standard_OVERRIDE; //! set the regularities - Standard_EXPORT void SetRegul(); + Standard_EXPORT void SetRegul() Standard_OVERRIDE; diff --git a/src/ChFi3d/ChFi3d_FilBuilder.hxx b/src/ChFi3d/ChFi3d_FilBuilder.hxx index c6434853db..9ffbbb7209 100644 --- a/src/ChFi3d/ChFi3d_FilBuilder.hxx +++ b/src/ChFi3d/ChFi3d_FilBuilder.hxx @@ -134,9 +134,9 @@ public: protected: - Standard_EXPORT void SimulKPart (const Handle(ChFiDS_SurfData)& SD) const; + Standard_EXPORT void SimulKPart (const Handle(ChFiDS_SurfData)& SD) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl); + Standard_EXPORT Standard_Boolean SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl) Standard_OVERRIDE; Standard_EXPORT virtual void SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HCurve2d)& PC1, const Handle(BRepAdaptor_HSurface)& Sref1, const Handle(BRepAdaptor_HCurve2d)& PCref1, Standard_Boolean& Decroch1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const TopAbs_Orientation Or2, const Standard_Real Fleche, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecP, const Standard_Boolean RecS, const Standard_Boolean RecRst, const math_Vector& Soldep) Standard_OVERRIDE; @@ -144,11 +144,11 @@ protected: Standard_EXPORT virtual void SimulSurf (Handle(ChFiDS_SurfData)& Data, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HCurve2d)& PC1, const Handle(BRepAdaptor_HSurface)& Sref1, const Handle(BRepAdaptor_HCurve2d)& PCref1, Standard_Boolean& Decroch1, const TopAbs_Orientation Or1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Handle(BRepAdaptor_HCurve2d)& PC2, const Handle(BRepAdaptor_HSurface)& Sref2, const Handle(BRepAdaptor_HCurve2d)& PCref2, Standard_Boolean& Decroch2, const TopAbs_Orientation Or2, const Standard_Real Fleche, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecP1, const Standard_Boolean RecRst1, const Standard_Boolean RecP2, const Standard_Boolean RecRst2, const math_Vector& Soldep) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean PerformFirstSection (const Handle(ChFiDS_Spine)& S, const Handle(ChFiDS_HElSpine)& HGuide, const Standard_Integer Choix, Handle(BRepAdaptor_HSurface)& S1, Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I1, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real Par, math_Vector& SolDep, TopAbs_State& Pos1, TopAbs_State& Pos2) const; + Standard_EXPORT Standard_Boolean PerformFirstSection (const Handle(ChFiDS_Spine)& S, const Handle(ChFiDS_HElSpine)& HGuide, const Standard_Integer Choix, Handle(BRepAdaptor_HSurface)& S1, Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I1, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real Par, math_Vector& SolDep, TopAbs_State& Pos1, TopAbs_State& Pos2) const Standard_OVERRIDE; //! Method calculates the elements of construction of the //! fillet (constant or evolutive). - Standard_EXPORT Standard_Boolean PerformSurf (ChFiDS_SequenceOfSurfData& SeqData, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real MaxStep, const Standard_Real Fleche, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl); + Standard_EXPORT Standard_Boolean PerformSurf (ChFiDS_SequenceOfSurfData& SeqData, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const Standard_Real MaxStep, const Standard_Real Fleche, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, const math_Vector& Soldep, Standard_Boolean& Intf, Standard_Boolean& Intl) Standard_OVERRIDE; Standard_EXPORT virtual void PerformSurf (ChFiDS_SequenceOfSurfData& SeqData, const Handle(ChFiDS_HElSpine)& Guide, const Handle(ChFiDS_Spine)& Spine, const Standard_Integer Choix, const Handle(BRepAdaptor_HSurface)& S1, const Handle(Adaptor3d_TopolTool)& I1, const Handle(BRepAdaptor_HCurve2d)& PC1, const Handle(BRepAdaptor_HSurface)& Sref1, const Handle(BRepAdaptor_HCurve2d)& PCref1, Standard_Boolean& Decroch1, const Handle(BRepAdaptor_HSurface)& S2, const Handle(Adaptor3d_TopolTool)& I2, const TopAbs_Orientation Or2, const Standard_Real MaxStep, const Standard_Real Fleche, const Standard_Real TolGuide, Standard_Real& First, Standard_Real& Last, const Standard_Boolean Inside, const Standard_Boolean Appro, const Standard_Boolean Forward, const Standard_Boolean RecP, const Standard_Boolean RecS, const Standard_Boolean RecRst, const math_Vector& Soldep) Standard_OVERRIDE; @@ -160,17 +160,17 @@ protected: //! singular SurfData.. Standard_EXPORT void SplitSurf (ChFiDS_SequenceOfSurfData& SeqData, const Handle(BRepBlend_Line)& line); - Standard_EXPORT void PerformTwoCorner (const Standard_Integer Index); + Standard_EXPORT void PerformTwoCorner (const Standard_Integer Index) Standard_OVERRIDE; - Standard_EXPORT void PerformThreeCorner (const Standard_Integer Index); + Standard_EXPORT void PerformThreeCorner (const Standard_Integer Index) Standard_OVERRIDE; - Standard_EXPORT void ExtentOneCorner (const TopoDS_Vertex& V, const Handle(ChFiDS_Stripe)& S); + Standard_EXPORT void ExtentOneCorner (const TopoDS_Vertex& V, const Handle(ChFiDS_Stripe)& S) Standard_OVERRIDE; - Standard_EXPORT void ExtentTwoCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS); + Standard_EXPORT void ExtentTwoCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) Standard_OVERRIDE; - Standard_EXPORT void ExtentThreeCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS); + Standard_EXPORT void ExtentThreeCorner (const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) Standard_OVERRIDE; - Standard_EXPORT void SetRegul(); + Standard_EXPORT void SetRegul() Standard_OVERRIDE; diff --git a/src/ChFiDS/ChFiDS_HElSpine.hxx b/src/ChFiDS/ChFiDS_HElSpine.hxx index 5745682d1d..8d03834df3 100644 --- a/src/ChFiDS/ChFiDS_HElSpine.hxx +++ b/src/ChFiDS/ChFiDS_HElSpine.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. ChFiDS_ElSpine& ChangeCurve(); diff --git a/src/Contap/Contap_ArcFunction.hxx b/src/Contap/Contap_ArcFunction.hxx index 2153f57aa1..56814977b6 100644 --- a/src/Contap/Contap_ArcFunction.hxx +++ b/src/Contap/Contap_ArcFunction.hxx @@ -59,11 +59,11 @@ public: void Set (const Handle(Adaptor2d_HCurve2d)& A); - Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real X, Standard_Real& D); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real X, Standard_Real& D) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Values (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT Standard_Boolean Values (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; Standard_EXPORT Standard_Integer NbSamples() const; diff --git a/src/DBRep/DBRep_DrawableShape.hxx b/src/DBRep/DBRep_DrawableShape.hxx index d3a76f459a..a9d41baf9a 100644 --- a/src/DBRep/DBRep_DrawableShape.hxx +++ b/src/DBRep/DBRep_DrawableShape.hxx @@ -91,7 +91,7 @@ public: Standard_EXPORT void GetDisplayHLR (Standard_Boolean& withHLR, Standard_Boolean& withRg1, Standard_Boolean& withRgN, Standard_Boolean& withHid, Standard_Real& ang) const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT void DisplayHiddenLines (Draw_Display& dis); diff --git a/src/DDF/DDF_Browser.hxx b/src/DDF/DDF_Browser.hxx index 8c02674903..0fe33d8165 100644 --- a/src/DDF/DDF_Browser.hxx +++ b/src/DDF/DDF_Browser.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT DDF_Browser(const Handle(TDF_Data)& aDF); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DDF/DDF_Data.hxx b/src/DDF/DDF_Data.hxx index 04202dd659..af121aaefe 100644 --- a/src/DDF/DDF_Data.hxx +++ b/src/DDF/DDF_Data.hxx @@ -39,7 +39,7 @@ public: Standard_EXPORT DDF_Data(const Handle(TDF_Data)& aDF); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DDataStd/DDataStd_DrawPresentation.hxx b/src/DDataStd/DDataStd_DrawPresentation.hxx index b3f1452a52..6eb6a0631d 100644 --- a/src/DDataStd/DDataStd_DrawPresentation.hxx +++ b/src/DDataStd/DDataStd_DrawPresentation.hxx @@ -66,15 +66,15 @@ public: Standard_EXPORT Handle(Draw_Drawable3D) GetDrawable() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; //! call backs for viewer updating //! ============================== - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void AfterAddition() Standard_OVERRIDE; diff --git a/src/DDataStd/DDataStd_TreeBrowser.hxx b/src/DDataStd/DDataStd_TreeBrowser.hxx index a505bb35b9..bc4d9fae02 100644 --- a/src/DDataStd/DDataStd_TreeBrowser.hxx +++ b/src/DDataStd/DDataStd_TreeBrowser.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT DDataStd_TreeBrowser(const TDF_Label& root); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DDocStd/DDocStd_DrawDocument.hxx b/src/DDocStd/DDocStd_DrawDocument.hxx index 9d2484c57d..36da741930 100644 --- a/src/DDocStd/DDocStd_DrawDocument.hxx +++ b/src/DDocStd/DDocStd_DrawDocument.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT Handle(TDocStd_Document) GetDocument() const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/Draft/Draft_Modification.hxx b/src/Draft/Draft_Modification.hxx index c96ae436fd..f398d5b29c 100644 --- a/src/Draft/Draft_Modification.hxx +++ b/src/Draft/Draft_Modification.hxx @@ -119,7 +119,7 @@ public: //! //! Otherwise, returns Standard_False, and , , //! , , are not significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -127,14 +127,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -146,14 +146,14 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -161,7 +161,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/Draw/Draw_Axis2D.hxx b/src/Draw/Draw_Axis2D.hxx index 0d898acfcd..028adb0349 100644 --- a/src/Draw/Draw_Axis2D.hxx +++ b/src/Draw/Draw_Axis2D.hxx @@ -46,7 +46,7 @@ public: Standard_EXPORT Draw_Axis2D(const gp_Ax22d& A, const Draw_Color& col, const Standard_Integer Size = 5); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Axis3D.hxx b/src/Draw/Draw_Axis3D.hxx index 5587f3d63a..a077e92ae9 100644 --- a/src/Draw/Draw_Axis3D.hxx +++ b/src/Draw/Draw_Axis3D.hxx @@ -46,7 +46,7 @@ public: Standard_EXPORT Draw_Axis3D(const gp_Ax3& A, const Draw_Color& col, const Standard_Integer Size = 5); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Box.hxx b/src/Draw/Draw_Box.hxx index e555d08cbc..2062a3f1ed 100644 --- a/src/Draw/Draw_Box.hxx +++ b/src/Draw/Draw_Box.hxx @@ -40,7 +40,7 @@ public: Standard_EXPORT Draw_Box(const gp_Pnt& p1, const gp_Pnt& p2, const Draw_Color& col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT const gp_Pnt& First() const; diff --git a/src/Draw/Draw_Chronometer.hxx b/src/Draw/Draw_Chronometer.hxx index 4ce199225f..23518f45d1 100644 --- a/src/Draw/Draw_Chronometer.hxx +++ b/src/Draw/Draw_Chronometer.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT OSD_Timer& Timer(); //! Does nothhing, - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Circle2D.hxx b/src/Draw/Draw_Circle2D.hxx index 8968a41bd8..ad9de3b55d 100644 --- a/src/Draw/Draw_Circle2D.hxx +++ b/src/Draw/Draw_Circle2D.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT Draw_Circle2D(const gp_Circ2d& C, const Standard_Real A1, const Standard_Real A2, const Draw_Color& col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Circle3D.hxx b/src/Draw/Draw_Circle3D.hxx index dc0bf706f0..4efe2f1751 100644 --- a/src/Draw/Draw_Circle3D.hxx +++ b/src/Draw/Draw_Circle3D.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT Draw_Circle3D(const gp_Circ& C, const Standard_Real A1, const Standard_Real A2, const Draw_Color& col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Grid.hxx b/src/Draw/Draw_Grid.hxx index 5d062a1053..f37a270828 100644 --- a/src/Draw/Draw_Grid.hxx +++ b/src/Draw/Draw_Grid.hxx @@ -55,7 +55,7 @@ public: Standard_Boolean IsActive() const; //! Displays the grid. - Standard_EXPORT void DrawOn (Draw_Display& Out) const; + Standard_EXPORT void DrawOn (Draw_Display& Out) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Marker2D.hxx b/src/Draw/Draw_Marker2D.hxx index 150566e7dc..41cc631f02 100644 --- a/src/Draw/Draw_Marker2D.hxx +++ b/src/Draw/Draw_Marker2D.hxx @@ -49,7 +49,7 @@ public: //! myPos field Standard_EXPORT gp_Pnt2d& ChangePos(); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! Returs always false Standard_EXPORT virtual Standard_Boolean PickReject (const Standard_Real X, const Standard_Real Y, const Standard_Real Prec) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Marker3D.hxx b/src/Draw/Draw_Marker3D.hxx index b2b796af93..faf820874f 100644 --- a/src/Draw/Draw_Marker3D.hxx +++ b/src/Draw/Draw_Marker3D.hxx @@ -49,7 +49,7 @@ public: //! myPos field Standard_EXPORT gp_Pnt& ChangePos(); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! Returs always false Standard_EXPORT virtual Standard_Boolean PickReject (const Standard_Real X, const Standard_Real Y, const Standard_Real Prec) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Number.hxx b/src/Draw/Draw_Number.hxx index 60c1dc74f5..982a2f8b50 100644 --- a/src/Draw/Draw_Number.hxx +++ b/src/Draw/Draw_Number.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT void Value (const Standard_Real V); //! Does nothhing, - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Segment2D.hxx b/src/Draw/Draw_Segment2D.hxx index b0e0ea01c4..d901f9defd 100644 --- a/src/Draw/Draw_Segment2D.hxx +++ b/src/Draw/Draw_Segment2D.hxx @@ -42,7 +42,7 @@ public: Standard_EXPORT Draw_Segment2D(const gp_Pnt2d& p1, const gp_Pnt2d& p2, const Draw_Color& col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT const gp_Pnt2d& First() const; diff --git a/src/Draw/Draw_Segment3D.hxx b/src/Draw/Draw_Segment3D.hxx index 37a1afea3c..794eac7f62 100644 --- a/src/Draw/Draw_Segment3D.hxx +++ b/src/Draw/Draw_Segment3D.hxx @@ -40,7 +40,7 @@ public: Standard_EXPORT Draw_Segment3D(const gp_Pnt& p1, const gp_Pnt& p2, const Draw_Color& col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT const gp_Pnt& First() const; diff --git a/src/Draw/Draw_Text2D.hxx b/src/Draw/Draw_Text2D.hxx index e0c96c119b..326f1c9812 100644 --- a/src/Draw/Draw_Text2D.hxx +++ b/src/Draw/Draw_Text2D.hxx @@ -47,7 +47,7 @@ public: Standard_EXPORT void SetPnt2d (const gp_Pnt2d& p); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/Draw/Draw_Text3D.hxx b/src/Draw/Draw_Text3D.hxx index eb449dd2f6..3854ec05c0 100644 --- a/src/Draw/Draw_Text3D.hxx +++ b/src/Draw/Draw_Text3D.hxx @@ -47,7 +47,7 @@ public: Standard_EXPORT void SetPnt (const gp_Pnt& p); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_Angle.hxx b/src/DrawDim/DrawDim_Angle.hxx index 0361f45b9d..778d942891 100644 --- a/src/DrawDim/DrawDim_Angle.hxx +++ b/src/DrawDim/DrawDim_Angle.hxx @@ -46,7 +46,7 @@ public: Standard_EXPORT void Plane2 (const TopoDS_Face& plane); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_Distance.hxx b/src/DrawDim/DrawDim_Distance.hxx index 240e65860f..4a953d2a78 100644 --- a/src/DrawDim/DrawDim_Distance.hxx +++ b/src/DrawDim/DrawDim_Distance.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT void Plane2 (const TopoDS_Face& face); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_PlanarAngle.hxx b/src/DrawDim/DrawDim_PlanarAngle.hxx index ec1bade7d1..3e11ae1e49 100644 --- a/src/DrawDim/DrawDim_PlanarAngle.hxx +++ b/src/DrawDim/DrawDim_PlanarAngle.hxx @@ -47,7 +47,7 @@ public: Standard_EXPORT void Position (const Standard_Real value); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_PlanarDiameter.hxx b/src/DrawDim/DrawDim_PlanarDiameter.hxx index 1b185516ff..57b0517a6d 100644 --- a/src/DrawDim/DrawDim_PlanarDiameter.hxx +++ b/src/DrawDim/DrawDim_PlanarDiameter.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT DrawDim_PlanarDiameter(const TopoDS_Shape& circle); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_PlanarDistance.hxx b/src/DrawDim/DrawDim_PlanarDistance.hxx index ba01790774..6de18e5dd2 100644 --- a/src/DrawDim/DrawDim_PlanarDistance.hxx +++ b/src/DrawDim/DrawDim_PlanarDistance.hxx @@ -46,7 +46,7 @@ public: Standard_EXPORT DrawDim_PlanarDistance(const TopoDS_Shape& geom1, const TopoDS_Shape& geom2); //! private - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_PlanarRadius.hxx b/src/DrawDim/DrawDim_PlanarRadius.hxx index bb60c39d9b..0a5a81d9c0 100644 --- a/src/DrawDim/DrawDim_PlanarRadius.hxx +++ b/src/DrawDim/DrawDim_PlanarRadius.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT DrawDim_PlanarRadius(const TopoDS_Shape& circle); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawDim/DrawDim_Radius.hxx b/src/DrawDim/DrawDim_Radius.hxx index ab698ec581..85a34dd2b8 100644 --- a/src/DrawDim/DrawDim_Radius.hxx +++ b/src/DrawDim/DrawDim_Radius.hxx @@ -42,7 +42,7 @@ public: Standard_EXPORT void Cylinder (const TopoDS_Face& face); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; diff --git a/src/DrawTrSurf/DrawTrSurf_Curve.hxx b/src/DrawTrSurf/DrawTrSurf_Curve.hxx index 3a54548c1e..6efdbc733f 100644 --- a/src/DrawTrSurf/DrawTrSurf_Curve.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Curve.hxx @@ -50,7 +50,7 @@ public: Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode, const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False, const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Handle(Geom_Curve) GetCurve() const; diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx index 891e52f5c7..ca1d2e186c 100644 --- a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx @@ -50,7 +50,7 @@ public: Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False, const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Handle(Geom2d_Curve) GetCurve() const; diff --git a/src/DrawTrSurf/DrawTrSurf_Drawable.hxx b/src/DrawTrSurf/DrawTrSurf_Drawable.hxx index 5835a3dd96..590ade9015 100644 --- a/src/DrawTrSurf/DrawTrSurf_Drawable.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Drawable.hxx @@ -56,7 +56,7 @@ public: //! this is defined only to tell C++ not to complain //! about inheriting a pure virtual method. - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const = 0; + Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE = 0; void SetDiscretisation (const Standard_Integer Discret); diff --git a/src/DrawTrSurf/DrawTrSurf_Point.hxx b/src/DrawTrSurf/DrawTrSurf_Point.hxx index d9768eafcd..9eb0e115c3 100644 --- a/src/DrawTrSurf/DrawTrSurf_Point.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Point.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT DrawTrSurf_Point(const gp_Pnt2d& P, const Draw_MarkerShape Shape, const Draw_Color& Col); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! Is a 3D object. (Default True). Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE; diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx b/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx index 7c8876b2bc..ea58a34db4 100644 --- a/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx @@ -49,7 +49,7 @@ public: Standard_EXPORT Standard_Boolean ShowNodes() const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx b/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx index 533f9491f8..2b47ae2fb3 100644 --- a/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx @@ -49,7 +49,7 @@ public: Standard_EXPORT Standard_Boolean ShowNodes() const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DrawTrSurf/DrawTrSurf_Surface.hxx b/src/DrawTrSurf/DrawTrSurf_Surface.hxx index 2050237783..b31004ff38 100644 --- a/src/DrawTrSurf/DrawTrSurf_Surface.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Surface.hxx @@ -59,7 +59,7 @@ public: //! rub out all the isoparametric curves. Standard_EXPORT virtual void ClearIsos(); - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! Iso = True : Draw the isos, the boundaries, the UVMarker. //! Iso = False: Only Draw the boundary and the UVMarker. diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx b/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx index a5beb893b9..42972ec2ba 100644 --- a/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx @@ -56,7 +56,7 @@ public: Standard_EXPORT Standard_Boolean ShowTriangles() const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx index 7e2bf48636..a10ae65bc6 100644 --- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx +++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx @@ -47,7 +47,7 @@ public: Standard_EXPORT Handle(Poly_Triangulation) Triangulation() const; - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Absolute.hxx b/src/Expr/Expr_Absolute.hxx index 62b986eecb..3d3fba557f 100644 --- a/src/Expr/Expr_Absolute.hxx +++ b/src/Expr/Expr_Absolute.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArcCosine.hxx b/src/Expr/Expr_ArcCosine.hxx index fa198d5ef1..83edc917a8 100644 --- a/src/Expr/Expr_ArcCosine.hxx +++ b/src/Expr/Expr_ArcCosine.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArcSine.hxx b/src/Expr/Expr_ArcSine.hxx index d7c750a59d..1bdcf4553d 100644 --- a/src/Expr/Expr_ArcSine.hxx +++ b/src/Expr/Expr_ArcSine.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArcTangent.hxx b/src/Expr/Expr_ArcTangent.hxx index 7e70a11203..756db687b1 100644 --- a/src/Expr/Expr_ArcTangent.hxx +++ b/src/Expr/Expr_ArcTangent.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArgCosh.hxx b/src/Expr/Expr_ArgCosh.hxx index 8087971798..69633e3bc6 100644 --- a/src/Expr/Expr_ArgCosh.hxx +++ b/src/Expr/Expr_ArgCosh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArgSinh.hxx b/src/Expr/Expr_ArgSinh.hxx index 3927d54947..42b1c91335 100644 --- a/src/Expr/Expr_ArgSinh.hxx +++ b/src/Expr/Expr_ArgSinh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_ArgTanh.hxx b/src/Expr/Expr_ArgTanh.hxx index 7ec9e302c1..96e58485d9 100644 --- a/src/Expr/Expr_ArgTanh.hxx +++ b/src/Expr/Expr_ArgTanh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_BinaryExpression.hxx b/src/Expr/Expr_BinaryExpression.hxx index fafedbc2e8..754424b51c 100644 --- a/src/Expr/Expr_BinaryExpression.hxx +++ b/src/Expr/Expr_BinaryExpression.hxx @@ -55,26 +55,26 @@ public: //! returns the number of sub-expressions contained //! in ( >= 0) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! returns the -th sub-expression of //! raises OutOfRange if > NbSubExpressions(me) - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! Does contain NamedUnknown ? - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if contains . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Replaces all occurences of with in . //! Raises InvalidOperand if contains . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_BinaryFunction.hxx b/src/Expr/Expr_BinaryFunction.hxx index 9d2b93c6a8..a2e3ab5045 100644 --- a/src/Expr/Expr_BinaryFunction.hxx +++ b/src/Expr/Expr_BinaryFunction.hxx @@ -54,29 +54,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Cosh.hxx b/src/Expr/Expr_Cosh.hxx index 67187709ec..58d2873c39 100644 --- a/src/Expr/Expr_Cosh.hxx +++ b/src/Expr/Expr_Cosh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Cosine.hxx b/src/Expr/Expr_Cosine.hxx index c43656ceeb..5e63c9b032 100644 --- a/src/Expr/Expr_Cosine.hxx +++ b/src/Expr/Expr_Cosine.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Difference.hxx b/src/Expr/Expr_Difference.hxx index fbb7f0f7e0..4cec776868 100644 --- a/src/Expr/Expr_Difference.hxx +++ b/src/Expr/Expr_Difference.hxx @@ -49,20 +49,20 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the -th derivative on unknown of . //! Raises OutOfRange if <= 0 @@ -72,10 +72,10 @@ public: //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Different.hxx b/src/Expr/Expr_Different.hxx index 970c740c6c..f136b3dc39 100644 --- a/src/Expr/Expr_Different.hxx +++ b/src/Expr/Expr_Different.hxx @@ -41,23 +41,23 @@ public: //! Creates the relation # . Standard_EXPORT Expr_Different(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and //! functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Division.hxx b/src/Expr/Expr_Division.hxx index ea773edeb9..95b92b57dd 100644 --- a/src/Expr/Expr_Division.hxx +++ b/src/Expr/Expr_Division.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Equal.hxx b/src/Expr/Expr_Equal.hxx index fb03d89a93..500c6694c2 100644 --- a/src/Expr/Expr_Equal.hxx +++ b/src/Expr/Expr_Equal.hxx @@ -41,22 +41,22 @@ public: //! Creates the relation = . Standard_EXPORT Expr_Equal(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by an associated expressions //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Exponential.hxx b/src/Expr/Expr_Exponential.hxx index dcb4843345..b16f9aa086 100644 --- a/src/Expr/Expr_Exponential.hxx +++ b/src/Expr/Expr_Exponential.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Exponentiate.hxx b/src/Expr/Expr_Exponentiate.hxx index 4934c4edcd..d2d9b0ed6a 100644 --- a/src/Expr/Expr_Exponentiate.hxx +++ b/src/Expr/Expr_Exponentiate.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_FunctionDerivative.hxx b/src/Expr/Expr_FunctionDerivative.hxx index 011f4857c9..3249e31371 100644 --- a/src/Expr/Expr_FunctionDerivative.hxx +++ b/src/Expr/Expr_FunctionDerivative.hxx @@ -53,34 +53,34 @@ public: Standard_EXPORT Expr_FunctionDerivative(const Handle(Expr_GeneralFunction)& func, const Handle(Expr_NamedUnknown)& withX, const Standard_Integer deg); //! Returns the number of variables of . - Standard_EXPORT Standard_Integer NbOfVariables() const; + Standard_EXPORT Standard_Integer NbOfVariables() const Standard_OVERRIDE; //! Returns the variable denoted by in . //! Raises OutOfRange if greater than //! NbOfVariables of . - Standard_EXPORT Handle(Expr_NamedUnknown) Variable (const Standard_Integer index) const; + Standard_EXPORT Handle(Expr_NamedUnknown) Variable (const Standard_Integer index) const Standard_OVERRIDE; //! Computes the value of with the given variables. //! Raises DimensionMismatch if Length(vars) is different from //! Length(values). - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& values) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& values) const Standard_OVERRIDE; //! Returns a copy of with the same form. - Standard_EXPORT Handle(Expr_GeneralFunction) Copy() const; + Standard_EXPORT Handle(Expr_GeneralFunction) Copy() const Standard_OVERRIDE; //! Returns Derivative of for variable . - Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var) const; + Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var) const Standard_OVERRIDE; //! Returns Derivative of for variable with //! degree . - Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var, const Standard_Integer deg) const; + Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var, const Standard_Integer deg) const Standard_OVERRIDE; //! Tests if and are similar functions (same //! name and same used expression). - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralFunction)& func) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralFunction)& func) const Standard_OVERRIDE; //! Tests if is linear on variable on range - Standard_EXPORT Standard_Boolean IsLinearOnVariable (const Standard_Integer index) const; + Standard_EXPORT Standard_Boolean IsLinearOnVariable (const Standard_Integer index) const Standard_OVERRIDE; //! Returns the function of which is the derivative. Standard_EXPORT Handle(Expr_GeneralFunction) Function() const; @@ -91,7 +91,7 @@ public: //! Returns the derivation variable of . Standard_EXPORT Handle(Expr_NamedUnknown) DerivVariable() const; - Standard_EXPORT TCollection_AsciiString GetStringName() const; + Standard_EXPORT TCollection_AsciiString GetStringName() const Standard_OVERRIDE; Standard_EXPORT Handle(Expr_GeneralExpression) Expression() const; diff --git a/src/Expr/Expr_GreaterThan.hxx b/src/Expr/Expr_GreaterThan.hxx index c31ee36bec..0206ad9896 100644 --- a/src/Expr/Expr_GreaterThan.hxx +++ b/src/Expr/Expr_GreaterThan.hxx @@ -41,22 +41,22 @@ public: //! Creates the relation > . Standard_EXPORT Expr_GreaterThan(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_GreaterThanOrEqual.hxx b/src/Expr/Expr_GreaterThanOrEqual.hxx index 7c65e1983b..cfa4468e5b 100644 --- a/src/Expr/Expr_GreaterThanOrEqual.hxx +++ b/src/Expr/Expr_GreaterThanOrEqual.hxx @@ -41,22 +41,22 @@ public: //! Creates the relation >= . Standard_EXPORT Expr_GreaterThanOrEqual(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_LessThan.hxx b/src/Expr/Expr_LessThan.hxx index fcbe5808f4..c51bed33c5 100644 --- a/src/Expr/Expr_LessThan.hxx +++ b/src/Expr/Expr_LessThan.hxx @@ -41,22 +41,22 @@ public: //! Creates the relation < . Standard_EXPORT Expr_LessThan(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_LessThanOrEqual.hxx b/src/Expr/Expr_LessThanOrEqual.hxx index 21bcc7460c..a562c356ec 100644 --- a/src/Expr/Expr_LessThanOrEqual.hxx +++ b/src/Expr/Expr_LessThanOrEqual.hxx @@ -41,22 +41,22 @@ public: //! Creates the relation <= . Standard_EXPORT Expr_LessThanOrEqual(const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2); - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_LogOf10.hxx b/src/Expr/Expr_LogOf10.hxx index 668e902149..b4f5946408 100644 --- a/src/Expr/Expr_LogOf10.hxx +++ b/src/Expr/Expr_LogOf10.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_LogOfe.hxx b/src/Expr/Expr_LogOfe.hxx index 2adc1c21aa..02132393e9 100644 --- a/src/Expr/Expr_LogOfe.hxx +++ b/src/Expr/Expr_LogOfe.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_NamedConstant.hxx b/src/Expr/Expr_NamedConstant.hxx index 1a0eb4fde9..a0fd7ddcb6 100644 --- a/src/Expr/Expr_NamedConstant.hxx +++ b/src/Expr/Expr_NamedConstant.hxx @@ -50,46 +50,46 @@ public: //! returns the number of sub-expressions contained //! in (always returns zero) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! returns the -th sub-expression of //! raises OutOfRange - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if contains NamedUnknown. //! (returns always False) - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if is contained in . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the -th derivative on unknown of . //! Raises OutOfRange if <= 0 Standard_EXPORT virtual Handle(Expr_GeneralExpression) NDerivative (const Handle(Expr_NamedUnknown)& X, const Standard_Integer N) const Standard_OVERRIDE; //! Replaces all occurences of with in - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; diff --git a/src/Expr/Expr_NamedExpression.hxx b/src/Expr/Expr_NamedExpression.hxx index 85c5e0abe4..a70858094a 100644 --- a/src/Expr/Expr_NamedExpression.hxx +++ b/src/Expr/Expr_NamedExpression.hxx @@ -52,10 +52,10 @@ public: //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_NamedFunction.hxx b/src/Expr/Expr_NamedFunction.hxx index e3de7724f8..ef20ccb89b 100644 --- a/src/Expr/Expr_NamedFunction.hxx +++ b/src/Expr/Expr_NamedFunction.hxx @@ -58,36 +58,36 @@ public: Standard_EXPORT TCollection_AsciiString GetName() const; //! Returns the number of variables of . - Standard_EXPORT Standard_Integer NbOfVariables() const; + Standard_EXPORT Standard_Integer NbOfVariables() const Standard_OVERRIDE; //! Returns the variable denoted by in . //! Raises OutOfRange if is greater than //! NbOfVariables of , or less than or equal to zero. - Standard_EXPORT Handle(Expr_NamedUnknown) Variable (const Standard_Integer index) const; + Standard_EXPORT Handle(Expr_NamedUnknown) Variable (const Standard_Integer index) const Standard_OVERRIDE; //! Computes the value of with the given variables. //! Raises DimensionMismatch if Length(vars) is different from //! Length(values). - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& values) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& values) const Standard_OVERRIDE; //! Returns a copy of with the same form. - Standard_EXPORT Handle(Expr_GeneralFunction) Copy() const; + Standard_EXPORT Handle(Expr_GeneralFunction) Copy() const Standard_OVERRIDE; //! Returns Derivative of for variable . - Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var) const; + Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var) const Standard_OVERRIDE; //! Returns Derivative of for variable with //! degree . - Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var, const Standard_Integer deg) const; + Standard_EXPORT Handle(Expr_GeneralFunction) Derivative (const Handle(Expr_NamedUnknown)& var, const Standard_Integer deg) const Standard_OVERRIDE; //! Tests if and are similar functions (same //! name and same used expression). - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralFunction)& func) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralFunction)& func) const Standard_OVERRIDE; //! Tests if is linear on variable on range - Standard_EXPORT Standard_Boolean IsLinearOnVariable (const Standard_Integer index) const; + Standard_EXPORT Standard_Boolean IsLinearOnVariable (const Standard_Integer index) const Standard_OVERRIDE; - Standard_EXPORT TCollection_AsciiString GetStringName() const; + Standard_EXPORT TCollection_AsciiString GetStringName() const Standard_OVERRIDE; //! Returns equivalent expression of . Standard_EXPORT Handle(Expr_GeneralExpression) Expression() const; diff --git a/src/Expr/Expr_NamedUnknown.hxx b/src/Expr/Expr_NamedUnknown.hxx index 82457c3062..6338d429d0 100644 --- a/src/Expr/Expr_NamedUnknown.hxx +++ b/src/Expr/Expr_NamedUnknown.hxx @@ -65,44 +65,44 @@ public: //! Returns the number of sub-expressions contained //! in ( >= 0) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! Returns the -th sub-expression of //! raises OutOfRange if > NbSubExpressions(me) - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! Returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if contains NamedUnknown. - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if is contained in . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Replaces all occurences of with in //! Raises InvalidOperand if contains . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; diff --git a/src/Expr/Expr_NumericValue.hxx b/src/Expr/Expr_NumericValue.hxx index 42f1638005..5d6c3c829e 100644 --- a/src/Expr/Expr_NumericValue.hxx +++ b/src/Expr/Expr_NumericValue.hxx @@ -51,53 +51,53 @@ public: //! Returns the number of sub-expressions contained //! in ( >= 0) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! Returns the -th sub-expression of //! raises OutOfRange if > NbSubExpressions(me) - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! Returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if contains NamedUnknown. - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if is contained in . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the -th derivative on unknown of . //! Raises OutOfRange if <= 0 Standard_EXPORT virtual Handle(Expr_GeneralExpression) NDerivative (const Handle(Expr_NamedUnknown)& X, const Standard_Integer N) const Standard_OVERRIDE; //! Replaces all occurences of with in - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_PolyExpression.hxx b/src/Expr/Expr_PolyExpression.hxx index 9ef8faaf2c..33f3263b16 100644 --- a/src/Expr/Expr_PolyExpression.hxx +++ b/src/Expr/Expr_PolyExpression.hxx @@ -55,26 +55,26 @@ public: //! returns the number of sub-expressions contained //! in ( >= 2) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! Returns the sub-expression denoted by in //! Raises OutOfRange if > NbSubExpressions(me) - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! Does contains NamedUnknown ? - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if is contained in . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Replaces all occurences of with in //! Raises InvalidOperand if contains . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_PolyFunction.hxx b/src/Expr/Expr_PolyFunction.hxx index 2fb1dd5353..7b9d40dcf9 100644 --- a/src/Expr/Expr_PolyFunction.hxx +++ b/src/Expr/Expr_PolyFunction.hxx @@ -54,29 +54,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Product.hxx b/src/Expr/Expr_Product.hxx index 5d1f9e213f..d23187ed7b 100644 --- a/src/Expr/Expr_Product.hxx +++ b/src/Expr/Expr_Product.hxx @@ -51,29 +51,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Sign.hxx b/src/Expr/Expr_Sign.hxx index f2b2715ec6..bb6200d437 100644 --- a/src/Expr/Expr_Sign.hxx +++ b/src/Expr/Expr_Sign.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Sine.hxx b/src/Expr/Expr_Sine.hxx index fe94f44ae0..d004558cb8 100644 --- a/src/Expr/Expr_Sine.hxx +++ b/src/Expr/Expr_Sine.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_SingleRelation.hxx b/src/Expr/Expr_SingleRelation.hxx index fe706c445a..99a30707b8 100644 --- a/src/Expr/Expr_SingleRelation.hxx +++ b/src/Expr/Expr_SingleRelation.hxx @@ -52,24 +52,24 @@ public: Standard_EXPORT Handle(Expr_GeneralExpression) SecondMember() const; //! Tests if is linear between its NamedUnknowns. - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the number of relations contained in . - Standard_EXPORT Standard_Integer NbOfSubRelations() const; + Standard_EXPORT Standard_Integer NbOfSubRelations() const Standard_OVERRIDE; //! Returns the number of SingleRelations contained in //! (Always 1). - Standard_EXPORT Standard_Integer NbOfSingleRelations() const; + Standard_EXPORT Standard_Integer NbOfSingleRelations() const Standard_OVERRIDE; //! Returns the relation denoted by in . //! An exception is raised if index is out of range. - Standard_EXPORT Handle(Expr_GeneralRelation) SubRelation (const Standard_Integer index) const; + Standard_EXPORT Handle(Expr_GeneralRelation) SubRelation (const Standard_Integer index) const Standard_OVERRIDE; //! Tests if contains . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Replaces all occurences of with in . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; diff --git a/src/Expr/Expr_Sinh.hxx b/src/Expr/Expr_Sinh.hxx index aae2092886..54749ac015 100644 --- a/src/Expr/Expr_Sinh.hxx +++ b/src/Expr/Expr_Sinh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Square.hxx b/src/Expr/Expr_Square.hxx index d3a02c1d41..c5ac1633f8 100644 --- a/src/Expr/Expr_Square.hxx +++ b/src/Expr/Expr_Square.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_SquareRoot.hxx b/src/Expr/Expr_SquareRoot.hxx index 8101f3e145..d8b277e7cd 100644 --- a/src/Expr/Expr_SquareRoot.hxx +++ b/src/Expr/Expr_SquareRoot.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Sum.hxx b/src/Expr/Expr_Sum.hxx index ad3481dad9..284c6c782b 100644 --- a/src/Expr/Expr_Sum.hxx +++ b/src/Expr/Expr_Sum.hxx @@ -53,20 +53,20 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the -th derivative on unknown of . //! Raises OutOfRange if <= 0 @@ -76,10 +76,10 @@ public: //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_SystemRelation.hxx b/src/Expr/Expr_SystemRelation.hxx index db00bffd63..767dfdcc70 100644 --- a/src/Expr/Expr_SystemRelation.hxx +++ b/src/Expr/Expr_SystemRelation.hxx @@ -53,41 +53,41 @@ public: Standard_EXPORT void Remove (const Handle(Expr_GeneralRelation)& relation); //! Tests if is linear between its NamedUnknowns. - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the number of relations contained in . - Standard_EXPORT Standard_Integer NbOfSubRelations() const; + Standard_EXPORT Standard_Integer NbOfSubRelations() const Standard_OVERRIDE; //! Returns the number of SingleRelations contained in //! . - Standard_EXPORT Standard_Integer NbOfSingleRelations() const; + Standard_EXPORT Standard_Integer NbOfSingleRelations() const Standard_OVERRIDE; //! Returns the relation denoted by in . //! An exception is raised if is out of range. - Standard_EXPORT Handle(Expr_GeneralRelation) SubRelation (const Standard_Integer index) const; + Standard_EXPORT Handle(Expr_GeneralRelation) SubRelation (const Standard_Integer index) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsSatisfied() const; + Standard_EXPORT Standard_Boolean IsSatisfied() const Standard_OVERRIDE; //! Returns a GeneralRelation after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Simplified() const Standard_OVERRIDE; //! Replaces NamedUnknowns by associated expressions, //! and computes values in . - Standard_EXPORT void Simplify(); + Standard_EXPORT void Simplify() Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const; + Standard_EXPORT Handle(Expr_GeneralRelation) Copy() const Standard_OVERRIDE; //! Tests if contains . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Replaces all occurences of with in . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Tangent.hxx b/src/Expr/Expr_Tangent.hxx index fbe7064793..faf8d9d591 100644 --- a/src/Expr/Expr_Tangent.hxx +++ b/src/Expr/Expr_Tangent.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_Tanh.hxx b/src/Expr/Expr_Tanh.hxx index 8df9a5ee31..533cc690b9 100644 --- a/src/Expr/Expr_Tanh.hxx +++ b/src/Expr/Expr_Tanh.hxx @@ -47,29 +47,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_UnaryExpression.hxx b/src/Expr/Expr_UnaryExpression.hxx index 089cc121e3..db2df830e3 100644 --- a/src/Expr/Expr_UnaryExpression.hxx +++ b/src/Expr/Expr_UnaryExpression.hxx @@ -49,26 +49,26 @@ public: //! Returns the number of sub-expressions contained //! in ( >= 0) - Standard_EXPORT Standard_Integer NbSubExpressions() const; + Standard_EXPORT Standard_Integer NbSubExpressions() const Standard_OVERRIDE; //! Returns the -th sub-expression of . //! Raises OutOfRange if > NbSubExpressions(me) - Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const; + Standard_EXPORT const Handle(Expr_GeneralExpression)& SubExpression (const Standard_Integer I) const Standard_OVERRIDE; //! Does contains NamedUnknown ? - Standard_EXPORT Standard_Boolean ContainsUnknowns() const; + Standard_EXPORT Standard_Boolean ContainsUnknowns() const Standard_OVERRIDE; //! Tests if is contained in . - Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const; + Standard_EXPORT Standard_Boolean Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_OVERRIDE; //! Replaces all occurences of with in //! Raises InvalidOperand if contains . - Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with); + Standard_EXPORT void Replace (const Handle(Expr_NamedUnknown)& var, const Handle(Expr_GeneralExpression)& with) Standard_OVERRIDE; //! Returns a GeneralExpression after replacement of //! NamedUnknowns by an associated expression, and after //! values computation. - Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Simplified() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_UnaryFunction.hxx b/src/Expr/Expr_UnaryFunction.hxx index 3fc7ea12ec..edafc730df 100644 --- a/src/Expr/Expr_UnaryFunction.hxx +++ b/src/Expr/Expr_UnaryFunction.hxx @@ -54,29 +54,29 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! returns the derivative on unknown of . - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the value of (as a Real) by //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Expr/Expr_UnaryMinus.hxx b/src/Expr/Expr_UnaryMinus.hxx index e4af3cd0cd..ad3f9fb071 100644 --- a/src/Expr/Expr_UnaryMinus.hxx +++ b/src/Expr/Expr_UnaryMinus.hxx @@ -49,20 +49,20 @@ public: //! Returns a GeneralExpression after a simplification //! of the arguments of . - Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const; + Standard_EXPORT Handle(Expr_GeneralExpression) ShallowSimplified() const Standard_OVERRIDE; //! Returns a copy of having the same unknowns and functions. - Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const; + Standard_EXPORT Handle(Expr_GeneralExpression) Copy() const Standard_OVERRIDE; //! Tests if and define the same expression. //! This method does not include any simplification before //! testing. - Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const; + Standard_EXPORT Standard_Boolean IsIdentical (const Handle(Expr_GeneralExpression)& Other) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsLinear() const; + Standard_EXPORT Standard_Boolean IsLinear() const Standard_OVERRIDE; //! Returns the derivative on unknown of - Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const; + Standard_EXPORT Handle(Expr_GeneralExpression) Derivative (const Handle(Expr_NamedUnknown)& X) const Standard_OVERRIDE; //! Returns the -th derivative on unknown of . //! Raises OutOfRange if <= 0 @@ -72,10 +72,10 @@ public: //! replacement of by . //! Raises NotEvaluable if contains NamedUnknown not //! in or NumericError if result cannot be computed. - Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const; + Standard_EXPORT Standard_Real Evaluate (const Expr_Array1OfNamedUnknown& vars, const TColStd_Array1OfReal& vals) const Standard_OVERRIDE; //! returns a string representing in a readable way. - Standard_EXPORT TCollection_AsciiString String() const; + Standard_EXPORT TCollection_AsciiString String() const Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_CCLocFOfLocECC.hxx b/src/Extrema/Extrema_CCLocFOfLocECC.hxx index 432c972d1f..75c9dea247 100644 --- a/src/Extrema/Extrema_CCLocFOfLocECC.hxx +++ b/src/Extrema/Extrema_CCLocFOfLocECC.hxx @@ -64,10 +64,10 @@ public: Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& UV, math_Vector& F) Standard_OVERRIDE; //! Calculate Fi'(U,V). - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF) Standard_OVERRIDE; //! Calculate Fi(U,V) and Fi'(U,V). - Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx b/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx index 4748dedb7c..feae30e7b8 100644 --- a/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx +++ b/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx @@ -64,10 +64,10 @@ public: Standard_EXPORT virtual Standard_Boolean Value (const math_Vector& UV, math_Vector& F) Standard_OVERRIDE; //! Calculate Fi'(U,V). - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF) Standard_OVERRIDE; //! Calculate Fi(U,V) and Fi'(U,V). - Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_FuncExtCS.hxx b/src/Extrema/Extrema_FuncExtCS.hxx index 6513b47417..4a07792a3c 100644 --- a/src/Extrema/Extrema_FuncExtCS.hxx +++ b/src/Extrema/Extrema_FuncExtCS.hxx @@ -56,18 +56,18 @@ public: //! sets the field mysurf of the function. Standard_EXPORT void Initialize (const Adaptor3d_Curve& C, const Adaptor3d_Surface& S); - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! Calculation of Fi(U,V). - Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F) Standard_OVERRIDE; //! Calculation of Fi'(U,V). - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF) Standard_OVERRIDE; //! Calculation of Fi(U,V) and Fi'(U,V). - Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_FuncExtPS.hxx b/src/Extrema/Extrema_FuncExtPS.hxx index f61be36c9b..2dc9213588 100644 --- a/src/Extrema/Extrema_FuncExtPS.hxx +++ b/src/Extrema/Extrema_FuncExtPS.hxx @@ -75,18 +75,18 @@ public: //! sets the field mysurf of the function. Standard_EXPORT void SetPoint (const gp_Pnt& P); - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! Calculate Fi(U,V). - Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F) Standard_OVERRIDE; //! Calculate Fi'(U,V). - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF) Standard_OVERRIDE; //! Calculate Fi(U,V) and Fi'(U,V). - Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_FuncExtSS.hxx b/src/Extrema/Extrema_FuncExtSS.hxx index 8eb9a8ea63..f8423716ef 100644 --- a/src/Extrema/Extrema_FuncExtSS.hxx +++ b/src/Extrema/Extrema_FuncExtSS.hxx @@ -52,18 +52,18 @@ public: //! sets the field mysurf of the function. Standard_EXPORT void Initialize (const Adaptor3d_Surface& S1, const Adaptor3d_Surface& S2); - Standard_EXPORT Standard_Integer NbVariables() const; + Standard_EXPORT Standard_Integer NbVariables() const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbEquations() const; + Standard_EXPORT Standard_Integer NbEquations() const Standard_OVERRIDE; //! Calculate Fi(U,V). - Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F); + Standard_EXPORT Standard_Boolean Value (const math_Vector& UV, math_Vector& F) Standard_OVERRIDE; //! Calculate Fi'(U,V). - Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Derivatives (const math_Vector& UV, math_Matrix& DF) Standard_OVERRIDE; //! Calculate Fi(U,V) and Fi'(U,V). - Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF); + Standard_EXPORT Standard_Boolean Values (const math_Vector& UV, math_Vector& F, math_Matrix& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx index a2250a203d..a803503354 100644 --- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx +++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx index 9720ae127b..9708eba001 100644 --- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx +++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt2d& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx index ee66363c13..7199fc2d32 100644 --- a/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx +++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx index 1f6c1c681f..cfa3da7f79 100644 --- a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx +++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt2d& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx index 2d8445a808..492d6bc358 100644 --- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx +++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx index dd197134b6..ecef1b2527 100644 --- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx +++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt2d& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/FEmTool/FEmTool_ProfileMatrix.hxx b/src/FEmTool/FEmTool_ProfileMatrix.hxx index 2591b1e366..f20e69d06f 100644 --- a/src/FEmTool/FEmTool_ProfileMatrix.hxx +++ b/src/FEmTool/FEmTool_ProfileMatrix.hxx @@ -47,31 +47,31 @@ public: Standard_EXPORT FEmTool_ProfileMatrix(const TColStd_Array1OfInteger& FirstIndexes); - Standard_EXPORT void Init (const Standard_Real Value); + Standard_EXPORT void Init (const Standard_Real Value) Standard_OVERRIDE; - Standard_EXPORT Standard_Real& ChangeValue (const Standard_Integer I, const Standard_Integer J); + Standard_EXPORT Standard_Real& ChangeValue (const Standard_Integer I, const Standard_Integer J) Standard_OVERRIDE; //! To make a Factorization of - Standard_EXPORT Standard_Boolean Decompose(); + Standard_EXPORT Standard_Boolean Decompose() Standard_OVERRIDE; //! Direct Solve of AX = B - Standard_EXPORT void Solve (const math_Vector& B, math_Vector& X) const; + Standard_EXPORT void Solve (const math_Vector& B, math_Vector& X) const Standard_OVERRIDE; //! Make Preparation to iterative solve - Standard_EXPORT Standard_Boolean Prepare(); + Standard_EXPORT Standard_Boolean Prepare() Standard_OVERRIDE; //! Iterative solve of AX = B - Standard_EXPORT void Solve (const math_Vector& B, const math_Vector& Init, math_Vector& X, math_Vector& Residual, const Standard_Real Tolerance = 1.0e-8, const Standard_Integer NbIterations = 50) const; + Standard_EXPORT void Solve (const math_Vector& B, const math_Vector& Init, math_Vector& X, math_Vector& Residual, const Standard_Real Tolerance = 1.0e-8, const Standard_Integer NbIterations = 50) const Standard_OVERRIDE; //! returns the product of a SparseMatrix by a vector. //! An exception is raised if the dimensions are different - Standard_EXPORT void Multiplied (const math_Vector& X, math_Vector& MX) const; + Standard_EXPORT void Multiplied (const math_Vector& X, math_Vector& MX) const Standard_OVERRIDE; //! returns the row range of a matrix. - Standard_EXPORT Standard_Integer RowNumber() const; + Standard_EXPORT Standard_Integer RowNumber() const Standard_OVERRIDE; //! returns the column range of the matrix. - Standard_EXPORT Standard_Integer ColNumber() const; + Standard_EXPORT Standard_Integer ColNumber() const Standard_OVERRIDE; Standard_EXPORT Standard_Boolean IsInProfile (const Standard_Integer i, const Standard_Integer j) const; diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx b/src/FWOSDriver/FWOSDriver_DriverFactory.hxx index 9c5423fe43..1ab0e67535 100644 --- a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx +++ b/src/FWOSDriver/FWOSDriver_DriverFactory.hxx @@ -36,7 +36,7 @@ public: Standard_EXPORT FWOSDriver_DriverFactory(); - Standard_EXPORT Handle(CDF_MetaDataDriver) Build() const; + Standard_EXPORT Handle(CDF_MetaDataDriver) Build() const Standard_OVERRIDE; diff --git a/src/Font/Font_BRepFont.hxx b/src/Font/Font_BRepFont.hxx index 28eac4ca5f..e3e5d15aec 100755 --- a/src/Font/Font_BRepFont.hxx +++ b/src/Font/Font_BRepFont.hxx @@ -61,7 +61,7 @@ public: const Standard_Real theSize); //! Release currently loaded font. - Standard_EXPORT virtual void Release(); + Standard_EXPORT virtual void Release() Standard_OVERRIDE; //! Initialize the font. //! @param theFontPath FULL path to the font diff --git a/src/GccInt/GccInt_BCirc.hxx b/src/GccInt/GccInt_BCirc.hxx index f8ad45acfd..b2a4c7e084 100644 --- a/src/GccInt/GccInt_BCirc.hxx +++ b/src/GccInt/GccInt_BCirc.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT virtual gp_Circ2d Circle() const Standard_OVERRIDE; //! Returns GccInt_Cir, which is the type of any GccInt_BCirc bisecting curve. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/GccInt/GccInt_BElips.hxx b/src/GccInt/GccInt_BElips.hxx index d5d7dab784..0eb0b3c2df 100644 --- a/src/GccInt/GccInt_BElips.hxx +++ b/src/GccInt/GccInt_BElips.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT virtual gp_Elips2d Ellipse() const Standard_OVERRIDE; //! Returns GccInt_Ell, which is the type of any GccInt_BElips bisecting curve. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/GccInt/GccInt_BHyper.hxx b/src/GccInt/GccInt_BHyper.hxx index 0cf97351c1..6e078360c6 100644 --- a/src/GccInt/GccInt_BHyper.hxx +++ b/src/GccInt/GccInt_BHyper.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT virtual gp_Hypr2d Hyperbola() const Standard_OVERRIDE; //! Returns GccInt_Hpr, which is the type of any GccInt_BHyper bisecting curve. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/GccInt/GccInt_BLine.hxx b/src/GccInt/GccInt_BLine.hxx index 20b768f65b..3ab39031eb 100644 --- a/src/GccInt/GccInt_BLine.hxx +++ b/src/GccInt/GccInt_BLine.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT virtual gp_Lin2d Line() const Standard_OVERRIDE; //! Returns GccInt_Lin, which is the type of any GccInt_BLine bisecting line. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/GccInt/GccInt_BParab.hxx b/src/GccInt/GccInt_BParab.hxx index 70b8ca42a1..354d844773 100644 --- a/src/GccInt/GccInt_BParab.hxx +++ b/src/GccInt/GccInt_BParab.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT virtual gp_Parab2d Parabola() const Standard_OVERRIDE; //! Returns GccInt_Par, which is the type of any GccInt_BParab bisecting curve. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/GccInt/GccInt_BPoint.hxx b/src/GccInt/GccInt_BPoint.hxx index a5e3a462ef..3226006f1c 100644 --- a/src/GccInt/GccInt_BPoint.hxx +++ b/src/GccInt/GccInt_BPoint.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT virtual gp_Pnt2d Point() const Standard_OVERRIDE; //! Returns GccInt_Pnt, which is the type of any GccInt_BPoint bisecting object. - Standard_EXPORT GccInt_IType ArcType() const; + Standard_EXPORT GccInt_IType ArcType() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_Axis1Placement.hxx b/src/Geom/Geom_Axis1Placement.hxx index 98036bbac6..847960fc57 100644 --- a/src/Geom/Geom_Axis1Placement.hxx +++ b/src/Geom/Geom_Axis1Placement.hxx @@ -68,13 +68,13 @@ public: Standard_EXPORT Handle(Geom_Axis1Placement) Reversed() const; //! Assigns V to the unit vector of this axis. - Standard_EXPORT void SetDirection (const gp_Dir& V); + Standard_EXPORT void SetDirection (const gp_Dir& V) Standard_OVERRIDE; //! Applies the transformation T to this axis. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object, which is a copy of this axis. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_Axis2Placement.hxx b/src/Geom/Geom_Axis2Placement.hxx index 60d60e3e20..6d87fcd4d9 100644 --- a/src/Geom/Geom_Axis2Placement.hxx +++ b/src/Geom/Geom_Axis2Placement.hxx @@ -88,7 +88,7 @@ public: //! Raised if V and the previous "XDirection" are parallel //! because it is impossible to calculate the new "XDirection" //! and the new "YDirection". - Standard_EXPORT void SetDirection (const gp_Dir& V); + Standard_EXPORT void SetDirection (const gp_Dir& V) Standard_OVERRIDE; //! Changes the "XDirection" of the axis placement, Vx is the @@ -124,10 +124,10 @@ public: //! "YDirection" are transformed with T. The resulting //! main "Direction" of is the cross product between //! the "XDirection" and the "YDirection" after transformation. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this coordinate system. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_BSplineCurve.hxx b/src/Geom/Geom_BSplineCurve.hxx index d749f22fb6..1f7830f531 100644 --- a/src/Geom/Geom_BSplineCurve.hxx +++ b/src/Geom/Geom_BSplineCurve.hxx @@ -276,13 +276,13 @@ public: //! initial curve becomes the EndPoint of the reversed curve //! and the EndPoint of the initial curve becomes the StartPoint //! of the reversed curve. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . //! //! returns UFirst + ULast - U - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Modifies this BSpline curve by segmenting it between //! U1 and U2. Either of these values can be outside the @@ -439,7 +439,7 @@ public: //! Returns the continuity of the curve, the curve is at least C0. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Check if curve has at least G1 continuity in interval [theTf, theTl] @@ -457,10 +457,10 @@ public: //! Warnings : //! The first and the last point can be different from the first //! pole and the last pole of the curve. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns True if the curve is periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns True if the weights are not identical. @@ -480,7 +480,7 @@ public: //! than Cd-p where p is the maximum multiplicity of the interior //! Knots. In the interior of a knot span the curve is infinitely //! continuously differentiable. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the degree of this BSpline curve. //! The degree of a Geom_BSplineCurve curve cannot @@ -489,16 +489,16 @@ public: Standard_EXPORT Standard_Integer Degree() const; //! Returns in P the point of parameter U. - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C2. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C3. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const Standard_OVERRIDE; //! For the point of parameter U of this BSpline curve, //! computes the vector corresponding to the Nth derivative. @@ -522,7 +522,7 @@ public: //! the same as if we consider the whole definition of the //! curve. Of course the evaluations are different outside //! this parametric domain. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Raised if FromK1 = ToK2. //! @@ -579,7 +579,7 @@ public: //! The last point of the curve is different from the last //! pole of the curve if the multiplicity of the last knot //! is lower than Degree. - Standard_EXPORT gp_Pnt EndPoint() const; + Standard_EXPORT gp_Pnt EndPoint() const Standard_OVERRIDE; //! Returns the index in the knot array of the knot //! corresponding to the first or last parameter of this BSpline curve. @@ -594,7 +594,7 @@ public: //! Returns the value of the first parameter of this //! BSpline curve. This is a knot value. //! The first parameter is the one of the start point of the BSpline curve. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the knot of range Index. When there is a knot @@ -704,7 +704,7 @@ public: //! Computes the parametric value of the end point of the curve. //! It is a knot value. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Locates the parametric value U in the sequence of knots. @@ -758,7 +758,7 @@ public: //! Warnings : //! This point is different from the first pole of the curve if the //! multiplicity of the first knot is lower than Degree. - Standard_EXPORT gp_Pnt StartPoint() const; + Standard_EXPORT gp_Pnt StartPoint() const Standard_OVERRIDE; //! Returns the weight of the pole of range Index . //! Raised if Index < 1 or Index > NbPoles. @@ -773,7 +773,7 @@ public: Standard_EXPORT const TColStd_Array1OfReal* Weights() const; //! Applies the transformation T to this BSpline curve. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the value of the maximum degree of the normalized @@ -789,7 +789,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real Tolerance3D, Standard_Real& UTolerance); //! Creates a new object which is a copy of this BSpline curve. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; //! Comapare two Bspline curve on identity; Standard_EXPORT Standard_Boolean IsEqual (const Handle(Geom_BSplineCurve)& theOther, const Standard_Real thePreci) const; diff --git a/src/Geom/Geom_BSplineSurface.hxx b/src/Geom/Geom_BSplineSurface.hxx index 515f7872f3..725d057c42 100644 --- a/src/Geom/Geom_BSplineSurface.hxx +++ b/src/Geom/Geom_BSplineSurface.hxx @@ -319,7 +319,7 @@ public: //! direction is reversed. Hence the orientation of the //! surface is reversed. //! The knots and poles tables are modified. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Changes the orientation of this BSpline surface in the //! V parametric direction. The bounds of the @@ -327,7 +327,7 @@ public: //! direction is reversed. Hence the orientation of the //! surface is reversed. //! The knots and poles tables are modified. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the u parameter on the modified //! surface, produced by reversing its U parametric @@ -337,7 +337,7 @@ public: //! where UFirst, ULast are //! the values of the first and last parameters of this //! BSpline surface, in the u parametric directions. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, produced by reversing its V parametric @@ -347,7 +347,7 @@ public: //! VFirst and VLast are //! the values of the first and last parameters of this //! BSpline surface, in the v pametric directions. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Increases the degrees of this BSpline surface to //! UDegree and VDegree in the u and v parametric @@ -769,31 +769,31 @@ public: //! Returns true if the first control points row and the last //! control points row are identical. The tolerance criterion //! is Resolution from package gp. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns true if the first control points column and the //! last last control points column are identical. //! The tolerance criterion is Resolution from package gp. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True if the order of continuity of the surface in the //! U direction is N. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True if the order of continuity of the surface //! in the V direction is N. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True if the surface is closed in the U direction //! and if the B-spline has been turned into a periodic surface //! using the function SetUPeriodic. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns False if for each row of weights all the weights @@ -809,7 +809,7 @@ public: //! Returns True if the surface is closed in the V direction //! and if the B-spline has been turned into a periodic //! surface using the function SetVPeriodic. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Returns False if for each column of weights all the weights @@ -828,7 +828,7 @@ public: //! knots UKnots and VKnots only if the first knots and the //! last knots have a multiplicity equal to UDegree + 1 or //! VDegree + 1 - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the continuity of the surface : @@ -844,7 +844,7 @@ public: //! Example : //! If the surface is C1 in the V direction and C2 in the U //! direction this function returns Shape = C1. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Computes the Index of the UKnots which gives the first @@ -1050,16 +1050,16 @@ public: //! value and derivatives computation Standard_EXPORT const TColStd_Array2OfReal* Weights() const; - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Raised if the continuity of the surface is not C1. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Raised if the continuity of the surface is not C2. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Raised if the continuity of the surface is not C3. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Nu is the order of derivation in the U parametric direction and @@ -1083,7 +1083,7 @@ public: //! the evaluations are the same as if we consider the whole //! definition of the surface. Of course the evaluations are //! different outside this parametric domain. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Raised if FromUK1 = ToUK2 or FromVK1 = ToVK2. //! @@ -1149,12 +1149,12 @@ public: //! Computes the U isoparametric curve. //! A B-spline curve is returned. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. //! A B-spline curve is returned. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the U isoparametric curve. @@ -1170,7 +1170,7 @@ public: Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V, const Standard_Boolean CheckRational) const; //! Applies the transformation T to this BSpline surface. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the value of the maximum degree of the normalized @@ -1190,7 +1190,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real Tolerance3D, Standard_Real& UTolerance, Standard_Real& VTolerance); //! Creates a new object which is a copy of this BSpline surface. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_BezierCurve.hxx b/src/Geom/Geom_BezierCurve.hxx index add41c0dcb..1d7a9b576c 100644 --- a/src/Geom/Geom_BezierCurve.hxx +++ b/src/Geom/Geom_BezierCurve.hxx @@ -168,13 +168,13 @@ public: //! Reverses the direction of parametrization of //! Value (NewU) = Value (1 - OldU) - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . //! //! returns 1-U - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Segments the curve between U1 and U2 which can be out @@ -221,15 +221,15 @@ public: //! Returns True if the distance between the first point //! and the last point of the curve is lower or equal to //! the Resolution from package gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Continuity of the curve, returns True. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True if the parametrization of a curve is periodic. //! (P(u) = P(u + T) T = constante) - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns false if all the weights are identical. The tolerance @@ -237,7 +237,7 @@ public: Standard_EXPORT Standard_Boolean IsRational() const; //! a Bezier curve is CN - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the polynomial degree of the curve. //! it is the number of poles - 1 @@ -246,11 +246,11 @@ public: //! parameter U can be out of the bounds of the curve. Standard_EXPORT Standard_Integer Degree() const; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const Standard_OVERRIDE; //! For this Bezier curve, computes //! - the point P of parameter U, or @@ -259,27 +259,27 @@ public: //! - V2, the second derivative vector, //! - V3, the third derivative vector. //! Note: the parameter U can be outside the bounds of the curve. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const Standard_OVERRIDE; //! For the point of parameter U of this Bezier curve, //! computes the vector corresponding to the Nth derivative. //! Note: the parameter U can be outside the bounds of the curve. //! Exceptions Standard_RangeError if N is less than 1. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Returns Value (U=0.), it is the first control point of the curve. - Standard_EXPORT gp_Pnt StartPoint() const; + Standard_EXPORT gp_Pnt StartPoint() const Standard_OVERRIDE; //! Returns Value (U=1.), it is the last control point of the Bezier curve. - Standard_EXPORT gp_Pnt EndPoint() const; + Standard_EXPORT gp_Pnt EndPoint() const Standard_OVERRIDE; //! Returns the value of the first parameter of this //! Bezier curve. This is 0.0, which gives the start point of this Bezier curve - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the value of the last parameter of this //! Bezier curve. This is 1.0, which gives the end point of this Bezier curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the number of poles of this Bezier curve. Standard_EXPORT Standard_Integer NbPoles() const; @@ -306,7 +306,7 @@ public: Standard_EXPORT void Weights (TColStd_Array1OfReal& W) const; //! Applies the transformation T to this Bezier curve. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the value of the maximum polynomial degree @@ -321,7 +321,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real Tolerance3D, Standard_Real& UTolerance); //! Creates a new object which is a copy of this Bezier curve. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_BezierSurface.hxx b/src/Geom/Geom_BezierSurface.hxx index 5bf2ea2b35..17b584013c 100644 --- a/src/Geom/Geom_BezierSurface.hxx +++ b/src/Geom/Geom_BezierSurface.hxx @@ -394,7 +394,7 @@ public: //! u parametric direction. The bounds of the //! surface are not changed, but the given parametric //! direction is reversed. Hence, the orientation of the surface is reversed. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Computes the u (or v) parameter on the modified //! surface, produced by reversing its u (or v) parametric @@ -402,14 +402,14 @@ public: //! parameter V) on this Bezier surface. //! In the case of a Bezier surface, these functions return respectively: //! - 1.-U, or 1.-V. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this Bezier surface in the //! v parametric direction. The bounds of the //! surface are not changed, but the given parametric //! direction is reversed. Hence, the orientation of the //! surface is reversed. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the u (or v) parameter on the modified //! surface, produced by reversing its u (or v) parametric @@ -417,24 +417,24 @@ public: //! parameter V) on this Bezier surface. //! In the case of a Bezier surface, these functions return respectively: //! - 1.-U, or 1.-V. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Returns the parametric bounds U1, U2, V1 and V2 of //! this Bezier surface. //! In the case of a Bezier surface, this function returns //! U1 = 0, V1 = 0, U2 = 1, V2 = 1. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the continuity of the surface CN : the order of //! continuity is infinite. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes P, the point of parameters (U, V) of this Bezier surface, and //! - one or more of the following sets of vectors: @@ -444,7 +444,7 @@ public: //! - D3U, D3V, D3UUV and D3UVV, the third //! derivative vectors at this point. //! Note: The parameters U and V can be outside the bounds of the surface. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the u //! parametric direction, and Nv in the v parametric @@ -453,7 +453,7 @@ public: //! Exceptions //! Standard_RangeError if: //! - Nu + Nv is less than 1, or Nu or Nv is negative. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Returns the number of poles in the U direction. Standard_EXPORT Standard_Integer NbUPoles() const; @@ -480,7 +480,7 @@ public: //! Computes the U isoparametric curve. For a Bezier surface the //! UIso curve is a Bezier curve. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Returns the degree of the surface in the V direction it is @@ -490,7 +490,7 @@ public: //! Computes the V isoparametric curve. For a Bezier surface the //! VIso curve is a Bezier curve. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Returns the weight of range UIndex, VIndex //! @@ -508,25 +508,25 @@ public: //! Returns True if the first control points row and the //! last control points row are identical. The tolerance //! criterion is Resolution from package gp. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns True if the first control points column //! and the last control points column are identical. //! The tolerance criterion is Resolution from package gp. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True, a Bezier surface is always CN - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True, a BezierSurface is always CN - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Returns False if the weights are identical in the U direction, @@ -547,7 +547,7 @@ public: Standard_EXPORT Standard_Boolean IsVRational() const; //! Applies the transformation T to this Bezier surface. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the value of the maximum polynomial degree of a @@ -567,7 +567,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real Tolerance3D, Standard_Real& UTolerance, Standard_Real& VTolerance); //! Creates a new object which is a copy of this Bezier surface. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_CartesianPoint.hxx b/src/Geom/Geom_CartesianPoint.hxx index 513d1ef7a0..ec99c80b66 100644 --- a/src/Geom/Geom_CartesianPoint.hxx +++ b/src/Geom/Geom_CartesianPoint.hxx @@ -62,27 +62,27 @@ public: Standard_EXPORT void SetZ (const Standard_Real Z); //! Returns the coordinates of . - Standard_EXPORT void Coord (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const; + Standard_EXPORT void Coord (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const Standard_OVERRIDE; //! Returns a non transient cartesian point with //! the same coordinates as . - Standard_EXPORT gp_Pnt Pnt() const; + Standard_EXPORT gp_Pnt Pnt() const Standard_OVERRIDE; //! Returns the X coordinate of . - Standard_EXPORT Standard_Real X() const; + Standard_EXPORT Standard_Real X() const Standard_OVERRIDE; //! Returns the Y coordinate of . - Standard_EXPORT Standard_Real Y() const; + Standard_EXPORT Standard_Real Y() const Standard_OVERRIDE; //! Returns the Z coordinate of . - Standard_EXPORT Standard_Real Z() const; + Standard_EXPORT Standard_Real Z() const Standard_OVERRIDE; //! Applies the transformation T to this point. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this point. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_Conic.hxx b/src/Geom/Geom_Conic.hxx index 6852052f01..649c7f1c3b 100644 --- a/src/Geom/Geom_Conic.hxx +++ b/src/Geom/Geom_Conic.hxx @@ -123,18 +123,18 @@ public: //! Reverses the direction of parameterization of . //! The local coordinate system of the conic is modified. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . - Standard_EXPORT virtual Standard_Real ReversedParameter (const Standard_Real U) const = 0; + Standard_EXPORT virtual Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE = 0; //! The continuity of the conic is Cn. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns True. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; diff --git a/src/Geom/Geom_ConicalSurface.hxx b/src/Geom/Geom_ConicalSurface.hxx index 06215eda9e..fb653d550e 100644 --- a/src/Geom/Geom_ConicalSurface.hxx +++ b/src/Geom/Geom_ConicalSurface.hxx @@ -122,7 +122,7 @@ public: Standard_EXPORT gp_Cone Cone() const; //! return 2.PI - U. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Computes the u (or v) parameter on the modified //! surface, when reversing its u (or v) parametric @@ -130,7 +130,7 @@ public: //! parameter V) on this cone. //! In the case of a cone, these functions return respectively: //! - 2.*Pi - U, -V. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Changes the orientation of this cone in the v //! parametric direction. The bounds of the surface are @@ -185,7 +185,7 @@ public: //! The conical surface is infinite in the V direction so //! V1 = Realfirst from Standard and V2 = RealLast. //! U1 = 0 and U2 = 2*PI. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the coefficients of the implicit equation of the @@ -210,22 +210,22 @@ public: Standard_EXPORT Standard_Real SemiAngle() const; //! returns True. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! returns False. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Builds the U isoparametric line of this cone. The //! origin of this line is on the reference plane of this //! cone (i.e. the plane defined by the origin, "X Direction" //! and "Y Direction" of the local coordinate system of this cone). - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Builds the V isoparametric circle of this cone. It is the //! circle on this cone, located in the plane of Z @@ -237,7 +237,7 @@ public: //! If the V isoparametric circle is close to the apex of //! this cone, the radius of the circle becomes very small. //! It is possible to have a circle with radius equal to 0.0. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. @@ -247,22 +247,22 @@ public: //! where Loc is the origin of the placement plane (XAxis, YAxis) //! XDir is the direction of the XAxis and YDir the direction of //! the YAxis. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in the //! directions U and V. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second derivatives //! in the directions U and V. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the third //! derivatives in the directions U and V. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the u //! parametric direction, and Nv in the v parametric @@ -271,13 +271,13 @@ public: //! Standard_RangeError if: //! - Nu + Nv is less than 1, //! - Nu or Nv is negative. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this cone. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this cone. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_CylindricalSurface.hxx b/src/Geom/Geom_CylindricalSurface.hxx index 28a28ad788..11de92af51 100644 --- a/src/Geom/Geom_CylindricalSurface.hxx +++ b/src/Geom/Geom_CylindricalSurface.hxx @@ -106,12 +106,12 @@ public: //! Return the parameter on the Ureversed surface for //! the point of parameter U on . //! Return 2.PI - U. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Return the parameter on the Vreversed surface for //! the point of parameter V on . //! Return -V - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -139,7 +139,7 @@ public: //! The CylindricalSurface is infinite in the V direction so //! V1 = Realfirst, V2 = RealLast from package Standard. //! U1 = 0 and U2 = 2*PI. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the coefficients of the implicit equation of the quadric @@ -153,28 +153,28 @@ public: Standard_EXPORT Standard_Real Radius() const; //! Returns True. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! The UIso curve is a Line. The location point of this line is //! on the placement plane (XAxis, YAxis) of the surface. //! This line is parallel to the axis of symmetry of the surface. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! The VIso curve is a circle. The start point of this circle //! (U = 0) is defined with the "XAxis" of the surface. //! The center of the circle is on the symmetry axis. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. @@ -183,34 +183,34 @@ public: //! where Loc is the origin of the placement plane (XAxis, YAxis) //! XDir is the direction of the XAxis and YDir the direction of //! the YAxis. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in the //! directions U and V. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second derivatives //! in the directions U and V. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first, the second and the //! third derivatives in the directions U and V. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u and Nv //! in the direction v. //! Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this cylinder. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this cylinder. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_Direction.hxx b/src/Geom/Geom_Direction.hxx index 1f2262957b..c428a16aea 100644 --- a/src/Geom/Geom_Direction.hxx +++ b/src/Geom/Geom_Direction.hxx @@ -78,24 +78,24 @@ public: Standard_EXPORT gp_Dir Dir() const; //! returns 1.0 which is the magnitude of any unit vector. - Standard_EXPORT Standard_Real Magnitude() const; + Standard_EXPORT Standard_Real Magnitude() const Standard_OVERRIDE; //! returns 1.0 which is the square magnitude of any unit vector. - Standard_EXPORT Standard_Real SquareMagnitude() const; + Standard_EXPORT Standard_Real SquareMagnitude() const Standard_OVERRIDE; //! Computes the cross product between and . //! //! Raised if the two vectors are parallel because it is //! not possible to have a direction with null length. - Standard_EXPORT void Cross (const Handle(Geom_Vector)& Other); + Standard_EXPORT void Cross (const Handle(Geom_Vector)& Other) Standard_OVERRIDE; //! Computes the triple vector product ^(V1 ^ V2). //! //! Raised if V1 and V2 are parallel or and (V1 ^ V2) are //! parallel - Standard_EXPORT void CrossCross (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2); + Standard_EXPORT void CrossCross (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) Standard_OVERRIDE; //! Computes the cross product between and . @@ -103,20 +103,20 @@ public: //! //! Raised if the two vectors are parallel because it is //! not possible to have a direction with null length. - Standard_EXPORT Handle(Geom_Vector) Crossed (const Handle(Geom_Vector)& Other) const; + Standard_EXPORT Handle(Geom_Vector) Crossed (const Handle(Geom_Vector)& Other) const Standard_OVERRIDE; //! Computes the triple vector product ^(V1 ^ V2). //! //! Raised if V1 and V2 are parallel or and (V1 ^ V2) are //! parallel - Standard_EXPORT Handle(Geom_Vector) CrossCrossed (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const; + Standard_EXPORT Handle(Geom_Vector) CrossCrossed (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const Standard_OVERRIDE; //! Applies the transformation T to this unit vector, then normalizes it. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this unit vector. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_ElementarySurface.hxx b/src/Geom/Geom_ElementarySurface.hxx index 63e312d35e..a77b0669fd 100644 --- a/src/Geom/Geom_ElementarySurface.hxx +++ b/src/Geom/Geom_ElementarySurface.hxx @@ -108,7 +108,7 @@ public: //! Reverses the U parametric direction of the surface. - Standard_EXPORT virtual void UReverse(); + Standard_EXPORT virtual void UReverse() Standard_OVERRIDE; //! Return the parameter on the Ureversed surface for //! the point of parameter U on . @@ -116,11 +116,11 @@ public: //! me->UReversed()->Value(me->UReversedParameter(U),V) //! is the same point as //! me->Value(U,V) - Standard_EXPORT virtual Standard_Real UReversedParameter (const Standard_Real U) const = 0; + Standard_EXPORT virtual Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE = 0; //! Reverses the V parametric direction of the surface. - Standard_EXPORT virtual void VReverse(); + Standard_EXPORT virtual void VReverse() Standard_OVERRIDE; //! Return the parameter on the Vreversed surface for //! the point of parameter V on . @@ -128,16 +128,16 @@ public: //! me->VReversed()->Value(U,me->VReversedParameter(V)) //! is the same point as //! me->Value(U,V) - Standard_EXPORT virtual Standard_Real VReversedParameter (const Standard_Real V) const = 0; + Standard_EXPORT virtual Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE = 0; //! Returns GeomAbs_CN, the global continuity of any elementary surface. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; diff --git a/src/Geom/Geom_Line.hxx b/src/Geom/Geom_Line.hxx index f5c7e41bee..da629f99e2 100644 --- a/src/Geom/Geom_Line.hxx +++ b/src/Geom/Geom_Line.hxx @@ -95,61 +95,61 @@ public: //! Changes the orientation of this line. As a result, the //! unit vector of the positioning axis of this line is reversed. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed line for the //! point of parameter U on this line. //! For a line, the returned value is -U. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Returns the value of the first parameter of this //! line. This is Standard_Real::RealFirst(). - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the value of the last parameter of this //! line. This is Standard_Real::RealLast(). - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! returns False - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! returns False - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns GeomAbs_CN, which is the global continuity of any line. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! returns True. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns in P the point of parameter U. //! P (U) = O + U * Dir where O is the "Location" point of the //! line and Dir the direction of the line. - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Returns the point P of parameter u and the first derivative V1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const Standard_OVERRIDE; //! Returns the point P of parameter U, the first and second //! derivatives V1 and V2. V2 is a vector with null magnitude //! for a line. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const Standard_OVERRIDE; //! V2 and V3 are vectors with null magnitude for a line. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const Standard_OVERRIDE; //! The returned vector gives the value of the derivative for the //! order of derivation N. //! Raised if N < 1. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Applies the transformation T to this line. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the parameter on the transformed curve for //! the transform of the point of parameter U on . @@ -177,7 +177,7 @@ public: Standard_EXPORT virtual Standard_Real ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this line. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_OffsetCurve.hxx b/src/Geom/Geom_OffsetCurve.hxx index 595146e3f1..790ca895f7 100644 --- a/src/Geom/Geom_OffsetCurve.hxx +++ b/src/Geom/Geom_OffsetCurve.hxx @@ -118,11 +118,11 @@ public: //! - the end point of the initial curve becomes the //! start point of the reversed curve, and //! - the first and last parameters are recomputed. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed curve for //! the point of parameter U on this offset curve. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes this offset curve by assigning C //! as the basis curve from which it is built. @@ -159,7 +159,7 @@ public: //! Returns the continuity of the basis curve - 1. //! The offset curve must have a unique offset direction defined //! at any point. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the reference vector of this offset curve. //! Value and derivatives @@ -177,21 +177,21 @@ public: //! Warning! this should not be called //! if the basis curve is not at least C1. Nevertheless //! if used on portion where the curve is C1, it is OK - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Warning! this should not be called //! if the continuity of the basis curve is not C2. //! Nevertheless, it's OK to use it on portion //! where the curve is C2 - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const Standard_OVERRIDE; //! Warning! this should not be called //! if the continuity of the basis curve is not C3. //! Nevertheless, it's OK to use it on portion //! where the curve is C3 - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const Standard_OVERRIDE; - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const Standard_OVERRIDE; //! The returned vector gives the value of the derivative @@ -208,7 +208,7 @@ public: //! raised if it is not possible to compute a unique offset //! direction. //! Raised if N < 1. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Warning! this should not be called //! if the basis curve is not at least C1. Nevertheless @@ -233,7 +233,7 @@ public: //! where the curve is C3 Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Pnt& Pbasis, gp_Vec& V1, gp_Vec& V2, gp_Vec& V1basis, gp_Vec& V2basis, gp_Vec& V3basis) const; - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the value of the first or last parameter of this //! offset curve. The first parameter corresponds to the @@ -241,7 +241,7 @@ public: //! corresponds to the end point. //! Note: the first and last parameters of this offset curve //! are also the ones of its basis curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the offset value of this offset curve. Standard_EXPORT Standard_Real Offset() const; @@ -249,7 +249,7 @@ public: //! Returns True if the distance between the start point //! and the end point of the curve is lower or equal to //! Resolution from package gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns true if the degree of continuity of the basis //! curve of this offset curve is at least N + 1. @@ -258,11 +258,11 @@ public: //! to the basis curve (used to compute the offset curve) is //! defined at any point on the basis curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns true if this offset curve is periodic, i.e. if the //! basis curve of this offset curve is periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the period of this offset curve, i.e. the period //! of the basis curve of this offset curve. @@ -272,7 +272,7 @@ public: //! Applies the transformation T to this offset curve. //! Note: the basis curve is also modified. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the parameter on the transformed curve for //! the transform of the point of parameter U on . @@ -293,7 +293,7 @@ public: Standard_EXPORT virtual Standard_Real ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this offset curve. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; //! Returns continuity of the basis curve. Standard_EXPORT GeomAbs_Shape GetBasisCurveContinuity() const; diff --git a/src/Geom/Geom_OffsetSurface.hxx b/src/Geom/Geom_OffsetSurface.hxx index bcbc6747db..ca624cfc2c 100644 --- a/src/Geom/Geom_OffsetSurface.hxx +++ b/src/Geom/Geom_OffsetSurface.hxx @@ -129,30 +129,30 @@ public: //! Changes the orientation of this offset surface in the u //! parametric direction. The bounds of the surface //! are not changed but the given parametric direction is reversed. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Computes the u parameter on the modified //! surface, produced by reversing the u //! parametric direction of this offset surface, for any //! point of u parameter U on this offset surface. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this offset surface in the v parametric direction. The bounds of the surface //! are not changed but the given parametric direction is reversed. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, produced by reversing the or v //! parametric direction of this offset surface, for any //! point of v parameter V on this offset surface. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Returns the parametric bounds U1, U2, V1 and V2 of //! this offset surface. //! If the surface is infinite, this function can return: //! - Standard_Real::RealFirst(), or //! - Standard_Real::RealLast(). - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! This method returns the continuity of the basis surface - 1. @@ -170,7 +170,7 @@ public: //! any point this method gives the continuity of the offset //! surface otherwise the effective continuity can be lower than //! the continuity of the basis surface - 1. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! This method answer True if the continuity of the basis surface @@ -178,7 +178,7 @@ public: //! class that a unique normal is defined at any point on the basis //! surface. //! Raised if N <0. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! This method answer True if the continuity of the basis surface @@ -186,7 +186,7 @@ public: //! class that a unique normal is defined at any point on the basis //! surface. //! Raised if N <0. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Checks whether this offset surface is closed in the u //! parametric direction. @@ -195,7 +195,7 @@ public: //! the distance between the points P(uFirst,v) //! and P(uLast,v) is less than or equal to //! gp::Resolution() for each value of the parameter v. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Checks whether this offset surface is closed in the u //! or v parametric direction. Returns true if taking vFirst and vLast as the @@ -203,13 +203,13 @@ public: //! distance between the points P(u,vFirst) and //! P(u,vLast) is less than or equal to //! gp::Resolution() for each value of the parameter u. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns true if this offset surface is periodic in the u //! parametric direction, i.e. if the basis //! surface of this offset surface is periodic in this direction. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns the period of this offset surface in the u //! parametric direction respectively, i.e. the period of the @@ -221,7 +221,7 @@ public: //! Returns true if this offset surface is periodic in the v //! parametric direction, i.e. if the basis //! surface of this offset surface is periodic in this direction. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Returns the period of this offset surface in the v //! parametric direction respectively, i.e. the period of the @@ -230,7 +230,7 @@ public: Standard_EXPORT virtual Standard_Real VPeriod() const Standard_OVERRIDE; //! Computes the U isoparametric curve. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. //! @@ -243,7 +243,7 @@ public: //! No check is done at the creation time and we suppose //! in this package that the offset surface can be defined //! at any point. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! P (U, V) = Pbasis + Offset * Ndir where @@ -261,19 +261,19 @@ public: //! Raised if the continuity of the basis surface is not C1. //! Raised if the order of derivation required to compute the //! normal direction is greater than the second order. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Raised if the continuity of the basis surface is not C2. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! ---Purpose ; //! Raised if the continuity of the basis surface is not C3. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Raised if the continuity of the basis surface is not C4. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u and Nv @@ -293,11 +293,11 @@ public: //! The exception UndefinedValue or UndefinedDerivative is //! raised if it is not possible to compute a unique offset //! direction. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this offset surface. //! Note: the basis surface is also modified. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -332,7 +332,7 @@ public: Standard_EXPORT virtual gp_GTrsf2d ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this offset surface. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; //! returns an equivalent surface of the offset surface //! when the basis surface is a canonic surface or a diff --git a/src/Geom/Geom_Plane.hxx b/src/Geom/Geom_Plane.hxx index 54bc6f0de8..f7905fadce 100644 --- a/src/Geom/Geom_Plane.hxx +++ b/src/Geom/Geom_Plane.hxx @@ -113,7 +113,7 @@ public: //! plane, produced when reversing the u //! parametric of this plane, for any point of u parameter U on this plane. //! In the case of a plane, these methods return - -U. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this plane in the u (or v) @@ -126,7 +126,7 @@ public: //! plane, produced when reversing the v //! parametric of this plane, for any point of v parameter V on this plane. //! In the case of a plane, these methods return -V. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -154,7 +154,7 @@ public: //! Because a plane is an infinite surface, the following is always true: //! - U1 = V1 = Standard_Real::RealFirst() //! - U2 = V2 = Standard_Real::RealLast(). - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Computes the normalized coefficients of the plane's @@ -162,26 +162,26 @@ public: Standard_EXPORT void Coefficients (Standard_Real& A, Standard_Real& B, Standard_Real& C, Standard_Real& D) const; //! return False - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! return False - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! return False. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! return False. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Computes the U isoparametric curve. //! This is a Line parallel to the YAxis of the plane. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. //! This is a Line parallel to the XAxis of the plane. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on . @@ -189,34 +189,34 @@ public: //! where O is the "Location" point of the plane, XDir the //! "XDirection" and YDir the "YDirection" of the plane's local //! coordinate system. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in the //! directions U and V. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second //! derivatives in the directions U and V. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the //! third derivatives in the directions U and V. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u //! and Nv in the direction v. //! Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this plane. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this plane. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_RectangularTrimmedSurface.hxx b/src/Geom/Geom_RectangularTrimmedSurface.hxx index 35b74f2413..3ebe244d96 100644 --- a/src/Geom/Geom_RectangularTrimmedSurface.hxx +++ b/src/Geom/Geom_RectangularTrimmedSurface.hxx @@ -157,26 +157,26 @@ public: //! parametric direction. The bounds of the surface are //! not changed, but the given parametric direction is //! reversed. Hence the orientation of the surface is reversed. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Computes the u parameter on the modified //! surface, produced by when reversing its u //! parametric direction, for any point of u parameter U on this patch. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this patch in the v //! parametric direction. The bounds of the surface are //! not changed, but the given parametric direction is //! reversed. Hence the orientation of the surface is reversed. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, produced by when reversing its v //! parametric direction, for any point of v parameter V on this patch. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Returns the parametric bounds U1, U2, V1 and V2 of this patch. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the continuity of the surface : @@ -185,29 +185,29 @@ public: //! C2 : continuity of the second derivative all along the Surface, //! C3 : continuity of the third derivative all along the Surface, //! CN : the order of continuity is infinite. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns true if this patch is closed in the given parametric direction. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns true if this patch is closed in the given parametric direction. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns true if the order of derivation in the U parametric //! direction is N. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! Returns true if the order of derivation in the V parametric //! direction is N. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Returns true if this patch is periodic in the given //! parametric direction. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns the period of this patch in the u //! parametric direction. @@ -217,7 +217,7 @@ public: //! Returns true if this patch is periodic in the given //! parametric direction. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Returns the period of this patch in the v //! parametric direction. @@ -226,34 +226,34 @@ public: Standard_EXPORT virtual Standard_Real VPeriod() const Standard_OVERRIDE; //! computes the U isoparametric curve. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Can be raised if the basis surface is an OffsetSurface. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! The returned derivatives have the same orientation as the //! derivatives of the basis surface even if the trimmed surface //! has not the same parametric orientation. //! Warning! UndefinedDerivative raised if the continuity of the surface is not C1. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! The returned derivatives have the same orientation as the //! derivatives of the basis surface even if the trimmed surface //! has not the same parametric orientation. //! Warning! UndefinedDerivative raised if the continuity of the surface is not C2. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! The returned derivatives have the same orientation as the //! derivatives of the basis surface even if the trimmed surface //! has not the same parametric orientation. //! Warning UndefinedDerivative raised if the continuity of the surface is not C3. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! The returned derivative has the same orientation as the //! derivative of the basis surface even if the trimmed surface @@ -261,13 +261,13 @@ public: //! Warning! UndefinedDerivative raised if the continuity of the surface is not CNu in the U //! parametric direction and CNv in the V parametric direction. //! RangeError Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this patch. //! Warning //! As a consequence, the basis surface included in the //! data structure of this patch is also modified. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -303,7 +303,7 @@ public: Standard_EXPORT virtual gp_GTrsf2d ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this patch. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_SphericalSurface.hxx b/src/Geom/Geom_SphericalSurface.hxx index d22c8c666b..ab9290a62e 100644 --- a/src/Geom/Geom_SphericalSurface.hxx +++ b/src/Geom/Geom_SphericalSurface.hxx @@ -119,20 +119,20 @@ public: //! surface, when reversing its u parametric //! direction, for any point of u parameter U on this sphere. //! In the case of a sphere, these functions returns 2.PI - U. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, when reversing its v parametric //! direction, for any point of v parameter V on this sphere. //! In the case of a sphere, these functions returns -U. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Computes the aera of the spherical surface. Standard_EXPORT Standard_Real Area() const; //! Returns the parametric bounds U1, U2, V1 and V2 of this sphere. //! For a sphere: U1 = 0, U2 = 2*PI, V1 = -PI/2, V2 = PI/2. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the coefficients of the implicit equation of the //! quadric in the absolute cartesian coordinates system : @@ -153,16 +153,16 @@ public: Standard_EXPORT Standard_Real Volume() const; //! Returns True. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns False. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Computes the U isoparametric curve. //! The U isoparametric curves of the surface are defined by the @@ -171,7 +171,7 @@ public: //! defines the origin of parametrization u. //! For a SphericalSurface the UIso curve is a Circle. //! Warnings : The radius of this circle can be zero. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. //! The V isoparametric curves of the surface are defined by @@ -183,7 +183,7 @@ public: //! create circle with radius = 0.0 //! For a SphericalSurface the VIso curve is a Circle. //! Warnings : The radius of this circle can be zero. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. @@ -192,34 +192,34 @@ public: //! where Loc is the origin of the placement plane (XAxis, YAxis) //! XDir is the direction of the XAxis and YDir the direction of //! the YAxis and ZDir the direction of the ZAxis. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in the //! directions U and V. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second derivatives //! in the directions U and V. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the third //! derivatives in the directions U and V. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u //! and Nv in the direction v. //! Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this sphere. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this sphere. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx index 5b80e792e9..5cb3971a1d 100644 --- a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx +++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx @@ -103,7 +103,7 @@ public: //! In the case of a surface of linear extrusion: //! - UReverse reverses the basis curve, and //! - VReverse reverses the direction of linear extrusion. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Computes the u parameter on the modified //! surface, produced by reversing its u parametric @@ -112,7 +112,7 @@ public: //! - UReverseParameter returns the reversed //! parameter given by the function //! ReversedParameter called with U on the basis curve, - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this surface of linear //! extrusion in the v parametric direction. The @@ -122,13 +122,13 @@ public: //! In the case of a surface of linear extrusion: //! - UReverse reverses the basis curve, and //! - VReverse reverses the direction of linear extrusion. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, produced by reversing its u v parametric //! direction, for any point of v parameter V on this surface of linear extrusion. //! In the case of an extruded surface VReverse returns -V. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Returns the parametric bounds U1, U2, V1 and V2 of //! this surface of linear extrusion. @@ -136,41 +136,41 @@ public: //! parametric direction, so: //! - V1 = Standard_Real::RealFirst() //! - V2 = Standard_Real::RealLast(). - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! IsUClosed returns true if the "basis curve" of this //! surface of linear extrusion is closed. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! IsVClosed always returns false. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! IsCNu returns true if the degree of continuity for the //! "basis curve" of this surface of linear extrusion is at least N. //! Raises RangeError if N < 0. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! IsCNv always returns true. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! IsUPeriodic returns true if the "basis curve" of this //! surface of linear extrusion is periodic. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! IsVPeriodic always returns false. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Computes the U isoparametric curve of this surface //! of linear extrusion. This is the line parallel to the //! direction of extrusion, passing through the point of //! parameter U of the basis curve. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve of this surface //! of linear extrusion. This curve is obtained by //! translating the extruded curve in the direction of //! extrusion, with the magnitude V. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. @@ -178,25 +178,25 @@ public: //! The parametrization V is a linear parametrization, and //! the direction of parametrization is the direction of //! extrusion. If the point is on the extruded curve, V = 0.0 - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in the //! directions U and V. //! Raises UndefinedDerivative if the continuity of the surface is not C1. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! --- Purpose ; //! Computes the current point, the first and the second derivatives //! in the directions U and V. //! Raises UndefinedDerivative if the continuity of the surface is not C2. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the third //! derivatives in the directions U and V. //! Raises UndefinedDerivative if the continuity of the surface is not C3. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u @@ -204,10 +204,10 @@ public: //! Raises UndefinedDerivative if the continuity of the surface is not CNu in the u //! direction and CNv in the v direction. //! Raises RangeError if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this surface of linear extrusion. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -247,7 +247,7 @@ public: Standard_EXPORT virtual gp_GTrsf2d ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this surface of linear extrusion. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_SurfaceOfRevolution.hxx b/src/Geom/Geom_SurfaceOfRevolution.hxx index d1e41f08f4..11141e740f 100644 --- a/src/Geom/Geom_SurfaceOfRevolution.hxx +++ b/src/Geom/Geom_SurfaceOfRevolution.hxx @@ -162,14 +162,14 @@ public: //! As a consequence: //! - UReverse reverses the direction of the axis of //! revolution of this surface, - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Computes the u parameter on the modified //! surface, when reversing its u parametric //! direction, for any point of u parameter U on this surface of revolution. //! In the case of a revolved surface: //! - UReversedParameter returns 2.*Pi - U - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes the orientation of this surface of revolution //! in the v parametric direction. The bounds of the @@ -178,7 +178,7 @@ public: //! surface is reversed. //! As a consequence: //! - VReverse reverses the meridian of this surface of revolution. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Computes the v parameter on the modified //! surface, when reversing its v parametric @@ -187,7 +187,7 @@ public: //! - VReversedParameter returns the reversed //! parameter given by the function //! ReversedParameter called with V on the meridian. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -226,60 +226,60 @@ public: //! Returns the parametric bounds U1, U2 , V1 and V2 of this surface. //! A surface of revolution is always complete, so U1 = 0, U2 = 2*PI. - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! IsUClosed always returns true. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! IsVClosed returns true if the meridian of this //! surface of revolution is closed. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! IsCNu always returns true. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! IsCNv returns true if the degree of continuity of the //! meridian of this surface of revolution is at least N. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! IsVPeriodic returns true if the meridian of this //! surface of revolution is periodic. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Computes the U isoparametric curve of this surface //! of revolution. It is the curve obtained by rotating the //! meridian through an angle U about the axis of revolution. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the U isoparametric curve of this surface //! of revolution. It is the curve obtained by rotating the //! meridian through an angle U about the axis of revolution. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. //! U is the angle of the rotation around the revolution axis. //! The direction of this axis gives the sense of rotation. //! V is the parameter of the revolved curve. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives //! in the directions U and V. //! Raised if the continuity of the surface is not C1. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second derivatives //! in the directions U and V. //! Raised if the continuity of the surface is not C2. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the third //! derivatives in the directions U and V. //! Raised if the continuity of the surface is not C3. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u and //! Nv in the direction v. @@ -295,13 +295,13 @@ public: //! else P is betveen discontinuities //! can be evaluated using methods of //! global evaluations P = S( U ,V ) - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this surface of revolution. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this surface of revolution. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; DEFINE_STANDARD_RTTI(Geom_SurfaceOfRevolution,Geom_SweptSurface) diff --git a/src/Geom/Geom_SweptSurface.hxx b/src/Geom/Geom_SweptSurface.hxx index 4fa45d0f01..86349711d5 100644 --- a/src/Geom/Geom_SweptSurface.hxx +++ b/src/Geom/Geom_SweptSurface.hxx @@ -50,7 +50,7 @@ public: //! G1 : tangency continuity all along the surface, //! G2 : curvature continuity all along the surface, //! CN : the order of continuity is infinite. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the reference direction of the swept surface. diff --git a/src/Geom/Geom_ToroidalSurface.hxx b/src/Geom/Geom_ToroidalSurface.hxx index 324d3feddb..e823e04117 100644 --- a/src/Geom/Geom_ToroidalSurface.hxx +++ b/src/Geom/Geom_ToroidalSurface.hxx @@ -136,19 +136,19 @@ public: //! Return the parameter on the Ureversed surface for //! the point of parameter U on . //! Return 2.PI - U. - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Return the parameter on the Ureversed surface for //! the point of parameter U on . //! Return 2.PI - U. - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Computes the aera of the surface. Standard_EXPORT Standard_Real Area() const; //! Returns the parametric bounds U1, U2, V1 and V2 of this torus. //! For a torus: U1 = V1 = 0 and V1 = V2 = 2*PI . - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Returns the coefficients of the implicit equation of the surface @@ -177,16 +177,16 @@ public: Standard_EXPORT Standard_Real Volume() const; //! Returns True. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! Returns True. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! Computes the U isoparametric curve. //! @@ -196,7 +196,7 @@ public: //! Warnings : //! The radius of the circle can be zero if for the surface //! MinorRadius = 0.0 - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. //! @@ -206,7 +206,7 @@ public: //! Warnings : //! The radius of the circle can be zero if for the surface //! MajorRadius = MinorRadius - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Computes the point P (U, V) on the surface. @@ -216,34 +216,34 @@ public: //! where Loc is the origin of the placement plane (XAxis, YAxis) //! XDir is the direction of the XAxis and YDir the direction of //! the YAxis and ZDir the direction of the ZAxis. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the current point and the first derivatives in //! the directions U and V. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the current point, the first and the second derivatives //! in the directions U and V. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the current point, the first,the second and the //! third derivatives in the directions U and V. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! Computes the derivative of order Nu in the direction u and //! Nv in the direction v. //! Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; //! Applies the transformation T to this torus. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this torus. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_TrimmedCurve.hxx b/src/Geom/Geom_TrimmedCurve.hxx index 3e7bfea878..c81004d2d2 100644 --- a/src/Geom/Geom_TrimmedCurve.hxx +++ b/src/Geom/Geom_TrimmedCurve.hxx @@ -105,11 +105,11 @@ public: //! the reversed trimmed curve is defined by: //! - the reversed basis curve, whose parameter range is still [ 0., 1. ], //! - the two trim values 1. - U2 (first parameter) and 1. - U1 (last parameter). - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed curve for //! the point of parameter U on this trimmed curve. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes this trimmed curve, by redefining the //! parameter values U1 and U2 which limit its basis curve. @@ -145,7 +145,7 @@ public: //! C2 : continuity of the second derivative all along the Curve, //! C3 : continuity of the third derivative all along the Curve, //! CN : the order of continuity is infinite. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns true if the degree of continuity of the basis //! curve of this trimmed curve is at least N. A trimmed @@ -155,26 +155,26 @@ public: //! the continuity of the basis curve because you consider //! only a part of the basis curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns the end point of . This point is the //! evaluation of the curve for the "LastParameter". - Standard_EXPORT gp_Pnt EndPoint() const; + Standard_EXPORT gp_Pnt EndPoint() const Standard_OVERRIDE; //! Returns the value of the first parameter of . //! The first parameter is the parameter of the "StartPoint" //! of the trimmed curve. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns True if the distance between the StartPoint and //! the EndPoint is lower or equal to Resolution from package gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns true if the basis curve of this trimmed curve is periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the period of the basis curve of this trimmed curve. //! Exceptions @@ -185,7 +185,7 @@ public: //! Returns the value of the last parameter of . //! The last parameter is the parameter of the "EndPoint" of the //! trimmed curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the start point of . @@ -196,33 +196,33 @@ public: //! The returned derivatives have the same orientation as the //! derivatives of the basis curve even if the trimmed curve //! has not the same orientation as the basis curve. - Standard_EXPORT gp_Pnt StartPoint() const; + Standard_EXPORT gp_Pnt StartPoint() const Standard_OVERRIDE; //! Returns in P the point of parameter U. //! //! If the basis curve is an OffsetCurve sometimes it is not //! possible to do the evaluation of the curve at the parameter //! U (see class OffsetCurve). - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt& P) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C2. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C3. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3) const Standard_OVERRIDE; //! N is the order of derivation. //! Raised if the continuity of the curve is not CN. //! Raised if N < 1. //! geometric transformations - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Applies the transformation T to this trimmed curve. //! Warning The basis curve is also modified. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Returns the parameter on the transformed curve for //! the transform of the point of parameter U on . @@ -250,7 +250,7 @@ public: Standard_EXPORT virtual Standard_Real ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; //! Creates a new object which is a copy of this trimmed curve. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom/Geom_VectorWithMagnitude.hxx b/src/Geom/Geom_VectorWithMagnitude.hxx index 65e35bcbc0..58686108b1 100644 --- a/src/Geom/Geom_VectorWithMagnitude.hxx +++ b/src/Geom/Geom_VectorWithMagnitude.hxx @@ -69,10 +69,10 @@ public: Standard_EXPORT void SetZ (const Standard_Real Z); //! Returns the magnitude of . - Standard_EXPORT Standard_Real Magnitude() const; + Standard_EXPORT Standard_Real Magnitude() const Standard_OVERRIDE; //! Returns the square magnitude of . - Standard_EXPORT Standard_Real SquareMagnitude() const; + Standard_EXPORT Standard_Real SquareMagnitude() const Standard_OVERRIDE; //! Adds the Vector Other to . @@ -85,21 +85,21 @@ public: //! Computes the cross product between and Other //! ^ Other. - Standard_EXPORT void Cross (const Handle(Geom_Vector)& Other); + Standard_EXPORT void Cross (const Handle(Geom_Vector)& Other) Standard_OVERRIDE; //! Computes the cross product between and Other //! ^ Other. A new vector is returned. - Standard_EXPORT Handle(Geom_Vector) Crossed (const Handle(Geom_Vector)& Other) const; + Standard_EXPORT Handle(Geom_Vector) Crossed (const Handle(Geom_Vector)& Other) const Standard_OVERRIDE; //! Computes the triple vector product ^ (V1 ^ V2). - Standard_EXPORT void CrossCross (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2); + Standard_EXPORT void CrossCross (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) Standard_OVERRIDE; //! Computes the triple vector product ^ (V1 ^ V2). //! A new vector is returned. - Standard_EXPORT Handle(Geom_Vector) CrossCrossed (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const; + Standard_EXPORT Handle(Geom_Vector) CrossCrossed (const Handle(Geom_Vector)& V1, const Handle(Geom_Vector)& V2) const Standard_OVERRIDE; //! Divides by a scalar. Standard_EXPORT void Divide (const Standard_Real Scalar); @@ -137,10 +137,10 @@ public: Standard_EXPORT Handle(Geom_VectorWithMagnitude) Subtracted (const Handle(Geom_Vector)& Other) const; //! Applies the transformation T to this vector. - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this vector. - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_AxisPlacement.hxx b/src/Geom2d/Geom2d_AxisPlacement.hxx index 14e3d1fe84..faf0361c47 100644 --- a/src/Geom2d/Geom2d_AxisPlacement.hxx +++ b/src/Geom2d/Geom2d_AxisPlacement.hxx @@ -96,10 +96,10 @@ public: Standard_EXPORT gp_Pnt2d Location() const; //! Applies the transformation T to this axis. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this axis. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_BSplineCurve.hxx b/src/Geom2d/Geom2d_BSplineCurve.hxx index be06c28336..34771d02dc 100644 --- a/src/Geom2d/Geom2d_BSplineCurve.hxx +++ b/src/Geom2d/Geom2d_BSplineCurve.hxx @@ -341,14 +341,14 @@ public: //! point of the reversed curve; //! - the end point of the initial curve becomes the start //! point of the reversed curve. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed curve for //! the point of parameter U on this BSpline curve. //! The returned value is: UFirst + ULast - U, //! where UFirst and ULast are the values of the //! first and last parameters of this BSpline curve. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Modifies this BSpline curve by segmenting it //! between U1 and U2. Either of these values can be @@ -514,7 +514,7 @@ public: //! Returns true if the degree of continuity of this //! BSpline curve is at least N. A BSpline curve is at least GeomAbs_C0. //! Exceptions Standard_RangeError if N is negative. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Check if curve has at least G1 continuity in interval [theTf, theTl] @@ -532,10 +532,10 @@ public: //! Warnings : //! The first and the last point can be different from the first //! pole and the last pole of the curve. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns True if the curve is periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns True if the weights are not identical. @@ -555,7 +555,7 @@ public: //! than Cd-p where p is the maximum multiplicity of the interior //! Knots. In the interior of a knot span the curve is infinitely //! continuously differentiable. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the degree of this BSpline curve. //! In this class the degree of the basis normalized B-spline @@ -563,13 +563,13 @@ public: //! Computation of value and derivatives Standard_EXPORT Standard_Integer Degree() const; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C2. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; //! For this BSpline curve, computes //! - the point P of parameter U, or @@ -583,7 +583,7 @@ public: //! defined by the parameter with a value greater than U, //! i.e. the part of the curve to the "right" of the singularity. //! Raises UndefinedDerivative if the continuity of the curve is not C3. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; //! For the point of parameter U of this BSpline curve, //! computes the vector corresponding to the Nth derivative. @@ -606,7 +606,7 @@ public: //! the same as if we consider the whole definition of the //! curve. Of course the evaluations are different outside //! this parametric domain. - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Raised if FromK1 = ToK2. //! @@ -659,7 +659,7 @@ public: //! The last point of the curve is different from the last //! pole of the curve if the multiplicity of the last knot //! is lower than Degree. - Standard_EXPORT gp_Pnt2d EndPoint() const; + Standard_EXPORT gp_Pnt2d EndPoint() const Standard_OVERRIDE; //! For a B-spline curve the first parameter (which gives the start @@ -672,7 +672,7 @@ public: //! Computes the parametric value of the start point of the curve. //! It is a knot value. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the knot of range Index. When there is a knot @@ -732,7 +732,7 @@ public: //! Computes the parametric value of the end point of the curve. //! It is a knot value. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Locates the parametric value U in the sequence of knots. @@ -786,7 +786,7 @@ public: //! Warnings : //! This point is different from the first pole of the curve if the //! multiplicity of the first knot is lower than Degree. - Standard_EXPORT gp_Pnt2d StartPoint() const; + Standard_EXPORT gp_Pnt2d StartPoint() const Standard_OVERRIDE; //! Returns the weight of the pole of range Index . //! Raised if Index < 1 or Index > NbPoles. @@ -801,7 +801,7 @@ public: Standard_EXPORT const TColStd_Array1OfReal* Weights() const; //! Applies the transformation T to this BSpline curve. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Returns the value of the maximum degree of the normalized @@ -818,7 +818,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real ToleranceUV, Standard_Real& UTolerance); //! Creates a new object which is a copy of this BSpline curve. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_BezierCurve.hxx b/src/Geom2d/Geom2d_BezierCurve.hxx index 6208e86e36..935b125ac4 100644 --- a/src/Geom2d/Geom2d_BezierCurve.hxx +++ b/src/Geom2d/Geom2d_BezierCurve.hxx @@ -153,13 +153,13 @@ public: //! Reverses the direction of parametrization of //! Value (NewU) = Value (1 - OldU) - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . //! //! returns 1-U - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Segments the curve between U1 and U2 which can be out @@ -206,15 +206,15 @@ public: //! Returns True if the distance between the first point //! and the last point of the curve is lower or equal to //! the Resolution from package gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Continuity of the curve, returns True. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns False. A BezierCurve cannot be periodic in this //! package - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns false if all the weights are identical. The tolerance @@ -222,7 +222,7 @@ public: Standard_EXPORT Standard_Boolean IsRational() const; //! Returns GeomAbs_CN, which is the continuity of any Bezier curve. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the polynomial degree of the curve. It is the number @@ -230,13 +230,13 @@ public: //! curve cannot be greater than "MaxDegree". Standard_EXPORT Standard_Integer Degree() const; - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; //! For this Bezier curve, computes //! - the point P of parameter U, or @@ -246,18 +246,18 @@ public: //! - V3, the third derivative vector. //! Note: the parameter U can be outside the bounds of the curve. //! Raises RangeError if N < 1. - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Returns the end point or start point of this Bezier curve. - Standard_EXPORT gp_Pnt2d EndPoint() const; + Standard_EXPORT gp_Pnt2d EndPoint() const Standard_OVERRIDE; //! Returns the value of the first parameter of this //! Bezier curve. This is 0.0, which gives the start point of this Bezier curve. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the value of the last parameter of this //! Bezier curve. This is 1.0, which gives the end point of this Bezier curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the number of poles for this Bezier curve. Standard_EXPORT Standard_Integer NbPoles() const; @@ -274,7 +274,7 @@ public: //! Returns Value (U=1), it is the first control point //! of the curve. - Standard_EXPORT gp_Pnt2d StartPoint() const; + Standard_EXPORT gp_Pnt2d StartPoint() const Standard_OVERRIDE; //! Returns the weight of range Index. //! Raised if Index is not in the range [1, NbPoles] @@ -286,7 +286,7 @@ public: Standard_EXPORT void Weights (TColStd_Array1OfReal& W) const; //! Applies the transformation T to this Bezier curve. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Returns the value of the maximum polynomial degree of a @@ -303,7 +303,7 @@ public: Standard_EXPORT void Resolution (const Standard_Real ToleranceUV, Standard_Real& UTolerance); //! Creates a new object which is a copy of this Bezier curve. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_CartesianPoint.hxx b/src/Geom2d/Geom2d_CartesianPoint.hxx index 665986ee6e..ef868ea530 100644 --- a/src/Geom2d/Geom2d_CartesianPoint.hxx +++ b/src/Geom2d/Geom2d_CartesianPoint.hxx @@ -58,23 +58,23 @@ public: Standard_EXPORT void SetY (const Standard_Real Y); //! Returns the coordinates of . - Standard_EXPORT void Coord (Standard_Real& X, Standard_Real& Y) const; + Standard_EXPORT void Coord (Standard_Real& X, Standard_Real& Y) const Standard_OVERRIDE; //! Returns a non persistent cartesian point with //! the same coordinates as . //! -C++: return const& - Standard_EXPORT gp_Pnt2d Pnt2d() const; + Standard_EXPORT gp_Pnt2d Pnt2d() const Standard_OVERRIDE; //! Returns the X coordinate of . - Standard_EXPORT Standard_Real X() const; + Standard_EXPORT Standard_Real X() const Standard_OVERRIDE; //! Returns the Y coordinate of . - Standard_EXPORT Standard_Real Y() const; + Standard_EXPORT Standard_Real Y() const Standard_OVERRIDE; - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_Conic.hxx b/src/Geom2d/Geom2d_Conic.hxx index bd231b5d87..32ca94a03d 100644 --- a/src/Geom2d/Geom2d_Conic.hxx +++ b/src/Geom2d/Geom2d_Conic.hxx @@ -111,18 +111,18 @@ public: //! Reverses the direction of parameterization of . //! The local coordinate system of the conic is modified. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . - Standard_EXPORT virtual Standard_Real ReversedParameter (const Standard_Real U) const = 0; + Standard_EXPORT virtual Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE = 0; //! Returns GeomAbs_CN which is the global continuity of any conic. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns True, the order of continuity of a conic is infinite. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_Direction.hxx b/src/Geom2d/Geom2d_Direction.hxx index a94ccd6e1b..a77cc4a033 100644 --- a/src/Geom2d/Geom2d_Direction.hxx +++ b/src/Geom2d/Geom2d_Direction.hxx @@ -78,23 +78,23 @@ public: Standard_EXPORT gp_Dir2d Dir2d() const; //! returns 1.0 - Standard_EXPORT Standard_Real Magnitude() const; + Standard_EXPORT Standard_Real Magnitude() const Standard_OVERRIDE; //! returns 1.0 - Standard_EXPORT Standard_Real SquareMagnitude() const; + Standard_EXPORT Standard_Real SquareMagnitude() const Standard_OVERRIDE; //! Computes the cross product between and . - Standard_EXPORT Standard_Real Crossed (const Handle(Geom2d_Vector)& Other) const; + Standard_EXPORT Standard_Real Crossed (const Handle(Geom2d_Vector)& Other) const Standard_OVERRIDE; Standard_Real operator ^ (const Handle(Geom2d_Vector)& Other) const { return Crossed(Other); } //! Applies the transformation T to this unit vector, then normalizes it. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this unit vector. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_Line.hxx b/src/Geom2d/Geom2d_Line.hxx index 379159e27c..d1d061d8a3 100644 --- a/src/Geom2d/Geom2d_Line.hxx +++ b/src/Geom2d/Geom2d_Line.hxx @@ -106,62 +106,62 @@ public: //! Changes the orientation of this line. As a result, the //! unit vector of the positioning axis of this line is reversed. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed line for the //! point of parameter U on this line. //! For a line, the returned value is -U. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Returns RealFirst from Standard. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns RealLast from Standard - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns False - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns False - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns GeomAbs_CN, which is the global continuity of any line. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Computes the distance between and the point P. Standard_EXPORT Standard_Real Distance (const gp_Pnt2d& P) const; //! Returns True. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns in P the point of parameter U. //! P (U) = O + U * Dir where O is the "Location" point of the //! line and Dir the direction of the line. - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; //! Returns the point P of parameter u and the first derivative V1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; //! Returns the point P of parameter U, the first and second //! derivatives V1 and V2. V2 is a vector with null magnitude //! for a line. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; //! V2 and V3 are vectors with null magnitude for a line. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; //! For the point of parameter U of this line, computes //! the vector corresponding to the Nth derivative. //! Note: if N is greater than or equal to 2, the result is a //! vector with null magnitude. //! Exceptions Standard_RangeError if N is less than 1. - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Applies the transformation T to this line. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Computes the parameter on the line transformed by //! T for the point of parameter U on this line. @@ -179,7 +179,7 @@ public: Standard_EXPORT virtual Standard_Real ParametricTransformation (const gp_Trsf2d& T) const Standard_OVERRIDE; //! Creates a new object, which is a copy of this line. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_OffsetCurve.hxx b/src/Geom2d/Geom2d_OffsetCurve.hxx index 274ad630ba..d35ab3dede 100644 --- a/src/Geom2d/Geom2d_OffsetCurve.hxx +++ b/src/Geom2d/Geom2d_OffsetCurve.hxx @@ -115,11 +115,11 @@ public: //! - the end point of the initial curve becomes the start //! point of the reversed curve, and //! - the first and last parameters are recomputed. - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Computes the parameter on the reversed curve for //! the point of parameter U on this offset curve. - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes this offset curve by assigning C as the //! basis curve from which it is built. @@ -161,30 +161,30 @@ public: //! the offset curve. //! No check is done at the creation time and we suppose //! in this package that the offset curve is well defined. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Warning! this should not be called //! if the basis curve is not at least C1. Nevertheless //! if used on portion where the curve is C1, it is OK - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; //! Warning! this should not be called //! if the continuity of the basis curve is not C2. //! Nevertheless, it's OK to use it on portion //! where the curve is C2 - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; //! Warning! This should not be called //! if the continuity of the basis curve is not C3. //! Nevertheless, it's OK to use it on portion //! where the curve is C3 - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; //! Warning! This should not be called //! if the continuity of the basis curve is not C4. //! Nevertheless, it's OK to use it on portion //! where the curve is C4 - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; //! The returned vector gives the value of the derivative //! for the order of derivation N. @@ -202,7 +202,7 @@ public: //! Warnings : //! The exception UndefinedValue or UndefinedDerivative is //! raised if it is not possible to compute a unique offset direction. - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Warning! this should not be called //! if the basis curve is not at least C1. Nevertheless @@ -221,7 +221,7 @@ public: //! where the curve is C3 Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Pnt2d& Pbasis, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V1basis, gp_Vec2d& V2basis, gp_Vec2d& V3basis) const; - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns the value of the first or last parameter of this //! offset curve. The first parameter corresponds to the @@ -229,7 +229,7 @@ public: //! corresponds to the end point. //! Note: the first and last parameters of this offset curve //! are also the ones of its basis curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the offset value of this offset curve. Standard_EXPORT Standard_Real Offset() const; @@ -238,7 +238,7 @@ public: //! Returns True if the distance between the start point //! and the end point of the curve is lower or equal to //! Resolution from package gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Is the order of continuity of the curve N ? //! Warnings : @@ -247,13 +247,13 @@ public: //! to the basis curve (used to compute the offset curve) is //! defined at any point on the basis curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Is the parametrization of a curve is periodic ? //! If the basis curve is a circle or an ellipse the corresponding //! OffsetCurve is periodic. If the basis curve can't be periodic //! (for example BezierCurve) the OffsetCurve can't be periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the period of this offset curve, i.e. the period //! of the basis curve of this offset curve. @@ -263,7 +263,7 @@ public: //! Applies the transformation T to this offset curve. //! Note: the basis curve is also modified. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Returns the parameter on the transformed curve for //! the transform of the point of parameter U on . @@ -291,7 +291,7 @@ public: Standard_EXPORT virtual Standard_Real ParametricTransformation (const gp_Trsf2d& T) const Standard_OVERRIDE; //! Creates a new object, which is a copy of this offset curve. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; //! Returns continuity of the basis curve. Standard_EXPORT GeomAbs_Shape GetBasisCurveContinuity() const; diff --git a/src/Geom2d/Geom2d_TrimmedCurve.hxx b/src/Geom2d/Geom2d_TrimmedCurve.hxx index ca9a3e6d9f..2eee9db9eb 100644 --- a/src/Geom2d/Geom2d_TrimmedCurve.hxx +++ b/src/Geom2d/Geom2d_TrimmedCurve.hxx @@ -102,13 +102,13 @@ public: //! - the reversed basis curve, whose parameter range is still [ 0.,1. ], and //! - the two trim values 1. - U2 (first parameter) //! and 1. - U1 (last parameter). - Standard_EXPORT void Reverse(); + Standard_EXPORT void Reverse() Standard_OVERRIDE; //! Returns the parameter on the reversed curve for //! the point of parameter U on . //! //! returns UFirst + ULast - U - Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real ReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Changes this trimmed curve, by redefining the //! parameter values U1 and U2, which limit its basis curve. @@ -143,7 +143,7 @@ public: //! C2 : continuity of the second derivative all along the Curve, //! C3 : continuity of the third derivative all along the Curve, //! CN : the order of continuity is infinite. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! --- Purpose //! Returns True if the order of continuity of the @@ -153,27 +153,27 @@ public: //! the continuity of the basis curve because you consider //! only a part of the basis curve. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCN (const Standard_Integer N) const Standard_OVERRIDE; //! Returns the end point of . This point is the //! evaluation of the curve for the "LastParameter". - Standard_EXPORT gp_Pnt2d EndPoint() const; + Standard_EXPORT gp_Pnt2d EndPoint() const Standard_OVERRIDE; //! Returns the value of the first parameter of . //! The first parameter is the parameter of the "StartPoint" //! of the trimmed curve. - Standard_EXPORT Standard_Real FirstParameter() const; + Standard_EXPORT Standard_Real FirstParameter() const Standard_OVERRIDE; //! Returns True if the distance between the StartPoint and //! the EndPoint is lower or equal to Resolution from package //! gp. - Standard_EXPORT Standard_Boolean IsClosed() const; + Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE; //! Returns true if the basis curve of this trimmed curve is periodic. - Standard_EXPORT Standard_Boolean IsPeriodic() const; + Standard_EXPORT Standard_Boolean IsPeriodic() const Standard_OVERRIDE; //! Returns the period of the basis curve of this trimmed curve. //! Exceptions @@ -184,7 +184,7 @@ public: //! Returns the value of the last parameter of . //! The last parameter is the parameter of the "EndPoint" of the //! trimmed curve. - Standard_EXPORT Standard_Real LastParameter() const; + Standard_EXPORT Standard_Real LastParameter() const Standard_OVERRIDE; //! Returns the start point of . @@ -194,22 +194,22 @@ public: //! Warnings : //! The returned derivatives have the same orientation as the //! derivatives of the basis curve. - Standard_EXPORT gp_Pnt2d StartPoint() const; + Standard_EXPORT gp_Pnt2d StartPoint() const Standard_OVERRIDE; //! If the basis curve is an OffsetCurve sometimes it is not //! possible to do the evaluation of the curve at the parameter //! U (see class OffsetCurve). - Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const; + Standard_EXPORT void D0 (const Standard_Real U, gp_Pnt2d& P) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C1. - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C2. - Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const; + Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const Standard_OVERRIDE; //! Raised if the continuity of the curve is not C3. - Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const; + Standard_EXPORT void D3 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3) const Standard_OVERRIDE; //! For the point of parameter U of this trimmed curve, //! computes the vector corresponding to the Nth derivative. @@ -221,11 +221,11 @@ public: //! Exceptions //! Standard_RangeError if N is less than 1. //! geometric transformations - Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const; + Standard_EXPORT gp_Vec2d DN (const Standard_Real U, const Standard_Integer N) const Standard_OVERRIDE; //! Applies the transformation T to this trimmed curve. //! Warning The basis curve is also modified. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Returns the parameter on the transformed curve for //! the transform of the point of parameter U on . @@ -254,7 +254,7 @@ public: //! Creates a new object, which is a copy of this trimmed curve. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2d/Geom2d_VectorWithMagnitude.hxx b/src/Geom2d/Geom2d_VectorWithMagnitude.hxx index ead2a652f5..2e39ba1cec 100644 --- a/src/Geom2d/Geom2d_VectorWithMagnitude.hxx +++ b/src/Geom2d/Geom2d_VectorWithMagnitude.hxx @@ -65,10 +65,10 @@ public: Standard_EXPORT void SetY (const Standard_Real Y); //! Returns the magnitude of . - Standard_EXPORT Standard_Real Magnitude() const; + Standard_EXPORT Standard_Real Magnitude() const Standard_OVERRIDE; //! Returns the square magnitude of . - Standard_EXPORT Standard_Real SquareMagnitude() const; + Standard_EXPORT Standard_Real SquareMagnitude() const Standard_OVERRIDE; //! Adds the Vector Other to . @@ -89,7 +89,7 @@ Handle(Geom2d_VectorWithMagnitude) operator + (const Handle(Geom2d_Vector)& Othe //! Computes the cross product between and Other //! ^ Other. A new vector is returned. - Standard_EXPORT Standard_Real Crossed (const Handle(Geom2d_Vector)& Other) const; + Standard_EXPORT Standard_Real Crossed (const Handle(Geom2d_Vector)& Other) const Standard_OVERRIDE; Standard_Real operator ^ (const Handle(Geom2d_Vector)& Other) const { return Crossed(Other); @@ -154,10 +154,10 @@ Handle(Geom2d_VectorWithMagnitude) operator - (const Handle(Geom2d_Vector)& Othe } //! Applies the transformation T to this vector. - Standard_EXPORT void Transform (const gp_Trsf2d& T); + Standard_EXPORT void Transform (const gp_Trsf2d& T) Standard_OVERRIDE; //! Creates a new object which is a copy of this vector. - Standard_EXPORT Handle(Geom2d_Geometry) Copy() const; + Standard_EXPORT Handle(Geom2d_Geometry) Copy() const Standard_OVERRIDE; diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx b/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx index c073388d5f..b957e9a5c8 100644 --- a/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx +++ b/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. Geom2dAdaptor_Curve& ChangeCurve2d(); diff --git a/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx b/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx index 3d1539fa67..1705cf3817 100644 --- a/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx +++ b/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx @@ -56,13 +56,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt2d& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx b/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx index 70a9493d77..c81c6fc63f 100644 --- a/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx +++ b/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx @@ -50,11 +50,11 @@ public: //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT const Adaptor3d_Curve& Curve() const; + Standard_EXPORT const Adaptor3d_Curve& Curve() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. //! This is redefined from HCurve, cannot be inline. - Standard_EXPORT Adaptor3d_Curve& GetCurve(); + Standard_EXPORT Adaptor3d_Curve& GetCurve() Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. GeomAdaptor_Curve& ChangeCurve(); diff --git a/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx b/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx index a77672de2d..a7dd7dca7d 100644 --- a/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx +++ b/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx @@ -50,7 +50,7 @@ public: //! Returns a reference to the Surface inside the HSurface. //! This is redefined from HSurface, cannot be inline. - Standard_EXPORT const Adaptor3d_Surface& Surface() const; + Standard_EXPORT const Adaptor3d_Surface& Surface() const Standard_OVERRIDE; //! Returns the surface used to create the GenHSurface. GeomAdaptor_Surface& ChangeSurface(); diff --git a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx index 9c7766b7ad..386b16c1c5 100644 --- a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx +++ b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx @@ -50,7 +50,7 @@ public: //! Returns a reference to the Surface inside the HSurface. //! This is redefined from HSurface, cannot be inline. - Standard_EXPORT const Adaptor3d_Surface& Surface() const; + Standard_EXPORT const Adaptor3d_Surface& Surface() const Standard_OVERRIDE; //! Returns the surface used to create the GenHSurface. GeomAdaptor_SurfaceOfLinearExtrusion& ChangeSurface(); diff --git a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx index 6a33f6d160..7019873f8a 100644 --- a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx +++ b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx @@ -50,7 +50,7 @@ public: //! Returns a reference to the Surface inside the HSurface. //! This is redefined from HSurface, cannot be inline. - Standard_EXPORT const Adaptor3d_Surface& Surface() const; + Standard_EXPORT const Adaptor3d_Surface& Surface() const Standard_OVERRIDE; //! Returns the surface used to create the GenHSurface. GeomAdaptor_SurfaceOfRevolution& ChangeSurface(); diff --git a/src/GeomFill/GeomFill_BoundWithSurf.hxx b/src/GeomFill/GeomFill_BoundWithSurf.hxx index 671c6ec428..d9ffd54c13 100644 --- a/src/GeomFill/GeomFill_BoundWithSurf.hxx +++ b/src/GeomFill/GeomFill_BoundWithSurf.hxx @@ -81,9 +81,9 @@ public: //! CurveOnSurf, Tol, TolAng ); Standard_EXPORT GeomFill_BoundWithSurf(const Adaptor3d_CurveOnSurface& CurveOnSurf, const Standard_Real Tol3d, const Standard_Real Tolang); - Standard_EXPORT gp_Pnt Value (const Standard_Real U) const; + Standard_EXPORT gp_Pnt Value (const Standard_Real U) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean HasNormals() const Standard_OVERRIDE; @@ -91,11 +91,11 @@ public: Standard_EXPORT virtual void D1Norm (const Standard_Real U, gp_Vec& N, gp_Vec& DN) const Standard_OVERRIDE; - Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev); + Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev) Standard_OVERRIDE; - Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const; + Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsDegenerated() const; + Standard_EXPORT Standard_Boolean IsDegenerated() const Standard_OVERRIDE; diff --git a/src/GeomFill/GeomFill_DegeneratedBound.hxx b/src/GeomFill/GeomFill_DegeneratedBound.hxx index 4f35247ef5..1c08073576 100644 --- a/src/GeomFill/GeomFill_DegeneratedBound.hxx +++ b/src/GeomFill/GeomFill_DegeneratedBound.hxx @@ -44,15 +44,15 @@ public: Standard_EXPORT GeomFill_DegeneratedBound(const gp_Pnt& Point, const Standard_Real First, const Standard_Real Last, const Standard_Real Tol3d, const Standard_Real Tolang); - Standard_EXPORT gp_Pnt Value (const Standard_Real U) const; + Standard_EXPORT gp_Pnt Value (const Standard_Real U) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const Standard_OVERRIDE; - Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev); + Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev) Standard_OVERRIDE; - Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const; + Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsDegenerated() const; + Standard_EXPORT Standard_Boolean IsDegenerated() const Standard_OVERRIDE; diff --git a/src/GeomFill/GeomFill_SimpleBound.hxx b/src/GeomFill/GeomFill_SimpleBound.hxx index 876ccc311e..097f9b1eed 100644 --- a/src/GeomFill/GeomFill_SimpleBound.hxx +++ b/src/GeomFill/GeomFill_SimpleBound.hxx @@ -77,15 +77,15 @@ public: //! (Curve,Tol,dummy); Standard_EXPORT GeomFill_SimpleBound(const Handle(Adaptor3d_HCurve)& Curve, const Standard_Real Tol3d, const Standard_Real Tolang); - Standard_EXPORT gp_Pnt Value (const Standard_Real U) const; + Standard_EXPORT gp_Pnt Value (const Standard_Real U) const Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const; + Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt& P, gp_Vec& V) const Standard_OVERRIDE; - Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev); + Standard_EXPORT void Reparametrize (const Standard_Real First, const Standard_Real Last, const Standard_Boolean HasDF, const Standard_Boolean HasDL, const Standard_Real DF, const Standard_Real DL, const Standard_Boolean Rev) Standard_OVERRIDE; - Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const; + Standard_EXPORT void Bounds (Standard_Real& First, Standard_Real& Last) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean IsDegenerated() const; + Standard_EXPORT Standard_Boolean IsDegenerated() const Standard_OVERRIDE; diff --git a/src/GeomFill/GeomFill_TgtOnCoons.hxx b/src/GeomFill/GeomFill_TgtOnCoons.hxx index e95a332848..f3c9320536 100644 --- a/src/GeomFill/GeomFill_TgtOnCoons.hxx +++ b/src/GeomFill/GeomFill_TgtOnCoons.hxx @@ -42,15 +42,15 @@ public: //! Computes the value of the field of tangency at //! parameter W. - Standard_EXPORT gp_Vec Value (const Standard_Real W) const; + Standard_EXPORT gp_Vec Value (const Standard_Real W) const Standard_OVERRIDE; //! Computes the derivative of the field of tangency at //! parameter W. - Standard_EXPORT gp_Vec D1 (const Standard_Real W) const; + Standard_EXPORT gp_Vec D1 (const Standard_Real W) const Standard_OVERRIDE; //! Computes the value and the derivative of the field of //! tangency at parameter W. - Standard_EXPORT void D1 (const Standard_Real W, gp_Vec& T, gp_Vec& DT) const; + Standard_EXPORT void D1 (const Standard_Real W, gp_Vec& T, gp_Vec& DT) const Standard_OVERRIDE; diff --git a/src/GeomPlate/GeomPlate_Surface.hxx b/src/GeomPlate/GeomPlate_Surface.hxx index 097c6ab2fb..72b89d1ea5 100644 --- a/src/GeomPlate/GeomPlate_Surface.hxx +++ b/src/GeomPlate/GeomPlate_Surface.hxx @@ -64,7 +64,7 @@ public: //! Reverses the U direction of parametrization of . //! The bounds of the surface are not modified. - Standard_EXPORT void UReverse(); + Standard_EXPORT void UReverse() Standard_OVERRIDE; //! Return the parameter on the Ureversed surface for //! the point of parameter U on . @@ -74,12 +74,12 @@ public: //! is the same point as //! //! me->Value(U,V) - Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const; + Standard_EXPORT Standard_Real UReversedParameter (const Standard_Real U) const Standard_OVERRIDE; //! Reverses the V direction of parametrization of . //! The bounds of the surface are not modified. - Standard_EXPORT void VReverse(); + Standard_EXPORT void VReverse() Standard_OVERRIDE; //! Return the parameter on the Vreversed surface for //! the point of parameter V on . @@ -89,7 +89,7 @@ public: //! is the same point as //! //! me->Value(U,V) - Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const; + Standard_EXPORT Standard_Real VReversedParameter (const Standard_Real V) const Standard_OVERRIDE; //! Computes the parameters on the transformed surface for //! the transform of the point of parameters U,V on . @@ -130,7 +130,7 @@ public: //! Cylinder, Cone, Revolved and Extruded surfaces. Standard_EXPORT virtual gp_GTrsf2d ParametricTransformation (const gp_Trsf& T) const Standard_OVERRIDE; - Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const; + Standard_EXPORT void Bounds (Standard_Real& U1, Standard_Real& U2, Standard_Real& V1, Standard_Real& V2) const Standard_OVERRIDE; //! Is the surface closed in the parametric direction U ? @@ -138,7 +138,7 @@ public: //! between the point P (UFirst, V) and P (ULast, V) is //! lower or equal to Resolution from gp. UFirst and ULast //! are the parametric bounds in the U direction. - Standard_EXPORT Standard_Boolean IsUClosed() const; + Standard_EXPORT Standard_Boolean IsUClosed() const Standard_OVERRIDE; //! Is the surface closed in the parametric direction V ? @@ -146,7 +146,7 @@ public: //! between the point P (U, VFirst) and P (U, VLast) is //! lower or equal to Resolution from gp. VFirst and VLast //! are the parametric bounds in the V direction. - Standard_EXPORT Standard_Boolean IsVClosed() const; + Standard_EXPORT Standard_Boolean IsVClosed() const Standard_OVERRIDE; //! Is the parametrization of a surface periodic in the @@ -158,7 +158,7 @@ public: //! P (U, V) and the point P (U + T, V) is lower or equal //! to Resolution from package gp. T is the parametric period //! and must be a constant. - Standard_EXPORT Standard_Boolean IsUPeriodic() const; + Standard_EXPORT Standard_Boolean IsUPeriodic() const Standard_OVERRIDE; //! returns the Uperiod. //! raises if the surface is not uperiodic. @@ -174,17 +174,17 @@ public: //! P (U, V) and the point P (U + T, V) is lower or equal //! to Resolution from package gp. T is the parametric period //! and must be a constant. - Standard_EXPORT Standard_Boolean IsVPeriodic() const; + Standard_EXPORT Standard_Boolean IsVPeriodic() const Standard_OVERRIDE; //! returns the Vperiod. //! raises if the surface is not vperiodic. Standard_EXPORT virtual Standard_Real VPeriod() const Standard_OVERRIDE; //! Computes the U isoparametric curve. - Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const; + Standard_EXPORT Handle(Geom_Curve) UIso (const Standard_Real U) const Standard_OVERRIDE; //! Computes the V isoparametric curve. - Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const; + Standard_EXPORT Handle(Geom_Curve) VIso (const Standard_Real V) const Standard_OVERRIDE; //! Global Continuity of the surface in direction U and V : @@ -198,44 +198,44 @@ public: //! Example : //! If the surface is C1 in the V parametric direction and C2 //! in the U parametric direction Shape = C1. - Standard_EXPORT GeomAbs_Shape Continuity() const; + Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE; //! Returns the order of continuity of the surface in the //! U parametric direction. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNu (const Standard_Integer N) const Standard_OVERRIDE; //! Returns the order of continuity of the surface in the //! V parametric direction. //! Raised if N < 0. - Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const; + Standard_EXPORT Standard_Boolean IsCNv (const Standard_Integer N) const Standard_OVERRIDE; //! Computes the point of parameter U,V on the surface. //! //! Raised only for an "OffsetSurface" if it is not possible to //! compute the current point. - Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const; + Standard_EXPORT void D0 (const Standard_Real U, const Standard_Real V, gp_Pnt& P) const Standard_OVERRIDE; //! Computes the point P and the first derivatives in the //! directions U and V at this point. //! Raised if the continuity of the surface is not C1. - Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const; + Standard_EXPORT void D1 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V) const Standard_OVERRIDE; //! Computes the point P, the first and the second derivatives in //! the directions U and V at this point. //! Raised if the continuity of the surface is not C2. - Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const; + Standard_EXPORT void D2 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV) const Standard_OVERRIDE; //! Computes the point P, the first,the second and the third //! derivatives in the directions U and V at this point. //! Raised if the continuity of the surface is not C2. - Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const; + Standard_EXPORT void D3 (const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& D2UV, gp_Vec& D3U, gp_Vec& D3V, gp_Vec& D3UUV, gp_Vec& D3UVV) const Standard_OVERRIDE; //! ---Purpose ; //! Computes the derivative of order Nu in the direction U and Nv @@ -244,9 +244,9 @@ public: //! Raised if the continuity of the surface is not CNu in the U //! direction or not CNv in the V direction. //! Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0. - Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const; + Standard_EXPORT gp_Vec DN (const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv) const Standard_OVERRIDE; - Standard_EXPORT Handle(Geom_Geometry) Copy() const; + Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE; //! Transformation of a geometric object. This tansformation @@ -254,7 +254,7 @@ public: //! or a complex transformation obtained by combination of //! the previous elementaries transformations. //! (see class Transformation of the package Geom). - Standard_EXPORT void Transform (const gp_Trsf& T); + Standard_EXPORT void Transform (const gp_Trsf& T) Standard_OVERRIDE; Standard_EXPORT Handle(Geom_Surface) CallSurfinit() const; diff --git a/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx b/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx index 8a698979a5..b2d0210646 100644 --- a/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx +++ b/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx @@ -55,13 +55,13 @@ public: Standard_EXPORT void SetPoint (const gp_Pnt2d& P); //! Calculation of F(U). - Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real U, Standard_Real& F) Standard_OVERRIDE; //! Calculation of F'(U). - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real U, Standard_Real& DF) Standard_OVERRIDE; //! Calculation of F(U) and F'(U). - Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF); + Standard_EXPORT Standard_Boolean Values (const Standard_Real U, Standard_Real& F, Standard_Real& DF) Standard_OVERRIDE; //! Save the found extremum. Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE; diff --git a/src/HLRTest/HLRTest_DrawableEdgeTool.hxx b/src/HLRTest/HLRTest_DrawableEdgeTool.hxx index 1ca58a13f0..b82efc3d17 100644 --- a/src/HLRTest/HLRTest_DrawableEdgeTool.hxx +++ b/src/HLRTest/HLRTest_DrawableEdgeTool.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT HLRTest_DrawableEdgeTool(const Handle(HLRBRep_Algo)& Alg, const Standard_Boolean Visible, const Standard_Boolean IsoLine, const Standard_Boolean Rg1Line, const Standard_Boolean RgNLine, const Standard_Integer ViewId); - Standard_EXPORT void DrawOn (Draw_Display& D) const; + Standard_EXPORT void DrawOn (Draw_Display& D) const Standard_OVERRIDE; diff --git a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx index 588f6a0cd0..3ce5f8e4cf 100644 --- a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx +++ b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx @@ -56,7 +56,7 @@ public: Standard_Boolean DisplayHidden() const; - Standard_EXPORT void DrawOn (Draw_Display& D) const; + Standard_EXPORT void DrawOn (Draw_Display& D) const Standard_OVERRIDE; Standard_Boolean Debug() const; diff --git a/src/HLRTest/HLRTest_OutLiner.hxx b/src/HLRTest/HLRTest_OutLiner.hxx index c5655ba7d1..d968bc8f2d 100644 --- a/src/HLRTest/HLRTest_OutLiner.hxx +++ b/src/HLRTest/HLRTest_OutLiner.hxx @@ -44,7 +44,7 @@ public: Handle(HLRTopoBRep_OutLiner) OutLiner() const; //! Does nothhing, - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/HLRTest/HLRTest_Projector.hxx b/src/HLRTest/HLRTest_Projector.hxx index 388117c6ad..80a8a1cbbc 100644 --- a/src/HLRTest/HLRTest_Projector.hxx +++ b/src/HLRTest/HLRTest_Projector.hxx @@ -44,7 +44,7 @@ public: const HLRAlgo_Projector& Projector() const; //! Does nothhing, - Standard_EXPORT void DrawOn (Draw_Display& dis) const; + Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; //! For variable copy. Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; diff --git a/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx b/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx index 239690c331..97f69670bc 100644 --- a/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx +++ b/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx @@ -46,7 +46,7 @@ protected: //! Recognizes data types of Header STEP Standard - Standard_EXPORT void Eval (const TCollection_AsciiString& key); + Standard_EXPORT void Eval (const TCollection_AsciiString& key) Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_Act.hxx b/src/IFSelect/IFSelect_Act.hxx index acb27c3270..adfb5a9fe8 100644 --- a/src/IFSelect/IFSelect_Act.hxx +++ b/src/IFSelect/IFSelect_Act.hxx @@ -64,10 +64,10 @@ public: //! Execution of Command Line. remark that is senseless //! because each Act brings one and only one function - Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot); + Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot) Standard_OVERRIDE; //! Short Help for commands : returns the help given to create - Standard_EXPORT Standard_CString Help (const Standard_Integer number) const; + Standard_EXPORT Standard_CString Help (const Standard_Integer number) const Standard_OVERRIDE; //! Changes the default group name for the following Acts //! group empty means to come back to default from Activator diff --git a/src/IFSelect/IFSelect_BasicDumper.hxx b/src/IFSelect/IFSelect_BasicDumper.hxx index 585391f314..fb67d68ba3 100644 --- a/src/IFSelect/IFSelect_BasicDumper.hxx +++ b/src/IFSelect/IFSelect_BasicDumper.hxx @@ -44,11 +44,11 @@ public: //! Write the Own Parameters of Types defined in package IFSelect //! Returns True if has been processed, False else - Standard_EXPORT Standard_Boolean WriteOwn (IFSelect_SessionFile& file, const Handle(Standard_Transient)& item) const; + Standard_EXPORT Standard_Boolean WriteOwn (IFSelect_SessionFile& file, const Handle(Standard_Transient)& item) const Standard_OVERRIDE; //! Recognizes and Read Own Parameters for Types of package //! IFSelect. Returns True if done and created, False else - Standard_EXPORT Standard_Boolean ReadOwn (IFSelect_SessionFile& file, const TCollection_AsciiString& type, Handle(Standard_Transient)& item) const; + Standard_EXPORT Standard_Boolean ReadOwn (IFSelect_SessionFile& file, const TCollection_AsciiString& type, Handle(Standard_Transient)& item) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_DispGlobal.hxx b/src/IFSelect/IFSelect_DispGlobal.hxx index 17072b1ae6..955e179a99 100644 --- a/src/IFSelect/IFSelect_DispGlobal.hxx +++ b/src/IFSelect/IFSelect_DispGlobal.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IFSelect_DispGlobal(); //! Returns as Label, "One File for all Input" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns True : maximum equates 1 Standard_EXPORT virtual Standard_Boolean LimitedMax (const Standard_Integer nbent, Standard_Integer& max) const Standard_OVERRIDE; @@ -54,7 +54,7 @@ public: //! Computes the list of produced Packets. It is made of only ONE //! Packet, which gets the RootResult from the Final Selection. //! Remark : the inherited exception raising is never activated. - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_DispPerCount.hxx b/src/IFSelect/IFSelect_DispPerCount.hxx index b754d82cc1..811e208adb 100644 --- a/src/IFSelect/IFSelect_DispPerCount.hxx +++ b/src/IFSelect/IFSelect_DispPerCount.hxx @@ -57,7 +57,7 @@ public: Standard_EXPORT Standard_Integer CountValue() const; //! Returns as Label, "One File per Input Entities" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns True, maximum count is given as Standard_EXPORT virtual Standard_Boolean LimitedMax (const Standard_Integer nbent, Standard_Integer& max) const Standard_OVERRIDE; @@ -69,7 +69,7 @@ public: //! Computes the list of produced Packets. It defines Packets in //! order to have at most Entities per Packet, Entities //! are given by RootResult from the Final Selection. - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_DispPerFiles.hxx b/src/IFSelect/IFSelect_DispPerFiles.hxx index a9ded1da7d..ce4774fc10 100644 --- a/src/IFSelect/IFSelect_DispPerFiles.hxx +++ b/src/IFSelect/IFSelect_DispPerFiles.hxx @@ -60,7 +60,7 @@ public: Standard_EXPORT Standard_Integer CountValue() const; //! Returns as Label, "Maximum Files" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns True, maximum count is given as CountValue Standard_EXPORT virtual Standard_Boolean LimitedMax (const Standard_Integer nbent, Standard_Integer& max) const Standard_OVERRIDE; @@ -73,7 +73,7 @@ public: //! order to have Packets, except if the input count of //! Entities is lower. Entities are given by RootResult from the //! Final Selection. - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_DispPerOne.hxx b/src/IFSelect/IFSelect_DispPerOne.hxx index 9553bbd1b1..c6b15e4a16 100644 --- a/src/IFSelect/IFSelect_DispPerOne.hxx +++ b/src/IFSelect/IFSelect_DispPerOne.hxx @@ -44,7 +44,7 @@ public: Standard_EXPORT IFSelect_DispPerOne(); //! Returns as Label, "One File per Input Entity" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns True, maximum limit is given as Standard_EXPORT virtual Standard_Boolean LimitedMax (const Standard_Integer nbent, Standard_Integer& max) const Standard_OVERRIDE; @@ -55,7 +55,7 @@ public: //! Returns the list of produced Packets. It defines one Packet //! per Entity given by RootResult from the Final Selection. - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_DispPerSignature.hxx b/src/IFSelect/IFSelect_DispPerSignature.hxx index 1e9681d68e..840390ed1d 100644 --- a/src/IFSelect/IFSelect_DispPerSignature.hxx +++ b/src/IFSelect/IFSelect_DispPerSignature.hxx @@ -58,7 +58,7 @@ public: Standard_EXPORT Standard_CString SignName() const; //! Returns as Label, "One File per Signature " - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns True, maximum count is given as Standard_EXPORT virtual Standard_Boolean LimitedMax (const Standard_Integer nbent, Standard_Integer& max) const Standard_OVERRIDE; @@ -66,7 +66,7 @@ public: //! Computes the list of produced Packets. It defines Packets from //! the SignCounter, which sirts the input Entities per Signature //! (specific of the SignCounter). - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_ModifEditForm.hxx b/src/IFSelect/IFSelect_ModifEditForm.hxx index f807b315fe..c56e0c86af 100644 --- a/src/IFSelect/IFSelect_ModifEditForm.hxx +++ b/src/IFSelect/IFSelect_ModifEditForm.hxx @@ -46,10 +46,10 @@ public: Standard_EXPORT Handle(IFSelect_EditForm) EditForm() const; //! Acts by applying an EditForm to entities, selected or all model - Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const; + Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns Label as "Apply EditForm <+ label of EditForm>" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_ModifReorder.hxx b/src/IFSelect/IFSelect_ModifReorder.hxx index 7f307a5532..a09fe62a2b 100644 --- a/src/IFSelect/IFSelect_ModifReorder.hxx +++ b/src/IFSelect/IFSelect_ModifReorder.hxx @@ -51,10 +51,10 @@ public: //! Acts by computing orders (by method All from ShareTool) then //! forcing them in the model. Remark that selection is ignored : //! ALL the model is processed in once - Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const; + Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns Label as "Reorder, Roots (last or first)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_ParamEditor.hxx b/src/IFSelect/IFSelect_ParamEditor.hxx index 79cbc8330c..5bc27e1281 100644 --- a/src/IFSelect/IFSelect_ParamEditor.hxx +++ b/src/IFSelect/IFSelect_ParamEditor.hxx @@ -65,15 +65,15 @@ public: //! By default, its long name equates its shortname Standard_EXPORT void AddConstantText (const Standard_CString val, const Standard_CString shortname, const Standard_CString completename = ""); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a ParamEditor to work on the Static Parameters of //! which names are listed in diff --git a/src/IFSelect/IFSelect_SelectAnyList.hxx b/src/IFSelect/IFSelect_SelectAnyList.hxx index dd1bc00c1e..28d6964743 100644 --- a/src/IFSelect/IFSelect_SelectAnyList.hxx +++ b/src/IFSelect/IFSelect_SelectAnyList.hxx @@ -110,7 +110,7 @@ public: //! Returns the list of selected entities (list of entities //! complying with rank criterium) //! Error if the input list has more than one Item - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Puts into , the sub-entities of the list, from n1 to //! n2 included. Remark that adequation with Entity's type and @@ -122,7 +122,7 @@ public: //! then Specific List Label, then, following cases : //! " From .. Until .." or "From .." or "Until .." or "Rank no .." //! Specific type is given by deferred method ListLabel - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns the specific label for the list, which is included as //! a part of Label diff --git a/src/IFSelect/IFSelect_SelectAnyType.hxx b/src/IFSelect/IFSelect_SelectAnyType.hxx index ff164608ed..8c1546e516 100644 --- a/src/IFSelect/IFSelect_SelectAnyType.hxx +++ b/src/IFSelect/IFSelect_SelectAnyType.hxx @@ -46,7 +46,7 @@ public: //! Returns True for an Entity (model->Value(num)) which is kind //! of the choosen type, given by the method TypeForMatch. //! Criterium is IsKind. - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectBase.hxx b/src/IFSelect/IFSelect_SelectBase.hxx index 9d8ff76775..779bfc332f 100644 --- a/src/IFSelect/IFSelect_SelectBase.hxx +++ b/src/IFSelect/IFSelect_SelectBase.hxx @@ -37,7 +37,7 @@ public: //! Puts in an Iterator the Selections from which "me" depends //! This list is empty for all SelectBase type Selections - Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const; + Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectCombine.hxx b/src/IFSelect/IFSelect_SelectCombine.hxx index 360cc1982f..7623aa7056 100644 --- a/src/IFSelect/IFSelect_SelectCombine.hxx +++ b/src/IFSelect/IFSelect_SelectCombine.hxx @@ -70,7 +70,7 @@ public: //! Puts in an Iterator the Selections from which "me" depends //! That is to say, the list of Input Selections - Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const; + Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectControl.hxx b/src/IFSelect/IFSelect_SelectControl.hxx index ad9603816c..454f612b09 100644 --- a/src/IFSelect/IFSelect_SelectControl.hxx +++ b/src/IFSelect/IFSelect_SelectControl.hxx @@ -67,7 +67,7 @@ public: //! Puts in an Iterator the Selections from which "me" depends //! That is to say, the list of Input Selections - Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const; + Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectDeduct.hxx b/src/IFSelect/IFSelect_SelectDeduct.hxx index abff44462c..ebda639d99 100644 --- a/src/IFSelect/IFSelect_SelectDeduct.hxx +++ b/src/IFSelect/IFSelect_SelectDeduct.hxx @@ -81,7 +81,7 @@ public: //! Puts in an Iterator the Selections from which "me" depends //! This list contains one Selection : the InputSelection - Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const; + Standard_EXPORT void FillIterator (IFSelect_SelectionIterator& iter) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectDiff.hxx b/src/IFSelect/IFSelect_SelectDiff.hxx index f129db143d..9c1da09e3e 100644 --- a/src/IFSelect/IFSelect_SelectDiff.hxx +++ b/src/IFSelect/IFSelect_SelectDiff.hxx @@ -43,10 +43,10 @@ public: //! Returns the list of selected entities : they are the Entities //! gotten from the Main Input but not from the Diff Input - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Difference" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectEntityNumber.hxx b/src/IFSelect/IFSelect_SelectEntityNumber.hxx index c11361be5f..78d662770b 100644 --- a/src/IFSelect/IFSelect_SelectEntityNumber.hxx +++ b/src/IFSelect/IFSelect_SelectEntityNumber.hxx @@ -52,10 +52,10 @@ public: //! Returns the list of selected entities : the Entity having the //! specified Number (this result assures naturally uniqueness) - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Entity Number ..." - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectErrorEntities.hxx b/src/IFSelect/IFSelect_SelectErrorEntities.hxx index 0f7f7d6aea..7ecda8a76c 100644 --- a/src/IFSelect/IFSelect_SelectErrorEntities.hxx +++ b/src/IFSelect/IFSelect_SelectErrorEntities.hxx @@ -47,10 +47,10 @@ public: //! Returns True for an Entity which is qualified as "Error", i.e. //! if explicitly knows (through its Number) as //! Erroneous - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Error Entities" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectExplore.hxx b/src/IFSelect/IFSelect_SelectExplore.hxx index 0e5515c7d8..b0360a5899 100644 --- a/src/IFSelect/IFSelect_SelectExplore.hxx +++ b/src/IFSelect/IFSelect_SelectExplore.hxx @@ -63,7 +63,7 @@ public: //! taken for output, or to explore. If the maximum level has not //! yet been attained, or if no max level is specified, entities //! to be explored are themselves used as if they were input - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Analyses and, if required, Explores an entity, as follows : //! The explored list starts as empty, it has to be filled by this @@ -80,7 +80,7 @@ public: //! Returns a text saying "(Recursive)" or "(Level nn)" plus //! specific criterium returned by ExploreLabel (see below) - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns a text defining the way of exploration Standard_EXPORT virtual TCollection_AsciiString ExploreLabel() const = 0; diff --git a/src/IFSelect/IFSelect_SelectExtract.hxx b/src/IFSelect/IFSelect_SelectExtract.hxx index a50634ad4b..8d05b46a96 100644 --- a/src/IFSelect/IFSelect_SelectExtract.hxx +++ b/src/IFSelect/IFSelect_SelectExtract.hxx @@ -56,7 +56,7 @@ public: //! Returns the list of selected entities. Works by calling the //! method Sort on each input Entity : the Entity is kept as //! output if Sort returns the same value as Direct status - Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns True for an Entity if it satisfies the Sort criterium //! It receives : @@ -76,7 +76,7 @@ public: //! Returns a text saying "Picked" or "Removed", plus the //! specific criterium returned by ExtractLabel (see below) - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Returns a text defining the criterium for extraction Standard_EXPORT virtual TCollection_AsciiString ExtractLabel() const = 0; diff --git a/src/IFSelect/IFSelect_SelectFlag.hxx b/src/IFSelect/IFSelect_SelectFlag.hxx index 532b9a5af5..a3db1248e3 100644 --- a/src/IFSelect/IFSelect_SelectFlag.hxx +++ b/src/IFSelect/IFSelect_SelectFlag.hxx @@ -64,10 +64,10 @@ public: Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns always False because RootResult has done the work - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium, includes the flag name - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectInList.hxx b/src/IFSelect/IFSelect_SelectInList.hxx index 927fe9de05..4352f756e5 100644 --- a/src/IFSelect/IFSelect_SelectInList.hxx +++ b/src/IFSelect/IFSelect_SelectInList.hxx @@ -53,7 +53,7 @@ public: //! n2 included. Remark that adequation with Entity's type and //! length of list has already been made at this stage //! Called by RootResult; calls ListedEntity (see below) - Standard_EXPORT void FillResult (const Standard_Integer n1, const Standard_Integer n2, const Handle(Standard_Transient)& ent, Interface_EntityIterator& result) const; + Standard_EXPORT void FillResult (const Standard_Integer n1, const Standard_Integer n2, const Handle(Standard_Transient)& ent, Interface_EntityIterator& result) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectIntersection.hxx b/src/IFSelect/IFSelect_SelectIntersection.hxx index a83dd2178c..27fa1a7cfc 100644 --- a/src/IFSelect/IFSelect_SelectIntersection.hxx +++ b/src/IFSelect/IFSelect_SelectIntersection.hxx @@ -42,10 +42,10 @@ public: //! Returns the list of selected Entities, which is the common part //! of results from all input selections. Uniqueness is guaranteed. - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Intersection (AND)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectModelEntities.hxx b/src/IFSelect/IFSelect_SelectModelEntities.hxx index b702be6cdc..e2af3f5fc4 100644 --- a/src/IFSelect/IFSelect_SelectModelEntities.hxx +++ b/src/IFSelect/IFSelect_SelectModelEntities.hxx @@ -42,14 +42,14 @@ public: //! Returns the list of selected entities : the Entities of the //! Model (note that this result assures naturally uniqueness) - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! The complete list of Entities (including shared ones) ... //! is exactly identical to RootResults in this case Standard_EXPORT virtual Interface_EntityIterator CompleteResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Model Entities" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectModelRoots.hxx b/src/IFSelect/IFSelect_SelectModelRoots.hxx index e2f3f22318..b2dd4c9e27 100644 --- a/src/IFSelect/IFSelect_SelectModelRoots.hxx +++ b/src/IFSelect/IFSelect_SelectModelRoots.hxx @@ -44,10 +44,10 @@ public: //! Returns the list of selected entities : the Roots of the Model //! (note that this result assures naturally uniqueness) - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Model Roots" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectPointed.hxx b/src/IFSelect/IFSelect_SelectPointed.hxx index 7b28716733..0daa669c05 100644 --- a/src/IFSelect/IFSelect_SelectPointed.hxx +++ b/src/IFSelect/IFSelect_SelectPointed.hxx @@ -118,11 +118,11 @@ public: //! Returns the list of selected items. Only the selected entities //! which are present in the graph are given (this result assures //! uniqueness). - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text which identifies the type of selection made. //! It is "Pointed Entities" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectRange.hxx b/src/IFSelect/IFSelect_SelectRange.hxx index a61d4c0ae0..e7f195f00b 100644 --- a/src/IFSelect/IFSelect_SelectRange.hxx +++ b/src/IFSelect/IFSelect_SelectRange.hxx @@ -78,11 +78,11 @@ public: //! Returns True for an Entity of which occurence number in the //! iteration is inside the selected Range (considers ) - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : following cases, //! " From .. Until .." or "From .." or "Until .." or "Rank no .." - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectRootComps.hxx b/src/IFSelect/IFSelect_SelectRootComps.hxx index e96fad5d74..83c3137d83 100644 --- a/src/IFSelect/IFSelect_SelectRootComps.hxx +++ b/src/IFSelect/IFSelect_SelectRootComps.hxx @@ -59,10 +59,10 @@ public: Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns always True, because RootResult has done work - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Local Root Componants" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectRoots.hxx b/src/IFSelect/IFSelect_SelectRoots.hxx index cc2b53cf46..9ddaf260d1 100644 --- a/src/IFSelect/IFSelect_SelectRoots.hxx +++ b/src/IFSelect/IFSelect_SelectRoots.hxx @@ -52,10 +52,10 @@ public: Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns always True, because RootResult has done work - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Local Root Entities" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSent.hxx b/src/IFSelect/IFSelect_SelectSent.hxx index a198a2d72f..1307aee9c8 100644 --- a/src/IFSelect/IFSelect_SelectSent.hxx +++ b/src/IFSelect/IFSelect_SelectSent.hxx @@ -75,7 +75,7 @@ public: Standard_EXPORT virtual Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns always False because RootResult has done the work - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : query : //! SentCount = 0 -> "Remaining (non-sent) entities" @@ -85,7 +85,7 @@ public: //! SentCount = 2, AtLeast = False -> "Sent twice entities" //! SentCount > 2, AtLeast = True -> "Sent at least times entities" //! SentCount > 2, AtLeast = False -> "Sent times entities" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectShared.hxx b/src/IFSelect/IFSelect_SelectShared.hxx index 16d7cc6ae5..f1de4d255e 100644 --- a/src/IFSelect/IFSelect_SelectShared.hxx +++ b/src/IFSelect/IFSelect_SelectShared.hxx @@ -42,10 +42,10 @@ public: //! Returns the list of selected entities (list of entities //! shared by those of input list) - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Shared (one level)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSharing.hxx b/src/IFSelect/IFSelect_SelectSharing.hxx index c041a496b0..1c93361837 100644 --- a/src/IFSelect/IFSelect_SelectSharing.hxx +++ b/src/IFSelect/IFSelect_SelectSharing.hxx @@ -44,10 +44,10 @@ public: //! Returns the list of selected entities (list of entities //! which share (level one) those of input list) - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Sharing (one level)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSignature.hxx b/src/IFSelect/IFSelect_SelectSignature.hxx index 58136cd77e..fe27753b4e 100644 --- a/src/IFSelect/IFSelect_SelectSignature.hxx +++ b/src/IFSelect/IFSelect_SelectSignature.hxx @@ -88,7 +88,7 @@ public: Standard_EXPORT virtual Standard_Boolean SortInGraph (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Interface_Graph& G) const Standard_OVERRIDE; //! Not called, defined only to remove a deferred method here - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns Text used to Sort Entity on its Signature or SignCounter Standard_EXPORT const TCollection_AsciiString& SignatureText() const; @@ -99,7 +99,7 @@ public: //! Returns a text defining the criterium. //! (it refers to the text and exact flag to be matched, and is //! qualified by the Name provided by the Signature) - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSignedShared.hxx b/src/IFSelect/IFSelect_SelectSignedShared.hxx index ac07020387..a63e714b08 100644 --- a/src/IFSelect/IFSelect_SelectSignedShared.hxx +++ b/src/IFSelect/IFSelect_SelectSignedShared.hxx @@ -62,12 +62,12 @@ public: //! Explores an entity : its Shared entities //! to take if it matches the Signature //! At level max, filters the result. Else gives all Shareds - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium. //! (it refers to the text and exact flag to be matched, and is //! qualified by the Name provided by the Signature) - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSignedSharing.hxx b/src/IFSelect/IFSelect_SelectSignedSharing.hxx index c82a2e8056..42bc23f758 100644 --- a/src/IFSelect/IFSelect_SelectSignedSharing.hxx +++ b/src/IFSelect/IFSelect_SelectSignedSharing.hxx @@ -62,12 +62,12 @@ public: //! Explores an entity : its sharing entities //! to take if it matches the Signature //! At level max, filters the result. Else gives all sharings - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium. //! (it refers to the text and exact flag to be matched, and is //! qualified by the Name provided by the Signature) - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectSuite.hxx b/src/IFSelect/IFSelect_SelectSuite.hxx index ae7fcfc5c1..581ce3464f 100644 --- a/src/IFSelect/IFSelect_SelectSuite.hxx +++ b/src/IFSelect/IFSelect_SelectSuite.hxx @@ -90,12 +90,12 @@ public: //! this result is set as alternate input for the first item, //! which computes its result : this result is set as alternate //! input for the second item, etc... - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns the Label //! Either it has been defined by SetLabel, or it will give //! "Suite of nn Selections" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectType.hxx b/src/IFSelect/IFSelect_SelectType.hxx index 0868a867a7..ab91d17cca 100644 --- a/src/IFSelect/IFSelect_SelectType.hxx +++ b/src/IFSelect/IFSelect_SelectType.hxx @@ -47,11 +47,11 @@ public: //! Returns the Type to be matched for select : this is the type //! given at instantiation time - Standard_EXPORT Handle(Standard_Type) TypeForMatch() const; + Standard_EXPORT Handle(Standard_Type) TypeForMatch() const Standard_OVERRIDE; //! Returns a text defining the criterium. //! (should by gotten from Type of Entity used for instantiation) - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectUnion.hxx b/src/IFSelect/IFSelect_SelectUnion.hxx index a19df46bca..c0176a15a2 100644 --- a/src/IFSelect/IFSelect_SelectUnion.hxx +++ b/src/IFSelect/IFSelect_SelectUnion.hxx @@ -42,10 +42,10 @@ public: //! Returns the list of selected Entities, which is the addition //! result from all input selections. Uniqueness is guaranteed. - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Union (OR)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SelectUnknownEntities.hxx b/src/IFSelect/IFSelect_SelectUnknownEntities.hxx index 14bb7078c1..93538834c6 100644 --- a/src/IFSelect/IFSelect_SelectUnknownEntities.hxx +++ b/src/IFSelect/IFSelect_SelectUnknownEntities.hxx @@ -44,10 +44,10 @@ public: //! Returns True for an Entity which is qualified as "Unknown", //! i.e. if known (through its Number) as Unknown - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Recognized Entities" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SessionPilot.hxx b/src/IFSelect/IFSelect_SessionPilot.hxx index 961d07069f..322445dd20 100644 --- a/src/IFSelect/IFSelect_SessionPilot.hxx +++ b/src/IFSelect/IFSelect_SessionPilot.hxx @@ -205,10 +205,10 @@ public: //! xstep is a simple prefix (useful in a wider environment, to //! avoid conflicts on command names) //! xset control commands which create items with names - Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& session); + Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& session) Standard_OVERRIDE; //! Help for specific commands (apart from general command help) - Standard_EXPORT Standard_CString Help (const Standard_Integer number) const; + Standard_EXPORT Standard_CString Help (const Standard_Integer number) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SignCategory.hxx b/src/IFSelect/IFSelect_SignCategory.hxx index 796df1f0cc..849d4bd8af 100644 --- a/src/IFSelect/IFSelect_SignCategory.hxx +++ b/src/IFSelect/IFSelect_SignCategory.hxx @@ -42,7 +42,7 @@ public: //! Returns the Signature for a Transient object, as its Category //! recorded in the model - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SignMultiple.hxx b/src/IFSelect/IFSelect_SignMultiple.hxx index d2b6c29b49..168063067e 100644 --- a/src/IFSelect/IFSelect_SignMultiple.hxx +++ b/src/IFSelect/IFSelect_SignMultiple.hxx @@ -58,7 +58,7 @@ public: //! Concatenates the values of sub-signatures, with their //! tabulations - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Specialized Match Rule //! If is False, simply checks if at least one sub-item diff --git a/src/IFSelect/IFSelect_SignType.hxx b/src/IFSelect/IFSelect_SignType.hxx index dbc49426fb..18e8eaed7f 100644 --- a/src/IFSelect/IFSelect_SignType.hxx +++ b/src/IFSelect/IFSelect_SignType.hxx @@ -47,7 +47,7 @@ public: //! Returns the Signature for a Transient object, as its Dynamic //! Type, with or without package name, according starting option - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_SignValidity.hxx b/src/IFSelect/IFSelect_SignValidity.hxx index 47dd543ddf..48abb83a9b 100644 --- a/src/IFSelect/IFSelect_SignValidity.hxx +++ b/src/IFSelect/IFSelect_SignValidity.hxx @@ -50,7 +50,7 @@ public: //! Returns the Signature for a Transient object, as a validity //! deducted from data (reports) stored in the model //! Calls the class method CVal - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IFSelect/IFSelect_Signature.hxx b/src/IFSelect/IFSelect_Signature.hxx index a69ae0c721..7c2528c5b0 100644 --- a/src/IFSelect/IFSelect_Signature.hxx +++ b/src/IFSelect/IFSelect_Signature.hxx @@ -75,7 +75,7 @@ public: //! of each sub-class of Signature. For a Null Handle, it should //! provide "" //! It can work with the model which contains the entity - Standard_EXPORT Standard_CString Name() const; + Standard_EXPORT Standard_CString Name() const Standard_OVERRIDE; //! The label of a Signature uses its name as follow : //! "Signature : " diff --git a/src/IFSelect/IFSelect_TransformStandard.hxx b/src/IFSelect/IFSelect_TransformStandard.hxx index d622576d2e..646dd7f4f2 100644 --- a/src/IFSelect/IFSelect_TransformStandard.hxx +++ b/src/IFSelect/IFSelect_TransformStandard.hxx @@ -116,7 +116,7 @@ public: //! Performs the Standard Transformation, by calling Copy then //! ApplyModifiers (which can return an error status) - Standard_EXPORT Standard_Boolean Perform (const Interface_Graph& G, const Handle(Interface_Protocol)& protocol, Interface_CheckIterator& checks, Handle(Interface_InterfaceModel)& newmod); + Standard_EXPORT Standard_Boolean Perform (const Interface_Graph& G, const Handle(Interface_Protocol)& protocol, Interface_CheckIterator& checks, Handle(Interface_InterfaceModel)& newmod) Standard_OVERRIDE; //! This the first operation. It calls StandardCopy or OnTheSpot //! according the option @@ -143,12 +143,12 @@ public: //! This methods allows to know what happened to a starting //! entity after the last Perform. It reads result from the map //! which was filled by Perform. - Standard_EXPORT Standard_Boolean Updated (const Handle(Standard_Transient)& entfrom, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean Updated (const Handle(Standard_Transient)& entfrom, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Returns a text which defines the way a Transformer works : //! "On the spot edition" or "Standard Copy" followed by //! " Modifiers" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESAppli/IGESAppli_GeneralModule.hxx b/src/IGESAppli/IGESAppli_GeneralModule.hxx index 626e2492b0..ef68e5a1d4 100644 --- a/src/IGESAppli/IGESAppli_GeneralModule.hxx +++ b/src/IGESAppli/IGESAppli_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! FEA for : ElementResults,FiniteElement,Node&Co diff --git a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx index f7e28bb5d0..27a2366445 100644 --- a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx +++ b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESAppli_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESAppli - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESAppli - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESAppli/IGESAppli_SpecificModule.hxx b/src/IGESAppli/IGESAppli_SpecificModule.hxx index c62182dfd4..4322b8b690 100644 --- a/src/IGESAppli/IGESAppli_SpecificModule.hxx +++ b/src/IGESAppli/IGESAppli_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESAppli_SpecificModule(); //! Specific Dump (own parameters) for IGESAppli - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! ---Purpose Standard_EXPORT virtual Standard_Boolean OwnCorrect (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; diff --git a/src/IGESBasic/IGESBasic_GeneralModule.hxx b/src/IGESBasic/IGESBasic_GeneralModule.hxx index 7658e5c58d..823facc924 100644 --- a/src/IGESBasic/IGESBasic_GeneralModule.hxx +++ b/src/IGESBasic/IGESBasic_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Structure for Groups, Figures & Co diff --git a/src/IGESBasic/IGESBasic_Name.hxx b/src/IGESBasic/IGESBasic_Name.hxx index 80d4604b4f..9b666ba196 100644 --- a/src/IGESBasic/IGESBasic_Name.hxx +++ b/src/IGESBasic/IGESBasic_Name.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT Standard_Integer NbPropertyValues() const; //! returns the user defined Name - Standard_EXPORT Handle(TCollection_HAsciiString) Value() const; + Standard_EXPORT Handle(TCollection_HAsciiString) Value() const Standard_OVERRIDE; diff --git a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx index 1c697de333..1b7e31664f 100644 --- a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx +++ b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESBasic_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESBasic - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESBasic - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESBasic/IGESBasic_SingleParent.hxx b/src/IGESBasic/IGESBasic_SingleParent.hxx index 6378ae9134..60a5a0ba33 100644 --- a/src/IGESBasic/IGESBasic_SingleParent.hxx +++ b/src/IGESBasic/IGESBasic_SingleParent.hxx @@ -54,14 +54,14 @@ public: Standard_EXPORT Standard_Integer NbParentEntities() const; //! Returns the Parent Entity (inherited method) - Standard_EXPORT Handle(IGESData_IGESEntity) SingleParent() const; + Standard_EXPORT Handle(IGESData_IGESEntity) SingleParent() const Standard_OVERRIDE; //! returns the number of children of the Parent - Standard_EXPORT Standard_Integer NbChildren() const; + Standard_EXPORT Standard_Integer NbChildren() const Standard_OVERRIDE; //! returns the specific child as indicated by Index //! raises exception if Index <= 0 or Index > NbChildren() - Standard_EXPORT Handle(IGESData_IGESEntity) Child (const Standard_Integer Index) const; + Standard_EXPORT Handle(IGESData_IGESEntity) Child (const Standard_Integer Index) const Standard_OVERRIDE; diff --git a/src/IGESBasic/IGESBasic_SpecificModule.hxx b/src/IGESBasic/IGESBasic_SpecificModule.hxx index fd3cbbc395..7445f90451 100644 --- a/src/IGESBasic/IGESBasic_SpecificModule.hxx +++ b/src/IGESBasic/IGESBasic_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESBasic_SpecificModule(); //! Specific Dump (own parameters) for IGESBasic - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! Performs non-ambiguous Corrections on Entities which support //! them (AssocGroupType,Hierarchy,Name,SingleParent) diff --git a/src/IGESControl/IGESControl_Controller.hxx b/src/IGESControl/IGESControl_Controller.hxx index 54c205ede2..3d7bf941c8 100644 --- a/src/IGESControl/IGESControl_Controller.hxx +++ b/src/IGESControl/IGESControl_Controller.hxx @@ -48,12 +48,12 @@ public: //! Creates a new empty Model ready to receive data of the Norm. //! It is taken from IGES Template Model - Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const Standard_OVERRIDE; //! Returns the Actor for Read attached to the pair (norm,appli) //! It is an Actor from IGESToBRep, adapted from an IGESModel : //! Unit, tolerances - Standard_EXPORT Handle(Transfer_ActorOfTransientProcess) ActorRead (const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Handle(Transfer_ActorOfTransientProcess) ActorRead (const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Takes one Shape and transfers it to the InterfaceModel //! (already created by NewModel for instance) diff --git a/src/IGESData/IGESData_DefaultGeneral.hxx b/src/IGESData/IGESData_DefaultGeneral.hxx index 520cd51889..2278f6a2ab 100644 --- a/src/IGESData/IGESData_DefaultGeneral.hxx +++ b/src/IGESData/IGESData_DefaultGeneral.hxx @@ -49,21 +49,21 @@ public: //! Lists the Entities shared by an IGESEntity, which must be //! an UndefinedEntity - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! Here, Returns an empty DirChecker (no constraint to check) - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity //! Here, does nothing (no constraint to check) - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity (UndefinedEntity only) - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; diff --git a/src/IGESData/IGESData_DefaultSpecific.hxx b/src/IGESData/IGESData_DefaultSpecific.hxx index 0abb6e3f84..8c789ee07b 100644 --- a/src/IGESData/IGESData_DefaultSpecific.hxx +++ b/src/IGESData/IGESData_DefaultSpecific.hxx @@ -43,7 +43,7 @@ public: //! Specific Dump for UndefinedEntity : it concerns only //! own parameters, the general data (Directory Part, Lists) are //! taken into account by the IGESDumper - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; diff --git a/src/IGESData/IGESData_GeneralModule.hxx b/src/IGESData/IGESData_GeneralModule.hxx index 037e2dafff..7d1f653df2 100644 --- a/src/IGESData/IGESData_GeneralModule.hxx +++ b/src/IGESData/IGESData_GeneralModule.hxx @@ -51,7 +51,7 @@ public: //! according a Case Number (formerly computed by CaseNum). //! Considers Properties and Directory Part, and calls //! OwnSharedCase (which is adapted to each Type of Entity) - Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type @@ -69,7 +69,7 @@ public: //! Semantic Checking of an IGESEntity. Performs general Checks, //! which use DirChecker, then call OwnCheck which does a check //! specific for each type of Entity - Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines @@ -84,13 +84,13 @@ public: Standard_EXPORT virtual Standard_Boolean CanCopy (const Standard_Integer CN, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT virtual Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const = 0; + Standard_EXPORT virtual Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE = 0; //! Copy ("Deep") from to (same type) //! by using a CopyTool which provides its working Map. //! For IGESEntities, Copies general data (Directory Part, List of //! Properties) and call OwnCopyCase - Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity Standard_EXPORT virtual void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const = 0; diff --git a/src/IGESData/IGESData_IGESModel.hxx b/src/IGESData/IGESData_IGESModel.hxx index faa727c629..143d7f9c21 100644 --- a/src/IGESData/IGESData_IGESModel.hxx +++ b/src/IGESData/IGESData_IGESModel.hxx @@ -62,12 +62,12 @@ public: Standard_EXPORT IGESData_IGESModel(); //! Erases all data specific to IGES file Header (Start + Global) - Standard_EXPORT void ClearHeader(); + Standard_EXPORT void ClearHeader() Standard_OVERRIDE; //! Prints the IGES file header //! (Start and Global Sections) to the log file. The integer //! parameter is intended to be used as a level indicator but is not used at present. - Standard_EXPORT void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const; + Standard_EXPORT void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const Standard_OVERRIDE; //! Returns Model's Start Section (list of comment lines) Standard_EXPORT Handle(TColStd_HSequenceOfHAsciiString) StartSection() const; @@ -125,10 +125,10 @@ public: Standard_EXPORT Standard_Integer DNum (const Handle(IGESData_IGESEntity)& ent) const; //! gets Header (GlobalSection) from another Model - Standard_EXPORT void GetFromAnother (const Handle(Interface_InterfaceModel)& other); + Standard_EXPORT void GetFromAnother (const Handle(Interface_InterfaceModel)& other) Standard_OVERRIDE; //! Returns a New Empty Model, same type as i.e. IGESModel - Standard_EXPORT Handle(Interface_InterfaceModel) NewEmptyModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewEmptyModel() const Standard_OVERRIDE; //! Checks that the IGES file Global //! section contains valid data that conforms to the IGES specifications. @@ -140,11 +140,11 @@ public: Standard_EXPORT void SetLineWeights (const Standard_Real defw); //! erases specific labels, i.e. does nothing - Standard_EXPORT void ClearLabels(); + Standard_EXPORT void ClearLabels() Standard_OVERRIDE; //! Prints label specific to IGES norm for a given entity, i.e. //! its directory entry number (2*Number-1) - Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const; + Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const Standard_OVERRIDE; //! Prints label specific to IGES norm for a given -- -- //! entity, i.e. its directory entry number (2*Number-1) @@ -157,7 +157,7 @@ public: //! Returns a string with the label attached to a given entity, //! i.e. a string "Dnn" with nn = directory entry number (2*N-1) - Standard_EXPORT Handle(TCollection_HAsciiString) StringLabel (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringLabel (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/IGESData/IGESData_IGESReaderData.hxx b/src/IGESData/IGESData_IGESReaderData.hxx index ee90814651..fe1c5a8fc4 100644 --- a/src/IGESData/IGESData_IGESReaderData.hxx +++ b/src/IGESData/IGESData_IGESReaderData.hxx @@ -91,7 +91,7 @@ public: //! determines next suitable record from num; that is num+1 except //! for last one which gives 0 - Standard_EXPORT Standard_Integer FindNextRecord (const Standard_Integer num) const; + Standard_EXPORT Standard_Integer FindNextRecord (const Standard_Integer num) const Standard_OVERRIDE; //! determines reference numbers in EntityNumber fields (called by //! SetEntities from IGESReaderTool) diff --git a/src/IGESData/IGESData_IGESReaderTool.hxx b/src/IGESData/IGESData_IGESReaderTool.hxx index 208b43c2ce..a7838a56c4 100644 --- a/src/IGESData/IGESData_IGESReaderTool.hxx +++ b/src/IGESData/IGESData_IGESReaderTool.hxx @@ -62,16 +62,16 @@ public: Standard_EXPORT void Prepare (const Handle(IGESData_FileRecognizer)& reco); //! recognizes records by asking Protocol (on data of DirType) - Standard_EXPORT Standard_Boolean Recognize (const Standard_Integer num, Handle(Interface_Check)& ach, Handle(Standard_Transient)& ent); + Standard_EXPORT Standard_Boolean Recognize (const Standard_Integer num, Handle(Interface_Check)& ach, Handle(Standard_Transient)& ent) Standard_OVERRIDE; //! fills model's header, that is, its GlobalSection - Standard_EXPORT void BeginRead (const Handle(Interface_InterfaceModel)& amodel); + Standard_EXPORT void BeginRead (const Handle(Interface_InterfaceModel)& amodel) Standard_OVERRIDE; //! fills an entity, given record no; works by calling ReadDirPart //! then ReadParams (with help of a ParamReader), then if required //! ReadProps and ReadAssocs, from IGESEntity //! Returns True if no fail has been recorded - Standard_EXPORT Standard_Boolean AnalyseRecord (const Standard_Integer num, const Handle(Standard_Transient)& anent, Handle(Interface_Check)& acheck); + Standard_EXPORT Standard_Boolean AnalyseRecord (const Standard_Integer num, const Handle(Standard_Transient)& anent, Handle(Interface_Check)& acheck) Standard_OVERRIDE; //! after reading entities, true line weights can be computed Standard_EXPORT virtual void EndRead (const Handle(Interface_InterfaceModel)& amodel) Standard_OVERRIDE; diff --git a/src/IGESData/IGESData_Protocol.hxx b/src/IGESData/IGESData_Protocol.hxx index 1ec3c7d1c4..88ccaaa6c8 100644 --- a/src/IGESData/IGESData_Protocol.hxx +++ b/src/IGESData/IGESData_Protocol.hxx @@ -44,27 +44,27 @@ public: Standard_EXPORT IGESData_Protocol(); //! Gives the count of Resource Protocol. Here, none - Standard_EXPORT Standard_Integer NbResources() const; + Standard_EXPORT Standard_Integer NbResources() const Standard_OVERRIDE; //! Returns a Resource, given a rank. Here, none - Standard_EXPORT Handle(Interface_Protocol) Resource (const Standard_Integer num) const; + Standard_EXPORT Handle(Interface_Protocol) Resource (const Standard_Integer num) const Standard_OVERRIDE; //! Returns a Case Number, specific of each recognized Type //! Here, Undefined and Free Format Entities have the Number 1. - Standard_EXPORT Standard_Integer TypeNumber (const Handle(Standard_Type)& atype) const; + Standard_EXPORT Standard_Integer TypeNumber (const Handle(Standard_Type)& atype) const Standard_OVERRIDE; //! Creates an empty Model for IGES Norm - Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const Standard_OVERRIDE; //! Returns True if is a Model of IGES Norm - Standard_EXPORT Standard_Boolean IsSuitableModel (const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean IsSuitableModel (const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Creates a new Unknown Entity for IGES (UndefinedEntity) - Standard_EXPORT Handle(Standard_Transient) UnknownEntity() const; + Standard_EXPORT Handle(Standard_Transient) UnknownEntity() const Standard_OVERRIDE; //! Returns True if is an Unknown Entity for the Norm, i.e. //! Type UndefinedEntity, status Unknown - Standard_EXPORT Standard_Boolean IsUnknownEntity (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Boolean IsUnknownEntity (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/IGESData/IGESData_ReadWriteModule.hxx b/src/IGESData/IGESData_ReadWriteModule.hxx index 3ac59289e1..14ae7bb2ee 100644 --- a/src/IGESData/IGESData_ReadWriteModule.hxx +++ b/src/IGESData/IGESData_ReadWriteModule.hxx @@ -63,7 +63,7 @@ public: //! Case Number, or 0 if failed. //! Works with IGESReaderData which provides Type & Form Numbers, //! and calls CaseIGES (see below) - Standard_EXPORT Standard_Integer CaseNum (const Handle(Interface_FileReaderData)& data, const Standard_Integer num) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Interface_FileReaderData)& data, const Standard_Integer num) const Standard_OVERRIDE; //! Defines Case Numbers corresponding to the Entity Types taken //! into account by a sub-class of ReadWriteModule (hence, each @@ -73,7 +73,7 @@ public: Standard_EXPORT virtual Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const = 0; //! General Read Function. See IGESReaderTool for more info - Standard_EXPORT void Read (const Standard_Integer CN, const Handle(Interface_FileReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void Read (const Standard_Integer CN, const Handle(Interface_FileReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity; gives //! access to them, detains parameter types and values diff --git a/src/IGESDefs/IGESDefs_GeneralModule.hxx b/src/IGESDefs/IGESDefs_GeneralModule.hxx index 897f2c8af7..b1cf12690d 100644 --- a/src/IGESDefs/IGESDefs_GeneralModule.hxx +++ b/src/IGESDefs/IGESDefs_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Auxiliary for all diff --git a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx index 30f51cce3f..8eaac82656 100644 --- a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx +++ b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESDefs_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESDefs - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESDefs - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESDefs/IGESDefs_SpecificModule.hxx b/src/IGESDefs/IGESDefs_SpecificModule.hxx index 67bd478982..3e9feafe20 100644 --- a/src/IGESDefs/IGESDefs_SpecificModule.hxx +++ b/src/IGESDefs/IGESDefs_SpecificModule.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT IGESDefs_SpecificModule(); //! Specific Dump (own parameters) for IGESDefs - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; diff --git a/src/IGESDimen/IGESDimen_GeneralModule.hxx b/src/IGESDimen/IGESDimen_GeneralModule.hxx index 3ca84fb8c3..cb1017c295 100644 --- a/src/IGESDimen/IGESDimen_GeneralModule.hxx +++ b/src/IGESDimen/IGESDimen_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Drawing for all diff --git a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx index 554db3d304..0275a99523 100644 --- a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx +++ b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESDimen_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESDimen - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESDimen - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESDimen/IGESDimen_SpecificModule.hxx b/src/IGESDimen/IGESDimen_SpecificModule.hxx index af33fa0936..f90c886537 100644 --- a/src/IGESDimen/IGESDimen_SpecificModule.hxx +++ b/src/IGESDimen/IGESDimen_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESDimen_SpecificModule(); //! Specific Dump (own parameters) for IGESDimen - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! Performs non-ambiguous Corrections on Entities which support //! them (BasicDimension,CenterLine,DimensionDisplayData, diff --git a/src/IGESDraw/IGESDraw_GeneralModule.hxx b/src/IGESDraw/IGESDraw_GeneralModule.hxx index c3471570fc..dfdba297a5 100644 --- a/src/IGESDraw/IGESDraw_GeneralModule.hxx +++ b/src/IGESDraw/IGESDraw_GeneralModule.hxx @@ -48,7 +48,7 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Specific list of Entities implied by an IGESEntity (in //! addition to Associativities). Redefined for ViewsVisible ... @@ -57,16 +57,16 @@ public: //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Renews parameters which are specific of each Type of Entity : //! redefined for ViewsVisible ... (takes only the implied ref.s diff --git a/src/IGESDraw/IGESDraw_PerspectiveView.hxx b/src/IGESDraw/IGESDraw_PerspectiveView.hxx index 3057784c83..c77a8c633a 100644 --- a/src/IGESDraw/IGESDraw_PerspectiveView.hxx +++ b/src/IGESDraw/IGESDraw_PerspectiveView.hxx @@ -78,13 +78,13 @@ public: Standard_EXPORT void Init (const Standard_Integer aViewNumber, const Standard_Real aScaleFactor, const gp_XYZ& aViewNormalVector, const gp_XYZ& aViewReferencePoint, const gp_XYZ& aCenterOfProjection, const gp_XYZ& aViewUpVector, const Standard_Real aViewPlaneDistance, const gp_XY& aTopLeft, const gp_XY& aBottomRight, const Standard_Integer aDepthClip, const Standard_Real aBackPlaneDistance, const Standard_Real aFrontPlaneDistance); //! Returns True (for a single view) - Standard_EXPORT Standard_Boolean IsSingle() const; + Standard_EXPORT Standard_Boolean IsSingle() const Standard_OVERRIDE; //! Returns 1 (single view) - Standard_EXPORT Standard_Integer NbViews() const; + Standard_EXPORT Standard_Integer NbViews() const Standard_OVERRIDE; //! For a single view, returns whatever - Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer num) const; + Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer num) const Standard_OVERRIDE; //! returns the view number associated with Standard_EXPORT Standard_Integer ViewNumber() const; diff --git a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx index b65a74e58e..497d9ac79e 100644 --- a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx +++ b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESDraw_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESDraw - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESDraw - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx index dbf93fb1c9..e461b512cd 100644 --- a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx +++ b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx @@ -69,10 +69,10 @@ public: Standard_EXPORT void Init (const Handle(IGESDraw_HArray1OfViewKindEntity)& allViews, const Handle(TColStd_HArray1OfReal)& allBreakpointParameters, const Handle(TColStd_HArray1OfInteger)& allDisplayFlags, const Handle(TColStd_HArray1OfInteger)& allColorValues, const Handle(IGESGraph_HArray1OfColor)& allColorDefinitions, const Handle(TColStd_HArray1OfInteger)& allLineFontValues, const Handle(IGESBasic_HArray1OfLineFontEntity)& allLineFontDefinitions, const Handle(TColStd_HArray1OfInteger)& allLineWeights); //! Returns False (for a complex view) - Standard_EXPORT Standard_Boolean IsSingle() const; + Standard_EXPORT Standard_Boolean IsSingle() const Standard_OVERRIDE; //! Returns the count of Views referenced by (inherited) - Standard_EXPORT Standard_Integer NbViews() const; + Standard_EXPORT Standard_Integer NbViews() const Standard_OVERRIDE; //! returns the number of view/segment blocks in //! Similar to NbViews but has a more general significance @@ -81,7 +81,7 @@ public: //! returns the View entity indicated by ViewIndex //! raises an exception if ViewIndex <= 0 or //! ViewIndex > NbSegmentBlocks() - Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer ViewIndex) const; + Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer ViewIndex) const Standard_OVERRIDE; //! returns the parameter of the breakpoint indicated by //! BreakpointIndex diff --git a/src/IGESDraw/IGESDraw_SpecificModule.hxx b/src/IGESDraw/IGESDraw_SpecificModule.hxx index 39b76e94e0..144f8a8be7 100644 --- a/src/IGESDraw/IGESDraw_SpecificModule.hxx +++ b/src/IGESDraw/IGESDraw_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESDraw_SpecificModule(); //! Specific Dump (own parameters) for IGESDraw - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! Performs non-ambiguous Corrections on Entities which support //! them (Planar) diff --git a/src/IGESDraw/IGESDraw_View.hxx b/src/IGESDraw/IGESDraw_View.hxx index 6790002e80..2a4d253296 100644 --- a/src/IGESDraw/IGESDraw_View.hxx +++ b/src/IGESDraw/IGESDraw_View.hxx @@ -62,13 +62,13 @@ public: Standard_EXPORT void Init (const Standard_Integer aViewNum, const Standard_Real aScale, const Handle(IGESGeom_Plane)& aLeftPlane, const Handle(IGESGeom_Plane)& aTopPlane, const Handle(IGESGeom_Plane)& aRightPlane, const Handle(IGESGeom_Plane)& aBottomPlane, const Handle(IGESGeom_Plane)& aBackPlane, const Handle(IGESGeom_Plane)& aFrontPlane); //! Returns True (for a single view) - Standard_EXPORT Standard_Boolean IsSingle() const; + Standard_EXPORT Standard_Boolean IsSingle() const Standard_OVERRIDE; //! Returns 1 (single view) - Standard_EXPORT Standard_Integer NbViews() const; + Standard_EXPORT Standard_Integer NbViews() const Standard_OVERRIDE; //! For a single view, returns whatever - Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer num) const; + Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer num) const Standard_OVERRIDE; //! returns integer number identifying view orientation Standard_EXPORT Standard_Integer ViewNumber() const; diff --git a/src/IGESDraw/IGESDraw_ViewsVisible.hxx b/src/IGESDraw/IGESDraw_ViewsVisible.hxx index 56905ad6c0..dae1b8c165 100644 --- a/src/IGESDraw/IGESDraw_ViewsVisible.hxx +++ b/src/IGESDraw/IGESDraw_ViewsVisible.hxx @@ -57,10 +57,10 @@ public: Standard_EXPORT void InitImplied (const Handle(IGESData_HArray1OfIGESEntity)& allDisplayEntity); //! Returns False (for a complex view) - Standard_EXPORT Standard_Boolean IsSingle() const; + Standard_EXPORT Standard_Boolean IsSingle() const Standard_OVERRIDE; //! returns the Number of views visible - Standard_EXPORT Standard_Integer NbViews() const; + Standard_EXPORT Standard_Integer NbViews() const Standard_OVERRIDE; //! returns the number of entities displayed in the Views or zero if //! no Entities specified in these Views @@ -68,7 +68,7 @@ public: //! returns the Index'th ViewKindEntity Entity //! raises exception if Index <= 0 or Index > NbViewsVisible() - Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer Index) const; + Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer Index) const Standard_OVERRIDE; //! returns the Index'th entity whose display is being specified by //! this associativity instance diff --git a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx index c1a4c856ba..11cf7fb747 100644 --- a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx +++ b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx @@ -73,11 +73,11 @@ public: Standard_EXPORT void InitImplied (const Handle(IGESData_HArray1OfIGESEntity)& allDisplayEntity); //! Returns False (for a complex view) - Standard_EXPORT Standard_Boolean IsSingle() const; + Standard_EXPORT Standard_Boolean IsSingle() const Standard_OVERRIDE; //! returns the number of Views containing the view visible, line font, //! color number, and line weight information - Standard_EXPORT Standard_Integer NbViews() const; + Standard_EXPORT Standard_Integer NbViews() const Standard_OVERRIDE; //! returns the number of entities which have this particular set of //! display characteristic, or zero if no Entities specified @@ -85,7 +85,7 @@ public: //! returns the Index'th ViewKindEntity entity //! raises exception if Index <= 0 or Index > NbViews() - Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer Index) const; + Standard_EXPORT Handle(IGESData_ViewKindEntity) ViewItem (const Standard_Integer Index) const Standard_OVERRIDE; //! returns the Index'th Line font value or zero //! raises exception if Index <= 0 or Index > NbViews() diff --git a/src/IGESGeom/IGESGeom_GeneralModule.hxx b/src/IGESGeom/IGESGeom_GeneralModule.hxx index c96da0c40b..f02057f548 100644 --- a/src/IGESGeom/IGESGeom_GeneralModule.hxx +++ b/src/IGESGeom/IGESGeom_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Shape for all, but Drawing for : diff --git a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx index 5d8246c5eb..363fc66e2e 100644 --- a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx +++ b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESGeom_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESGeom - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESGeom - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESGeom/IGESGeom_SpecificModule.hxx b/src/IGESGeom/IGESGeom_SpecificModule.hxx index 19675c6b36..548ad70069 100644 --- a/src/IGESGeom/IGESGeom_SpecificModule.hxx +++ b/src/IGESGeom/IGESGeom_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESGeom_SpecificModule(); //! Specific Dump (own parameters) for IGESGeom - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! Performs non-ambiguous Correction on Entities which support //! them (Boundary,ConicArc,Flash,OffsetCurve,TransformationMatrix) diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx index aec523a756..9b4c22a86c 100644 --- a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx +++ b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx @@ -65,7 +65,7 @@ public: //! returns the transformation matrix //! 4th row elements of GTrsf will always be 0, 0, 0, 1 (not defined) - Standard_EXPORT gp_GTrsf Value() const; + Standard_EXPORT gp_GTrsf Value() const Standard_OVERRIDE; diff --git a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx index ac1655c87a..92a35182bd 100644 --- a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx +++ b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx @@ -51,12 +51,12 @@ public: Standard_EXPORT Standard_Integer NbPropertyValues() const; //! Must return the count of levels (== NbPropertyValues) - Standard_EXPORT Standard_Integer NbLevelNumbers() const; + Standard_EXPORT Standard_Integer NbLevelNumbers() const Standard_OVERRIDE; //! returns the Level Number of indicated by //! raises an exception if LevelIndex is <= 0 or //! LevelIndex > NbPropertyValues - Standard_EXPORT Standard_Integer LevelNumber (const Standard_Integer LevelIndex) const; + Standard_EXPORT Standard_Integer LevelNumber (const Standard_Integer LevelIndex) const Standard_OVERRIDE; diff --git a/src/IGESGraph/IGESGraph_GeneralModule.hxx b/src/IGESGraph/IGESGraph_GeneralModule.hxx index 3ad5d5d481..31ccea315a 100644 --- a/src/IGESGraph/IGESGraph_GeneralModule.hxx +++ b/src/IGESGraph/IGESGraph_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Drawing for all diff --git a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx index b6f22cb63c..2bea86a501 100644 --- a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx +++ b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESGraph_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESGraph - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESGraph - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESGraph/IGESGraph_SpecificModule.hxx b/src/IGESGraph/IGESGraph_SpecificModule.hxx index af33079db3..c7bf29881b 100644 --- a/src/IGESGraph/IGESGraph_SpecificModule.hxx +++ b/src/IGESGraph/IGESGraph_SpecificModule.hxx @@ -43,7 +43,7 @@ public: Standard_EXPORT IGESGraph_SpecificModule(); //! Specific Dump (own parameters) for IGESGraph - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; //! Performs non-ambiguous Corrections on Entities which support //! them (DrawingSize,DrawingUnits,HighLight,IntercharacterSpacing, diff --git a/src/IGESSelect/IGESSelect_Activator.hxx b/src/IGESSelect/IGESSelect_Activator.hxx index eba998defd..dfca5ba437 100644 --- a/src/IGESSelect/IGESSelect_Activator.hxx +++ b/src/IGESSelect/IGESSelect_Activator.hxx @@ -41,10 +41,10 @@ public: Standard_EXPORT IGESSelect_Activator(); //! Executes a Command Line for IGESSelect - Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot); + Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot) Standard_OVERRIDE; //! Sends a short help message for IGESSelect commands - Standard_EXPORT Standard_CString Help (const Standard_Integer number) const; + Standard_EXPORT Standard_CString Help (const Standard_Integer number) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_AddFileComment.hxx b/src/IGESSelect/IGESSelect_AddFileComment.hxx index 387edd9cb7..6e4e39e39c 100644 --- a/src/IGESSelect/IGESSelect_AddFileComment.hxx +++ b/src/IGESSelect/IGESSelect_AddFileComment.hxx @@ -66,11 +66,11 @@ public: Standard_EXPORT Handle(TColStd_HSequenceOfHAsciiString) Lines() const; //! Sends the comment lines to the file (Start Section) - Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, IGESData_IGESWriter& writer) const; + Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, IGESData_IGESWriter& writer) const Standard_OVERRIDE; //! Returns specific Label, which is //! "Add Comment Lines (Start Section)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_AddGroup.hxx b/src/IGESSelect/IGESSelect_AddGroup.hxx index 928fe3c1a1..7764c592f5 100644 --- a/src/IGESSelect/IGESSelect_AddGroup.hxx +++ b/src/IGESSelect/IGESSelect_AddGroup.hxx @@ -42,11 +42,11 @@ public: Standard_EXPORT IGESSelect_AddGroup(); //! Specific action : Adds a new group - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Add Group" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_AutoCorrect.hxx b/src/IGESSelect/IGESSelect_AutoCorrect.hxx index 469d03f87c..a542d99ce7 100644 --- a/src/IGESSelect/IGESSelect_AutoCorrect.hxx +++ b/src/IGESSelect/IGESSelect_AutoCorrect.hxx @@ -63,11 +63,11 @@ public: //! Specific action : corrects entities when it is absolutely //! obvious, i.e. non equivoque (by DirChecker and specific //! service OwnCorrect) : works with a protocol. - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Auto-correction of IGES Entities" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_ChangeLevelList.hxx b/src/IGESSelect/IGESSelect_ChangeLevelList.hxx index 277d343d00..209bad9a56 100644 --- a/src/IGESSelect/IGESSelect_ChangeLevelList.hxx +++ b/src/IGESSelect/IGESSelect_ChangeLevelList.hxx @@ -84,13 +84,13 @@ public: //! Level List which contains this value //! Attaches all these entities to value given by NewNumber, or //! the first value of the Level List - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which begins by //! "Changes Level Lists containing ", or //! "Changes all Level Lists in D.E.", and ends by //! " to Number " or " to Number = first value in List" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx b/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx index f2ccc5cdbd..a7cfdaf5e2 100644 --- a/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx +++ b/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx @@ -76,12 +76,12 @@ public: //! defined Level Number (can be zero) //! Attaches all these entities to value given by NewNumber, or //! zero if not defined - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Changes Level Number to " , or //! "Changes all Levels Numbers positive and zero to " - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_ComputeStatus.hxx b/src/IGESSelect/IGESSelect_ComputeStatus.hxx index 2ca317c927..bed5425cb0 100644 --- a/src/IGESSelect/IGESSelect_ComputeStatus.hxx +++ b/src/IGESSelect/IGESSelect_ComputeStatus.hxx @@ -50,11 +50,11 @@ public: //! Subordinate Status and Use Flag (in Directory Part of each //! IGES Entity). Then it corrects them, for the whole target. //! Works with a Protocol. Implementation uses BasicEditor - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Compute Subordinate Status and Use Flag" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_DispPerDrawing.hxx b/src/IGESSelect/IGESSelect_DispPerDrawing.hxx index 0315c9babc..33bb92d3ce 100644 --- a/src/IGESSelect/IGESSelect_DispPerDrawing.hxx +++ b/src/IGESSelect/IGESSelect_DispPerDrawing.hxx @@ -48,11 +48,11 @@ public: Standard_EXPORT IGESSelect_DispPerDrawing(); //! Returns as Label, "One File per Drawing" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Computes the list of produced Packets. Packets are computed //! by a ViewSorter (SortDrawings with also frames). - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; //! Returns True, because of entities attached to no view. Standard_EXPORT virtual Standard_Boolean CanHaveRemainder() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_DispPerSingleView.hxx b/src/IGESSelect/IGESSelect_DispPerSingleView.hxx index d0d4103c67..b0e00f1e3c 100644 --- a/src/IGESSelect/IGESSelect_DispPerSingleView.hxx +++ b/src/IGESSelect/IGESSelect_DispPerSingleView.hxx @@ -48,11 +48,11 @@ public: Standard_EXPORT IGESSelect_DispPerSingleView(); //! Returns as Label, "One File per single View or Drawing Frame" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; //! Computes the list of produced Packets. Packets are computed //! by a ViewSorter (SortSingleViews with also frames). - Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const; + Standard_EXPORT void Packets (const Interface_Graph& G, IFGraph_SubPartsIterator& packs) const Standard_OVERRIDE; //! Returns True, because of entities attached to no view. Standard_EXPORT virtual Standard_Boolean CanHaveRemainder() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_Dumper.hxx b/src/IGESSelect/IGESSelect_Dumper.hxx index ce9e3ff99c..e74c3ae629 100644 --- a/src/IGESSelect/IGESSelect_Dumper.hxx +++ b/src/IGESSelect/IGESSelect_Dumper.hxx @@ -44,11 +44,11 @@ public: //! Write the Own Parameters of Types defined in package IGESSelect //! Returns True if has been processed, False else - Standard_EXPORT Standard_Boolean WriteOwn (IFSelect_SessionFile& file, const Handle(Standard_Transient)& item) const; + Standard_EXPORT Standard_Boolean WriteOwn (IFSelect_SessionFile& file, const Handle(Standard_Transient)& item) const Standard_OVERRIDE; //! Recognizes and Read Own Parameters for Types of package //! IGESSelect. Returns True if done and created, False else - Standard_EXPORT Standard_Boolean ReadOwn (IFSelect_SessionFile& file, const TCollection_AsciiString& type, Handle(Standard_Transient)& item) const; + Standard_EXPORT Standard_Boolean ReadOwn (IFSelect_SessionFile& file, const TCollection_AsciiString& type, Handle(Standard_Transient)& item) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_EditDirPart.hxx b/src/IGESSelect/IGESSelect_EditDirPart.hxx index 4b7494d079..7070c185be 100644 --- a/src/IGESSelect/IGESSelect_EditDirPart.hxx +++ b/src/IGESSelect/IGESSelect_EditDirPart.hxx @@ -43,17 +43,17 @@ public: Standard_EXPORT IGESSelect_EditDirPart(); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean Update (const Handle(IFSelect_EditForm)& form, const Standard_Integer num, const Handle(TCollection_HAsciiString)& newval, const Standard_Boolean enforce) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_EditHeader.hxx b/src/IGESSelect/IGESSelect_EditHeader.hxx index 001e102f54..58502fe876 100644 --- a/src/IGESSelect/IGESSelect_EditHeader.hxx +++ b/src/IGESSelect/IGESSelect_EditHeader.hxx @@ -43,17 +43,17 @@ public: Standard_EXPORT IGESSelect_EditHeader(); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean Update (const Handle(IFSelect_EditForm)& form, const Standard_Integer num, const Handle(TCollection_HAsciiString)& newval, const Standard_Boolean enforce) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_FloatFormat.hxx b/src/IGESSelect/IGESSelect_FloatFormat.hxx index 3da6210a7e..f559b9da1a 100644 --- a/src/IGESSelect/IGESSelect_FloatFormat.hxx +++ b/src/IGESSelect/IGESSelect_FloatFormat.hxx @@ -84,11 +84,11 @@ public: //! Sets the Floatting Formats of IGESWriter to the recorded //! parameters - Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, IGESData_IGESWriter& writer) const; + Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, IGESData_IGESWriter& writer) const Standard_OVERRIDE; //! Returns specific Label : for instance, //! "Float Format [ZeroSuppress] %E [, in range R1-R2 %f]" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_IGESName.hxx b/src/IGESSelect/IGESSelect_IGESName.hxx index 61f10c80e8..d266b9ae6b 100644 --- a/src/IGESSelect/IGESSelect_IGESName.hxx +++ b/src/IGESSelect/IGESSelect_IGESName.hxx @@ -45,7 +45,7 @@ public: //! Returns the ShortLabel as being the Name of an IGESEntity //! If has no name, it returns empty string "" - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_IGESTypeForm.hxx b/src/IGESSelect/IGESSelect_IGESTypeForm.hxx index dee136d332..2218c54691 100644 --- a/src/IGESSelect/IGESSelect_IGESTypeForm.hxx +++ b/src/IGESSelect/IGESSelect_IGESTypeForm.hxx @@ -50,7 +50,7 @@ public: //! Returns the signature for IGES, "mmm nnn" or "mmm" according //! creation choice (Type & Form or Type only) - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_ModelModifier.hxx b/src/IGESSelect/IGESSelect_ModelModifier.hxx index b2680e5033..f821465cb5 100644 --- a/src/IGESSelect/IGESSelect_ModelModifier.hxx +++ b/src/IGESSelect/IGESSelect_ModelModifier.hxx @@ -43,7 +43,7 @@ public: //! The inherited Perform does the required cast (and refuses to //! go further if cast has failed) then calls the instantiated //! Performing - Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const; + Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Specific Perform with Protocol. It is defined to let the //! Protocol unused and to call Performing without Protocol diff --git a/src/IGESSelect/IGESSelect_RebuildDrawings.hxx b/src/IGESSelect/IGESSelect_RebuildDrawings.hxx index fdffbcf585..e8a52c43f4 100644 --- a/src/IGESSelect/IGESSelect_RebuildDrawings.hxx +++ b/src/IGESSelect/IGESSelect_RebuildDrawings.hxx @@ -50,11 +50,11 @@ public: Standard_EXPORT IGESSelect_RebuildDrawings(); //! Specific action : Rebuilds the original Drawings - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Rebuild Drawings" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_RebuildGroups.hxx b/src/IGESSelect/IGESSelect_RebuildGroups.hxx index fc6b4ce212..73dad9e82a 100644 --- a/src/IGESSelect/IGESSelect_RebuildGroups.hxx +++ b/src/IGESSelect/IGESSelect_RebuildGroups.hxx @@ -50,11 +50,11 @@ public: Standard_EXPORT IGESSelect_RebuildGroups(); //! Specific action : Rebuilds the original groups - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Rebuild Groups" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_RemoveCurves.hxx b/src/IGESSelect/IGESSelect_RemoveCurves.hxx index 8d590c829e..d29535dcf4 100644 --- a/src/IGESSelect/IGESSelect_RemoveCurves.hxx +++ b/src/IGESSelect/IGESSelect_RemoveCurves.hxx @@ -45,11 +45,11 @@ public: Standard_EXPORT IGESSelect_RemoveCurves(const Standard_Boolean UV); //! Specific action : Removes the Curves - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Remove Curves UV on Face" or "Remove Curves 3D on Face" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx b/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx index 464de2efeb..e1ef62dbea 100644 --- a/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx +++ b/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx @@ -64,11 +64,11 @@ public: //! Explores an entity, to take its contained Curves 3d //! Works recursively - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Curves 3d" or //! "Basic Geometry" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; //! This method can be called from everywhere to get the curves //! as sub-elements of a given curve : diff --git a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx index aea82171f6..14d340518c 100644 --- a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx +++ b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx @@ -53,10 +53,10 @@ public: //! Explores an entity : for a Group, gives its elements //! Else, takes the entity itself - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Content of Group" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx index c4c5c03f25..d940b03a93 100644 --- a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx +++ b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx @@ -59,10 +59,10 @@ public: //! Explores an entity : for a Subfigure, gives its elements //! Else, takes the entity itself - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Content of Subfigure" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx index 0852b4d55c..7dd07b81e5 100644 --- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx +++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx @@ -45,10 +45,10 @@ public: //! Selects the Drawings attached (through Single Views in //! Directory Part) to input entities - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns the label, with is "Drawings attached" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectFaces.hxx b/src/IGESSelect/IGESSelect_SelectFaces.hxx index 4c3e8be112..fc090be1bc 100644 --- a/src/IGESSelect/IGESSelect_SelectFaces.hxx +++ b/src/IGESSelect/IGESSelect_SelectFaces.hxx @@ -52,10 +52,10 @@ public: //! Explores an entity, to take its faces //! Works recursively - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Faces" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx index 2bcef5e5a7..7612dcb488 100644 --- a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx +++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx @@ -45,10 +45,10 @@ public: //! Selects the Entities which are attached to the Drawing(s) //! present in the Input - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns the label, with is "Entities attached to Drawing" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx index c408944559..0dbe2fe3e6 100644 --- a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx +++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx @@ -45,10 +45,10 @@ public: //! Selects the Entities which are attached to the Single View(s) //! present in the Input - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns the label, with is "Entities attached to single View" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx b/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx index 913186c6a3..643fd55977 100644 --- a/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx +++ b/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx @@ -60,12 +60,12 @@ public: //! Returns True if is an IGES Entity with Level Number //! admits the criterium (= value if single level, or one of the //! attached level numbers = value if level list) - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns the Selection criterium : //! "IGES Entity, Level Number admits " (if nn > 0) or //! "IGES Entity attached to no Level" (if nn = 0) - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectName.hxx b/src/IGESSelect/IGESSelect_SelectName.hxx index 9d2698b02b..a6b2a3d061 100644 --- a/src/IGESSelect/IGESSelect_SelectName.hxx +++ b/src/IGESSelect/IGESSelect_SelectName.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT IGESSelect_SelectName(); //! Returns True if Name of Entity complies with Name Filter - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Sets a Name as a criterium : IGES Entities which have this name //! are kept (without regular expression, there should be at most @@ -59,7 +59,7 @@ public: Standard_EXPORT Handle(TCollection_HAsciiString) Name() const; //! Returns the Selection criterium : "IGES Entity, Name : " - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectPCurves.hxx b/src/IGESSelect/IGESSelect_SelectPCurves.hxx index 98cfd7bac0..709916113d 100644 --- a/src/IGESSelect/IGESSelect_SelectPCurves.hxx +++ b/src/IGESSelect/IGESSelect_SelectPCurves.hxx @@ -49,11 +49,11 @@ public: //! Explores an entity, to take its contained PCurves //! An independant curve is IGNORED : only faces are explored - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Basic PCurves" or //! "Global PCurves" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx index bf5d2644ca..10b4aba7f9 100644 --- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx +++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx @@ -45,10 +45,10 @@ public: //! Selects the Single Views attached (in Directory Part) to //! input entities - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; //! Returns the label, with is "Single Views attached" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectSubordinate.hxx b/src/IGESSelect/IGESSelect_SelectSubordinate.hxx index e10235a909..4defc1099c 100644 --- a/src/IGESSelect/IGESSelect_SelectSubordinate.hxx +++ b/src/IGESSelect/IGESSelect_SelectSubordinate.hxx @@ -56,11 +56,11 @@ public: //! Returns True if is an IGES Entity with Subordinate //! Status matching the criterium - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns the Selection criterium : "IGES Entity, Independant" //! etc... - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx b/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx index b3ded5d0bd..0ebd83418c 100644 --- a/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx +++ b/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx @@ -44,10 +44,10 @@ public: Standard_EXPORT IGESSelect_SelectVisibleStatus(); //! Returns True if is an IGES Entity with Blank Status = 0 - Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Sort (const Standard_Integer rank, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Returns the Selection criterium : "IGES Entity, Status Visible" - Standard_EXPORT TCollection_AsciiString ExtractLabel() const; + Standard_EXPORT TCollection_AsciiString ExtractLabel() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx b/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx index 9cd17a1591..506ae16daa 100644 --- a/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx +++ b/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx @@ -65,11 +65,11 @@ public: //! Specific action : only is used : the form of the new //! value is checked regarding the parameter number (given at //! creation time). - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Sets Global Parameter to " - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SetLabel.hxx b/src/IGESSelect/IGESSelect_SetLabel.hxx index bea543ca9c..66432d9a42 100644 --- a/src/IGESSelect/IGESSelect_SetLabel.hxx +++ b/src/IGESSelect/IGESSelect_SetLabel.hxx @@ -49,12 +49,12 @@ public: Standard_EXPORT IGESSelect_SetLabel(const Standard_Integer mode, const Standard_Boolean enforce); //! Specific action : Sets or Clears the Label - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Clear Short Label" or "Set Label to DE" //! With possible additional information " (enforced)" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SetVersion5.hxx b/src/IGESSelect/IGESSelect_SetVersion5.hxx index 50b0563e41..c65057b12d 100644 --- a/src/IGESSelect/IGESSelect_SetVersion5.hxx +++ b/src/IGESSelect/IGESSelect_SetVersion5.hxx @@ -48,11 +48,11 @@ public: //! Specific action : only is used : IGES Version (coded) //! is upgraded to 5.1 if it is older, and it this case the new //! global parameter 25 (LastChangeDate) is set to current time - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Update IGES Version to 5.1" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SignColor.hxx b/src/IGESSelect/IGESSelect_SignColor.hxx index e3b815cd25..2ab1055440 100644 --- a/src/IGESSelect/IGESSelect_SignColor.hxx +++ b/src/IGESSelect/IGESSelect_SignColor.hxx @@ -53,7 +53,7 @@ public: Standard_EXPORT IGESSelect_SignColor(const Standard_Integer mode); //! Returns the value (see above) - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SignLevelNumber.hxx b/src/IGESSelect/IGESSelect_SignLevelNumber.hxx index 7efd619c6e..84d772fccf 100644 --- a/src/IGESSelect/IGESSelect_SignLevelNumber.hxx +++ b/src/IGESSelect/IGESSelect_SignLevelNumber.hxx @@ -49,7 +49,7 @@ public: Standard_EXPORT IGESSelect_SignLevelNumber(const Standard_Boolean countmode); //! Returns the value (see above) - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SignStatus.hxx b/src/IGESSelect/IGESSelect_SignStatus.hxx index cfac1c3245..778f79e3cc 100644 --- a/src/IGESSelect/IGESSelect_SignStatus.hxx +++ b/src/IGESSelect/IGESSelect_SignStatus.hxx @@ -54,7 +54,7 @@ public: Standard_EXPORT IGESSelect_SignStatus(); //! Returns the value (see above) - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Performs the match rule (see above) Standard_EXPORT virtual Standard_Boolean Matches (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model, const TCollection_AsciiString& text, const Standard_Boolean exact) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_SplineToBSpline.hxx b/src/IGESSelect/IGESSelect_SplineToBSpline.hxx index 47a26ffac2..73b56b73e9 100644 --- a/src/IGESSelect/IGESSelect_SplineToBSpline.hxx +++ b/src/IGESSelect/IGESSelect_SplineToBSpline.hxx @@ -62,7 +62,7 @@ public: //! Performs the transformation, if there is at least one Spline //! Curve (112) or Surface (126). Does nothing if there is none. - Standard_EXPORT Standard_Boolean Perform (const Interface_Graph& G, const Handle(Interface_Protocol)& protocol, Interface_CheckIterator& checks, Handle(Interface_InterfaceModel)& newmod); + Standard_EXPORT Standard_Boolean Perform (const Interface_Graph& G, const Handle(Interface_Protocol)& protocol, Interface_CheckIterator& checks, Handle(Interface_InterfaceModel)& newmod) Standard_OVERRIDE; //! Returns the transformed entities. //! If original data contained no Spline Curve or Surface, @@ -71,12 +71,12 @@ public: //! or Surface, it is a converted BSpline Curve or Surface. Else, //! it is the result of general service Copy (rebuilt as necessary //! by BSPlines replacing Splines). - Standard_EXPORT Standard_Boolean Updated (const Handle(Standard_Transient)& entfrom, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean Updated (const Handle(Standard_Transient)& entfrom, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Returns a text which defines the way a Transformer works : //! "Conversion Spline to BSpline" and as opted, //! " trying to upgrade continuity" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx b/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx index 05432dffe9..995496997f 100644 --- a/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx +++ b/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx @@ -46,11 +46,11 @@ public: //! Specific action : only is used : the system Date //! is set to Global Section Item n0 18. - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Update IGES Header Creation Date" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_UpdateFileName.hxx b/src/IGESSelect/IGESSelect_UpdateFileName.hxx index 2264f19cd8..2fc9ca3e17 100644 --- a/src/IGESSelect/IGESSelect_UpdateFileName.hxx +++ b/src/IGESSelect/IGESSelect_UpdateFileName.hxx @@ -48,11 +48,11 @@ public: //! Specific action : only is used : the system Date //! is set to Global Section Item n0 18. - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Updates IGES File Name to new current one" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_UpdateLastChange.hxx b/src/IGESSelect/IGESSelect_UpdateLastChange.hxx index 40b78b34a8..67866e6195 100644 --- a/src/IGESSelect/IGESSelect_UpdateLastChange.hxx +++ b/src/IGESSelect/IGESSelect_UpdateLastChange.hxx @@ -49,11 +49,11 @@ public: //! Specific action : only is used : the system Date //! is set to Global Section Item n0 25. Also sets IGES Version //! (Item n0 23) to IGES5 if it was older. - Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const; + Standard_EXPORT void Performing (IFSelect_ContextModif& ctx, const Handle(IGESData_IGESModel)& target, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a text which is //! "Update IGES Header Last Change Date" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.hxx b/src/IGESSelect/IGESSelect_WorkLibrary.hxx index 9d8cabceb7..bcde675da2 100644 --- a/src/IGESSelect/IGESSelect_WorkLibrary.hxx +++ b/src/IGESSelect/IGESSelect_WorkLibrary.hxx @@ -49,11 +49,11 @@ public: //! Reads a IGES File and returns a IGES Model (into ), //! or lets "Null" in case of Error //! Returns 0 if OK, 1 if Read Error, -1 if File not opened - Standard_EXPORT Standard_Integer ReadFile (const Standard_CString name, Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol) const; + Standard_EXPORT Standard_Integer ReadFile (const Standard_CString name, Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol) const Standard_OVERRIDE; //! Writes a File from a IGES Model (brought by ) //! Returns False (and writes no file) if is not for IGES - Standard_EXPORT Standard_Boolean WriteFile (IFSelect_ContextWrite& ctx) const; + Standard_EXPORT Standard_Boolean WriteFile (IFSelect_ContextWrite& ctx) const Standard_OVERRIDE; //! Defines a protocol to be adequate for IGES //! (encompasses ALL the IGES norm including IGESSolid, IGESAppli) @@ -61,7 +61,7 @@ public: //! Dumps an IGES Entity with an IGES Dumper. is the one //! used by IGESDumper. - Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S, const Standard_Integer level) const; + Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S, const Standard_Integer level) const Standard_OVERRIDE; diff --git a/src/IGESSolid/IGESSolid_GeneralModule.hxx b/src/IGESSolid/IGESSolid_GeneralModule.hxx index f8a701ddc4..2ef635ccc4 100644 --- a/src/IGESSolid/IGESSolid_GeneralModule.hxx +++ b/src/IGESSolid/IGESSolid_GeneralModule.hxx @@ -48,21 +48,21 @@ public: //! Lists the Entities shared by a given IGESEntity , from //! its specific parameters : specific for each type - Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void OwnSharedCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Returns a DirChecker, specific for each type of Entity //! (identified by its Case Number) : this DirChecker defines //! constraints which must be respected by the DirectoryPart - Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const; + Standard_EXPORT IGESData_DirChecker DirChecker (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE; //! Performs Specific Semantic Check for each type of Entity - Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void OwnCheckCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Copies parameters which are specific of each Type of Entity - Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void OwnCopyCase (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& entfrom, const Handle(IGESData_IGESEntity)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Returns a category number which characterizes an entity //! Shape for all diff --git a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx index 99da6e2fa6..61e3c8b881 100644 --- a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx +++ b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx @@ -45,13 +45,13 @@ public: Standard_EXPORT IGESSolid_ReadWriteModule(); //! Defines Case Numbers for Entities of IGESSolid - Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const; + Standard_EXPORT Standard_Integer CaseIGES (const Standard_Integer typenum, const Standard_Integer formnum) const Standard_OVERRIDE; //! Reads own parameters from file for an Entity of IGESSolid - Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const; + Standard_EXPORT void ReadOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const Handle(IGESData_IGESReaderData)& IR, IGESData_ParamReader& PR) const Standard_OVERRIDE; //! Writes own parameters to IGESWriter - Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const; + Standard_EXPORT void WriteOwnParams (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, IGESData_IGESWriter& IW) const Standard_OVERRIDE; diff --git a/src/IGESSolid/IGESSolid_SpecificModule.hxx b/src/IGESSolid/IGESSolid_SpecificModule.hxx index c33d8d24e9..079d925855 100644 --- a/src/IGESSolid/IGESSolid_SpecificModule.hxx +++ b/src/IGESSolid/IGESSolid_SpecificModule.hxx @@ -41,7 +41,7 @@ public: Standard_EXPORT IGESSolid_SpecificModule(); //! Specific Dump (own parameters) for IGESSolid - Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE; diff --git a/src/Image/Image_AlienPixMap.hxx b/src/Image/Image_AlienPixMap.hxx index aec57deee2..f021b9dd88 100644 --- a/src/Image/Image_AlienPixMap.hxx +++ b/src/Image/Image_AlienPixMap.hxx @@ -55,13 +55,13 @@ public: Standard_EXPORT virtual bool InitTrash (ImgFormat thePixelFormat, const Standard_Size theSizeX, const Standard_Size theSizeY, - const Standard_Size theSizeRowBytes = 0); + const Standard_Size theSizeRowBytes = 0) Standard_OVERRIDE; //! Initialize by copying data. - Standard_EXPORT virtual bool InitCopy (const Image_PixMap& theCopy); + Standard_EXPORT virtual bool InitCopy (const Image_PixMap& theCopy) Standard_OVERRIDE; //! Method correctly deallocate internal buffer. - Standard_EXPORT virtual void Clear(); + Standard_EXPORT virtual void Clear() Standard_OVERRIDE; //! Performs gamma correction on image. //! theGamma - gamma value to use; a value of 1.0 leaves the image alone @@ -83,7 +83,7 @@ private: Standard_Byte* theDataPtr, const Standard_Size theSizeX, const Standard_Size theSizeY, - const Standard_Size theSizeRowBytes); + const Standard_Size theSizeRowBytes) Standard_OVERRIDE; //! Built-in PPM export Standard_EXPORT bool savePPM (const TCollection_AsciiString& theFileName) const; diff --git a/src/IntPatch/IntPatch_ArcFunction.hxx b/src/IntPatch/IntPatch_ArcFunction.hxx index 3f2ad718d0..178c0d802e 100644 --- a/src/IntPatch/IntPatch_ArcFunction.hxx +++ b/src/IntPatch/IntPatch_ArcFunction.hxx @@ -50,11 +50,11 @@ public: void Set (const Handle(Adaptor3d_HSurface)& S); - Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F); + Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Derivative (const Standard_Real X, Standard_Real& D); + Standard_EXPORT Standard_Boolean Derivative (const Standard_Real X, Standard_Real& D) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Values (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT Standard_Boolean Values (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; Standard_EXPORT Standard_Integer NbSamples() const; diff --git a/src/IntPatch/IntPatch_PolyArc.hxx b/src/IntPatch/IntPatch_PolyArc.hxx index 139b7dddb4..9957305de6 100644 --- a/src/IntPatch/IntPatch_PolyArc.hxx +++ b/src/IntPatch/IntPatch_PolyArc.hxx @@ -48,9 +48,9 @@ public: Standard_EXPORT virtual Standard_Boolean Closed() const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer NbPoints() const; + Standard_EXPORT Standard_Integer NbPoints() const Standard_OVERRIDE; - Standard_EXPORT gp_Pnt2d Point (const Standard_Integer Index) const; + Standard_EXPORT gp_Pnt2d Point (const Standard_Integer Index) const Standard_OVERRIDE; Standard_EXPORT Standard_Real Parameter (const Standard_Integer Index) const; diff --git a/src/IntPatch/IntPatch_RLine.hxx b/src/IntPatch/IntPatch_RLine.hxx index c561d50939..b701883ef1 100644 --- a/src/IntPatch/IntPatch_RLine.hxx +++ b/src/IntPatch/IntPatch_RLine.hxx @@ -125,10 +125,10 @@ public: Standard_Boolean HasPolygon() const; //! Returns the number of intersection points. - Standard_Integer NbPnts() const; + Standard_Integer NbPnts() const Standard_OVERRIDE; //! Returns the intersection point of range Index. - const IntSurf_PntOn2S& Point (const Standard_Integer Index) const; + const IntSurf_PntOn2S& Point (const Standard_Integer Index) const Standard_OVERRIDE; //! Set the Point of index in the LineOn2S Standard_EXPORT void SetPoint (const Standard_Integer Index, const IntPatch_Point& Pnt); diff --git a/src/IntPatch/IntPatch_WLine.hxx b/src/IntPatch/IntPatch_WLine.hxx index 342cda18d2..a640aa0515 100644 --- a/src/IntPatch/IntPatch_WLine.hxx +++ b/src/IntPatch/IntPatch_WLine.hxx @@ -79,10 +79,10 @@ public: void SetLastPoint (const Standard_Integer IndLast); //! Returns the number of intersection points. - Standard_Integer NbPnts() const; + Standard_Integer NbPnts() const Standard_OVERRIDE; //! Returns the intersection point of range Index. - const IntSurf_PntOn2S& Point (const Standard_Integer Index) const; + const IntSurf_PntOn2S& Point (const Standard_Integer Index) const Standard_OVERRIDE; //! Returns True if the line has a known First point. //! This point is given by the method FirstPoint(). diff --git a/src/Interface/Interface_CopyMap.hxx b/src/Interface/Interface_CopyMap.hxx index 98feaa8303..3ee7cc384c 100644 --- a/src/Interface/Interface_CopyMap.hxx +++ b/src/Interface/Interface_CopyMap.hxx @@ -45,20 +45,20 @@ public: Standard_EXPORT Interface_CopyMap(const Handle(Interface_InterfaceModel)& amodel); //! Clears Transfer List. Gets Ready to begin another Transfer - Standard_EXPORT void Clear(); + Standard_EXPORT void Clear() Standard_OVERRIDE; //! Returns the InterfaceModel used at Creation time Standard_EXPORT Handle(Interface_InterfaceModel) Model() const; //! Binds a Starting Entity identified by its Number in the //! Starting Model, to a Result of Transfer - Standard_EXPORT void Bind (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& res); + Standard_EXPORT void Bind (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& res) Standard_OVERRIDE; //! Search for the result of a Starting Object (i.e. an Entity, //! identified by its Number in the Starting Model) //! Returns True if a Result is Bound (and fills ) //! Returns False if no result is Bound (and nullifies ) - Standard_EXPORT Standard_Boolean Search (const Handle(Standard_Transient)& ent, Handle(Standard_Transient)& res) const; + Standard_EXPORT Standard_Boolean Search (const Handle(Standard_Transient)& ent, Handle(Standard_Transient)& res) const Standard_OVERRIDE; diff --git a/src/Interface/Interface_SignLabel.hxx b/src/Interface/Interface_SignLabel.hxx index 6bef1976ee..947f380f04 100644 --- a/src/Interface/Interface_SignLabel.hxx +++ b/src/Interface/Interface_SignLabel.hxx @@ -39,11 +39,11 @@ public: Standard_EXPORT Interface_SignLabel(); //! Returns "Entity Label" - Standard_EXPORT Standard_CString Name() const; + Standard_EXPORT Standard_CString Name() const Standard_OVERRIDE; //! Considers context as an InterfaceModel and returns the Label //! computed by it - Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const; + Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const Standard_OVERRIDE; diff --git a/src/Interface/Interface_SignType.hxx b/src/Interface/Interface_SignType.hxx index 941282566e..8309eee369 100644 --- a/src/Interface/Interface_SignType.hxx +++ b/src/Interface/Interface_SignType.hxx @@ -42,7 +42,7 @@ public: //! Returns an identification of the Signature (a word), given at //! initialization time //! Specialised to consider context as an InterfaceModel - Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const; + Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const Standard_OVERRIDE; //! Returns the Signature for a Transient object. It is specific //! of each sub-class of Signature. For a Null Handle, it should diff --git a/src/Law/Law_BSpFunc.hxx b/src/Law/Law_BSpFunc.hxx index 1a90d322c2..b7845f46b1 100644 --- a/src/Law/Law_BSpFunc.hxx +++ b/src/Law/Law_BSpFunc.hxx @@ -60,11 +60,11 @@ public: //! for the parameters. i.e. T.Length() > NbIntervals() Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; - Standard_EXPORT Standard_Real Value (const Standard_Real X); + Standard_EXPORT Standard_Real Value (const Standard_Real X) Standard_OVERRIDE; - Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; - Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2); + Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2) Standard_OVERRIDE; //! Returns a law equivalent of between //! parameters and . is used to @@ -74,7 +74,7 @@ public: //! the Law is not Cn. Standard_EXPORT Handle(Law_Function) Trim (const Standard_Real PFirst, const Standard_Real PLast, const Standard_Real Tol) const Standard_OVERRIDE; - Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast); + Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast) Standard_OVERRIDE; Standard_EXPORT Handle(Law_BSpline) Curve() const; diff --git a/src/Law/Law_Composite.hxx b/src/Law/Law_Composite.hxx index 5eab3cbcef..cfc775147e 100644 --- a/src/Law/Law_Composite.hxx +++ b/src/Law/Law_Composite.hxx @@ -69,14 +69,14 @@ public: Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; //! Returns the value at parameter X. - Standard_EXPORT Standard_Real Value (const Standard_Real X); + Standard_EXPORT Standard_Real Value (const Standard_Real X) Standard_OVERRIDE; //! Returns the value and the first derivative at parameter X. - Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; //! Returns the value, first and second derivatives //! at parameter X. - Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2); + Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2) Standard_OVERRIDE; //! Returns a law equivalent of between //! parameters and . is used to @@ -87,7 +87,7 @@ public: Standard_EXPORT Handle(Law_Function) Trim (const Standard_Real PFirst, const Standard_Real PLast, const Standard_Real Tol) const Standard_OVERRIDE; //! Returns the parametric bounds of the function. - Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast); + Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast) Standard_OVERRIDE; //! Returns the elementary function of the composite used //! to compute at parameter W. diff --git a/src/Law/Law_Constant.hxx b/src/Law/Law_Constant.hxx index e97ac69c7e..49a636f657 100644 --- a/src/Law/Law_Constant.hxx +++ b/src/Law/Law_Constant.hxx @@ -53,19 +53,19 @@ public: Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; //! Returns the value at parameter X. - Standard_EXPORT Standard_Real Value (const Standard_Real X); + Standard_EXPORT Standard_Real Value (const Standard_Real X) Standard_OVERRIDE; //! Returns the value and the first derivative at parameter X. - Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; //! Returns the value, first and second derivatives //! at parameter X. - Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2); + Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2) Standard_OVERRIDE; Standard_EXPORT Handle(Law_Function) Trim (const Standard_Real PFirst, const Standard_Real PLast, const Standard_Real Tol) const Standard_OVERRIDE; //! Returns the parametric bounds of the function. - Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast); + Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast) Standard_OVERRIDE; diff --git a/src/Law/Law_Linear.hxx b/src/Law/Law_Linear.hxx index 8709ba91cc..033e6be07c 100644 --- a/src/Law/Law_Linear.hxx +++ b/src/Law/Law_Linear.hxx @@ -58,16 +58,16 @@ public: Standard_EXPORT void Intervals (TColStd_Array1OfReal& T, const GeomAbs_Shape S) const Standard_OVERRIDE; //! Returns the value of this function at the point of parameter X. - Standard_EXPORT Standard_Real Value (const Standard_Real X); + Standard_EXPORT Standard_Real Value (const Standard_Real X) Standard_OVERRIDE; //! Returns the value F and the first derivative D of this //! function at the point of parameter X. - Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D); + Standard_EXPORT void D1 (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE; //! Returns the value, first and second derivatives //! at parameter X. - Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2); + Standard_EXPORT void D2 (const Standard_Real X, Standard_Real& F, Standard_Real& D, Standard_Real& D2) Standard_OVERRIDE; //! Returns a law equivalent of between //! parameters and . is used to @@ -78,7 +78,7 @@ public: Standard_EXPORT Handle(Law_Function) Trim (const Standard_Real PFirst, const Standard_Real PLast, const Standard_Real Tol) const Standard_OVERRIDE; //! Returns the parametric bounds of the function. - Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast); + Standard_EXPORT void Bounds (Standard_Real& PFirst, Standard_Real& PLast) Standard_OVERRIDE; diff --git a/src/LocOpe/LocOpe_GluedShape.hxx b/src/LocOpe/LocOpe_GluedShape.hxx index 6b377c45cd..df90a76a59 100644 --- a/src/LocOpe/LocOpe_GluedShape.hxx +++ b/src/LocOpe/LocOpe_GluedShape.hxx @@ -49,19 +49,19 @@ public: Standard_EXPORT void GlueOnFace (const TopoDS_Face& F); - Standard_EXPORT const TopTools_ListOfShape& GeneratingEdges(); + Standard_EXPORT const TopTools_ListOfShape& GeneratingEdges() Standard_OVERRIDE; //! Returns the edge created by the vertex . If //! none, must return a null shape. - Standard_EXPORT TopoDS_Edge Generated (const TopoDS_Vertex& V); + Standard_EXPORT TopoDS_Edge Generated (const TopoDS_Vertex& V) Standard_OVERRIDE; //! Returns the face created by the edge . If none, //! must return a null shape. - Standard_EXPORT TopoDS_Face Generated (const TopoDS_Edge& E); + Standard_EXPORT TopoDS_Face Generated (const TopoDS_Edge& E) Standard_OVERRIDE; //! Returns the list of correctly oriented generated //! faces. - Standard_EXPORT const TopTools_ListOfShape& OrientedFaces(); + Standard_EXPORT const TopTools_ListOfShape& OrientedFaces() Standard_OVERRIDE; diff --git a/src/MeshTest/MeshTest_DrawableMesh.hxx b/src/MeshTest/MeshTest_DrawableMesh.hxx index 4dad2f601b..38a7df7596 100644 --- a/src/MeshTest/MeshTest_DrawableMesh.hxx +++ b/src/MeshTest/MeshTest_DrawableMesh.hxx @@ -47,13 +47,13 @@ public: Standard_EXPORT TColStd_SequenceOfInteger& Triangles(); - Standard_EXPORT void DrawOn(Draw_Display& theDisplay) const; + Standard_EXPORT void DrawOn(Draw_Display& theDisplay) const Standard_OVERRIDE; - Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const; + Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; - Standard_EXPORT virtual void Dump(Standard_OStream& theStream) const; + Standard_EXPORT virtual void Dump(Standard_OStream& theStream) const Standard_OVERRIDE; - Standard_EXPORT virtual void Whatis(Draw_Interpretor& theDi) const; + Standard_EXPORT virtual void Whatis(Draw_Interpretor& theDi) const Standard_OVERRIDE; Standard_EXPORT const Handle(BRepMesh_IncrementalMesh)& Mesher() const; diff --git a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx index 70a484d498..ca533a78ca 100644 --- a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx +++ b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx @@ -50,7 +50,7 @@ public: Standard_EXPORT MeshVS_ElementalColorPrsBuilder(const Handle(MeshVS_Mesh)& Parent, const MeshVS_DisplayModeFlags& Flags = MeshVS_DMF_ElementalColorDataPrs, const Handle(MeshVS_DataSource)& DS = 0, const Standard_Integer Id = -1, const MeshVS_BuilderPriority& Priority = MeshVS_BP_ElemColor); //! Builds presentation of elements with assigned colors. - Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const; + Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const Standard_OVERRIDE; //! Returns map of colors same for front and back side of face. Standard_EXPORT const MeshVS_DataMapOfIntegerColor& GetColors1() const; diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.hxx b/src/MeshVS/MeshVS_MeshPrsBuilder.hxx index 7f51737d55..5578480e1d 100644 --- a/src/MeshVS/MeshVS_MeshPrsBuilder.hxx +++ b/src/MeshVS/MeshVS_MeshPrsBuilder.hxx @@ -52,7 +52,7 @@ public: Standard_EXPORT MeshVS_MeshPrsBuilder(const Handle(MeshVS_Mesh)& Parent, const MeshVS_DisplayModeFlags& Flags = MeshVS_DMF_OCCMask, const Handle(MeshVS_DataSource)& DS = 0, const Standard_Integer Id = -1, const MeshVS_BuilderPriority& Priority = MeshVS_BP_Mesh); //! Builds base mesh presentation by calling the methods below - Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const; + Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const Standard_OVERRIDE; //! Builds nodes presentation Standard_EXPORT virtual void BuildNodes (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Integer DisplayMode) const; diff --git a/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx b/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx index 064acb7355..5c3f901d07 100644 --- a/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx +++ b/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx @@ -66,7 +66,7 @@ public: Standard_EXPORT MeshVS_NodalColorPrsBuilder(const Handle(MeshVS_Mesh)& Parent, const MeshVS_DisplayModeFlags& Flags = MeshVS_DMF_NodalColorDataPrs, const Handle(MeshVS_DataSource)& DS = 0, const Standard_Integer Id = -1, const MeshVS_BuilderPriority& Priority = MeshVS_BP_NodalColor); //! Builds presentation of nodes with assigned color. - Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const; + Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer DisplayMode) const Standard_OVERRIDE; //! Returns map of colors assigned to nodes. Standard_EXPORT const MeshVS_DataMapOfIntegerColor& GetColors() const; diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.hxx b/src/MeshVS/MeshVS_TextPrsBuilder.hxx index 07a8aa509b..c3b7ef66ae 100644 --- a/src/MeshVS/MeshVS_TextPrsBuilder.hxx +++ b/src/MeshVS/MeshVS_TextPrsBuilder.hxx @@ -48,7 +48,7 @@ public: Standard_EXPORT MeshVS_TextPrsBuilder(const Handle(MeshVS_Mesh)& Parent, const Standard_Real Height, const Quantity_Color& Color, const MeshVS_DisplayModeFlags& Flags = MeshVS_DMF_TextDataPrs, const Handle(MeshVS_DataSource)& DS = 0, const Standard_Integer Id = -1, const MeshVS_BuilderPriority& Priority = MeshVS_BP_Text); //! Builds presentation of text data - Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer theDisplayMode) const; + Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer theDisplayMode) const Standard_OVERRIDE; //! Returns map of text assigned with nodes ( IsElement = False ) or elements ( IsElement = True ) Standard_EXPORT const MeshVS_DataMapOfIntegerAsciiString& GetTexts (const Standard_Boolean IsElement) const; diff --git a/src/MeshVS/MeshVS_VectorPrsBuilder.hxx b/src/MeshVS/MeshVS_VectorPrsBuilder.hxx index b246e31878..104c946ebb 100644 --- a/src/MeshVS/MeshVS_VectorPrsBuilder.hxx +++ b/src/MeshVS/MeshVS_VectorPrsBuilder.hxx @@ -52,7 +52,7 @@ public: Standard_EXPORT MeshVS_VectorPrsBuilder(const Handle(MeshVS_Mesh)& Parent, const Standard_Real MaxLength, const Quantity_Color& VectorColor, const MeshVS_DisplayModeFlags& Flags = MeshVS_DMF_VectorDataPrs, const Handle(MeshVS_DataSource)& DS = 0, const Standard_Integer Id = -1, const MeshVS_BuilderPriority& Priority = MeshVS_BP_Vector, const Standard_Boolean IsSimplePrs = Standard_False); //! Builds vector data presentation - Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer theDisplayMode) const; + Standard_EXPORT virtual void Build (const Handle(Prs3d_Presentation)& Prs, const TColStd_PackedMapOfInteger& IDs, TColStd_PackedMapOfInteger& IDsToExclude, const Standard_Boolean IsElement, const Standard_Integer theDisplayMode) const Standard_OVERRIDE; //! Adds to array of polygons and polylines some primitive representing single vector Standard_EXPORT void DrawVector (const gp_Trsf& theTrsf, const Standard_Real Length, const Standard_Real MaxLength, const TColgp_Array1OfPnt& ArrowPoints, const Handle(Graphic3d_ArrayOfPrimitives)& Lines, const Handle(Graphic3d_ArrayOfPrimitives)& ArrowLines, const Handle(Graphic3d_ArrayOfPrimitives)& Triangles) const; diff --git a/src/MoniTool/MoniTool_SignShape.hxx b/src/MoniTool/MoniTool_SignShape.hxx index 8bca1a908a..d9058327a7 100644 --- a/src/MoniTool/MoniTool_SignShape.hxx +++ b/src/MoniTool/MoniTool_SignShape.hxx @@ -40,11 +40,11 @@ public: Standard_EXPORT MoniTool_SignShape(); //! Returns "SHAPE" - Standard_EXPORT Standard_CString Name() const; + Standard_EXPORT Standard_CString Name() const Standard_OVERRIDE; //! Returns for a HShape, the string of its ShapeEnum //! The Model is absolutely useless (may be null) - Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const; + Standard_EXPORT TCollection_AsciiString Text (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& context) const Standard_OVERRIDE; diff --git a/src/MoniTool/MoniTool_TransientElem.hxx b/src/MoniTool/MoniTool_TransientElem.hxx index 46a21844db..bc65fc86a0 100644 --- a/src/MoniTool/MoniTool_TransientElem.hxx +++ b/src/MoniTool/MoniTool_TransientElem.hxx @@ -56,7 +56,7 @@ public: //! Specific testof equallity : defined as False if has //! not the same true Type, else contents are compared (by //! C++ operator ==) - Standard_EXPORT Standard_Boolean Equates (const Handle(MoniTool_Element)& other) const; + Standard_EXPORT Standard_Boolean Equates (const Handle(MoniTool_Element)& other) const Standard_OVERRIDE; //! Returns the Type of the Value. By default, returns the //! DynamicType of , but can be redefined diff --git a/src/NCollection/NCollection_AccAllocator.hxx b/src/NCollection/NCollection_AccAllocator.hxx index e103603117..76049dc88c 100644 --- a/src/NCollection/NCollection_AccAllocator.hxx +++ b/src/NCollection/NCollection_AccAllocator.hxx @@ -62,11 +62,11 @@ public: Standard_EXPORT ~NCollection_AccAllocator(); //! Allocate memory with given size - Standard_EXPORT virtual void* Allocate (const size_t theSize); + Standard_EXPORT virtual void* Allocate (const size_t theSize) Standard_OVERRIDE; //! Free a previously allocated memory; //! memory is returned to the OS when all allocations in some block are freed - Standard_EXPORT virtual void Free (void* theAddress); + Standard_EXPORT virtual void Free (void* theAddress) Standard_OVERRIDE; // --------- PROTECTED TYPES --------- protected: diff --git a/src/NCollection/NCollection_AlignedAllocator.hxx b/src/NCollection/NCollection_AlignedAllocator.hxx index 031494478f..2502c5e39b 100644 --- a/src/NCollection/NCollection_AlignedAllocator.hxx +++ b/src/NCollection/NCollection_AlignedAllocator.hxx @@ -30,10 +30,10 @@ public: Standard_EXPORT NCollection_AlignedAllocator (const size_t theAlignment); //! Allocate memory with given size. Returns NULL on failure. - Standard_EXPORT virtual void* Allocate (const size_t theSize); + Standard_EXPORT virtual void* Allocate (const size_t theSize) Standard_OVERRIDE; //! Free a previously allocated memory. - Standard_EXPORT virtual void Free (void* thePtr); + Standard_EXPORT virtual void Free (void* thePtr) Standard_OVERRIDE; private: diff --git a/src/NCollection/NCollection_HeapAllocator.hxx b/src/NCollection/NCollection_HeapAllocator.hxx index 269e2d0300..2dfb2636d1 100644 --- a/src/NCollection/NCollection_HeapAllocator.hxx +++ b/src/NCollection/NCollection_HeapAllocator.hxx @@ -27,8 +27,8 @@ class NCollection_HeapAllocator : public NCollection_BaseAllocator { public: // ---------- PUBLIC METHODS ---------- - Standard_EXPORT virtual void* Allocate (const Standard_Size theSize); - Standard_EXPORT virtual void Free (void * anAddress); + Standard_EXPORT virtual void* Allocate (const Standard_Size theSize) Standard_OVERRIDE; + Standard_EXPORT virtual void Free (void * anAddress) Standard_OVERRIDE; Standard_EXPORT static const Handle(NCollection_HeapAllocator)& GlobalHeapAllocator(); diff --git a/src/NCollection/NCollection_IncAllocator.hxx b/src/NCollection/NCollection_IncAllocator.hxx index d9782bd59f..27a030d7c4 100644 --- a/src/NCollection/NCollection_IncAllocator.hxx +++ b/src/NCollection/NCollection_IncAllocator.hxx @@ -45,10 +45,10 @@ class NCollection_IncAllocator : public NCollection_BaseAllocator Standard_EXPORT NCollection_IncAllocator (const size_t theBlockSize = DefaultBlockSize); //! Allocate memory with given size. Returns NULL on failure - Standard_EXPORT virtual void* Allocate (const size_t size); + Standard_EXPORT virtual void* Allocate (const size_t size) Standard_OVERRIDE; //! Free a previously allocated memory. Does nothing - Standard_EXPORT virtual void Free (void *anAddress); + Standard_EXPORT virtual void Free (void *anAddress) Standard_OVERRIDE; //! Diagnostic method, returns the total allocated size Standard_EXPORT size_t GetMemSize () const; diff --git a/src/NCollection/NCollection_WinHeapAllocator.hxx b/src/NCollection/NCollection_WinHeapAllocator.hxx index 7fdff038e3..625617e13f 100644 --- a/src/NCollection/NCollection_WinHeapAllocator.hxx +++ b/src/NCollection/NCollection_WinHeapAllocator.hxx @@ -42,10 +42,10 @@ public: Standard_EXPORT virtual ~NCollection_WinHeapAllocator(); //! Allocate memory - Standard_EXPORT virtual void* Allocate (const Standard_Size theSize); + Standard_EXPORT virtual void* Allocate (const Standard_Size theSize) Standard_OVERRIDE; //! Release memory - Standard_EXPORT virtual void Free (void* theAddress); + Standard_EXPORT virtual void Free (void* theAddress) Standard_OVERRIDE; // Declaration of CASCADE RTTI DEFINE_STANDARD_RTTI(NCollection_WinHeapAllocator, NCollection_BaseAllocator) diff --git a/src/OpenGl/OpenGl_CappingAlgo.hxx b/src/OpenGl/OpenGl_CappingAlgo.hxx index 14c28285bb..cff4be93b1 100755 --- a/src/OpenGl/OpenGl_CappingAlgo.hxx +++ b/src/OpenGl/OpenGl_CappingAlgo.hxx @@ -57,7 +57,7 @@ public: //! Checks whether the element can be rendered or not. //! @param theElement [in] the element to check. //! @return True if element can be rendered. - virtual Standard_Boolean CanRender (const OpenGl_Element* theElement); + virtual Standard_Boolean CanRender (const OpenGl_Element* theElement) Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_Font.hxx b/src/OpenGl/OpenGl_Font.hxx index fbc794d328..aca7c177f9 100755 --- a/src/OpenGl/OpenGl_Font.hxx +++ b/src/OpenGl/OpenGl_Font.hxx @@ -59,7 +59,7 @@ public: Standard_EXPORT virtual ~OpenGl_Font(); //! Destroy object - will release GPU memory if any - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! @return key of shared resource inline const TCollection_AsciiString& ResourceKey() const diff --git a/src/OpenGl/OpenGl_FrameBuffer.hxx b/src/OpenGl/OpenGl_FrameBuffer.hxx index 6c907b0211..b99fd98af4 100644 --- a/src/OpenGl/OpenGl_FrameBuffer.hxx +++ b/src/OpenGl/OpenGl_FrameBuffer.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT virtual ~OpenGl_FrameBuffer(); //! Destroy object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx) Standard_OVERRIDE; //! Number of multisampling samples. GLsizei NbSamples() const diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index 73c0d3b36b..0f73a4f533 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -114,8 +114,8 @@ public: void* theEglConfig); #endif - Standard_EXPORT Standard_Integer InquireLightLimit (); - Standard_EXPORT Standard_Integer InquireViewLimit (); + Standard_EXPORT Standard_Integer InquireLightLimit () Standard_OVERRIDE; + Standard_EXPORT Standard_Integer InquireViewLimit () Standard_OVERRIDE; public: @@ -136,11 +136,11 @@ public: const Standard_ShortReal theHeight, Standard_ShortReal& theWidth, Standard_ShortReal& theAscent, - Standard_ShortReal& theDescent) const; + Standard_ShortReal& theDescent) const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer InquirePlaneLimit(); + Standard_EXPORT Standard_Integer InquirePlaneLimit() Standard_OVERRIDE; - Standard_EXPORT Standard_ShortReal DefaultTextHeight() const; + Standard_EXPORT Standard_ShortReal DefaultTextHeight() const Standard_OVERRIDE; Standard_EXPORT Standard_Boolean ViewExists (const Handle(Aspect_Window)& theWindow, Handle(Graphic3d_CView)& theView) Standard_OVERRIDE; @@ -186,12 +186,12 @@ public: //! VBO usage can be forbidden by this method even if it is supported by GL driver. //! Notice that disabling of VBO will cause rendering performance degradation. //! Warning! This method should be called only before any primitives are displayed in GL scene! - Standard_EXPORT void EnableVBO (const Standard_Boolean theToTurnOn); + Standard_EXPORT void EnableVBO (const Standard_Boolean theToTurnOn) Standard_OVERRIDE; //! Returns information about GPU memory usage. //! Please read OpenGl_Context::MemoryInfo() for more description. Standard_EXPORT Standard_Boolean MemoryInfo (Standard_Size& theFreeBytes, - TCollection_AsciiString& theInfo) const; + TCollection_AsciiString& theInfo) const Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_Group.hxx b/src/OpenGl/OpenGl_Group.hxx index 7c481e9f1d..22e41929c3 100644 --- a/src/OpenGl/OpenGl_Group.hxx +++ b/src/OpenGl/OpenGl_Group.hxx @@ -46,26 +46,26 @@ public: //! Will throw exception if not created by OpenGl_Structure. Standard_EXPORT OpenGl_Group (const Handle(Graphic3d_Structure)& theStruct); - Standard_EXPORT virtual void Clear (const Standard_Boolean theToUpdateStructureMgr); + Standard_EXPORT virtual void Clear (const Standard_Boolean theToUpdateStructureMgr) Standard_OVERRIDE; //! Update line aspect - Standard_EXPORT virtual void UpdateAspectLine (const Standard_Boolean theIsGlobal); + Standard_EXPORT virtual void UpdateAspectLine (const Standard_Boolean theIsGlobal) Standard_OVERRIDE; //! Update fill aspect - Standard_EXPORT virtual void UpdateAspectFace (const Standard_Boolean theIsGlobal); + Standard_EXPORT virtual void UpdateAspectFace (const Standard_Boolean theIsGlobal) Standard_OVERRIDE; //! Update marker aspect - Standard_EXPORT virtual void UpdateAspectMarker (const Standard_Boolean theIsGlobal); + Standard_EXPORT virtual void UpdateAspectMarker (const Standard_Boolean theIsGlobal) Standard_OVERRIDE; //! Update text aspect - Standard_EXPORT virtual void UpdateAspectText (const Standard_Boolean theIsGlobal); + Standard_EXPORT virtual void UpdateAspectText (const Standard_Boolean theIsGlobal) Standard_OVERRIDE; //! Add primitive array element Standard_EXPORT virtual void AddPrimitiveArray (const Graphic3d_TypeOfPrimitiveArray theType, const Handle(Graphic3d_IndexBuffer)& theIndices, const Handle(Graphic3d_Buffer)& theAttribs, const Handle(Graphic3d_BoundBuffer)& theBounds, - const Standard_Boolean theToEvalMinMax); + const Standard_Boolean theToEvalMinMax) Standard_OVERRIDE; //! Add text element Standard_EXPORT virtual void Text (const Standard_CString theTextUtf, @@ -75,7 +75,7 @@ public: const Graphic3d_TextPath theTp, const Graphic3d_HorizontalTextAlignment theHta, const Graphic3d_VerticalTextAlignment theVta, - const Standard_Boolean theToEvalMinMax); + const Standard_Boolean theToEvalMinMax) Standard_OVERRIDE; //! Add text element in 3D space. Standard_EXPORT virtual void Text (const Standard_CString theTextUtf, @@ -89,10 +89,10 @@ public: //! Add flipping element Standard_EXPORT virtual void SetFlippingOptions (const Standard_Boolean theIsEnabled, - const gp_Ax2& theRefPlane); + const gp_Ax2& theRefPlane) Standard_OVERRIDE; //! Add stencil test element - Standard_EXPORT virtual void SetStencilTestOptions (const Standard_Boolean theIsEnabled); + Standard_EXPORT virtual void SetStencilTestOptions (const Standard_Boolean theIsEnabled) Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_IndexBuffer.hxx b/src/OpenGl/OpenGl_IndexBuffer.hxx index 87409e5448..efae415072 100644 --- a/src/OpenGl/OpenGl_IndexBuffer.hxx +++ b/src/OpenGl/OpenGl_IndexBuffer.hxx @@ -23,7 +23,7 @@ class OpenGl_IndexBuffer : public OpenGl_VertexBuffer public: Standard_EXPORT OpenGl_IndexBuffer(); - Standard_EXPORT virtual GLenum GetTarget() const; + Standard_EXPORT virtual GLenum GetTarget() const Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_LineAttributes.hxx b/src/OpenGl/OpenGl_LineAttributes.hxx index 54b26f4148..7a9c884d07 100644 --- a/src/OpenGl/OpenGl_LineAttributes.hxx +++ b/src/OpenGl/OpenGl_LineAttributes.hxx @@ -32,7 +32,7 @@ public: virtual ~OpenGl_LineAttributes(); void Init (const Handle(OpenGl_Context)& theGlCtx); - virtual void Release (OpenGl_Context* theGlCtx); + virtual void Release (OpenGl_Context* theGlCtx) Standard_OVERRIDE; void SetTypeOfHatch (const int theType) const; diff --git a/src/OpenGl/OpenGl_PointSprite.hxx b/src/OpenGl/OpenGl_PointSprite.hxx index 9b5bf0ff19..92f663337a 100755 --- a/src/OpenGl/OpenGl_PointSprite.hxx +++ b/src/OpenGl/OpenGl_PointSprite.hxx @@ -34,7 +34,7 @@ public: Standard_EXPORT virtual ~OpenGl_PointSprite(); //! Destroy object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! @return true if this is display list bitmap inline Standard_Boolean IsDisplayList() const diff --git a/src/OpenGl/OpenGl_Sampler.hxx b/src/OpenGl/OpenGl_Sampler.hxx index 9489fe9f47..4574147aa2 100644 --- a/src/OpenGl/OpenGl_Sampler.hxx +++ b/src/OpenGl/OpenGl_Sampler.hxx @@ -39,7 +39,7 @@ public: Standard_EXPORT virtual ~OpenGl_Sampler(); //! Destroys object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theContext); + Standard_EXPORT virtual void Release (OpenGl_Context* theContext) Standard_OVERRIDE; //! Initializes sampler object. Standard_EXPORT Standard_Boolean Init (OpenGl_Context& theContext); diff --git a/src/OpenGl/OpenGl_ShaderObject.hxx b/src/OpenGl/OpenGl_ShaderObject.hxx index 29b4860a3f..75bf2dd67b 100755 --- a/src/OpenGl/OpenGl_ShaderObject.hxx +++ b/src/OpenGl/OpenGl_ShaderObject.hxx @@ -59,7 +59,7 @@ public: Standard_EXPORT Standard_Boolean Create (const Handle(OpenGl_Context)& theCtx); //! Destroys shader object. - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! Returns type of shader object. GLenum Type() const { return myType; } diff --git a/src/OpenGl/OpenGl_ShaderProgram.hxx b/src/OpenGl/OpenGl_ShaderProgram.hxx index ebea3a311d..b2d6aa9028 100755 --- a/src/OpenGl/OpenGl_ShaderProgram.hxx +++ b/src/OpenGl/OpenGl_ShaderProgram.hxx @@ -174,7 +174,7 @@ public: Standard_EXPORT Standard_Boolean Create (const Handle(OpenGl_Context)& theCtx); //! Destroys shader program. - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! Attaches shader object to the program object. Standard_EXPORT Standard_Boolean AttachShader (const Handle(OpenGl_Context)& theCtx, diff --git a/src/OpenGl/OpenGl_Structure.hxx b/src/OpenGl/OpenGl_Structure.hxx index ae1e968a0b..e4f47dade3 100644 --- a/src/OpenGl/OpenGl_Structure.hxx +++ b/src/OpenGl/OpenGl_Structure.hxx @@ -70,36 +70,36 @@ public: Standard_EXPORT virtual void OnVisibilityChanged() Standard_OVERRIDE; //! Clear graphic data - Standard_EXPORT virtual void Clear(); + Standard_EXPORT virtual void Clear() Standard_OVERRIDE; //! Connect other structure to this one - Standard_EXPORT virtual void Connect (Graphic3d_CStructure& theStructure); + Standard_EXPORT virtual void Connect (Graphic3d_CStructure& theStructure) Standard_OVERRIDE; //! Disconnect other structure to this one - Standard_EXPORT virtual void Disconnect (Graphic3d_CStructure& theStructure); + Standard_EXPORT virtual void Disconnect (Graphic3d_CStructure& theStructure) Standard_OVERRIDE; //! Synchronize structure aspects - Standard_EXPORT virtual void UpdateAspects(); + Standard_EXPORT virtual void UpdateAspects() Standard_OVERRIDE; //! Synchronize structure transformation - Standard_EXPORT virtual void UpdateTransformation(); + Standard_EXPORT virtual void UpdateTransformation() Standard_OVERRIDE; //! Highlight entire structure with color Standard_EXPORT virtual void HighlightWithColor (const Graphic3d_Vec3& theColor, - const Standard_Boolean theToCreate); + const Standard_Boolean theToCreate) Standard_OVERRIDE; //! Highlight structure using boundary box Standard_EXPORT virtual void HighlightWithBndBox (const Handle(Graphic3d_Structure)& theStruct, - const Standard_Boolean theToCreate); + const Standard_Boolean theToCreate) Standard_OVERRIDE; //! Create shadow link to this structure - Standard_EXPORT virtual Handle(Graphic3d_CStructure) ShadowLink (const Handle(Graphic3d_StructureManager)& theManager) const; + Standard_EXPORT virtual Handle(Graphic3d_CStructure) ShadowLink (const Handle(Graphic3d_StructureManager)& theManager) const Standard_OVERRIDE; //! Create new group within this structure - Standard_EXPORT virtual Handle(Graphic3d_Group) NewGroup (const Handle(Graphic3d_Structure)& theStruct); + Standard_EXPORT virtual Handle(Graphic3d_Group) NewGroup (const Handle(Graphic3d_Structure)& theStruct) Standard_OVERRIDE; //! Remove group from this structure - Standard_EXPORT virtual void RemoveGroup (const Handle(Graphic3d_Group)& theGroup); + Standard_EXPORT virtual void RemoveGroup (const Handle(Graphic3d_Group)& theGroup) Standard_OVERRIDE; public: diff --git a/src/OpenGl/OpenGl_StructureShadow.hxx b/src/OpenGl/OpenGl_StructureShadow.hxx index 7cc554414c..e9d2c58e60 100644 --- a/src/OpenGl/OpenGl_StructureShadow.hxx +++ b/src/OpenGl/OpenGl_StructureShadow.hxx @@ -28,7 +28,8 @@ public: Standard_EXPORT OpenGl_StructureShadow (const Handle(Graphic3d_StructureManager)& theManager, const Handle(OpenGl_Structure)& theStructure); - virtual const Graphic3d_SequenceOfGroup& DrawGroups() const { return myParent->DrawGroups(); } + virtual const Graphic3d_SequenceOfGroup& DrawGroups() const Standard_OVERRIDE + { return myParent->DrawGroups(); } private: diff --git a/src/OpenGl/OpenGl_Texture.hxx b/src/OpenGl/OpenGl_Texture.hxx index 15424143fd..4c43896135 100644 --- a/src/OpenGl/OpenGl_Texture.hxx +++ b/src/OpenGl/OpenGl_Texture.hxx @@ -220,7 +220,7 @@ public: Standard_EXPORT bool Create (const Handle(OpenGl_Context)& theCtx); //! Destroy object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; //! Bind this Texture to specified unit. Standard_EXPORT void Bind (const Handle(OpenGl_Context)& theCtx, diff --git a/src/OpenGl/OpenGl_TextureBufferArb.hxx b/src/OpenGl/OpenGl_TextureBufferArb.hxx index 269044604a..4fc82b4f83 100644 --- a/src/OpenGl/OpenGl_TextureBufferArb.hxx +++ b/src/OpenGl/OpenGl_TextureBufferArb.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT virtual ~OpenGl_TextureBufferArb(); //! Override VBO target - Standard_EXPORT virtual GLenum GetTarget() const; + Standard_EXPORT virtual GLenum GetTarget() const Standard_OVERRIDE; //! Returns true if TBO is valid. //! Notice that no any real GL call is performed! @@ -56,11 +56,11 @@ public: } //! Destroy object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx) Standard_OVERRIDE; //! Creates VBO and Texture names (ids) if not yet generated. //! Data should be initialized by another method. - Standard_EXPORT bool Create (const Handle(OpenGl_Context)& theGlCtx); + Standard_EXPORT bool Create (const Handle(OpenGl_Context)& theGlCtx) Standard_OVERRIDE; //! Perform TBO initialization with specified data. //! Existing data will be deleted. diff --git a/src/OpenGl/OpenGl_VertexBuffer.hxx b/src/OpenGl/OpenGl_VertexBuffer.hxx index ba0a91e4a9..8faf00becb 100644 --- a/src/OpenGl/OpenGl_VertexBuffer.hxx +++ b/src/OpenGl/OpenGl_VertexBuffer.hxx @@ -77,7 +77,7 @@ public: Standard_EXPORT virtual bool Create (const Handle(OpenGl_Context)& theGlCtx); //! Destroy object - will release GPU memory if any. - Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx); + Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx) Standard_OVERRIDE; //! Bind this VBO. Standard_EXPORT virtual void Bind (const Handle(OpenGl_Context)& theGlCtx) const; diff --git a/src/OpenGl/OpenGl_VertexBufferCompat.hxx b/src/OpenGl/OpenGl_VertexBufferCompat.hxx index 092bf3fec0..741fcc70b2 100644 --- a/src/OpenGl/OpenGl_VertexBufferCompat.hxx +++ b/src/OpenGl/OpenGl_VertexBufferCompat.hxx @@ -44,7 +44,7 @@ public: //! Creates VBO name (id) if not yet generated. //! Data should be initialized by another method. - Standard_EXPORT bool Create (const Handle(OpenGl_Context)& theGlCtx); + Standard_EXPORT bool Create (const Handle(OpenGl_Context)& theGlCtx) Standard_OVERRIDE; //! Destroy object - will release memory if any. Standard_EXPORT virtual void Release (OpenGl_Context* theGlCtx) Standard_OVERRIDE; diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx index 7c6043c7bf..774ccfbb48 100644 --- a/src/OpenGl/OpenGl_View.hxx +++ b/src/OpenGl/OpenGl_View.hxx @@ -129,10 +129,12 @@ public: const Aspect_RenderingContext theContext) Standard_OVERRIDE; //! Returns window associated with the view. - virtual Handle(Aspect_Window) Window() const Standard_OVERRIDE { return myWindow->PlatformWindow(); } + virtual Handle(Aspect_Window) Window() const Standard_OVERRIDE + { return myWindow->PlatformWindow(); } //! Returns True if the window associated to the view is defined. - virtual Standard_Boolean IsDefined() const { return !myWindow.IsNull(); } + virtual Standard_Boolean IsDefined() const Standard_OVERRIDE + { return !myWindow.IsNull(); } //! Handle changing size of the rendering window. Standard_EXPORT virtual void Resized() Standard_OVERRIDE; @@ -170,7 +172,8 @@ public: Standard_EXPORT virtual void TriedronEcho (const Aspect_TypeOfTriedronEcho theType = Aspect_TOTE_NONE) Standard_OVERRIDE; //! Returns data of a graduated trihedron - const Graphic3d_GraduatedTrihedron& GetGraduatedTrihedron() { return myGTrihedronData; } + const Graphic3d_GraduatedTrihedron& GetGraduatedTrihedron() Standard_OVERRIDE + { return myGTrihedronData; } //! Displays Graduated Trihedron. Standard_EXPORT virtual void GraduatedTrihedronDisplay (const Graphic3d_GraduatedTrihedron& theTrihedronData) Standard_OVERRIDE; diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx index 737d26472f..c211954081 100644 --- a/src/OpenGl/OpenGl_Workspace.hxx +++ b/src/OpenGl/OpenGl_Workspace.hxx @@ -95,7 +95,7 @@ public: //! Checks whether the element can be rendered or not. //! @param theElement [in] the element to check. //! @return True if element can be rendered. - virtual Standard_Boolean CanRender (const OpenGl_Element* theElement); + virtual Standard_Boolean CanRender (const OpenGl_Element* theElement) Standard_OVERRIDE; private: diff --git a/src/PCDM/PCDM_ReadWriter_1.hxx b/src/PCDM/PCDM_ReadWriter_1.hxx index 85c1cac820..e35029fd13 100644 --- a/src/PCDM/PCDM_ReadWriter_1.hxx +++ b/src/PCDM/PCDM_ReadWriter_1.hxx @@ -44,23 +44,23 @@ public: Standard_EXPORT PCDM_ReadWriter_1(); //! returns PCDM_ReadWriter_1. - Standard_EXPORT TCollection_AsciiString Version() const; + Standard_EXPORT TCollection_AsciiString Version() const Standard_OVERRIDE; - Standard_EXPORT void WriteReferenceCounter (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const; + Standard_EXPORT void WriteReferenceCounter (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const Standard_OVERRIDE; - Standard_EXPORT void WriteReferences (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& theReferencerFileName) const; + Standard_EXPORT void WriteReferences (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& theReferencerFileName) const Standard_OVERRIDE; - Standard_EXPORT void WriteExtensions (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const; + Standard_EXPORT void WriteExtensions (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const Standard_OVERRIDE; - Standard_EXPORT void WriteVersion (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const; + Standard_EXPORT void WriteVersion (const Handle(Storage_Data)& aData, const Handle(CDM_Document)& aDocument) const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer ReadReferenceCounter (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) const; + Standard_EXPORT Standard_Integer ReadReferenceCounter (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) const Standard_OVERRIDE; - Standard_EXPORT void ReadReferences (const TCollection_ExtendedString& aFileName, PCDM_SequenceOfReference& theReferences, const Handle(CDM_MessageDriver)& theMsgDriver) const; + Standard_EXPORT void ReadReferences (const TCollection_ExtendedString& aFileName, PCDM_SequenceOfReference& theReferences, const Handle(CDM_MessageDriver)& theMsgDriver) const Standard_OVERRIDE; - Standard_EXPORT void ReadExtensions (const TCollection_ExtendedString& aFileName, TColStd_SequenceOfExtendedString& theExtensions, const Handle(CDM_MessageDriver)& theMsgDriver) const; + Standard_EXPORT void ReadExtensions (const TCollection_ExtendedString& aFileName, TColStd_SequenceOfExtendedString& theExtensions, const Handle(CDM_MessageDriver)& theMsgDriver) const Standard_OVERRIDE; - Standard_EXPORT Standard_Integer ReadDocumentVersion (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) const; + Standard_EXPORT Standard_Integer ReadDocumentVersion (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) const Standard_OVERRIDE; diff --git a/src/PLib/PLib_HermitJacobi.hxx b/src/PLib/PLib_HermitJacobi.hxx index 2355aa281f..e47267abe2 100644 --- a/src/PLib/PLib_HermitJacobi.hxx +++ b/src/PLib/PLib_HermitJacobi.hxx @@ -85,34 +85,34 @@ public: //! MaxError can be greater than Tol if it is not possible //! to find a NewDegree <= MaxDegree. //! In this case NewDegree = MaxDegree - Standard_EXPORT void ReduceDegree (const Standard_Integer Dimension, const Standard_Integer MaxDegree, const Standard_Real Tol, Standard_Real& HermJacCoeff, Standard_Integer& NewDegree, Standard_Real& MaxError) const; + Standard_EXPORT void ReduceDegree (const Standard_Integer Dimension, const Standard_Integer MaxDegree, const Standard_Real Tol, Standard_Real& HermJacCoeff, Standard_Integer& NewDegree, Standard_Real& MaxError) const Standard_OVERRIDE; Standard_EXPORT Standard_Real AverageError (const Standard_Integer Dimension, Standard_Real& HermJacCoeff, const Standard_Integer NewDegree) const; //! Convert the polynomial P(t) = H(t) + W(t) Q(t) in the canonical base. - Standard_EXPORT void ToCoefficients (const Standard_Integer Dimension, const Standard_Integer Degree, const TColStd_Array1OfReal& HermJacCoeff, TColStd_Array1OfReal& Coefficients) const; + Standard_EXPORT void ToCoefficients (const Standard_Integer Dimension, const Standard_Integer Degree, const TColStd_Array1OfReal& HermJacCoeff, TColStd_Array1OfReal& Coefficients) const Standard_OVERRIDE; //! Compute the values of the basis functions in u - Standard_EXPORT void D0 (const Standard_Real U, TColStd_Array1OfReal& BasisValue); + Standard_EXPORT void D0 (const Standard_Real U, TColStd_Array1OfReal& BasisValue) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D1 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1); + Standard_EXPORT void D1 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D2 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2); + Standard_EXPORT void D2 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D3 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2, TColStd_Array1OfReal& BasisD3); + Standard_EXPORT void D3 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2, TColStd_Array1OfReal& BasisD3) Standard_OVERRIDE; //! returns WorkDegree - Standard_Integer WorkDegree() const; + Standard_Integer WorkDegree() const Standard_OVERRIDE; //! returns NivConstr - Standard_Integer NivConstr() const; + Standard_Integer NivConstr() const; diff --git a/src/PLib/PLib_JacobiPolynomial.hxx b/src/PLib/PLib_JacobiPolynomial.hxx index 2256734e90..0839e36a73 100644 --- a/src/PLib/PLib_JacobiPolynomial.hxx +++ b/src/PLib/PLib_JacobiPolynomial.hxx @@ -116,34 +116,34 @@ public: //! MaxError can be greater than Tol if it is not possible //! to find a NewDegree <= MaxDegree. //! In this case NewDegree = MaxDegree - Standard_EXPORT void ReduceDegree (const Standard_Integer Dimension, const Standard_Integer MaxDegree, const Standard_Real Tol, Standard_Real& JacCoeff, Standard_Integer& NewDegree, Standard_Real& MaxError) const; + Standard_EXPORT void ReduceDegree (const Standard_Integer Dimension, const Standard_Integer MaxDegree, const Standard_Real Tol, Standard_Real& JacCoeff, Standard_Integer& NewDegree, Standard_Real& MaxError) const Standard_OVERRIDE; Standard_EXPORT Standard_Real AverageError (const Standard_Integer Dimension, Standard_Real& JacCoeff, const Standard_Integer NewDegree) const; //! Convert the polynomial P(t) = R(t) + W(t) Q(t) in the canonical base. - Standard_EXPORT void ToCoefficients (const Standard_Integer Dimension, const Standard_Integer Degree, const TColStd_Array1OfReal& JacCoeff, TColStd_Array1OfReal& Coefficients) const; + Standard_EXPORT void ToCoefficients (const Standard_Integer Dimension, const Standard_Integer Degree, const TColStd_Array1OfReal& JacCoeff, TColStd_Array1OfReal& Coefficients) const Standard_OVERRIDE; //! Compute the values of the basis functions in u - Standard_EXPORT void D0 (const Standard_Real U, TColStd_Array1OfReal& BasisValue); + Standard_EXPORT void D0 (const Standard_Real U, TColStd_Array1OfReal& BasisValue) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D1 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1); + Standard_EXPORT void D1 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D2 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2); + Standard_EXPORT void D2 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2) Standard_OVERRIDE; //! Compute the values and the derivatives values of //! the basis functions in u - Standard_EXPORT void D3 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2, TColStd_Array1OfReal& BasisD3); + Standard_EXPORT void D3 (const Standard_Real U, TColStd_Array1OfReal& BasisValue, TColStd_Array1OfReal& BasisD1, TColStd_Array1OfReal& BasisD2, TColStd_Array1OfReal& BasisD3) Standard_OVERRIDE; //! returns WorkDegree - Standard_Integer WorkDegree() const; + Standard_Integer WorkDegree() const Standard_OVERRIDE; //! returns NivConstr - Standard_Integer NivConstr() const; + Standard_Integer NivConstr() const; diff --git a/src/ProjLib/ProjLib_HCompProjectedCurve.hxx b/src/ProjLib/ProjLib_HCompProjectedCurve.hxx index d9273cd1ee..d475867940 100644 --- a/src/ProjLib/ProjLib_HCompProjectedCurve.hxx +++ b/src/ProjLib/ProjLib_HCompProjectedCurve.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. ProjLib_CompProjectedCurve& ChangeCurve2d(); diff --git a/src/ProjLib/ProjLib_HProjectedCurve.hxx b/src/ProjLib/ProjLib_HProjectedCurve.hxx index 5940e621de..545fb54a6a 100644 --- a/src/ProjLib/ProjLib_HProjectedCurve.hxx +++ b/src/ProjLib/ProjLib_HProjectedCurve.hxx @@ -50,7 +50,7 @@ public: //! Returns the curve used to create the GenHCurve2d. //! This is redefined from HCurve2d, cannot be inline. - Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const; + Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE; //! Returns the curve used to create the GenHCurve. ProjLib_ProjectedCurve& ChangeCurve2d(); diff --git a/src/QANCollection/QANCollection_Handle.cxx b/src/QANCollection/QANCollection_Handle.cxx index 36e81da154..907b97c1c3 100644 --- a/src/QANCollection/QANCollection_Handle.cxx +++ b/src/QANCollection/QANCollection_Handle.cxx @@ -233,17 +233,26 @@ static Standard_Integer QAHandleBool (Draw_Interpretor& theDI, return 0; } +// Auxiliary class to define new virtual methods +class Transient_Root : public Standard_Transient +{ +public: + virtual const char* Name() const { return "Transient_Root"; } + virtual Standard_Transient* CreateParent() const { return new Standard_Transient; } + virtual Standard_Transient* Clone() const { return new Transient_Root; } + DEFINE_STANDARD_RTTI(Transient_Root, Standard_Transient) +}; +DEFINE_STANDARD_HANDLE(Transient_Root, Standard_Transient) + // Auxiliary macros to create hierarchy of 50 classes #define QA_DEFINECLASS(theClass, theParent) \ class theClass : public theParent \ { \ public:\ - theClass() {}; \ - virtual ~theClass() {}; \ - virtual const char* Name() const { return #theClass; } \ - virtual Standard_Transient* CreateParent() const { return new theParent(); } \ - virtual Standard_Transient* Clone() const { return new theClass(); } \ - DEFINE_STANDARD_RTTI(theClass, theParent); \ + virtual const char* Name() const Standard_OVERRIDE { return #theClass; } \ + virtual Standard_Transient* CreateParent() const Standard_OVERRIDE { return new theParent(); } \ + virtual Standard_Transient* Clone() const Standard_OVERRIDE { return new theClass(); } \ + DEFINE_STANDARD_RTTI(theClass, theParent) \ };\ DEFINE_STANDARD_HANDLE (theClass, theParent) \ IMPLEMENT_STANDARD_HANDLE (theClass, theParent) \ @@ -264,7 +273,7 @@ QA_DEFINECLASS(QA_NAME(theTens ## 7), QA_NAME(theTens ## 6)) \ QA_DEFINECLASS(QA_NAME(theTens ## 8), QA_NAME(theTens ## 7)) \ QA_DEFINECLASS(QA_NAME(theTens ## 9), QA_NAME(theTens ## 8)) -QA_DEFINECLASS10(Standard_Transient, 0) +QA_DEFINECLASS10(Transient_Root, 0) QA_DEFINECLASS10(qaclass09_50, 1) QA_DEFINECLASS10(qaclass19_50, 2) QA_DEFINECLASS10(qaclass29_50, 3) diff --git a/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx b/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx index 1147c522f4..3e1c1056dc 100644 --- a/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx +++ b/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx @@ -48,17 +48,17 @@ public: //! Specific filling of the list of Entities shared by an Entity //! , according to a Case Number (provided by HeaderSection //! Protocol). - Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Specific Checking of an Entity - Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific Copy ("Deep") from to (same type) //! by using a CopyTool which provides its working Map. //! Use method Transferred from CopyTool to work - Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx index b853a5109d..4af0c4ae8a 100644 --- a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx +++ b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx @@ -45,7 +45,7 @@ public: //! associates a positive Case Number to each type of HeaderSection entity, //! given as a String defined in the EXPRESS form - Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const; + Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const Standard_OVERRIDE; //! associates a positive Case Number to each type of HeaderSection Complex entity, //! given as a String defined in the EXPRESS form @@ -56,11 +56,11 @@ public: //! returns a StepType (defined in EXPRESS form which belongs to a //! Type of Entity, identified by its CaseNumber determined by Protocol - Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const; + Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const Standard_OVERRIDE; - Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; - Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx b/src/RWStepAP214/RWStepAP214_GeneralModule.hxx index 63c6aee47c..9f11dbcc54 100644 --- a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx +++ b/src/RWStepAP214/RWStepAP214_GeneralModule.hxx @@ -49,17 +49,17 @@ public: //! Specific filling of the list of Entities shared by an Entity //! , according to a Case Number (provided by StepAP214 //! Protocol). - Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Specific Checking of an Entity - Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific Copy ("Deep") from to (same type) //! by using a CopyTool which provides its working Map. //! Use method Transferred from CopyTool to work - Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Integer CategoryNumber (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares) const Standard_OVERRIDE; diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx index 96c3a4ede2..b00928bf7f 100644 --- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx +++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx @@ -45,7 +45,7 @@ public: //! associates a positive Case Number to each type of StepAP214 entity, //! given as a String defined in the EXPRESS form - Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const; + Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const Standard_OVERRIDE; //! associates a positive Case Number to each type of StepAP214 Complex entity, //! given as a String defined in the EXPRESS form @@ -56,13 +56,13 @@ public: //! returns a StepType (defined in EXPRESS form which belongs to a //! Type of Entity, identified by its CaseNumber determined by Protocol - Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const; + Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean ComplexType (const Standard_Integer CN, TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE; - Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; - Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/STEPControl/STEPControl_Controller.hxx b/src/STEPControl/STEPControl_Controller.hxx index 8a054b8eff..15a590a782 100644 --- a/src/STEPControl/STEPControl_Controller.hxx +++ b/src/STEPControl/STEPControl_Controller.hxx @@ -47,11 +47,11 @@ public: //! Creates a new empty Model ready to receive data of the Norm. //! It is taken from STEP Template Model - Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const Standard_OVERRIDE; //! Returns a new Actor for Read attached to the pair (norm,appli) //! It is a PmsToTopoDSAct_Actor - Standard_EXPORT Handle(Transfer_ActorOfTransientProcess) ActorRead (const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Handle(Transfer_ActorOfTransientProcess) ActorRead (const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; Standard_EXPORT virtual void Customise (Handle(XSControl_WorkSession)& WS) Standard_OVERRIDE; diff --git a/src/STEPEdit/STEPEdit_EditContext.hxx b/src/STEPEdit/STEPEdit_EditContext.hxx index 4fa1c6a080..3cdbee9a03 100644 --- a/src/STEPEdit/STEPEdit_EditContext.hxx +++ b/src/STEPEdit/STEPEdit_EditContext.hxx @@ -46,15 +46,15 @@ public: Standard_EXPORT STEPEdit_EditContext(); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/STEPEdit/STEPEdit_EditSDR.hxx b/src/STEPEdit/STEPEdit_EditSDR.hxx index 8677a311fa..73b6fc8b9c 100644 --- a/src/STEPEdit/STEPEdit_EditSDR.hxx +++ b/src/STEPEdit/STEPEdit_EditSDR.hxx @@ -43,15 +43,15 @@ public: Standard_EXPORT STEPEdit_EditSDR(); - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const; + Standard_EXPORT Standard_Boolean Recognize (const Handle(IFSelect_EditForm)& form) const Standard_OVERRIDE; - Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringValue (const Handle(IFSelect_EditForm)& form, const Standard_Integer num) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Apply (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean Load (const Handle(IFSelect_EditForm)& form, const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/STEPSelections/STEPSelections_SelectAssembly.hxx b/src/STEPSelections/STEPSelections_SelectAssembly.hxx index 55ab8f3c3e..6f2f945f79 100644 --- a/src/STEPSelections/STEPSelections_SelectAssembly.hxx +++ b/src/STEPSelections/STEPSelections_SelectAssembly.hxx @@ -43,10 +43,10 @@ public: //! Explores an entity, to take its faces //! Works recursively - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Assembly structures" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/STEPSelections/STEPSelections_SelectFaces.hxx b/src/STEPSelections/STEPSelections_SelectFaces.hxx index a709c9ebc5..152a91917b 100644 --- a/src/STEPSelections/STEPSelections_SelectFaces.hxx +++ b/src/STEPSelections/STEPSelections_SelectFaces.hxx @@ -43,10 +43,10 @@ public: //! Explores an entity, to take its faces //! Works recursively - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Faces" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx index 38fcc1ce55..a8cd649823 100644 --- a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx +++ b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx @@ -41,10 +41,10 @@ public: Standard_EXPORT STEPSelections_SelectGSCurves(); - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Curves" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/STEPSelections/STEPSelections_SelectInstances.hxx b/src/STEPSelections/STEPSelections_SelectInstances.hxx index de3df2590b..1a6732761c 100644 --- a/src/STEPSelections/STEPSelections_SelectInstances.hxx +++ b/src/STEPSelections/STEPSelections_SelectInstances.hxx @@ -41,12 +41,12 @@ public: Standard_EXPORT STEPSelections_SelectInstances(); - Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const; + Standard_EXPORT Interface_EntityIterator RootResult (const Interface_Graph& G) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const; + Standard_EXPORT Standard_Boolean Explore (const Standard_Integer level, const Handle(Standard_Transient)& ent, const Interface_Graph& G, Interface_EntityIterator& explored) const Standard_OVERRIDE; //! Returns a text defining the criterium : "Instances" - Standard_EXPORT TCollection_AsciiString ExploreLabel() const; + Standard_EXPORT TCollection_AsciiString ExploreLabel() const Standard_OVERRIDE; diff --git a/src/Select3D/Select3D_SensitiveEntity.hxx b/src/Select3D/Select3D_SensitiveEntity.hxx index 8228d490a2..0a33a60005 100644 --- a/src/Select3D/Select3D_SensitiveEntity.hxx +++ b/src/Select3D/Select3D_SensitiveEntity.hxx @@ -64,10 +64,10 @@ public: //! complex and needs to pre-build BVH at the creation of //! sensitive entity step or is light-weighted so the tree //! can be build on demand with unnoticeable delay - virtual Standard_Integer NbSubElements() = 0; + virtual Standard_Integer NbSubElements() Standard_OVERRIDE = 0; //! Returns bounding box of a sensitive with transformation applied - virtual Select3D_BndBox3d BoundingBox() = 0; + virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE = 0; //! Returns center of a sensitive with transformation applied virtual gp_Pnt CenterOfGeometry() const = 0; @@ -83,7 +83,7 @@ public: //! Returns inversed location transformation matrix if the shape corresponding //! to this entity has init location set. Otherwise, returns identity matrix. - Standard_EXPORT virtual gp_Trsf InvInitLocation() const; + Standard_EXPORT virtual gp_Trsf InvInitLocation() const Standard_OVERRIDE; DEFINE_STANDARD_RTTI(Select3D_SensitiveEntity, SelectBasics_SensitiveEntity) diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx index beccfc838f..711cf575ea 100644 --- a/src/Select3D/Select3D_SensitiveGroup.hxx +++ b/src/Select3D/Select3D_SensitiveGroup.hxx @@ -67,7 +67,7 @@ public: //! Removes all sensitive entities from the list used at the //! time of construction, or added using the function Add. - Standard_EXPORT void Clear(); + Standard_EXPORT void Clear() Standard_OVERRIDE; //! Returns true if the sensitive entity aSensitive is in //! the list used at the time of construction, or added using the function Add. @@ -92,7 +92,7 @@ public: Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE; //! Sets the owner for all entities in group - Standard_EXPORT void Set (const Handle(SelectBasics_EntityOwner)& theOwnerId); + Standard_EXPORT void Set (const Handle(SelectBasics_EntityOwner)& theOwnerId) Standard_OVERRIDE; //! Gets group content const Select3D_EntitySequence& GetEntities() const; diff --git a/src/Select3D/Select3D_SensitiveSet.hxx b/src/Select3D/Select3D_SensitiveSet.hxx index 9b3cc77a02..5a29543df6 100644 --- a/src/Select3D/Select3D_SensitiveSet.hxx +++ b/src/Select3D/Select3D_SensitiveSet.hxx @@ -70,7 +70,7 @@ public: //! Must be called manually to build BVH tree for any sensitive set //! in case if its content was initialized not in a constructor, //! but element by element - Standard_EXPORT void BVH(); + Standard_EXPORT void BVH() Standard_OVERRIDE; //! Marks BVH tree of the set as outdated. It will be rebuild //! at the next call of BVH() diff --git a/src/Select3D/Select3D_SensitiveWire.hxx b/src/Select3D/Select3D_SensitiveWire.hxx index 792b3bf817..daf54c846f 100644 --- a/src/Select3D/Select3D_SensitiveWire.hxx +++ b/src/Select3D/Select3D_SensitiveWire.hxx @@ -52,7 +52,7 @@ public: Standard_EXPORT const NCollection_Vector& GetEdges(); //! Sets the owner for all entities in wire - Standard_EXPORT void Set (const Handle(SelectBasics_EntityOwner)& theOwnerId); + Standard_EXPORT void Set (const Handle(SelectBasics_EntityOwner)& theOwnerId) Standard_OVERRIDE; Standard_EXPORT Handle(Select3D_SensitiveEntity) GetLastDetected() const; diff --git a/src/SelectMgr/SelectMgr_AndFilter.hxx b/src/SelectMgr/SelectMgr_AndFilter.hxx index 8968a4c5f7..d2a41fef66 100644 --- a/src/SelectMgr/SelectMgr_AndFilter.hxx +++ b/src/SelectMgr/SelectMgr_AndFilter.hxx @@ -40,7 +40,7 @@ public: //! more types of entity. Standard_EXPORT SelectMgr_AndFilter(); - Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const; + Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const Standard_OVERRIDE; diff --git a/src/SelectMgr/SelectMgr_OrFilter.hxx b/src/SelectMgr/SelectMgr_OrFilter.hxx index b96a51b7e2..23b2821298 100644 --- a/src/SelectMgr/SelectMgr_OrFilter.hxx +++ b/src/SelectMgr/SelectMgr_OrFilter.hxx @@ -40,7 +40,7 @@ public: //! Constructs an empty or selection filter. Standard_EXPORT SelectMgr_OrFilter(); - Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const; + Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const Standard_OVERRIDE; //! Disable selection of specified objects. Standard_EXPORT void SetDisabledObjects (const Handle(Graphic3d_NMapOfTransient)& theObjects); diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx index 7431098239..fec4bb8419 100644 --- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx +++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx @@ -69,7 +69,7 @@ public: //! //! Otherwise, returns Standard_False, and , , //! , , are not significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if curve from the edge has been //! modified. In this case, is the new geometric @@ -80,7 +80,7 @@ public: //! geometric support of the edge. //! In other cases returns Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has been modified. //! In this case,if curve on the surface is modified, @@ -93,7 +93,7 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the surface has been modified. //! if flag IsOf equals Standard_True Offset surfaces are aproximated to Offset @@ -171,11 +171,11 @@ public: //! Returns error for aproximation surface. Standard_Real SurfaceError() const; - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; //! Returns error for aproximation surface, curve3d and curve2d. Standard_EXPORT Standard_Real MaxErrors (Standard_Real& aCurve3dErr, Standard_Real& aCurve2dErr) const; diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx index 791be3fdcb..7c9b2ac3d2 100644 --- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx +++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx @@ -69,7 +69,7 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -77,14 +77,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -96,14 +96,14 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -111,7 +111,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx index 89f855eaf3..1fbfab3cd7 100644 --- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx +++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx @@ -54,7 +54,7 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -62,14 +62,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -81,14 +81,14 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -96,7 +96,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.hxx b/src/ShapeCustom/ShapeCustom_DirectModification.hxx index 085ddb7bd6..bb7f7874c9 100644 --- a/src/ShapeCustom/ShapeCustom_DirectModification.hxx +++ b/src/ShapeCustom/ShapeCustom_DirectModification.hxx @@ -54,7 +54,7 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -62,14 +62,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -81,14 +81,14 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -96,7 +96,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx index 778c9a8004..f073346544 100644 --- a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx +++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx @@ -53,7 +53,7 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Returns Standard_True if the edge has been //! modified. In this case, is the new geometric @@ -61,14 +61,14 @@ public: //! the new tolerance. Otherwise, returns //! Standard_False, and , , are not //! significant. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the vertex has been //! modified. In this case,

is the new geometric //! support of the vertex, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the edge has a new //! curve on surface on the face .In this case, @@ -80,14 +80,14 @@ public: //! //! is the new edge created from . //! is the new face created from . They may be usefull. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Returns Standard_True if the Vertex has a new //! parameter on the edge . In this case,

is //! the parameter, the new tolerance. //! Otherwise, returns Standard_False, and

, //! are not significant. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; //! Returns the continuity of between //! and . @@ -95,7 +95,7 @@ public: //! is the new edge created from . //! (resp. ) is the new face created from //! (resp. ). - Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); + Standard_EXPORT GeomAbs_Shape Continuity (const TopoDS_Edge& E, const TopoDS_Face& F1, const TopoDS_Face& F2, const TopoDS_Edge& NewE, const TopoDS_Face& NewF1, const TopoDS_Face& NewF2) Standard_OVERRIDE; diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx index 37edf538c9..f8ca3f4b31 100644 --- a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx +++ b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx @@ -54,27 +54,27 @@ public: //! Calls inherited method. //! Sets as actual tolerance of multiplied with scale //! factor. - Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace); + Standard_EXPORT Standard_Boolean NewSurface (const TopoDS_Face& F, Handle(Geom_Surface)& S, TopLoc_Location& L, Standard_Real& Tol, Standard_Boolean& RevWires, Standard_Boolean& RevFace) Standard_OVERRIDE; //! Calls inherited method. //! Sets as actual tolerance of multiplied with scale //! factor. - Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve (const TopoDS_Edge& E, Handle(Geom_Curve)& C, TopLoc_Location& L, Standard_Real& Tol) Standard_OVERRIDE; //! Calls inherited method. //! Sets as actual tolerance of multiplied with scale //! factor. - Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewPoint (const TopoDS_Vertex& V, gp_Pnt& P, Standard_Real& Tol) Standard_OVERRIDE; //! Calls inherited method. //! Sets as actual tolerance of multiplied with scale //! factor. - Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewCurve2d (const TopoDS_Edge& E, const TopoDS_Face& F, const TopoDS_Edge& NewE, const TopoDS_Face& NewF, Handle(Geom2d_Curve)& C, Standard_Real& Tol) Standard_OVERRIDE; //! Calls inherited method. //! Sets as actual tolerance of multiplied with scale //! factor. - Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol); + Standard_EXPORT Standard_Boolean NewParameter (const TopoDS_Vertex& V, const TopoDS_Edge& E, Standard_Real& P, Standard_Real& Tol) Standard_OVERRIDE; diff --git a/src/Standard/Standard_DefineException.hxx b/src/Standard/Standard_DefineException.hxx index 61e99c8445..9abf9670bd 100644 --- a/src/Standard/Standard_DefineException.hxx +++ b/src/Standard/Standard_DefineException.hxx @@ -29,7 +29,7 @@ #define DEFINE_STANDARD_EXCEPTION(C1,C2) \ \ class C1 : public C2 { \ - void Throw () const { throw *this; } \ + void Throw () const Standard_OVERRIDE { throw *this; } \ public: \ C1() : C2() {} \ C1(const Standard_CString theMessage) : C2(theMessage) {} \ diff --git a/src/Standard/Standard_Type.hxx b/src/Standard/Standard_Type.hxx index 97d8535002..d36234ad00 100644 --- a/src/Standard/Standard_Type.hxx +++ b/src/Standard/Standard_Type.hxx @@ -31,7 +31,8 @@ public: \ typedef Base base_type; \ static const char* get_type_name () { return #Class; } \ - virtual const Handle(Standard_Type)& DynamicType() const { return STANDARD_TYPE(Class); } + virtual const Handle(Standard_Type)& DynamicType() const Standard_OVERRIDE \ + { return STANDARD_TYPE(Class); } // forward declaration of type_instance class namespace opencascade { diff --git a/src/StepBasic/StepBasic_SizeSelect.hxx b/src/StepBasic/StepBasic_SizeSelect.hxx index a8fb9d95dc..c2007a4927 100644 --- a/src/StepBasic/StepBasic_SizeSelect.hxx +++ b/src/StepBasic/StepBasic_SizeSelect.hxx @@ -42,7 +42,7 @@ public: //! Recognizes a TrimmingSelect Kind Entity that is : //! 1 -> SizeMember //! 0 else (i.e. Real) - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Returns a SizeMember (POSITIVE_LENGTH_MEASURE) as preferred Standard_EXPORT virtual Handle(StepData_SelectMember) NewMember() const Standard_OVERRIDE; diff --git a/src/StepBasic/StepBasic_SourceItem.hxx b/src/StepBasic/StepBasic_SourceItem.hxx index 26fc30345e..94175f9b2f 100644 --- a/src/StepBasic/StepBasic_SourceItem.hxx +++ b/src/StepBasic/StepBasic_SourceItem.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of SourceItem select type //! 1 -> HAsciiString from TCollection //! 0 else - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(StepData_SelectMember) NewMember() const Standard_OVERRIDE; diff --git a/src/StepData/StepData_DefaultGeneral.hxx b/src/StepData/StepData_DefaultGeneral.hxx index ca8cfd1d46..5896caf70e 100644 --- a/src/StepData/StepData_DefaultGeneral.hxx +++ b/src/StepData/StepData_DefaultGeneral.hxx @@ -46,18 +46,18 @@ public: //! Specific filling of the list of Entities shared by an Entity //! , which is an UnknownEntity from StepData. - Standard_EXPORT void FillSharedCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void FillSharedCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; //! Specific Checking of an Entity - Standard_EXPORT void CheckCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void CheckCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Specific creation of a new void entity - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& entto) const Standard_OVERRIDE; //! Specific Copy ("Deep") from to (same type) //! by using a CopyTool which provides its working Map. //! Use method Transferred from TransferControl to work - Standard_EXPORT void CopyCase (const Standard_Integer casenum, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void CopyCase (const Standard_Integer casenum, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_DescrGeneral.hxx b/src/StepData/StepData_DescrGeneral.hxx index 9c2e637891..bad8d33b35 100644 --- a/src/StepData/StepData_DescrGeneral.hxx +++ b/src/StepData/StepData_DescrGeneral.hxx @@ -43,13 +43,13 @@ public: Standard_EXPORT StepData_DescrGeneral(const Handle(StepData_Protocol)& proto); - Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const; + Standard_EXPORT void FillSharedCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE; - Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const; + Standard_EXPORT void CheckCase (const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE; - Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const; + Standard_EXPORT void CopyCase (const Standard_Integer CN, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE; - Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Boolean NewVoid (const Standard_Integer CN, Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_DescrReadWrite.hxx b/src/StepData/StepData_DescrReadWrite.hxx index 8d4baea1c1..c3562e2f2c 100644 --- a/src/StepData/StepData_DescrReadWrite.hxx +++ b/src/StepData/StepData_DescrReadWrite.hxx @@ -44,19 +44,19 @@ public: Standard_EXPORT StepData_DescrReadWrite(const Handle(StepData_Protocol)& proto); - Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const; + Standard_EXPORT Standard_Integer CaseStep (const TCollection_AsciiString& atype) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Integer CaseStep (const TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean IsComplex (const Standard_Integer CN) const Standard_OVERRIDE; - Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const; + Standard_EXPORT const TCollection_AsciiString& StepType (const Standard_Integer CN) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean ComplexType (const Standard_Integer CN, TColStd_SequenceOfAsciiString& types) const Standard_OVERRIDE; - Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; - Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void WriteStep (const Standard_Integer CN, StepData_StepWriter& SW, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_ECDescr.hxx b/src/StepData/StepData_ECDescr.hxx index 7774de7850..c46faf2b4d 100644 --- a/src/StepData/StepData_ECDescr.hxx +++ b/src/StepData/StepData_ECDescr.hxx @@ -57,14 +57,14 @@ public: Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) TypeList() const; //! Tells if a ESDescr matches a step type : exact or super type - Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const; + Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const Standard_OVERRIDE; //! Returns True - Standard_EXPORT Standard_Boolean IsComplex() const; + Standard_EXPORT Standard_Boolean IsComplex() const Standard_OVERRIDE; //! Creates a described entity (i.e. a complex one, made of one //! simple entity per member) - Standard_EXPORT Handle(StepData_Described) NewEntity() const; + Standard_EXPORT Handle(StepData_Described) NewEntity() const Standard_OVERRIDE; diff --git a/src/StepData/StepData_ESDescr.hxx b/src/StepData/StepData_ESDescr.hxx index 1433a39aed..1ea82ee918 100644 --- a/src/StepData/StepData_ESDescr.hxx +++ b/src/StepData/StepData_ESDescr.hxx @@ -94,13 +94,13 @@ public: Standard_EXPORT Handle(StepData_PDescr) NamedField (const Standard_CString name) const; //! Tells if a ESDescr matches a step type : exact or super type - Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const; + Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const Standard_OVERRIDE; //! Returns False - Standard_EXPORT Standard_Boolean IsComplex() const; + Standard_EXPORT Standard_Boolean IsComplex() const Standard_OVERRIDE; //! Creates a described entity (i.e. a simple one) - Standard_EXPORT Handle(StepData_Described) NewEntity() const; + Standard_EXPORT Handle(StepData_Described) NewEntity() const Standard_OVERRIDE; diff --git a/src/StepData/StepData_GeneralModule.hxx b/src/StepData/StepData_GeneralModule.hxx index ab168b730c..44d4812a2e 100644 --- a/src/StepData/StepData_GeneralModule.hxx +++ b/src/StepData/StepData_GeneralModule.hxx @@ -41,10 +41,10 @@ public: //! Specific filling of the list of Entities shared by an Entity //! . Can use the internal utility method Share, below - Standard_EXPORT virtual void FillSharedCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const = 0; + Standard_EXPORT virtual void FillSharedCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, Interface_EntityIterator& iter) const Standard_OVERRIDE = 0; //! Specific Checking of an Entity - Standard_EXPORT virtual void CheckCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const = 0; + Standard_EXPORT virtual void CheckCase (const Standard_Integer casenum, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, Handle(Interface_Check)& ach) const Standard_OVERRIDE = 0; //! Specific Copy ("Deep") from to (same type) //! by using a TransferControl which provides its working Map. @@ -53,7 +53,7 @@ public: //! A Default is provided which does nothing (must current case !) //! Already copied references (by CopyFrom) must remain unchanged //! Use method Search from TransferControl to work - Standard_EXPORT virtual void CopyCase (const Standard_Integer casenum, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const = 0; + Standard_EXPORT virtual void CopyCase (const Standard_Integer casenum, const Handle(Standard_Transient)& entfrom, const Handle(Standard_Transient)& entto, Interface_CopyTool& TC) const Standard_OVERRIDE = 0; diff --git a/src/StepData/StepData_Plex.hxx b/src/StepData/StepData_Plex.hxx index b166258d9a..fa0da4c68a 100644 --- a/src/StepData/StepData_Plex.hxx +++ b/src/StepData/StepData_Plex.hxx @@ -57,26 +57,26 @@ public: Standard_EXPORT Handle(StepData_ECDescr) ECDescr() const; //! Returns False - Standard_EXPORT Standard_Boolean IsComplex() const; + Standard_EXPORT Standard_Boolean IsComplex() const Standard_OVERRIDE; //! Tells if a step type is matched by //! For a Simple Entity : own type or super type //! For a Complex Entity : one of the members - Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const; + Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const Standard_OVERRIDE; //! Returns a Simple Entity which matches with a Type in : //! For a Simple Entity : me if it matches, else a null handle //! For a Complex Entity : the member which matches, else null - Standard_EXPORT Handle(StepData_Simple) As (const Standard_CString steptype) const; + Standard_EXPORT Handle(StepData_Simple) As (const Standard_CString steptype) const Standard_OVERRIDE; //! Tells if a Field brings a given name - Standard_EXPORT Standard_Boolean HasField (const Standard_CString name) const; + Standard_EXPORT Standard_Boolean HasField (const Standard_CString name) const Standard_OVERRIDE; //! Returns a Field from its name; read-only - Standard_EXPORT const StepData_Field& Field (const Standard_CString name) const; + Standard_EXPORT const StepData_Field& Field (const Standard_CString name) const Standard_OVERRIDE; //! Returns a Field from its name; read or write - Standard_EXPORT StepData_Field& CField (const Standard_CString name); + Standard_EXPORT StepData_Field& CField (const Standard_CString name) Standard_OVERRIDE; //! Returns the count of simple members Standard_EXPORT Standard_Integer NbMembers() const; @@ -88,10 +88,10 @@ public: Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) TypeList() const; //! Fills a Check by using its Description - Standard_EXPORT void Check (Handle(Interface_Check)& ach) const; + Standard_EXPORT void Check (Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Fills an EntityIterator with entities shared by - Standard_EXPORT void Shared (Interface_EntityIterator& list) const; + Standard_EXPORT void Shared (Interface_EntityIterator& list) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_Protocol.hxx b/src/StepData/StepData_Protocol.hxx index 8351fc761e..9588d6401e 100644 --- a/src/StepData/StepData_Protocol.hxx +++ b/src/StepData/StepData_Protocol.hxx @@ -55,10 +55,10 @@ public: //! Gives the count of Protocols used as Resource (can be zero) //! Here, No resource - Standard_EXPORT Standard_Integer NbResources() const; + Standard_EXPORT Standard_Integer NbResources() const Standard_OVERRIDE; //! Returns a Resource, given a rank. Here, none - Standard_EXPORT Handle(Interface_Protocol) Resource (const Standard_Integer num) const; + Standard_EXPORT Handle(Interface_Protocol) Resource (const Standard_Integer num) const Standard_OVERRIDE; //! Returns a unique positive number for any recognized entity //! Redefined to work by calling both TypeNumber and, for a @@ -67,7 +67,7 @@ public: //! Returns a Case Number, specific of each recognized Type //! Here, only Unknown Entity is recognized - Standard_EXPORT Standard_Integer TypeNumber (const Handle(Standard_Type)& atype) const; + Standard_EXPORT Standard_Integer TypeNumber (const Handle(Standard_Type)& atype) const Standard_OVERRIDE; //! Returns the Schema Name attached to each class of Protocol //! To be redefined by each sub-class @@ -76,17 +76,17 @@ public: Standard_EXPORT virtual Standard_CString SchemaName() const; //! Creates an empty Model for Step Norm - Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const Standard_OVERRIDE; //! Returns True if is a Model of Step Norm - Standard_EXPORT Standard_Boolean IsSuitableModel (const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_Boolean IsSuitableModel (const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; //! Creates a new Unknown Entity for Step (UndefinedEntity) - Standard_EXPORT Handle(Standard_Transient) UnknownEntity() const; + Standard_EXPORT Handle(Standard_Transient) UnknownEntity() const Standard_OVERRIDE; //! Returns True if is an Unknown Entity for the Norm, i.e. //! Type UndefinedEntity, status Unknown - Standard_EXPORT Standard_Boolean IsUnknownEntity (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Boolean IsUnknownEntity (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Returns a unique positive CaseNumber for types described by //! an EDescr (late binding) diff --git a/src/StepData/StepData_ReadWriteModule.hxx b/src/StepData/StepData_ReadWriteModule.hxx index 2f8c1a13d6..4b69f901d4 100644 --- a/src/StepData/StepData_ReadWriteModule.hxx +++ b/src/StepData/StepData_ReadWriteModule.hxx @@ -56,7 +56,7 @@ public: //! CaseNum (this type) //! Warning : The methods CaseStep, StepType and Recognize, //! must be in phase (triplets CaseNum-StepType-Type of Object) - Standard_EXPORT Standard_Integer CaseNum (const Handle(Interface_FileReaderData)& data, const Standard_Integer num) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Interface_FileReaderData)& data, const Standard_Integer num) const Standard_OVERRIDE; //! Defines Case Numbers corresponding to the recognized Types //! Called by CaseNum (data,num) above for a Simple Type Entity @@ -99,7 +99,7 @@ public: Standard_EXPORT virtual Standard_Boolean ComplexType (const Standard_Integer CN, TColStd_SequenceOfAsciiString& types) const; //! General Read Function, calls ReadStep - Standard_EXPORT void Read (const Standard_Integer CN, const Handle(Interface_FileReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const; + Standard_EXPORT void Read (const Standard_Integer CN, const Handle(Interface_FileReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Specific Read Function. Works with StepReaderData Standard_EXPORT virtual void ReadStep (const Standard_Integer CN, const Handle(StepData_StepReaderData)& data, const Standard_Integer num, Handle(Interface_Check)& ach, const Handle(Standard_Transient)& ent) const = 0; diff --git a/src/StepData/StepData_Simple.hxx b/src/StepData/StepData_Simple.hxx index 8fd3ea53b5..f431a3b41e 100644 --- a/src/StepData/StepData_Simple.hxx +++ b/src/StepData/StepData_Simple.hxx @@ -54,26 +54,26 @@ public: Standard_EXPORT Standard_CString StepType() const; //! Returns False - Standard_EXPORT Standard_Boolean IsComplex() const; + Standard_EXPORT Standard_Boolean IsComplex() const Standard_OVERRIDE; //! Tells if a step type is matched by //! For a Simple Entity : own type or super type //! For a Complex Entity : one of the members - Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const; + Standard_EXPORT Standard_Boolean Matches (const Standard_CString steptype) const Standard_OVERRIDE; //! Returns a Simple Entity which matches with a Type in : //! For a Simple Entity : me if it matches, else a null handle //! For a Complex Entity : the member which matches, else null - Standard_EXPORT Handle(StepData_Simple) As (const Standard_CString steptype) const; + Standard_EXPORT Handle(StepData_Simple) As (const Standard_CString steptype) const Standard_OVERRIDE; //! Tells if a Field brings a given name - Standard_EXPORT Standard_Boolean HasField (const Standard_CString name) const; + Standard_EXPORT Standard_Boolean HasField (const Standard_CString name) const Standard_OVERRIDE; //! Returns a Field from its name; read-only - Standard_EXPORT const StepData_Field& Field (const Standard_CString name) const; + Standard_EXPORT const StepData_Field& Field (const Standard_CString name) const Standard_OVERRIDE; //! Returns a Field from its name; read or write - Standard_EXPORT StepData_Field& CField (const Standard_CString name); + Standard_EXPORT StepData_Field& CField (const Standard_CString name) Standard_OVERRIDE; //! Returns the count of fields Standard_EXPORT Standard_Integer NbFields() const; @@ -91,10 +91,10 @@ public: Standard_EXPORT StepData_FieldListN& CFields(); //! Fills a Check by using its Description - Standard_EXPORT void Check (Handle(Interface_Check)& ach) const; + Standard_EXPORT void Check (Handle(Interface_Check)& ach) const Standard_OVERRIDE; //! Fills an EntityIterator with entities shared by - Standard_EXPORT void Shared (Interface_EntityIterator& list) const; + Standard_EXPORT void Shared (Interface_EntityIterator& list) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_StepModel.hxx b/src/StepData/StepData_StepModel.hxx index 5845d222b9..dfea65d3cb 100644 --- a/src/StepData/StepData_StepModel.hxx +++ b/src/StepData/StepData_StepModel.hxx @@ -55,10 +55,10 @@ public: Standard_EXPORT Handle(Standard_Transient) Entity (const Standard_Integer num) const; //! gets header from another Model (uses Header Protocol) - Standard_EXPORT void GetFromAnother (const Handle(Interface_InterfaceModel)& other); + Standard_EXPORT void GetFromAnother (const Handle(Interface_InterfaceModel)& other) Standard_OVERRIDE; //! Returns a New Empty Model, same type as , i.e. StepModel - Standard_EXPORT Handle(Interface_InterfaceModel) NewEmptyModel() const; + Standard_EXPORT Handle(Interface_InterfaceModel) NewEmptyModel() const Standard_OVERRIDE; //! returns Header entities under the form of an iterator Standard_EXPORT Interface_EntityIterator Header() const; @@ -70,7 +70,7 @@ public: Standard_EXPORT Handle(Standard_Transient) HeaderEntity (const Handle(Standard_Type)& atype) const; //! Clears the Header - Standard_EXPORT void ClearHeader(); + Standard_EXPORT void ClearHeader() Standard_OVERRIDE; //! Adds an Entity to the Header Standard_EXPORT void AddHeaderEntity (const Handle(Standard_Transient)& ent); @@ -83,10 +83,10 @@ public: //! prints its Type. Else sends the Header under the form of //! HEADER Section of an Ascii Step File //! is not used because Header is not so big - Standard_EXPORT void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const; + Standard_EXPORT void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const Standard_OVERRIDE; //! erases specific labels, i.e. clears the map (entity-ident) - Standard_EXPORT void ClearLabels(); + Standard_EXPORT void ClearLabels() Standard_OVERRIDE; //! Attaches an ident to an entity to produce a label //! (does nothing if is not in ) @@ -98,11 +98,11 @@ public: //! Prints label specific to STEP norm for a given entity, i.e. //! if a LabelIdent has been recorded, its value with '#', else //! the number in the model with '#' and between () - Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const; + Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const Standard_OVERRIDE; //! Returns a string with the label attached to a given entity, //! same form as for PrintLabel - Standard_EXPORT Handle(TCollection_HAsciiString) StringLabel (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Handle(TCollection_HAsciiString) StringLabel (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_StepReaderData.hxx b/src/StepData/StepData_StepReaderData.hxx index 07abe3cf64..5fdbca2d95 100644 --- a/src/StepData/StepData_StepReaderData.hxx +++ b/src/StepData/StepData_StepReaderData.hxx @@ -291,7 +291,7 @@ public: //! determines the first suitable record following a given one //! that is, skips SCOPE,ENDSCOPE and SUBLIST records //! Note : skips Header records, which are accessed separately - Standard_EXPORT Standard_Integer FindNextRecord (const Standard_Integer num) const; + Standard_EXPORT Standard_Integer FindNextRecord (const Standard_Integer num) const Standard_OVERRIDE; //! determines reference numbers in EntityNumber fields //! called by Prepare from StepReaderTool to prepare later using diff --git a/src/StepData/StepData_StepReaderTool.hxx b/src/StepData/StepData_StepReaderTool.hxx index 20a9bfc37b..fe22bb8714 100644 --- a/src/StepData/StepData_StepReaderTool.hxx +++ b/src/StepData/StepData_StepReaderTool.hxx @@ -66,7 +66,7 @@ public: //! recognizes records, by asking either ReaderLib (default) or //! FileRecognizer (if defined) to do so. is to call //! RecognizeByLib - Standard_EXPORT Standard_Boolean Recognize (const Standard_Integer num, Handle(Interface_Check)& ach, Handle(Standard_Transient)& ent); + Standard_EXPORT Standard_Boolean Recognize (const Standard_Integer num, Handle(Interface_Check)& ach, Handle(Standard_Transient)& ent) Standard_OVERRIDE; //! bounds empty entities and sub-lists to header records //! works like Prepare + SetEntityNumbers, but for header @@ -78,12 +78,12 @@ public: //! fills model's header; that is, gives to it Header entities //! and commands their loading. Also fills StepModel's Global //! Check from StepReaderData's GlobalCheck - Standard_EXPORT void BeginRead (const Handle(Interface_InterfaceModel)& amodel); + Standard_EXPORT void BeginRead (const Handle(Interface_InterfaceModel)& amodel) Standard_OVERRIDE; //! fills an entity, given record no; works by using a ReaderLib //! to load each entity, which must be a Transient //! Actually, returned value is True if no fail, False else - Standard_EXPORT Standard_Boolean AnalyseRecord (const Standard_Integer num, const Handle(Standard_Transient)& anent, Handle(Interface_Check)& acheck); + Standard_EXPORT Standard_Boolean AnalyseRecord (const Standard_Integer num, const Handle(Standard_Transient)& anent, Handle(Interface_Check)& acheck) Standard_OVERRIDE; //! Ends file reading after reading all the entities //! Here, it binds in the model, Idents to Entities (for checks) diff --git a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx index d2e7e9a197..94a9d21e7c 100644 --- a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx +++ b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx @@ -36,18 +36,18 @@ public: Standard_EXPORT StepDimTol_SimpleDatumReferenceModifierMember(); - inline Standard_Boolean HasName() const + virtual Standard_Boolean HasName() const Standard_OVERRIDE { return Standard_True; } - inline Standard_CString Name() const + virtual Standard_CString Name() const Standard_OVERRIDE { return "SIMPLE_DATUM_REFERENCE_MODIFIER"; } - inline Standard_Boolean SetName(const Standard_CString /*theName*/) + virtual Standard_Boolean SetName(const Standard_CString /*theName*/) Standard_OVERRIDE { return Standard_True; } - Standard_EXPORT virtual Standard_CString EnumText() const; + Standard_EXPORT virtual Standard_CString EnumText() const Standard_OVERRIDE; - Standard_EXPORT virtual void SetEnumText (const Standard_Integer theValue, const Standard_CString theText) ; + Standard_EXPORT virtual void SetEnumText (const Standard_Integer theValue, const Standard_CString theText) Standard_OVERRIDE; Standard_EXPORT void SetValue (const StepDimTol_SimpleDatumReferenceModifier theValue) ; diff --git a/src/StepElement/StepElement_CurveElementFreedom.hxx b/src/StepElement/StepElement_CurveElementFreedom.hxx index e563d3f178..fb0d551f34 100644 --- a/src/StepElement/StepElement_CurveElementFreedom.hxx +++ b/src/StepElement/StepElement_CurveElementFreedom.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of CurveElementFreedom select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member CurveElementFreedomMember //! 1 -> EnumeratedCurveElementFreedom diff --git a/src/StepElement/StepElement_CurveElementPurpose.hxx b/src/StepElement/StepElement_CurveElementPurpose.hxx index fdf81d11c8..5cb83d5b9b 100644 --- a/src/StepElement/StepElement_CurveElementPurpose.hxx +++ b/src/StepElement/StepElement_CurveElementPurpose.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of CurveElementPurpose select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member CurveElementPurposeMember //! 1 -> EnumeratedCurveElementPurpose diff --git a/src/StepElement/StepElement_ElementAspect.hxx b/src/StepElement/StepElement_ElementAspect.hxx index 0336150841..15e553a7cb 100644 --- a/src/StepElement/StepElement_ElementAspect.hxx +++ b/src/StepElement/StepElement_ElementAspect.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of ElementAspect select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member ElementAspectMember //! 1 -> ElementVolume diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx index 7b83710729..2fff0450ca 100644 --- a/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx +++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of MeasureOrUnspecifiedValue select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member MeasureOrUnspecifiedValueMember //! 1 -> ContextDependentMeasure diff --git a/src/StepElement/StepElement_SurfaceElementPurpose.hxx b/src/StepElement/StepElement_SurfaceElementPurpose.hxx index 7a19dbc6f3..6652413ae1 100644 --- a/src/StepElement/StepElement_SurfaceElementPurpose.hxx +++ b/src/StepElement/StepElement_SurfaceElementPurpose.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of SurfaceElementPurpose select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member SurfaceElementPurposeMember //! 1 -> EnumeratedSurfaceElementPurpose diff --git a/src/StepElement/StepElement_VolumeElementPurpose.hxx b/src/StepElement/StepElement_VolumeElementPurpose.hxx index 383d905e46..9d7037e7f9 100644 --- a/src/StepElement/StepElement_VolumeElementPurpose.hxx +++ b/src/StepElement/StepElement_VolumeElementPurpose.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of VolumeElementPurpose select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member VolumeElementPurposeMember //! 1 -> EnumeratedVolumeElementPurpose diff --git a/src/StepFEA/StepFEA_DegreeOfFreedom.hxx b/src/StepFEA/StepFEA_DegreeOfFreedom.hxx index 568d5ea7f9..143b1eb992 100644 --- a/src/StepFEA/StepFEA_DegreeOfFreedom.hxx +++ b/src/StepFEA/StepFEA_DegreeOfFreedom.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of CurveElementFreedom select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member CurveElementFreedomMember //! 1 -> EnumeratedCurveElementFreedom diff --git a/src/StepFEA/StepFEA_SymmetricTensor23d.hxx b/src/StepFEA/StepFEA_SymmetricTensor23d.hxx index 8a83e4ea8e..0eaa8cb97d 100644 --- a/src/StepFEA/StepFEA_SymmetricTensor23d.hxx +++ b/src/StepFEA/StepFEA_SymmetricTensor23d.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a kind of SymmetricTensor23d select type //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member SymmetricTensor23dMember //! 1 -> IsotropicSymmetricTensor23d diff --git a/src/StepFEA/StepFEA_SymmetricTensor43d.hxx b/src/StepFEA/StepFEA_SymmetricTensor43d.hxx index 2f05e24329..3945dcbe32 100644 --- a/src/StepFEA/StepFEA_SymmetricTensor43d.hxx +++ b/src/StepFEA/StepFEA_SymmetricTensor43d.hxx @@ -39,7 +39,7 @@ public: Standard_EXPORT StepFEA_SymmetricTensor43d(); //! return 0 - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Recognizes a items of select member CurveElementFreedomMember //! 1 -> AnisotropicSymmetricTensor43d diff --git a/src/StepGeom/StepGeom_TrimmingSelect.hxx b/src/StepGeom/StepGeom_TrimmingSelect.hxx index f5ea9d31c7..ed2724c2ca 100644 --- a/src/StepGeom/StepGeom_TrimmingSelect.hxx +++ b/src/StepGeom/StepGeom_TrimmingSelect.hxx @@ -43,7 +43,7 @@ public: //! Recognizes a TrimmingSelect Kind Entity that is : //! 1 -> CartesianPoint //! 0 else (i.e. Real) - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Returns a TrimmingMember (for PARAMETER_VALUE) as preferred Standard_EXPORT virtual Handle(StepData_SelectMember) NewMember() const Standard_OVERRIDE; diff --git a/src/StepSelect/StepSelect_Activator.hxx b/src/StepSelect/StepSelect_Activator.hxx index f7e82c595e..11c0a11e94 100644 --- a/src/StepSelect/StepSelect_Activator.hxx +++ b/src/StepSelect/StepSelect_Activator.hxx @@ -41,10 +41,10 @@ public: Standard_EXPORT StepSelect_Activator(); //! Executes a Command Line for StepSelect - Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot); + Standard_EXPORT IFSelect_ReturnStatus Do (const Standard_Integer number, const Handle(IFSelect_SessionPilot)& pilot) Standard_OVERRIDE; //! Sends a short help message for StepSelect commands - Standard_EXPORT Standard_CString Help (const Standard_Integer number) const; + Standard_EXPORT Standard_CString Help (const Standard_Integer number) const Standard_OVERRIDE; diff --git a/src/StepSelect/StepSelect_FloatFormat.hxx b/src/StepSelect/StepSelect_FloatFormat.hxx index bc06c4169c..6a83f1d0cd 100644 --- a/src/StepSelect/StepSelect_FloatFormat.hxx +++ b/src/StepSelect/StepSelect_FloatFormat.hxx @@ -84,11 +84,11 @@ public: //! Sets the Floatting Formats of StepWriter to the recorded //! parameters - Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, StepData_StepWriter& writer) const; + Standard_EXPORT void Perform (IFSelect_ContextWrite& ctx, StepData_StepWriter& writer) const Standard_OVERRIDE; //! Returns specific Label : for instance, //! "Float Format [ZeroSuppress] %E [, in range R1-R2 %f]" - Standard_EXPORT TCollection_AsciiString Label() const; + Standard_EXPORT TCollection_AsciiString Label() const Standard_OVERRIDE; diff --git a/src/StepSelect/StepSelect_ModelModifier.hxx b/src/StepSelect/StepSelect_ModelModifier.hxx index 302260f10a..13e3d8f9fb 100644 --- a/src/StepSelect/StepSelect_ModelModifier.hxx +++ b/src/StepSelect/StepSelect_ModelModifier.hxx @@ -43,7 +43,7 @@ public: //! The inherited Perform does the required cast (and refuses to //! go further if cast has failed) then calls the instantiated //! Performing - Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const; + Standard_EXPORT void Perform (IFSelect_ContextModif& ctx, const Handle(Interface_InterfaceModel)& target, const Handle(Interface_Protocol)& protocol, Interface_CopyTool& TC) const Standard_OVERRIDE; //! Specific Perform with Protocol. It is defined to let the //! Protocol unused and to call Performing without Protocol diff --git a/src/StepSelect/StepSelect_StepType.hxx b/src/StepSelect/StepSelect_StepType.hxx index 4f223c029f..65858d9ecf 100644 --- a/src/StepSelect/StepSelect_StepType.hxx +++ b/src/StepSelect/StepSelect_StepType.hxx @@ -59,7 +59,7 @@ public: //! Returns the Step Type defined from the Protocol (see above). //! If is not recognised, produces "..NOT FROM SCHEMA .." - Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const; + Standard_EXPORT Standard_CString Value (const Handle(Standard_Transient)& ent, const Handle(Interface_InterfaceModel)& model) const Standard_OVERRIDE; diff --git a/src/StepSelect/StepSelect_WorkLibrary.hxx b/src/StepSelect/StepSelect_WorkLibrary.hxx index ec81a1150c..43468da833 100644 --- a/src/StepSelect/StepSelect_WorkLibrary.hxx +++ b/src/StepSelect/StepSelect_WorkLibrary.hxx @@ -57,12 +57,12 @@ public: //! Reads a STEP File and returns a STEP Model (into ), //! or lets "Null" in case of Error //! Returns 0 if OK, 1 if Read Error, -1 if File not opened - Standard_EXPORT Standard_Integer ReadFile (const Standard_CString name, Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol) const; + Standard_EXPORT Standard_Integer ReadFile (const Standard_CString name, Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol) const Standard_OVERRIDE; //! Writes a File from a STEP Model //! Returns False (and writes no file) if does not bring a //! STEP Model - Standard_EXPORT Standard_Boolean WriteFile (IFSelect_ContextWrite& ctx) const; + Standard_EXPORT Standard_Boolean WriteFile (IFSelect_ContextWrite& ctx) const Standard_OVERRIDE; //! Performs the copy of entities from an original model to a new //! one. Works according : @@ -75,7 +75,7 @@ public: //! Level 0 just displays type; level 1 displays the entity itself //! and level 2 displays the entity plus its shared ones (one //! sub-level : immediately shared entities) - Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S, const Standard_Integer level) const; + Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S, const Standard_Integer level) const Standard_OVERRIDE; diff --git a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx index 4be244868a..77ab6dab29 100644 --- a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx +++ b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx @@ -37,7 +37,7 @@ public: Standard_EXPORT StepShape_ShapeDimensionRepresentation(); //! Initialize all fields AP214 - Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(StepRepr_HArray1OfRepresentationItem)& theItems, const Handle(StepRepr_RepresentationContext)& theContextOfItems); + Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(StepRepr_HArray1OfRepresentationItem)& theItems, const Handle(StepRepr_RepresentationContext)& theContextOfItems) Standard_OVERRIDE; //! Initialize all fields AP242 Standard_EXPORT void Init (const Handle(TCollection_HAsciiString)& theName, const Handle(StepShape_HArray1OfShapeDimensionRepresentationItem)& theItems, const Handle(StepRepr_RepresentationContext)& theContextOfItems); diff --git a/src/StepVisual/StepVisual_MarkerSelect.hxx b/src/StepVisual/StepVisual_MarkerSelect.hxx index 7d72451e02..233ccfaabb 100644 --- a/src/StepVisual/StepVisual_MarkerSelect.hxx +++ b/src/StepVisual/StepVisual_MarkerSelect.hxx @@ -41,7 +41,7 @@ public: //! Recognizes a MarkerSelect Kind Entity that is : //! 0 else - Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const; + Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent) const Standard_OVERRIDE; //! Returns a new MarkerMember Standard_EXPORT virtual Handle(StepData_SelectMember) NewMember() const Standard_OVERRIDE; diff --git a/src/Storage/Storage_DefaultCallBack.hxx b/src/Storage/Storage_DefaultCallBack.hxx index 7abfcf09fd..99a8e9b1ed 100644 --- a/src/Storage/Storage_DefaultCallBack.hxx +++ b/src/Storage/Storage_DefaultCallBack.hxx @@ -38,13 +38,13 @@ public: Standard_EXPORT Storage_DefaultCallBack(); - Standard_EXPORT Handle(Standard_Persistent) New() const; + Standard_EXPORT Handle(Standard_Persistent) New() const Standard_OVERRIDE; - Standard_EXPORT void Add (const Handle(Standard_Persistent)& aPers, const Handle(Storage_Schema)& aSchema) const; + Standard_EXPORT void Add (const Handle(Standard_Persistent)& aPers, const Handle(Storage_Schema)& aSchema) const Standard_OVERRIDE; - Standard_EXPORT void Write (const Handle(Standard_Persistent)& aPers, Storage_BaseDriver& aDriver, const Handle(Storage_Schema)& aSchema) const; + Standard_EXPORT void Write (const Handle(Standard_Persistent)& aPers, Storage_BaseDriver& aDriver, const Handle(Storage_Schema)& aSchema) const Standard_OVERRIDE; - Standard_EXPORT void Read (const Handle(Standard_Persistent)& aPers, Storage_BaseDriver& aDriver, const Handle(Storage_Schema)& aSchema) const; + Standard_EXPORT void Read (const Handle(Standard_Persistent)& aPers, Storage_BaseDriver& aDriver, const Handle(Storage_Schema)& aSchema) const Standard_OVERRIDE; diff --git a/src/TDF/TDF_Reference.hxx b/src/TDF/TDF_Reference.hxx index 38dcea42ae..2504d8d3bb 100644 --- a/src/TDF/TDF_Reference.hxx +++ b/src/TDF/TDF_Reference.hxx @@ -48,13 +48,13 @@ public: Standard_EXPORT TDF_Label Get() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDF/TDF_TagSource.hxx b/src/TDF/TDF_TagSource.hxx index e7417ccb45..63168f5dae 100644 --- a/src/TDF/TDF_TagSource.hxx +++ b/src/TDF/TDF_TagSource.hxx @@ -65,13 +65,13 @@ public: //! ===================== Standard_EXPORT void Set (const Standard_Integer T); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_AsciiString.hxx b/src/TDataStd/TDataStd_AsciiString.hxx index 6daa168767..aaeaf2a910 100644 --- a/src/TDataStd/TDataStd_AsciiString.hxx +++ b/src/TDataStd/TDataStd_AsciiString.hxx @@ -59,13 +59,13 @@ public: Standard_EXPORT Standard_Boolean IsEmpty() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_BooleanArray.hxx b/src/TDataStd/TDataStd_BooleanArray.hxx index 91f06902bc..ba835ffd2b 100644 --- a/src/TDataStd/TDataStd_BooleanArray.hxx +++ b/src/TDataStd/TDataStd_BooleanArray.hxx @@ -77,13 +77,13 @@ Standard_Boolean operator () (const Standard_Integer Index) const Standard_EXPORT TDataStd_BooleanArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_BooleanList.hxx b/src/TDataStd/TDataStd_BooleanList.hxx index 71e7fb38eb..3814406f4b 100644 --- a/src/TDataStd/TDataStd_BooleanList.hxx +++ b/src/TDataStd/TDataStd_BooleanList.hxx @@ -68,13 +68,13 @@ public: //! 0 - means FALSE. Standard_EXPORT const TDataStd_ListOfByte& List() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ByteArray.hxx b/src/TDataStd/TDataStd_ByteArray.hxx index 6c2d3c3b59..d18bf31506 100644 --- a/src/TDataStd/TDataStd_ByteArray.hxx +++ b/src/TDataStd/TDataStd_ByteArray.hxx @@ -95,13 +95,13 @@ Standard_Byte operator () (const Standard_Integer Index) const Standard_EXPORT TDataStd_ByteArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& OS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Comment.hxx b/src/TDataStd/TDataStd_Comment.hxx index 0319f3fdd3..204681994a 100644 --- a/src/TDataStd/TDataStd_Comment.hxx +++ b/src/TDataStd/TDataStd_Comment.hxx @@ -65,13 +65,13 @@ public: //! Returns the comment attribute. Standard_EXPORT const TCollection_ExtendedString& Get() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Current.hxx b/src/TDataStd/TDataStd_Current.hxx index 2b70c9534c..54620ae0c8 100644 --- a/src/TDataStd/TDataStd_Current.hxx +++ b/src/TDataStd/TDataStd_Current.hxx @@ -63,13 +63,13 @@ public: Standard_EXPORT TDF_Label GetLabel() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Directory.hxx b/src/TDataStd/TDataStd_Directory.hxx index 6f4fb67cf3..e43d13b451 100644 --- a/src/TDataStd/TDataStd_Directory.hxx +++ b/src/TDataStd/TDataStd_Directory.hxx @@ -69,13 +69,13 @@ public: Standard_EXPORT TDataStd_Directory(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Expression.hxx b/src/TDataStd/TDataStd_Expression.hxx index 4882e1c0d5..fef2f4c406 100644 --- a/src/TDataStd/TDataStd_Expression.hxx +++ b/src/TDataStd/TDataStd_Expression.hxx @@ -68,13 +68,13 @@ public: Standard_EXPORT TDF_AttributeList& GetVariables(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ExtStringArray.hxx b/src/TDataStd/TDataStd_ExtStringArray.hxx index a005e46249..af69b51d69 100644 --- a/src/TDataStd/TDataStd_ExtStringArray.hxx +++ b/src/TDataStd/TDataStd_ExtStringArray.hxx @@ -98,13 +98,13 @@ const TCollection_ExtendedString& operator () (const Standard_Integer Index) con Standard_EXPORT TDataStd_ExtStringArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ExtStringList.hxx b/src/TDataStd/TDataStd_ExtStringList.hxx index 1cc4659dae..5f1ed236f3 100644 --- a/src/TDataStd/TDataStd_ExtStringList.hxx +++ b/src/TDataStd/TDataStd_ExtStringList.hxx @@ -76,13 +76,13 @@ public: Standard_EXPORT const TDataStd_ListOfExtendedString& List() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_IntPackedMap.hxx b/src/TDataStd/TDataStd_IntPackedMap.hxx index 743f1e26ec..3b8dff5dc8 100644 --- a/src/TDataStd/TDataStd_IntPackedMap.hxx +++ b/src/TDataStd/TDataStd_IntPackedMap.hxx @@ -82,13 +82,13 @@ public: //! for internal use only! void SetDelta (const Standard_Boolean isDelta); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Integer.hxx b/src/TDataStd/TDataStd_Integer.hxx index b63dc0027c..5da5ff030a 100644 --- a/src/TDataStd/TDataStd_Integer.hxx +++ b/src/TDataStd/TDataStd_Integer.hxx @@ -59,13 +59,13 @@ public: //! Returns True if there is a reference on the same label Standard_EXPORT Standard_Boolean IsCaptured() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_IntegerArray.hxx b/src/TDataStd/TDataStd_IntegerArray.hxx index cf69756818..a6fa2339b6 100644 --- a/src/TDataStd/TDataStd_IntegerArray.hxx +++ b/src/TDataStd/TDataStd_IntegerArray.hxx @@ -98,14 +98,14 @@ Standard_Integer operator () (const Standard_Integer Index) const Standard_EXPORT TDataStd_IntegerArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Note. Uses inside ChangeArray() method - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_IntegerList.hxx b/src/TDataStd/TDataStd_IntegerList.hxx index 85f42e4896..f1b313c215 100644 --- a/src/TDataStd/TDataStd_IntegerList.hxx +++ b/src/TDataStd/TDataStd_IntegerList.hxx @@ -75,13 +75,13 @@ public: Standard_EXPORT const TColStd_ListOfInteger& List() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Name.hxx b/src/TDataStd/TDataStd_Name.hxx index acd780ed11..bafa2ceeea 100644 --- a/src/TDataStd/TDataStd_Name.hxx +++ b/src/TDataStd/TDataStd_Name.hxx @@ -79,13 +79,13 @@ public: //! Returns the name contained in this name attribute. Standard_EXPORT const TCollection_ExtendedString& Get() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_NamedData.hxx b/src/TDataStd/TDataStd_NamedData.hxx index 5f75b3a56f..0c6e8e5304 100644 --- a/src/TDataStd/TDataStd_NamedData.hxx +++ b/src/TDataStd/TDataStd_NamedData.hxx @@ -195,13 +195,13 @@ public: //! Replace the container content by new content of the . Standard_EXPORT void ChangeArraysOfReals (const TDataStd_DataMapOfStringHArray1OfReal& theArraysOfReals); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_NoteBook.hxx b/src/TDataStd/TDataStd_NoteBook.hxx index 3a3ccf896c..b4862bd769 100644 --- a/src/TDataStd/TDataStd_NoteBook.hxx +++ b/src/TDataStd/TDataStd_NoteBook.hxx @@ -70,13 +70,13 @@ public: //! is returned. Standard_EXPORT Handle(TDataStd_Integer) Append (const Standard_Integer value, const Standard_Boolean isExported = Standard_False); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Real.hxx b/src/TDataStd/TDataStd_Real.hxx index fb4876d36f..4bf0b4615b 100644 --- a/src/TDataStd/TDataStd_Real.hxx +++ b/src/TDataStd/TDataStd_Real.hxx @@ -70,13 +70,13 @@ public: //! Returns True if there is a reference on the same label Standard_EXPORT Standard_Boolean IsCaptured() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_RealArray.hxx b/src/TDataStd/TDataStd_RealArray.hxx index b4525ffa92..1fc619f7bf 100644 --- a/src/TDataStd/TDataStd_RealArray.hxx +++ b/src/TDataStd/TDataStd_RealArray.hxx @@ -99,14 +99,14 @@ Standard_Real operator () (const Standard_Integer Index) const Standard_EXPORT TDataStd_RealArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Note. Uses inside ChangeArray() method - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_RealList.hxx b/src/TDataStd/TDataStd_RealList.hxx index 8e68d648b2..d4d7024fcd 100644 --- a/src/TDataStd/TDataStd_RealList.hxx +++ b/src/TDataStd/TDataStd_RealList.hxx @@ -76,13 +76,13 @@ public: Standard_EXPORT const TColStd_ListOfReal& List() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ReferenceArray.hxx b/src/TDataStd/TDataStd_ReferenceArray.hxx index 935b610e6c..e078735a46 100644 --- a/src/TDataStd/TDataStd_ReferenceArray.hxx +++ b/src/TDataStd/TDataStd_ReferenceArray.hxx @@ -79,13 +79,13 @@ TDF_Label operator () (const Standard_Integer Index) const Standard_EXPORT TDataStd_ReferenceArray(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_ReferenceList.hxx b/src/TDataStd/TDataStd_ReferenceList.hxx index 55ec47d9aa..bf09726b31 100644 --- a/src/TDataStd/TDataStd_ReferenceList.hxx +++ b/src/TDataStd/TDataStd_ReferenceList.hxx @@ -76,13 +76,13 @@ public: Standard_EXPORT const TDF_LabelList& List() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Relation.hxx b/src/TDataStd/TDataStd_Relation.hxx index 31693070a6..56a46533f5 100644 --- a/src/TDataStd/TDataStd_Relation.hxx +++ b/src/TDataStd/TDataStd_Relation.hxx @@ -68,13 +68,13 @@ public: Standard_EXPORT TDF_AttributeList& GetVariables(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Tick.hxx b/src/TDataStd/TDataStd_Tick.hxx index 4ea35be3dd..d837084244 100644 --- a/src/TDataStd/TDataStd_Tick.hxx +++ b/src/TDataStd/TDataStd_Tick.hxx @@ -50,13 +50,13 @@ public: Standard_EXPORT TDataStd_Tick(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_TreeNode.hxx b/src/TDataStd/TDataStd_TreeNode.hxx index f9459a4fa8..54ee708b6e 100644 --- a/src/TDataStd/TDataStd_TreeNode.hxx +++ b/src/TDataStd/TDataStd_TreeNode.hxx @@ -202,11 +202,11 @@ public: //! Returns the tree ID (default or explicit one depending //! onthe Set method used). - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_UAttribute.hxx b/src/TDataStd/TDataStd_UAttribute.hxx index 198c79c6c7..6f9eb655d9 100644 --- a/src/TDataStd/TDataStd_UAttribute.hxx +++ b/src/TDataStd/TDataStd_UAttribute.hxx @@ -52,13 +52,13 @@ public: Standard_EXPORT void SetID (const Standard_GUID& LocalID); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDataStd/TDataStd_Variable.hxx b/src/TDataStd/TDataStd_Variable.hxx index 23cb76e2ee..c92ee51fc2 100644 --- a/src/TDataStd/TDataStd_Variable.hxx +++ b/src/TDataStd/TDataStd_Variable.hxx @@ -124,13 +124,13 @@ public: //! modified by the solver. Standard_EXPORT void Constant (const Standard_Boolean status); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; //! to export reference to the associated Name attribute. Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Axis.hxx b/src/TDataXtd/TDataXtd_Axis.hxx index 7e4d5fd615..a3458ceb72 100644 --- a/src/TDataXtd/TDataXtd_Axis.hxx +++ b/src/TDataXtd/TDataXtd_Axis.hxx @@ -62,13 +62,13 @@ public: Standard_EXPORT TDataXtd_Axis(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Constraint.hxx b/src/TDataXtd/TDataXtd_Constraint.hxx index 1f23d66974..35d75683de 100644 --- a/src/TDataXtd/TDataXtd_Constraint.hxx +++ b/src/TDataXtd/TDataXtd_Constraint.hxx @@ -180,13 +180,13 @@ public: //! collects constraints on Childs for label Standard_EXPORT static void CollectChildConstraints (const TDF_Label& aLabel, TDF_LabelList& TheList); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Geometry.hxx b/src/TDataXtd/TDataXtd_Geometry.hxx index 0ff95c31f1..5bfaeba100 100644 --- a/src/TDataXtd/TDataXtd_Geometry.hxx +++ b/src/TDataXtd/TDataXtd_Geometry.hxx @@ -145,13 +145,13 @@ public: //! Returns the type of geometric construction. Standard_EXPORT TDataXtd_GeometryEnum GetType() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_PatternStd.hxx b/src/TDataXtd/TDataXtd_PatternStd.hxx index ca8f0557eb..08f1e4a711 100644 --- a/src/TDataXtd/TDataXtd_PatternStd.hxx +++ b/src/TDataXtd/TDataXtd_PatternStd.hxx @@ -93,17 +93,17 @@ public: Handle(TNaming_NamedShape) Mirror() const; - Standard_EXPORT Standard_Integer NbTrsfs() const; + Standard_EXPORT Standard_Integer NbTrsfs() const Standard_OVERRIDE; - Standard_EXPORT void ComputeTrsfs (TDataXtd_Array1OfTrsf& Trsfs) const; + Standard_EXPORT void ComputeTrsfs (TDataXtd_Array1OfTrsf& Trsfs) const Standard_OVERRIDE; - Standard_EXPORT const Standard_GUID& PatternID() const; + Standard_EXPORT const Standard_GUID& PatternID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& aDataSet) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Placement.hxx b/src/TDataXtd/TDataXtd_Placement.hxx index c13bdb448e..8eb08f3dd1 100644 --- a/src/TDataXtd/TDataXtd_Placement.hxx +++ b/src/TDataXtd/TDataXtd_Placement.hxx @@ -49,13 +49,13 @@ public: Standard_EXPORT TDataXtd_Placement(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Plane.hxx b/src/TDataXtd/TDataXtd_Plane.hxx index 567caef307..e23a1366de 100644 --- a/src/TDataXtd/TDataXtd_Plane.hxx +++ b/src/TDataXtd/TDataXtd_Plane.hxx @@ -61,13 +61,13 @@ public: Standard_EXPORT TDataXtd_Plane(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Point.hxx b/src/TDataXtd/TDataXtd_Point.hxx index ef9b1c3221..47b5e2a35e 100644 --- a/src/TDataXtd/TDataXtd_Point.hxx +++ b/src/TDataXtd/TDataXtd_Point.hxx @@ -64,13 +64,13 @@ public: Standard_EXPORT TDataXtd_Point(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDataXtd/TDataXtd_Shape.hxx b/src/TDataXtd/TDataXtd_Shape.hxx index a84dac56a2..712119d077 100644 --- a/src/TDataXtd/TDataXtd_Shape.hxx +++ b/src/TDataXtd/TDataXtd_Shape.hxx @@ -66,13 +66,13 @@ public: Standard_EXPORT TDataXtd_Shape(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& DS) const Standard_OVERRIDE; diff --git a/src/TDocStd/TDocStd_Document.hxx b/src/TDocStd/TDocStd_Document.hxx index b43f0c58bb..146ab293a4 100644 --- a/src/TDocStd/TDocStd_Document.hxx +++ b/src/TDocStd/TDocStd_Document.hxx @@ -219,7 +219,7 @@ public: //! ================ Standard_EXPORT virtual void Update (const Handle(CDM_Document)& aToDocument, const Standard_Integer aReferenceIdentifier, const Standard_Address aModifContext) Standard_OVERRIDE; - Standard_EXPORT virtual TCollection_ExtendedString StorageFormat() const; + Standard_EXPORT virtual TCollection_ExtendedString StorageFormat() const Standard_OVERRIDE; //! methods for the nested transaction mode Standard_EXPORT virtual void ChangeStorageFormat (const TCollection_ExtendedString& newStorageFormat); diff --git a/src/TDocStd/TDocStd_Modified.hxx b/src/TDocStd/TDocStd_Modified.hxx index 2de9a3e66d..18da571ef0 100644 --- a/src/TDocStd/TDocStd_Modified.hxx +++ b/src/TDocStd/TDocStd_Modified.hxx @@ -76,13 +76,13 @@ public: //! returns modified label map Standard_EXPORT const TDF_LabelMap& Get() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TDocStd/TDocStd_Owner.hxx b/src/TDocStd/TDocStd_Owner.hxx index ed86ed3bda..f5924cfb9b 100644 --- a/src/TDocStd/TDocStd_Owner.hxx +++ b/src/TDocStd/TDocStd_Owner.hxx @@ -58,13 +58,13 @@ public: Standard_EXPORT Handle(TDocStd_Document) GetDocument() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Standard_OStream& Dump (Standard_OStream& anOS) const Standard_OVERRIDE; diff --git a/src/TFunction/TFunction_Function.hxx b/src/TFunction/TFunction_Function.hxx index 79d4adff69..1248dabda4 100644 --- a/src/TFunction/TFunction_Function.hxx +++ b/src/TFunction/TFunction_Function.hxx @@ -84,11 +84,11 @@ public: //! =================================== Standard_Integer GetFailure() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/TFunction/TFunction_GraphNode.hxx b/src/TFunction/TFunction_GraphNode.hxx index 78a88e4f78..a270c544a3 100644 --- a/src/TFunction/TFunction_GraphNode.hxx +++ b/src/TFunction/TFunction_GraphNode.hxx @@ -100,11 +100,11 @@ public: //! =================================== Standard_EXPORT void SetStatus (const TFunction_ExecutionStatus status); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/TFunction/TFunction_Scope.hxx b/src/TFunction/TFunction_Scope.hxx index 4a25f28c1e..73bbb86180 100644 --- a/src/TFunction/TFunction_Scope.hxx +++ b/src/TFunction/TFunction_Scope.hxx @@ -85,11 +85,11 @@ public: //! =================================== Standard_EXPORT TFunction_Logbook& GetLogbook(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/TNaming/TNaming_Naming.hxx b/src/TNaming/TNaming_Naming.hxx index e0fcc5ae37..1fdbc4474a 100644 --- a/src/TNaming/TNaming_Naming.hxx +++ b/src/TNaming/TNaming_Naming.hxx @@ -90,11 +90,11 @@ public: //! =================================== Standard_EXPORT virtual const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& With) Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual void References (const Handle(TDF_DataSet)& aDataSet) const Standard_OVERRIDE; diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx index 4d11a55eb2..27574291ec 100644 --- a/src/TObj/TObj_Application.hxx +++ b/src/TObj/TObj_Application.hxx @@ -87,13 +87,13 @@ public: */ //! Return name of resource (i.e. "TObj") - virtual Standard_EXPORT Standard_CString ResourcesName(); + virtual Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE; //! Return format (i.e "TObj") - virtual Standard_EXPORT void Formats(TColStd_SequenceOfExtendedString& theFormats); + virtual Standard_EXPORT void Formats(TColStd_SequenceOfExtendedString& theFormats) Standard_OVERRIDE; //! Defines message driver for CDM layer - virtual Standard_EXPORT Handle(CDM_MessageDriver) MessageDriver() + virtual Standard_EXPORT Handle(CDM_MessageDriver) MessageDriver() Standard_OVERRIDE { return myMessageDriver; } protected: diff --git a/src/TObj/TObj_HiddenPartition.hxx b/src/TObj/TObj_HiddenPartition.hxx index 346bc34ad0..e496f71c82 100644 --- a/src/TObj/TObj_HiddenPartition.hxx +++ b/src/TObj/TObj_HiddenPartition.hxx @@ -31,7 +31,7 @@ class TObj_HiddenPartition : public TObj_Partition Standard_EXPORT TObj_HiddenPartition (const TDF_Label& theLabel); //! Returns all flags of father except Visible - virtual Standard_EXPORT Standard_Integer GetTypeFlags() const; + virtual Standard_EXPORT Standard_Integer GetTypeFlags() const Standard_OVERRIDE; protected: //! Persistence of TObj object diff --git a/src/TObj/TObj_LabelIterator.hxx b/src/TObj/TObj_LabelIterator.hxx index 8e453f2726..42719d70fe 100644 --- a/src/TObj/TObj_LabelIterator.hxx +++ b/src/TObj/TObj_LabelIterator.hxx @@ -56,14 +56,14 @@ class TObj_LabelIterator : public TObj_ObjectIterator */ //! Returns True if there is a current Item in the iteration. - virtual Standard_EXPORT Standard_Boolean More () const + virtual Standard_EXPORT Standard_Boolean More () const Standard_OVERRIDE { return !myNode.IsNull(); } //! Move to the next Item - virtual Standard_EXPORT void Next (); + virtual Standard_EXPORT void Next () Standard_OVERRIDE; //! Returns the current item - virtual Standard_EXPORT Handle(TObj_Object) Value () const + virtual Standard_EXPORT Handle(TObj_Object) Value () const Standard_OVERRIDE { return myObject; } //! Returns the label of the current item diff --git a/src/TObj/TObj_ModelIterator.hxx b/src/TObj/TObj_ModelIterator.hxx index 577021fb4f..4ba1ae670c 100644 --- a/src/TObj/TObj_ModelIterator.hxx +++ b/src/TObj/TObj_ModelIterator.hxx @@ -43,13 +43,13 @@ class TObj_ModelIterator : public TObj_ObjectIterator //! Returns True if iteration is not finished and method Value() //! will give the object - virtual Standard_EXPORT Standard_Boolean More() const; + virtual Standard_EXPORT Standard_Boolean More() const Standard_OVERRIDE; //! Iterates to the next object - virtual Standard_EXPORT void Next (); + virtual Standard_EXPORT void Next () Standard_OVERRIDE; //! Returns current object (or MainObj of Model if iteration has finished) - virtual Standard_EXPORT Handle(TObj_Object) Value () const; + virtual Standard_EXPORT Handle(TObj_Object) Value () const Standard_OVERRIDE; protected: /** diff --git a/src/TObj/TObj_OcafObjectIterator.hxx b/src/TObj/TObj_OcafObjectIterator.hxx index cf4174849a..416a2b95ae 100644 --- a/src/TObj/TObj_OcafObjectIterator.hxx +++ b/src/TObj/TObj_OcafObjectIterator.hxx @@ -45,7 +45,7 @@ class TObj_OcafObjectIterator : public TObj_LabelIterator */ //! Shift iterator to the next object - virtual Standard_EXPORT void MakeStep(); + virtual Standard_EXPORT void MakeStep() Standard_OVERRIDE; protected: /** diff --git a/src/TObj/TObj_Partition.hxx b/src/TObj/TObj_Partition.hxx index 6358bef01f..bd9e47c95c 100644 --- a/src/TObj/TObj_Partition.hxx +++ b/src/TObj/TObj_Partition.hxx @@ -62,7 +62,7 @@ class TObj_Partition : public TObj_Object //! Sets name of the object. partition does not check unique of own name virtual Standard_EXPORT Standard_Boolean SetName - (const Handle(TCollection_HExtendedString)& theName) const; + (const Handle(TCollection_HExtendedString)& theName) const Standard_OVERRIDE; public: /** @@ -71,7 +71,7 @@ class TObj_Partition : public TObj_Object //! Preforms updating the links and dependances of the object which are not //! stored in persistence. Does not register the partition name - virtual Standard_EXPORT void AfterRetrieval(); + virtual Standard_EXPORT void AfterRetrieval() Standard_OVERRIDE; public: /** @@ -128,7 +128,7 @@ class TObj_Partition : public TObj_Object //! Coping the data of me to Target object. //! return Standard_False is Target object is different type Standard_EXPORT virtual Standard_Boolean copyData - (const Handle(TObj_Object)& theTargetObject); + (const Handle(TObj_Object)& theTargetObject) Standard_OVERRIDE; private: /** diff --git a/src/TObj/TObj_ReferenceIterator.hxx b/src/TObj/TObj_ReferenceIterator.hxx index 95e3c6659c..d06389ede5 100644 --- a/src/TObj/TObj_ReferenceIterator.hxx +++ b/src/TObj/TObj_ReferenceIterator.hxx @@ -45,7 +45,7 @@ class TObj_ReferenceIterator : public TObj_LabelIterator */ //! Shift iterator to the next object - virtual Standard_EXPORT void MakeStep(); + virtual Standard_EXPORT void MakeStep() Standard_OVERRIDE; Handle(Standard_Type) myType; //!< Type of objects to iterate on diff --git a/src/TObj/TObj_SequenceIterator.hxx b/src/TObj/TObj_SequenceIterator.hxx index a3e3d8c1b9..0754a02816 100644 --- a/src/TObj/TObj_SequenceIterator.hxx +++ b/src/TObj/TObj_SequenceIterator.hxx @@ -52,13 +52,13 @@ class TObj_SequenceIterator : public TObj_ObjectIterator */ //! Returns True if there is a current Item in the iteration. - virtual Standard_EXPORT Standard_Boolean More () const; + virtual Standard_EXPORT Standard_Boolean More () const Standard_OVERRIDE; //! Move to the next Item - virtual Standard_EXPORT void Next (); + virtual Standard_EXPORT void Next () Standard_OVERRIDE; //! Returns the current item - virtual Standard_EXPORT Handle(TObj_Object) Value () const; + virtual Standard_EXPORT Handle(TObj_Object) Value () const Standard_OVERRIDE; protected: /** diff --git a/src/TObj/TObj_TIntSparseArray.hxx b/src/TObj/TObj_TIntSparseArray.hxx index 212b309ad5..9406611bd5 100644 --- a/src/TObj/TObj_TIntSparseArray.hxx +++ b/src/TObj/TObj_TIntSparseArray.hxx @@ -46,7 +46,7 @@ class TObj_TIntSparseArray : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of this attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; //! Creates TObj_TIntSparseArray attribute on given label. static Standard_EXPORT Handle(TObj_TIntSparseArray) Set @@ -90,31 +90,31 @@ class TObj_TIntSparseArray : public TDF_Attribute //! Returns an new empty TObj_TIntSparseArray attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Moves this delta into a new other attribute. - Standard_EXPORT Handle(TDF_Attribute) BackupCopy() const; + Standard_EXPORT Handle(TDF_Attribute) BackupCopy() const Standard_OVERRIDE; //! Restores the set using info saved in backup attribute theDelta. - Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theDelta); + Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theDelta) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; //! It is called just before Commit or Abort transaction //! and does Backup() to create a delta - Standard_EXPORT void BeforeCommitTransaction(); + Standard_EXPORT void BeforeCommitTransaction() Standard_OVERRIDE; //! Applies theDelta to this. Standard_EXPORT void DeltaOnModification - (const Handle(TDF_DeltaOnModification)& theDelta); + (const Handle(TDF_DeltaOnModification)& theDelta) Standard_OVERRIDE; //! Clears my modification delta; called after application of theDelta Standard_EXPORT Standard_Boolean AfterUndo (const Handle(TDF_AttributeDelta)& theDelta, - const Standard_Boolean toForce); + const Standard_Boolean toForce) Standard_OVERRIDE; public: //! Methods to handle the modification delta diff --git a/src/TObj/TObj_TModel.hxx b/src/TObj/TObj_TModel.hxx index c4b921afd6..5ba1152a8e 100644 --- a/src/TObj/TObj_TModel.hxx +++ b/src/TObj/TObj_TModel.hxx @@ -43,7 +43,7 @@ class TObj_TModel : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of TObj_TModel attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; public: //! Methods for setting and obtaining the Model object @@ -59,16 +59,16 @@ class TObj_TModel : public TDF_Attribute //! Returns an new empty TObj_TModel attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Restores the backuped contents from into this one. It is used //! when aborting a transaction. - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& theWith); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& theWith) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste (const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; private: //! Fields diff --git a/src/TObj/TObj_TNameContainer.hxx b/src/TObj/TObj_TNameContainer.hxx index 7078ce41de..039d7842c5 100644 --- a/src/TObj/TObj_TNameContainer.hxx +++ b/src/TObj/TObj_TNameContainer.hxx @@ -41,7 +41,7 @@ class TObj_TNameContainer : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of TObj_TNameContainer attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; public: //! Method for create TObj_TNameContainer object @@ -79,16 +79,16 @@ class TObj_TNameContainer : public TDF_Attribute //! Returns an new empty TObj_TNameContainer attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Restores the backuped contents from into this one. It is used //! when aborting a transaction. - Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith); + Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; private: //! Fields diff --git a/src/TObj/TObj_TObject.hxx b/src/TObj/TObj_TObject.hxx index 891ed08d9f..4101f2bb47 100644 --- a/src/TObj/TObj_TObject.hxx +++ b/src/TObj/TObj_TObject.hxx @@ -45,7 +45,7 @@ class TObj_TObject : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of TObj_TObject attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; public: //! Method for create TObj_TObject object @@ -68,26 +68,26 @@ class TObj_TObject : public TDF_Attribute //! Returns an new empty TObj_TObject attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Restores the backuped contents from into this one. It is used //! when aborting a transaction. - Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith); + Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; //! Tell TObj_Object to die, //! i.e. (myElem->IsAlive() == false) after that - Standard_EXPORT void BeforeForget(); + Standard_EXPORT void BeforeForget() Standard_OVERRIDE; //! Tell TObj_Object to rise from the dead, //! i.e. (myElem->IsAlive() == true) after that Standard_EXPORT Standard_Boolean AfterUndo (const Handle(TDF_AttributeDelta)& anAttDelta, - const Standard_Boolean forceIt); + const Standard_Boolean forceIt) Standard_OVERRIDE; private: //! Fields diff --git a/src/TObj/TObj_TReference.hxx b/src/TObj/TObj_TReference.hxx index d3d01459d9..f6c505de8a 100644 --- a/src/TObj/TObj_TReference.hxx +++ b/src/TObj/TObj_TReference.hxx @@ -46,7 +46,7 @@ class TObj_TReference : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of TObj_TReference attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; public: //! Method for create TObj_TReference object @@ -84,36 +84,36 @@ class TObj_TReference : public TDF_Attribute //! Returns an new empty TObj_TReference attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Restores the backuped contents from into this one. It is used //! when aborting a transaction. - Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith); + Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; //! Remove back references of it reference if it is in other document. - virtual Standard_EXPORT void BeforeForget(); + virtual Standard_EXPORT void BeforeForget() Standard_OVERRIDE; //! It is necessary for tranzaction mechanism (Undo/Redo). virtual Standard_EXPORT Standard_Boolean BeforeUndo (const Handle(TDF_AttributeDelta)& theDelta, - const Standard_Boolean isForced = Standard_False); + const Standard_Boolean isForced = Standard_False) Standard_OVERRIDE; //! It is necessary for tranzaction mechanism (Undo/Redo). virtual Standard_EXPORT Standard_Boolean AfterUndo (const Handle(TDF_AttributeDelta)& theDelta, - const Standard_Boolean isForced = Standard_False); + const Standard_Boolean isForced = Standard_False) Standard_OVERRIDE; //! Check if back reference exists for reference. - virtual Standard_EXPORT void AfterResume(); + virtual Standard_EXPORT void AfterResume() Standard_OVERRIDE; //! Called after retrieval reference from file. virtual Standard_EXPORT Standard_Boolean AfterRetrieval - (const Standard_Boolean forceIt = Standard_False); + (const Standard_Boolean forceIt = Standard_False) Standard_OVERRIDE; private: //! Fields diff --git a/src/TObj/TObj_TXYZ.hxx b/src/TObj/TObj_TXYZ.hxx index 9c7709076d..848e3adfff 100644 --- a/src/TObj/TObj_TXYZ.hxx +++ b/src/TObj/TObj_TXYZ.hxx @@ -43,7 +43,7 @@ class TObj_TXYZ : public TDF_Attribute static Standard_EXPORT const Standard_GUID& GetID(); //! Returns the ID of TObj_TXYZ attribute. - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; public: //! Method for create TObj_TXYZ object @@ -65,19 +65,19 @@ class TObj_TXYZ : public TDF_Attribute //! Returns an new empty TObj_TXYZ attribute. It is used by the //! copy algorithm. - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; //! Restores the backuped contents from into this one. It is used //! when aborting a transaction. - Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith); + Standard_EXPORT void Restore(const Handle(TDF_Attribute)& theWith) Standard_OVERRIDE; //! This method is used when copying an attribute from a source structure //! into a target structure. Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theInto, - const Handle(TDF_RelocationTable)& theRT) const; + const Handle(TDF_RelocationTable)& theRT) const Standard_OVERRIDE; //! This method dumps the attribute value into the stream - Standard_EXPORT virtual Standard_OStream& Dump(Standard_OStream& theOS) const; + Standard_EXPORT virtual Standard_OStream& Dump(Standard_OStream& theOS) const Standard_OVERRIDE; private: //! Fields diff --git a/src/TObjDRAW/TObjDRAW.cxx b/src/TObjDRAW/TObjDRAW.cxx index 778949b358..e08e766678 100644 --- a/src/TObjDRAW/TObjDRAW.cxx +++ b/src/TObjDRAW/TObjDRAW.cxx @@ -51,7 +51,7 @@ class TObjDRAW_Model : public TObj_Model Standard_EXPORT TObjDRAW_Model() : TObj_Model() {} - virtual Standard_EXPORT Handle(TObj_Model) NewEmpty() + virtual Standard_EXPORT Handle(TObj_Model) NewEmpty() Standard_OVERRIDE { return new TObjDRAW_Model(); } diff --git a/src/TPrsStd/TPrsStd_AISPresentation.hxx b/src/TPrsStd/TPrsStd_AISPresentation.hxx index bf61e8b795..357bcba5d1 100644 --- a/src/TPrsStd/TPrsStd_AISPresentation.hxx +++ b/src/TPrsStd/TPrsStd_AISPresentation.hxx @@ -162,13 +162,13 @@ public: Standard_EXPORT void UnsetSelectionMode(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const; + Standard_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) BackupCopy() const Standard_OVERRIDE; diff --git a/src/TPrsStd/TPrsStd_AISViewer.hxx b/src/TPrsStd/TPrsStd_AISViewer.hxx index 8dfcf9407c..e99a83c540 100644 --- a/src/TPrsStd/TPrsStd_AISViewer.hxx +++ b/src/TPrsStd/TPrsStd_AISViewer.hxx @@ -84,13 +84,13 @@ public: //! Returns the interactive context in this attribute. Standard_EXPORT Handle(AIS_InteractiveContext) GetInteractiveContext() const; - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; - Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with); + Standard_EXPORT void Restore (const Handle(TDF_Attribute)& with) Standard_OVERRIDE; - Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const; + 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_EXPORT void Paste (const Handle(TDF_Attribute)& into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE; diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.hxx index 24beac4ddb..feb7b313b8 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.hxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeClassifier.hxx @@ -52,26 +52,26 @@ public: Standard_EXPORT TopoDS_Shape LoopToShape (const Handle(TopOpeBRepBuild_Loop)& L); //! classify wire with wire - Standard_EXPORT TopAbs_State CompareShapes (const TopoDS_Shape& B1, const TopoDS_Shape& B2); + Standard_EXPORT TopAbs_State CompareShapes (const TopoDS_Shape& B1, const TopoDS_Shape& B2) Standard_OVERRIDE; //! classify edge with wire - Standard_EXPORT TopAbs_State CompareElementToShape (const TopoDS_Shape& E, const TopoDS_Shape& B); + Standard_EXPORT TopAbs_State CompareElementToShape (const TopoDS_Shape& E, const TopoDS_Shape& B) Standard_OVERRIDE; //! prepare classification involving wire //! calls ResetElement on first edge of - Standard_EXPORT void ResetShape (const TopoDS_Shape& B); + Standard_EXPORT void ResetShape (const TopoDS_Shape& B) Standard_OVERRIDE; //! prepare classification involving edge //! define 2D point (later used in Compare()) on first vertex of edge . - Standard_EXPORT void ResetElement (const TopoDS_Shape& E); + Standard_EXPORT void ResetElement (const TopoDS_Shape& E) Standard_OVERRIDE; //! Add the edge in the set of edges used in 2D point //! classification. - Standard_EXPORT Standard_Boolean CompareElement (const TopoDS_Shape& E); + Standard_EXPORT Standard_Boolean CompareElement (const TopoDS_Shape& E) Standard_OVERRIDE; //! Returns state of classification of 2D point, defined by //! ResetElement, with the current set of edges, defined by Compare. - Standard_EXPORT TopAbs_State State(); + Standard_EXPORT TopAbs_State State() Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TCompSolid.hxx b/src/TopoDS/TopoDS_TCompSolid.hxx index aea77fbdb1..a6f6604dd3 100644 --- a/src/TopoDS/TopoDS_TCompSolid.hxx +++ b/src/TopoDS/TopoDS_TCompSolid.hxx @@ -39,10 +39,10 @@ public: TopoDS_TCompSolid(); //! returns COMPSOLID - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TCompSolid. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TCompound.hxx b/src/TopoDS/TopoDS_TCompound.hxx index ad36401120..5b023f8383 100644 --- a/src/TopoDS/TopoDS_TCompound.hxx +++ b/src/TopoDS/TopoDS_TCompound.hxx @@ -39,10 +39,10 @@ public: TopoDS_TCompound(); //! Returns COMPOUND. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TCompound. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TEdge.hxx b/src/TopoDS/TopoDS_TEdge.hxx index 7ee0d654a1..e664ff438e 100644 --- a/src/TopoDS/TopoDS_TEdge.hxx +++ b/src/TopoDS/TopoDS_TEdge.hxx @@ -36,7 +36,7 @@ public: //! Returns EDGE. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TFace.hxx b/src/TopoDS/TopoDS_TFace.hxx index f62c0bde4d..d4a5db0435 100644 --- a/src/TopoDS/TopoDS_TFace.hxx +++ b/src/TopoDS/TopoDS_TFace.hxx @@ -41,10 +41,10 @@ public: TopoDS_TFace(); //! returns FACE. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TFace. - Standard_EXPORT virtual Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT virtual Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TShell.hxx b/src/TopoDS/TopoDS_TShell.hxx index d39fcc3825..a792aef7c8 100644 --- a/src/TopoDS/TopoDS_TShell.hxx +++ b/src/TopoDS/TopoDS_TShell.hxx @@ -39,10 +39,10 @@ public: TopoDS_TShell(); //! Returns SHELL. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TShell. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TSolid.hxx b/src/TopoDS/TopoDS_TSolid.hxx index f9d4dfe113..1b819015c3 100644 --- a/src/TopoDS/TopoDS_TSolid.hxx +++ b/src/TopoDS/TopoDS_TSolid.hxx @@ -40,10 +40,10 @@ public: TopoDS_TSolid(); //! returns SOLID. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TSolid. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TVertex.hxx b/src/TopoDS/TopoDS_TVertex.hxx index 8624fbb8dd..24e0477bb5 100644 --- a/src/TopoDS/TopoDS_TVertex.hxx +++ b/src/TopoDS/TopoDS_TVertex.hxx @@ -36,7 +36,7 @@ public: //! Returns VERTEX. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; diff --git a/src/TopoDS/TopoDS_TWire.hxx b/src/TopoDS/TopoDS_TWire.hxx index 3fa3e37742..02a93db312 100644 --- a/src/TopoDS/TopoDS_TWire.hxx +++ b/src/TopoDS/TopoDS_TWire.hxx @@ -39,10 +39,10 @@ public: TopoDS_TWire(); //! Returns WIRE. - Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; + Standard_EXPORT TopAbs_ShapeEnum ShapeType() const Standard_OVERRIDE; //! Returns an empty TWire. - Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const; + Standard_EXPORT Handle(TopoDS_TShape) EmptyCopy() const Standard_OVERRIDE; diff --git a/src/Transfer/Transfer_DispatchControl.hxx b/src/Transfer/Transfer_DispatchControl.hxx index 3d0cea3165..1053b0a21e 100644 --- a/src/Transfer/Transfer_DispatchControl.hxx +++ b/src/Transfer/Transfer_DispatchControl.hxx @@ -52,15 +52,15 @@ public: Standard_EXPORT const Handle(Interface_InterfaceModel)& StartingModel() const; //! Clears the List of Copied Results - Standard_EXPORT void Clear(); + Standard_EXPORT void Clear() Standard_OVERRIDE; //! Binds a (Transient) Result to a (Transient) Starting Entity - Standard_EXPORT void Bind (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& res); + Standard_EXPORT void Bind (const Handle(Standard_Transient)& ent, const Handle(Standard_Transient)& res) Standard_OVERRIDE; //! Searches for the Result bound to a Starting Entity //! If Found, returns True and fills //! Else, returns False and nullifies - Standard_EXPORT Standard_Boolean Search (const Handle(Standard_Transient)& ent, Handle(Standard_Transient)& res) const; + Standard_EXPORT Standard_Boolean Search (const Handle(Standard_Transient)& ent, Handle(Standard_Transient)& res) const Standard_OVERRIDE; diff --git a/src/Transfer/Transfer_MultipleBinder.hxx b/src/Transfer/Transfer_MultipleBinder.hxx index 8faf5ea1a4..d1c0dfbd36 100644 --- a/src/Transfer/Transfer_MultipleBinder.hxx +++ b/src/Transfer/Transfer_MultipleBinder.hxx @@ -66,11 +66,11 @@ public: Standard_EXPORT virtual Standard_Boolean IsMultiple() const Standard_OVERRIDE; //! Returns the Type permitted for Results, i.e. here Transient - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; //! Returns the Name of the Type which characterizes the Result //! Here, returns "(list)" - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; //! Adds a new Item to the Multiple Result Standard_EXPORT void AddResult (const Handle(Standard_Transient)& res); diff --git a/src/Transfer/Transfer_SimpleBinderOfTransient.hxx b/src/Transfer/Transfer_SimpleBinderOfTransient.hxx index faa7816b5e..ac52d7dce4 100644 --- a/src/Transfer/Transfer_SimpleBinderOfTransient.hxx +++ b/src/Transfer/Transfer_SimpleBinderOfTransient.hxx @@ -49,11 +49,11 @@ public: //! Returns the Effective (Dynamic) Type of the Result //! (Standard_Transient if no Result is defined) - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; //! Returns the Effective Name of (Dynamic) Type of the Result //! (void) if no result is defined - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; //! Defines the Result Standard_EXPORT void SetResult (const Handle(Standard_Transient)& res); diff --git a/src/Transfer/Transfer_TransientListBinder.hxx b/src/Transfer/Transfer_TransientListBinder.hxx index 38c2565cd4..67f0869697 100644 --- a/src/Transfer/Transfer_TransientListBinder.hxx +++ b/src/Transfer/Transfer_TransientListBinder.hxx @@ -50,9 +50,9 @@ public: Standard_EXPORT virtual Standard_Boolean IsMultiple() const Standard_OVERRIDE; - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; //! Adds an item to the result list Standard_EXPORT void AddResult (const Handle(Standard_Transient)& res); diff --git a/src/Transfer/Transfer_TransientMapper.hxx b/src/Transfer/Transfer_TransientMapper.hxx index 3635d21ecb..77b1e1f8a1 100644 --- a/src/Transfer/Transfer_TransientMapper.hxx +++ b/src/Transfer/Transfer_TransientMapper.hxx @@ -51,7 +51,7 @@ public: //! Specific testof equallity : defined as False if has //! not the same true Type, else contents are compared (by //! C++ operator ==) - Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const; + Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const Standard_OVERRIDE; //! Returns the Type of the Value. By default, returns the //! DynamicType of , but can be redefined diff --git a/src/Transfer/Transfer_VoidBinder.hxx b/src/Transfer/Transfer_VoidBinder.hxx index f1a6bf3fe8..c6cdd35246 100644 --- a/src/Transfer/Transfer_VoidBinder.hxx +++ b/src/Transfer/Transfer_VoidBinder.hxx @@ -45,10 +45,10 @@ public: //! while a VoidBinder admits no Result, its ResultType returns //! the type of - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; //! Returns "(void)" - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; diff --git a/src/TransferBRep/TransferBRep_BinderOfShape.hxx b/src/TransferBRep/TransferBRep_BinderOfShape.hxx index e6e2ab2896..ad02568f8a 100644 --- a/src/TransferBRep/TransferBRep_BinderOfShape.hxx +++ b/src/TransferBRep/TransferBRep_BinderOfShape.hxx @@ -58,10 +58,10 @@ public: //! Returns the Type permitted for the Result, i.e. the Type //! of the Parameter Class (statically defined) - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; //! Returns the Type Name computed for the Result (dynamic) - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; //! Defines the Result Standard_EXPORT void SetResult (const TopoDS_Shape& res); diff --git a/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx b/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx index ba1f97a89f..7543d090fd 100644 --- a/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx +++ b/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx @@ -52,7 +52,7 @@ public: //! Specific testof equallity : defined as False if has //! not the same true Type, else contents are compared (by //! C++ operator ==) - Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const; + Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const Standard_OVERRIDE; //! Returns the Type of the Value. By default, returns the //! DynamicType of , but can be redefined diff --git a/src/TransferBRep/TransferBRep_ShapeListBinder.hxx b/src/TransferBRep/TransferBRep_ShapeListBinder.hxx index a414590f7c..bf7f56fb39 100644 --- a/src/TransferBRep/TransferBRep_ShapeListBinder.hxx +++ b/src/TransferBRep/TransferBRep_ShapeListBinder.hxx @@ -59,9 +59,9 @@ public: Standard_EXPORT virtual Standard_Boolean IsMultiple() const Standard_OVERRIDE; - Standard_EXPORT Handle(Standard_Type) ResultType() const; + Standard_EXPORT Handle(Standard_Type) ResultType() const Standard_OVERRIDE; - Standard_EXPORT Standard_CString ResultTypeName() const; + Standard_EXPORT Standard_CString ResultTypeName() const Standard_OVERRIDE; //! Adds an item to the result list Standard_EXPORT void AddResult (const TopoDS_Shape& res); diff --git a/src/TransferBRep/TransferBRep_ShapeMapper.hxx b/src/TransferBRep/TransferBRep_ShapeMapper.hxx index 3a66311447..07d2aa2746 100644 --- a/src/TransferBRep/TransferBRep_ShapeMapper.hxx +++ b/src/TransferBRep/TransferBRep_ShapeMapper.hxx @@ -52,7 +52,7 @@ public: //! Specific testof equallity : defined as False if has //! not the same true Type, else contents are compared (by //! C++ operator ==) - Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const; + Standard_EXPORT Standard_Boolean Equates (const Handle(Transfer_Finder)& other) const Standard_OVERRIDE; //! Returns the Type of the Value. By default, returns the //! DynamicType of , but can be redefined diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index e65b696ca5..c2003a7724 100644 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -2024,10 +2024,10 @@ private: // Virtual methods implementation void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection ( const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; protected: Handle(Geom_Circle) myCircle; @@ -3385,10 +3385,10 @@ private: void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode); + const Standard_Integer aMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer /*theMode*/); + const Standard_Integer /*theMode*/) Standard_OVERRIDE; bool CheckInputCommand (const TCollection_AsciiString theCommand, const Handle(TColStd_HArray1OfAsciiString) theArgsArray, @@ -4583,10 +4583,10 @@ public: protected: void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection ( const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; private: gp_Pnt myPoint1; gp_Pnt myPoint2; @@ -4775,10 +4775,10 @@ public: protected: void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; private: gp_Pnt myPoint1; gp_Pnt myPoint2; @@ -5165,10 +5165,10 @@ private: void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode); + const Standard_Integer aMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer /*theMode*/); + const Standard_Integer /*theMode*/) Standard_OVERRIDE; protected: diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx index ab41e0a1cc..48ea9b079e 100644 --- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx +++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx @@ -104,10 +104,10 @@ private: // Virtual methods implementation void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; // Called by VUserDrawElement void Render(const Handle(OpenGl_Workspace)& theWorkspace) const; diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 28077010f2..c79eb9ba7d 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -4667,10 +4667,11 @@ public: void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode); + const Standard_Integer theMode) Standard_OVERRIDE; void ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/, - const Standard_Integer /*aMode*/){}; + const Standard_Integer /*aMode*/) Standard_OVERRIDE + {} private: diff --git a/src/VrmlData/VrmlData_Appearance.hxx b/src/VrmlData/VrmlData_Appearance.hxx index 992faf311b..d6c23b6215 100644 --- a/src/VrmlData/VrmlData_Appearance.hxx +++ b/src/VrmlData/VrmlData_Appearance.hxx @@ -83,24 +83,24 @@ class VrmlData_Appearance : public VrmlData_Node * is not created, but rather the given one is modified.

*/ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)&)const; + Clone (const Handle(VrmlData_Node)&)const Standard_OVERRIDE; /** * Read the node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Returns True if the node is default, so that it should not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_ArrayVec3d.hxx b/src/VrmlData/VrmlData_ArrayVec3d.hxx index de987a011e..51740e4863 100644 --- a/src/VrmlData/VrmlData_ArrayVec3d.hxx +++ b/src/VrmlData/VrmlData_ArrayVec3d.hxx @@ -99,7 +99,7 @@ class VrmlData_ArrayVec3d : public VrmlData_Node * Returns True if the node is default, so that it should not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_Box.hxx b/src/VrmlData/VrmlData_Box.hxx index d4c6267099..8493f4f3c4 100644 --- a/src/VrmlData/VrmlData_Box.hxx +++ b/src/VrmlData/VrmlData_Box.hxx @@ -64,7 +64,7 @@ class VrmlData_Box : public VrmlData_Geometry * is an internal error during the primitive creation (zero radius, etc.) */ Standard_EXPORT virtual const Handle(TopoDS_TShape)& - TShape (); + TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -72,19 +72,19 @@ class VrmlData_Box : public VrmlData_Geometry * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_Color.hxx b/src/VrmlData/VrmlData_Color.hxx index 30cc4ab074..369fbd8bae 100644 --- a/src/VrmlData/VrmlData_Color.hxx +++ b/src/VrmlData/VrmlData_Color.hxx @@ -67,19 +67,19 @@ class VrmlData_Color : public VrmlData_ArrayVec3d * is not created, but rather the given one is modified.

*/ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to the Scene output. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_Cone.hxx b/src/VrmlData/VrmlData_Cone.hxx index a190210274..d0a9b96dac 100644 --- a/src/VrmlData/VrmlData_Cone.hxx +++ b/src/VrmlData/VrmlData_Cone.hxx @@ -95,7 +95,7 @@ class VrmlData_Cone : public VrmlData_Geometry * Query the primitive topology. This method returns a Null shape if there * is an internal error during the primitive creation (zero radius, etc.) */ - Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape (); + Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -103,19 +103,19 @@ class VrmlData_Cone : public VrmlData_Geometry * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther) const; + Clone (const Handle(VrmlData_Node)& theOther) const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; protected: diff --git a/src/VrmlData/VrmlData_Coordinate.hxx b/src/VrmlData/VrmlData_Coordinate.hxx index 2a5cf58d3e..c99d8cb720 100644 --- a/src/VrmlData/VrmlData_Coordinate.hxx +++ b/src/VrmlData/VrmlData_Coordinate.hxx @@ -57,19 +57,19 @@ class VrmlData_Coordinate : public VrmlData_ArrayVec3d * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to the Scene output. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_Cylinder.hxx b/src/VrmlData/VrmlData_Cylinder.hxx index 3178e593e0..7e8dada026 100644 --- a/src/VrmlData/VrmlData_Cylinder.hxx +++ b/src/VrmlData/VrmlData_Cylinder.hxx @@ -101,7 +101,7 @@ class VrmlData_Cylinder : public VrmlData_Geometry * Query the primitive topology. This method returns a Null shape if there * is an internal error during the primitive creation (zero radius, etc.) */ - Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape (); + Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -109,19 +109,19 @@ class VrmlData_Cylinder : public VrmlData_Geometry * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_Group.hxx b/src/VrmlData/VrmlData_Group.hxx index 4de9d470af..e987acb441 100644 --- a/src/VrmlData/VrmlData_Group.hxx +++ b/src/VrmlData/VrmlData_Group.hxx @@ -117,19 +117,19 @@ class VrmlData_Group : public VrmlData_Node * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther) const; + Clone (const Handle(VrmlData_Node)& theOther) const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Find a node by its name, inside this Group diff --git a/src/VrmlData/VrmlData_ImageTexture.hxx b/src/VrmlData/VrmlData_ImageTexture.hxx index 88c98948f1..e85c2e0f41 100644 --- a/src/VrmlData/VrmlData_ImageTexture.hxx +++ b/src/VrmlData/VrmlData_ImageTexture.hxx @@ -55,19 +55,19 @@ class VrmlData_ImageTexture : public VrmlData_Texture * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.hxx b/src/VrmlData/VrmlData_IndexedFaceSet.hxx index bd5e53125b..6639d705eb 100644 --- a/src/VrmlData/VrmlData_IndexedFaceSet.hxx +++ b/src/VrmlData/VrmlData_IndexedFaceSet.hxx @@ -272,7 +272,7 @@ class VrmlData_IndexedFaceSet : public VrmlData_Faceted * Query the shape. This method checks the flag myIsModified; if True it * should rebuild the shape presentation. */ - Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape (); + Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -280,25 +280,25 @@ class VrmlData_IndexedFaceSet : public VrmlData_Faceted * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Returns True if the node is default, so that it should not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_IndexedLineSet.hxx b/src/VrmlData/VrmlData_IndexedLineSet.hxx index 8c9e30141a..8f95d067fd 100644 --- a/src/VrmlData/VrmlData_IndexedLineSet.hxx +++ b/src/VrmlData/VrmlData_IndexedLineSet.hxx @@ -156,7 +156,7 @@ class VrmlData_IndexedLineSet : public VrmlData_Geometry * should rebuild the shape presentation. */ Standard_EXPORT virtual const Handle(TopoDS_TShape)& - TShape (); + TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -164,25 +164,25 @@ class VrmlData_IndexedLineSet : public VrmlData_Geometry * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Returns True if the node is default, so that it should not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; private: diff --git a/src/VrmlData/VrmlData_Material.hxx b/src/VrmlData/VrmlData_Material.hxx index 2e30baa5af..51d3a417a5 100644 --- a/src/VrmlData/VrmlData_Material.hxx +++ b/src/VrmlData/VrmlData_Material.hxx @@ -121,25 +121,25 @@ class VrmlData_Material : public VrmlData_Node * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to the Scene output. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Returns True if the node is default, so that it should not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_Normal.hxx b/src/VrmlData/VrmlData_Normal.hxx index ed147e2513..8f2e3eb4b9 100644 --- a/src/VrmlData/VrmlData_Normal.hxx +++ b/src/VrmlData/VrmlData_Normal.hxx @@ -57,19 +57,19 @@ class VrmlData_Normal : public VrmlData_ArrayVec3d * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to the Scene output. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; private: diff --git a/src/VrmlData/VrmlData_ShapeNode.hxx b/src/VrmlData/VrmlData_ShapeNode.hxx index 39580fc7c6..164d9d8839 100644 --- a/src/VrmlData/VrmlData_ShapeNode.hxx +++ b/src/VrmlData/VrmlData_ShapeNode.hxx @@ -69,25 +69,25 @@ class VrmlData_ShapeNode : public VrmlData_Node * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Check if the Shape Node is writeable. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; protected: // ---------- PROTECTED METHODS ---------- diff --git a/src/VrmlData/VrmlData_Sphere.hxx b/src/VrmlData/VrmlData_Sphere.hxx index 74ad99acc5..1d23bce17b 100644 --- a/src/VrmlData/VrmlData_Sphere.hxx +++ b/src/VrmlData/VrmlData_Sphere.hxx @@ -58,7 +58,7 @@ class VrmlData_Sphere : public VrmlData_Geometry * Query the primitive topology. This method returns a Null shape if there * is an internal error during the primitive creation (zero radius, etc.) */ - Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape (); + Standard_EXPORT virtual const Handle(TopoDS_TShape)& TShape () Standard_OVERRIDE; /** * Create a copy of this node. @@ -66,19 +66,19 @@ class VrmlData_Sphere : public VrmlData_Geometry * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Fill the Node internal data from the given input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to output stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_TextureCoordinate.hxx b/src/VrmlData/VrmlData_TextureCoordinate.hxx index 6127fc044c..0f0af73155 100644 --- a/src/VrmlData/VrmlData_TextureCoordinate.hxx +++ b/src/VrmlData/VrmlData_TextureCoordinate.hxx @@ -76,13 +76,13 @@ class VrmlData_TextureCoordinate : public VrmlData_Node * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther)const; + Clone (const Handle(VrmlData_Node)& theOther)const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_UnknownNode.hxx b/src/VrmlData/VrmlData_UnknownNode.hxx index f26a41c508..699feec30a 100644 --- a/src/VrmlData/VrmlData_UnknownNode.hxx +++ b/src/VrmlData/VrmlData_UnknownNode.hxx @@ -47,7 +47,7 @@ class VrmlData_UnknownNode : public VrmlData_Node * Read the unknown node, till the last closing brace of it. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Query the title of the unknown node. @@ -60,7 +60,7 @@ class VrmlData_UnknownNode : public VrmlData_Node * Check if the Node is non-writeable -- always returns true. */ Standard_EXPORT virtual Standard_Boolean - IsDefault () const; + IsDefault () const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/VrmlData/VrmlData_WorldInfo.hxx b/src/VrmlData/VrmlData_WorldInfo.hxx index b95e85f79c..5f8e2761b2 100644 --- a/src/VrmlData/VrmlData_WorldInfo.hxx +++ b/src/VrmlData/VrmlData_WorldInfo.hxx @@ -68,25 +68,25 @@ class VrmlData_WorldInfo : public VrmlData_Node * is not created, but rather the given one is modified. */ Standard_EXPORT virtual Handle(VrmlData_Node) - Clone (const Handle(VrmlData_Node)& theOther) const; + Clone (const Handle(VrmlData_Node)& theOther) const Standard_OVERRIDE; /** * Read the Node from input stream. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Read (VrmlData_InBuffer& theBuffer); + Read (VrmlData_InBuffer& theBuffer) Standard_OVERRIDE; /** * Write the Node to the Scene output. */ Standard_EXPORT virtual VrmlData_ErrorStatus - Write (const char * thePrefix) const; + Write (const char * thePrefix) const Standard_OVERRIDE; /** * Returns True if the node is default, then it would not be written. */ Standard_EXPORT virtual Standard_Boolean - IsDefault() const; + IsDefault() const Standard_OVERRIDE; private: // ---------- PRIVATE FIELDS ---------- diff --git a/src/XCAFDoc/XCAFDoc_Area.hxx b/src/XCAFDoc/XCAFDoc_Area.hxx index dfee3c1e0b..cab5929658 100644 --- a/src/XCAFDoc/XCAFDoc_Area.hxx +++ b/src/XCAFDoc/XCAFDoc_Area.hxx @@ -45,7 +45,7 @@ public: Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT const Standard_GUID& ID() const; + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; //! Sets a value of volume Standard_EXPORT void Set (const Standard_Real vol); @@ -59,11 +59,11 @@ public: //! returns false if no such attribute at the