From 314527f5c037e1cc3a2ede6a95799a8ffa543907 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Sat, 16 Aug 2025 20:50:50 +0100 Subject: [PATCH] Coding - Update Clang-format with more macroses (#677) - Updates `.clang-format` to include `OCC_CATCH_SIGNALS`, `DEFINE_STANDARD_RTTIEXT`, and `Draw_Drawable3D_FACTORY` as statement macros - Adds a GitHub action step to automatically remove empty lines after `Standard_DEPRECATED` macro declarations - Reformats numerous files by removing blank lines after deprecated method declarations and improving macro formatting --- .clang-format | 3 ++ .github/actions/clang-format-check/action.yml | 14 +++++++++ .../TKCAF/TNaming/TNaming_Identifier.cxx | 2 +- .../TKCAF/TNaming/TNaming_Name.cxx | 2 +- .../TKCDF/PCDM/PCDM_StorageDriver.cxx | 3 +- .../GeomToStep_MakeBSplineCurveWithKnots.cxx | 3 +- ...eCurveWithKnotsAndRationalBSplineCurve.cxx | 5 ++-- .../GeomToStep/GeomToStep_MakeLine.cxx | 7 ++--- .../RWStepVisual_RWPresentationLayerUsage.cxx | 2 +- .../TKXCAF/XCAFDoc/XCAFDoc_VisMaterial.hxx | 2 -- .../DNaming_BooleanOperationDriver.cxx | 2 +- src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx | 21 +++++++------ src/Draw/TKDraw/Draw/Draw.cxx | 6 ++-- src/Draw/TKDraw/Draw/Draw_Number.hxx | 7 ++--- .../DrawTrSurf/DrawTrSurf_BSplineCurve.hxx | 9 +++--- .../DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx | 9 +++--- .../DrawTrSurf/DrawTrSurf_BSplineSurface.hxx | 17 +++++------ .../DrawTrSurf/DrawTrSurf_BezierCurve.hxx | 9 +++--- .../DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx | 9 +++--- .../DrawTrSurf/DrawTrSurf_BezierSurface.hxx | 9 +++--- .../TKDraw/DrawTrSurf/DrawTrSurf_Curve.hxx | 11 ++++--- .../TKDraw/DrawTrSurf/DrawTrSurf_Curve2d.hxx | 11 ++++--- .../TKDraw/DrawTrSurf/DrawTrSurf_Point.hxx | 9 +++--- .../DrawTrSurf/DrawTrSurf_Polygon2D.hxx | 7 ++--- .../DrawTrSurf/DrawTrSurf_Polygon3D.hxx | 7 ++--- .../TKDraw/DrawTrSurf/DrawTrSurf_Surface.hxx | 15 +++++----- .../DrawTrSurf/DrawTrSurf_Triangulation.hxx | 7 ++--- .../TKTopTest/HLRTest/HLRTest_Projector.hxx | 7 ++--- .../Poly/Poly_PolygonOnTriangulation.hxx | 2 -- .../TKMath/Poly/Poly_Triangulation.hxx | 3 -- .../Message/Message_ProgressSentry.hxx | 5 +--- .../TKernel/NCollection/NCollection_Map.hxx | 11 ------- .../TKernel/Standard/Standard_Atomic.hxx | 15 ---------- .../TKernel/Standard/Standard_Handle.hxx | 3 -- .../TKernel/Standard/Standard_MMgrOpt.cxx | 2 +- .../TKernel/Standard/Standard_Strtod.cxx | 2 +- .../TKernel/TCollection/TCollection.hxx | 30 +++++++++---------- .../TopOpeBRepBuild_BuilderON.cxx | 2 +- .../GeomFill/GeomFill_NSections.cxx | 4 +-- .../ShapeAnalysis_ShapeContents.hxx | 1 - .../ShapeFix/ShapeFix_FaceConnect.cxx | 3 +- .../TKTopAlgo/MAT2d/MAT2d_Tool2d.cxx | 4 +-- .../TKGeomBase/GC/GC_MakeArcOfCircle.hxx | 2 +- .../TKGeomBase/GC/GC_MakeArcOfEllipse.hxx | 2 +- .../TKGeomBase/GC/GC_MakeArcOfHyperbola.hxx | 2 +- .../TKGeomBase/GC/GC_MakeArcOfParabola.hxx | 2 +- .../TKGeomBase/GC/GC_MakeCircle.hxx | 2 +- .../TKGeomBase/GC/GC_MakeConicalSurface.hxx | 2 +- .../GC/GC_MakeCylindricalSurface.hxx | 2 +- .../TKGeomBase/GC/GC_MakeEllipse.hxx | 2 +- .../TKGeomBase/GC/GC_MakeHyperbola.hxx | 2 +- .../TKGeomBase/GC/GC_MakeLine.hxx | 2 +- .../TKGeomBase/GC/GC_MakeMirror.hxx | 2 +- .../TKGeomBase/GC/GC_MakePlane.hxx | 2 +- .../TKGeomBase/GC/GC_MakeRotation.hxx | 2 +- .../TKGeomBase/GC/GC_MakeScale.hxx | 2 +- .../TKGeomBase/GC/GC_MakeSegment.hxx | 2 +- .../TKGeomBase/GC/GC_MakeTranslation.hxx | 2 +- .../TKGeomBase/GC/GC_MakeTrimmedCone.hxx | 2 +- .../TKGeomBase/GC/GC_MakeTrimmedCylinder.hxx | 2 +- .../GCE2d/GCE2d_MakeArcOfCircle.hxx | 2 +- .../GCE2d/GCE2d_MakeArcOfEllipse.hxx | 2 +- .../GCE2d/GCE2d_MakeArcOfHyperbola.hxx | 2 +- .../GCE2d/GCE2d_MakeArcOfParabola.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeCircle.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeEllipse.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeHyperbola.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeLine.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeMirror.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeParabola.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeRotation.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeScale.hxx | 2 +- .../TKGeomBase/GCE2d/GCE2d_MakeSegment.hxx | 2 +- .../GCE2d/GCE2d_MakeTranslation.hxx | 2 +- .../TKMeshVS/MeshVS/MeshVS_Mesh.cxx | 6 ++-- .../TKOpenGl/OpenGl/OpenGl_Context.hxx | 1 - .../TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx | 6 ---- .../TKOpenGl/OpenGl/OpenGl_Texture.hxx | 3 -- .../TKOpenGl/OpenGl/OpenGl_TextureSet.hxx | 4 +-- .../TKService/Font/Font_FTFont.hxx | 2 -- .../TKService/Font/Font_TextFormatter.hxx | 1 - .../Graphic3d/Graphic3d_AspectFillArea3d.hxx | 1 - .../TKService/Graphic3d/Graphic3d_Aspects.hxx | 5 ---- .../Graphic3d/Graphic3d_MaterialAspect.hxx | 1 - .../Graphic3d/Graphic3d_Structure.hxx | 4 --- .../TKV3d/AIS/AIS_InteractiveContext.hxx | 13 -------- .../TKV3d/Prs3d/Prs3d_Drawer.hxx | 5 ---- .../TKV3d/PrsMgr/PrsMgr_Presentation.hxx | 1 - .../Select3D/Select3D_SensitiveCircle.hxx | 1 - .../SelectBasics_SelectingVolumeManager.hxx | 7 ----- .../TKV3d/SelectMgr/SelectMgr_EntityOwner.hxx | 3 -- src/Visualization/TKV3d/V3d/V3d_View.hxx | 4 --- src/Visualization/TKV3d/V3d/V3d_Viewer.hxx | 17 ----------- 93 files changed, 169 insertions(+), 282 deletions(-) diff --git a/.clang-format b/.clang-format index 718d0e0389..4df4034182 100644 --- a/.clang-format +++ b/.clang-format @@ -36,6 +36,9 @@ UseTab: Never # OCCT specific settings StatementMacros: - Standard_FALLTHROUGH + - OCC_CATCH_SIGNALS + - DEFINE_STANDARD_RTTIEXT + - Draw_Drawable3D_FACTORY - Standard_DEPRECATED TypenameMacros: - Handle diff --git a/.github/actions/clang-format-check/action.yml b/.github/actions/clang-format-check/action.yml index ca42bf9320..dcee51b5db 100644 --- a/.github/actions/clang-format-check/action.yml +++ b/.github/actions/clang-format-check/action.yml @@ -56,6 +56,20 @@ runs: clang-format -i -style=file $_ } + - name: Remove empty lines after Standard_DEPRECATED + if: steps.changed-files.outputs.has_files == 'true' + shell: pwsh + run: | + $files = Get-Content "changed_files.txt" | Where-Object { Test-Path $_ } + $files | ForEach-Object { + $content = Get-Content $_ -Raw + $pattern = '(Standard_DEPRECATED\("[a-z0-9\.,;\s\(\)_-]+"(?:[\s\n]+"[a-z0-9\.,;\s\(\)_-]+")?\)\n)\n+' + $newContent = $content -replace $pattern, '$1' + if ($content -ne $newContent) { + Set-Content -Path $_ -Value $newContent -NoNewline + } + } + - name: Check git status id: git-check if: steps.changed-files.outputs.has_files == 'true' diff --git a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Identifier.cxx b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Identifier.cxx index 7e954a6b01..1488bde49b 100644 --- a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Identifier.cxx +++ b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Identifier.cxx @@ -264,7 +264,7 @@ Standard_Boolean IsImported(const Handle(TNaming_NamedShape)& NS) it.Next(); if (!it.More()) return 0; - // plus d un shape. + // plus d un shape. #ifdef OCCT_DEBUG std::cout << "WARNING IMPORTED" << std::endl; #endif diff --git a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx index 55a301bfda..f0fb2777f5 100644 --- a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx +++ b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx @@ -1498,7 +1498,7 @@ static Standard_Boolean FilterByNeighbourgs(const TDF_Label& L, TC = TopAbs_VERTEX; // clang-format off if (ShapeType == TopAbs_VERTEX) TC = TopAbs_VERTEX; // szy 31.03.10 - to process case when Candidate is of type Vertex - // clang-format on + // clang-format on #ifdef OCCT_DEBUG_FNB i = 1; diff --git a/src/ApplicationFramework/TKCDF/PCDM/PCDM_StorageDriver.cxx b/src/ApplicationFramework/TKCDF/PCDM/PCDM_StorageDriver.cxx index 5f6ec3118e..e395e1d1cf 100644 --- a/src/ApplicationFramework/TKCDF/PCDM/PCDM_StorageDriver.cxx +++ b/src/ApplicationFramework/TKCDF/PCDM/PCDM_StorageDriver.cxx @@ -49,7 +49,8 @@ void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, { try { - OCC_CATCH_SIGNALS Make(aDocument, thePersistentDocuments); + OCC_CATCH_SIGNALS + Make(aDocument, thePersistentDocuments); } catch (Standard_Failure const& anException) { diff --git a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.cxx b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.cxx index 50c76cd5f0..46befcee3a 100644 --- a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.cxx +++ b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.cxx @@ -37,8 +37,7 @@ //============================================================================= GeomToStep_MakeBSplineCurveWithKnots::GeomToStep_MakeBSplineCurveWithKnots( const Handle(Geom_BSplineCurve)& BS, - const StepData_Factors& theLocalFactors) -{ + const StepData_Factors& theLocalFactors){ #define Array1OfPnt_gen TColgp_Array1OfPnt #include "GeomToStep_MakeBSplineCurveWithKnots_gen.pxx" #undef Array1OfPnt_gen diff --git a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.cxx b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.cxx index 8eeaa0a67e..6d80b0756f 100644 --- a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.cxx +++ b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.cxx @@ -38,12 +38,11 @@ GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve:: GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve( const Handle(Geom_BSplineCurve)& BS, - const StepData_Factors& theLocalFactors) -{ + const StepData_Factors& theLocalFactors){ #define Array1OfPnt_gen TColgp_Array1OfPnt #include "GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve_gen.pxx" #undef Array1OfPnt_gen -} + } //============================================================================= // Creation d' une bspline_curve_with_knots_and_rational_bspline_curve de diff --git a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeLine.cxx b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeLine.cxx index c59fa96710..e60258d449 100644 --- a/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeLine.cxx +++ b/src/DataExchange/TKDESTEP/GeomToStep/GeomToStep_MakeLine.cxx @@ -33,8 +33,7 @@ //============================================================================= // Creation d' une line de prostep a partir d' une Lin de gp //============================================================================= -GeomToStep_MakeLine::GeomToStep_MakeLine(const gp_Lin& L, const StepData_Factors& theLocalFactors) -{ +GeomToStep_MakeLine::GeomToStep_MakeLine(const gp_Lin& L, const StepData_Factors& theLocalFactors){ #define Vec_gen gp_Vec #include "GeomToStep_MakeLine_gen.pxx" #undef Vec_gen @@ -44,8 +43,8 @@ GeomToStep_MakeLine::GeomToStep_MakeLine(const gp_Lin& L, const StepData_Factors // Creation d' une line de prostep a partir d' une Lin2d de gp //============================================================================= -GeomToStep_MakeLine::GeomToStep_MakeLine(const gp_Lin2d& L, const StepData_Factors& theLocalFactors) -{ +GeomToStep_MakeLine::GeomToStep_MakeLine(const gp_Lin2d& L, + const StepData_Factors& theLocalFactors){ #define Vec_gen gp_Vec2d #include "GeomToStep_MakeLine_gen.pxx" #undef Vec_gen diff --git a/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx b/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx index 1add5232ef..d8b880adee 100644 --- a/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx +++ b/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx @@ -34,7 +34,7 @@ void RWStepVisual_RWPresentationLayerUsage::ReadStep( if (!data->CheckNbParams(num, 2, ach, "presentation_layer_usage")) return; - // --- own fields + // --- own fields #include #include Handle(StepVisual_PresentationLayerAssignment) pla; diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_VisMaterial.hxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_VisMaterial.hxx index 3f52ef847b..4089ca01df 100644 --- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_VisMaterial.hxx +++ b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_VisMaterial.hxx @@ -132,7 +132,6 @@ public: Standard_EXPORT void SetFaceCulling(Graphic3d_TypeOfBackfacingModel theFaceCulling); Standard_DEPRECATED("Deprecated method, FaceCulling() should be used instead") - Standard_Boolean IsDoubleSided() const { return myFaceCulling == Graphic3d_TypeOfBackfacingModel_DoubleSided; @@ -140,7 +139,6 @@ public: Standard_DEPRECATED("Deprecated method, SetFaceCulling() should be used " "instead") - void SetDoubleSided(Standard_Boolean theIsDoubleSided) { SetFaceCulling(theIsDoubleSided ? Graphic3d_TypeOfBackfacingModel_DoubleSided diff --git a/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.cxx b/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.cxx index 3a920eb9ca..449268f4a1 100644 --- a/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.cxx +++ b/src/Draw/TKDCAF/DNaming/DNaming_BooleanOperationDriver.cxx @@ -214,7 +214,7 @@ static Standard_Boolean IsValidSurfType(const TopoDS_Face& theFace) } */ #ifdef OCCT_DEBUG - // ModDbgTools_Write(theFace, "Surf"); + // ModDbgTools_Write(theFace, "Surf"); #endif return Standard_False; } diff --git a/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx b/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx index e8584d76fd..4c8186acda 100644 --- a/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx +++ b/src/Draw/TKDraw/DBRep/DBRep_DrawableShape.hxx @@ -37,17 +37,16 @@ class gp_Trsf; class DBRep_DrawableShape : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(DBRep_DrawableShape, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - DBRep_DrawableShape(const TopoDS_Shape& C, - const Draw_Color& FreeCol, - const Draw_Color& ConnCol, - const Draw_Color& EdgeCol, - const Draw_Color& IsosCol, - const Standard_Real size, - const Standard_Integer nbisos, - const Standard_Integer discret); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT DBRep_DrawableShape(const TopoDS_Shape& C, + const Draw_Color& FreeCol, + const Draw_Color& ConnCol, + const Draw_Color& EdgeCol, + const Draw_Color& IsosCol, + const Standard_Real size, + const Standard_Integer nbisos, + const Standard_Integer discret); //! Changes the number of isoparametric curves in a shape. Standard_EXPORT void ChangeNbIsos(const Standard_Integer NbIsos); diff --git a/src/Draw/TKDraw/Draw/Draw.cxx b/src/Draw/TKDraw/Draw/Draw.cxx index 184152728e..6528b65f83 100644 --- a/src/Draw/TKDraw/Draw/Draw.cxx +++ b/src/Draw/TKDraw/Draw/Draw.cxx @@ -384,9 +384,9 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli) ::SetErrorMode(0); #endif - // ***************************************************************** - // init X window and create display - // ***************************************************************** + // ***************************************************************** + // init X window and create display + // ***************************************************************** #ifdef _WIN32 HWND hWnd = NULL; #endif diff --git a/src/Draw/TKDraw/Draw/Draw_Number.hxx b/src/Draw/TKDraw/Draw/Draw_Number.hxx index b56c79380a..b1419946f8 100644 --- a/src/Draw/TKDraw/Draw/Draw_Number.hxx +++ b/src/Draw/TKDraw/Draw/Draw_Number.hxx @@ -25,10 +25,9 @@ DEFINE_STANDARD_HANDLE(Draw_Number, Draw_Drawable3D) class Draw_Number : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(Draw_Number, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - Draw_Number(const Standard_Real theV); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT Draw_Number(const Standard_Real theV); Standard_Real Value() const { return myValue; } diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx index 0087a7496a..5194ca2887 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx @@ -28,11 +28,10 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve) class DrawTrSurf_BSplineCurve : public DrawTrSurf_Curve { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable BSpline curve from a BSpline curve of package Geom. - Standard_EXPORT - DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable BSpline curve from a BSpline curve of package Geom. + Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C); //! creates a drawable BSpline curve from a BSpline curve of package Geom. Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx index 2755598441..8ea41bbb52 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx @@ -28,11 +28,10 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d) class DrawTrSurf_BSplineCurve2d : public DrawTrSurf_Curve2d { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable BSpline curve from a BSpline curve of package Geom2d. - Standard_EXPORT - DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable BSpline curve from a BSpline curve of package Geom2d. + Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C); Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C, const Draw_Color& CurvColor, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx index b341e5b8b3..0b9410dc59 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx @@ -33,15 +33,14 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface) class DrawTrSurf_BSplineSurface : public DrawTrSurf_Surface { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface) - Draw_Drawable3D_FACTORY public : - - //! default drawing mode. - //! The isoparametric curves corresponding to the knots values are drawn. - //! The control points and the knots points are drawn. - //! The boundaries are yellow, the isoparametric curves are blues. - //! For the discretisation 50 points are computed in each parametric direction. - Standard_EXPORT - DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S); + Draw_Drawable3D_FACTORY +public: + //! default drawing mode. + //! The isoparametric curves corresponding to the knots values are drawn. + //! The control points and the knots points are drawn. + //! The boundaries are yellow, the isoparametric curves are blues. + //! For the discretisation 50 points are computed in each parametric direction. + Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S); //! The isoparametric curves corresponding to the knots values are drawn. Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx index 6b97faa8b7..96af82cb4e 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve.hxx @@ -27,11 +27,10 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve, DrawTrSurf_Curve) class DrawTrSurf_BezierCurve : public DrawTrSurf_Curve { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve, DrawTrSurf_Curve) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable Bezier curve from a Bezier curve of package Geom. - Standard_EXPORT - DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable Bezier curve from a Bezier curve of package Geom. + Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C); Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C, const Draw_Color& CurvColor, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx index 81c7b14a22..a96dcf7ea3 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx @@ -27,11 +27,10 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d) class DrawTrSurf_BezierCurve2d : public DrawTrSurf_Curve2d { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable Bezier curve from a Bezier curve of package Geom2d. - Standard_EXPORT - DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable Bezier curve from a Bezier curve of package Geom2d. + Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C); Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C, const Draw_Color& CurvColor, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierSurface.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierSurface.hxx index f888e9b693..bf4477c903 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierSurface.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_BezierSurface.hxx @@ -27,11 +27,10 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierSurface, DrawTrSurf_Surface) class DrawTrSurf_BezierSurface : public DrawTrSurf_Surface { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface, DrawTrSurf_Surface) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable Bezier curve from a Bezier curve of package Geom. - Standard_EXPORT - DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable Bezier curve from a Bezier curve of package Geom. + Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S); Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S, const Standard_Integer NbUIsos, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve.hxx index 8bce301995..c2098927fa 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve.hxx @@ -30,12 +30,11 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve, DrawTrSurf_Drawable) class DrawTrSurf_Curve : public DrawTrSurf_Drawable { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve, DrawTrSurf_Drawable) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable curve from a curve of package Geom. - Standard_EXPORT - DrawTrSurf_Curve(const Handle(Geom_Curve)& C, - const Standard_Boolean DispOrigin = Standard_True); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable curve from a curve of package Geom. + Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, + const Standard_Boolean DispOrigin = Standard_True); Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Draw_Color& aColor, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve2d.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve2d.hxx index 9e37ae1f8b..3f7ecbe636 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve2d.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Curve2d.hxx @@ -30,12 +30,11 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve2d, DrawTrSurf_Drawable) class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable) - Draw_Drawable3D_FACTORY public : - - //! creates a drawable curve from a curve of package Geom2d. - Standard_EXPORT - DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, - const Standard_Boolean DispOrigin = Standard_True); + Draw_Drawable3D_FACTORY +public: + //! creates a drawable curve from a curve of package Geom2d. + Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, + const Standard_Boolean DispOrigin = Standard_True); Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Draw_Color& aColor, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Point.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Point.hxx index dfb5240947..82f2d6757b 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Point.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Point.hxx @@ -29,10 +29,11 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Point, Draw_Drawable3D) class DrawTrSurf_Point : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Point, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - DrawTrSurf_Point(const gp_Pnt& P, const Draw_MarkerShape Shape, const Draw_Color& Col); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT DrawTrSurf_Point(const gp_Pnt& P, + const Draw_MarkerShape Shape, + const Draw_Color& Col); Standard_EXPORT DrawTrSurf_Point(const gp_Pnt2d& P, const Draw_MarkerShape Shape, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon2D.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon2D.hxx index 0b929c4c82..bb06a91372 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon2D.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon2D.hxx @@ -29,10 +29,9 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon2D, Draw_Drawable2D) class DrawTrSurf_Polygon2D : public Draw_Drawable2D { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D, Draw_Drawable2D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P); Handle(Poly_Polygon2D) Polygon2D() const { return myPolygon2D; } diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx index 79fc1deef3..f30b26b009 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Polygon3D.hxx @@ -29,10 +29,9 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon3D, Draw_Drawable3D) class DrawTrSurf_Polygon3D : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P); Handle(Poly_Polygon3D) Polygon3D() const { return myPolygon3D; } diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Surface.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Surface.hxx index 85168ab72f..e8eaf616c1 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Surface.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Surface.hxx @@ -30,14 +30,13 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Surface, DrawTrSurf_Drawable) class DrawTrSurf_Surface : public DrawTrSurf_Drawable { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Surface, DrawTrSurf_Drawable) - Draw_Drawable3D_FACTORY public : - - //! default drawing mode - //! Just the middle isoparametric curves are drawn. - //! The boundaries are yellow, the isoparametric curves are blues. - //! For the discretisation 50 points are computed in each parametric direction. - Standard_EXPORT - DrawTrSurf_Surface(const Handle(Geom_Surface)& S); + Draw_Drawable3D_FACTORY +public: + //! default drawing mode + //! Just the middle isoparametric curves are drawn. + //! The boundaries are yellow, the isoparametric curves are blues. + //! For the discretisation 50 points are computed in each parametric direction. + Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S); Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S, const Standard_Integer Nu, diff --git a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation.hxx b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation.hxx index 14de981195..925d6e0052 100644 --- a/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation.hxx +++ b/src/Draw/TKDraw/DrawTrSurf/DrawTrSurf_Triangulation.hxx @@ -33,10 +33,9 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D) class DrawTrSurf_Triangulation : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - DrawTrSurf_Triangulation(const Handle(Poly_Triangulation)& T); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT DrawTrSurf_Triangulation(const Handle(Poly_Triangulation)& T); Handle(Poly_Triangulation) Triangulation() const { return myTriangulation; } diff --git a/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx b/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx index 7d9024b103..75bf82673e 100644 --- a/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx +++ b/src/Draw/TKTopTest/HLRTest/HLRTest_Projector.hxx @@ -27,10 +27,9 @@ DEFINE_STANDARD_HANDLE(HLRTest_Projector, Draw_Drawable3D) class HLRTest_Projector : public Draw_Drawable3D { DEFINE_STANDARD_RTTIEXT(HLRTest_Projector, Draw_Drawable3D) - Draw_Drawable3D_FACTORY public : - - Standard_EXPORT - HLRTest_Projector(const HLRAlgo_Projector& P); + Draw_Drawable3D_FACTORY +public: + Standard_EXPORT HLRTest_Projector(const HLRAlgo_Projector& P); const HLRAlgo_Projector& Projector() const { return myProjector; } diff --git a/src/FoundationClasses/TKMath/Poly/Poly_PolygonOnTriangulation.hxx b/src/FoundationClasses/TKMath/Poly/Poly_PolygonOnTriangulation.hxx index 3433ebbf04..8a569018f7 100644 --- a/src/FoundationClasses/TKMath/Poly/Poly_PolygonOnTriangulation.hxx +++ b/src/FoundationClasses/TKMath/Poly/Poly_PolygonOnTriangulation.hxx @@ -127,11 +127,9 @@ public: const Handle(TColStd_HArray1OfReal)& Parameters() const { return myParameters; } Standard_DEPRECATED("Deprecated method, SetNode() should be used instead") - TColStd_Array1OfInteger& ChangeNodes() { return myNodes; } Standard_DEPRECATED("Deprecated method, SetParameter() should be used instead") - TColStd_Array1OfReal& ChangeParameters() { return myParameters->ChangeArray1(); } private: diff --git a/src/FoundationClasses/TKMath/Poly/Poly_Triangulation.hxx b/src/FoundationClasses/TKMath/Poly/Poly_Triangulation.hxx index f02af28ce9..5645de361a 100644 --- a/src/FoundationClasses/TKMath/Poly/Poly_Triangulation.hxx +++ b/src/FoundationClasses/TKMath/Poly/Poly_Triangulation.hxx @@ -335,15 +335,12 @@ public: Standard_EXPORT void SetNormals(const Handle(TShort_HArray1OfShortReal)& theNormals); Standard_DEPRECATED("Deprecated method, Triangle() should be used instead") - const Poly_Array1OfTriangle& Triangles() const { return myTriangles; } Standard_DEPRECATED("Deprecated method, SetTriangle() should be used instead") - Poly_Array1OfTriangle& ChangeTriangles() { return myTriangles; } Standard_DEPRECATED("Deprecated method, SetTriangle() should be used instead") - Poly_Triangle& ChangeTriangle(const Standard_Integer theIndex) { return myTriangles.ChangeValue(theIndex); diff --git a/src/FoundationClasses/TKernel/Message/Message_ProgressSentry.hxx b/src/FoundationClasses/TKernel/Message/Message_ProgressSentry.hxx index 5094f7aac5..00d082a55c 100644 --- a/src/FoundationClasses/TKernel/Message/Message_ProgressSentry.hxx +++ b/src/FoundationClasses/TKernel/Message/Message_ProgressSentry.hxx @@ -40,10 +40,7 @@ public: } //! Method Relieve() was replaced by Close() in Message_ProgressScope - void Relieve() - { - Close(); - } + void Relieve() { Close(); } private: //! Message_ProgressRange should be passed to constructor instead of Message_ProgressIndicator. diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_Map.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_Map.hxx index d24362d356..89dcb80a18 100644 --- a/src/FoundationClasses/TKernel/NCollection/NCollection_Map.hxx +++ b/src/FoundationClasses/TKernel/NCollection/NCollection_Map.hxx @@ -363,7 +363,6 @@ public: //! if they contain exactly the same keys. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean IsEqual(const NCollection_Map& theOther) const { return NCollection_MapAlgo::IsEqual(*this, theOther); @@ -373,7 +372,6 @@ public: //! This function checks if this map contains all keys of another map. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean Contains(const NCollection_Map& theOther) const { return NCollection_MapAlgo::Contains(*this, theOther); @@ -385,7 +383,6 @@ public: //! (result of the boolean operation) can also be passed as one of operands. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - void Union(const NCollection_Map& theLeft, const NCollection_Map& theRight) { NCollection_MapAlgo::Union(*this, theLeft, theRight); @@ -397,7 +394,6 @@ public: //! True if contents of this map is changed. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean Unite(const NCollection_Map& theOther) { return NCollection_MapAlgo::Unite(*this, theOther); @@ -406,7 +402,6 @@ public: //! Returns true if this and theMap have common elements. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean HasIntersection(const NCollection_Map& theMap) const { return NCollection_MapAlgo::HasIntersection(*this, theMap); @@ -418,7 +413,6 @@ public: //! boolean operation) can also be used as one of operands. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - void Intersection(const NCollection_Map& theLeft, const NCollection_Map& theRight) { NCollection_MapAlgo::Intersection(*this, theLeft, theRight); @@ -430,7 +424,6 @@ public: //! of this map is changed. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean Intersect(const NCollection_Map& theOther) { return NCollection_MapAlgo::Intersect(*this, theOther); @@ -442,7 +435,6 @@ public: //! one. All previous content of this Map is cleared. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - void Subtraction(const NCollection_Map& theLeft, const NCollection_Map& theRight) { NCollection_MapAlgo::Subtraction(*this, theLeft, theRight); @@ -455,7 +447,6 @@ public: //! Returns True if contents of this map is changed. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean Subtract(const NCollection_Map& theOther) { return NCollection_MapAlgo::Subtract(*this, theOther); @@ -467,7 +458,6 @@ public: //! cleared. This map (result of the boolean operation) can also be used as one of operands. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - void Difference(const NCollection_Map& theLeft, const NCollection_Map& theRight) { NCollection_MapAlgo::Difference(*this, theLeft, theRight); @@ -479,7 +469,6 @@ public: //! True if contents of this map is changed. Standard_DEPRECATED("This method will be removed right after 7.9. release. Use methods from " "NCollection_MapAlgo.hxx instead.") - Standard_Boolean Differ(const NCollection_Map& theOther) { return NCollection_MapAlgo::Differ(*this, theOther); diff --git a/src/FoundationClasses/TKernel/Standard/Standard_Atomic.hxx b/src/FoundationClasses/TKernel/Standard/Standard_Atomic.hxx index 21bc8d518b..fd843782ba 100644 --- a/src/FoundationClasses/TKernel/Standard/Standard_Atomic.hxx +++ b/src/FoundationClasses/TKernel/Standard/Standard_Atomic.hxx @@ -63,21 +63,18 @@ inline bool Standard_Atomic_CompareAndSwap(volatile int* theValue, // enforced. Standard_DEPRECATED("Standard_Atomic_Increment will be removed in OCCT 8.0.0") - int Standard_Atomic_Increment(volatile int* theValue) { return __sync_add_and_fetch(theValue, 1); } Standard_DEPRECATED("Standard_Atomic_Decrement will be removed in OCCT 8.0.0") - int Standard_Atomic_Decrement(volatile int* theValue) { return __sync_sub_and_fetch(theValue, 1); } Standard_DEPRECATED("Standard_Atomic_CompareAndSwap will be removed in OCCT 8.0.0") - bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int theNewValue) { return __sync_val_compare_and_swap(theValue, theOldValue, theNewValue) == theOldValue; @@ -102,21 +99,18 @@ extern "C" // Note that we safely cast int* to long*, as they have same size and endian-ness Standard_DEPRECATED("Standard_Atomic_Increment will be removed in OCCT 8.0.0") - int Standard_Atomic_Increment(volatile int* theValue) { return _InterlockedIncrement(reinterpret_cast(theValue)); } Standard_DEPRECATED("Standard_Atomic_Decrement will be removed in OCCT 8.0.0") - int Standard_Atomic_Decrement(volatile int* theValue) { return _InterlockedDecrement(reinterpret_cast(theValue)); } Standard_DEPRECATED("Standard_Atomic_CompareAndSwap will be removed in OCCT 8.0.0") - bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int theNewValue) { return _InterlockedCompareExchange(reinterpret_cast(theValue), @@ -131,21 +125,18 @@ bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int #include Standard_DEPRECATED("Standard_Atomic_Increment will be removed in OCCT 8.0.0") - int Standard_Atomic_Increment(volatile int* theValue) { return OSAtomicIncrement32Barrier(theValue); } Standard_DEPRECATED("Standard_Atomic_Decrement will be removed in OCCT 8.0.0") - int Standard_Atomic_Decrement(volatile int* theValue) { return OSAtomicDecrement32Barrier(theValue); } Standard_DEPRECATED("Standard_Atomic_CompareAndSwap will be removed in OCCT 8.0.0") - bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int theNewValue) { return OSAtomicCompareAndSwapInt(theOldValue, theNewValue, theValue); @@ -161,21 +152,18 @@ bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int #include Standard_DEPRECATED("Standard_Atomic_Increment will be removed in OCCT 8.0.0") - int Standard_Atomic_Increment(volatile int* theValue) { return __atomic_inc(theValue) + 1; // analog of __sync_fetch_and_add } Standard_DEPRECATED("Standard_Atomic_Decrement will be removed in OCCT 8.0.0") - int Standard_Atomic_Decrement(volatile int* theValue) { return __atomic_dec(theValue) - 1; // analog of __sync_fetch_and_sub } Standard_DEPRECATED("Standard_Atomic_CompareAndSwap will be removed in OCCT 8.0.0") - bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int theNewValue) { return __atomic_cmpxchg(theOldValue, theNewValue, theValue) == 0; @@ -187,21 +175,18 @@ bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int #error "Atomic operation isn't implemented for current platform!" #endif Standard_DEPRECATED("Standard_Atomic_Increment will be removed in OCCT 8.0.0") - int Standard_Atomic_Increment(volatile int* theValue) { return ++(*theValue); } Standard_DEPRECATED("Standard_Atomic_Decrement will be removed in OCCT 8.0.0") - int Standard_Atomic_Decrement(volatile int* theValue) { return --(*theValue); } Standard_DEPRECATED("Standard_Atomic_CompareAndSwap will be removed in OCCT 8.0.0") - bool Standard_Atomic_CompareAndSwap(volatile int* theValue, int theOldValue, int theNewValue) { if (*theValue == theOldValue) diff --git a/src/FoundationClasses/TKernel/Standard/Standard_Handle.hxx b/src/FoundationClasses/TKernel/Standard/Standard_Handle.hxx index 42fb9dd468..26523cdde6 100644 --- a/src/FoundationClasses/TKernel/Standard/Standard_Handle.hxx +++ b/src/FoundationClasses/TKernel/Standard/Standard_Handle.hxx @@ -189,7 +189,6 @@ public: //! For compatibility, define down casting operator from non-base type, as deprecated template Standard_DEPRECATED("down-casting from object of the same or unrelated type is meaningless") - static handle DownCast( const handle& theObject, typename opencascade::std::enable_if::value, void*>::type = 0) @@ -200,7 +199,6 @@ public: //! For compatibility, define down casting operator from non-base type, as deprecated template Standard_DEPRECATED("down-casting from object of the same or unrelated type is meaningless") - static handle DownCast( const T2* thePtr, typename opencascade::std::enable_if::value, void*>::type = 0) @@ -350,7 +348,6 @@ public: template Standard_DEPRECATED("Passing non-const reference to handle of base type in function is unsafe; " "use variable of exact type") - operator handle&() { // error "type is not a member of enable_if" will be generated if T2 is not sub-type of T diff --git a/src/FoundationClasses/TKernel/Standard/Standard_MMgrOpt.cxx b/src/FoundationClasses/TKernel/Standard/Standard_MMgrOpt.cxx index b90e2ff6fa..1ed2bf5e48 100644 --- a/src/FoundationClasses/TKernel/Standard/Standard_MMgrOpt.cxx +++ b/src/FoundationClasses/TKernel/Standard/Standard_MMgrOpt.cxx @@ -188,7 +188,7 @@ void Standard_MMgrOpt::Initialize() if (myNbPages < 100) myNbPages = 1000; - // get system-dependent page size + // get system-dependent page size #ifndef _WIN32 myPageSize = getpagesize(); if (!myPageSize) diff --git a/src/FoundationClasses/TKernel/Standard/Standard_Strtod.cxx b/src/FoundationClasses/TKernel/Standard/Standard_Strtod.cxx index 391ff38b66..75b1c320c3 100644 --- a/src/FoundationClasses/TKernel/Standard/Standard_Strtod.cxx +++ b/src/FoundationClasses/TKernel/Standard/Standard_Strtod.cxx @@ -6216,7 +6216,7 @@ Fast_failed1: b = multadd(b, 10, 0 MTb); } - /* Round off last digit */ + /* Round off last digit */ #ifdef Honor_FLT_ROUNDS if (mode > 1) diff --git a/src/FoundationClasses/TKernel/TCollection/TCollection.hxx b/src/FoundationClasses/TKernel/TCollection/TCollection.hxx index bd02dfef10..0b6d1a2fec 100644 --- a/src/FoundationClasses/TKernel/TCollection/TCollection.hxx +++ b/src/FoundationClasses/TKernel/TCollection/TCollection.hxx @@ -26,21 +26,21 @@ //! The package provides the services for the //! transient basic data structures. class Standard_DEPRECATED( - "Deprecated since OCCT 7.9, NCollection_Primes should be used instead of TCollection") -TCollection{public : + "Deprecated since OCCT 7.9, NCollection_Primes should be used instead of TCollection") TCollection +{ +public: + DEFINE_STANDARD_ALLOC - DEFINE_STANDARD_ALLOC - - //! Returns a prime number greater than suitable - //! to dimension a Map. When becomes great there - //! is a limit on the result (today the limit is - //! around 1 000 000). This is not a limit of the number of - //! items but a limit in the number of buckets. i.e. - //! there will be more collisions in the map. - static Standard_Integer NextPrimeForMap(const Standard_Integer I){ - return NCollection_Primes::NextPrimeForMap(I); -} -} -; + //! Returns a prime number greater than suitable + //! to dimension a Map. When becomes great there + //! is a limit on the result (today the limit is + //! around 1 000 000). This is not a limit of the number of + //! items but a limit in the number of buckets. i.e. + //! there will be more collisions in the map. + static Standard_Integer NextPrimeForMap(const Standard_Integer I) + { + return NCollection_Primes::NextPrimeForMap(I); + } +}; #endif // _TCollection_HeaderFile diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx index a23a0ec779..c2c087ff95 100644 --- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx +++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_BuilderON.cxx @@ -2269,7 +2269,7 @@ void TopOpeBRepBuild_BuilderON::GFillONPartsWES2(const Handle(TopOpeBRepDS_Inter gp_Vec ntOOFOR = FUN_tool_nggeomF(uv, OOFOR); if (OOFOR.Orientation() == TopAbs_REVERSED) ntOOFOR.Reverse(); - // xxFCX : + // xxFCX : #ifdef OCCT_DEBUG // Standard_Real t1 =factor*BRep_Tool::Tolerance(Esd); #endif diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx index c345f10a43..06c84f7673 100644 --- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx +++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx @@ -388,7 +388,7 @@ Standard_Boolean GeomFill_NSections::D1(const Standard_Real V, if (NullWeight) return Standard_False; - // verif par diff finies sous debug sauf pour les surfaces periodiques + // verif par diff finies sous debug sauf pour les surfaces periodiques #ifdef OCCT_DEBUG if (!mySurface->IsVPeriodic()) { @@ -498,7 +498,7 @@ Standard_Boolean GeomFill_NSections::D2(const Standard_Real V, if (NullWeight) return Standard_False; - // verif par diff finies sous debug sauf pour les surfaces periodiques + // verif par diff finies sous debug sauf pour les surfaces periodiques #ifdef OCCT_DEBUG if (!mySurface->IsVPeriodic()) { diff --git a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx index ab456debe0..1a8309bbf1 100644 --- a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx +++ b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx @@ -146,7 +146,6 @@ public: public: Standard_DEPRECATED("ModifyOffsetSurfaceMode() should be used instead") - Standard_Boolean& ModifyOffestSurfaceMode() { return myOffsetSurfaceMode; } private: diff --git a/src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_FaceConnect.cxx b/src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_FaceConnect.cxx index a59f750bad..d0cb919dad 100644 --- a/src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_FaceConnect.cxx +++ b/src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_FaceConnect.cxx @@ -309,7 +309,8 @@ TopoDS_Shell ShapeFix_FaceConnect::Build(const TopoDS_Shell& shell, { try { - OCC_CATCH_SIGNALS theSewer.Perform(); + OCC_CATCH_SIGNALS + theSewer.Perform(); } catch (Standard_Failure const&) { diff --git a/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Tool2d.cxx b/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Tool2d.cxx index de882c1624..5b043cc759 100644 --- a/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Tool2d.cxx +++ b/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Tool2d.cxx @@ -1503,8 +1503,8 @@ void MAT2d_DrawCurve(const Handle(Geom2d_Curve)& aCurve, const Standard_Integer else dr = new DrawTrSurf_Curve2d(CurveDraw, Couleur, 500); - // dout << dr; - // dout.Flush(); + // dout << dr; + // dout.Flush(); #endif } diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfCircle.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfCircle.hxx index 61fefdd564..787707dd85 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfCircle.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfCircle.hxx @@ -93,7 +93,7 @@ public: //! Exceptions StdFail_NotDone if no arc of circle is constructed. Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const; - operator const Handle(Geom_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom_TrimmedCurve)&() const { return Value(); } private: Handle(Geom_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfEllipse.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfEllipse.hxx index a27fdc5b69..d6d7bcc106 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfEllipse.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfEllipse.hxx @@ -70,7 +70,7 @@ public: //! Returns the constructed arc of ellipse. Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const; - operator const Handle(Geom_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom_TrimmedCurve)&() const { return Value(); } private: Handle(Geom_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfHyperbola.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfHyperbola.hxx index b11eb605b2..bb73e27c17 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfHyperbola.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfHyperbola.hxx @@ -68,7 +68,7 @@ public: //! Returns the constructed arc of hyperbola. Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const; - operator const Handle(Geom_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom_TrimmedCurve)&() const { return Value(); } private: Handle(Geom_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfParabola.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfParabola.hxx index 982ccd6fda..5e5f4f5930 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfParabola.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeArcOfParabola.hxx @@ -65,7 +65,7 @@ public: //! Returns the constructed arc of parabola. Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const; - operator const Handle(Geom_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom_TrimmedCurve)&() const { return Value(); } private: Handle(Geom_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeCircle.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeCircle.hxx index fb3c86cd0c..1cd9e530f5 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeCircle.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeCircle.hxx @@ -98,7 +98,7 @@ public: //! StdFail_NotDone if no circle is constructed. Standard_EXPORT const Handle(Geom_Circle)& Value() const; - operator const Handle(Geom_Circle) & () const { return Value(); } + operator const Handle(Geom_Circle)&() const { return Value(); } private: Handle(Geom_Circle) TheCircle; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeConicalSurface.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeConicalSurface.hxx index 78a2b10a18..044a7b540b 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeConicalSurface.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeConicalSurface.hxx @@ -110,7 +110,7 @@ public: //! StdFail_NotDone if no cone is constructed. Standard_EXPORT const Handle(Geom_ConicalSurface)& Value() const; - operator const Handle(Geom_ConicalSurface) & () const { return Value(); } + operator const Handle(Geom_ConicalSurface)&() const { return Value(); } private: Handle(Geom_ConicalSurface) TheCone; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeCylindricalSurface.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeCylindricalSurface.hxx index 936016b33b..729f8cf400 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeCylindricalSurface.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeCylindricalSurface.hxx @@ -106,7 +106,7 @@ public: //! Exceptions StdFail_NotDone if no cylinder is constructed. Standard_EXPORT const Handle(Geom_CylindricalSurface)& Value() const; - operator const Handle(Geom_CylindricalSurface) & () const { return Value(); } + operator const Handle(Geom_CylindricalSurface)&() const { return Value(); } private: Handle(Geom_CylindricalSurface) TheCylinder; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeEllipse.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeEllipse.hxx index 497afec3d3..fc7b43b240 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeEllipse.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeEllipse.hxx @@ -75,7 +75,7 @@ public: //! Exceptions StdFail_NotDone if no ellipse is constructed. Standard_EXPORT const Handle(Geom_Ellipse)& Value() const; - operator const Handle(Geom_Ellipse) & () const { return Value(); } + operator const Handle(Geom_Ellipse)&() const { return Value(); } private: Handle(Geom_Ellipse) TheEllipse; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeHyperbola.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeHyperbola.hxx index c2d113ef8d..f68dc7bdf2 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeHyperbola.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeHyperbola.hxx @@ -85,7 +85,7 @@ public: //! Exceptions StdFail_NotDone if no hyperbola is constructed. Standard_EXPORT const Handle(Geom_Hyperbola)& Value() const; - operator const Handle(Geom_Hyperbola) & () const { return Value(); } + operator const Handle(Geom_Hyperbola)&() const { return Value(); } private: Handle(Geom_Hyperbola) TheHyperbola; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeLine.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeLine.hxx index 4c3130edf3..3d18377972 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeLine.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeLine.hxx @@ -70,7 +70,7 @@ public: //! Exceptions StdFail_NotDone if no line is constructed. Standard_EXPORT const Handle(Geom_Line)& Value() const; - operator const Handle(Geom_Line) & () const { return Value(); } + operator const Handle(Geom_Line)&() const { return Value(); } private: Handle(Geom_Line) TheLine; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeMirror.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeMirror.hxx index 8991e595b3..9c7ba6c090 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeMirror.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeMirror.hxx @@ -60,7 +60,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom_Transformation)& Value() const; - operator const Handle(Geom_Transformation) & () const { return Value(); } + operator const Handle(Geom_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakePlane.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakePlane.hxx index c62097311c..2a0d8ad740 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakePlane.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakePlane.hxx @@ -87,7 +87,7 @@ public: //! Exceptions StdFail_NotDone if no plane is constructed. Standard_EXPORT const Handle(Geom_Plane)& Value() const; - operator const Handle(Geom_Plane) & () const { return Value(); } + operator const Handle(Geom_Plane)&() const { return Value(); } private: Handle(Geom_Plane) ThePlane; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeRotation.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeRotation.hxx index 3110d6dcd5..80177f8ac8 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeRotation.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeRotation.hxx @@ -55,7 +55,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom_Transformation)& Value() const; - operator const Handle(Geom_Transformation) & () const { return Value(); } + operator const Handle(Geom_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeScale.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeScale.hxx index 4328e8d1b3..66558b5d7b 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeScale.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeScale.hxx @@ -46,7 +46,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom_Transformation)& Value() const; - operator const Handle(Geom_Transformation) & () const { return Value(); } + operator const Handle(Geom_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeSegment.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeSegment.hxx index 83742012dc..335cb29cfa 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeSegment.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeSegment.hxx @@ -67,7 +67,7 @@ public: //! Returns the constructed line segment. Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const; - operator const Handle(Geom_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom_TrimmedCurve)&() const { return Value(); } private: Handle(Geom_TrimmedCurve) TheSegment; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeTranslation.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeTranslation.hxx index 5e7b470515..c9420b8ef2 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeTranslation.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeTranslation.hxx @@ -47,7 +47,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom_Transformation)& Value() const; - operator const Handle(Geom_Transformation) & () const { return Value(); } + operator const Handle(Geom_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCone.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCone.hxx index f0f324e55a..4c276f99fe 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCone.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCone.hxx @@ -78,7 +78,7 @@ public: //! StdFail_NotDone if no trimmed cone is constructed. Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const; - operator const Handle(Geom_RectangularTrimmedSurface) & () const { return Value(); } + operator const Handle(Geom_RectangularTrimmedSurface)&() const { return Value(); } private: Handle(Geom_RectangularTrimmedSurface) TheCone; diff --git a/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCylinder.hxx b/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCylinder.hxx index 40b24c0039..bc8a4eead8 100644 --- a/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCylinder.hxx +++ b/src/ModelingData/TKGeomBase/GC/GC_MakeTrimmedCylinder.hxx @@ -71,7 +71,7 @@ public: //! StdFail_NotDone if no trimmed cylinder is constructed. Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const; - operator const Handle(Geom_RectangularTrimmedSurface) & () const { return Value(); } + operator const Handle(Geom_RectangularTrimmedSurface)&() const { return Value(); } private: Handle(Geom_RectangularTrimmedSurface) TheCyl; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfCircle.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfCircle.hxx index 1ebdee1d2e..b9b91c6d4b 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfCircle.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfCircle.hxx @@ -78,7 +78,7 @@ public: //! Exceptions StdFail_NotDone if no arc of circle is constructed. Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const; - operator const Handle(Geom2d_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom2d_TrimmedCurve)&() const { return Value(); } private: Handle(Geom2d_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfEllipse.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfEllipse.hxx index e18f077bea..43960c2af7 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfEllipse.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfEllipse.hxx @@ -70,7 +70,7 @@ public: //! Returns the constructed arc of ellipse. Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const; - operator const Handle(Geom2d_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom2d_TrimmedCurve)&() const { return Value(); } private: Handle(Geom2d_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfHyperbola.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfHyperbola.hxx index 8aa0cdcf9e..50e473a6fa 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfHyperbola.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfHyperbola.hxx @@ -69,7 +69,7 @@ public: //! Returns the constructed arc of hyperbola. Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const; - operator const Handle(Geom2d_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom2d_TrimmedCurve)&() const { return Value(); } private: Handle(Geom2d_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfParabola.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfParabola.hxx index 06b098d859..802742dd1a 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfParabola.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeArcOfParabola.hxx @@ -69,7 +69,7 @@ public: //! Returns the constructed arc of parabola. Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const; - operator const Handle(Geom2d_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom2d_TrimmedCurve)&() const { return Value(); } private: Handle(Geom2d_TrimmedCurve) TheArc; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeCircle.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeCircle.hxx index 1f4ff35824..544c14a5e2 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeCircle.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeCircle.hxx @@ -102,7 +102,7 @@ public: //! Exceptions StdFail_NotDone if no circle is constructed. Standard_EXPORT const Handle(Geom2d_Circle)& Value() const; - operator const Handle(Geom2d_Circle) & () const { return Value(); } + operator const Handle(Geom2d_Circle)&() const { return Value(); } private: Handle(Geom2d_Circle) TheCircle; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeEllipse.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeEllipse.hxx index 8f69139cfd..aca7852aff 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeEllipse.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeEllipse.hxx @@ -85,7 +85,7 @@ public: //! Exceptions StdFail_NotDone if no ellipse is constructed. Standard_EXPORT const Handle(Geom2d_Ellipse)& Value() const; - operator const Handle(Geom2d_Ellipse) & () const { return Value(); } + operator const Handle(Geom2d_Ellipse)&() const { return Value(); } private: Handle(Geom2d_Ellipse) TheEllipse; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeHyperbola.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeHyperbola.hxx index da2ddaa12a..aba24738db 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeHyperbola.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeHyperbola.hxx @@ -107,7 +107,7 @@ public: //! Exceptions: StdFail_NotDone if no hyperbola is constructed. Standard_EXPORT const Handle(Geom2d_Hyperbola)& Value() const; - operator const Handle(Geom2d_Hyperbola) & () const { return Value(); } + operator const Handle(Geom2d_Hyperbola)&() const { return Value(); } private: Handle(Geom2d_Hyperbola) TheHyperbola; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeLine.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeLine.hxx index 8b49bdcf84..474cfcd1ac 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeLine.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeLine.hxx @@ -69,7 +69,7 @@ public: //! Exceptions StdFail_NotDone if no line is constructed. Standard_EXPORT const Handle(Geom2d_Line)& Value() const; - operator const Handle(Geom2d_Line) & () const { return Value(); } + operator const Handle(Geom2d_Line)&() const { return Value(); } private: Handle(Geom2d_Line) TheLine; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeMirror.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeMirror.hxx index d4bfa1e1bd..d70055a72d 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeMirror.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeMirror.hxx @@ -52,7 +52,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom2d_Transformation)& Value() const; - operator const Handle(Geom2d_Transformation) & () const { return Value(); } + operator const Handle(Geom2d_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeParabola.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeParabola.hxx index fad4979a60..be98177e9c 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeParabola.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeParabola.hxx @@ -100,7 +100,7 @@ public: //! Exceptions StdFail_NotDone if no parabola is constructed. Standard_EXPORT const Handle(Geom2d_Parabola)& Value() const; - operator const Handle(Geom2d_Parabola) & () const { return Value(); } + operator const Handle(Geom2d_Parabola)&() const { return Value(); } private: Handle(Geom2d_Parabola) TheParabola; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeRotation.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeRotation.hxx index ba3ec71166..4db3832343 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeRotation.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeRotation.hxx @@ -42,7 +42,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom2d_Transformation)& Value() const; - operator const Handle(Geom2d_Transformation) & () const { return Value(); } + operator const Handle(Geom2d_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeScale.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeScale.hxx index 0dc785aef6..13898bad56 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeScale.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeScale.hxx @@ -45,7 +45,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom2d_Transformation)& Value() const; - operator const Handle(Geom2d_Transformation) & () const { return Value(); } + operator const Handle(Geom2d_Transformation)&() const { return Value(); } protected: private: diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeSegment.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeSegment.hxx index 36574c81f6..644e3d23e3 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeSegment.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeSegment.hxx @@ -81,7 +81,7 @@ public: //! Exceptions StdFail_NotDone if no line segment is constructed. Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const; - operator const Handle(Geom2d_TrimmedCurve) & () const { return Value(); } + operator const Handle(Geom2d_TrimmedCurve)&() const { return Value(); } private: Handle(Geom2d_TrimmedCurve) TheSegment; diff --git a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeTranslation.hxx b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeTranslation.hxx index b6262c9887..97bbb120b1 100644 --- a/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeTranslation.hxx +++ b/src/ModelingData/TKGeomBase/GCE2d/GCE2d_MakeTranslation.hxx @@ -47,7 +47,7 @@ public: //! Returns the constructed transformation. Standard_EXPORT const Handle(Geom2d_Transformation)& Value() const; - operator const Handle(Geom2d_Transformation) & () const { return Value(); } + operator const Handle(Geom2d_Transformation)&() const { return Value(); } protected: private: diff --git a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx index 9876407edd..e110ceed35 100644 --- a/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx +++ b/src/Visualization/TKMeshVS/MeshVS/MeshVS_Mesh.cxx @@ -930,10 +930,10 @@ void MeshVS_Mesh::HilightSelected(const Handle(PrsMgr_PresentationManager)& theP if (HasPresentation()) aSelectionPrs->SetTransformPersistence(Presentation()->TransformPersistence()); - //---------------- + //---------------- - // It is very important to call this parent method, because it check whether - // mySelectionPrs is created and if not, create it. + // It is very important to call this parent method, because it check whether + // mySelectionPrs is created and if not, create it. #ifdef OCCT_DEBUG OSD_Timer gTimer; diff --git a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Context.hxx b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Context.hxx index 75b94c1426..8f60484203 100644 --- a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Context.hxx +++ b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Context.hxx @@ -851,7 +851,6 @@ public: //! @name methods to alter or retrieve current state //! Bind specified texture set to current context taking into account active GLSL program. Standard_DEPRECATED("BindTextures() with explicit GLSL program should be used instead") - Handle(OpenGl_TextureSet) BindTextures(const Handle(OpenGl_TextureSet)& theTextures) { return BindTextures(theTextures, myActiveProgram); diff --git a/src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx b/src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx index 2e265ca74a..eb8399471c 100644 --- a/src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx +++ b/src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameBuffer.hxx @@ -282,7 +282,6 @@ public: //! Initialize FBO for rendering into single/multiple color buffer and depth textures. Standard_DEPRECATED("Obsolete method, use Init() taking Graphic3d_Vec2i") - bool Init(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theSizeX, const Standard_Integer theSizeY, @@ -299,7 +298,6 @@ public: //! Initialize FBO for rendering into textures. Standard_DEPRECATED("Obsolete method, use Init() taking Graphic3d_Vec2i") - bool Init(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theSizeX, const Standard_Integer theSizeY, @@ -316,7 +314,6 @@ public: //! Initialize FBO for rendering into single/multiple color buffer and depth textures. Standard_DEPRECATED("Obsolete method, use Init() taking Graphic3d_Vec2i") - bool Init(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theSizeX, const Standard_Integer theSizeY, @@ -333,7 +330,6 @@ public: //! (Re-)initialize FBO with specified dimensions. Standard_DEPRECATED("Obsolete method, use InitLazy() taking Graphic3d_Vec2i") - bool InitLazy(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theViewportSizeX, const Standard_Integer theViewportSizeY, @@ -350,7 +346,6 @@ public: //! (Re-)initialize FBO with specified dimensions. Standard_DEPRECATED("Obsolete method, use InitLazy() taking Graphic3d_Vec2i") - bool InitLazy(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theViewportSizeX, const Standard_Integer theViewportSizeY, @@ -369,7 +364,6 @@ public: //! The Render Buffer Objects will be used for Color, Depth and Stencil attachments (as opposite //! to textures). Standard_DEPRECATED("Obsolete method, use InitWithRB() taking Graphic3d_Vec2i") - bool InitWithRB(const Handle(OpenGl_Context)& theGlCtx, const Standard_Integer theSizeX, const Standard_Integer theSizeY, diff --git a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx index 416d764048..37caf3fdec 100644 --- a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx +++ b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx @@ -259,7 +259,6 @@ public: Standard_DEPRECATED("Deprecated method, OpenGl_TextureFormat should be passed instead of " "separate parameters") - bool Init(const Handle(OpenGl_Context)& theCtx, const Standard_Integer theTextFormat, const unsigned int thePixelFormat, @@ -278,7 +277,6 @@ public: Standard_DEPRECATED("Deprecated method, theIsColorMap parameter should be explicitly " "specified") - bool Init(const Handle(OpenGl_Context)& theCtx, const Image_PixMap& theImage, const Graphic3d_TypeOfTexture theType) @@ -288,7 +286,6 @@ public: Standard_DEPRECATED("Deprecated method, OpenGl_TextureFormat should be passed instead of " "separate parameters") - bool Init3D(const Handle(OpenGl_Context)& theCtx, const Standard_Integer theTextFormat, const unsigned int thePixelFormat, diff --git a/src/Visualization/TKOpenGl/OpenGl/OpenGl_TextureSet.hxx b/src/Visualization/TKOpenGl/OpenGl/OpenGl_TextureSet.hxx index cf25d7b351..6e05dac5c4 100644 --- a/src/Visualization/TKOpenGl/OpenGl/OpenGl_TextureSet.hxx +++ b/src/Visualization/TKOpenGl/OpenGl/OpenGl_TextureSet.hxx @@ -31,9 +31,9 @@ public: Handle(OpenGl_Texture) Texture; Graphic3d_TextureUnit Unit; - operator const Handle(OpenGl_Texture) & () const { return Texture; } + operator const Handle(OpenGl_Texture)&() const { return Texture; } - operator Handle(OpenGl_Texture) & () { return Texture; } + operator Handle(OpenGl_Texture)&() { return Texture; } TextureSlot() : Unit(Graphic3d_TextureUnit_0) diff --git a/src/Visualization/TKService/Font/Font_FTFont.hxx b/src/Visualization/TKService/Font/Font_FTFont.hxx index 0bfb8e6fa1..7c325dd724 100755 --- a/src/Visualization/TKService/Font/Font_FTFont.hxx +++ b/src/Visualization/TKService/Font/Font_FTFont.hxx @@ -308,7 +308,6 @@ public: //! @return true on success Standard_DEPRECATED("Deprecated method, Font_FTFontParams should be used for passing " "parameters") - bool Init(const NCollection_String& theFontPath, unsigned int thePointSize, unsigned int theResolution) @@ -327,7 +326,6 @@ public: //! @return true on success Standard_DEPRECATED("Deprecated method, Font_FTFontParams should be used for passing " "parameters") - bool Init(const NCollection_String& theFontName, Font_FontAspect theFontAspect, unsigned int thePointSize, diff --git a/src/Visualization/TKService/Font/Font_TextFormatter.hxx b/src/Visualization/TKService/Font/Font_TextFormatter.hxx index 3c61ecb2c1..0be56c2c63 100755 --- a/src/Visualization/TKService/Font/Font_TextFormatter.hxx +++ b/src/Visualization/TKService/Font/Font_TextFormatter.hxx @@ -162,7 +162,6 @@ public: Standard_EXPORT void Format(); Standard_DEPRECATED("BottomLeft should be used instead") - const NCollection_Vec2& TopLeft(const Standard_Integer theIndex) const { return BottomLeft(theIndex); diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_AspectFillArea3d.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_AspectFillArea3d.hxx index 1d0573586d..33a79a8a0d 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_AspectFillArea3d.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_AspectFillArea3d.hxx @@ -57,7 +57,6 @@ public: public: Standard_DEPRECATED("Deprecated method, ToDrawEdges() should be used instead") - bool Edge() const { return ToDrawEdges(); } }; diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_Aspects.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_Aspects.hxx index 0093853e42..85cc1ba0b7 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_Aspects.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_Aspects.hxx @@ -548,7 +548,6 @@ public: public: Standard_DEPRECATED("Deprecated method, FaceCulling() should be used instead") - bool ToSuppressBackFaces() const { return myFaceCulling == Graphic3d_TypeOfBackfacingModel_BackCulled @@ -557,7 +556,6 @@ public: Standard_DEPRECATED("Deprecated method, SetFaceCulling() should be used " "instead") - void SetSuppressBackFaces(bool theToSuppress) { myFaceCulling = theToSuppress ? Graphic3d_TypeOfBackfacingModel_Auto @@ -565,7 +563,6 @@ public: } Standard_DEPRECATED("Deprecated method, FaceCulling() should be used instead") - bool BackFace() const { return myFaceCulling == Graphic3d_TypeOfBackfacingModel_BackCulled @@ -573,11 +570,9 @@ public: } Standard_DEPRECATED("Deprecated method, SetFaceCulling() should be used instead") - void AllowBackFace() { myFaceCulling = Graphic3d_TypeOfBackfacingModel_DoubleSided; } Standard_DEPRECATED("Deprecated method, SetFaceCulling() should be used instead") - void SuppressBackFace() { myFaceCulling = Graphic3d_TypeOfBackfacingModel_Auto; } protected: diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_MaterialAspect.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_MaterialAspect.hxx index f65f3ae0b9..872b14d7df 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_MaterialAspect.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_MaterialAspect.hxx @@ -241,7 +241,6 @@ public: //! Deactivates the reflective properties of the surface with specified reflection type. Standard_DEPRECATED("Deprecated method, specific material component should be zerroed " "instead") - void SetReflectionModeOff(const Graphic3d_TypeOfReflection theType) { if (!ReflectionMode(theType)) diff --git a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx index 2ae8fcbad1..5516579dd3 100644 --- a/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx +++ b/src/Visualization/TKService/Graphic3d/Graphic3d_Structure.hxx @@ -88,7 +88,6 @@ public: Standard_DEPRECATED("Deprecated since OCCT7.7, Graphic3d_DisplayPriority should be passed " "instead of integer number to SetDisplayPriority()") - void SetDisplayPriority(const Standard_Integer thePriority) { SetDisplayPriority((Graphic3d_DisplayPriority)thePriority); @@ -328,7 +327,6 @@ public: Standard_Boolean theWithCheck = Standard_False); Standard_DEPRECATED("Deprecated short-cut") - void Connect(const Handle(Graphic3d_Structure)& thePrs) { Connect(thePrs.get(), Graphic3d_TOC_DESCENDANT); @@ -341,7 +339,6 @@ public: Standard_EXPORT void Disconnect(Graphic3d_Structure* theStructure); Standard_DEPRECATED("Deprecated alias for Disconnect()") - void Remove(const Handle(Graphic3d_Structure)& thePrs) { Disconnect(thePrs.get()); } //! If Atype is TOC_DESCENDANT then suppress all @@ -351,7 +348,6 @@ public: Standard_EXPORT void DisconnectAll(const Graphic3d_TypeOfConnection AType); Standard_DEPRECATED("Deprecated alias for DisconnectAll()") - void RemoveAll() { DisconnectAll(Graphic3d_TOC_DESCENDANT); } //! Returns the group of structures : diff --git a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx index 5581ef45b6..d6c44640bd 100644 --- a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx +++ b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx @@ -314,7 +314,6 @@ public: //! @name object presence management (View affinity, Layer, Priority) Standard_DEPRECATED("Deprecated since OCCT7.7, Graphic3d_DisplayPriority should be passed " "instead of integer number to SetDisplayPriority()") - void SetDisplayPriority(const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer thePriority) { @@ -574,7 +573,6 @@ public: //! @name Selection management Standard_EXPORT Bnd_Box BoundingBoxOfSelection(const Handle(V3d_View)& theView) const; Standard_DEPRECATED("BoundingBoxOfSelection() should be called with View argument") - Bnd_Box BoundingBoxOfSelection() const { return BoundingBoxOfSelection(Handle(V3d_View)()); } //! Sets list of owner selected/deselected using specified selection scheme. @@ -1230,7 +1228,6 @@ public: //! @name iso-line display attributes public: Standard_DEPRECATED("Deprecated method Display() with obsolete argument " "theToAllowDecomposition") - void Display(const Handle(AIS_InteractiveObject)& theIObj, const Standard_Integer theDispMode, const Standard_Integer theSelectionMode, @@ -1244,7 +1241,6 @@ public: Standard_DEPRECATED("Deprecated method Load() with obsolete last argument " "theToAllowDecomposition") - void Load(const Handle(AIS_InteractiveObject)& theObj, Standard_Integer theSelectionMode, Standard_Boolean) @@ -1256,7 +1252,6 @@ public: //! On dynamic detection by the mouse cursor, sensitive primitives are highlighted. //! The highlight color of entities detected by mouse movement is white by default. Standard_DEPRECATED("Deprecated method Hilight()") - void Hilight(const Handle(AIS_InteractiveObject)& theObj, const Standard_Boolean theIsToUpdateViewer) { @@ -1326,7 +1321,6 @@ public: //! selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void SetCurrentObject(const Handle(AIS_InteractiveObject)& theIObj, const Standard_Boolean theToUpdateViewer) { @@ -1339,7 +1333,6 @@ public: //! object, if 0 selection of the object is empty this method simply does nothing. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void AddOrRemoveCurrentObject(const Handle(AIS_InteractiveObject)& theObj, const Standard_Boolean theIsToUpdateViewer) { @@ -1351,7 +1344,6 @@ public: //! current objects; those selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void UpdateCurrent() { UpdateSelected(Standard_True); } //! Returns true if there is a non-null interactive object in Neutral Point. @@ -1370,7 +1362,6 @@ public: //! selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void InitCurrent() { InitSelected(); } //! Returns true if there is another object found by the scan of the list of current objects. @@ -1386,7 +1377,6 @@ public: //! selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void NextCurrent() { NextSelected(); } //! Returns the current interactive object. @@ -1407,7 +1397,6 @@ public: //! selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void HilightCurrents(const Standard_Boolean theToUpdateViewer) { HilightSelected(theToUpdateViewer); @@ -1418,7 +1407,6 @@ public: //! selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void UnhilightCurrents(const Standard_Boolean theToUpdateViewer) { UnhilightSelected(theToUpdateViewer); @@ -1429,7 +1417,6 @@ public: //! objects; those selected in open local context, selected objects. Standard_DEPRECATED("Local Context is deprecated - local selection should be used without Local " "Context") - void ClearCurrents(const Standard_Boolean theToUpdateViewer) { ClearSelected(theToUpdateViewer); } //! @return current mouse-detected shape or empty (null) shape, if current interactive object diff --git a/src/Visualization/TKV3d/Prs3d/Prs3d_Drawer.hxx b/src/Visualization/TKV3d/Prs3d/Prs3d_Drawer.hxx index a548b4bc61..ea4c0937a2 100644 --- a/src/Visualization/TKV3d/Prs3d/Prs3d_Drawer.hxx +++ b/src/Visualization/TKV3d/Prs3d/Prs3d_Drawer.hxx @@ -883,23 +883,18 @@ public: public: //! @name deprecated methods Standard_DEPRECATED("SetDeviationAngle() should be used instead") - void SetHLRAngle(const Standard_Real theAngle) { SetDeviationAngle(theAngle); } Standard_DEPRECATED("DeviationAngle() should be used instead") - Standard_Real HLRAngle() const { return DeviationAngle(); } Standard_DEPRECATED("SetDeviationAngle() should be used instead") - void SetHLRAngle() { SetDeviationAngle(); } Standard_DEPRECATED("HasOwnDeviationAngle() should be used instead") - Standard_Boolean HasOwnHLRDeviationAngle() const { return HasOwnDeviationAngle(); } Standard_DEPRECATED("PreviousDeviationAngle() should be used instead") - Standard_Real PreviousHLRDeviationAngle() const { return PreviousDeviationAngle(); } protected: diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentation.hxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentation.hxx index 792f1c6890..10b6e67368 100644 --- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentation.hxx +++ b/src/Visualization/TKV3d/PrsMgr/PrsMgr_Presentation.hxx @@ -37,7 +37,6 @@ public: Standard_EXPORT ~PrsMgr_Presentation(); Standard_DEPRECATED("Dummy to simplify porting - returns self") - Prs3d_Presentation* Presentation() { return this; } //! returns the PresentationManager in which the presentation has been created. diff --git a/src/Visualization/TKV3d/Select3D/Select3D_SensitiveCircle.hxx b/src/Visualization/TKV3d/Select3D/Select3D_SensitiveCircle.hxx index a1b93746c8..691c121e40 100644 --- a/src/Visualization/TKV3d/Select3D/Select3D_SensitiveCircle.hxx +++ b/src/Visualization/TKV3d/Select3D/Select3D_SensitiveCircle.hxx @@ -36,7 +36,6 @@ public: //! owner theOwnerId, the circle theCircle, the boolean //! theIsFilled and the number of points theNbPnts. Standard_DEPRECATED("Deprecated constructor, theNbPnts parameter will be ignored") - Select3D_SensitiveCircle(const Handle(SelectMgr_EntityOwner)& theOwnerId, const gp_Circ& theCircle, const Standard_Boolean theIsFilled, diff --git a/src/Visualization/TKV3d/SelectBasics/SelectBasics_SelectingVolumeManager.hxx b/src/Visualization/TKV3d/SelectBasics/SelectBasics_SelectingVolumeManager.hxx index 3c58dbfa61..924b1d790d 100644 --- a/src/Visualization/TKV3d/SelectBasics/SelectBasics_SelectingVolumeManager.hxx +++ b/src/Visualization/TKV3d/SelectBasics/SelectBasics_SelectingVolumeManager.hxx @@ -180,7 +180,6 @@ public: public: Standard_DEPRECATED("Deprecated alias for OverlapsBox()") - Standard_Boolean Overlaps(const NCollection_Vec3& theBoxMin, const NCollection_Vec3& theBoxMax, SelectBasics_PickResult& thePickResult) const @@ -189,7 +188,6 @@ public: } Standard_DEPRECATED("Deprecated alias for OverlapsBox()") - Standard_Boolean Overlaps(const NCollection_Vec3& theBoxMin, const NCollection_Vec3& theBoxMax, Standard_Boolean* theInside = NULL) const @@ -198,14 +196,12 @@ public: } Standard_DEPRECATED("Deprecated alias for OverlapsPoint()") - Standard_Boolean Overlaps(const gp_Pnt& thePnt, SelectBasics_PickResult& thePickResult) const { return OverlapsPoint(thePnt, thePickResult); } Standard_DEPRECATED("Deprecated alias for OverlapsPoint()") - Standard_Boolean Overlaps(const gp_Pnt& thePnt) const { return OverlapsPoint(thePnt); } Standard_DEPRECATED("Deprecated alias for OverlapsPolygon()") @@ -214,7 +210,6 @@ public: SelectBasics_PickResult& thePickResult) const; Standard_DEPRECATED("Deprecated alias for OverlapsPolygon()") - Standard_Boolean Overlaps(const TColgp_Array1OfPnt& theArrayOfPts, Standard_Integer theSensType, SelectBasics_PickResult& thePickResult) const @@ -223,7 +218,6 @@ public: } Standard_DEPRECATED("Deprecated alias for OverlapsSegment()") - Standard_Boolean Overlaps(const gp_Pnt& thePnt1, const gp_Pnt& thePnt2, SelectBasics_PickResult& thePickResult) const @@ -232,7 +226,6 @@ public: } Standard_DEPRECATED("Deprecated alias for OverlapsTriangle()") - Standard_Boolean Overlaps(const gp_Pnt& thePnt1, const gp_Pnt& thePnt2, const gp_Pnt& thePnt3, diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_EntityOwner.hxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_EntityOwner.hxx index dfd94e757e..cfc33d8892 100644 --- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_EntityOwner.hxx +++ b/src/Visualization/TKV3d/SelectMgr/SelectMgr_EntityOwner.hxx @@ -160,7 +160,6 @@ public: //! Returns selection state. Standard_DEPRECATED("Deprecated method - IsSelected() should be used instead") - Standard_Integer State() const { return myIsSelected ? 1 : 0; } //! Set the state of the owner. @@ -215,12 +214,10 @@ public: public: //! Sets the selectable object. Standard_DEPRECATED("Deprecated method - SetSelectable() should be used instead") - void Set(const Handle(SelectMgr_SelectableObject)& theSelObj) { SetSelectable(theSelObj); } //! sets the selectable priority of the owner Standard_DEPRECATED("Deprecated method - SetPriority() should be used instead") - void Set(const Standard_Integer thePriority) { SetPriority(thePriority); } protected: diff --git a/src/Visualization/TKV3d/V3d/V3d_View.hxx b/src/Visualization/TKV3d/V3d/V3d_View.hxx index 3b65325efd..367acccddf 100644 --- a/src/Visualization/TKV3d/V3d/V3d_View.hxx +++ b/src/Visualization/TKV3d/V3d/V3d_View.hxx @@ -1129,21 +1129,17 @@ public: //! @name deprecated methods //! initializes an iteration on the active Lights. Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - void InitActiveLights() { myActiveLightsIterator.Initialize(myActiveLights); } //! returns true if there are more active Light(s) to return. Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - Standard_Boolean MoreActiveLights() const { return myActiveLightsIterator.More(); } //! Go to the next active Light (if there is not, ActiveLight will raise an exception) Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - void NextActiveLights() { myActiveLightsIterator.Next(); } Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - const Handle(V3d_Light)& ActiveLight() const { return myActiveLightsIterator.Value(); } protected: diff --git a/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx b/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx index 1cbadfb1c6..8b946addee 100644 --- a/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx +++ b/src/Visualization/TKV3d/V3d/V3d_Viewer.hxx @@ -453,22 +453,18 @@ public: //! @name grid management public: //! @name deprecated methods //! Returns Standard_True if a grid is activated in . Standard_DEPRECATED("Deprecated method - IsGridActive() should be used instead") - Standard_Boolean IsActive() { return IsGridActive(); } //! Initializes an internal iterator on the active views. Standard_DEPRECATED("Deprecated method - ActiveViews() should be used instead") - void InitActiveViews() { myActiveViewsIterator.Initialize(myActiveViews); } //! Returns true if there are more active view(s) to return. Standard_DEPRECATED("Deprecated method - ActiveViews() should be used instead") - Standard_Boolean MoreActiveViews() const { return myActiveViewsIterator.More(); } //! Go to the next active view (if there is not, ActiveView will raise an exception) Standard_DEPRECATED("Deprecated method - ActiveViews() should be used instead") - void NextActiveViews() { if (!myActiveViews.IsEmpty()) @@ -476,22 +472,18 @@ public: //! @name deprecated methods } Standard_DEPRECATED("Deprecated method - ActiveViews() should be used instead") - const Handle(V3d_View)& ActiveView() const { return myActiveViewsIterator.Value(); } //! Initializes an internal iterator on the Defined views. Standard_DEPRECATED("Deprecated method - DefinedViews() should be used instead") - void InitDefinedViews() { myDefinedViewsIterator.Initialize(myDefinedViews); } //! returns true if there are more Defined view(s) to return. Standard_DEPRECATED("Deprecated method - DefinedViews() should be used instead") - Standard_Boolean MoreDefinedViews() const { return myDefinedViewsIterator.More(); } //! Go to the next Defined view (if there is not, DefinedView will raise an exception) Standard_DEPRECATED("Deprecated method - DefinedViews() should be used instead") - void NextDefinedViews() { if (!myDefinedViews.IsEmpty()) @@ -499,41 +491,33 @@ public: //! @name deprecated methods } Standard_DEPRECATED("Deprecated method - DefinedViews() should be used instead") - const Handle(V3d_View)& DefinedView() const { return myDefinedViewsIterator.Value(); } //! Initializes an internal iteratator on the active Lights. Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - void InitActiveLights() { myActiveLightsIterator.Initialize(myActiveLights); } //! returns true if there are more active Light(s) to return. Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - Standard_Boolean MoreActiveLights() const { return myActiveLightsIterator.More(); } //! Go to the next active Light (if there is not, ActiveLight() will raise an exception) Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - void NextActiveLights() { myActiveLightsIterator.Next(); } Standard_DEPRECATED("Deprecated method - ActiveLights() should be used instead") - const Handle(V3d_Light)& ActiveLight() const { return myActiveLightsIterator.Value(); } //! Initializes an internal iterattor on the Defined Lights. Standard_DEPRECATED("Deprecated method - DefinedLights() should be used instead") - void InitDefinedLights() { myDefinedLightsIterator.Initialize(myDefinedLights); } //! Returns true if there are more Defined Light(s) to return. Standard_DEPRECATED("Deprecated method - DefinedLights() should be used instead") - Standard_Boolean MoreDefinedLights() const { return myDefinedLightsIterator.More(); } //! Go to the next Defined Light (if there is not, DefinedLight() will raise an exception) Standard_DEPRECATED("Deprecated method - DefinedLights() should be used instead") - void NextDefinedLights() { if (!myDefinedLights.IsEmpty()) @@ -541,7 +525,6 @@ public: //! @name deprecated methods } Standard_DEPRECATED("Deprecated method - DefinedLights() should be used instead") - const Handle(V3d_Light)& DefinedLight() const { return myDefinedLightsIterator.Value(); } //! Dumps the content of me into the stream