From da9ebc572f85f1694f75380c45ca2ac87f12f414 Mon Sep 17 00:00:00 2001 From: berniev Date: Sun, 7 Aug 2022 20:05:16 +1000 Subject: [PATCH] Mod: redundant void 2 --- src/Mod/Fem/App/FemAnalysis.cpp | 6 +- src/Mod/Fem/App/FemConstraint.cpp | 6 +- src/Mod/Fem/App/FemConstraintBearing.cpp | 2 +- src/Mod/Fem/App/FemConstraintBearing.h | 6 +- src/Mod/Fem/App/FemConstraintContact.cpp | 4 +- src/Mod/Fem/App/FemConstraintContact.h | 6 +- src/Mod/Fem/App/FemConstraintDisplacement.cpp | 4 +- src/Mod/Fem/App/FemConstraintDisplacement.h | 6 +- src/Mod/Fem/App/FemConstraintFixed.cpp | 2 +- src/Mod/Fem/App/FemConstraintFixed.h | 6 +- .../Fem/App/FemConstraintFluidBoundary.cpp | 2 +- src/Mod/Fem/App/FemConstraintFluidBoundary.h | 6 +- src/Mod/Fem/App/FemConstraintForce.cpp | 2 +- src/Mod/Fem/App/FemConstraintForce.h | 6 +- src/Mod/Fem/App/FemConstraintGear.cpp | 2 +- src/Mod/Fem/App/FemConstraintGear.h | 6 +- src/Mod/Fem/App/FemConstraintHeatflux.cpp | 4 +- src/Mod/Fem/App/FemConstraintHeatflux.h | 6 +- .../App/FemConstraintInitialTemperature.cpp | 4 +- .../Fem/App/FemConstraintInitialTemperature.h | 6 +- .../Fem/App/FemConstraintPlaneRotation.cpp | 4 +- src/Mod/Fem/App/FemConstraintPlaneRotation.h | 6 +- src/Mod/Fem/App/FemConstraintPressure.cpp | 4 +- src/Mod/Fem/App/FemConstraintPressure.h | 6 +- src/Mod/Fem/App/FemConstraintPulley.cpp | 2 +- src/Mod/Fem/App/FemConstraintPulley.h | 6 +- src/Mod/Fem/App/FemConstraintSpring.cpp | 4 +- src/Mod/Fem/App/FemConstraintSpring.h | 6 +- src/Mod/Fem/App/FemConstraintTemperature.cpp | 4 +- src/Mod/Fem/App/FemConstraintTemperature.h | 6 +- src/Mod/Fem/App/FemConstraintTransform.cpp | 4 +- src/Mod/Fem/App/FemConstraintTransform.h | 6 +- src/Mod/Fem/App/FemMesh.cpp | 16 +- src/Mod/Fem/App/FemMesh.h | 16 +- src/Mod/Fem/App/FemMeshObject.cpp | 6 +- src/Mod/Fem/App/FemMeshObject.h | 10 +- src/Mod/Fem/App/FemMeshProperty.cpp | 8 +- src/Mod/Fem/App/FemMeshProperty.h | 12 +- src/Mod/Fem/App/FemMeshPyImp.cpp | 46 ++-- src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp | 2 +- src/Mod/Fem/App/FemMeshShapeNetgenObject.h | 6 +- src/Mod/Fem/App/FemMeshShapeObject.cpp | 2 +- src/Mod/Fem/App/FemMeshShapeObject.h | 6 +- src/Mod/Fem/App/FemPostFilter.cpp | 38 +-- src/Mod/Fem/App/FemPostFilter.h | 52 ++-- src/Mod/Fem/App/FemPostFunction.cpp | 8 +- src/Mod/Fem/App/FemPostFunction.h | 18 +- src/Mod/Fem/App/FemPostObject.h | 2 +- src/Mod/Fem/App/FemPostPipeline.cpp | 6 +- src/Mod/Fem/App/FemPostPipeline.h | 8 +- src/Mod/Fem/App/FemPostPipelinePyImp.cpp | 2 +- src/Mod/Fem/App/FemResultObject.cpp | 6 +- src/Mod/Fem/App/FemResultObject.h | 10 +- src/Mod/Fem/App/FemSetElementsObject.cpp | 2 +- src/Mod/Fem/App/FemSetElementsObject.h | 10 +- src/Mod/Fem/App/FemSetFacesObject.cpp | 2 +- src/Mod/Fem/App/FemSetFacesObject.h | 10 +- src/Mod/Fem/App/FemSetGeometryObject.cpp | 2 +- src/Mod/Fem/App/FemSetGeometryObject.h | 10 +- src/Mod/Fem/App/FemSetNodesObject.cpp | 2 +- src/Mod/Fem/App/FemSetNodesObject.h | 10 +- src/Mod/Fem/App/FemSetObject.cpp | 2 +- src/Mod/Fem/App/FemSetObject.h | 8 +- src/Mod/Fem/App/FemSolverObject.cpp | 6 +- src/Mod/Fem/App/FemSolverObject.h | 10 +- src/Mod/Fem/App/PropertyPostDataObject.cpp | 8 +- src/Mod/Fem/App/PropertyPostDataObject.h | 8 +- src/Mod/Fem/Gui/AppFemGui.cpp | 2 +- src/Mod/Fem/Gui/Command.cpp | 60 ++--- src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 4 +- src/Mod/Fem/Gui/TaskCreateNodeSet.h | 4 +- src/Mod/Fem/Gui/TaskDlgAnalysis.h | 2 +- src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h | 2 +- src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h | 2 +- src/Mod/Fem/Gui/TaskFemConstraint.h | 6 +- src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp | 6 +- src/Mod/Fem/Gui/TaskFemConstraintBearing.h | 10 +- src/Mod/Fem/Gui/TaskFemConstraintContact.h | 4 +- .../Fem/Gui/TaskFemConstraintDisplacement.h | 2 +- src/Mod/Fem/Gui/TaskFemConstraintFixed.h | 2 +- .../Fem/Gui/TaskFemConstraintFluidBoundary.h | 42 ++-- src/Mod/Fem/Gui/TaskFemConstraintForce.cpp | 6 +- src/Mod/Fem/Gui/TaskFemConstraintForce.h | 10 +- src/Mod/Fem/Gui/TaskFemConstraintGear.cpp | 10 +- src/Mod/Fem/Gui/TaskFemConstraintGear.h | 12 +- src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp | 6 +- src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h | 8 +- .../Fem/Gui/TaskFemConstraintPlaneRotation.h | 2 +- src/Mod/Fem/Gui/TaskFemConstraintPressure.h | 2 +- src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp | 8 +- src/Mod/Fem/Gui/TaskFemConstraintPulley.h | 10 +- src/Mod/Fem/Gui/TaskFemConstraintSpring.h | 2 +- .../Fem/Gui/TaskFemConstraintTemperature.cpp | 2 +- .../Fem/Gui/TaskFemConstraintTemperature.h | 4 +- .../Fem/Gui/TaskFemConstraintTransform.cpp | 2 +- src/Mod/Fem/Gui/TaskFemConstraintTransform.h | 4 +- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 2 +- src/Mod/Fem/Gui/TaskPostBoxes.h | 4 +- src/Mod/Fem/Gui/TaskTetParameter.cpp | 2 +- src/Mod/Fem/Gui/TaskTetParameter.h | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 12 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.h | 6 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 12 +- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 12 +- src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp | 12 +- .../Fem/Gui/ViewProviderFemPostFunction.cpp | 8 +- src/Mod/Fem/Gui/ViewProviderFemPostFunction.h | 6 +- src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 10 +- src/Mod/Fem/Gui/ViewProviderFemPostObject.h | 8 +- .../Fem/Gui/ViewProviderFemPostPipeline.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h | 4 +- src/Mod/Fem/Gui/ViewProviderResult.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetElements.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetElements.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetFaces.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetFaces.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetNodes.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetNodes.h | 2 +- src/Mod/Fem/Gui/ViewProviderSolver.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSolver.h | 4 +- src/Mod/Import/App/dxf/ImpExpDxf.cpp | 4 +- src/Mod/Import/App/dxf/ImpExpDxf.h | 4 +- src/Mod/Import/Gui/AppImportGui.cpp | 2 +- src/Mod/Import/Gui/Command.cpp | 8 +- src/Mod/Inspection/App/InspectionFeature.h | 20 +- .../Inspection/Gui/ViewProviderInspection.cpp | 8 +- .../Inspection/Gui/ViewProviderInspection.h | 8 +- src/Mod/Measure/App/Measurement.cpp | 4 +- src/Mod/Measure/App/Measurement.h | 4 +- src/Mod/Measure/App/MeasurementPyImp.cpp | 2 +- src/Mod/Mesh/Gui/DlgDecimating.h | 2 +- src/Mod/MeshPart/App/CurveProjector.cpp | 6 +- src/Mod/MeshPart/App/CurveProjector.h | 2 +- src/Mod/MeshPart/App/MeshAlgos.cpp | 2 +- src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 2 +- src/Mod/MeshPart/Gui/Command.cpp | 12 +- src/Mod/Part/App/ArcOfCirclePyImp.cpp | 6 +- src/Mod/Part/App/ArcOfConicPyImp.cpp | 14 +- src/Mod/Part/App/ArcOfEllipsePyImp.cpp | 8 +- src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp | 8 +- src/Mod/Part/App/ArcOfParabolaPyImp.cpp | 6 +- src/Mod/Part/App/ArcPyImp.cpp | 2 +- src/Mod/Part/App/AttachEnginePyImp.cpp | 20 +- src/Mod/Part/App/AttachExtension.cpp | 4 +- src/Mod/Part/App/AttachExtension.h | 10 +- src/Mod/Part/App/AttachExtensionPyImp.cpp | 4 +- src/Mod/Part/App/Attacher.h | 2 +- src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp | 2 +- .../App/BRepOffsetAPI_MakeFillingPyImp.cpp | 2 +- .../App/BRepOffsetAPI_MakePipeShellPyImp.cpp | 2 +- src/Mod/Part/App/BSplineCurvePyImp.cpp | 20 +- src/Mod/Part/App/BezierCurvePyImp.cpp | 12 +- src/Mod/Part/App/BezierSurfacePyImp.cpp | 12 +- src/Mod/Part/App/BodyBasePyImp.cpp | 2 +- src/Mod/Part/App/BoundedCurvePyImp.cpp | 6 +- src/Mod/Part/App/CirclePyImp.cpp | 4 +- src/Mod/Part/App/ConePyImp.cpp | 12 +- src/Mod/Part/App/ConicPyImp.cpp | 16 +- src/Mod/Part/App/CustomFeature.cpp | 8 +- src/Mod/Part/App/CustomFeature.h | 8 +- src/Mod/Part/App/CylinderPyImp.cpp | 8 +- src/Mod/Part/App/DatumFeature.cpp | 2 +- src/Mod/Part/App/EllipsePyImp.cpp | 12 +- src/Mod/Part/App/FeatureChamfer.h | 4 +- src/Mod/Part/App/FeatureCompound.cpp | 2 +- src/Mod/Part/App/FeatureCompound.h | 4 +- src/Mod/Part/App/FeatureExtrusion.cpp | 2 +- src/Mod/Part/App/FeatureFace.cpp | 2 +- src/Mod/Part/App/FeatureFace.h | 4 +- src/Mod/Part/App/FeatureFillet.cpp | 2 +- src/Mod/Part/App/FeatureFillet.h | 4 +- src/Mod/Part/App/FeatureGeometrySet.cpp | 2 +- src/Mod/Part/App/FeatureMirroring.cpp | 2 +- src/Mod/Part/App/FeatureMirroring.h | 4 +- src/Mod/Part/App/FeatureOffset.h | 8 +- src/Mod/Part/App/FeaturePartBoolean.cpp | 4 +- src/Mod/Part/App/FeaturePartBoolean.h | 4 +- src/Mod/Part/App/FeaturePartBox.cpp | 2 +- src/Mod/Part/App/FeaturePartBox.h | 4 +- src/Mod/Part/App/FeaturePartCircle.h | 4 +- src/Mod/Part/App/FeaturePartCommon.cpp | 6 +- src/Mod/Part/App/FeaturePartCommon.h | 4 +- src/Mod/Part/App/FeaturePartCurveNet.cpp | 2 +- src/Mod/Part/App/FeaturePartCurveNet.h | 4 +- src/Mod/Part/App/FeaturePartCut.cpp | 2 +- src/Mod/Part/App/FeaturePartFuse.cpp | 6 +- src/Mod/Part/App/FeaturePartFuse.h | 4 +- src/Mod/Part/App/FeaturePartImportBrep.cpp | 4 +- src/Mod/Part/App/FeaturePartImportBrep.h | 4 +- src/Mod/Part/App/FeaturePartImportIges.cpp | 4 +- src/Mod/Part/App/FeaturePartImportStep.cpp | 4 +- src/Mod/Part/App/FeaturePartImportStep.h | 4 +- src/Mod/Part/App/FeaturePartPolygon.cpp | 2 +- src/Mod/Part/App/FeaturePartPolygon.h | 2 +- src/Mod/Part/App/FeaturePartSpline.h | 2 +- src/Mod/Part/App/FeatureRevolution.cpp | 2 +- src/Mod/Part/App/FeatureRevolution.h | 4 +- .../Part/App/Geom2d/ArcOfCircle2dPyImp.cpp | 6 +- src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp | 10 +- .../Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp | 8 +- .../Part/App/Geom2d/ArcOfParabola2dPyImp.cpp | 6 +- .../Part/App/Geom2d/BSplineCurve2dPyImp.cpp | 20 +- .../Part/App/Geom2d/BezierCurve2dPyImp.cpp | 12 +- src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp | 4 +- src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp | 10 +- src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp | 12 +- src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp | 12 +- src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp | 2 +- src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp | 12 +- src/Mod/Part/App/Geom2d/Line2dPyImp.cpp | 6 +- .../Part/App/Geom2d/Line2dSegmentPyImp.cpp | 6 +- .../Part/App/Geom2d/OffsetCurve2dPyImp.cpp | 6 +- src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp | 8 +- .../App/GeomPlate/CurveConstraintPyImp.cpp | 10 +- .../App/GeomPlate/PointConstraintPyImp.cpp | 2 +- src/Mod/Part/App/Geometry.cpp | 216 ++++++++-------- src/Mod/Part/App/Geometry.h | 230 +++++++++--------- src/Mod/Part/App/Geometry2d.cpp | 126 +++++----- src/Mod/Part/App/Geometry2d.h | 140 +++++------ .../Part/App/GeometryBoolExtensionPyImp.cpp | 4 +- src/Mod/Part/App/GeometryCurvePyImp.cpp | 10 +- src/Mod/Part/App/GeometryDefaultExtension.cpp | 12 +- src/Mod/Part/App/GeometryDefaultExtension.h | 4 +- .../Part/App/GeometryDoubleExtensionPyImp.cpp | 4 +- src/Mod/Part/App/GeometryExtension.h | 4 +- src/Mod/Part/App/GeometryExtensionPyImp.cpp | 4 +- .../Part/App/GeometryIntExtensionPyImp.cpp | 4 +- .../Part/App/GeometryMigrationExtension.cpp | 4 +- src/Mod/Part/App/GeometryMigrationExtension.h | 4 +- src/Mod/Part/App/GeometryPyImp.cpp | 4 +- .../Part/App/GeometryStringExtensionPyImp.cpp | 4 +- src/Mod/Part/App/GeometrySurfacePyImp.cpp | 6 +- .../Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp | 2 +- .../App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp | 2 +- src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp | 2 +- .../Part/App/HLRBRep/PolyHLRToShapePyImp.cpp | 2 +- src/Mod/Part/App/HyperbolaPyImp.cpp | 12 +- src/Mod/Part/App/LinePyImp.cpp | 6 +- src/Mod/Part/App/OffsetCurvePyImp.cpp | 8 +- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 6 +- src/Mod/Part/App/ParabolaPyImp.cpp | 8 +- src/Mod/Part/App/Part2DObject.h | 6 +- src/Mod/Part/App/Part2DObjectPyImp.cpp | 2 +- src/Mod/Part/App/PartFeature.cpp | 16 +- src/Mod/Part/App/PartFeature.h | 4 +- src/Mod/Part/App/PartFeaturePyImp.cpp | 2 +- src/Mod/Part/App/PartFeatureReference.cpp | 6 +- src/Mod/Part/App/PartFeatureReference.h | 8 +- src/Mod/Part/App/PartFeatures.cpp | 12 +- src/Mod/Part/App/PartFeatures.h | 24 +- src/Mod/Part/App/PlanePyImp.cpp | 6 +- src/Mod/Part/App/PlateSurfacePyImp.cpp | 2 +- src/Mod/Part/App/PointPyImp.cpp | 8 +- src/Mod/Part/App/PrimitiveFeature.cpp | 52 ++-- src/Mod/Part/App/PrimitiveFeature.h | 58 ++--- src/Mod/Part/App/PrismExtension.h | 4 +- src/Mod/Part/App/PropertyGeometryList.cpp | 8 +- src/Mod/Part/App/PropertyGeometryList.h | 10 +- src/Mod/Part/App/PropertyTopoShape.h | 28 +-- .../App/RectangularTrimmedSurfacePyImp.cpp | 2 +- .../App/ShapeUpgrade/UnifySameDomainPyImp.cpp | 2 +- src/Mod/Part/App/SpherePyImp.cpp | 12 +- src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp | 6 +- src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp | 8 +- src/Mod/Part/App/TopoShape.cpp | 10 +- src/Mod/Part/App/TopoShape.h | 10 +- src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeCompoundPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeEdgePyImp.cpp | 26 +- src/Mod/Part/App/TopoShapeFacePyImp.cpp | 20 +- src/Mod/Part/App/TopoShapePyImp.cpp | 30 +-- src/Mod/Part/App/TopoShapeShellPyImp.cpp | 12 +- src/Mod/Part/App/TopoShapeSolidPyImp.cpp | 14 +- src/Mod/Part/App/TopoShapeVertexPyImp.cpp | 12 +- src/Mod/Part/App/TopoShapeWirePyImp.cpp | 16 +- src/Mod/Part/App/ToroidPyImp.cpp | 14 +- src/Mod/Part/App/TrimmedCurvePyImp.cpp | 2 +- src/Mod/Part/App/edgecluster.cpp | 2 +- src/Mod/Part/App/edgecluster.h | 4 +- src/Mod/Part/Gui/AppPartGui.cpp | 6 +- src/Mod/Part/Gui/Command.cpp | 102 ++++---- src/Mod/Part/Gui/CommandSimple.cpp | 18 +- src/Mod/Part/Gui/DlgBooleanOperation.h | 2 +- src/Mod/Part/Gui/DlgProjectionOnSurface.cpp | 6 +- src/Mod/Part/Gui/DlgProjectionOnSurface.h | 6 +- src/Mod/Part/Gui/Mirroring.h | 2 +- src/Mod/Part/Gui/TaskCheckGeometry.h | 2 +- src/Mod/Part/Gui/TaskDimension.h | 4 +- src/Mod/Part/Gui/ViewProvider.cpp | 2 +- src/Mod/Part/Gui/ViewProvider2DObject.cpp | 4 +- src/Mod/Part/Gui/ViewProvider2DObject.h | 4 +- .../Part/Gui/ViewProviderAttachExtension.h | 2 +- src/Mod/Part/Gui/ViewProviderBoolean.cpp | 12 +- src/Mod/Part/Gui/ViewProviderBoolean.h | 12 +- src/Mod/Part/Gui/ViewProviderBox.cpp | 2 +- src/Mod/Part/Gui/ViewProviderBox.h | 2 +- .../Part/Gui/ViewProviderCircleParametric.cpp | 2 +- .../Part/Gui/ViewProviderConeParametric.cpp | 2 +- src/Mod/Part/Gui/ViewProviderConeParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderCurveNet.cpp | 2 +- src/Mod/Part/Gui/ViewProviderCurveNet.h | 2 +- .../Gui/ViewProviderCylinderParametric.cpp | 2 +- .../Part/Gui/ViewProviderCylinderParametric.h | 2 +- .../Gui/ViewProviderEllipseParametric.cpp | 2 +- .../Part/Gui/ViewProviderEllipseParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderExt.cpp | 2 +- src/Mod/Part/Gui/ViewProviderExtrusion.cpp | 2 +- .../Part/Gui/ViewProviderLineParametric.cpp | 2 +- src/Mod/Part/Gui/ViewProviderMirror.h | 10 +- .../Part/Gui/ViewProviderPlaneParametric.cpp | 4 +- .../Part/Gui/ViewProviderPlaneParametric.h | 4 +- .../Part/Gui/ViewProviderPointParametric.cpp | 2 +- .../Part/Gui/ViewProviderPointParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderPrism.cpp | 4 +- src/Mod/Part/Gui/ViewProviderPrism.h | 4 +- src/Mod/Part/Gui/ViewProviderReference.cpp | 2 +- .../Part/Gui/ViewProviderRegularPolygon.cpp | 2 +- src/Mod/Part/Gui/ViewProviderRegularPolygon.h | 2 +- src/Mod/Part/Gui/ViewProviderRuledSurface.cpp | 2 +- .../Part/Gui/ViewProviderSphereParametric.cpp | 4 +- src/Mod/PartDesign/App/Body.cpp | 4 +- src/Mod/PartDesign/App/Body.h | 8 +- src/Mod/PartDesign/App/BodyPyImp.cpp | 2 +- src/Mod/PartDesign/App/DatumCS.h | 2 +- src/Mod/PartDesign/App/DatumLine.h | 2 +- src/Mod/PartDesign/App/DatumPlane.h | 2 +- src/Mod/PartDesign/App/DatumPoint.h | 2 +- src/Mod/PartDesign/App/Feature.cpp | 4 +- src/Mod/PartDesign/App/Feature.h | 2 +- src/Mod/PartDesign/App/FeatureBase.cpp | 4 +- src/Mod/PartDesign/App/FeatureBase.h | 4 +- src/Mod/PartDesign/App/FeatureBoolean.cpp | 2 +- src/Mod/PartDesign/App/FeatureBoolean.h | 4 +- src/Mod/PartDesign/App/FeatureChamfer.cpp | 2 +- src/Mod/PartDesign/App/FeatureChamfer.h | 4 +- src/Mod/PartDesign/App/FeatureDraft.cpp | 2 +- src/Mod/PartDesign/App/FeatureDraft.h | 4 +- src/Mod/PartDesign/App/FeatureDressUp.cpp | 2 +- src/Mod/PartDesign/App/FeatureDressUp.h | 2 +- src/Mod/PartDesign/App/FeatureFillet.cpp | 2 +- src/Mod/PartDesign/App/FeatureGroove.cpp | 6 +- src/Mod/PartDesign/App/FeatureGroove.h | 8 +- src/Mod/PartDesign/App/FeatureHelix.cpp | 4 +- src/Mod/PartDesign/App/FeatureHelix.h | 8 +- src/Mod/PartDesign/App/FeatureHole.cpp | 2 +- src/Mod/PartDesign/App/FeatureHole.h | 4 +- src/Mod/PartDesign/App/FeatureLinearPattern.h | 2 +- src/Mod/PartDesign/App/FeatureLoft.cpp | 2 +- src/Mod/PartDesign/App/FeatureLoft.h | 4 +- src/Mod/PartDesign/App/FeatureMirrored.h | 2 +- .../PartDesign/App/FeatureMultiTransform.cpp | 2 +- .../PartDesign/App/FeatureMultiTransform.h | 4 +- src/Mod/PartDesign/App/FeaturePipe.cpp | 2 +- src/Mod/PartDesign/App/FeaturePipe.h | 4 +- src/Mod/PartDesign/App/FeaturePocket.h | 2 +- src/Mod/PartDesign/App/FeaturePolarPattern.h | 2 +- src/Mod/PartDesign/App/FeaturePrimitive.cpp | 16 +- src/Mod/PartDesign/App/FeaturePrimitive.h | 18 +- src/Mod/PartDesign/App/FeatureRevolution.cpp | 6 +- src/Mod/PartDesign/App/FeatureRevolution.h | 8 +- src/Mod/PartDesign/App/FeatureScaled.h | 2 +- src/Mod/PartDesign/App/FeatureSketchBased.cpp | 4 +- src/Mod/PartDesign/App/FeatureSketchBased.h | 4 +- src/Mod/PartDesign/App/FeatureThickness.cpp | 2 +- src/Mod/PartDesign/App/FeatureThickness.h | 4 +- src/Mod/PartDesign/App/FeatureTransformed.cpp | 4 +- src/Mod/PartDesign/App/FeatureTransformed.h | 4 +- src/Mod/PartDesign/App/ShapeBinder.cpp | 8 +- src/Mod/PartDesign/App/ShapeBinder.h | 10 +- src/Mod/PartDesign/Gui/Command.cpp | 60 ++--- src/Mod/PartDesign/Gui/CommandBody.cpp | 14 +- .../PartDesign/Gui/TaskBooleanParameters.h | 10 +- .../PartDesign/Gui/TaskChamferParameters.cpp | 14 +- src/Mod/PartDesign/Gui/TaskDraftParameters.h | 8 +- .../PartDesign/Gui/TaskExtrudeParameters.cpp | 28 +-- .../PartDesign/Gui/TaskFeatureParameters.h | 2 +- .../PartDesign/Gui/TaskFilletParameters.cpp | 6 +- src/Mod/PartDesign/Gui/TaskFilletParameters.h | 6 +- .../Gui/TaskLinearPatternParameters.h | 8 +- .../PartDesign/Gui/TaskMirroredParameters.cpp | 2 +- .../PartDesign/Gui/TaskMirroredParameters.h | 2 +- .../Gui/TaskMultiTransformParameters.cpp | 4 +- .../Gui/TaskMultiTransformParameters.h | 6 +- .../Gui/TaskPolarPatternParameters.h | 12 +- .../PartDesign/Gui/TaskPrimitiveParameters.h | 2 +- .../Gui/TaskRevolutionParameters.cpp | 6 +- .../PartDesign/Gui/TaskRevolutionParameters.h | 6 +- src/Mod/PartDesign/Gui/TaskScaledParameters.h | 6 +- src/Mod/PartDesign/Gui/Utils.h | 2 +- src/Mod/PartDesign/Gui/ViewProvider.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderBase.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderBase.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 4 +- src/Mod/PartDesign/Gui/ViewProviderDatum.cpp | 8 +- src/Mod/PartDesign/Gui/ViewProviderHole.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderHole.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderLoft.cpp | 4 +- .../Gui/ViewProviderMultiTransform.cpp | 2 +- .../Gui/ViewProviderMultiTransform.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderPipe.cpp | 4 +- src/Mod/PartDesign/Gui/ViewProviderPipe.h | 4 +- .../PartDesign/Gui/ViewProviderPrimitive.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPyImp.cpp | 2 +- .../PartDesign/Gui/ViewProviderShapeBinder.h | 2 +- .../Gui/ViewProviderSketchBased.cpp | 2 +- .../PartDesign/Gui/ViewProviderSketchBased.h | 2 +- src/Mod/Path/App/AreaPyImp.cpp | 14 +- src/Mod/Path/App/Command.cpp | 4 +- src/Mod/Path/App/CommandPyImp.cpp | 8 +- src/Mod/Path/App/FeatureArea.cpp | 10 +- src/Mod/Path/App/FeatureArea.h | 16 +- src/Mod/Path/App/FeatureAreaPyImp.cpp | 4 +- src/Mod/Path/App/FeaturePath.cpp | 4 +- src/Mod/Path/App/FeaturePathCompound.cpp | 4 +- src/Mod/Path/App/FeaturePathCompoundPyImp.cpp | 2 +- src/Mod/Path/App/FeaturePathShape.cpp | 4 +- src/Mod/Path/App/FeaturePathShape.h | 6 +- src/Mod/Path/App/Path.cpp | 8 +- src/Mod/Path/App/PathPyImp.cpp | 12 +- src/Mod/Path/App/PropertyPath.cpp | 8 +- src/Mod/Path/App/PropertyTool.cpp | 8 +- src/Mod/Path/App/PropertyTooltable.cpp | 8 +- src/Mod/Path/App/Tool.cpp | 6 +- src/Mod/Path/App/ToolPyImp.cpp | 20 +- src/Mod/Path/App/Tooltable.cpp | 2 +- src/Mod/Path/App/TooltablePyImp.cpp | 8 +- src/Mod/Path/App/VoronoiCell.cpp | 2 +- src/Mod/Path/App/VoronoiCellPyImp.cpp | 14 +- src/Mod/Path/App/VoronoiEdge.cpp | 2 +- src/Mod/Path/App/VoronoiEdgePyImp.cpp | 20 +- src/Mod/Path/App/VoronoiPyImp.cpp | 8 +- src/Mod/Path/App/VoronoiVertex.cpp | 2 +- src/Mod/Path/App/VoronoiVertexPyImp.cpp | 10 +- src/Mod/Path/Gui/AppPathGui.cpp | 2 +- src/Mod/Path/Gui/Command.cpp | 10 +- src/Mod/Path/Gui/TaskDlgPathCompound.cpp | 2 +- src/Mod/Path/Gui/TaskDlgPathCompound.h | 2 +- src/Mod/Path/Gui/ViewProviderArea.cpp | 4 +- src/Mod/Path/Gui/ViewProviderPath.cpp | 4 +- src/Mod/Path/Gui/ViewProviderPathCompound.cpp | 2 +- src/Mod/Path/Gui/ViewProviderPathShape.cpp | 2 +- .../Path/PathSimulator/App/PathSimPyImp.cpp | 4 +- src/Mod/Robot/App/PropertyTrajectory.cpp | 8 +- src/Mod/Robot/App/Robot6Axis.cpp | 6 +- src/Mod/Robot/App/Robot6Axis.h | 6 +- src/Mod/Robot/App/Robot6AxisPyImp.cpp | 18 +- src/Mod/Robot/App/RobotAlgos.cpp | 14 +- src/Mod/Robot/App/RobotObject.cpp | 2 +- src/Mod/Robot/App/RobotObject.h | 12 +- src/Mod/Robot/App/RobotObjectPyImp.cpp | 2 +- src/Mod/Robot/App/Simulation.cpp | 2 +- src/Mod/Robot/App/Simulation.h | 10 +- src/Mod/Robot/App/Trajectory.cpp | 4 +- src/Mod/Robot/App/TrajectoryDressUpObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryPyImp.cpp | 8 +- src/Mod/Robot/App/Waypoint.cpp | 2 +- src/Mod/Robot/App/WaypointPyImp.cpp | 16 +- src/Mod/Robot/Gui/AppRobotGui.cpp | 8 +- src/Mod/Robot/Gui/Command.cpp | 10 +- src/Mod/Robot/Gui/CommandExport.cpp | 6 +- src/Mod/Robot/Gui/CommandInsertRobot.cpp | 12 +- src/Mod/Robot/Gui/CommandTrajectory.cpp | 18 +- src/Mod/Robot/Gui/TaskDlgEdge2Trac.h | 2 +- src/Mod/Robot/Gui/TaskDlgSimulate.h | 2 +- src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h | 2 +- src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp | 4 +- src/Mod/Robot/Gui/TaskEdge2TracParameter.h | 4 +- src/Mod/Robot/Gui/TaskRobot6Axis.cpp | 2 +- src/Mod/Robot/Gui/TaskRobot6Axis.h | 2 +- src/Mod/Robot/Gui/TaskTrajectory.cpp | 16 +- src/Mod/Robot/Gui/TaskTrajectory.h | 16 +- .../Gui/TaskTrajectoryDressUpParameter.cpp | 6 +- .../Gui/TaskTrajectoryDressUpParameter.h | 6 +- src/Mod/Robot/Gui/TaskWatcher.h | 2 +- src/Mod/Robot/Gui/TrajectorySimulate.cpp | 16 +- src/Mod/Robot/Gui/TrajectorySimulate.h | 16 +- .../Robot/Gui/ViewProviderEdge2TracObject.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderTrajectory.cpp | 2 +- .../Gui/ViewProviderTrajectoryCompound.cpp | 2 +- .../Gui/ViewProviderTrajectoryDressUp.cpp | 2 +- src/Mod/Sketcher/App/Constraint.cpp | 8 +- src/Mod/Sketcher/App/Constraint.h | 8 +- src/Mod/Sketcher/App/ConstraintPyImp.cpp | 26 +- .../App/ExternalGeometryExtension.cpp | 4 +- .../Sketcher/App/ExternalGeometryExtension.h | 4 +- .../App/ExternalGeometryExtensionPyImp.cpp | 4 +- .../Sketcher/App/ExternalGeometryFacade.cpp | 2 +- src/Mod/Sketcher/App/ExternalGeometryFacade.h | 24 +- .../App/ExternalGeometryFacadePyImp.cpp | 18 +- src/Mod/Sketcher/App/GeoList.cpp | 2 +- src/Mod/Sketcher/App/GeometryFacade.cpp | 2 +- src/Mod/Sketcher/App/GeometryFacade.h | 20 +- src/Mod/Sketcher/App/GeometryFacadePyImp.cpp | 16 +- .../Sketcher/App/PropertyConstraintList.cpp | 8 +- src/Mod/Sketcher/App/PropertyConstraintList.h | 14 +- src/Mod/Sketcher/App/Sketch.cpp | 14 +- src/Mod/Sketcher/App/Sketch.h | 38 +-- src/Mod/Sketcher/App/SketchAnalysis.cpp | 2 +- src/Mod/Sketcher/App/SketchAnalysis.h | 10 +- .../Sketcher/App/SketchGeometryExtension.cpp | 4 +- .../Sketcher/App/SketchGeometryExtension.h | 4 +- .../App/SketchGeometryExtensionPyImp.cpp | 12 +- src/Mod/Sketcher/App/SketchObject.cpp | 40 +-- src/Mod/Sketcher/App/SketchObject.h | 58 ++--- src/Mod/Sketcher/App/SketchObjectPyImp.cpp | 20 +- src/Mod/Sketcher/App/SketchObjectSF.cpp | 2 +- src/Mod/Sketcher/App/SketchObjectSF.h | 2 +- src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp | 2 +- src/Mod/Sketcher/App/SketchPyImp.cpp | 12 +- .../Sketcher/App/SolverGeometryExtension.cpp | 4 +- .../Sketcher/App/SolverGeometryExtension.h | 4 +- src/Mod/Sketcher/Gui/AppSketcherGui.cpp | 14 +- src/Mod/Sketcher/Gui/Command.cpp | 24 +- src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp | 4 +- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 20 +- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 94 +++---- .../Sketcher/Gui/CommandSketcherBSpline.cpp | 32 +-- src/Mod/Sketcher/Gui/CommandSketcherTools.cpp | 50 ++-- .../Gui/CommandSketcherVirtualSpace.cpp | 4 +- .../Gui/ConstraintMultiFilterDialog.cpp | 2 +- .../Gui/ConstraintMultiFilterDialog.h | 2 +- .../Sketcher/Gui/ConstraintSettingsDialog.cpp | 2 +- .../Sketcher/Gui/ConstraintSettingsDialog.h | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 18 +- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 2 +- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 2 +- src/Mod/Sketcher/Gui/EditModeCoinManager.cpp | 2 +- src/Mod/Sketcher/Gui/EditModeCoinManager.h | 2 +- .../Gui/EditModeConstraintCoinManager.cpp | 2 +- .../Gui/EditModeConstraintCoinManager.h | 2 +- src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp | 2 +- src/Mod/Sketcher/Gui/SketchMirrorDialog.h | 2 +- .../Sketcher/Gui/SketchOrientationDialog.cpp | 2 +- .../Sketcher/Gui/SketchOrientationDialog.h | 2 +- .../Gui/SketchRectangularArrayDialog.cpp | 4 +- .../Gui/SketchRectangularArrayDialog.h | 4 +- .../Gui/SketcherRegularPolygonDialog.cpp | 4 +- .../Gui/SketcherRegularPolygonDialog.h | 4 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.h | 4 +- .../Sketcher/Gui/TaskSketcherConstraints.cpp | 4 +- .../Sketcher/Gui/TaskSketcherConstraints.h | 6 +- src/Mod/Sketcher/Gui/TaskSketcherElements.h | 4 +- .../Gui/TaskSketcherSolverAdvanced.cpp | 6 +- .../Sketcher/Gui/TaskSketcherSolverAdvanced.h | 6 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 26 +- src/Mod/Sketcher/Gui/ViewProviderSketch.h | 34 +-- .../ViewProviderSketchGeometryExtension.cpp | 4 +- .../Gui/ViewProviderSketchGeometryExtension.h | 4 +- src/Mod/Spreadsheet/App/Cell.h | 2 +- .../Spreadsheet/App/PropertyColumnWidths.h | 4 +- .../App/PropertyColumnWidthsPyImp.cpp | 2 +- src/Mod/Spreadsheet/App/PropertyRowHeights.h | 4 +- src/Mod/Spreadsheet/App/Sheet.cpp | 4 +- src/Mod/Start/Gui/AppStartGui.cpp | 2 +- src/Mod/Start/Gui/Command.cpp | 2 +- src/Mod/Surface/App/FeatureCut.cpp | 2 +- src/Mod/Surface/App/FeatureCut.h | 2 +- src/Mod/Surface/App/FeatureExtend.cpp | 2 +- src/Mod/Surface/App/FeatureExtend.h | 4 +- src/Mod/Surface/App/FeatureFilling.cpp | 2 +- src/Mod/Surface/App/FeatureFilling.h | 4 +- .../Surface/App/FeatureGeomFillSurface.cpp | 4 +- src/Mod/Surface/App/FeatureGeomFillSurface.h | 6 +- src/Mod/Surface/App/FeatureSections.cpp | 2 +- src/Mod/Surface/App/FeatureSections.h | 4 +- src/Mod/Surface/App/FeatureSewing.cpp | 2 +- src/Mod/Surface/App/FeatureSewing.h | 2 +- src/Mod/Surface/Gui/AppSurfaceGui.cpp | 2 +- src/Mod/Surface/Gui/Command.cpp | 12 +- src/Mod/Surface/Gui/TaskFilling.cpp | 2 +- src/Mod/Surface/Gui/TaskFilling.h | 4 +- src/Mod/Surface/Gui/TaskFillingEdge.h | 2 +- src/Mod/Surface/Gui/TaskFillingVertex.h | 2 +- src/Mod/Surface/Gui/TaskGeomFillSurface.cpp | 2 +- src/Mod/Surface/Gui/TaskGeomFillSurface.h | 4 +- src/Mod/Surface/Gui/TaskSections.cpp | 2 +- src/Mod/Surface/Gui/TaskSections.h | 4 +- src/Mod/Surface/Gui/ViewProviderExtend.h | 2 +- src/Mod/TechDraw/App/CenterLinePyImp.cpp | 26 +- src/Mod/TechDraw/App/Cosmetic.cpp | 68 +++--- src/Mod/TechDraw/App/Cosmetic.h | 62 ++--- src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp | 14 +- src/Mod/TechDraw/App/CosmeticExtension.h | 2 +- .../TechDraw/App/CosmeticExtensionPyImp.cpp | 2 +- src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp | 14 +- src/Mod/TechDraw/App/DrawGeomHatch.cpp | 18 +- src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawHatch.h | 22 +- src/Mod/TechDraw/App/DrawHatchPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawLeaderLine.cpp | 30 +-- src/Mod/TechDraw/App/DrawLeaderLine.h | 28 +-- src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawPage.h | 24 +- src/Mod/TechDraw/App/DrawPagePyImp.cpp | 2 +- .../TechDraw/App/DrawParametricTemplate.cpp | 10 +- src/Mod/TechDraw/App/DrawParametricTemplate.h | 8 +- src/Mod/TechDraw/App/DrawProjGroup.cpp | 34 +-- src/Mod/TechDraw/App/DrawProjGroup.h | 36 +-- src/Mod/TechDraw/App/DrawProjGroupItem.h | 22 +- .../TechDraw/App/DrawProjGroupItemPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawProjectSplit.cpp | 2 +- src/Mod/TechDraw/App/DrawProjectSplit.h | 2 +- src/Mod/TechDraw/App/DrawRichAnno.cpp | 10 +- src/Mod/TechDraw/App/DrawRichAnno.h | 8 +- src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawSVGTemplate.cpp | 8 +- src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawTemplate.cpp | 10 +- src/Mod/TechDraw/App/DrawTemplatePyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawTile.cpp | 10 +- src/Mod/TechDraw/App/DrawTilePyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawTileWeld.cpp | 12 +- src/Mod/TechDraw/App/DrawTileWeld.h | 10 +- src/Mod/TechDraw/App/DrawView.cpp | 32 +-- src/Mod/TechDraw/App/DrawView.h | 34 +-- src/Mod/TechDraw/App/DrawViewAnnotation.cpp | 6 +- src/Mod/TechDraw/App/DrawViewAnnotation.h | 6 +- .../TechDraw/App/DrawViewAnnotationPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawViewArch.cpp | 8 +- src/Mod/TechDraw/App/DrawViewArch.h | 10 +- src/Mod/TechDraw/App/DrawViewBalloon.cpp | 12 +- src/Mod/TechDraw/App/DrawViewBalloon.h | 12 +- src/Mod/TechDraw/App/DrawViewClip.cpp | 8 +- src/Mod/TechDraw/App/DrawViewClip.h | 10 +- src/Mod/TechDraw/App/DrawViewClipPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawViewCollection.cpp | 4 +- src/Mod/TechDraw/App/DrawViewCollection.h | 12 +- src/Mod/TechDraw/App/DrawViewDetail.cpp | 8 +- src/Mod/TechDraw/App/DrawViewDetail.h | 12 +- src/Mod/TechDraw/App/DrawViewDimExtent.h | 8 +- .../TechDraw/App/DrawViewDimExtentPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawViewDimension.cpp | 24 +- src/Mod/TechDraw/App/DrawViewDimension.h | 34 +-- .../TechDraw/App/DrawViewDimensionPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawViewDraft.cpp | 10 +- src/Mod/TechDraw/App/DrawViewDraft.h | 10 +- src/Mod/TechDraw/App/DrawViewImage.cpp | 8 +- src/Mod/TechDraw/App/DrawViewImage.h | 8 +- src/Mod/TechDraw/App/DrawViewMulti.cpp | 4 +- src/Mod/TechDraw/App/DrawViewMulti.h | 6 +- src/Mod/TechDraw/App/DrawViewPart.cpp | 80 +++--- src/Mod/TechDraw/App/DrawViewPart.h | 86 +++---- src/Mod/TechDraw/App/DrawViewPartPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawViewSection.cpp | 22 +- src/Mod/TechDraw/App/DrawViewSection.h | 26 +- src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp | 14 +- src/Mod/TechDraw/App/DrawViewSpreadsheet.h | 14 +- src/Mod/TechDraw/App/DrawViewSymbol.cpp | 8 +- src/Mod/TechDraw/App/DrawViewSymbol.h | 8 +- src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp | 2 +- src/Mod/TechDraw/App/DrawWeldSymbol.cpp | 10 +- src/Mod/TechDraw/App/DrawWeldSymbol.h | 10 +- src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp | 2 +- src/Mod/TechDraw/App/EdgeWalker.cpp | 10 +- src/Mod/TechDraw/App/EdgeWalker.h | 12 +- src/Mod/TechDraw/App/FeatureProjection.cpp | 2 +- src/Mod/TechDraw/App/Geometry.cpp | 26 +- src/Mod/TechDraw/App/Geometry.h | 38 +-- src/Mod/TechDraw/App/GeometryObject.h | 28 +-- src/Mod/TechDraw/App/HatchLine.cpp | 28 +-- src/Mod/TechDraw/App/HatchLine.h | 76 +++--- src/Mod/TechDraw/App/LandmarkDimension.cpp | 8 +- src/Mod/TechDraw/App/LandmarkDimension.h | 10 +- src/Mod/TechDraw/App/LineGroup.cpp | 2 +- src/Mod/TechDraw/App/Preferences.cpp | 2 +- src/Mod/TechDraw/App/Preferences.h | 2 +- src/Mod/TechDraw/App/ProjectionAlgos.cpp | 2 +- src/Mod/TechDraw/App/ProjectionAlgos.h | 2 +- .../TechDraw/App/PropertyCenterLineList.cpp | 8 +- .../TechDraw/App/PropertyCosmeticEdgeList.cpp | 8 +- .../App/PropertyCosmeticVertexList.cpp | 8 +- .../TechDraw/App/PropertyGeomFormatList.cpp | 8 +- src/Mod/TechDraw/App/ShapeExtractor.cpp | 2 +- src/Mod/TechDraw/App/ShapeExtractor.h | 2 +- src/Mod/TechDraw/Gui/AppTechDrawGui.cpp | 12 +- src/Mod/TechDraw/Gui/Command.cpp | 40 +-- src/Mod/TechDraw/Gui/CommandAnnotate.cpp | 40 +-- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 30 +-- src/Mod/TechDraw/Gui/CommandDecorate.cpp | 10 +- src/Mod/TechDraw/Gui/CommandExtensionDims.cpp | 72 +++--- src/Mod/TechDraw/Gui/CommandExtensionPack.cpp | 60 ++--- .../Gui/DlgPrefsTechDrawAnnotationImp.cpp | 2 +- .../Gui/DlgPrefsTechDrawAnnotationImp.h | 2 +- .../Gui/DlgPrefsTechDrawDimensionsImp.cpp | 2 +- .../Gui/DlgPrefsTechDrawDimensionsImp.h | 2 +- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 18 +- src/Mod/TechDraw/Gui/MDIViewPage.h | 32 +-- src/Mod/TechDraw/Gui/QGCustomClip.h | 2 +- src/Mod/TechDraw/Gui/QGCustomImage.cpp | 2 +- src/Mod/TechDraw/Gui/QGCustomImage.h | 4 +- src/Mod/TechDraw/Gui/QGCustomText.cpp | 4 +- src/Mod/TechDraw/Gui/QGDisplayArea.cpp | 2 +- src/Mod/TechDraw/Gui/QGEPath.cpp | 10 +- src/Mod/TechDraw/Gui/QGICMark.cpp | 4 +- src/Mod/TechDraw/Gui/QGIDimLines.cpp | 2 +- src/Mod/TechDraw/Gui/QGIEdge.cpp | 2 +- src/Mod/TechDraw/Gui/QGIFace.cpp | 10 +- src/Mod/TechDraw/Gui/QGIFace.h | 16 +- src/Mod/TechDraw/Gui/QGILeaderLine.cpp | 20 +- src/Mod/TechDraw/Gui/QGILeaderLine.h | 24 +- src/Mod/TechDraw/Gui/QGIMatting.h | 6 +- src/Mod/TechDraw/Gui/QGIProjGroup.cpp | 4 +- src/Mod/TechDraw/Gui/QGIProjGroup.h | 6 +- src/Mod/TechDraw/Gui/QGIRichAnno.cpp | 6 +- src/Mod/TechDraw/Gui/QGISVGTemplate.cpp | 2 +- src/Mod/TechDraw/Gui/QGITile.cpp | 24 +- src/Mod/TechDraw/Gui/QGIView.cpp | 10 +- src/Mod/TechDraw/Gui/QGIView.h | 38 +-- src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewAnnotation.h | 2 +- src/Mod/TechDraw/Gui/QGIViewBalloon.h | 30 +-- src/Mod/TechDraw/Gui/QGIViewClip.h | 4 +- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 26 +- src/Mod/TechDraw/Gui/QGIViewDimension.h | 46 ++-- src/Mod/TechDraw/Gui/QGIViewImage.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewImage.h | 2 +- src/Mod/TechDraw/Gui/QGIViewPart.cpp | 8 +- src/Mod/TechDraw/Gui/QGIViewPart.h | 16 +- src/Mod/TechDraw/Gui/QGIViewSymbol.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewSymbol.h | 2 +- src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp | 20 +- src/Mod/TechDraw/Gui/QGIWeldSymbol.h | 24 +- src/Mod/TechDraw/Gui/QGMText.cpp | 6 +- src/Mod/TechDraw/Gui/QGSPage.cpp | 2 +- src/Mod/TechDraw/Gui/QGSPage.h | 2 +- src/Mod/TechDraw/Gui/QGTracker.cpp | 6 +- src/Mod/TechDraw/Gui/QGTracker.h | 6 +- src/Mod/TechDraw/Gui/QGVNavStyle.cpp | 2 +- src/Mod/TechDraw/Gui/QGVNavStyle.h | 2 +- src/Mod/TechDraw/Gui/QGVPage.cpp | 4 +- src/Mod/TechDraw/Gui/QGVPage.h | 6 +- src/Mod/TechDraw/Gui/TaskActiveView.cpp | 2 +- src/Mod/TechDraw/Gui/TaskActiveView.h | 2 +- src/Mod/TechDraw/Gui/TaskBalloon.h | 2 +- src/Mod/TechDraw/Gui/TaskCenterLine.cpp | 6 +- src/Mod/TechDraw/Gui/TaskCenterLine.h | 14 +- src/Mod/TechDraw/Gui/TaskCosVertex.cpp | 8 +- src/Mod/TechDraw/Gui/TaskCosVertex.h | 12 +- src/Mod/TechDraw/Gui/TaskCosmeticLine.h | 10 +- src/Mod/TechDraw/Gui/TaskCustomizeFormat.h | 4 +- src/Mod/TechDraw/Gui/TaskDetail.h | 6 +- src/Mod/TechDraw/Gui/TaskDimension.h | 2 +- src/Mod/TechDraw/Gui/TaskGeomHatch.cpp | 2 +- src/Mod/TechDraw/Gui/TaskGeomHatch.h | 4 +- src/Mod/TechDraw/Gui/TaskHatch.cpp | 2 +- src/Mod/TechDraw/Gui/TaskHatch.h | 8 +- src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 16 +- src/Mod/TechDraw/Gui/TaskLeaderLine.h | 26 +- src/Mod/TechDraw/Gui/TaskLineDecor.cpp | 36 +-- src/Mod/TechDraw/Gui/TaskLineDecor.h | 44 ++-- src/Mod/TechDraw/Gui/TaskLinkDim.h | 2 +- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 4 +- src/Mod/TechDraw/Gui/TaskProjGroup.h | 8 +- src/Mod/TechDraw/Gui/TaskProjection.h | 2 +- src/Mod/TechDraw/Gui/TaskRichAnno.cpp | 8 +- src/Mod/TechDraw/Gui/TaskRichAnno.h | 20 +- src/Mod/TechDraw/Gui/TaskSectionView.cpp | 12 +- src/Mod/TechDraw/Gui/TaskSectionView.h | 16 +- .../TechDraw/Gui/TaskSelectLineAttributes.cpp | 8 +- .../TechDraw/Gui/TaskSelectLineAttributes.h | 22 +- .../TechDraw/Gui/TaskSurfaceFinishSymbols.cpp | 4 +- .../TechDraw/Gui/TaskSurfaceFinishSymbols.h | 6 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp | 12 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.h | 4 +- src/Mod/TechDraw/Gui/ViewProviderAnnotation.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderBalloon.h | 4 +- .../TechDraw/Gui/ViewProviderDimension.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderDimension.h | 4 +- .../TechDraw/Gui/ViewProviderDrawingView.cpp | 8 +- .../TechDraw/Gui/ViewProviderDrawingView.h | 10 +- .../TechDraw/Gui/ViewProviderGeomHatch.cpp | 6 +- src/Mod/TechDraw/Gui/ViewProviderHatch.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderHatch.h | 4 +- src/Mod/TechDraw/Gui/ViewProviderImage.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderLeader.cpp | 8 +- src/Mod/TechDraw/Gui/ViewProviderLeader.h | 10 +- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 20 +- src/Mod/TechDraw/Gui/ViewProviderPage.h | 24 +- .../TechDraw/Gui/ViewProviderProjGroup.cpp | 6 +- src/Mod/TechDraw/Gui/ViewProviderProjGroup.h | 8 +- .../Gui/ViewProviderProjGroupItem.cpp | 4 +- .../TechDraw/Gui/ViewProviderProjGroupItem.h | 6 +- src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp | 8 +- src/Mod/TechDraw/Gui/ViewProviderRichAnno.h | 12 +- .../TechDraw/Gui/ViewProviderSpreadsheet.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderSymbol.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp | 10 +- src/Mod/TechDraw/Gui/ViewProviderTile.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp | 6 +- src/Mod/TechDraw/Gui/ViewProviderViewClip.h | 8 +- src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp | 10 +- .../TechDraw/Gui/ViewProviderViewSection.cpp | 6 +- .../TechDraw/Gui/ViewProviderViewSection.h | 6 +- src/Mod/TechDraw/Gui/ViewProviderWeld.cpp | 10 +- src/Mod/TechDraw/Gui/ViewProviderWeld.h | 12 +- src/Mod/Web/Gui/AppWebGui.cpp | 2 +- src/Mod/Web/Gui/BrowserView.cpp | 6 +- src/Mod/Web/Gui/BrowserView.h | 8 +- src/Mod/Web/Gui/Command.cpp | 16 +- 805 files changed, 3787 insertions(+), 3787 deletions(-) diff --git a/src/Mod/Fem/App/FemAnalysis.cpp b/src/Mod/Fem/App/FemAnalysis.cpp index bc2f075d6e..c795df19a7 100644 --- a/src/Mod/Fem/App/FemAnalysis.cpp +++ b/src/Mod/Fem/App/FemAnalysis.cpp @@ -67,7 +67,7 @@ PROPERTY_SOURCE_ABSTRACT(Fem::DocumentObject, App::DocumentObject) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::FemAnalysisPython, Fem::FemAnalysis) -template<> const char* Fem::FemAnalysisPython::getViewProviderName(void) const { +template<> const char* Fem::FemAnalysisPython::getViewProviderName() const { return "FemGui::ViewProviderFemAnalysisPython"; } @@ -92,10 +92,10 @@ template class FemExport FeaturePythonT; namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::FeaturePython, Fem::DocumentObject) -template<> const char* Fem::FeaturePython::getViewProviderName(void) const { +template<> const char* Fem::FeaturePython::getViewProviderName() const { return "Gui::ViewProviderPythonFeature"; } -template<> PyObject* Fem::FeaturePython::getPyObject(void) { +template<> PyObject* Fem::FeaturePython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new App::FeaturePythonPyT(this), true); diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index d58f8f4286..13fac320a6 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -92,7 +92,7 @@ Constraint::~Constraint() { } -App::DocumentObjectExecReturn *Constraint::execute(void) +App::DocumentObjectExecReturn *Constraint::execute() { try { References.touch(); @@ -483,11 +483,11 @@ const Base::Vector3d Constraint::getDirection(const App::PropertyLinkSub &direct namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::ConstraintPython, Fem::Constraint) -template<> const char* Fem::ConstraintPython::getViewProviderName(void) const { +template<> const char* Fem::ConstraintPython::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintPython"; } -template<> PyObject* Fem::ConstraintPython::getPyObject(void) { +template<> PyObject* Fem::ConstraintPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new App::FeaturePythonPyT(this),true); diff --git a/src/Mod/Fem/App/FemConstraintBearing.cpp b/src/Mod/Fem/App/FemConstraintBearing.cpp index dd0cb0bb95..9cf7cf63ed 100644 --- a/src/Mod/Fem/App/FemConstraintBearing.cpp +++ b/src/Mod/Fem/App/FemConstraintBearing.cpp @@ -57,7 +57,7 @@ ConstraintBearing::ConstraintBearing() "Axis of bearing seat"); } -App::DocumentObjectExecReturn *ConstraintBearing::execute(void) +App::DocumentObjectExecReturn *ConstraintBearing::execute() { return Constraint::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h index ab027b9dfa..0cfcc9241f 100644 --- a/src/Mod/Fem/App/FemConstraintBearing.h +++ b/src/Mod/Fem/App/FemConstraintBearing.h @@ -40,7 +40,7 @@ class FemExport ConstraintBearing : public Fem::Constraint public: /// Constructor - ConstraintBearing(void); + ConstraintBearing(); /// Location reference App::PropertyLinkSub Location; @@ -55,10 +55,10 @@ public: App::PropertyVector Axis; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintBearing"; } diff --git a/src/Mod/Fem/App/FemConstraintContact.cpp b/src/Mod/Fem/App/FemConstraintContact.cpp index 390f09efc4..d368ef24d9 100644 --- a/src/Mod/Fem/App/FemConstraintContact.cpp +++ b/src/Mod/Fem/App/FemConstraintContact.cpp @@ -55,12 +55,12 @@ ConstraintContact::ConstraintContact() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintContact::execute(void) +App::DocumentObjectExecReturn *ConstraintContact::execute() { return Constraint::execute(); } -const char* ConstraintContact::getViewProviderName(void) const +const char* ConstraintContact::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintContact"; } diff --git a/src/Mod/Fem/App/FemConstraintContact.h b/src/Mod/Fem/App/FemConstraintContact.h index a4ba7f92bd..59415cd7ad 100644 --- a/src/Mod/Fem/App/FemConstraintContact.h +++ b/src/Mod/Fem/App/FemConstraintContact.h @@ -36,7 +36,7 @@ class FemExport ConstraintContact : public Fem::Constraint public: /// Constructor - ConstraintContact(void); + ConstraintContact(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; @@ -57,10 +57,10 @@ public: /* */ /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.cpp b/src/Mod/Fem/App/FemConstraintDisplacement.cpp index 6a50add28c..e7da523dfe 100644 --- a/src/Mod/Fem/App/FemConstraintDisplacement.cpp +++ b/src/Mod/Fem/App/FemConstraintDisplacement.cpp @@ -88,12 +88,12 @@ ConstraintDisplacement::ConstraintDisplacement() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintDisplacement::execute(void) +App::DocumentObjectExecReturn *ConstraintDisplacement::execute() { return Constraint::execute(); } -const char* ConstraintDisplacement::getViewProviderName(void) const +const char* ConstraintDisplacement::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintDisplacement"; } diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.h b/src/Mod/Fem/App/FemConstraintDisplacement.h index 2ebae5030f..2c147137dd 100644 --- a/src/Mod/Fem/App/FemConstraintDisplacement.h +++ b/src/Mod/Fem/App/FemConstraintDisplacement.h @@ -38,7 +38,7 @@ class FemExport ConstraintDisplacement : public Fem::Constraint public: /// Constructor - ConstraintDisplacement(void); + ConstraintDisplacement(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; @@ -66,10 +66,10 @@ public: //App::PropertyBool element; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintFixed.cpp b/src/Mod/Fem/App/FemConstraintFixed.cpp index 5b8874ec90..30bf786c05 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.cpp +++ b/src/Mod/Fem/App/FemConstraintFixed.cpp @@ -60,7 +60,7 @@ ConstraintFixed::ConstraintFixed() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintFixed::execute(void) +App::DocumentObjectExecReturn *ConstraintFixed::execute() { return Constraint::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h index 7731f1a9aa..2e397dd7f7 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.h +++ b/src/Mod/Fem/App/FemConstraintFixed.h @@ -39,17 +39,17 @@ class FemExport ConstraintFixed : public Fem::Constraint public: /// Constructor - ConstraintFixed(void); + ConstraintFixed(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintFixed"; } diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp b/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp index 7f29c31af5..3b3644b280 100644 --- a/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp @@ -113,7 +113,7 @@ ConstraintFluidBoundary::ConstraintFluidBoundary() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintFluidBoundary::execute(void) +App::DocumentObjectExecReturn *ConstraintFluidBoundary::execute() { return Constraint::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.h b/src/Mod/Fem/App/FemConstraintFluidBoundary.h index 531c6384d5..563706ab1b 100644 --- a/src/Mod/Fem/App/FemConstraintFluidBoundary.h +++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.h @@ -41,7 +41,7 @@ class FemExport ConstraintFluidBoundary: public Fem::Constraint public: /// Constructor - ConstraintFluidBoundary(void); + ConstraintFluidBoundary(); // App::PropertyEnumeration BoundaryType; App::PropertyEnumeration Subtype; @@ -64,10 +64,10 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintFluidBoundary"; } diff --git a/src/Mod/Fem/App/FemConstraintForce.cpp b/src/Mod/Fem/App/FemConstraintForce.cpp index 2c2fe4117a..2a14d6d1ae 100644 --- a/src/Mod/Fem/App/FemConstraintForce.cpp +++ b/src/Mod/Fem/App/FemConstraintForce.cpp @@ -57,7 +57,7 @@ ConstraintForce::ConstraintForce() Points.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintForce::execute(void) +App::DocumentObjectExecReturn *ConstraintForce::execute() { return Constraint::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintForce.h b/src/Mod/Fem/App/FemConstraintForce.h index b263676c11..ea3d9959b5 100644 --- a/src/Mod/Fem/App/FemConstraintForce.h +++ b/src/Mod/Fem/App/FemConstraintForce.h @@ -40,7 +40,7 @@ class FemExport ConstraintForce : public Fem::Constraint public: /// Constructor - ConstraintForce(void); + ConstraintForce(); App::PropertyFloat Force; App::PropertyLinkSub Direction; @@ -50,10 +50,10 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintForce"; } diff --git a/src/Mod/Fem/App/FemConstraintGear.cpp b/src/Mod/Fem/App/FemConstraintGear.cpp index 10c1559323..df15ad06a5 100644 --- a/src/Mod/Fem/App/FemConstraintGear.cpp +++ b/src/Mod/Fem/App/FemConstraintGear.cpp @@ -56,7 +56,7 @@ ConstraintGear::ConstraintGear() naturalDirectionVector = Base::Vector3d(1,1,1).Normalize(); } -App::DocumentObjectExecReturn *ConstraintGear::execute(void) +App::DocumentObjectExecReturn *ConstraintGear::execute() { return ConstraintBearing::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h index 27f186bf1a..32ab618d7a 100644 --- a/src/Mod/Fem/App/FemConstraintGear.h +++ b/src/Mod/Fem/App/FemConstraintGear.h @@ -40,7 +40,7 @@ class FemExport ConstraintGear : public Fem::ConstraintBearing public: /// Constructor - ConstraintGear(void); + ConstraintGear(); App::PropertyFloat Diameter; App::PropertyFloat Force; @@ -51,10 +51,10 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintGear"; } diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.cpp b/src/Mod/Fem/App/FemConstraintHeatflux.cpp index c9e7847664..3a652c979f 100644 --- a/src/Mod/Fem/App/FemConstraintHeatflux.cpp +++ b/src/Mod/Fem/App/FemConstraintHeatflux.cpp @@ -61,12 +61,12 @@ ConstraintHeatflux::ConstraintHeatflux() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintHeatflux::execute(void) +App::DocumentObjectExecReturn *ConstraintHeatflux::execute() { return Constraint::execute(); } -const char* ConstraintHeatflux::getViewProviderName(void) const +const char* ConstraintHeatflux::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintHeatflux"; } diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.h b/src/Mod/Fem/App/FemConstraintHeatflux.h index 33f1a4485c..a2c4567405 100644 --- a/src/Mod/Fem/App/FemConstraintHeatflux.h +++ b/src/Mod/Fem/App/FemConstraintHeatflux.h @@ -36,7 +36,7 @@ class FemExport ConstraintHeatflux : public Fem::Constraint PROPERTY_HEADER(Fem::ConstraintHeatflux); public: - ConstraintHeatflux(void); + ConstraintHeatflux(); App::PropertyFloat AmbientTemp; /*App::PropertyFloat FaceTemp;*/ @@ -48,10 +48,10 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp b/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp index ace92e2061..81e024839b 100644 --- a/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp +++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp @@ -57,12 +57,12 @@ ConstraintInitialTemperature::ConstraintInitialTemperature() References.setStatus(App::Property::Hidden, true); } -App::DocumentObjectExecReturn *ConstraintInitialTemperature::execute(void) +App::DocumentObjectExecReturn *ConstraintInitialTemperature::execute() { return Constraint::execute(); } -const char* ConstraintInitialTemperature::getViewProviderName(void) const +const char* ConstraintInitialTemperature::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintInitialTemperature"; } diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.h b/src/Mod/Fem/App/FemConstraintInitialTemperature.h index c594490c24..13dbdaaef6 100644 --- a/src/Mod/Fem/App/FemConstraintInitialTemperature.h +++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.h @@ -38,7 +38,7 @@ class FemExport ConstraintInitialTemperature : public Fem::Constraint public: /// Constructor - ConstraintInitialTemperature(void); + ConstraintInitialTemperature(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; @@ -49,10 +49,10 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp b/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp index 2831840141..58b03ebdb5 100644 --- a/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp +++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp @@ -51,12 +51,12 @@ ConstraintPlaneRotation::ConstraintPlaneRotation() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintPlaneRotation::execute(void) +App::DocumentObjectExecReturn *ConstraintPlaneRotation::execute() { return Constraint::execute(); } -const char* ConstraintPlaneRotation::getViewProviderName(void) const +const char* ConstraintPlaneRotation::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintPlaneRotation"; } diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.h b/src/Mod/Fem/App/FemConstraintPlaneRotation.h index 15c8e851a1..fc244cd196 100644 --- a/src/Mod/Fem/App/FemConstraintPlaneRotation.h +++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.h @@ -36,7 +36,7 @@ class FemExport ConstraintPlaneRotation : public Fem::Constraint public: /// Constructor - ConstraintPlaneRotation(void); + ConstraintPlaneRotation(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; @@ -44,10 +44,10 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintPressure.cpp b/src/Mod/Fem/App/FemConstraintPressure.cpp index 75365ba960..85e095ce02 100644 --- a/src/Mod/Fem/App/FemConstraintPressure.cpp +++ b/src/Mod/Fem/App/FemConstraintPressure.cpp @@ -53,12 +53,12 @@ ConstraintPressure::ConstraintPressure() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintPressure::execute(void) +App::DocumentObjectExecReturn *ConstraintPressure::execute() { return Constraint::execute(); } -const char* ConstraintPressure::getViewProviderName(void) const +const char* ConstraintPressure::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintPressure"; } diff --git a/src/Mod/Fem/App/FemConstraintPressure.h b/src/Mod/Fem/App/FemConstraintPressure.h index e25b36cf54..97175afcc8 100644 --- a/src/Mod/Fem/App/FemConstraintPressure.h +++ b/src/Mod/Fem/App/FemConstraintPressure.h @@ -34,7 +34,7 @@ class FemExport ConstraintPressure : public Fem::Constraint PROPERTY_HEADER(Fem::ConstraintPressure); public: - ConstraintPressure(void); + ConstraintPressure(); App::PropertyFloat Pressure; App::PropertyBool Reversed; @@ -42,10 +42,10 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintPulley.cpp b/src/Mod/Fem/App/FemConstraintPulley.cpp index e38fbf9703..d6e394b41a 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.cpp +++ b/src/Mod/Fem/App/FemConstraintPulley.cpp @@ -62,7 +62,7 @@ ConstraintPulley::ConstraintPulley() onChanged(&Force); } -App::DocumentObjectExecReturn *ConstraintPulley::execute(void) +App::DocumentObjectExecReturn *ConstraintPulley::execute() { return ConstraintGear::execute(); } diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h index 9d37df73ac..deb962ec39 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.h +++ b/src/Mod/Fem/App/FemConstraintPulley.h @@ -39,7 +39,7 @@ class FemExport ConstraintPulley : public Fem::ConstraintGear public: /// Constructor - ConstraintPulley(void); + ConstraintPulley(); /// Other pulley diameter App::PropertyFloat OtherDiameter; @@ -55,10 +55,10 @@ public: App::PropertyFloat BeltForce2; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "FemGui::ViewProviderFemConstraintPulley"; } diff --git a/src/Mod/Fem/App/FemConstraintSpring.cpp b/src/Mod/Fem/App/FemConstraintSpring.cpp index 20ffe69338..b70a8a4c07 100644 --- a/src/Mod/Fem/App/FemConstraintSpring.cpp +++ b/src/Mod/Fem/App/FemConstraintSpring.cpp @@ -53,12 +53,12 @@ ConstraintSpring::ConstraintSpring() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintSpring::execute(void) +App::DocumentObjectExecReturn *ConstraintSpring::execute() { return Constraint::execute(); } -const char* ConstraintSpring::getViewProviderName(void) const +const char* ConstraintSpring::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintSpring"; } diff --git a/src/Mod/Fem/App/FemConstraintSpring.h b/src/Mod/Fem/App/FemConstraintSpring.h index 0a743091bb..550a90fe65 100644 --- a/src/Mod/Fem/App/FemConstraintSpring.h +++ b/src/Mod/Fem/App/FemConstraintSpring.h @@ -34,7 +34,7 @@ class FemExport ConstraintSpring : public Fem::Constraint PROPERTY_HEADER(Fem::ConstraintSpring); public: - ConstraintSpring(void); + ConstraintSpring(); App::PropertyFloat normalStiffness; App::PropertyFloat tangentialStiffness; @@ -42,10 +42,10 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintTemperature.cpp b/src/Mod/Fem/App/FemConstraintTemperature.cpp index ff3afc7360..ba51f39d55 100644 --- a/src/Mod/Fem/App/FemConstraintTemperature.cpp +++ b/src/Mod/Fem/App/FemConstraintTemperature.cpp @@ -60,12 +60,12 @@ ConstraintTemperature::ConstraintTemperature() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintTemperature::execute(void) +App::DocumentObjectExecReturn *ConstraintTemperature::execute() { return Constraint::execute(); } -const char* ConstraintTemperature::getViewProviderName(void) const +const char* ConstraintTemperature::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintTemperature"; } diff --git a/src/Mod/Fem/App/FemConstraintTemperature.h b/src/Mod/Fem/App/FemConstraintTemperature.h index 078d514490..6ed3f54a86 100644 --- a/src/Mod/Fem/App/FemConstraintTemperature.h +++ b/src/Mod/Fem/App/FemConstraintTemperature.h @@ -38,7 +38,7 @@ class FemExport ConstraintTemperature : public Fem::Constraint public: /// Constructor - ConstraintTemperature(void); + ConstraintTemperature(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyVectorList Points; @@ -51,10 +51,10 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemConstraintTransform.cpp b/src/Mod/Fem/App/FemConstraintTransform.cpp index dc7d06b2f1..210bbc3205 100644 --- a/src/Mod/Fem/App/FemConstraintTransform.cpp +++ b/src/Mod/Fem/App/FemConstraintTransform.cpp @@ -64,12 +64,12 @@ ConstraintTransform::ConstraintTransform() Normals.setValues(std::vector()); } -App::DocumentObjectExecReturn *ConstraintTransform::execute(void) +App::DocumentObjectExecReturn *ConstraintTransform::execute() { return Constraint::execute(); } -const char* ConstraintTransform::getViewProviderName(void) const +const char* ConstraintTransform::getViewProviderName() const { return "FemGui::ViewProviderFemConstraintTransform"; } diff --git a/src/Mod/Fem/App/FemConstraintTransform.h b/src/Mod/Fem/App/FemConstraintTransform.h index a93dc363d2..b44aff7a6f 100644 --- a/src/Mod/Fem/App/FemConstraintTransform.h +++ b/src/Mod/Fem/App/FemConstraintTransform.h @@ -35,7 +35,7 @@ class FemExport ConstraintTransform : public Fem::Constraint public: /// Constructor - ConstraintTransform(void); + ConstraintTransform(); // Read-only (calculated values). These trigger changes in the ViewProvider App::PropertyLinkSubList RefDispl; @@ -52,10 +52,10 @@ public: /* */ /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const; + const char* getViewProviderName() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index a1ba7e20f8..b386846ec4 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1055,7 +1055,7 @@ std::list FemMesh::getElementNodes(int id) const return result; } -std::set FemMesh::getEdgesOnly(void) const +std::set FemMesh::getEdgesOnly() const { std::set resultIDs; @@ -1092,7 +1092,7 @@ std::set FemMesh::getEdgesOnly(void) const return resultIDs; } -std::set FemMesh::getFacesOnly(void) const +std::set FemMesh::getFacesOnly() const { // How it works ATM: // for each face @@ -2365,7 +2365,7 @@ void FemMesh::write(const char *FileName) const // ==== Base class implementer ============================================================== -unsigned int FemMesh::getMemSize (void) const +unsigned int FemMesh::getMemSize () const { return 0; } @@ -2480,12 +2480,12 @@ void FemMesh::setTransform(const Base::Matrix4D& rclTrf) _Mtrx = rclTrf; } -Base::Matrix4D FemMesh::getTransform(void) const +Base::Matrix4D FemMesh::getTransform() const { return _Mtrx; } -Base::BoundBox3d FemMesh::getBoundBox(void) const +Base::BoundBox3d FemMesh::getBoundBox() const { Base::BoundBox3d box; @@ -2503,7 +2503,7 @@ Base::BoundBox3d FemMesh::getBoundBox(void) const return box; } -std::vector FemMesh::getElementTypes(void) const +std::vector FemMesh::getElementTypes() const { std::vector temp; temp.push_back("Vertex"); @@ -2529,7 +2529,7 @@ Data::Segment* FemMesh::getSubElement(const char* /*Type*/, unsigned long /*n*/) return nullptr; } -struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{ +struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo() const{ struct FemMeshInfo rtrn; @@ -2570,7 +2570,7 @@ struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{ // ); // } -Base::Quantity FemMesh::getVolume(void)const +Base::Quantity FemMesh::getVolume()const { SMDS_VolumeIteratorPtr aVolIter = myMesh->GetMeshDS()->volumesIterator(); diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index 9b054e1301..b6f3387c90 100644 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -67,7 +67,7 @@ public: void compute(); // from base class - virtual unsigned int getMemSize (void) const; + virtual unsigned int getMemSize () const; virtual void Save (Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); void SaveDocFile (Base::Writer &writer) const; @@ -79,7 +79,7 @@ public: * List of different subelement types * it is NOT a list of the subelements itself */ - virtual std::vector getElementTypes(void) const; + virtual std::vector getElementTypes() const; virtual unsigned long countSubElements(const char* Type) const; /// get the subelement by type and number virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; @@ -108,9 +108,9 @@ public: /// retrieving volume IDs and CalculiX face number by face std::map getccxVolumesByFace(const TopoDS_Face &face) const; /// retrieving IDs of edges not belonging to any face (and thus not belonging to any volume too) - std::set getEdgesOnly(void) const; + std::set getEdgesOnly() const; /// retrieving IDs of faces not belonging to any volume - std::set getFacesOnly(void) const; + std::set getFacesOnly() const; //@} /** @name Placement control */ @@ -118,11 +118,11 @@ public: /// set the transformation void setTransform(const Base::Matrix4D& rclTrf); /// get the transformation - Base::Matrix4D getTransform(void) const; + Base::Matrix4D getTransform() const; /// Bound box from the shape - Base::BoundBox3d getBoundBox(void)const; + Base::BoundBox3d getBoundBox()const; /// get the volume (when there are volume elements) - Base::Quantity getVolume(void)const; + Base::Quantity getVolume()const; //@} /** @name Modification */ @@ -157,7 +157,7 @@ public: }; /// - struct FemMeshInfo getInfo(void) const; + struct FemMeshInfo getInfo() const; /// import from files void read(const char *FileName); diff --git a/src/Mod/Fem/App/FemMeshObject.cpp b/src/Mod/Fem/App/FemMeshObject.cpp index ceb1d99458..662be2417c 100644 --- a/src/Mod/Fem/App/FemMeshObject.cpp +++ b/src/Mod/Fem/App/FemMeshObject.cpp @@ -45,7 +45,7 @@ FemMeshObject::~FemMeshObject() { } -short FemMeshObject::mustExecute(void) const +short FemMeshObject::mustExecute() const { return 0; } @@ -75,11 +75,11 @@ void FemMeshObject::onChanged(const Property* prop) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::FemMeshObjectPython, Fem::FemMeshObject) -template<> const char* Fem::FemMeshObjectPython::getViewProviderName(void) const { +template<> const char* Fem::FemMeshObjectPython::getViewProviderName() const { return "FemGui::ViewProviderFemMeshPython"; } -template<> PyObject* Fem::FemMeshObjectPython::getPyObject(void) { +template<> PyObject* Fem::FemMeshObjectPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new App::FeaturePythonPyT(this), true); diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h index acc5f28094..aa2eef5cb6 100644 --- a/src/Mod/Fem/App/FemMeshObject.h +++ b/src/Mod/Fem/App/FemMeshObject.h @@ -39,18 +39,18 @@ class FemExport FemMeshObject : public App::GeoFeature public: /// Constructor - FemMeshObject(void); + FemMeshObject(); virtual ~FemMeshObject(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemMesh"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); PropertyFemMesh FemMesh; diff --git a/src/Mod/Fem/App/FemMeshProperty.cpp b/src/Mod/Fem/App/FemMeshProperty.cpp index 14a9576830..716bfef30a 100644 --- a/src/Mod/Fem/App/FemMeshProperty.cpp +++ b/src/Mod/Fem/App/FemMeshProperty.cpp @@ -67,7 +67,7 @@ void PropertyFemMesh::setValue(const FemMesh& sh) hasSetValue(); } -const FemMesh &PropertyFemMesh::getValue(void)const +const FemMesh &PropertyFemMesh::getValue()const { return *_FemMesh; } @@ -99,7 +99,7 @@ void PropertyFemMesh::transformGeometry(const Base::Matrix4D &rclMat) hasSetValue(); } -PyObject *PropertyFemMesh::getPyObject(void) +PyObject *PropertyFemMesh::getPyObject() { FemMeshPy* mesh = new FemMeshPy(&*_FemMesh); mesh->setConst(); @@ -123,7 +123,7 @@ void PropertyFemMesh::setPyObject(PyObject *value) } } -App::Property *PropertyFemMesh::Copy(void) const +App::Property *PropertyFemMesh::Copy() const { PropertyFemMesh *prop = new PropertyFemMesh(); prop->_FemMesh = this->_FemMesh; @@ -137,7 +137,7 @@ void PropertyFemMesh::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyFemMesh::getMemSize (void) const +unsigned int PropertyFemMesh::getMemSize () const { return _FemMesh->getMemSize(); } diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h index 77d1358cc6..57cc500d19 100644 --- a/src/Mod/Fem/App/FemMeshProperty.h +++ b/src/Mod/Fem/App/FemMeshProperty.h @@ -49,9 +49,9 @@ public: /// set the FemMesh shape void setValue(const FemMesh&); /// does nothing, for add property macro - void setValue(void){} + void setValue(){} /// get the FemMesh shape - const FemMesh &getValue(void) const; + const FemMesh &getValue() const; const Data::ComplexGeoData* getComplexData() const; //@} @@ -69,7 +69,7 @@ public: /** @name Python interface */ //@{ - PyObject* getPyObject(void); + PyObject* getPyObject(); void setPyObject(PyObject *value); //@} @@ -80,10 +80,10 @@ public: void SaveDocFile (Base::Writer &writer) const; void RestoreDocFile(Base::Reader &reader); - App::Property *Copy(void) const; + App::Property *Copy() const; void Paste(const App::Property &from); - unsigned int getMemSize (void) const; - const char* getEditorName(void) const { return "FemGui::PropertyFemMeshItem"; } + unsigned int getMemSize () const; + const char* getEditorName() const { return "FemGui::PropertyFemMeshItem"; } //@} private: diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp index 275798e55e..5158d467f5 100644 --- a/src/Mod/Fem/App/FemMeshPyImp.cpp +++ b/src/Mod/Fem/App/FemMeshPyImp.cpp @@ -63,7 +63,7 @@ using namespace Fem; // returns a string which represents the object e.g. when printed in python -std::string FemMeshPy::representation(void) const +std::string FemMeshPy::representation() const { std::stringstream str; getFemMeshPtr()->getSMesh()->Dump(str); @@ -1160,7 +1160,7 @@ PyObject* FemMeshPy::getIdByElementType(PyObject *args) // ===== Attributes ============================================================ -Py::Dict FemMeshPy::getNodes(void) const +Py::Dict FemMeshPy::getNodes() const { //int count = getFemMeshPtr()->getSMesh()->GetMeshDS()->NbNodes(); //Py::Tuple tup(count); @@ -1183,12 +1183,12 @@ Py::Dict FemMeshPy::getNodes(void) const return dict; } -Py::Long FemMeshPy::getNodeCount(void) const +Py::Long FemMeshPy::getNodeCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbNodes()); } -Py::Tuple FemMeshPy::getEdges(void) const +Py::Tuple FemMeshPy::getEdges() const { std::set ids; SMDS_EdgeIteratorPtr aEdgeIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->edgesIterator(); @@ -1206,7 +1206,7 @@ Py::Tuple FemMeshPy::getEdges(void) const return tuple; } -Py::Tuple FemMeshPy::getEdgesOnly(void) const +Py::Tuple FemMeshPy::getEdgesOnly() const { std::set resultSet = getFemMeshPtr()->getEdgesOnly(); Py::Tuple tuple(resultSet.size()); @@ -1218,12 +1218,12 @@ Py::Tuple FemMeshPy::getEdgesOnly(void) const return tuple; } -Py::Long FemMeshPy::getEdgeCount(void) const +Py::Long FemMeshPy::getEdgeCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbEdges()); } -Py::Tuple FemMeshPy::getFaces(void) const +Py::Tuple FemMeshPy::getFaces() const { std::set ids; SMDS_FaceIteratorPtr aFaceIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->facesIterator(); @@ -1241,7 +1241,7 @@ Py::Tuple FemMeshPy::getFaces(void) const return tuple; } -Py::Tuple FemMeshPy::getFacesOnly(void) const +Py::Tuple FemMeshPy::getFacesOnly() const { std::set resultSet = getFemMeshPtr()->getFacesOnly(); Py::Tuple tuple(resultSet.size()); @@ -1253,27 +1253,27 @@ Py::Tuple FemMeshPy::getFacesOnly(void) const return tuple; } -Py::Long FemMeshPy::getFaceCount(void) const +Py::Long FemMeshPy::getFaceCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbFaces()); } -Py::Long FemMeshPy::getTriangleCount(void) const +Py::Long FemMeshPy::getTriangleCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbTriangles()); } -Py::Long FemMeshPy::getQuadrangleCount(void) const +Py::Long FemMeshPy::getQuadrangleCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbQuadrangles()); } -Py::Long FemMeshPy::getPolygonCount(void) const +Py::Long FemMeshPy::getPolygonCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbPolygons()); } -Py::Tuple FemMeshPy::getVolumes(void) const +Py::Tuple FemMeshPy::getVolumes() const { std::set ids; SMDS_VolumeIteratorPtr aVolIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->volumesIterator(); @@ -1291,47 +1291,47 @@ Py::Tuple FemMeshPy::getVolumes(void) const return tuple; } -Py::Long FemMeshPy::getVolumeCount(void) const +Py::Long FemMeshPy::getVolumeCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbVolumes()); } -Py::Long FemMeshPy::getTetraCount(void) const +Py::Long FemMeshPy::getTetraCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbTetras()); } -Py::Long FemMeshPy::getHexaCount(void) const +Py::Long FemMeshPy::getHexaCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbHexas()); } -Py::Long FemMeshPy::getPyramidCount(void) const +Py::Long FemMeshPy::getPyramidCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbPyramids()); } -Py::Long FemMeshPy::getPrismCount(void) const +Py::Long FemMeshPy::getPrismCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbPrisms()); } -Py::Long FemMeshPy::getPolyhedronCount(void) const +Py::Long FemMeshPy::getPolyhedronCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbPolyhedrons()); } -Py::Long FemMeshPy::getSubMeshCount(void) const +Py::Long FemMeshPy::getSubMeshCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbSubMesh()); } -Py::Long FemMeshPy::getGroupCount(void) const +Py::Long FemMeshPy::getGroupCount() const { return Py::Long(getFemMeshPtr()->getSMesh()->NbGroup()); } -Py::Tuple FemMeshPy::getGroups(void) const +Py::Tuple FemMeshPy::getGroups() const { std::list groupIDs = getFemMeshPtr()->getSMesh()->GetGroupIds(); @@ -1344,7 +1344,7 @@ Py::Tuple FemMeshPy::getGroups(void) const return tuple; } -Py::Object FemMeshPy::getVolume(void) const +Py::Object FemMeshPy::getVolume() const { return Py::asObject(new Base::QuantityPy(new Base::Quantity(getFemMeshPtr()->getVolume()))); diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp index b8c587ac5e..a90d41489b 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp @@ -73,7 +73,7 @@ FemMeshShapeNetgenObject::~FemMeshShapeNetgenObject() { } -App::DocumentObjectExecReturn *FemMeshShapeNetgenObject::execute(void) +App::DocumentObjectExecReturn *FemMeshShapeNetgenObject::execute() { #ifdef FCWithNetgen diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h index 38b8c418c6..fcfbe32b33 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h @@ -35,7 +35,7 @@ class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject public: /// Constructor - FemMeshShapeNetgenObject(void); + FemMeshShapeNetgenObject(); virtual ~FemMeshShapeNetgenObject(); App::PropertyFloat MaxSize; @@ -47,10 +47,10 @@ public: App::PropertyBool Optimize; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemMeshShapeNetgen"; } - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //virtual short mustExecute(void) const; //virtual PyObject *getPyObject(void); diff --git a/src/Mod/Fem/App/FemMeshShapeObject.cpp b/src/Mod/Fem/App/FemMeshShapeObject.cpp index edc896cf9d..af4e4760cb 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.cpp +++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp @@ -86,7 +86,7 @@ FemMeshShapeObject::~FemMeshShapeObject() { } -App::DocumentObjectExecReturn *FemMeshShapeObject::execute(void) +App::DocumentObjectExecReturn *FemMeshShapeObject::execute() { Fem::FemMesh newMesh; diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h index e3ecfe5c29..99db629481 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.h +++ b/src/Mod/Fem/App/FemMeshShapeObject.h @@ -36,14 +36,14 @@ class FemExport FemMeshShapeObject : public FemMeshObject public: /// Constructor - FemMeshShapeObject(void); + FemMeshShapeObject(); virtual ~FemMeshShapeObject(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemMeshShape"; } - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //virtual short mustExecute(void) const; //virtual PyObject *getPyObject(void); diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp index 44f1db9d59..3762cf8504 100644 --- a/src/Mod/Fem/App/FemPostFilter.cpp +++ b/src/Mod/Fem/App/FemPostFilter.cpp @@ -63,7 +63,7 @@ void FemPostFilter::setActiveFilterPipeline(std::string name) { } } -DocumentObjectExecReturn* FemPostFilter::execute(void) { +DocumentObjectExecReturn* FemPostFilter::execute() { if (!m_pipelines.empty() && !m_activePipeline.empty()) { FemPostFilter::FilterPipeline& pipe = m_pipelines[m_activePipeline]; @@ -112,7 +112,7 @@ vtkDataObject* FemPostFilter::getInputData() { // clip filter PROPERTY_SOURCE(Fem::FemPostClipFilter, Fem::FemPostFilter) -FemPostClipFilter::FemPostClipFilter(void) : FemPostFilter() { +FemPostClipFilter::FemPostClipFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Function, (nullptr), "Clip", App::Prop_None, "The function object which defines the clip regions"); ADD_PROPERTY_TYPE(InsideOut, (false), "Clip", App::Prop_None, "Invert the clip direction"); @@ -163,7 +163,7 @@ void FemPostClipFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostClipFilter::mustExecute(void) const { +short int FemPostClipFilter::mustExecute() const { if (Function.isTouched() || InsideOut.isTouched() || @@ -174,7 +174,7 @@ short int FemPostClipFilter::mustExecute(void) const { else return App::DocumentObject::mustExecute(); } -DocumentObjectExecReturn* FemPostClipFilter::execute(void) { +DocumentObjectExecReturn* FemPostClipFilter::execute() { if (!m_extractor->GetImplicitFunction()) return StdReturn; @@ -187,7 +187,7 @@ DocumentObjectExecReturn* FemPostClipFilter::execute(void) { // data along a line PROPERTY_SOURCE(Fem::FemPostDataAlongLineFilter, Fem::FemPostFilter) -FemPostDataAlongLineFilter::FemPostDataAlongLineFilter(void) : FemPostFilter() { +FemPostDataAlongLineFilter::FemPostDataAlongLineFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Point1, (Base::Vector3d(0.0, 0.0, 0.0)), "DataAlongLine", App::Prop_None, "The point 1 used to define end point of line"); ADD_PROPERTY_TYPE(Point2, (Base::Vector3d(0.0, 0.0, 1.0)), "DataAlongLine", App::Prop_None, "The point 2 used to define end point of line"); @@ -232,7 +232,7 @@ FemPostDataAlongLineFilter::~FemPostDataAlongLineFilter() { } -DocumentObjectExecReturn* FemPostDataAlongLineFilter::execute(void) { +DocumentObjectExecReturn* FemPostDataAlongLineFilter::execute() { //recalculate the filter return Fem::FemPostFilter::execute(); @@ -274,7 +274,7 @@ void FemPostDataAlongLineFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostDataAlongLineFilter::mustExecute(void) const { +short int FemPostDataAlongLineFilter::mustExecute() const { if (Point1.isTouched() || Point2.isTouched() || @@ -334,7 +334,7 @@ void FemPostDataAlongLineFilter::GetAxisData() { // data point filter PROPERTY_SOURCE(Fem::FemPostDataAtPointFilter, Fem::FemPostFilter) -FemPostDataAtPointFilter::FemPostDataAtPointFilter(void) : FemPostFilter() { +FemPostDataAtPointFilter::FemPostDataAtPointFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Center, (Base::Vector3d(0.0, 0.0, 0.0)), "DataAtPoint", App::Prop_None, "Center of the point"); ADD_PROPERTY_TYPE(Radius, (0), "DataAtPoint", App::Prop_None, "Radius around the point (unused)"); @@ -375,7 +375,7 @@ FemPostDataAtPointFilter::~FemPostDataAtPointFilter() { } -DocumentObjectExecReturn* FemPostDataAtPointFilter::execute(void) { +DocumentObjectExecReturn* FemPostDataAtPointFilter::execute() { //recalculate the filter return Fem::FemPostFilter::execute(); @@ -390,7 +390,7 @@ void FemPostDataAtPointFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostDataAtPointFilter::mustExecute(void) const { +short int FemPostDataAtPointFilter::mustExecute() const { if (Center.isTouched()) return 1; @@ -433,7 +433,7 @@ void FemPostDataAtPointFilter::GetPointData() { // scalar clip filter PROPERTY_SOURCE(Fem::FemPostScalarClipFilter, Fem::FemPostFilter) -FemPostScalarClipFilter::FemPostScalarClipFilter(void) : FemPostFilter() { +FemPostScalarClipFilter::FemPostScalarClipFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Value, (0), "Clip", App::Prop_None, "The scalar value used to clip the selected field"); ADD_PROPERTY_TYPE(Scalars, (long(0)), "Clip", App::Prop_None, "The field used to clip"); @@ -453,7 +453,7 @@ FemPostScalarClipFilter::~FemPostScalarClipFilter() { } -DocumentObjectExecReturn* FemPostScalarClipFilter::execute(void) { +DocumentObjectExecReturn* FemPostScalarClipFilter::execute() { std::string val; if (Scalars.getValue() >= 0) @@ -506,7 +506,7 @@ void FemPostScalarClipFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostScalarClipFilter::mustExecute(void) const { +short int FemPostScalarClipFilter::mustExecute() const { if (Value.isTouched() || InsideOut.isTouched() || @@ -541,7 +541,7 @@ void FemPostScalarClipFilter::setConstraintForField() { // warp vector filter PROPERTY_SOURCE(Fem::FemPostWarpVectorFilter, Fem::FemPostFilter) -FemPostWarpVectorFilter::FemPostWarpVectorFilter(void) : FemPostFilter() { +FemPostWarpVectorFilter::FemPostWarpVectorFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Factor, (0), "Warp", App::Prop_None, "The factor by which the vector is added to the node positions"); ADD_PROPERTY_TYPE(Vector, (long(0)), "Warp", App::Prop_None, "The field added to the node position"); @@ -558,7 +558,7 @@ FemPostWarpVectorFilter::~FemPostWarpVectorFilter() { } -DocumentObjectExecReturn* FemPostWarpVectorFilter::execute(void) { +DocumentObjectExecReturn* FemPostWarpVectorFilter::execute() { std::string val; if (Vector.getValue() >= 0) @@ -605,7 +605,7 @@ void FemPostWarpVectorFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostWarpVectorFilter::mustExecute(void) const { +short int FemPostWarpVectorFilter::mustExecute() const { if (Factor.isTouched() || Vector.isTouched()) @@ -619,7 +619,7 @@ short int FemPostWarpVectorFilter::mustExecute(void) const { // cut filter PROPERTY_SOURCE(Fem::FemPostCutFilter, Fem::FemPostFilter) -FemPostCutFilter::FemPostCutFilter(void) : FemPostFilter() { +FemPostCutFilter::FemPostCutFilter() : FemPostFilter() { ADD_PROPERTY_TYPE(Function, (nullptr), "Cut", App::Prop_None, "The function object which defines the clip cut function"); @@ -647,7 +647,7 @@ void FemPostCutFilter::onChanged(const Property* prop) { Fem::FemPostFilter::onChanged(prop); } -short int FemPostCutFilter::mustExecute(void) const { +short int FemPostCutFilter::mustExecute() const { if (Function.isTouched()) { @@ -656,7 +656,7 @@ short int FemPostCutFilter::mustExecute(void) const { else return App::DocumentObject::mustExecute(); } -DocumentObjectExecReturn* FemPostCutFilter::execute(void) { +DocumentObjectExecReturn* FemPostCutFilter::execute() { if (!m_cutter->GetCutFunction()) return StdReturn; diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h index 22a693cb0e..c0686e6cfb 100644 --- a/src/Mod/Fem/App/FemPostFilter.h +++ b/src/Mod/Fem/App/FemPostFilter.h @@ -46,12 +46,12 @@ class FemExport FemPostFilter : public Fem::FemPostObject public: /// Constructor - FemPostFilter(void); + FemPostFilter(); virtual ~FemPostFilter(); App::PropertyLink Input; - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); protected: vtkDataObject* getInputData(); @@ -77,18 +77,18 @@ class FemExport FemPostClipFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostClipFilter); public: - FemPostClipFilter(void); + FemPostClipFilter(); virtual ~FemPostClipFilter(); App::PropertyLink Function; App::PropertyBool InsideOut; App::PropertyBool CutCells; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostClip"; } - virtual short int mustExecute(void) const; - virtual App::DocumentObjectExecReturn* execute(void); + virtual short int mustExecute() const; + virtual App::DocumentObjectExecReturn* execute(); protected: virtual void onChanged(const App::Property* prop); @@ -103,7 +103,7 @@ class FemExport FemPostDataAlongLineFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter); public: - FemPostDataAlongLineFilter(void); + FemPostDataAlongLineFilter(); virtual ~FemPostDataAlongLineFilter(); App::PropertyVectorDistance Point1; @@ -113,14 +113,14 @@ public: App::PropertyFloatList YAxisData; App::PropertyString PlotData; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostDataAlongLine"; } - virtual short int mustExecute(void) const; + virtual short int mustExecute() const; void GetAxisData(); protected: - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); virtual void onChanged(const App::Property* prop); virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); @@ -136,7 +136,7 @@ class FemExport FemPostDataAtPointFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostDataAtPointFilter); public: - FemPostDataAtPointFilter(void); + FemPostDataAtPointFilter(); virtual ~FemPostDataAtPointFilter(); App::PropertyVectorDistance Center; @@ -145,13 +145,13 @@ public: App::PropertyFloatList PointData; App::PropertyString Unit; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostDataAtPoint"; } - virtual short int mustExecute(void) const; + virtual short int mustExecute() const; protected: - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); virtual void onChanged(const App::Property* prop); void GetPointData(); @@ -167,20 +167,20 @@ class FemExport FemPostScalarClipFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostScalarClipFilter); public: - FemPostScalarClipFilter(void); + FemPostScalarClipFilter(); virtual ~FemPostScalarClipFilter(); App::PropertyBool InsideOut; App::PropertyFloatConstraint Value; App::PropertyEnumeration Scalars; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostScalarClip"; } - virtual short int mustExecute(void) const; + virtual short int mustExecute() const; protected: - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); virtual void onChanged(const App::Property* prop); void setConstraintForField(); @@ -195,19 +195,19 @@ class FemExport FemPostWarpVectorFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostWarpVectorFilter); public: - FemPostWarpVectorFilter(void); + FemPostWarpVectorFilter(); virtual ~FemPostWarpVectorFilter(); App::PropertyFloat Factor; App::PropertyEnumeration Vector; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostWarpVector"; } - virtual short int mustExecute(void) const; + virtual short int mustExecute() const; protected: - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); virtual void onChanged(const App::Property* prop); private: @@ -220,16 +220,16 @@ class FemExport FemPostCutFilter : public FemPostFilter { PROPERTY_HEADER(Fem::FemPostCutFilter); public: - FemPostCutFilter(void); + FemPostCutFilter(); virtual ~FemPostCutFilter(); App::PropertyLink Function; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostCut"; } - virtual short int mustExecute(void) const; - virtual App::DocumentObjectExecReturn* execute(void); + virtual short int mustExecute() const; + virtual App::DocumentObjectExecReturn* execute(); protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/Fem/App/FemPostFunction.cpp b/src/Mod/Fem/App/FemPostFunction.cpp index 0dd14db8fb..4386ed89b2 100644 --- a/src/Mod/Fem/App/FemPostFunction.cpp +++ b/src/Mod/Fem/App/FemPostFunction.cpp @@ -34,7 +34,7 @@ using namespace App; PROPERTY_SOURCE(Fem::FemPostFunctionProvider, App::DocumentObject) -FemPostFunctionProvider::FemPostFunctionProvider(void) : DocumentObject() { +FemPostFunctionProvider::FemPostFunctionProvider() : DocumentObject() { ADD_PROPERTY(Functions, (nullptr)); } @@ -58,7 +58,7 @@ FemPostFunction::~FemPostFunction() { } -DocumentObjectExecReturn* FemPostFunction::execute(void) { +DocumentObjectExecReturn* FemPostFunction::execute() { return DocumentObject::StdReturn; } @@ -68,7 +68,7 @@ DocumentObjectExecReturn* FemPostFunction::execute(void) { // plane function PROPERTY_SOURCE(Fem::FemPostPlaneFunction, Fem::FemPostFunction) -FemPostPlaneFunction::FemPostPlaneFunction(void) : FemPostFunction() { +FemPostPlaneFunction::FemPostPlaneFunction() : FemPostFunction() { ADD_PROPERTY(Origin, (Base::Vector3d(0.0, 0.0, 0.0))); ADD_PROPERTY(Normal, (Base::Vector3d(0.0, 0.0, 1.0))); @@ -108,7 +108,7 @@ void FemPostPlaneFunction::onDocumentRestored() { // sphere function PROPERTY_SOURCE(Fem::FemPostSphereFunction, Fem::FemPostFunction) -FemPostSphereFunction::FemPostSphereFunction(void) : FemPostFunction() { +FemPostSphereFunction::FemPostSphereFunction() : FemPostFunction() { ADD_PROPERTY(Radius, (5)); ADD_PROPERTY(Center, (Base::Vector3d(1.0, 0.0, 0.0))); diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h index ee3bb1495b..461de671d3 100644 --- a/src/Mod/Fem/App/FemPostFunction.h +++ b/src/Mod/Fem/App/FemPostFunction.h @@ -43,14 +43,14 @@ class FemExport FemPostFunction : public App::DocumentObject public: /// Constructor - FemPostFunction(void); + FemPostFunction(); virtual ~FemPostFunction(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostFunction"; } - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); //bound box handling void setBoundingBox(vtkBoundingBox b) {m_boundingBox = b;}; @@ -68,10 +68,10 @@ class FemExport FemPostFunctionProvider : public App::DocumentObject { PROPERTY_HEADER(Fem::FemPostFunctionProvider); public: - FemPostFunctionProvider(void); + FemPostFunctionProvider(); virtual ~FemPostFunctionProvider(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostFunctionProvider"; } @@ -90,13 +90,13 @@ class FemExport FemPostPlaneFunction : public FemPostFunction public: - FemPostPlaneFunction(void); + FemPostPlaneFunction(); virtual ~FemPostPlaneFunction(); App::PropertyVector Normal; App::PropertyVectorDistance Origin; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostPlaneFunction"; } @@ -116,13 +116,13 @@ class FemExport FemPostSphereFunction : public FemPostFunction public: - FemPostSphereFunction(void); + FemPostSphereFunction(); virtual ~FemPostSphereFunction(); App::PropertyDistance Radius; App::PropertyVectorDistance Center; - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostSphereFunction"; } diff --git a/src/Mod/Fem/App/FemPostObject.h b/src/Mod/Fem/App/FemPostObject.h index 5744c1e56f..edbacf7479 100644 --- a/src/Mod/Fem/App/FemPostObject.h +++ b/src/Mod/Fem/App/FemPostObject.h @@ -39,7 +39,7 @@ class FemExport FemPostObject : public App::GeoFeature public: /// Constructor - FemPostObject(void); + FemPostObject(); virtual ~FemPostObject(); Fem::PropertyPostDataObject Data; diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp index 7bf64f5e85..15a9d17b39 100644 --- a/src/Mod/Fem/App/FemPostPipeline.cpp +++ b/src/Mod/Fem/App/FemPostPipeline.cpp @@ -70,7 +70,7 @@ FemPostPipeline::~FemPostPipeline() { } -short FemPostPipeline::mustExecute(void) const +short FemPostPipeline::mustExecute() const { if (Mode.isTouched()) return 1; @@ -78,7 +78,7 @@ short FemPostPipeline::mustExecute(void) const return FemPostFilter::mustExecute(); } -DocumentObjectExecReturn* FemPostPipeline::execute(void) { +DocumentObjectExecReturn* FemPostPipeline::execute() { //if we are the toplevel pipeline our data object is not created by filters, we are the main source if (!Input.getValue()) @@ -274,7 +274,7 @@ void FemPostPipeline::load(FemResultObject* res) { Data.setValue(grid); } -PyObject* FemPostPipeline::getPyObject(void) +PyObject* FemPostPipeline::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h index aff5b1c780..388242ee9a 100644 --- a/src/Mod/Fem/App/FemPostPipeline.h +++ b/src/Mod/Fem/App/FemPostPipeline.h @@ -40,18 +40,18 @@ class FemExport FemPostPipeline : public Fem::FemPostFilter public: /// Constructor - FemPostPipeline(void); + FemPostPipeline(); virtual ~FemPostPipeline(); App::PropertyLinkList Filter; App::PropertyLink Functions; App::PropertyEnumeration Mode; - short mustExecute(void) const; - virtual App::DocumentObjectExecReturn* execute(void); + short mustExecute() const; + virtual App::DocumentObjectExecReturn* execute(); PyObject* getPyObject(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderFemPostPipeline"; } diff --git a/src/Mod/Fem/App/FemPostPipelinePyImp.cpp b/src/Mod/Fem/App/FemPostPipelinePyImp.cpp index 1ddc80126e..6ceaf8af66 100644 --- a/src/Mod/Fem/App/FemPostPipelinePyImp.cpp +++ b/src/Mod/Fem/App/FemPostPipelinePyImp.cpp @@ -35,7 +35,7 @@ using namespace Fem; // returns a string which represents the object e.g. when printed in python -std::string FemPostPipelinePy::representation(void) const +std::string FemPostPipelinePy::representation() const { return std::string(""); } diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp index 1742c085bf..5ac614326b 100644 --- a/src/Mod/Fem/App/FemResultObject.cpp +++ b/src/Mod/Fem/App/FemResultObject.cpp @@ -51,7 +51,7 @@ FemResultObject::~FemResultObject() { } -short FemResultObject::mustExecute(void) const +short FemResultObject::mustExecute() const { return 0; } @@ -70,12 +70,12 @@ PyObject *FemResultObject::getPyObject() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::FemResultObjectPython, Fem::FemResultObject) -template<> const char* Fem::FemResultObjectPython::getViewProviderName(void) const { +template<> const char* Fem::FemResultObjectPython::getViewProviderName() const { return "FemGui::ViewProviderResultPython"; } /// @endcond -template<> PyObject* Fem::FemResultObjectPython::getPyObject(void) { +template<> PyObject* Fem::FemResultObjectPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new App::FeaturePythonPyT(this),true); diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index 2e6ed6f2ee..eefe455b20 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -38,7 +38,7 @@ class FemExport FemResultObject : public App::DocumentObject public: /// Constructor - FemResultObject(void); + FemResultObject(); virtual ~FemResultObject(); App::PropertyIntegerList NodeNumbers; @@ -51,14 +51,14 @@ public: /// Displacement vectors of analysis /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderResult"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; typedef App::FeaturePythonT FemResultObjectPython; diff --git a/src/Mod/Fem/App/FemSetElementsObject.cpp b/src/Mod/Fem/App/FemSetElementsObject.cpp index 26b53d38b8..91a5952d17 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.cpp +++ b/src/Mod/Fem/App/FemSetElementsObject.cpp @@ -43,7 +43,7 @@ FemSetElementsObject::~FemSetElementsObject() { } -short FemSetElementsObject::mustExecute(void) const +short FemSetElementsObject::mustExecute() const { return 0; } diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h index 07bcb2bca1..62a260314b 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.h +++ b/src/Mod/Fem/App/FemSetElementsObject.h @@ -36,18 +36,18 @@ class FemExport FemSetElementsObject : public FemSetObject public: /// Constructor - FemSetElementsObject(void); + FemSetElementsObject(); virtual ~FemSetElementsObject(); // returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderSetElements"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; diff --git a/src/Mod/Fem/App/FemSetFacesObject.cpp b/src/Mod/Fem/App/FemSetFacesObject.cpp index 49fd003a8e..f314332507 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.cpp +++ b/src/Mod/Fem/App/FemSetFacesObject.cpp @@ -44,7 +44,7 @@ FemSetFacesObject::~FemSetFacesObject() { } -short FemSetFacesObject::mustExecute(void) const +short FemSetFacesObject::mustExecute() const { return 0; } diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h index 3f7b6117c3..af4f9b64df 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.h +++ b/src/Mod/Fem/App/FemSetFacesObject.h @@ -36,18 +36,18 @@ class FemExport FemSetFacesObject : public FemSetObject public: /// Constructor - FemSetFacesObject(void); + FemSetFacesObject(); virtual ~FemSetFacesObject(); // returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderSetFaces"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; } //namespace Fem diff --git a/src/Mod/Fem/App/FemSetGeometryObject.cpp b/src/Mod/Fem/App/FemSetGeometryObject.cpp index a2601b26d8..c30d5d8c2a 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.cpp +++ b/src/Mod/Fem/App/FemSetGeometryObject.cpp @@ -44,7 +44,7 @@ FemSetGeometryObject::~FemSetGeometryObject() { } -short FemSetGeometryObject::mustExecute(void) const +short FemSetGeometryObject::mustExecute() const { return 0; } diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h index 42170c2976..762a6018c2 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.h +++ b/src/Mod/Fem/App/FemSetGeometryObject.h @@ -36,18 +36,18 @@ class FemExport FemSetGeometryObject : public FemSetObject public: /// Constructor - FemSetGeometryObject(void); + FemSetGeometryObject(); virtual ~FemSetGeometryObject(); // returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderSetGeometry"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; diff --git a/src/Mod/Fem/App/FemSetNodesObject.cpp b/src/Mod/Fem/App/FemSetNodesObject.cpp index 399794463c..10ebd06d51 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.cpp +++ b/src/Mod/Fem/App/FemSetNodesObject.cpp @@ -45,7 +45,7 @@ FemSetNodesObject::~FemSetNodesObject() { } -short FemSetNodesObject::mustExecute(void) const +short FemSetNodesObject::mustExecute() const { return 0; } diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h index 9b59a37706..57bdc2ef4b 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.h +++ b/src/Mod/Fem/App/FemSetNodesObject.h @@ -37,20 +37,20 @@ class FemExport FemSetNodesObject : public FemSetObject public: /// Constructor - FemSetNodesObject(void); + FemSetNodesObject(); virtual ~FemSetNodesObject(); App::PropertyIntegerSet Nodes; // returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderSetNodes"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; diff --git a/src/Mod/Fem/App/FemSetObject.cpp b/src/Mod/Fem/App/FemSetObject.cpp index 040ad89c49..56e0931109 100644 --- a/src/Mod/Fem/App/FemSetObject.cpp +++ b/src/Mod/Fem/App/FemSetObject.cpp @@ -45,7 +45,7 @@ FemSetObject::~FemSetObject() { } -short FemSetObject::mustExecute(void) const +short FemSetObject::mustExecute() const { return 0; } diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h index 3b79ae7408..c1d0c75bc4 100644 --- a/src/Mod/Fem/App/FemSetObject.h +++ b/src/Mod/Fem/App/FemSetObject.h @@ -37,7 +37,7 @@ class FemExport FemSetObject : public App::DocumentObject public: /// Constructor - FemSetObject(void); + FemSetObject(); virtual ~FemSetObject(); App::PropertyLink FemMesh; @@ -46,11 +46,11 @@ public: //virtual const char* getViewProviderName(void) const { // return "FemGui::ViewProviderFemSet"; //} - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; diff --git a/src/Mod/Fem/App/FemSolverObject.cpp b/src/Mod/Fem/App/FemSolverObject.cpp index e8dca06337..95d2028da1 100644 --- a/src/Mod/Fem/App/FemSolverObject.cpp +++ b/src/Mod/Fem/App/FemSolverObject.cpp @@ -47,7 +47,7 @@ FemSolverObject::~FemSolverObject() { } -short FemSolverObject::mustExecute(void) const +short FemSolverObject::mustExecute() const { return 0; } @@ -66,11 +66,11 @@ PyObject *FemSolverObject::getPyObject() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Fem::FemSolverObjectPython, Fem::FemSolverObject) -template<> const char* Fem::FemSolverObjectPython::getViewProviderName(void) const { +template<> const char* Fem::FemSolverObjectPython::getViewProviderName() const { return "FemGui::ViewProviderSolverPython"; } -template<> PyObject* Fem::FemSolverObjectPython::getPyObject(void) { +template<> PyObject* Fem::FemSolverObjectPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new App::FeaturePythonPyT(this),true); diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h index 83045ec785..dfd58135e3 100644 --- a/src/Mod/Fem/App/FemSolverObject.h +++ b/src/Mod/Fem/App/FemSolverObject.h @@ -37,20 +37,20 @@ class FemExport FemSolverObject : public App::DocumentObject public: /// Constructor - FemSolverObject(void); + FemSolverObject(); virtual ~FemSolverObject(); // Attributes are implemented in the FemSolverObjectPython /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "FemGui::ViewProviderSolver"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); }; diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp b/src/Mod/Fem/App/PropertyPostDataObject.cpp index 6634ccc2d0..ee7e11ecf1 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.cpp +++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp @@ -127,7 +127,7 @@ void PropertyPostDataObject::setValue(const vtkSmartPointer &ds) hasSetValue(); } -const vtkSmartPointer &PropertyPostDataObject::getValue(void) const +const vtkSmartPointer &PropertyPostDataObject::getValue() const { return m_dataObject; } @@ -154,7 +154,7 @@ int PropertyPostDataObject::getDataType() } -PyObject *PropertyPostDataObject::getPyObject(void) +PyObject *PropertyPostDataObject::getPyObject() { //TODO: fetch the vtk python object from the data set and return it return Py::new_reference_to(Py::None()); @@ -164,7 +164,7 @@ void PropertyPostDataObject::setPyObject(PyObject * /*value*/) { } -App::Property *PropertyPostDataObject::Copy(void) const +App::Property *PropertyPostDataObject::Copy() const { PropertyPostDataObject *prop = new PropertyPostDataObject(); if (m_dataObject) { @@ -218,7 +218,7 @@ void PropertyPostDataObject::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyPostDataObject::getMemSize(void) const +unsigned int PropertyPostDataObject::getMemSize() const { return m_dataObject ? m_dataObject->GetActualMemorySize() : 0; } diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h index 481a1ea9f8..eb9caad193 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.h +++ b/src/Mod/Fem/App/PropertyPostDataObject.h @@ -52,7 +52,7 @@ public: /// set the dataset void setValue(const vtkSmartPointer&); /// get the part shape - const vtkSmartPointer& getValue(void) const; + const vtkSmartPointer& getValue() const; /// check if we hold a dataset or a dataobject (which would mean a composite data structure) bool isDataSet(); bool isComposite(); @@ -61,7 +61,7 @@ public: /** @name Python interface */ //@{ - PyObject* getPyObject(void); + PyObject* getPyObject(); void setPyObject(PyObject *value); //@} @@ -73,9 +73,9 @@ public: void SaveDocFile (Base::Writer &writer) const; void RestoreDocFile(Base::Reader &reader); - App::Property *Copy(void) const; + App::Property *Copy() const; void Paste(const App::Property &from); - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; //@} /// Get valid paths for this property; used by auto completer diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp index d1d1f8eb23..8401da4f02 100644 --- a/src/Mod/Fem/Gui/AppFemGui.cpp +++ b/src/Mod/Fem/Gui/AppFemGui.cpp @@ -76,7 +76,7 @@ // use a different name to CreateCommand() -void CreateFemCommands(void); +void CreateFemCommands(); void loadFemResource() { diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 5c9211ed30..d4ca222655 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -314,7 +314,7 @@ void CmdFemConstraintBearing::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintBearing::isActive(void) +bool CmdFemConstraintBearing::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -359,7 +359,7 @@ void CmdFemConstraintContact::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintContact::isActive(void) +bool CmdFemConstraintContact::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -402,7 +402,7 @@ void CmdFemConstraintDisplacement::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintDisplacement::isActive(void) +bool CmdFemConstraintDisplacement::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -444,7 +444,7 @@ void CmdFemConstraintFixed::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintFixed::isActive(void) +bool CmdFemConstraintFixed::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -487,7 +487,7 @@ void CmdFemConstraintFluidBoundary::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintFluidBoundary::isActive(void) +bool CmdFemConstraintFluidBoundary::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -531,7 +531,7 @@ void CmdFemConstraintForce::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintForce::isActive(void) +bool CmdFemConstraintForce::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -572,7 +572,7 @@ void CmdFemConstraintGear::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintGear::isActive(void) +bool CmdFemConstraintGear::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -617,7 +617,7 @@ void CmdFemConstraintHeatflux::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintHeatflux::isActive(void) +bool CmdFemConstraintHeatflux::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -660,7 +660,7 @@ void CmdFemConstraintInitialTemperature::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintInitialTemperature::isActive(void) +bool CmdFemConstraintInitialTemperature::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -702,7 +702,7 @@ void CmdFemConstraintPlaneRotation::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintPlaneRotation::isActive(void) +bool CmdFemConstraintPlaneRotation::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -747,7 +747,7 @@ void CmdFemConstraintPressure::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintPressure::isActive(void) +bool CmdFemConstraintPressure::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -792,7 +792,7 @@ void CmdFemConstraintSpring::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintSpring::isActive(void) +bool CmdFemConstraintSpring::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -838,7 +838,7 @@ void CmdFemConstraintPulley::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintPulley::isActive(void) +bool CmdFemConstraintPulley::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -881,7 +881,7 @@ void CmdFemConstraintTemperature::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintTemperature::isActive(void) +bool CmdFemConstraintTemperature::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -927,7 +927,7 @@ void CmdFemConstraintTransform::activated(int) doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str()); } -bool CmdFemConstraintTransform::isActive(void) +bool CmdFemConstraintTransform::isActive() { return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); } @@ -1063,7 +1063,7 @@ void CmdFemDefineNodesSet::activated(int) } } -bool CmdFemDefineNodesSet::isActive(void) +bool CmdFemDefineNodesSet::isActive() { // Check for the selected mesh feature (all Mesh types) if (getSelection().countObjectsOfType(Fem::FemMeshObject::getClassTypeId()) != 1) @@ -1121,7 +1121,7 @@ void CmdFemCreateNodesSet::activated(int) } } -bool CmdFemCreateNodesSet::isActive(void) +bool CmdFemCreateNodesSet::isActive() { return hasActiveDocument(); } @@ -1311,7 +1311,7 @@ void CmdFemPostClipFilter::activated(int) setupFilter(this, "Clip"); } -bool CmdFemPostClipFilter::isActive(void) +bool CmdFemPostClipFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1354,7 +1354,7 @@ void CmdFemPostCutFilter::activated(int) setupFilter(this, "Cut"); } -bool CmdFemPostCutFilter::isActive(void) +bool CmdFemPostCutFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1397,7 +1397,7 @@ void CmdFemPostDataAlongLineFilter::activated(int) setupFilter(this, "DataAlongLine"); } -bool CmdFemPostDataAlongLineFilter::isActive(void) +bool CmdFemPostDataAlongLineFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1440,7 +1440,7 @@ void CmdFemPostDataAtPointFilter::activated(int) } -bool CmdFemPostDataAtPointFilter::isActive(void) +bool CmdFemPostDataAtPointFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1515,7 +1515,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int) } } -bool CmdFemPostLinearizedStressesFilter::isActive(void) +bool CmdFemPostLinearizedStressesFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1547,7 +1547,7 @@ void CmdFemPostScalarClipFilter::activated(int) setupFilter(this, "ScalarClip"); } -bool CmdFemPostScalarClipFilter::isActive(void) +bool CmdFemPostScalarClipFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1588,7 +1588,7 @@ void CmdFemPostWarpVectorFilter::activated(int) setupFilter(this, "WarpVector"); } -bool CmdFemPostWarpVectorFilter::isActive(void) +bool CmdFemPostWarpVectorFilter::isActive() { // only allow one object if (getSelection().getSelection().size() > 1) @@ -1697,7 +1697,7 @@ void CmdFemPostFunctions::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action* CmdFemPostFunctions::createAction(void) +Gui::Action* CmdFemPostFunctions::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1740,7 +1740,7 @@ void CmdFemPostFunctions::languageChange() } -bool CmdFemPostFunctions::isActive(void) +bool CmdFemPostFunctions::isActive() { if (getActiveGuiDocument()) return true; @@ -1770,7 +1770,7 @@ void CmdFemPostApllyChanges::activated(int iMsg) FemGui::FemSettings().setPostAutoRecompute(iMsg == 1); } -bool CmdFemPostApllyChanges::isActive(void) +bool CmdFemPostApllyChanges::isActive() { if (getActiveGuiDocument()) return true; @@ -1778,7 +1778,7 @@ bool CmdFemPostApllyChanges::isActive(void) return false; } -Gui::Action* CmdFemPostApllyChanges::createAction(void) +Gui::Action* CmdFemPostApllyChanges::createAction() { Gui::Action* pcAction = Command::createAction(); pcAction->setCheckable(true); @@ -1869,7 +1869,7 @@ void CmdFemPostPipelineFromResult::activated(int) } } -bool CmdFemPostPipelineFromResult::isActive(void) +bool CmdFemPostPipelineFromResult::isActive() { // only activate if a result object is selected from which the pipeline can be loaded std::vector results = getSelection().getObjectsOfType(); @@ -1881,7 +1881,7 @@ bool CmdFemPostPipelineFromResult::isActive(void) //================================================================================================ //================================================================================================ -void CreateFemCommands(void) +void CreateFemCommands() { Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp index 91e4fecb94..bc07cd08a1 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp @@ -92,7 +92,7 @@ TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject* pcObject, QWidget* } -void TaskCreateNodeSet::Poly(void) +void TaskCreateNodeSet::Poly() { Gui::Document* doc = Gui::Application::Instance->activeDocument(); Gui::MDIView* view = doc->getActiveView(); @@ -104,7 +104,7 @@ void TaskCreateNodeSet::Poly(void) } } -void TaskCreateNodeSet::Pick(void) +void TaskCreateNodeSet::Pick() { if (selectionMode == none) { selectionMode = PickElement; diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.h b/src/Mod/Fem/Gui/TaskCreateNodeSet.h index 67527103a7..d3f87159e7 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.h @@ -59,8 +59,8 @@ public: ViewProviderFemMesh * MeshViewProvider; private Q_SLOTS: - void Poly(void); - void Pick(void); + void Poly(); + void Pick(); void SwitchMethod(int Value); protected: diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.h b/src/Mod/Fem/Gui/TaskDlgAnalysis.h index b5c6434c4a..6ed0da18cf 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.h +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.h @@ -55,7 +55,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; } protected: diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h index 29d2011ce1..33b928a505 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h @@ -57,7 +57,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h index 324e28cf88..04f0f38d52 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h @@ -58,7 +58,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; } protected: diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.h b/src/Mod/Fem/Gui/TaskFemConstraint.h index c117090fb2..9589770736 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.h +++ b/src/Mod/Fem/Gui/TaskFemConstraint.h @@ -47,7 +47,7 @@ public: TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr,const char* pixmapname = ""); virtual ~TaskFemConstraint() {} - virtual const std::string getReferences(void) const {return std::string();} + virtual const std::string getReferences() const {return std::string();} const std::string getReferences(const std::vector& items) const; const std::string getScale() const; @@ -98,11 +98,11 @@ public: virtual bool accept(); /// is called by the framework if the dialog is rejected (Cancel) virtual bool reject(); - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } ViewProviderFemConstraint* getConstraintView() const diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp index ccbe2bb237..0018997059 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp @@ -235,7 +235,7 @@ void TaskFemConstraintBearing::onCheckAxial(const bool pressed) pcConstraint->AxialFree.setValue(pressed); } -double TaskFemConstraintBearing::getDistance(void) const +double TaskFemConstraintBearing::getDistance() const { return ui->spinDistance->value(); } @@ -250,7 +250,7 @@ const std::string TaskFemConstraintBearing::getReferences() const return TaskFemConstraint::getReferences(items); } -const std::string TaskFemConstraintBearing::getLocationName(void) const +const std::string TaskFemConstraintBearing::getLocationName() const { std::string loc = ui->lineLocation->text().toStdString(); if (loc.empty()) @@ -260,7 +260,7 @@ const std::string TaskFemConstraintBearing::getLocationName(void) const return loc.substr(0, pos).c_str(); } -const std::string TaskFemConstraintBearing::getLocationObject(void) const +const std::string TaskFemConstraintBearing::getLocationObject() const { std::string loc = ui->lineLocation->text().toStdString(); if (loc.empty()) diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h index f1be4708e2..534fd64e37 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h @@ -51,14 +51,14 @@ public: const char* pixmapname = "FEM_ConstraintBearing"); virtual ~TaskFemConstraintBearing(); - double getDistance(void) const; + double getDistance() const; virtual const std::string getReferences() const; - const std::string getLocationName(void) const; - const std::string getLocationObject(void) const; - bool getAxial(void) const; + const std::string getLocationName() const; + const std::string getLocationObject() const; + bool getAxial() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void onDistanceChanged(double l); void onButtonLocation(const bool pressed = true); void onCheckAxial(bool); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.h b/src/Mod/Fem/Gui/TaskFemConstraintContact.h index 74d6be5916..b471022c1f 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.h @@ -47,8 +47,8 @@ public: double get_Friction()const; private Q_SLOTS: - void onReferenceDeletedSlave(void); - void onReferenceDeletedMaster(void); + void onReferenceDeletedSlave(); + void onReferenceDeletedMaster(); void addToSelectionSlave(); void removeFromSelectionSlave(); void addToSelectionMaster(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h index 87a54fca67..8789046bfe 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h @@ -72,7 +72,7 @@ public: bool get_rotzfree()const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void x_changed(double); void y_changed(double); void z_changed(double); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h index 64ff73060c..db95624cb4 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h @@ -43,7 +43,7 @@ public: const std::string getReferences() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void addToSelection(); void removeFromSelection(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h index cc68776536..315db94e45 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h @@ -52,35 +52,35 @@ public: TaskFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView,QWidget *parent = nullptr); virtual ~TaskFemConstraintFluidBoundary(); - const Fem::FemSolverObject* getFemSolver(void) const; + const Fem::FemSolverObject* getFemSolver() const; - std::string getBoundaryType(void) const; - std::string getSubtype(void) const; - double getBoundaryValue(void) const; + std::string getBoundaryType() const; + std::string getSubtype() const; + double getBoundaryValue() const; - std::string getTurbulenceModel(void) const; - std::string getTurbulenceSpecification(void) const; - double getTurbulentIntensityValue(void) const; - double getTurbulentLengthValue(void) const; + std::string getTurbulenceModel() const; + std::string getTurbulenceSpecification() const; + double getTurbulentIntensityValue() const; + double getTurbulentLengthValue() const; - bool getHeatTransferring(void) const; - std::string getThermalBoundaryType(void) const; - double getTemperatureValue(void) const; - double getHeatFluxValue(void) const; - double getHTCoeffValue(void) const; + bool getHeatTransferring() const; + std::string getThermalBoundaryType() const; + double getTemperatureValue() const; + double getHeatFluxValue() const; + double getHTCoeffValue() const; const std::string getReferences() const; - const std::string getDirectionName(void) const; - const std::string getDirectionObject(void) const; - bool getReverse(void) const; + const std::string getDirectionName() const; + const std::string getDirectionObject() const; + bool getReverse() const; private Q_SLOTS: - void onBoundaryTypeChanged(void); - void onSubtypeChanged(void); + void onBoundaryTypeChanged(); + void onSubtypeChanged(); void onBoundaryValueChanged(double); - void onTurbulenceSpecificationChanged(void); - void onThermalBoundaryTypeChanged(void); - void onReferenceDeleted(void); + void onTurbulenceSpecificationChanged(); + void onThermalBoundaryTypeChanged(); + void onReferenceDeleted(); void onButtonDirection(const bool pressed = true); void onCheckReverse(bool); // consider removing this slot as the UI is hidden void addToSelection(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp index 97047dc090..a7ac51b01b 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp @@ -322,7 +322,7 @@ void TaskFemConstraintForce::onCheckReverse(const bool pressed) pcConstraint->Reversed.setValue(pressed); } -double TaskFemConstraintForce::getForce(void) const +double TaskFemConstraintForce::getForce() const { return ui->spinForce->value().getValue(); } @@ -337,7 +337,7 @@ const std::string TaskFemConstraintForce::getReferences() const return TaskFemConstraint::getReferences(items); } -const std::string TaskFemConstraintForce::getDirectionName(void) const +const std::string TaskFemConstraintForce::getDirectionName() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) @@ -347,7 +347,7 @@ const std::string TaskFemConstraintForce::getDirectionName(void) const return dir.substr(0, pos).c_str(); } -const std::string TaskFemConstraintForce::getDirectionObject(void) const +const std::string TaskFemConstraintForce::getDirectionObject() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.h b/src/Mod/Fem/Gui/TaskFemConstraintForce.h index 54bc234557..217ebf6f6b 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintForce.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.h @@ -50,14 +50,14 @@ class TaskFemConstraintForce : public TaskFemConstraintOnBoundary public: TaskFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView,QWidget *parent = nullptr); virtual ~TaskFemConstraintForce(); - double getForce(void) const; + double getForce() const; const std::string getReferences() const; - const std::string getDirectionName(void) const; - const std::string getDirectionObject(void) const; - bool getReverse(void) const; + const std::string getDirectionName() const; + const std::string getDirectionObject() const; + bool getReverse() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void onForceChanged(double); void onButtonDirection(const bool pressed = false); void onCheckReverse(bool); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp b/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp index c36e523bb4..f37ae0110d 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp @@ -206,17 +206,17 @@ void TaskFemConstraintGear::onCheckReversed(const bool pressed) pcConstraint->Reversed.setValue(pressed); } -double TaskFemConstraintGear::getForce(void) const +double TaskFemConstraintGear::getForce() const { return ui->spinForce->value(); } -double TaskFemConstraintGear::getForceAngle(void) const +double TaskFemConstraintGear::getForceAngle() const { return ui->spinForceAngle->value(); } -const std::string TaskFemConstraintGear::getDirectionName(void) const +const std::string TaskFemConstraintGear::getDirectionName() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) @@ -226,7 +226,7 @@ const std::string TaskFemConstraintGear::getDirectionName(void) const return dir.substr(0, pos).c_str(); } -const std::string TaskFemConstraintGear::getDirectionObject(void) const +const std::string TaskFemConstraintGear::getDirectionObject() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) @@ -241,7 +241,7 @@ bool TaskFemConstraintGear::getReverse() const return ui->checkReversed->isChecked(); } -double TaskFemConstraintGear::getDiameter(void) const +double TaskFemConstraintGear::getDiameter() const { return ui->spinDiameter->value(); } diff --git a/src/Mod/Fem/Gui/TaskFemConstraintGear.h b/src/Mod/Fem/Gui/TaskFemConstraintGear.h index e217ee212a..7839efbfea 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintGear.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintGear.h @@ -37,12 +37,12 @@ public: TaskFemConstraintGear(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr, const char* pixmapname = "FEM_ConstraintGear"); - double getDiameter(void) const; - double getForce(void) const; - double getForceAngle(void) const; - const std::string getDirectionName(void) const; - const std::string getDirectionObject(void) const; - bool getReverse(void) const; + double getDiameter() const; + double getForce() const; + double getForceAngle() const; + const std::string getDirectionName() const; + const std::string getDirectionObject() const; + bool getReverse() const; private Q_SLOTS: void onDiameterChanged(double dia); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp index 87a207567d..e7524966df 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp @@ -321,21 +321,21 @@ const std::string TaskFemConstraintHeatflux::getReferences() const return TaskFemConstraint::getReferences(items); } -double TaskFemConstraintHeatflux::getAmbientTemp(void) const +double TaskFemConstraintHeatflux::getAmbientTemp() const { Base::Quantity temperature = ui->if_ambienttemp->getQuantity(); double temperature_in_kelvin = temperature.getValueAs(Base::Quantity::Kelvin); return temperature_in_kelvin; } -double TaskFemConstraintHeatflux::getFilmCoef(void) const +double TaskFemConstraintHeatflux::getFilmCoef() const { Base::Quantity filmcoef = ui->if_filmcoef->getQuantity(); double filmcoef_in_units = filmcoef.getValueAs(Base::Quantity(1.0, Base::Unit::ThermalTransferCoefficient)); return filmcoef_in_units; } -std::string TaskFemConstraintHeatflux::get_constraint_type(void) const { +std::string TaskFemConstraintHeatflux::get_constraint_type() const { std::string type; if (ui->rb_convection->isChecked()) { type = "\"Convection\""; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h index 0d778d9bc3..f8b3010276 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h @@ -42,14 +42,14 @@ class TaskFemConstraintHeatflux : public TaskFemConstraintOnBoundary public: TaskFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView,QWidget *parent = nullptr); virtual ~TaskFemConstraintHeatflux(); - double getAmbientTemp(void) const; + double getAmbientTemp() const; /*double getFaceTemp(void) const;*/ - double getFilmCoef(void) const; - std::string get_constraint_type(void) const; + double getFilmCoef() const; + std::string get_constraint_type() const; virtual const std::string getReferences() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void onAmbientTempChanged(double val); /*void onFaceTempChanged(double val);*/ void onFilmCoefChanged(double val); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h index fd5613de36..dc5cf39fac 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h @@ -45,7 +45,7 @@ public: const std::string getReferences() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void addToSelection(); void removeFromSelection(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h index 2c57c2b229..6a183b0fee 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h @@ -47,7 +47,7 @@ public: bool get_Reverse()const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void onCheckReverse(bool); void addToSelection(); void removeFromSelection(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp index 177d9172d2..aedf669322 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp @@ -123,12 +123,12 @@ void TaskFemConstraintPulley::onCheckIsDriven(const bool pressed) pcConstraint->IsDriven.setValue(pressed); } -double TaskFemConstraintPulley::getTorque(void) const +double TaskFemConstraintPulley::getTorque() const { return ui->spinForce->value(); } -double TaskFemConstraintPulley::getTensionForce(void) const +double TaskFemConstraintPulley::getTensionForce() const { return ui->spinTensionForce->value(); } @@ -138,12 +138,12 @@ bool TaskFemConstraintPulley::getIsDriven() const return ui->checkIsDriven->isChecked(); } -double TaskFemConstraintPulley::getOtherDiameter(void) const +double TaskFemConstraintPulley::getOtherDiameter() const { return ui->spinOtherDiameter->value(); } -double TaskFemConstraintPulley::getCenterDistance(void) const +double TaskFemConstraintPulley::getCenterDistance() const { return ui->spinCenterDistance->value(); } diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h index b61777044c..c1a0b4d631 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h @@ -36,11 +36,11 @@ class TaskFemConstraintPulley : public TaskFemConstraintGear public: TaskFemConstraintPulley(ViewProviderFemConstraintPulley *ConstraintView,QWidget *parent = nullptr); - double getOtherDiameter(void) const; - double getCenterDistance(void) const; - double getTensionForce(void) const; - double getTorque(void) const; - bool getIsDriven(void) const; + double getOtherDiameter() const; + double getCenterDistance() const; + double getTensionForce() const; + double getTorque() const; + bool getIsDriven() const; private Q_SLOTS: void onOtherDiameterChanged(double dia); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h index 7bc210e281..2df80ca804 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h @@ -45,7 +45,7 @@ public: double get_tangentialStiffness()const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void addToSelection(); void removeFromSelection(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp index 397e06e346..dfac163f60 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp @@ -278,7 +278,7 @@ double TaskFemConstraintTemperature::get_cflux() const { return cflux_in_watt; } -std::string TaskFemConstraintTemperature::get_constraint_type(void) const { +std::string TaskFemConstraintTemperature::get_constraint_type() const { std::string type; if (ui->rb_temperature->isChecked()) { type = "\"Temperature\""; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h index ae18573b3d..a86fd7fc19 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h @@ -48,10 +48,10 @@ public: const std::string getReferences() const; double get_temperature()const; double get_cflux() const; - std::string get_constraint_type(void) const; + std::string get_constraint_type() const; private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void onTempCfluxChanged(double val); void Temp(); void Flux(); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp index 66e1f5198d..7fe0f70b06 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp @@ -446,7 +446,7 @@ double TaskFemConstraintTransform::get_X_rot() const { return ui->sp_X->value(); double TaskFemConstraintTransform::get_Y_rot() const { return ui->sp_Y->value(); } double TaskFemConstraintTransform::get_Z_rot() const { return ui->sp_Z->value(); } -std::string TaskFemConstraintTransform::get_transform_type(void) const { +std::string TaskFemConstraintTransform::get_transform_type() const { std::string transform; if (ui->rb_rect->isChecked()) { transform = "\"Rectangular\""; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h index 9289924ab5..54bb7eb617 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h @@ -47,11 +47,11 @@ public: double get_X_rot()const; double get_Y_rot()const; double get_Z_rot()const; - std::string get_transform_type(void) const; + std::string get_transform_type() const; static std::string getSurfaceReferences(const std::string showConstr); private Q_SLOTS: - void onReferenceDeleted(void); + void onReferenceDeleted(); void Rect(); void Cyl(); void addToSelection(); diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index a61df82c00..32134729b0 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -225,7 +225,7 @@ TaskDlgPost::~TaskDlgPost() } -QDialogButtonBox::StandardButtons TaskDlgPost::getStandardButtons(void) const { +QDialogButtonBox::StandardButtons TaskDlgPost::getStandardButtons() const { //check if we only have gui task boxes bool guionly = true; diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h index 17b7f0117a..f8e441b2cd 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.h +++ b/src/Mod/Fem/Gui/TaskPostBoxes.h @@ -198,12 +198,12 @@ public: /// is called by the framework if the dialog is rejected (Cancel) virtual bool reject(); /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } virtual void modifyStandardButtons(QDialogButtonBox*); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const; + virtual QDialogButtonBox::StandardButtons getStandardButtons() const; protected: void recompute(); diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp index 3f07abaf88..1a50d93f9e 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.cpp +++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp @@ -147,7 +147,7 @@ void TaskTetParameter::setOptimize(int v) } -void TaskTetParameter::setInfo(void) +void TaskTetParameter::setInfo() { Fem::FemMesh::FemMeshInfo info = pcObject->FemMesh.getValue().getInfo(); //Base::BoundBox3d bndBox = pcObject->FemMesh.getValue().getBoundBox(); diff --git a/src/Mod/Fem/Gui/TaskTetParameter.h b/src/Mod/Fem/Gui/TaskTetParameter.h index 40150aa5ac..17a37c1ad0 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.h +++ b/src/Mod/Fem/Gui/TaskTetParameter.h @@ -58,7 +58,7 @@ public: TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent = nullptr); ~TaskTetParameter(); - void setInfo(void); + void setInfo(); bool touched; private Q_SLOTS: diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 6036cf98fc..30e0759f47 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -59,9 +59,9 @@ public: virtual ~ViewProviderFemAnalysis(); virtual void attach(App::DocumentObject*); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); - virtual std::vector claimChildren(void)const; + virtual std::vector claimChildren()const; // handling when object is deleted virtual bool onDelete(const std::vector&); @@ -72,15 +72,15 @@ public: void setupContextMenu(QMenu*, QObject*, const char*); /// A list of all possible display modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; // shows solid in the tree - virtual bool isShow(void) const { + virtual bool isShow() const { return Visibility.getValue(); } /// Hide the object in the view - virtual void hide(void); + virtual void hide(); /// Show the object in the view - virtual void show(void); + virtual void show(); void highlightView(Gui::ViewProviderDocumentObject*); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp index d9011417d9..29634cb43b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp @@ -122,7 +122,7 @@ void ViewProviderFemConstraint::attach(App::DocumentObject* pcObject) addDisplayMaskMode(sep, "Base"); } -std::vector ViewProviderFemConstraint::getDisplayModes(void) const +std::vector ViewProviderFemConstraint::getDisplayModes() const { // add modes std::vector StrList; @@ -137,7 +137,7 @@ void ViewProviderFemConstraint::setDisplayMode(const char* ModeName) ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderFemConstraint::claimChildren(void)const +std::vector ViewProviderFemConstraint::claimChildren()const { return std::vector(); } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index 1f35f4fd23..8674efe673 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -48,7 +48,7 @@ class FemGuiExport ViewProviderFemConstraint : public Gui::ViewProviderGeometryO public: /// Constructor - ViewProviderFemConstraint(void); + ViewProviderFemConstraint(); virtual ~ViewProviderFemConstraint(); // Display properties @@ -61,10 +61,10 @@ public: void attach(App::DocumentObject *); virtual void updateData(const App::Property* prop) { Gui::ViewProviderGeometryObject::updateData(prop); } - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; void setDisplayMode(const char* ModeName); - std::vector claimChildren(void)const; + std::vector claimChildren()const; void setupContextMenu(QMenu*, QObject*, const char*); /// Highlight the references that have been selected diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index c0bae73065..7950a2983d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -66,7 +66,7 @@ struct FemFace unsigned short Size; unsigned short FaceNo; bool hide; - Base::Vector3d getFirstNodePoint(void) { + Base::Vector3d getFirstNodePoint() { return Base::Vector3d(Nodes[0]->X(),Nodes[0]->Y(),Nodes[0]->Z()); } @@ -331,7 +331,7 @@ void ViewProviderFemMesh::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode(ModeName); } -std::vector ViewProviderFemMesh::getDisplayModes(void) const +std::vector ViewProviderFemMesh::getDisplayModes() const { std::vector StrList; StrList.emplace_back(Private::dm_face_wire); @@ -493,7 +493,7 @@ void ViewProviderFemMesh::setHighlightNodes(const std::set& HighlightedNod } } -void ViewProviderFemMesh::resetHighlightNodes(void) +void ViewProviderFemMesh::resetHighlightNodes() { pcAnoCoords->point.setNum(0); vHighlightedIdx.clear(); @@ -550,7 +550,7 @@ void ViewProviderFemMesh::setColorByNodeIdHelper(const std::vector & pcShapeMaterial->diffuseColor.finishEditing(); } -void ViewProviderFemMesh::resetColorByNodeId(void) +void ViewProviderFemMesh::resetColorByNodeId() { pcMatBinding->value = SoMaterialBinding::OVERALL; pcShapeMaterial->diffuseColor.setNum(0); @@ -596,7 +596,7 @@ void ViewProviderFemMesh::setDisplacementByNodeIdHelper(const std::vector &E pcShapeMaterial->diffuseColor.finishEditing(); } -void ViewProviderFemMesh::resetColorByElementId(void) +void ViewProviderFemMesh::resetColorByElementId() { pcMatBinding->value = SoMaterialBinding::OVERALL; pcShapeMaterial->diffuseColor.setNum(0); diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index e9375b8dda..01ec9a5725 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -87,7 +87,7 @@ public: */ //@{ /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const {return true;} + virtual bool useNewSelectionModel() const {return true;} /// return a hit element to the selection path or 0 virtual std::string getElement(const SoDetail*) const; virtual SoDetail* getDetail(const char*) const; @@ -98,7 +98,7 @@ public: // interface methods void setHighlightNodes(const std::set&); std::set getHighlightNodes() const; - void resetHighlightNodes(void); + void resetHighlightNodes(); /** @name Postprocessing * this interfaces apply post processing stuff to the View- @@ -112,21 +112,21 @@ public: void setColorByNodeId(const std::vector &NodeIds,const std::vector &NodeColors); /// reset the view of the node colors - void resetColorByNodeId(void); + void resetColorByNodeId(); /// set the displacement for each node void setDisplacementByNodeId(const std::map &NodeDispMap); void setDisplacementByNodeId(const std::vector &NodeIds,const std::vector &NodeDisps); /// reset the view of the node displacement - void resetDisplacementByNodeId(void); + void resetDisplacementByNodeId(); /// reaply the node displacement with a certain factor and do a redraw void applyDisplacementToNodes(double factor); /// set the color for each element void setColorByElementId(const std::map &ElementColorMap); /// reset the view of the element colors - void resetColorByElementId(void); + void resetColorByElementId(); //@} - const std::vector &getVisibleElementFaces(void)const{return vFaceElementIdx;} + const std::vector &getVisibleElementFaces()const{return vFaceElementIdx;} PyObject *getPyObject(); diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp index 1953292276..b1409df22b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp @@ -20,7 +20,7 @@ using namespace FemGui; // returns a string which represents the object e.g. when printed in python -std::string ViewProviderFemMeshPy::representation(void) const +std::string ViewProviderFemMeshPy::representation() const { return std::string(""); } @@ -150,7 +150,7 @@ PyObject* ViewProviderFemMeshPy::resetNodeDisplacement(PyObject* args) } -Py::Dict ViewProviderFemMeshPy::getNodeColor(void) const +Py::Dict ViewProviderFemMeshPy::getNodeColor() const { //return Py::List(); throw Py::AttributeError("Not yet implemented"); @@ -191,7 +191,7 @@ void ViewProviderFemMeshPy::setNodeColor(Py::Dict arg) } -Py::Dict ViewProviderFemMeshPy::getElementColor(void) const +Py::Dict ViewProviderFemMeshPy::getElementColor() const { //return Py::List(); throw Py::AttributeError("Not yet implemented"); @@ -215,7 +215,7 @@ void ViewProviderFemMeshPy::setElementColor(Py::Dict arg) } -Py::Dict ViewProviderFemMeshPy::getNodeDisplacement(void) const +Py::Dict ViewProviderFemMeshPy::getNodeDisplacement() const { //return Py::Dict(); throw Py::AttributeError("Not yet implemented"); @@ -242,7 +242,7 @@ void ViewProviderFemMeshPy::setNodeDisplacement(Py::Dict arg) } -Py::List ViewProviderFemMeshPy::getHighlightedNodes(void) const +Py::List ViewProviderFemMeshPy::getHighlightedNodes() const { Py::List list; ViewProviderFemMesh* vp = this->getViewProviderFemMeshPtr(); @@ -281,7 +281,7 @@ PyObject* ViewProviderFemMeshPy::resetHighlightedNodes(PyObject* args) } -Py::List ViewProviderFemMeshPy::getVisibleElementFaces(void) const +Py::List ViewProviderFemMeshPy::getVisibleElementFaces() const { const std::vector& visElmFc = this->getViewProviderFemMeshPtr()->getVisibleElementFaces(); std::vector trans; diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 63f55be8aa..0e2fa7499f 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -93,12 +93,12 @@ ViewProviderFemPostFunctionProvider::~ViewProviderFemPostFunctionProvider() { } -std::vector< App::DocumentObject* > ViewProviderFemPostFunctionProvider::claimChildren(void) const { +std::vector< App::DocumentObject* > ViewProviderFemPostFunctionProvider::claimChildren() const { return static_cast(getObject())->Functions.getValues(); } -std::vector< App::DocumentObject* > ViewProviderFemPostFunctionProvider::claimChildren3D(void) const { +std::vector< App::DocumentObject* > ViewProviderFemPostFunctionProvider::claimChildren3D() const { return claimChildren(); } @@ -276,7 +276,7 @@ bool ViewProviderFemPostFunction::findScaleFactor(double& scale) const return false; } -bool ViewProviderFemPostFunction::doubleClicked(void) { +bool ViewProviderFemPostFunction::doubleClicked() { Gui::Application::Instance->activeDocument()->setEdit(this, (int)ViewProvider::Default); return true; } @@ -286,7 +286,7 @@ SoTransformManip* ViewProviderFemPostFunction::setupManipulator() { return new SoCenterballManip; } -std::vector ViewProviderFemPostFunction::getDisplayModes(void) const +std::vector ViewProviderFemPostFunction::getDisplayModes() const { std::vector StrList; StrList.emplace_back("Default"); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index 976d60481f..f75d11cbe1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -90,8 +90,8 @@ public: virtual bool canDelete(App::DocumentObject* obj) const; protected: - virtual std::vector< App::DocumentObject* > claimChildren(void) const; - virtual std::vector< App::DocumentObject* > claimChildren3D(void) const; + virtual std::vector< App::DocumentObject* > claimChildren() const; + virtual std::vector< App::DocumentObject* > claimChildren3D() const; virtual void onChanged(const App::Property* prop); virtual void updateData(const App::Property*); @@ -112,7 +112,7 @@ public: App::PropertyFloat AutoScaleFactorZ; void attach(App::DocumentObject *pcObject); - bool doubleClicked(void); + bool doubleClicked(); std::vector getDisplayModes() const; //creates the widget used in the task dalogs, either for the function itself or for diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp index 981332a7ca..527b4db993 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp @@ -254,7 +254,7 @@ void ViewProviderFemPostObject::attach(App::DocumentObject* pcObj) (void)setupPipeline(); } -SoSeparator* ViewProviderFemPostObject::getFrontRoot(void) const { +SoSeparator* ViewProviderFemPostObject::getFrontRoot() const { return m_colorRoot; } @@ -282,7 +282,7 @@ void ViewProviderFemPostObject::setDisplayMode(const char* ModeName) ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderFemPostObject::getDisplayModes(void) const +std::vector ViewProviderFemPostObject::getDisplayModes() const { std::vector StrList; StrList.emplace_back("Outline"); @@ -655,7 +655,7 @@ void ViewProviderFemPostObject::onChanged(const App::Property* prop) { ViewProviderDocumentObject::onChanged(prop); } -bool ViewProviderFemPostObject::doubleClicked(void) { +bool ViewProviderFemPostObject::doubleClicked() { // work around for a problem in VTK implementation: https://forum.freecadweb.org/viewtopic.php?t=10587&start=130#p125688 // check if backlight is enabled ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); @@ -725,7 +725,7 @@ void ViewProviderFemPostObject::unsetEdit(int ModNum) { } } -void ViewProviderFemPostObject::hide(void) { +void ViewProviderFemPostObject::hide() { Gui::ViewProviderDocumentObject::hide(); m_colorStyle->style = SoDrawStyle::INVISIBLE; // The object is now hidden but the color bar is wrong @@ -760,7 +760,7 @@ void ViewProviderFemPostObject::hide(void) { } } -void ViewProviderFemPostObject::show(void) { +void ViewProviderFemPostObject::show() { Gui::ViewProviderDocumentObject::show(); m_colorStyle->style = SoDrawStyle::FILLED; // we must update the color bar except for data point filters diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h index f1fd646a12..d2246c9c50 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h @@ -86,14 +86,14 @@ public: void onChanged(const App::Property* prop); //edit handling - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - virtual void hide(void); - virtual void show(void); + virtual void hide(); + virtual void show(); - virtual SoSeparator* getFrontRoot(void) const; + virtual SoSeparator* getFrontRoot() const; // observer for the color bar virtual void OnChange(Base::Subject< int >& rCaller, int rcReason); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp index ca90cffdd2..05750af12f 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp @@ -52,7 +52,7 @@ ViewProviderFemPostPipeline::~ViewProviderFemPostPipeline() { } -std::vector< App::DocumentObject* > ViewProviderFemPostPipeline::claimChildren(void) const { +std::vector< App::DocumentObject* > ViewProviderFemPostPipeline::claimChildren() const { Fem::FemPostPipeline* pipeline = static_cast(getObject()); std::vector children; @@ -65,7 +65,7 @@ std::vector< App::DocumentObject* > ViewProviderFemPostPipeline::claimChildren(v return children; } -std::vector< App::DocumentObject* > ViewProviderFemPostPipeline::claimChildren3D(void) const { +std::vector< App::DocumentObject* > ViewProviderFemPostPipeline::claimChildren3D() const { return claimChildren(); } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h index be7eff2ddd..5722e6ee80 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h @@ -40,8 +40,8 @@ public: ViewProviderFemPostPipeline(); ~ViewProviderFemPostPipeline(); - virtual std::vector< App::DocumentObject* > claimChildren(void) const; - virtual std::vector< App::DocumentObject* > claimChildren3D(void) const; + virtual std::vector< App::DocumentObject* > claimChildren() const; + virtual std::vector< App::DocumentObject* > claimChildren3D() const; virtual void updateData(const App::Property* prop); virtual void onSelectionChanged(const Gui::SelectionChanges &sel); void updateColorBars(); diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index c6650dabd0..bae158cd67 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -43,7 +43,7 @@ public: virtual ~ViewProviderResult(); // shows solid in the tree - virtual bool isShow(void) const + virtual bool isShow() const { return true; } }; diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp index 0fd120d8ae..5e3be39f28 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp @@ -33,7 +33,7 @@ using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetElements, Gui::ViewProviderGeometryObject) -bool ViewProviderSetElements::doubleClicked(void) +bool ViewProviderSetElements::doubleClicked() { //Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(dynamic_cast(getObject())); //Gui::Control().showDialog(dlg); diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h index 5b6bc89566..d8328f4cde 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h @@ -34,7 +34,7 @@ class ViewProviderSetElements : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetElements); public: - virtual bool doubleClicked(void); + virtual bool doubleClicked(); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp index 18d0dd3c4f..e3951b47fa 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp @@ -33,7 +33,7 @@ using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetFaces, Gui::ViewProviderGeometryObject) -bool ViewProviderSetFaces::doubleClicked(void) +bool ViewProviderSetFaces::doubleClicked() { //Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(dynamic_cast(getObject())); //Gui::Control().showDialog(dlg); diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h index 7d31b8490a..664e99e736 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h @@ -34,7 +34,7 @@ class ViewProviderSetFaces : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetFaces); public: - virtual bool doubleClicked(void); + virtual bool doubleClicked(); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp index 3a98972a2f..899a99dab7 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp @@ -33,7 +33,7 @@ using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetGeometry, Gui::ViewProviderGeometryObject) -bool ViewProviderSetGeometry::doubleClicked(void) +bool ViewProviderSetGeometry::doubleClicked() { //Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(dynamic_cast(getObject())); //Gui::Control().showDialog(dlg); diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h index d046d0dd33..d76b6f9991 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h @@ -34,7 +34,7 @@ class ViewProviderSetGeometry : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetGeometry); public: - virtual bool doubleClicked(void); + virtual bool doubleClicked(); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp index b4e47ddc78..08e6b237f9 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp @@ -35,7 +35,7 @@ using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetNodes, Gui::ViewProviderGeometryObject) -bool ViewProviderSetNodes::doubleClicked(void) +bool ViewProviderSetNodes::doubleClicked() { Gui::TaskView::TaskDialog* dlg = new TaskDlgCreateNodeSet(static_cast(getObject())); Gui::Control().showDialog(dlg); diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h index 14567b92fe..531b6694d7 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h @@ -34,7 +34,7 @@ class ViewProviderSetNodes : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(FemGui::ViewProviderSetNodes); public: - virtual bool doubleClicked(void); + virtual bool doubleClicked(); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.cpp b/src/Mod/Fem/Gui/ViewProviderSolver.cpp index 2bd586897e..3eabd41722 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSolver.cpp @@ -48,7 +48,7 @@ ViewProviderSolver::~ViewProviderSolver() } -std::vector ViewProviderSolver::getDisplayModes(void) const +std::vector ViewProviderSolver::getDisplayModes() const { return { "Solver" }; } diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h index df61c896dc..0b82d9d202 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.h +++ b/src/Mod/Fem/Gui/ViewProviderSolver.h @@ -53,11 +53,11 @@ public: ~ViewProviderSolver(); // shows solid in the tree - virtual bool isShow(void) const { + virtual bool isShow() const { return Visibility.getValue(); } /// A list of all possible display modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; // handling when object is deleted virtual bool onDelete(const std::vector&); diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.cpp b/src/Mod/Import/App/dxf/ImpExpDxf.cpp index e5cc1b632d..dd365efd3f 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.cpp +++ b/src/Mod/Import/App/dxf/ImpExpDxf.cpp @@ -85,7 +85,7 @@ ImpExpDxfRead::ImpExpDxfRead(std::string filepath, App::Document *pcDoc) : CDxfR setOptions(); } -void ImpExpDxfRead::setOptions(void) +void ImpExpDxfRead::setOptions() { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(getOptionSource().c_str()); optionGroupLayers = hGrp->GetBool("groupLayers",false); @@ -473,7 +473,7 @@ ImpExpDxfWrite::~ImpExpDxfWrite() { } -void ImpExpDxfWrite::setOptions(void) +void ImpExpDxfWrite::setOptions() { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(getOptionSource().c_str()); optionMaxLength = hGrp->GetFloat("maxsegmentlength",5.0); diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.h b/src/Mod/Import/App/dxf/ImpExpDxf.h index 0868739537..baa645783f 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.h +++ b/src/Mod/Import/App/dxf/ImpExpDxf.h @@ -55,7 +55,7 @@ namespace Import std::string getOptionSource() { return m_optionSource; } void setOptionSource(std::string s) { m_optionSource = s; } - void setOptions(void); + void setOptions(); private: gp_Pnt makePoint(const double* p); @@ -78,7 +78,7 @@ namespace Import void exportShape(const TopoDS_Shape input); std::string getOptionSource() { return m_optionSource; } void setOptionSource(std::string s) { m_optionSource = s; } - void setOptions(void); + void setOptions(); void exportText(const char* text, Base::Vector3d position1, Base::Vector3d position2, double size, int just); void exportLinearDim(Base::Vector3d textLocn, Base::Vector3d lineLocn, diff --git a/src/Mod/Import/Gui/AppImportGui.cpp b/src/Mod/Import/Gui/AppImportGui.cpp index e851e20662..99e8aea2e9 100644 --- a/src/Mod/Import/Gui/AppImportGui.cpp +++ b/src/Mod/Import/Gui/AppImportGui.cpp @@ -32,7 +32,7 @@ // use a different name to CreateCommand() -void CreateImportCommands(void); +void CreateImportCommands(); namespace ImportGui { diff --git a/src/Mod/Import/Gui/Command.cpp b/src/Mod/Import/Gui/Command.cpp index a534a2cf89..ad333559bb 100644 --- a/src/Mod/Import/Gui/Command.cpp +++ b/src/Mod/Import/Gui/Command.cpp @@ -64,7 +64,7 @@ void FCCmdImportReadBREP::activated(int iMsg) commitCommand(); } -bool FCCmdImportReadBREP::isActive(void) +bool FCCmdImportReadBREP::isActive() { return getGuiApplication()->activeDocument() != nullptr; } @@ -101,7 +101,7 @@ void ImportStep::activated(int iMsg) } } -bool ImportStep::isActive(void) +bool ImportStep::isActive() { if (getActiveGuiDocument()) return true; @@ -141,7 +141,7 @@ void ImportIges::activated(int iMsg) } } -bool ImportIges::isActive(void) +bool ImportIges::isActive() { if (getActiveGuiDocument()) return true; @@ -150,7 +150,7 @@ bool ImportIges::isActive(void) } -void CreateImportCommands(void) +void CreateImportCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new FCCmdImportReadBREP()); diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index 3a5409d049..832982d98e 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -177,7 +177,7 @@ public: virtual ~PropertyDistanceList(); virtual void setSize(int newSize); - virtual int getSize(void) const; + virtual int getSize() const; /** Sets the property */ @@ -189,9 +189,9 @@ public: void set1Value (const int idx, float value){_lValueList.operator[] (idx) = value;} void setValues (const std::vector& values); - const std::vector &getValues(void) const{return _lValueList;} + const std::vector &getValues() const{return _lValueList;} - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual void setPyObject(PyObject *); virtual void Save (Base::Writer &writer) const; @@ -200,9 +200,9 @@ public: virtual void SaveDocFile (Base::Writer &writer) const; virtual void RestoreDocFile(Base::Reader &reader); - virtual Property *Copy(void) const; + virtual Property *Copy() const; virtual void Paste(const Property &from); - virtual unsigned int getMemSize (void) const; + virtual unsigned int getMemSize () const; private: std::vector _lValueList; @@ -219,7 +219,7 @@ class InspectionExport Feature : public App::DocumentObject public: /// Constructor - Feature(void); + Feature(); virtual ~Feature(); /** @name Properties */ @@ -235,11 +235,11 @@ public: //@{ short mustExecute() const; /// recalculate the Feature - App::DocumentObjectExecReturn* execute(void); + App::DocumentObjectExecReturn* execute(); //@} /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const + const char* getViewProviderName() const { return "InspectionGui::ViewProviderInspection"; } }; @@ -249,11 +249,11 @@ class InspectionExport Group : public App::DocumentObjectGroup public: /// Constructor - Group(void); + Group(); virtual ~Group(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const + const char* getViewProviderName() const { return "InspectionGui::ViewProviderInspectionGroup"; } }; diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index 0226421d85..bf29465729 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -128,13 +128,13 @@ void ViewProviderInspection::onChanged(const App::Property* prop) } } -void ViewProviderInspection::hide(void) +void ViewProviderInspection::hide() { inherited::hide(); pcColorStyle->style = SoDrawStyle::INVISIBLE; } -void ViewProviderInspection::show(void) +void ViewProviderInspection::show() { inherited::show(); pcColorStyle->style = SoDrawStyle::FILLED; @@ -296,7 +296,7 @@ void ViewProviderInspection::updateData(const App::Property* prop) } } -SoSeparator* ViewProviderInspection::getFrontRoot(void) const +SoSeparator* ViewProviderInspection::getFrontRoot() const { return pcColorRoot; } @@ -376,7 +376,7 @@ void ViewProviderInspection::setDisplayMode(const char* ModeName) inherited::setDisplayMode(ModeName); } -std::vector ViewProviderInspection::getDisplayModes(void) const +std::vector ViewProviderInspection::getDisplayModes() const { // add modes std::vector StrList; diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h index 74a7be1a3c..076320ace5 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.h +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h @@ -62,18 +62,18 @@ public: /// Sets the viewing mode void setDisplayMode(const char* ModeName); /// Returns a list of all possible modes - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; /// Update colorbar after recomputation of distances. void updateData(const App::Property*); /// Once the color bar settings has been changed this method gets called to update the feature's representation void OnChange(Base::Subject &rCaller,int rcReason); QIcon getIcon() const; /// Returns a color bar - SoSeparator* getFrontRoot(void) const; + SoSeparator* getFrontRoot() const; /// Hide the object in the view - virtual void hide(void); + virtual void hide(); /// Show the object in the view - virtual void show(void); + virtual void show(); static void inspectCallback(void * ud, SoEventCallback * n); diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 0ce5b06f91..f9fd8fd562 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -496,12 +496,12 @@ Base::Vector3d Measurement::massCenter() const return result; } -unsigned int Measurement::getMemSize(void) const +unsigned int Measurement::getMemSize() const { return 0; } -PyObject *Measurement::getPyObject(void) +PyObject *Measurement::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h index 001758fc66..6c85553da3 100644 --- a/src/Mod/Measure/App/Measurement.h +++ b/src/Mod/Measure/App/Measurement.h @@ -66,8 +66,8 @@ public: MeasureType getType(); // from base class - virtual PyObject *getPyObject(void); - virtual unsigned int getMemSize(void) const; + virtual PyObject *getPyObject(); + virtual unsigned int getMemSize() const; public: // Methods for distances (edge length, two points, edge and a point diff --git a/src/Mod/Measure/App/MeasurementPyImp.cpp b/src/Mod/Measure/App/MeasurementPyImp.cpp index 14c3781cad..3fe1967146 100644 --- a/src/Mod/Measure/App/MeasurementPyImp.cpp +++ b/src/Mod/Measure/App/MeasurementPyImp.cpp @@ -38,7 +38,7 @@ using namespace Measure; // returns a string which represents the object e.g. when printed in python -std::string MeasurementPy::representation(void) const +std::string MeasurementPy::representation() const { return ""; } diff --git a/src/Mod/Mesh/Gui/DlgDecimating.h b/src/Mod/Mesh/Gui/DlgDecimating.h index d988296969..cddcef6e3b 100644 --- a/src/Mod/Mesh/Gui/DlgDecimating.h +++ b/src/Mod/Mesh/Gui/DlgDecimating.h @@ -68,7 +68,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return true; } private: diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp index 6091401bdc..1e79dd0b3a 100644 --- a/src/Mod/MeshPart/App/CurveProjector.cpp +++ b/src/Mod/MeshPart/App/CurveProjector.cpp @@ -101,7 +101,7 @@ CurveProjectorShape::CurveProjectorShape(const TopoDS_Shape &aShape, const MeshK Do(); } -void CurveProjectorShape::Do(void) +void CurveProjectorShape::Do() { TopExp_Explorer Ex; TopoDS_Shape Edge; @@ -269,7 +269,7 @@ CurveProjectorSimple::CurveProjectorSimple(const TopoDS_Shape &aShape, const Mes } -void CurveProjectorSimple::Do(void) +void CurveProjectorSimple::Do() { TopExp_Explorer Ex; TopoDS_Shape Edge; @@ -583,7 +583,7 @@ CurveProjectorWithToolMesh::CurveProjectorWithToolMesh(const TopoDS_Shape &aShap } -void CurveProjectorWithToolMesh::Do(void) +void CurveProjectorWithToolMesh::Do() { TopExp_Explorer Ex; TopoDS_Shape Edge; diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index e74ee014b9..58a710a3ed 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -72,7 +72,7 @@ public: typedef std::map,TopoDSLess > result_type; - result_type &result(void) {return mvEdgeSplitPoints;} + result_type &result() {return mvEdgeSplitPoints;} void writeIntersectionPointsToFile(const char *name="export_pts.asc"); diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp index b7f051143d..ae456eec8e 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.cpp +++ b/src/Mod/MeshPart/App/MeshAlgos.cpp @@ -478,7 +478,7 @@ class _VertexCompare return clP1.X() < clP2.X(); } - _VertexCompare (void) : dE(1.0e-5) {} + _VertexCompare () : dE(1.0e-5) {} double dE; }; diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index fc838d3194..3e1ed2a55b 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -34,7 +34,7 @@ #include "Workbench.h" // use a different name to CreateCommand() -void CreateMeshPartCommands(void); +void CreateMeshPartCommands(); void loadMeshPartResource() { diff --git a/src/Mod/MeshPart/Gui/Command.cpp b/src/Mod/MeshPart/Gui/Command.cpp index 27b182670e..445397411d 100644 --- a/src/Mod/MeshPart/Gui/Command.cpp +++ b/src/Mod/MeshPart/Gui/Command.cpp @@ -68,7 +68,7 @@ void CmdMeshPartMesher::activated(int) Gui::Control().showDialog(new MeshPartGui::TaskTessellation()); } -bool CmdMeshPartMesher::isActive(void) +bool CmdMeshPartMesher::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -164,7 +164,7 @@ void CmdMeshPartTrimByPlane::activated(int) commitCommand(); } -bool CmdMeshPartTrimByPlane::isActive(void) +bool CmdMeshPartTrimByPlane::isActive() { // Check for the selected mesh feature (all Mesh types) if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) != 1) @@ -248,7 +248,7 @@ void CmdMeshPartSection::activated(int) commitCommand(); } -bool CmdMeshPartSection::isActive(void) +bool CmdMeshPartSection::isActive() { // Check for the selected mesh feature (all Mesh types) if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) != 1) @@ -290,7 +290,7 @@ void CmdMeshPartCrossSections::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdMeshPartCrossSections::isActive(void) +bool CmdMeshPartCrossSections::isActive() { return (Gui::Selection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0 && !Gui::Control().activeDialog()); @@ -322,7 +322,7 @@ void CmdMeshPartCurveOnMesh::activated(int) Gui::Control().showDialog(new MeshPartGui::TaskCurveOnMesh(static_cast(mdis.front()))); } -bool CmdMeshPartCurveOnMesh::isActive(void) +bool CmdMeshPartCurveOnMesh::isActive() { if (Gui::Control().activeDialog()) return false; @@ -336,7 +336,7 @@ bool CmdMeshPartCurveOnMesh::isActive(void) } -void CreateMeshPartCommands(void) +void CreateMeshPartCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdMeshPartMesher()); diff --git a/src/Mod/Part/App/ArcOfCirclePyImp.cpp b/src/Mod/Part/App/ArcOfCirclePyImp.cpp index 05c17f0a18..d48d76f122 100644 --- a/src/Mod/Part/App/ArcOfCirclePyImp.cpp +++ b/src/Mod/Part/App/ArcOfCirclePyImp.cpp @@ -40,7 +40,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfCirclePy::representation(void) const +std::string ArcOfCirclePy::representation() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfCirclePtr()->handle()); @@ -126,7 +126,7 @@ int ArcOfCirclePy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfCirclePy::getRadius(void) const +Py::Float ArcOfCirclePy::getRadius() const { return Py::Float(getGeomArcOfCirclePtr()->getRadius()); } @@ -136,7 +136,7 @@ void ArcOfCirclePy::setRadius(Py::Float arg) getGeomArcOfCirclePtr()->setRadius((double)arg); } -Py::Object ArcOfCirclePy::getCircle(void) const +Py::Object ArcOfCirclePy::getCircle() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfCirclePtr()->handle()); diff --git a/src/Mod/Part/App/ArcOfConicPyImp.cpp b/src/Mod/Part/App/ArcOfConicPyImp.cpp index b3768b921d..b795c0e220 100644 --- a/src/Mod/Part/App/ArcOfConicPyImp.cpp +++ b/src/Mod/Part/App/ArcOfConicPyImp.cpp @@ -36,7 +36,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string ArcOfConicPy::representation(void) const +std::string ArcOfConicPy::representation() const { return ""; } @@ -55,12 +55,12 @@ int ArcOfConicPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) return -1; } -Py::Object ArcOfConicPy::getLocation(void) const +Py::Object ArcOfConicPy::getLocation() const { return Py::Vector(getGeomArcOfConicPtr()->getLocation()); } -Py::Object ArcOfConicPy::getCenter(void) const +Py::Object ArcOfConicPy::getCenter() const { return Py::Vector(getGeomArcOfConicPtr()->getCenter()); } @@ -101,7 +101,7 @@ void ArcOfConicPy::setCenter(Py::Object arg) } } -Py::Float ArcOfConicPy::getAngleXU(void) const +Py::Float ArcOfConicPy::getAngleXU() const { return Py::Float(getGeomArcOfConicPtr()->getAngleXU()); } @@ -111,7 +111,7 @@ void ArcOfConicPy::setAngleXU(Py::Float arg) getGeomArcOfConicPtr()->setAngleXU((double)arg); } -Py::Object ArcOfConicPy::getAxis(void) const +Py::Object ArcOfConicPy::getAxis() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); @@ -151,7 +151,7 @@ void ArcOfConicPy::setAxis(Py::Object arg) } } -Py::Object ArcOfConicPy::getXAxis(void) const +Py::Object ArcOfConicPy::getXAxis() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); @@ -191,7 +191,7 @@ void ArcOfConicPy::setXAxis(Py::Object arg) } } -Py::Object ArcOfConicPy::getYAxis(void) const +Py::Object ArcOfConicPy::getYAxis() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); diff --git a/src/Mod/Part/App/ArcOfEllipsePyImp.cpp b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp index cf592b4463..8275935a4b 100644 --- a/src/Mod/Part/App/ArcOfEllipsePyImp.cpp +++ b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfEllipsePy::representation(void) const +std::string ArcOfEllipsePy::representation() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfEllipsePtr()->handle()); @@ -114,7 +114,7 @@ int ArcOfEllipsePy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfEllipsePy::getMajorRadius(void) const +Py::Float ArcOfEllipsePy::getMajorRadius() const { return Py::Float(getGeomArcOfEllipsePtr()->getMajorRadius()); } @@ -124,7 +124,7 @@ void ArcOfEllipsePy::setMajorRadius(Py::Float arg) getGeomArcOfEllipsePtr()->setMajorRadius((double)arg); } -Py::Float ArcOfEllipsePy::getMinorRadius(void) const +Py::Float ArcOfEllipsePy::getMinorRadius() const { return Py::Float(getGeomArcOfEllipsePtr()->getMinorRadius()); } @@ -134,7 +134,7 @@ void ArcOfEllipsePy::setMinorRadius(Py::Float arg) getGeomArcOfEllipsePtr()->setMinorRadius((double)arg); } -Py::Object ArcOfEllipsePy::getEllipse(void) const +Py::Object ArcOfEllipsePy::getEllipse() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfEllipsePtr()->handle()); diff --git a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp index 437557339a..5276b7cdfa 100644 --- a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp +++ b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfHyperbolaPy::representation(void) const +std::string ArcOfHyperbolaPy::representation() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfHyperbolaPtr()->handle()); @@ -114,7 +114,7 @@ int ArcOfHyperbolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfHyperbolaPy::getMajorRadius(void) const +Py::Float ArcOfHyperbolaPy::getMajorRadius() const { return Py::Float(getGeomArcOfHyperbolaPtr()->getMajorRadius()); } @@ -124,7 +124,7 @@ void ArcOfHyperbolaPy::setMajorRadius(Py::Float arg) getGeomArcOfHyperbolaPtr()->setMajorRadius((double)arg); } -Py::Float ArcOfHyperbolaPy::getMinorRadius(void) const +Py::Float ArcOfHyperbolaPy::getMinorRadius() const { return Py::Float(getGeomArcOfHyperbolaPtr()->getMinorRadius()); } @@ -134,7 +134,7 @@ void ArcOfHyperbolaPy::setMinorRadius(Py::Float arg) getGeomArcOfHyperbolaPtr()->setMinorRadius((double)arg); } -Py::Object ArcOfHyperbolaPy::getHyperbola(void) const +Py::Object ArcOfHyperbolaPy::getHyperbola() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfHyperbolaPtr()->handle()); diff --git a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp index beeaac9e63..98b0fc3d84 100644 --- a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp +++ b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfParabolaPy::representation(void) const +std::string ArcOfParabolaPy::representation() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfParabolaPtr()->handle()); @@ -112,7 +112,7 @@ int ArcOfParabolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfParabolaPy::getFocal(void) const +Py::Float ArcOfParabolaPy::getFocal() const { return Py::Float(getGeomArcOfParabolaPtr()->getFocal()); } @@ -122,7 +122,7 @@ void ArcOfParabolaPy::setFocal(Py::Float arg) getGeomArcOfParabolaPtr()->setFocal((double)arg); } -Py::Object ArcOfParabolaPy::getParabola(void) const +Py::Object ArcOfParabolaPy::getParabola() const { Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfParabolaPtr()->handle()); diff --git a/src/Mod/Part/App/ArcPyImp.cpp b/src/Mod/Part/App/ArcPyImp.cpp index a3e5908e6b..8ccf6627ab 100644 --- a/src/Mod/Part/App/ArcPyImp.cpp +++ b/src/Mod/Part/App/ArcPyImp.cpp @@ -48,7 +48,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcPy::representation(void) const +std::string ArcPy::representation() const { return ""; } diff --git a/src/Mod/Part/App/AttachEnginePyImp.cpp b/src/Mod/Part/App/AttachEnginePyImp.cpp index d5eb9e173d..f160a0b8f5 100644 --- a/src/Mod/Part/App/AttachEnginePyImp.cpp +++ b/src/Mod/Part/App/AttachEnginePyImp.cpp @@ -38,7 +38,7 @@ using namespace Attacher; // returns a string which represents the object e.g. when printed in python -std::string AttachEnginePy::representation(void) const +std::string AttachEnginePy::representation() const { return std::string(""); } @@ -92,7 +92,7 @@ int AttachEnginePy::PyInit(PyObject* args, PyObject* /*kwd*/) } -Py::String AttachEnginePy::getAttacherType(void) const +Py::String AttachEnginePy::getAttacherType() const { return Py::String(std::string(this->getAttachEnginePtr()->getTypeId().getName())); } @@ -110,7 +110,7 @@ Py::String AttachEnginePy::getAttacherType(void) const throw Py::Exception();\ } -Py::String AttachEnginePy::getMode(void) const +Py::String AttachEnginePy::getMode() const { try { AttachEngine &attacher = *(this->getAttachEnginePtr()); @@ -127,7 +127,7 @@ void AttachEnginePy::setMode(Py::String arg) } ATTACHERPY_STDCATCH_ATTR; } -Py::Object AttachEnginePy::getReferences(void) const +Py::Object AttachEnginePy::getReferences() const { try { AttachEngine &attacher = *(this->getAttachEnginePtr()); @@ -144,7 +144,7 @@ void AttachEnginePy::setReferences(Py::Object arg) } ATTACHERPY_STDCATCH_ATTR; } -Py::Object AttachEnginePy::getAttachmentOffset(void) const +Py::Object AttachEnginePy::getAttachmentOffset() const { try { AttachEngine &attacher = *(this->getAttachEnginePtr()); @@ -167,7 +167,7 @@ void AttachEnginePy::setAttachmentOffset(Py::Object arg) } ATTACHERPY_STDCATCH_ATTR; } -Py::Boolean AttachEnginePy::getReverse(void) const +Py::Boolean AttachEnginePy::getReverse() const { try { AttachEngine &attacher = *(this->getAttachEnginePtr()); @@ -183,7 +183,7 @@ void AttachEnginePy::setReverse(Py::Boolean arg) } ATTACHERPY_STDCATCH_ATTR; } -Py::Float AttachEnginePy::getParameter(void) const +Py::Float AttachEnginePy::getParameter() const { try { AttachEngine &attacher = *(this->getAttachEnginePtr()); @@ -200,7 +200,7 @@ void AttachEnginePy::setParameter(Py::Float arg) } -Py::List AttachEnginePy::getCompleteModeList(void) const +Py::List AttachEnginePy::getCompleteModeList() const { try { Py::List ret; @@ -212,7 +212,7 @@ Py::List AttachEnginePy::getCompleteModeList(void) const } ATTACHERPY_STDCATCH_ATTR; } -Py::List AttachEnginePy::getCompleteRefTypeList(void) const +Py::List AttachEnginePy::getCompleteRefTypeList() const { try { Py::List ret; @@ -224,7 +224,7 @@ Py::List AttachEnginePy::getCompleteRefTypeList(void) const } ATTACHERPY_STDCATCH_ATTR; } -Py::List AttachEnginePy::getImplementedModes(void) const +Py::List AttachEnginePy::getImplementedModes() const { try { Py::List ret; diff --git a/src/Mod/Part/App/AttachExtension.cpp b/src/Mod/Part/App/AttachExtension.cpp index ab2e2eedd8..fae069f712 100644 --- a/src/Mod/Part/App/AttachExtension.cpp +++ b/src/Mod/Part/App/AttachExtension.cpp @@ -141,7 +141,7 @@ bool AttachExtension::isAttacherActive() const { return _active!=0; } -short int AttachExtension::extensionMustExecute(void) { +short int AttachExtension::extensionMustExecute() { return DocumentObjectExtension::extensionMustExecute(); } @@ -274,7 +274,7 @@ App::PropertyPlacement& AttachExtension::getPlacement() const { return *pla; } -PyObject* AttachExtension::getExtensionPyObject(void) { +PyObject* AttachExtension::getExtensionPyObject() { if (ExtensionPythonObject.is(Py::_None())){ // ref counter is set to 1 diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h index e2d61012cf..f1814b783a 100644 --- a/src/Mod/Part/App/AttachExtension.h +++ b/src/Mod/Part/App/AttachExtension.h @@ -81,7 +81,7 @@ public: */ bool changeAttacherType(const char* typeName); - Attacher::AttachEngine &attacher(void) const {if(!_attacher) throw AttachEngineException("AttachableObject: no attacher is set."); return *_attacher;} + Attacher::AttachEngine &attacher() const {if(!_attacher) throw AttachEngineException("AttachableObject: no attacher is set."); return *_attacher;} App::PropertyString AttacherType; @@ -101,7 +101,7 @@ public: * mode. Can throw FreeCAD and OCC exceptions. Returns true if attached, * false if not, throws if attachment failed. */ - virtual bool positionBySupport(void); + virtual bool positionBySupport(); /** Return whether this attacher is active */ @@ -110,9 +110,9 @@ public: virtual bool isTouched_Mapping() {return true; /*support.isTouched isn't true when linked objects are changed... why?..*/} - virtual short int extensionMustExecute(void); - virtual App::DocumentObjectExecReturn *extensionExecute(void); - virtual PyObject* getExtensionPyObject(void); + virtual short int extensionMustExecute(); + virtual App::DocumentObjectExecReturn *extensionExecute(); + virtual PyObject* getExtensionPyObject(); virtual void onExtendedDocumentRestored(); protected: diff --git a/src/Mod/Part/App/AttachExtensionPyImp.cpp b/src/Mod/Part/App/AttachExtensionPyImp.cpp index 57f7522fa2..d9fd263565 100644 --- a/src/Mod/Part/App/AttachExtensionPyImp.cpp +++ b/src/Mod/Part/App/AttachExtensionPyImp.cpp @@ -31,7 +31,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string AttachExtensionPy::representation(void) const +std::string AttachExtensionPy::representation() const { return std::string(""); } @@ -71,7 +71,7 @@ PyObject* AttachExtensionPy::changeAttacherType(PyObject *args) return Py::new_reference_to(Py::Boolean(ret)); } -Py::Object AttachExtensionPy::getAttacher(void) const +Py::Object AttachExtensionPy::getAttacher() const { try { this->getAttachExtensionPtr()->attacher(); //throws if attacher is not set diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h index cc72fdcbd9..d3dd80ac65 100644 --- a/src/Mod/Part/App/Attacher.h +++ b/src/Mod/Part/App/Attacher.h @@ -284,7 +284,7 @@ public: //methods /** * @brief EnableAllModes enables all modes that have shape type lists filled. The function acts on modeEnabled array. */ - void EnableAllSupportedModes(void); + void EnableAllSupportedModes(); virtual ~AttachEngine(){}; diff --git a/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp b/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp index 99f5f29729..e2cb79d59e 100644 --- a/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp +++ b/src/Mod/Part/App/BRepFeat/MakePrismPyImp.cpp @@ -97,7 +97,7 @@ int MakePrismPy::PyInit(PyObject* args, PyObject* kwds) } // returns a string which represents the object e.g. when printed in python -std::string MakePrismPy::representation(void) const +std::string MakePrismPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp index a07d38e8be..2693221009 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp +++ b/src/Mod/Part/App/BRepOffsetAPI_MakeFillingPyImp.cpp @@ -114,7 +114,7 @@ int BRepOffsetAPI_MakeFillingPy::PyInit(PyObject* args, PyObject* kwds) } // returns a string which represents the object e.g. when printed in python -std::string BRepOffsetAPI_MakeFillingPy::representation(void) const +std::string BRepOffsetAPI_MakeFillingPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp index 592d2cd387..d43f4b4ed7 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp +++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp @@ -66,7 +66,7 @@ int BRepOffsetAPI_MakePipeShellPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) } // returns a string which represents the object e.g. when printed in python -std::string BRepOffsetAPI_MakePipeShellPy::representation(void) const +std::string BRepOffsetAPI_MakePipeShellPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/BSplineCurvePyImp.cpp b/src/Mod/Part/App/BSplineCurvePyImp.cpp index 14932d2c14..31498fcc59 100644 --- a/src/Mod/Part/App/BSplineCurvePyImp.cpp +++ b/src/Mod/Part/App/BSplineCurvePyImp.cpp @@ -50,7 +50,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BSplineCurvePy::representation(void) const +std::string BSplineCurvePy::representation() const { return ""; } @@ -682,35 +682,35 @@ PyObject* BSplineCurvePy::getMultiplicities(PyObject * args) return nullptr; } } -Py::Long BSplineCurvePy::getDegree(void) const +Py::Long BSplineCurvePy::getDegree() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->Degree()); } -Py::Long BSplineCurvePy::getMaxDegree(void) const +Py::Long BSplineCurvePy::getMaxDegree() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->MaxDegree()); } -Py::Long BSplineCurvePy::getNbPoles(void) const +Py::Long BSplineCurvePy::getNbPoles() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbPoles()); } -Py::Long BSplineCurvePy::getNbKnots(void) const +Py::Long BSplineCurvePy::getNbKnots() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbKnots()); } -Py::Object BSplineCurvePy::getStartPoint(void) const +Py::Object BSplineCurvePy::getStartPoint() const { Handle(Geom_BSplineCurve) c = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); @@ -718,7 +718,7 @@ Py::Object BSplineCurvePy::getStartPoint(void) const return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); } -Py::Object BSplineCurvePy::getEndPoint(void) const +Py::Object BSplineCurvePy::getEndPoint() const { Handle(Geom_BSplineCurve) c = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); @@ -726,21 +726,21 @@ Py::Object BSplineCurvePy::getEndPoint(void) const return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); } -Py::Object BSplineCurvePy::getFirstUKnotIndex(void) const +Py::Object BSplineCurvePy::getFirstUKnotIndex() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->FirstUKnotIndex()); } -Py::Object BSplineCurvePy::getLastUKnotIndex(void) const +Py::Object BSplineCurvePy::getLastUKnotIndex() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->LastUKnotIndex()); } -Py::List BSplineCurvePy::getKnotSequence(void) const +Py::List BSplineCurvePy::getKnotSequence() const { Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/BezierCurvePyImp.cpp b/src/Mod/Part/App/BezierCurvePyImp.cpp index 089e13ff8f..d0630b5882 100644 --- a/src/Mod/Part/App/BezierCurvePyImp.cpp +++ b/src/Mod/Part/App/BezierCurvePyImp.cpp @@ -42,7 +42,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BezierCurvePy::representation(void) const +std::string BezierCurvePy::representation() const { return ""; } @@ -345,28 +345,28 @@ PyObject* BezierCurvePy::getResolution(PyObject* args) return nullptr; } } -Py::Long BezierCurvePy::getDegree(void) const +Py::Long BezierCurvePy::getDegree() const { Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->Degree()); } -Py::Long BezierCurvePy::getMaxDegree(void) const +Py::Long BezierCurvePy::getMaxDegree() const { Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->MaxDegree()); } -Py::Long BezierCurvePy::getNbPoles(void) const +Py::Long BezierCurvePy::getNbPoles() const { Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbPoles()); } -Py::Object BezierCurvePy::getStartPoint(void) const +Py::Object BezierCurvePy::getStartPoint() const { Handle(Geom_BezierCurve) c = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); @@ -374,7 +374,7 @@ Py::Object BezierCurvePy::getStartPoint(void) const return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); } -Py::Object BezierCurvePy::getEndPoint(void) const +Py::Object BezierCurvePy::getEndPoint() const { Handle(Geom_BezierCurve) c = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/BezierSurfacePyImp.cpp b/src/Mod/Part/App/BezierSurfacePyImp.cpp index b5d11db823..2ff67c75c6 100644 --- a/src/Mod/Part/App/BezierSurfacePyImp.cpp +++ b/src/Mod/Part/App/BezierSurfacePyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BezierSurfacePy::representation(void) const +std::string BezierSurfacePy::representation() const { return ""; } @@ -669,35 +669,35 @@ PyObject* BezierSurfacePy::exchangeUV(PyObject *args) } } -Py::Long BezierSurfacePy::getUDegree(void) const +Py::Long BezierSurfacePy::getUDegree() const { Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->UDegree()); } -Py::Long BezierSurfacePy::getVDegree(void) const +Py::Long BezierSurfacePy::getVDegree() const { Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->VDegree()); } -Py::Long BezierSurfacePy::getMaxDegree(void) const +Py::Long BezierSurfacePy::getMaxDegree() const { Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->MaxDegree()); } -Py::Long BezierSurfacePy::getNbUPoles(void) const +Py::Long BezierSurfacePy::getNbUPoles() const { Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUPoles()); } -Py::Long BezierSurfacePy::getNbVPoles(void) const +Py::Long BezierSurfacePy::getNbVPoles() const { Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/BodyBasePyImp.cpp b/src/Mod/Part/App/BodyBasePyImp.cpp index 00b3db4670..97c0fbdfcc 100644 --- a/src/Mod/Part/App/BodyBasePyImp.cpp +++ b/src/Mod/Part/App/BodyBasePyImp.cpp @@ -31,7 +31,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BodyBasePy::representation(void) const +std::string BodyBasePy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/BoundedCurvePyImp.cpp b/src/Mod/Part/App/BoundedCurvePyImp.cpp index cfd4ddead4..f6e8adff2a 100644 --- a/src/Mod/Part/App/BoundedCurvePyImp.cpp +++ b/src/Mod/Part/App/BoundedCurvePyImp.cpp @@ -34,7 +34,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BoundedCurvePy::representation(void) const +std::string BoundedCurvePy::representation() const { return ""; } @@ -53,12 +53,12 @@ int BoundedCurvePy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) return 0; } -Py::Object BoundedCurvePy::getStartPoint(void) const +Py::Object BoundedCurvePy::getStartPoint() const { return Py::Vector(getGeomBoundedCurvePtr()->getStartPoint()); } -Py::Object BoundedCurvePy::getEndPoint(void) const +Py::Object BoundedCurvePy::getEndPoint() const { return Py::Vector(getGeomBoundedCurvePtr()->getEndPoint()); } diff --git a/src/Mod/Part/App/CirclePyImp.cpp b/src/Mod/Part/App/CirclePyImp.cpp index 878b1c4df9..462e148028 100644 --- a/src/Mod/Part/App/CirclePyImp.cpp +++ b/src/Mod/Part/App/CirclePyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string CirclePy::representation(void) const +std::string CirclePy::representation() const { Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); gp_Ax1 axis = circle->Axis(); @@ -161,7 +161,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float CirclePy::getRadius(void) const +Py::Float CirclePy::getRadius() const { Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); return Py::Float(circle->Radius()); diff --git a/src/Mod/Part/App/ConePyImp.cpp b/src/Mod/Part/App/ConePyImp.cpp index b2f35de625..c9ed212f85 100644 --- a/src/Mod/Part/App/ConePyImp.cpp +++ b/src/Mod/Part/App/ConePyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ConePy::representation(void) const +std::string ConePy::representation() const { return ""; } @@ -143,7 +143,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Object ConePy::getApex(void) const +Py::Object ConePy::getApex() const { Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast (getGeomConePtr()->handle()); @@ -151,7 +151,7 @@ Py::Object ConePy::getApex(void) const return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } -Py::Float ConePy::getRadius(void) const +Py::Float ConePy::getRadius() const { Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast (getGeomConePtr()->handle()); @@ -165,7 +165,7 @@ void ConePy::setRadius(Py::Float arg) s->SetRadius((double)arg); } -Py::Float ConePy::getSemiAngle(void) const +Py::Float ConePy::getSemiAngle() const { Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast (getGeomConePtr()->handle()); @@ -179,7 +179,7 @@ void ConePy::setSemiAngle(Py::Float arg) s->SetSemiAngle((double)arg); } -Py::Object ConePy::getCenter(void) const +Py::Object ConePy::getCenter() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeomConePtr()->handle()); @@ -209,7 +209,7 @@ void ConePy::setCenter(Py::Object arg) } } -Py::Object ConePy::getAxis(void) const +Py::Object ConePy::getAxis() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/ConicPyImp.cpp b/src/Mod/Part/App/ConicPyImp.cpp index b8fbae5609..06d5d4456d 100644 --- a/src/Mod/Part/App/ConicPyImp.cpp +++ b/src/Mod/Part/App/ConicPyImp.cpp @@ -36,7 +36,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string ConicPy::representation(void) const +std::string ConicPy::representation() const { return ""; } @@ -55,14 +55,14 @@ int ConicPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) return 0; } -Py::Object ConicPy::getCenter(void) const +Py::Object ConicPy::getCenter() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Pnt loc = conic->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } -Py::Object ConicPy::getLocation(void) const +Py::Object ConicPy::getLocation() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Pnt loc = conic->Location(); @@ -103,13 +103,13 @@ void ConicPy::setLocation(Py::Object arg) } } -Py::Float ConicPy::getEccentricity(void) const +Py::Float ConicPy::getEccentricity() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); return Py::Float(conic->Eccentricity()); } -Py::Float ConicPy::getAngleXU(void) const +Py::Float ConicPy::getAngleXU() const { return Py::Float(getGeomConicPtr()->getAngleXU()); } @@ -119,7 +119,7 @@ void ConicPy::setAngleXU(Py::Float arg) getGeomConicPtr()->setAngleXU((double)arg); } -Py::Object ConicPy::getAxis(void) const +Py::Object ConicPy::getAxis() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->Axis(); @@ -155,7 +155,7 @@ void ConicPy::setAxis(Py::Object arg) } } -Py::Object ConicPy::getXAxis(void) const +Py::Object ConicPy::getXAxis() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->XAxis(); @@ -191,7 +191,7 @@ void ConicPy::setXAxis(Py::Object arg) } } -Py::Object ConicPy::getYAxis(void) const +Py::Object ConicPy::getYAxis() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->YAxis(); diff --git a/src/Mod/Part/App/CustomFeature.cpp b/src/Mod/Part/App/CustomFeature.cpp index ed0f29b21f..fb79a4a20b 100644 --- a/src/Mod/Part/App/CustomFeature.cpp +++ b/src/Mod/Part/App/CustomFeature.cpp @@ -31,7 +31,7 @@ using namespace Part; PROPERTY_SOURCE(Part::CustomFeature, Part::Feature) -CustomFeature::CustomFeature(void) +CustomFeature::CustomFeature() { } @@ -39,12 +39,12 @@ CustomFeature::~CustomFeature() { } -short CustomFeature::mustExecute(void) const +short CustomFeature::mustExecute() const { return Part::Feature::mustExecute(); } -App::DocumentObjectExecReturn *CustomFeature::execute(void) +App::DocumentObjectExecReturn *CustomFeature::execute() { return App::DocumentObject::StdReturn; } @@ -54,7 +54,7 @@ App::DocumentObjectExecReturn *CustomFeature::execute(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Part::CustomFeaturePython, Part::CustomFeature) -template<> const char* Part::CustomFeaturePython::getViewProviderName(void) const { +template<> const char* Part::CustomFeaturePython::getViewProviderName() const { return "PartGui::ViewProviderCustomPython"; } /// @endcond diff --git a/src/Mod/Part/App/CustomFeature.h b/src/Mod/Part/App/CustomFeature.h index 09f2538a4d..6e26bb8a0a 100644 --- a/src/Mod/Part/App/CustomFeature.h +++ b/src/Mod/Part/App/CustomFeature.h @@ -38,18 +38,18 @@ class PartExport CustomFeature : public Part::Feature public: /// Constructor - CustomFeature(void); + CustomFeature(); virtual ~CustomFeature(); /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(void); - virtual short mustExecute(void) const; + virtual App::DocumentObjectExecReturn *execute(); + virtual short mustExecute() const; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PartGui::ViewProviderCustom"; } }; diff --git a/src/Mod/Part/App/CylinderPyImp.cpp b/src/Mod/Part/App/CylinderPyImp.cpp index 7881dda880..75559ce6a6 100644 --- a/src/Mod/Part/App/CylinderPyImp.cpp +++ b/src/Mod/Part/App/CylinderPyImp.cpp @@ -42,7 +42,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string CylinderPy::representation(void) const +std::string CylinderPy::representation() const { return ""; } @@ -150,7 +150,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float CylinderPy::getRadius(void) const +Py::Float CylinderPy::getRadius() const { Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); @@ -164,7 +164,7 @@ void CylinderPy::setRadius(Py::Float arg) cyl->SetRadius((double)arg); } -Py::Object CylinderPy::getCenter(void) const +Py::Object CylinderPy::getCenter() const { Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); @@ -194,7 +194,7 @@ void CylinderPy::setCenter(Py::Object arg) } } -Py::Object CylinderPy::getAxis(void) const +Py::Object CylinderPy::getAxis() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/DatumFeature.cpp b/src/Mod/Part/App/DatumFeature.cpp index 3ddce9dafb..8cabfb5d5a 100644 --- a/src/Mod/Part/App/DatumFeature.cpp +++ b/src/Mod/Part/App/DatumFeature.cpp @@ -33,7 +33,7 @@ using namespace Attacher; PROPERTY_SOURCE_ABSTRACT_WITH_EXTENSIONS(Part::Datum, Part::Feature) -Datum::Datum(void) +Datum::Datum() { AttachExtension::initExtension(this); touch(); diff --git a/src/Mod/Part/App/EllipsePyImp.cpp b/src/Mod/Part/App/EllipsePyImp.cpp index 91d55e8e06..3630a8defd 100644 --- a/src/Mod/Part/App/EllipsePyImp.cpp +++ b/src/Mod/Part/App/EllipsePyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string EllipsePy::representation(void) const +std::string EllipsePy::representation() const { return ""; } @@ -125,7 +125,7 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float EllipsePy::getMajorRadius(void) const +Py::Float EllipsePy::getMajorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->MajorRadius()); @@ -137,7 +137,7 @@ void EllipsePy::setMajorRadius(Py::Float arg) ellipse->SetMajorRadius((double)arg); } -Py::Float EllipsePy::getMinorRadius(void) const +Py::Float EllipsePy::getMinorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->MinorRadius()); @@ -149,20 +149,20 @@ void EllipsePy::setMinorRadius(Py::Float arg) ellipse->SetMinorRadius((double)arg); } -Py::Float EllipsePy::getFocal(void) const +Py::Float EllipsePy::getFocal() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->Focal()); } -Py::Object EllipsePy::getFocus1(void) const +Py::Object EllipsePy::getFocus1() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); gp_Pnt loc = ellipse->Focus1(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } -Py::Object EllipsePy::getFocus2(void) const +Py::Object EllipsePy::getFocus2() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); gp_Pnt loc = ellipse->Focus2(); diff --git a/src/Mod/Part/App/FeatureChamfer.h b/src/Mod/Part/App/FeatureChamfer.h index 9af5ee50a2..2b548f2f71 100644 --- a/src/Mod/Part/App/FeatureChamfer.h +++ b/src/Mod/Part/App/FeatureChamfer.h @@ -39,9 +39,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderChamfer"; } //@} diff --git a/src/Mod/Part/App/FeatureCompound.cpp b/src/Mod/Part/App/FeatureCompound.cpp index 8d8a9aeeb9..1e28fb3104 100644 --- a/src/Mod/Part/App/FeatureCompound.cpp +++ b/src/Mod/Part/App/FeatureCompound.cpp @@ -53,7 +53,7 @@ short Compound::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Compound::execute(void) +App::DocumentObjectExecReturn *Compound::execute() { try { std::vector history; diff --git a/src/Mod/Part/App/FeatureCompound.h b/src/Mod/Part/App/FeatureCompound.h index 86c47e47bd..c6774b4c7e 100644 --- a/src/Mod/Part/App/FeatureCompound.h +++ b/src/Mod/Part/App/FeatureCompound.h @@ -44,9 +44,9 @@ public: //@{ short mustExecute() const; /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderCompound"; } //@} diff --git a/src/Mod/Part/App/FeatureExtrusion.cpp b/src/Mod/Part/App/FeatureExtrusion.cpp index ed7549b13c..8f04a2cb92 100644 --- a/src/Mod/Part/App/FeatureExtrusion.cpp +++ b/src/Mod/Part/App/FeatureExtrusion.cpp @@ -311,7 +311,7 @@ TopoShape Extrusion::extrudeShape(const TopoShape& source, const Extrusion::Extr return TopoShape(result); } -App::DocumentObjectExecReturn* Extrusion::execute(void) +App::DocumentObjectExecReturn* Extrusion::execute() { App::DocumentObject* link = Base.getValue(); if (!link) diff --git a/src/Mod/Part/App/FeatureFace.cpp b/src/Mod/Part/App/FeatureFace.cpp index c1ab98f76b..4b6cb26c20 100644 --- a/src/Mod/Part/App/FeatureFace.cpp +++ b/src/Mod/Part/App/FeatureFace.cpp @@ -57,7 +57,7 @@ void Face::setupObject() Feature::setupObject(); } -App::DocumentObjectExecReturn *Face::execute(void) +App::DocumentObjectExecReturn *Face::execute() { std::vector links = Sources.getValues(); if (links.empty()) diff --git a/src/Mod/Part/App/FeatureFace.h b/src/Mod/Part/App/FeatureFace.h index 912ad2a554..b0f3d2eb26 100644 --- a/src/Mod/Part/App/FeatureFace.h +++ b/src/Mod/Part/App/FeatureFace.h @@ -42,10 +42,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartGui::ViewProviderFace"; } void setupObject() override; diff --git a/src/Mod/Part/App/FeatureFillet.cpp b/src/Mod/Part/App/FeatureFillet.cpp index 17ea046085..3365962369 100644 --- a/src/Mod/Part/App/FeatureFillet.cpp +++ b/src/Mod/Part/App/FeatureFillet.cpp @@ -44,7 +44,7 @@ Fillet::Fillet() { } -App::DocumentObjectExecReturn *Fillet::execute(void) +App::DocumentObjectExecReturn *Fillet::execute() { App::DocumentObject* link = Base.getValue(); if (!link) diff --git a/src/Mod/Part/App/FeatureFillet.h b/src/Mod/Part/App/FeatureFillet.h index 86a07eebb0..75b3afb03b 100644 --- a/src/Mod/Part/App/FeatureFillet.h +++ b/src/Mod/Part/App/FeatureFillet.h @@ -39,9 +39,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderFillet"; } //@} diff --git a/src/Mod/Part/App/FeatureGeometrySet.cpp b/src/Mod/Part/App/FeatureGeometrySet.cpp index 2a2c0e1081..759c5df839 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.cpp +++ b/src/Mod/Part/App/FeatureGeometrySet.cpp @@ -37,7 +37,7 @@ FeatureGeometrySet::FeatureGeometrySet() } -App::DocumentObjectExecReturn *FeatureGeometrySet::execute(void) +App::DocumentObjectExecReturn *FeatureGeometrySet::execute() { TopoShape result; diff --git a/src/Mod/Part/App/FeatureMirroring.cpp b/src/Mod/Part/App/FeatureMirroring.cpp index 4057881fe9..3449410dfc 100644 --- a/src/Mod/Part/App/FeatureMirroring.cpp +++ b/src/Mod/Part/App/FeatureMirroring.cpp @@ -90,7 +90,7 @@ void Mirroring::handleChangedPropertyType(Base::XMLReader &reader, const char *T } } -App::DocumentObjectExecReturn *Mirroring::execute(void) +App::DocumentObjectExecReturn *Mirroring::execute() { App::DocumentObject* link = Source.getValue(); if (!link) diff --git a/src/Mod/Part/App/FeatureMirroring.h b/src/Mod/Part/App/FeatureMirroring.h index 6dcdb836b5..1951a70213 100644 --- a/src/Mod/Part/App/FeatureMirroring.h +++ b/src/Mod/Part/App/FeatureMirroring.h @@ -45,10 +45,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderMirror"; } //@} diff --git a/src/Mod/Part/App/FeatureOffset.h b/src/Mod/Part/App/FeatureOffset.h index a46b55a1ab..9db788df88 100644 --- a/src/Mod/Part/App/FeatureOffset.h +++ b/src/Mod/Part/App/FeatureOffset.h @@ -50,9 +50,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual short mustExecute() const override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "PartGui::ViewProviderOffset"; } //@} @@ -72,9 +72,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual short mustExecute() const override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "PartGui::ViewProviderOffset2D"; } //@} diff --git a/src/Mod/Part/App/FeaturePartBoolean.cpp b/src/Mod/Part/App/FeaturePartBoolean.cpp index 91c6e2e519..4cf3d561f3 100644 --- a/src/Mod/Part/App/FeaturePartBoolean.cpp +++ b/src/Mod/Part/App/FeaturePartBoolean.cpp @@ -41,7 +41,7 @@ using namespace Part; PROPERTY_SOURCE_ABSTRACT(Part::Boolean, Part::Feature) -Boolean::Boolean(void) +Boolean::Boolean() { ADD_PROPERTY(Base,(nullptr)); ADD_PROPERTY(Tool,(nullptr)); @@ -68,7 +68,7 @@ short Boolean::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Boolean::execute(void) +App::DocumentObjectExecReturn *Boolean::execute() { try { #if defined(__GNUC__) && defined (FC_OS_LINUX) diff --git a/src/Mod/Part/App/FeaturePartBoolean.h b/src/Mod/Part/App/FeaturePartBoolean.h index 72ec174178..d03b4f1d5c 100644 --- a/src/Mod/Part/App/FeaturePartBoolean.h +++ b/src/Mod/Part/App/FeaturePartBoolean.h @@ -47,12 +47,12 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderBoolean"; } diff --git a/src/Mod/Part/App/FeaturePartBox.cpp b/src/Mod/Part/App/FeaturePartBox.cpp index eba2e89c0f..69b86d16e0 100644 --- a/src/Mod/Part/App/FeaturePartBox.cpp +++ b/src/Mod/Part/App/FeaturePartBox.cpp @@ -52,7 +52,7 @@ short Box::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Box::execute(void) +App::DocumentObjectExecReturn *Box::execute() { double L = Length.getValue(); double W = Width.getValue(); diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h index f3cea7d1c3..0f7ac58c79 100644 --- a/src/Mod/Part/App/FeaturePartBox.h +++ b/src/Mod/Part/App/FeaturePartBox.h @@ -44,10 +44,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderBox"; } protected: diff --git a/src/Mod/Part/App/FeaturePartCircle.h b/src/Mod/Part/App/FeaturePartCircle.h index d1a86403a6..a383a79f83 100644 --- a/src/Mod/Part/App/FeaturePartCircle.h +++ b/src/Mod/Part/App/FeaturePartCircle.h @@ -45,11 +45,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; void onChanged(const App::Property*); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderCircleParametric"; } diff --git a/src/Mod/Part/App/FeaturePartCommon.cpp b/src/Mod/Part/App/FeaturePartCommon.cpp index 94fa3b443f..d849d5009b 100644 --- a/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/src/Mod/Part/App/FeaturePartCommon.cpp @@ -42,7 +42,7 @@ using namespace Part; PROPERTY_SOURCE(Part::Common, Part::Boolean) -Common::Common(void) +Common::Common() { } @@ -57,7 +57,7 @@ BRepAlgoAPI_BooleanOperation* Common::makeOperation(const TopoDS_Shape& base, co PROPERTY_SOURCE(Part::MultiCommon, Part::Feature) -MultiCommon::MultiCommon(void) +MultiCommon::MultiCommon() { ADD_PROPERTY(Shapes,(nullptr)); Shapes.setSize(0); @@ -80,7 +80,7 @@ short MultiCommon::mustExecute() const return 0; } -App::DocumentObjectExecReturn *MultiCommon::execute(void) +App::DocumentObjectExecReturn *MultiCommon::execute() { std::vector s; std::vector obj = Shapes.getValues(); diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h index 8bf4b3685e..6e73664935 100644 --- a/src/Mod/Part/App/FeaturePartCommon.h +++ b/src/Mod/Part/App/FeaturePartCommon.h @@ -58,11 +58,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderMultiCommon"; } diff --git a/src/Mod/Part/App/FeaturePartCurveNet.cpp b/src/Mod/Part/App/FeaturePartCurveNet.cpp index 39dfcf6958..aafcf457ae 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.cpp +++ b/src/Mod/Part/App/FeaturePartCurveNet.cpp @@ -43,7 +43,7 @@ short CurveNet::mustExecute() const return 0; } -App::DocumentObjectExecReturn *CurveNet::execute(void) +App::DocumentObjectExecReturn *CurveNet::execute() { Base::FileInfo fi(FileName.getValue()); if (!fi.isReadable()) { diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index 34f8d6c1e6..7d1036f5bc 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.h +++ b/src/Mod/Part/App/FeaturePartCurveNet.h @@ -41,10 +41,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderCurveNet"; } //@} diff --git a/src/Mod/Part/App/FeaturePartCut.cpp b/src/Mod/Part/App/FeaturePartCut.cpp index 41e517dafa..d603618c83 100644 --- a/src/Mod/Part/App/FeaturePartCut.cpp +++ b/src/Mod/Part/App/FeaturePartCut.cpp @@ -33,7 +33,7 @@ using namespace Part; PROPERTY_SOURCE(Part::Cut, Part::Boolean) -Cut::Cut(void) +Cut::Cut() { } diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp index f11ec9ad58..d72d08ddf8 100644 --- a/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/src/Mod/Part/App/FeaturePartFuse.cpp @@ -42,7 +42,7 @@ using namespace Part; PROPERTY_SOURCE(Part::Fuse, Part::Boolean) -Fuse::Fuse(void) +Fuse::Fuse() { } @@ -57,7 +57,7 @@ BRepAlgoAPI_BooleanOperation* Fuse::makeOperation(const TopoDS_Shape& base, cons PROPERTY_SOURCE(Part::MultiFuse, Part::Feature) -MultiFuse::MultiFuse(void) +MultiFuse::MultiFuse() { ADD_PROPERTY(Shapes,(nullptr)); Shapes.setSize(0); @@ -81,7 +81,7 @@ short MultiFuse::mustExecute() const return 0; } -App::DocumentObjectExecReturn *MultiFuse::execute(void) +App::DocumentObjectExecReturn *MultiFuse::execute() { std::vector s; std::vector obj = Shapes.getValues(); diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h index 5525374e33..0b764464cd 100644 --- a/src/Mod/Part/App/FeaturePartFuse.h +++ b/src/Mod/Part/App/FeaturePartFuse.h @@ -58,11 +58,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderMultiFuse"; } diff --git a/src/Mod/Part/App/FeaturePartImportBrep.cpp b/src/Mod/Part/App/FeaturePartImportBrep.cpp index be6cec3487..81c09ef1c2 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.cpp +++ b/src/Mod/Part/App/FeaturePartImportBrep.cpp @@ -36,7 +36,7 @@ using namespace Part; PROPERTY_SOURCE(Part::ImportBrep, Part::Feature) -ImportBrep::ImportBrep(void) +ImportBrep::ImportBrep() { ADD_PROPERTY(FileName,("")); } @@ -48,7 +48,7 @@ short ImportBrep::mustExecute() const return 0; } -App::DocumentObjectExecReturn *ImportBrep::execute(void) +App::DocumentObjectExecReturn *ImportBrep::execute() { Base::FileInfo fi(FileName.getValue()); if (!fi.isReadable()) { diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index dfd2fdea39..bad67b669e 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.h +++ b/src/Mod/Part/App/FeaturePartImportBrep.h @@ -41,10 +41,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartImportIges.cpp b/src/Mod/Part/App/FeaturePartImportIges.cpp index 837e9275ea..cc28d598a8 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.cpp +++ b/src/Mod/Part/App/FeaturePartImportIges.cpp @@ -36,7 +36,7 @@ using namespace Part; PROPERTY_SOURCE(Part::ImportIges, Part::Feature) -ImportIges::ImportIges(void) +ImportIges::ImportIges() { ADD_PROPERTY(FileName,("")); } @@ -48,7 +48,7 @@ short ImportIges::mustExecute() const return 0; } -App::DocumentObjectExecReturn *ImportIges::execute(void) +App::DocumentObjectExecReturn *ImportIges::execute() { Base::FileInfo fi(FileName.getValue()); if (!fi.isReadable()) { diff --git a/src/Mod/Part/App/FeaturePartImportStep.cpp b/src/Mod/Part/App/FeaturePartImportStep.cpp index 201980521a..435722b7cd 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.cpp +++ b/src/Mod/Part/App/FeaturePartImportStep.cpp @@ -36,7 +36,7 @@ using namespace Part; PROPERTY_SOURCE(Part::ImportStep, Part::Feature) -ImportStep::ImportStep(void) +ImportStep::ImportStep() { ADD_PROPERTY(FileName,("")); } @@ -48,7 +48,7 @@ short ImportStep::mustExecute() const return 0; } -App::DocumentObjectExecReturn *ImportStep::execute(void) +App::DocumentObjectExecReturn *ImportStep::execute() { Base::FileInfo fi(FileName.getValue()); if (!fi.isReadable()) { diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index 1327905ae9..caa45d342f 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.h +++ b/src/Mod/Part/App/FeaturePartImportStep.h @@ -43,10 +43,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartPolygon.cpp b/src/Mod/Part/App/FeaturePartPolygon.cpp index ccc4c83197..1c52c98ecd 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.cpp +++ b/src/Mod/Part/App/FeaturePartPolygon.cpp @@ -50,7 +50,7 @@ short Part::Polygon::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Part::Polygon::execute(void) +App::DocumentObjectExecReturn *Part::Polygon::execute() { BRepBuilderAPI_MakePolygon poly; const std::vector nodes = Nodes.getValues(); diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h index 64ce124558..db75b9d4c7 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.h +++ b/src/Mod/Part/App/FeaturePartPolygon.h @@ -45,7 +45,7 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} }; diff --git a/src/Mod/Part/App/FeaturePartSpline.h b/src/Mod/Part/App/FeaturePartSpline.h index 921dcd0317..27e7ea88f5 100644 --- a/src/Mod/Part/App/FeaturePartSpline.h +++ b/src/Mod/Part/App/FeaturePartSpline.h @@ -36,7 +36,7 @@ class PartExport Spline :public Part::Feature public: Spline(); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderSpline"; } }; diff --git a/src/Mod/Part/App/FeatureRevolution.cpp b/src/Mod/Part/App/FeatureRevolution.cpp index cbd552cb35..5667f263e7 100644 --- a/src/Mod/Part/App/FeatureRevolution.cpp +++ b/src/Mod/Part/App/FeatureRevolution.cpp @@ -121,7 +121,7 @@ bool Revolution::fetchAxisLink(const App::PropertyLinkSub &axisLink, return true; } -App::DocumentObjectExecReturn *Revolution::execute(void) +App::DocumentObjectExecReturn *Revolution::execute() { App::DocumentObject* link = Source.getValue(); if (!link) diff --git a/src/Mod/Part/App/FeatureRevolution.h b/src/Mod/Part/App/FeatureRevolution.h index cf8dc28d00..0ec697bc90 100644 --- a/src/Mod/Part/App/FeatureRevolution.h +++ b/src/Mod/Part/App/FeatureRevolution.h @@ -51,13 +51,13 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; void onChanged(const App::Property* prop) override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override{ + const char* getViewProviderName() const override{ return "PartGui::ViewProviderRevolution"; } //@} diff --git a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp index 25ef756a10..37cf28cf92 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfCircle2dPy::representation(void) const +std::string ArcOfCircle2dPy::representation() const { return ""; } @@ -108,7 +108,7 @@ int ArcOfCircle2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfCircle2dPy::getRadius(void) const +Py::Float ArcOfCircle2dPy::getRadius() const { return Py::Float(getGeom2dArcOfCirclePtr()->getRadius()); } @@ -118,7 +118,7 @@ void ArcOfCircle2dPy::setRadius(Py::Float arg) getGeom2dArcOfCirclePtr()->setRadius((double)arg); } -Py::Object ArcOfCircle2dPy::getCircle(void) const +Py::Object ArcOfCircle2dPy::getCircle() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(curve->BasisCurve()); diff --git a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp index 0ad55faadb..20be65c3ec 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp @@ -36,7 +36,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string ArcOfConic2dPy::representation(void) const +std::string ArcOfConic2dPy::representation() const { return ""; } @@ -55,7 +55,7 @@ int ArcOfConic2dPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) return -1; } -Py::Object ArcOfConic2dPy::getLocation(void) const +Py::Object ArcOfConic2dPy::getLocation() const { Base::Vector2d loc = getGeom2dArcOfConicPtr()->getLocation(); return Base::Vector2dPy::create(loc); @@ -67,14 +67,14 @@ void ArcOfConic2dPy::setLocation(Py::Object arg) getGeom2dArcOfConicPtr()->setLocation(loc); } -Py::Float ArcOfConic2dPy::getEccentricity(void) const +Py::Float ArcOfConic2dPy::getEccentricity() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); return Py::Float(conic->Eccentricity()); } -Py::Object ArcOfConic2dPy::getXAxis(void) const +Py::Object ArcOfConic2dPy::getXAxis() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); @@ -92,7 +92,7 @@ void ArcOfConic2dPy::setXAxis(Py::Object arg) conic->SetXAxis(xaxis); } -Py::Object ArcOfConic2dPy::getYAxis(void) const +Py::Object ArcOfConic2dPy::getYAxis() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); diff --git a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp index 5a0ecbe6ab..1cccf0b23f 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfEllipse2dPy::representation(void) const +std::string ArcOfEllipse2dPy::representation() const { return ""; } @@ -86,7 +86,7 @@ int ArcOfEllipse2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfEllipse2dPy::getMajorRadius(void) const +Py::Float ArcOfEllipse2dPy::getMajorRadius() const { return Py::Float(getGeom2dArcOfEllipsePtr()->getMajorRadius()); } @@ -96,7 +96,7 @@ void ArcOfEllipse2dPy::setMajorRadius(Py::Float arg) getGeom2dArcOfEllipsePtr()->setMajorRadius((double)arg); } -Py::Float ArcOfEllipse2dPy::getMinorRadius(void) const +Py::Float ArcOfEllipse2dPy::getMinorRadius() const { return Py::Float(getGeom2dArcOfEllipsePtr()->getMinorRadius()); } @@ -106,7 +106,7 @@ void ArcOfEllipse2dPy::setMinorRadius(Py::Float arg) getGeom2dArcOfEllipsePtr()->setMinorRadius((double)arg); } -Py::Object ArcOfEllipse2dPy::getEllipse(void) const +Py::Object ArcOfEllipse2dPy::getEllipse() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(curve->BasisCurve()); diff --git a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp index f7cc422bb4..c31836e611 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfParabola2dPy::representation(void) const +std::string ArcOfParabola2dPy::representation() const { return ""; } @@ -86,7 +86,7 @@ int ArcOfParabola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfParabola2dPy::getFocal(void) const +Py::Float ArcOfParabola2dPy::getFocal() const { return Py::Float(getGeom2dArcOfParabolaPtr()->getFocal()); } @@ -96,7 +96,7 @@ void ArcOfParabola2dPy::setFocal(Py::Float arg) getGeom2dArcOfParabolaPtr()->setFocal((double)arg); } -Py::Object ArcOfParabola2dPy::getParabola(void) const +Py::Object ArcOfParabola2dPy::getParabola() const { Handle(Geom2d_TrimmedCurve) trim = Handle(Geom2d_TrimmedCurve)::DownCast (getGeom2dArcOfParabolaPtr()->handle()); diff --git a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp index e1c843b911..f32ec4b3de 100644 --- a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp @@ -48,7 +48,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BSplineCurve2dPy::representation(void) const +std::string BSplineCurve2dPy::representation() const { return ""; } @@ -618,35 +618,35 @@ PyObject* BSplineCurve2dPy::getMultiplicities(PyObject * args) } } -Py::Long BSplineCurve2dPy::getDegree(void) const +Py::Long BSplineCurve2dPy::getDegree() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->Degree()); } -Py::Long BSplineCurve2dPy::getMaxDegree(void) const +Py::Long BSplineCurve2dPy::getMaxDegree() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->MaxDegree()); } -Py::Long BSplineCurve2dPy::getNbPoles(void) const +Py::Long BSplineCurve2dPy::getNbPoles() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbPoles()); } -Py::Long BSplineCurve2dPy::getNbKnots(void) const +Py::Long BSplineCurve2dPy::getNbKnots() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbKnots()); } -Py::Object BSplineCurve2dPy::getStartPoint(void) const +Py::Object BSplineCurve2dPy::getStartPoint() const { Handle(Geom2d_BSplineCurve) c = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); @@ -654,7 +654,7 @@ Py::Object BSplineCurve2dPy::getStartPoint(void) const return Base::Vector2dPy::create(pnt.X(), pnt.Y()); } -Py::Object BSplineCurve2dPy::getEndPoint(void) const +Py::Object BSplineCurve2dPy::getEndPoint() const { Handle(Geom2d_BSplineCurve) c = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); @@ -662,21 +662,21 @@ Py::Object BSplineCurve2dPy::getEndPoint(void) const return Base::Vector2dPy::create(pnt.X(), pnt.Y()); } -Py::Object BSplineCurve2dPy::getFirstUKnotIndex(void) const +Py::Object BSplineCurve2dPy::getFirstUKnotIndex() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->FirstUKnotIndex()); } -Py::Object BSplineCurve2dPy::getLastUKnotIndex(void) const +Py::Object BSplineCurve2dPy::getLastUKnotIndex() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->LastUKnotIndex()); } -Py::List BSplineCurve2dPy::getKnotSequence(void) const +Py::List BSplineCurve2dPy::getKnotSequence() const { Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); diff --git a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp index 17e5baeb94..a56306bf40 100644 --- a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BezierCurve2dPy::representation(void) const +std::string BezierCurve2dPy::representation() const { return ""; } @@ -337,28 +337,28 @@ PyObject* BezierCurve2dPy::getResolution(PyObject* args) return nullptr; } } -Py::Long BezierCurve2dPy::getDegree(void) const +Py::Long BezierCurve2dPy::getDegree() const { Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->Degree()); } -Py::Long BezierCurve2dPy::getMaxDegree(void) const +Py::Long BezierCurve2dPy::getMaxDegree() const { Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->MaxDegree()); } -Py::Long BezierCurve2dPy::getNbPoles(void) const +Py::Long BezierCurve2dPy::getNbPoles() const { Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbPoles()); } -Py::Object BezierCurve2dPy::getStartPoint(void) const +Py::Object BezierCurve2dPy::getStartPoint() const { Handle(Geom2d_BezierCurve) c = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); @@ -366,7 +366,7 @@ Py::Object BezierCurve2dPy::getStartPoint(void) const return Base::Vector2dPy::create(pnt.X(), pnt.Y()); } -Py::Object BezierCurve2dPy::getEndPoint(void) const +Py::Object BezierCurve2dPy::getEndPoint() const { Handle(Geom2d_BezierCurve) c = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); diff --git a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp index 25941ab3b4..c1ca37908f 100644 --- a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string Circle2dPy::representation(void) const +std::string Circle2dPy::representation() const { return ""; } @@ -161,7 +161,7 @@ PyObject* Circle2dPy::getCircleCenter(PyObject *args) return Py::new_reference_to(Base::Vector2dPy::create(cnt)); } -Py::Float Circle2dPy::getRadius(void) const +Py::Float Circle2dPy::getRadius() const { Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); return Py::Float(circle->Radius()); diff --git a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp index c8095c6e1a..7f070c5e5f 100644 --- a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp @@ -35,7 +35,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string Conic2dPy::representation(void) const +std::string Conic2dPy::representation() const { return ""; } @@ -54,7 +54,7 @@ int Conic2dPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) return 0; } -Py::Object Conic2dPy::getLocation(void) const +Py::Object Conic2dPy::getLocation() const { Base::Vector2d loc = getGeom2dConicPtr()->getLocation(); return Base::Vector2dPy::create(loc); @@ -66,13 +66,13 @@ void Conic2dPy::setLocation(Py::Object arg) getGeom2dConicPtr()->setLocation(loc); } -Py::Float Conic2dPy::getEccentricity(void) const +Py::Float Conic2dPy::getEccentricity() const { Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); return Py::Float(conic->Eccentricity()); } -Py::Object Conic2dPy::getXAxis(void) const +Py::Object Conic2dPy::getXAxis() const { Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Dir2d xdir = conic->XAxis().Direction(); @@ -88,7 +88,7 @@ void Conic2dPy::setXAxis(Py::Object arg) conic->SetXAxis(xaxis); } -Py::Object Conic2dPy::getYAxis(void) const +Py::Object Conic2dPy::getYAxis() const { Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Dir2d ydir = conic->YAxis().Direction(); diff --git a/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp index 8cee685f0f..79fe755056 100644 --- a/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp @@ -68,7 +68,7 @@ extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c); using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string Curve2dPy::representation(void) const +std::string Curve2dPy::representation() const { return ""; } @@ -719,7 +719,7 @@ PyObject* Curve2dPy::approximateBSpline(PyObject *args) } } -Py::String Curve2dPy::getContinuity(void) const +Py::String Curve2dPy::getContinuity() const { GeomAbs_Shape c = Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->Continuity(); @@ -753,25 +753,25 @@ Py::String Curve2dPy::getContinuity(void) const return Py::String(str); } -Py::Boolean Curve2dPy::getClosed(void) const +Py::Boolean Curve2dPy::getClosed() const { return Py::Boolean(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->IsClosed() ? true : false); } -Py::Boolean Curve2dPy::getPeriodic(void) const +Py::Boolean Curve2dPy::getPeriodic() const { return Py::Boolean(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->IsPeriodic() ? true : false); } -Py::Float Curve2dPy::getFirstParameter(void) const +Py::Float Curve2dPy::getFirstParameter() const { return Py::Float(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->FirstParameter()); } -Py::Float Curve2dPy::getLastParameter(void) const +Py::Float Curve2dPy::getLastParameter() const { return Py::Float(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->LastParameter()); diff --git a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp index e422927105..9fd42a96d7 100644 --- a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string Ellipse2dPy::representation(void) const +std::string Ellipse2dPy::representation() const { return ""; } @@ -125,7 +125,7 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float Ellipse2dPy::getMajorRadius(void) const +Py::Float Ellipse2dPy::getMajorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->MajorRadius()); @@ -137,7 +137,7 @@ void Ellipse2dPy::setMajorRadius(Py::Float arg) ellipse->SetMajorRadius((double)arg); } -Py::Float Ellipse2dPy::getMinorRadius(void) const +Py::Float Ellipse2dPy::getMinorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->MinorRadius()); @@ -149,20 +149,20 @@ void Ellipse2dPy::setMinorRadius(Py::Float arg) ellipse->SetMinorRadius((double)arg); } -Py::Float Ellipse2dPy::getFocal(void) const +Py::Float Ellipse2dPy::getFocal() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->Focal()); } -Py::Object Ellipse2dPy::getFocus1(void) const +Py::Object Ellipse2dPy::getFocus1() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); gp_Pnt2d loc = ellipse->Focus1(); return Base::Vector2dPy::create(loc.X(), loc.Y()); } -Py::Object Ellipse2dPy::getFocus2(void) const +Py::Object Ellipse2dPy::getFocus2() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); gp_Pnt2d loc = ellipse->Focus2(); diff --git a/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp index b5f9c360d3..e08976077c 100644 --- a/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string Geometry2dPy::representation(void) const +std::string Geometry2dPy::representation() const { return ""; } diff --git a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp index 5a0e5c8855..a65160d3d0 100644 --- a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string Hyperbola2dPy::representation(void) const +std::string Hyperbola2dPy::representation() const { return ""; } @@ -125,7 +125,7 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float Hyperbola2dPy::getMajorRadius(void) const +Py::Float Hyperbola2dPy::getMajorRadius() const { Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->MajorRadius()); @@ -137,7 +137,7 @@ void Hyperbola2dPy::setMajorRadius(Py::Float arg) hyperbola->SetMajorRadius((double)arg); } -Py::Float Hyperbola2dPy::getMinorRadius(void) const +Py::Float Hyperbola2dPy::getMinorRadius() const { Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->MinorRadius()); @@ -149,20 +149,20 @@ void Hyperbola2dPy::setMinorRadius(Py::Float arg) hyperbola->SetMinorRadius((double)arg); } -Py::Float Hyperbola2dPy::getFocal(void) const +Py::Float Hyperbola2dPy::getFocal() const { Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->Focal()); } -Py::Object Hyperbola2dPy::getFocus1(void) const +Py::Object Hyperbola2dPy::getFocus1() const { Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); gp_Pnt2d loc = hyperbola->Focus1(); return Base::Vector2dPy::create(loc.X(), loc.Y()); } -Py::Object Hyperbola2dPy::getFocus2(void) const +Py::Object Hyperbola2dPy::getFocus2() const { Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); gp_Pnt2d loc = hyperbola->Focus2(); diff --git a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp index 822dc8dd72..7ef16eb806 100644 --- a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string Line2dPy::representation(void) const +std::string Line2dPy::representation() const { return ""; } @@ -118,7 +118,7 @@ int Line2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Object Line2dPy::getLocation(void) const +Py::Object Line2dPy::getLocation() const { Handle(Geom2d_Line) this_curve = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); @@ -166,7 +166,7 @@ void Line2dPy::setLocation(Py::Object arg) } } -Py::Object Line2dPy::getDirection(void) const +Py::Object Line2dPy::getDirection() const { Handle(Geom2d_Line) this_curve = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); diff --git a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp index f7904f068c..ebf37a6d4f 100644 --- a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string Line2dSegmentPy::representation(void) const +std::string Line2dSegmentPy::representation() const { return ""; } @@ -192,7 +192,7 @@ PyObject* Line2dSegmentPy::setParameterRange(PyObject *args) Py_Return; } -Py::Object Line2dSegmentPy::getStartPoint(void) const +Py::Object Line2dSegmentPy::getStartPoint() const { Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); @@ -246,7 +246,7 @@ void Line2dSegmentPy::setStartPoint(Py::Object arg) } } -Py::Object Line2dSegmentPy::getEndPoint(void) const +Py::Object Line2dSegmentPy::getEndPoint() const { Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); diff --git a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp index 31333aebc7..c4f39e711a 100644 --- a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp @@ -33,7 +33,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string OffsetCurve2dPy::representation(void) const +std::string OffsetCurve2dPy::representation() const { return ""; } @@ -74,7 +74,7 @@ int OffsetCurve2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) } } -Py::Float OffsetCurve2dPy::getOffsetValue(void) const +Py::Float OffsetCurve2dPy::getOffsetValue() const { Handle(Geom2d_OffsetCurve) curve = Handle(Geom2d_OffsetCurve)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Offset()); @@ -86,7 +86,7 @@ void OffsetCurve2dPy::setOffsetValue(Py::Float arg) curve->SetOffsetValue((double)arg); } -Py::Object OffsetCurve2dPy::getBasisCurve(void) const +Py::Object OffsetCurve2dPy::getBasisCurve() const { Handle(Geom2d_OffsetCurve) curve = Handle(Geom2d_OffsetCurve)::DownCast(getGeometry2dPtr()->handle()); Handle(Geom2d_Curve) basis = curve->BasisCurve(); diff --git a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp index 353eb1bdbd..9c79d43a01 100644 --- a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp @@ -35,7 +35,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string Parabola2dPy::representation(void) const +std::string Parabola2dPy::representation() const { return ""; } @@ -59,7 +59,7 @@ int Parabola2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Float Parabola2dPy::getFocal(void) const +Py::Float Parabola2dPy::getFocal() const { Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Focal()); @@ -71,14 +71,14 @@ void Parabola2dPy::setFocal(Py::Float arg) curve->SetFocal((double)arg); } -Py::Object Parabola2dPy::getFocus(void) const +Py::Object Parabola2dPy::getFocus() const { Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); gp_Pnt2d loc = curve->Focus(); return Base::Vector2dPy::create(loc.X(), loc.Y()); } -Py::Float Parabola2dPy::getParameter(void) const +Py::Float Parabola2dPy::getParameter() const { Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Parameter()); diff --git a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp index 450a778554..aca3233ddb 100644 --- a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp +++ b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp @@ -116,7 +116,7 @@ int CurveConstraintPy::PyInit(PyObject* args, PyObject* kwds) } // returns a string which represents the object e.g. when printed in python -std::string CurveConstraintPy::representation(void) const +std::string CurveConstraintPy::representation() const { return std::string(""); } @@ -353,7 +353,7 @@ PyObject* CurveConstraintPy::projectedCurve(PyObject *args) } } -Py::Long CurveConstraintPy::getNbPoints(void) const +Py::Long CurveConstraintPy::getNbPoints() const { try { Standard_Integer v = getGeomPlate_CurveConstraintPtr()->NbPoints(); @@ -374,7 +374,7 @@ void CurveConstraintPy::setNbPoints(Py::Long arg) } } -Py::Float CurveConstraintPy::getFirstParameter(void) const +Py::Float CurveConstraintPy::getFirstParameter() const { try { Standard_Real v = getGeomPlate_CurveConstraintPtr()->FirstParameter(); @@ -385,7 +385,7 @@ Py::Float CurveConstraintPy::getFirstParameter(void) const } } -Py::Float CurveConstraintPy::getLastParameter(void) const +Py::Float CurveConstraintPy::getLastParameter() const { try { Standard_Real v = getGeomPlate_CurveConstraintPtr()->LastParameter(); @@ -396,7 +396,7 @@ Py::Float CurveConstraintPy::getLastParameter(void) const } } -Py::Float CurveConstraintPy::getLength(void) const +Py::Float CurveConstraintPy::getLength() const { try { Standard_Real v = getGeomPlate_CurveConstraintPtr()->Length(); diff --git a/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp b/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp index 73e9284a5f..89713c5717 100644 --- a/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp +++ b/src/Mod/Part/App/GeomPlate/PointConstraintPyImp.cpp @@ -68,7 +68,7 @@ int PointConstraintPy::PyInit(PyObject* args, PyObject* kwds) } // returns a string which represents the object e.g. when printed in python -std::string PointConstraintPy::representation(void) const +std::string PointConstraintPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index 160942006a..85237e21c8 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -197,7 +197,7 @@ Geometry::~Geometry() } // Persistence implementer -unsigned int Geometry::getMemSize (void) const +unsigned int Geometry::getMemSize () const { return 1; } @@ -406,7 +406,7 @@ void Geometry::copyNonTag(const Part::Geometry * src) } } -Geometry *Geometry::clone(void) const +Geometry *Geometry::clone() const { Geometry* cpy = this->copy(); cpy->tag = this->tag; @@ -498,7 +498,7 @@ void GeomPoint::setHandle(const Handle(Geom_CartesianPoint)& p) myPoint = Handle(Geom_CartesianPoint)::DownCast(p->Copy()); } -Geometry *GeomPoint::copy(void) const +Geometry *GeomPoint::copy() const { GeomPoint *newPoint = new GeomPoint(myPoint); newPoint->copyNonTag(this); @@ -510,7 +510,7 @@ TopoDS_Shape GeomPoint::toShape() const return BRepBuilderAPI_MakeVertex(myPoint->Pnt()); } -Base::Vector3d GeomPoint::getPoint(void)const +Base::Vector3d GeomPoint::getPoint()const { return Base::Vector3d(myPoint->X(),myPoint->Y(),myPoint->Z()); } @@ -521,7 +521,7 @@ void GeomPoint::setPoint(const Base::Vector3d& p) } // Persistence implementer -unsigned int GeomPoint::getMemSize (void) const +unsigned int GeomPoint::getMemSize () const { return sizeof(Geom_CartesianPoint); } @@ -558,7 +558,7 @@ void GeomPoint::Restore(Base::XMLReader &reader) setPoint(Base::Vector3d(X,Y,Z) ); } -PyObject *GeomPoint::getPyObject(void) +PyObject *GeomPoint::getPyObject() { return new PointPy(new GeomPoint(getPoint())); } @@ -883,7 +883,7 @@ double GeomCurve::length(double u, double v) const } } -void GeomCurve::reverse(void) +void GeomCurve::reverse() { Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); @@ -972,7 +972,7 @@ const Handle(Geom_Geometry)& GeomBezierCurve::handle() const return myCurve; } -Geometry *GeomBezierCurve::copy(void) const +Geometry *GeomBezierCurve::copy() const { GeomBezierCurve *newCurve = new GeomBezierCurve(myCurve); newCurve->copyNonTag(this); @@ -1008,7 +1008,7 @@ std::vector GeomBezierCurve::getWeights() const } // Persistence implementer -unsigned int GeomBezierCurve::getMemSize (void) const +unsigned int GeomBezierCurve::getMemSize () const { return sizeof(Geom_BezierCurve); } @@ -1085,7 +1085,7 @@ void GeomBezierCurve::Restore(Base::XMLReader& reader) } } -PyObject *GeomBezierCurve::getPyObject(void) +PyObject *GeomBezierCurve::getPyObject() { return new BezierCurvePy(static_cast(this->clone())); } @@ -1160,7 +1160,7 @@ const Handle(Geom_Geometry)& GeomBSplineCurve::handle() const return myCurve; } -Geometry *GeomBSplineCurve::copy(void) const +Geometry *GeomBSplineCurve::copy() const { try { GeomBSplineCurve *newCurve = new GeomBSplineCurve(myCurve); @@ -1616,7 +1616,7 @@ void GeomBSplineCurve::Trim(double u, double v) } // Persistence implementer -unsigned int GeomBSplineCurve::getMemSize (void) const +unsigned int GeomBSplineCurve::getMemSize () const { return sizeof(Geom_BSplineCurve); } @@ -1732,7 +1732,7 @@ void GeomBSplineCurve::Restore(Base::XMLReader& reader) } -PyObject *GeomBSplineCurve::getPyObject(void) +PyObject *GeomBSplineCurve::getPyObject() { return new BSplineCurvePy(static_cast(this->clone())); } @@ -1749,7 +1749,7 @@ GeomConic::~GeomConic() { } -Base::Vector3d GeomConic::getLocation(void) const +Base::Vector3d GeomConic::getLocation() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); @@ -1771,7 +1771,7 @@ void GeomConic::setLocation(const Base::Vector3d& Center) } } -Base::Vector3d GeomConic::getCenter(void) const +Base::Vector3d GeomConic::getCenter() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); @@ -1793,7 +1793,7 @@ void GeomConic::setCenter(const Base::Vector3d& Center) } } -Base::Vector3d GeomConic::getAxisDirection(void) const +Base::Vector3d GeomConic::getAxisDirection() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); @@ -1811,7 +1811,7 @@ Base::Vector3d GeomConic::getAxisDirection(void) const * system is reversed compared to the global X axis. This angle, in conjunction * with ellipse's axis, fully defines the orientation of the ellipse. */ -double GeomConic::getAngleXU(void) const +double GeomConic::getAngleXU() const { Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); @@ -1890,7 +1890,7 @@ const Handle(Geom_Geometry)& GeomTrimmedCurve::handle() const return myCurve; } -Geometry *GeomTrimmedCurve::copy(void) const +Geometry *GeomTrimmedCurve::copy() const { GeomTrimmedCurve *newCurve = new GeomTrimmedCurve(myCurve); newCurve->copyNonTag(this); @@ -1898,7 +1898,7 @@ Geometry *GeomTrimmedCurve::copy(void) const } // Persistence implementer -unsigned int GeomTrimmedCurve::getMemSize (void) const +unsigned int GeomTrimmedCurve::getMemSize () const { return sizeof(Geom_TrimmedCurve); } @@ -1913,7 +1913,7 @@ void GeomTrimmedCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomTrimmedCurve::Restore"); } -PyObject *GeomTrimmedCurve::getPyObject(void) +PyObject *GeomTrimmedCurve::getPyObject() { return new TrimmedCurvePy(static_cast(this->clone())); } @@ -2002,7 +2002,7 @@ Base::Vector3d GeomArcOfConic::getEndPoint(bool emulateCCWXY) const return Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z()); } -Base::Vector3d GeomArcOfConic::getCenter(void) const +Base::Vector3d GeomArcOfConic::getCenter() const { Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); @@ -2011,7 +2011,7 @@ Base::Vector3d GeomArcOfConic::getCenter(void) const return Base::Vector3d(loc.X(),loc.Y(),loc.Z()); } -Base::Vector3d GeomArcOfConic::getLocation(void) const +Base::Vector3d GeomArcOfConic::getLocation() const { Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); @@ -2050,7 +2050,7 @@ void GeomArcOfConic::setLocation(const Base::Vector3d& Center) } } -Base::Vector3d GeomArcOfConic::getAxisDirection(void) const +Base::Vector3d GeomArcOfConic::getAxisDirection() const { Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); @@ -2083,7 +2083,7 @@ bool GeomArcOfConic::isReversed() const * system is reversed compared to the global X axis. This angle, in conjunction * with ellipse's axis, fully defines the orientation of the ellipse. */ -double GeomArcOfConic::getAngleXU(void) const +double GeomArcOfConic::getAngleXU() const { Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); @@ -2194,7 +2194,7 @@ void GeomCircle::setHandle(const Handle(Geom_Circle)& c) myCurve = Handle(Geom_Circle)::DownCast(c->Copy()); } -Geometry *GeomCircle::copy(void) const +Geometry *GeomCircle::copy() const { GeomCircle *newCirc = new GeomCircle(myCurve); newCirc->copyNonTag(this); @@ -2248,7 +2248,7 @@ GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const return new GeomBSplineCurve(spline); } -double GeomCircle::getRadius(void) const +double GeomCircle::getRadius() const { Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(handle()); return circle->Radius(); @@ -2270,7 +2270,7 @@ void GeomCircle::setRadius(double Radius) } // Persistence implementer -unsigned int GeomCircle::getMemSize (void) const +unsigned int GeomCircle::getMemSize () const { return sizeof(Geom_Circle); } @@ -2342,7 +2342,7 @@ void GeomCircle::Restore(Base::XMLReader& reader) } } -PyObject *GeomCircle::getPyObject(void) +PyObject *GeomCircle::getPyObject() { return new CirclePy(static_cast(this->clone())); } @@ -2385,7 +2385,7 @@ const Handle(Geom_Geometry)& GeomArcOfCircle::handle() const return myCurve; } -Geometry *GeomArcOfCircle::copy(void) const +Geometry *GeomArcOfCircle::copy() const { GeomArcOfCircle* copy = new GeomArcOfCircle(); copy->setHandle(this->myCurve); @@ -2400,7 +2400,7 @@ GeomBSplineCurve* GeomArcOfCircle::toNurbs(double first, double last) const return GeomCircle(circle).toNurbs(first, last); } -double GeomArcOfCircle::getRadius(void) const +double GeomArcOfCircle::getRadius() const { Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(myCurve->BasisCurve()); return circle->Radius(); @@ -2495,7 +2495,7 @@ void GeomArcOfCircle::setRange(double u, double v, bool emulateCCWXY) } // Persistence implementer -unsigned int GeomArcOfCircle::getMemSize (void) const +unsigned int GeomArcOfCircle::getMemSize () const { return sizeof(Geom_Circle) + 2 *sizeof(double); } @@ -2581,7 +2581,7 @@ void GeomArcOfCircle::Restore(Base::XMLReader &reader) } } -PyObject *GeomArcOfCircle::getPyObject(void) +PyObject *GeomArcOfCircle::getPyObject() { return new ArcOfCirclePy(static_cast(this->clone())); } @@ -2615,7 +2615,7 @@ void GeomEllipse::setHandle(const Handle(Geom_Ellipse) &e) this->myCurve = Handle(Geom_Ellipse)::DownCast(e->Copy()); } -Geometry *GeomEllipse::copy(void) const +Geometry *GeomEllipse::copy() const { GeomEllipse *newEllipse = new GeomEllipse(myCurve); newEllipse->copyNonTag(this); @@ -2670,7 +2670,7 @@ GeomBSplineCurve* GeomEllipse::toNurbs(double first, double last) const return new GeomBSplineCurve(spline); } -double GeomEllipse::getMajorRadius(void) const +double GeomEllipse::getMajorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); return ellipse->MajorRadius(); @@ -2689,7 +2689,7 @@ void GeomEllipse::setMajorRadius(double Radius) } } -double GeomEllipse::getMinorRadius(void) const +double GeomEllipse::getMinorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); return ellipse->MinorRadius(); @@ -2754,7 +2754,7 @@ void GeomEllipse::setMajorAxisDir(Base::Vector3d newdir) } // Persistence implementer -unsigned int GeomEllipse::getMemSize (void) const +unsigned int GeomEllipse::getMemSize () const { return sizeof(Geom_Ellipse); } @@ -2835,7 +2835,7 @@ void GeomEllipse::Restore(Base::XMLReader& reader) } } -PyObject *GeomEllipse::getPyObject(void) +PyObject *GeomEllipse::getPyObject() { return new EllipsePy(static_cast(this->clone())); } @@ -2877,7 +2877,7 @@ const Handle(Geom_Geometry)& GeomArcOfEllipse::handle() const return myCurve; } -Geometry *GeomArcOfEllipse::copy(void) const +Geometry *GeomArcOfEllipse::copy() const { GeomArcOfEllipse* copy = new GeomArcOfEllipse(); copy->setHandle(this->myCurve); @@ -2892,7 +2892,7 @@ GeomBSplineCurve* GeomArcOfEllipse::toNurbs(double first, double last) const return GeomEllipse(ellipse).toNurbs(first, last); } -double GeomArcOfEllipse::getMajorRadius(void) const +double GeomArcOfEllipse::getMajorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MajorRadius(); @@ -2911,7 +2911,7 @@ void GeomArcOfEllipse::setMajorRadius(double Radius) } } -double GeomArcOfEllipse::getMinorRadius(void) const +double GeomArcOfEllipse::getMinorRadius() const { Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MinorRadius(); @@ -3016,7 +3016,7 @@ void GeomArcOfEllipse::setRange(double u, double v, bool emulateCCWXY) } // Persistence implementer -unsigned int GeomArcOfEllipse::getMemSize (void) const +unsigned int GeomArcOfEllipse::getMemSize () const { return sizeof(Geom_Ellipse) + 2 *sizeof(double); } @@ -3108,7 +3108,7 @@ void GeomArcOfEllipse::Restore(Base::XMLReader &reader) } } -PyObject *GeomArcOfEllipse::getPyObject(void) +PyObject *GeomArcOfEllipse::getPyObject() { return new ArcOfEllipsePy(static_cast(this->clone())); } @@ -3143,7 +3143,7 @@ void GeomHyperbola::setHandle(const Handle(Geom_Hyperbola)& c) myCurve = Handle(Geom_Hyperbola)::DownCast(c->Copy()); } -Geometry *GeomHyperbola::copy(void) const +Geometry *GeomHyperbola::copy() const { GeomHyperbola *newHyp = new GeomHyperbola(myCurve); newHyp->copyNonTag(this); @@ -3155,7 +3155,7 @@ GeomBSplineCurve* GeomHyperbola::toNurbs(double first, double last) const return GeomCurve::toNurbs(first, last); } -double GeomHyperbola::getMajorRadius(void) const +double GeomHyperbola::getMajorRadius() const { Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); return h->MajorRadius(); @@ -3174,7 +3174,7 @@ void GeomHyperbola::setMajorRadius(double Radius) } } -double GeomHyperbola::getMinorRadius(void) const +double GeomHyperbola::getMinorRadius() const { Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); return h->MinorRadius(); @@ -3194,7 +3194,7 @@ void GeomHyperbola::setMinorRadius(double Radius) } // Persistence implementer -unsigned int GeomHyperbola::getMemSize (void) const +unsigned int GeomHyperbola::getMemSize () const { return sizeof(Geom_Hyperbola); } @@ -3269,7 +3269,7 @@ void GeomHyperbola::Restore(Base::XMLReader& reader) } } -PyObject *GeomHyperbola::getPyObject(void) +PyObject *GeomHyperbola::getPyObject() { return new HyperbolaPy(static_cast(this->clone())); } @@ -3311,7 +3311,7 @@ const Handle(Geom_Geometry)& GeomArcOfHyperbola::handle() const return myCurve; } -Geometry *GeomArcOfHyperbola::copy(void) const +Geometry *GeomArcOfHyperbola::copy() const { GeomArcOfHyperbola* copy = new GeomArcOfHyperbola(); copy->setHandle(this->myCurve); @@ -3326,7 +3326,7 @@ GeomBSplineCurve* GeomArcOfHyperbola::toNurbs(double first, double last) const return GeomHyperbola(hyperbola).toNurbs(first, last); } -double GeomArcOfHyperbola::getMajorRadius(void) const +double GeomArcOfHyperbola::getMajorRadius() const { Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MajorRadius(); @@ -3345,7 +3345,7 @@ void GeomArcOfHyperbola::setMajorRadius(double Radius) } } -double GeomArcOfHyperbola::getMinorRadius(void) const +double GeomArcOfHyperbola::getMinorRadius() const { Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MinorRadius(); @@ -3443,7 +3443,7 @@ void GeomArcOfHyperbola::setRange(double u, double v, bool emulateCCWXY) } // Persistence implementer -unsigned int GeomArcOfHyperbola::getMemSize (void) const +unsigned int GeomArcOfHyperbola::getMemSize () const { return sizeof(Geom_Hyperbola) + 2 *sizeof(double); } @@ -3534,7 +3534,7 @@ void GeomArcOfHyperbola::Restore(Base::XMLReader &reader) } } -PyObject *GeomArcOfHyperbola::getPyObject(void) +PyObject *GeomArcOfHyperbola::getPyObject() { return new ArcOfHyperbolaPy(static_cast(this->clone())); } @@ -3567,7 +3567,7 @@ void GeomParabola::setHandle(const Handle(Geom_Parabola)& c) myCurve = Handle(Geom_Parabola)::DownCast(c->Copy()); } -Geometry *GeomParabola::copy(void) const +Geometry *GeomParabola::copy() const { GeomParabola *newPar = new GeomParabola(myCurve); newPar->copyNonTag(this); @@ -3581,7 +3581,7 @@ GeomBSplineCurve* GeomParabola::toNurbs(double first, double last) const return GeomCurve::toNurbs(first, last); } -double GeomParabola::getFocal(void) const +double GeomParabola::getFocal() const { Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(handle()); return p->Focal(); @@ -3601,7 +3601,7 @@ void GeomParabola::setFocal(double length) } // Persistence implementer -unsigned int GeomParabola::getMemSize (void) const +unsigned int GeomParabola::getMemSize () const { return sizeof(Geom_Parabola); } @@ -3674,7 +3674,7 @@ void GeomParabola::Restore(Base::XMLReader& reader) } } -PyObject *GeomParabola::getPyObject(void) +PyObject *GeomParabola::getPyObject() { return new ParabolaPy(static_cast(this->clone())); } @@ -3716,7 +3716,7 @@ const Handle(Geom_Geometry)& GeomArcOfParabola::handle() const return myCurve; } -Geometry *GeomArcOfParabola::copy(void) const +Geometry *GeomArcOfParabola::copy() const { GeomArcOfParabola* copy = new GeomArcOfParabola(); copy->setHandle(this->myCurve); @@ -3731,7 +3731,7 @@ GeomBSplineCurve* GeomArcOfParabola::toNurbs(double first, double last) const return GeomParabola(parabola).toNurbs(first, last); } -double GeomArcOfParabola::getFocal(void) const +double GeomArcOfParabola::getFocal() const { Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); return p->Focal(); @@ -3750,7 +3750,7 @@ void GeomArcOfParabola::setFocal(double length) } } -Base::Vector3d GeomArcOfParabola::getFocus(void) const +Base::Vector3d GeomArcOfParabola::getFocus() const { Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); gp_Pnt gp = p->Focus(); @@ -3797,7 +3797,7 @@ void GeomArcOfParabola::setRange(double u, double v, bool emulateCCWXY) } // Persistence implementer -unsigned int GeomArcOfParabola::getMemSize (void) const +unsigned int GeomArcOfParabola::getMemSize () const { return sizeof(Geom_Parabola) + 2 *sizeof(double); } @@ -3886,7 +3886,7 @@ void GeomArcOfParabola::Restore(Base::XMLReader &reader) } } -PyObject *GeomArcOfParabola::getPyObject(void) +PyObject *GeomArcOfParabola::getPyObject() { return new ArcOfParabolaPy(static_cast(this->clone())); } @@ -3922,13 +3922,13 @@ void GeomLine::setLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir) this->myCurve->SetDirection(gp_Dir(Dir.x,Dir.y,Dir.z)); } -Base::Vector3d GeomLine::getPos(void) const +Base::Vector3d GeomLine::getPos() const { gp_Pnt Pos = this->myCurve->Lin().Location(); return Base::Vector3d(Pos.X(),Pos.Y(),Pos.Z()); } -Base::Vector3d GeomLine::getDir(void) const +Base::Vector3d GeomLine::getDir() const { gp_Dir Dir = this->myCurve->Lin().Direction(); return Base::Vector3d(Dir.X(),Dir.Y(),Dir.Z()); @@ -3945,7 +3945,7 @@ void GeomLine::setHandle(const Handle(Geom_Line)& l) this->myCurve = Handle(Geom_Line)::DownCast(l->Copy()); } -Geometry *GeomLine::copy(void) const +Geometry *GeomLine::copy() const { GeomLine *newLine = new GeomLine(myCurve); newLine->copyNonTag(this); @@ -3953,7 +3953,7 @@ Geometry *GeomLine::copy(void) const } // Persistence implementer -unsigned int GeomLine::getMemSize (void) const +unsigned int GeomLine::getMemSize () const { return sizeof(Geom_Line); } @@ -3997,7 +3997,7 @@ void GeomLine::Restore(Base::XMLReader &reader) setLine(Base::Vector3d(PosX,PosY,PosZ),Base::Vector3d(DirX,DirY,DirZ) ); } -PyObject *GeomLine::getPyObject(void) +PyObject *GeomLine::getPyObject() { return new LinePy(static_cast(this->clone())); } @@ -4042,7 +4042,7 @@ const Handle(Geom_Geometry)& GeomLineSegment::handle() const return myCurve; } -Geometry *GeomLineSegment::copy(void)const +Geometry *GeomLineSegment::copy()const { GeomLineSegment *tempCurve = new GeomLineSegment(); tempCurve->myCurve = Handle(Geom_TrimmedCurve)::DownCast(myCurve->Copy()); @@ -4094,7 +4094,7 @@ void GeomLineSegment::setPoints(const Base::Vector3d& Start, const Base::Vector3 } // Persistence implementer -unsigned int GeomLineSegment::getMemSize (void) const +unsigned int GeomLineSegment::getMemSize () const { return sizeof(Geom_TrimmedCurve) + sizeof(Geom_Line); } @@ -4158,7 +4158,7 @@ void GeomLineSegment::Restore (Base::XMLReader &reader) } } -PyObject *GeomLineSegment::getPyObject(void) +PyObject *GeomLineSegment::getPyObject() { return new LineSegmentPy(static_cast(this->clone())); } @@ -4189,7 +4189,7 @@ GeomOffsetCurve::~GeomOffsetCurve() { } -Geometry *GeomOffsetCurve::copy(void) const +Geometry *GeomOffsetCurve::copy() const { GeomOffsetCurve *newCurve = new GeomOffsetCurve(myCurve); newCurve->copyNonTag(this); @@ -4207,7 +4207,7 @@ const Handle(Geom_Geometry)& GeomOffsetCurve::handle() const } // Persistence implementer -unsigned int GeomOffsetCurve::getMemSize (void) const +unsigned int GeomOffsetCurve::getMemSize () const { return sizeof(Geom_OffsetCurve); } @@ -4222,7 +4222,7 @@ void GeomOffsetCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomOffsetCurve::Restore"); } -PyObject *GeomOffsetCurve::getPyObject(void) +PyObject *GeomOffsetCurve::getPyObject() { return new OffsetCurvePy(static_cast(this->clone())); } @@ -4374,7 +4374,7 @@ void GeomBezierSurface::setHandle(const Handle(Geom_BezierSurface)& b) this->mySurface = Handle(Geom_BezierSurface)::DownCast(b->Copy()); } -Geometry *GeomBezierSurface::copy(void) const +Geometry *GeomBezierSurface::copy() const { GeomBezierSurface *newSurf = new GeomBezierSurface(mySurface); newSurf->copyNonTag(this); @@ -4382,7 +4382,7 @@ Geometry *GeomBezierSurface::copy(void) const } // Persistence implementer -unsigned int GeomBezierSurface::getMemSize (void) const +unsigned int GeomBezierSurface::getMemSize () const { unsigned int size = sizeof(Geom_BezierSurface); if (!mySurface.IsNull()) { @@ -4404,7 +4404,7 @@ void GeomBezierSurface::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomBezierSurface::Restore"); } -PyObject *GeomBezierSurface::getPyObject(void) +PyObject *GeomBezierSurface::getPyObject() { return new BezierSurfacePy(static_cast(this->clone())); } @@ -4451,7 +4451,7 @@ const Handle(Geom_Geometry)& GeomBSplineSurface::handle() const return mySurface; } -Geometry *GeomBSplineSurface::copy(void) const +Geometry *GeomBSplineSurface::copy() const { GeomBSplineSurface *newSurf = new GeomBSplineSurface(mySurface); newSurf->copyNonTag(this); @@ -4494,7 +4494,7 @@ void GeomBSplineSurface::setBounds(double u0, double u1, double v0, double v1) } // Persistence implementer -unsigned int GeomBSplineSurface::getMemSize (void) const +unsigned int GeomBSplineSurface::getMemSize () const { unsigned int size = sizeof(Geom_BSplineSurface); if (!mySurface.IsNull()) { @@ -4520,7 +4520,7 @@ void GeomBSplineSurface::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomBSplineSurface::Restore"); } -PyObject *GeomBSplineSurface::getPyObject(void) +PyObject *GeomBSplineSurface::getPyObject() { return new BSplineSurfacePy(static_cast(this->clone())); } @@ -4554,7 +4554,7 @@ const Handle(Geom_Geometry)& GeomCylinder::handle() const return mySurface; } -Geometry *GeomCylinder::copy(void) const +Geometry *GeomCylinder::copy() const { GeomCylinder *tempCurve = new GeomCylinder(); tempCurve->mySurface = Handle(Geom_CylindricalSurface)::DownCast(mySurface->Copy()); @@ -4563,7 +4563,7 @@ Geometry *GeomCylinder::copy(void) const } // Persistence implementer -unsigned int GeomCylinder::getMemSize (void) const +unsigned int GeomCylinder::getMemSize () const { return sizeof(Geom_CylindricalSurface); } @@ -4578,7 +4578,7 @@ void GeomCylinder::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomCylinder::Restore"); } -PyObject *GeomCylinder::getPyObject(void) +PyObject *GeomCylinder::getPyObject() { return new CylinderPy(static_cast(this->clone())); } @@ -4612,7 +4612,7 @@ const Handle(Geom_Geometry)& GeomCone::handle() const return mySurface; } -Geometry *GeomCone::copy(void) const +Geometry *GeomCone::copy() const { GeomCone *tempCurve = new GeomCone(); tempCurve->mySurface = Handle(Geom_ConicalSurface)::DownCast(mySurface->Copy()); @@ -4621,7 +4621,7 @@ Geometry *GeomCone::copy(void) const } // Persistence implementer -unsigned int GeomCone::getMemSize (void) const +unsigned int GeomCone::getMemSize () const { return sizeof(Geom_ConicalSurface); } @@ -4636,7 +4636,7 @@ void GeomCone::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomCone::Restore"); } -PyObject *GeomCone::getPyObject(void) +PyObject *GeomCone::getPyObject() { return new ConePy(static_cast(this->clone())); } @@ -4718,7 +4718,7 @@ const Handle(Geom_Geometry)& GeomToroid::handle() const return mySurface; } -Geometry *GeomToroid::copy(void) const +Geometry *GeomToroid::copy() const { GeomToroid *tempCurve = new GeomToroid(); tempCurve->mySurface = Handle(Geom_ToroidalSurface)::DownCast(mySurface->Copy()); @@ -4727,7 +4727,7 @@ Geometry *GeomToroid::copy(void) const } // Persistence implementer -unsigned int GeomToroid::getMemSize (void) const +unsigned int GeomToroid::getMemSize () const { return sizeof(Geom_ToroidalSurface); } @@ -4742,7 +4742,7 @@ void GeomToroid::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomToroid::Restore"); } -PyObject *GeomToroid::getPyObject(void) +PyObject *GeomToroid::getPyObject() { return new ToroidPy(static_cast(this->clone())); } @@ -4776,7 +4776,7 @@ const Handle(Geom_Geometry)& GeomSphere::handle() const return mySurface; } -Geometry *GeomSphere::copy(void) const +Geometry *GeomSphere::copy() const { GeomSphere *tempCurve = new GeomSphere(); tempCurve->mySurface = Handle(Geom_SphericalSurface)::DownCast(mySurface->Copy()); @@ -4785,7 +4785,7 @@ Geometry *GeomSphere::copy(void) const } // Persistence implementer -unsigned int GeomSphere::getMemSize (void) const +unsigned int GeomSphere::getMemSize () const { return sizeof(Geom_SphericalSurface); } @@ -4800,7 +4800,7 @@ void GeomSphere::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomSphere::Restore"); } -PyObject *GeomSphere::getPyObject(void) +PyObject *GeomSphere::getPyObject() { return new SpherePy(static_cast(this->clone())); } @@ -4834,7 +4834,7 @@ const Handle(Geom_Geometry)& GeomPlane::handle() const return mySurface; } -Geometry *GeomPlane::copy(void) const +Geometry *GeomPlane::copy() const { GeomPlane *tempCurve = new GeomPlane(); tempCurve->mySurface = Handle(Geom_Plane)::DownCast(mySurface->Copy()); @@ -4843,7 +4843,7 @@ Geometry *GeomPlane::copy(void) const } // Persistence implementer -unsigned int GeomPlane::getMemSize (void) const +unsigned int GeomPlane::getMemSize () const { return sizeof(Geom_Plane); } @@ -4858,7 +4858,7 @@ void GeomPlane::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomPlane::Restore"); } -PyObject *GeomPlane::getPyObject(void) +PyObject *GeomPlane::getPyObject() { return new PlanePy(static_cast(this->clone())); } @@ -4895,7 +4895,7 @@ const Handle(Geom_Geometry)& GeomOffsetSurface::handle() const return mySurface; } -Geometry *GeomOffsetSurface::copy(void) const +Geometry *GeomOffsetSurface::copy() const { GeomOffsetSurface *newSurf = new GeomOffsetSurface(mySurface); newSurf->copyNonTag(this); @@ -4903,7 +4903,7 @@ Geometry *GeomOffsetSurface::copy(void) const } // Persistence implementer -unsigned int GeomOffsetSurface::getMemSize (void) const +unsigned int GeomOffsetSurface::getMemSize () const { return sizeof(Geom_OffsetSurface); } @@ -4918,7 +4918,7 @@ void GeomOffsetSurface::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomOffsetSurface::Restore"); } -PyObject *GeomOffsetSurface::getPyObject(void) +PyObject *GeomOffsetSurface::getPyObject() { return new OffsetSurfacePy(static_cast(this->clone())); } @@ -4961,7 +4961,7 @@ const Handle(Geom_Geometry)& GeomPlateSurface::handle() const return mySurface; } -Geometry *GeomPlateSurface::copy(void) const +Geometry *GeomPlateSurface::copy() const { GeomPlateSurface *newSurf = new GeomPlateSurface(mySurface); newSurf->copyNonTag(this); @@ -4969,7 +4969,7 @@ Geometry *GeomPlateSurface::copy(void) const } // Persistence implementer -unsigned int GeomPlateSurface::getMemSize (void) const +unsigned int GeomPlateSurface::getMemSize () const { throw Base::NotImplementedError("GeomPlateSurface::getMemSize"); } @@ -4984,7 +4984,7 @@ void GeomPlateSurface::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomPlateSurface::Restore"); } -PyObject *GeomPlateSurface::getPyObject(void) +PyObject *GeomPlateSurface::getPyObject() { return new PlateSurfacePy(static_cast(this->clone())); } @@ -5016,7 +5016,7 @@ const Handle(Geom_Geometry)& GeomTrimmedSurface::handle() const return mySurface; } -Geometry *GeomTrimmedSurface::copy(void) const +Geometry *GeomTrimmedSurface::copy() const { GeomTrimmedSurface *newSurf = new GeomTrimmedSurface(mySurface); newSurf->copyNonTag(this); @@ -5024,7 +5024,7 @@ Geometry *GeomTrimmedSurface::copy(void) const } // Persistence implementer -unsigned int GeomTrimmedSurface::getMemSize (void) const +unsigned int GeomTrimmedSurface::getMemSize () const { return sizeof(Geom_RectangularTrimmedSurface); } @@ -5039,7 +5039,7 @@ void GeomTrimmedSurface::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomTrimmedSurface::Restore"); } -PyObject *GeomTrimmedSurface::getPyObject(void) +PyObject *GeomTrimmedSurface::getPyObject() { return new RectangularTrimmedSurfacePy(static_cast(this->clone())); } @@ -5076,7 +5076,7 @@ const Handle(Geom_Geometry)& GeomSurfaceOfRevolution::handle() const return mySurface; } -Geometry *GeomSurfaceOfRevolution::copy(void) const +Geometry *GeomSurfaceOfRevolution::copy() const { GeomSurfaceOfRevolution *newSurf = new GeomSurfaceOfRevolution(mySurface); newSurf->copyNonTag(this); @@ -5084,7 +5084,7 @@ Geometry *GeomSurfaceOfRevolution::copy(void) const } // Persistence implementer -unsigned int GeomSurfaceOfRevolution::getMemSize (void) const +unsigned int GeomSurfaceOfRevolution::getMemSize () const { return sizeof(Geom_SurfaceOfRevolution); } @@ -5099,7 +5099,7 @@ void GeomSurfaceOfRevolution::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomSurfaceOfRevolution::Restore"); } -PyObject *GeomSurfaceOfRevolution::getPyObject(void) +PyObject *GeomSurfaceOfRevolution::getPyObject() { return new SurfaceOfRevolutionPy(static_cast(this->clone())); } @@ -5136,7 +5136,7 @@ const Handle(Geom_Geometry)& GeomSurfaceOfExtrusion::handle() const return mySurface; } -Geometry *GeomSurfaceOfExtrusion::copy(void) const +Geometry *GeomSurfaceOfExtrusion::copy() const { GeomSurfaceOfExtrusion *newSurf = new GeomSurfaceOfExtrusion(mySurface); newSurf->copyNonTag(this); @@ -5144,7 +5144,7 @@ Geometry *GeomSurfaceOfExtrusion::copy(void) const } // Persistence implementer -unsigned int GeomSurfaceOfExtrusion::getMemSize (void) const +unsigned int GeomSurfaceOfExtrusion::getMemSize () const { return sizeof(Geom_SurfaceOfLinearExtrusion); } @@ -5159,7 +5159,7 @@ void GeomSurfaceOfExtrusion::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("GeomSurfaceOfExtrusion::Restore"); } -PyObject *GeomSurfaceOfExtrusion::getPyObject(void) +PyObject *GeomSurfaceOfExtrusion::getPyObject() { return new SurfaceOfExtrusionPy(static_cast(this->clone())); } diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index b596ace45a..9366764693 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -80,20 +80,20 @@ public: virtual TopoDS_Shape toShape() const = 0; virtual const Handle(Geom_Geometry)& handle() const = 0; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); /// returns a copy of this object having a new randomly generated tag. If you also want to copy the tag, you may use clone() instead. /// For creation of geometry with other handles, with or without the same tag, you may use the constructors and the sethandle functions. /// The tag of a geometry can be copied to another geometry using the assignTag function. - virtual Geometry *copy(void) const = 0; + virtual Geometry *copy() const = 0; /// returns a cloned object. A cloned object has the same tag (see getTag) as the original object. /// if you want a copy not having the same tag, you can use copy() instead. /// If you want a clone with another geometry handle, it is possible to clone an object and then assign another handle or to create an object /// via constructor and use assignTag to assign the tag of the other geometry. /// If you do not desire to have the same tag, then a copy can be performed by using a constructor (which will generate another tag) /// and then, if necessary (e.g. if the constructor did not take a handle as a parameter), set a new handle. - Geometry *clone(void) const; + Geometry *clone() const; /// returns the tag of the geometry object boost::uuids::uuid getTag() const; @@ -144,20 +144,20 @@ public: GeomPoint(const Handle(Geom_CartesianPoint)&); GeomPoint(const Base::Vector3d&); virtual ~GeomPoint(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; virtual TopoDS_Shape toShape() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom_Geometry)& handle() const; void setHandle(const Handle(Geom_CartesianPoint)&); - Base::Vector3d getPoint(void)const; + Base::Vector3d getPoint()const; void setPoint(const Base::Vector3d&); private: @@ -203,7 +203,7 @@ public: std::vector>& points, double tol = Precision::Confusion()) const; - void reverse(void); + void reverse(); Base::Vector3d value(double u) const; @@ -233,16 +233,16 @@ public: GeomBezierCurve(const Handle(Geom_BezierCurve)&); GeomBezierCurve(const std::vector&, const std::vector&); virtual ~GeomBezierCurve(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; std::vector getPoles() const; std::vector getWeights() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize (void) const; + virtual unsigned int getMemSize () const; virtual void Save (Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_BezierCurve)&); const Handle(Geom_Geometry)& handle() const; @@ -263,7 +263,7 @@ public: int degree, bool periodic=false, bool checkrational = true); virtual ~GeomBSplineCurve(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; /*! * Interpolate a spline passing through the given points without tangency. @@ -319,11 +319,11 @@ public: void Trim(double u, double v); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_BSplineCurve)&); const Handle(Geom_Geometry)& handle() const; @@ -351,28 +351,28 @@ protected: public: virtual ~GeomConic(); - virtual Geometry *copy(void) const = 0; + virtual Geometry *copy() const = 0; /*! * \deprecated use getLocation * \brief getCenter */ - Base::Vector3d getCenter(void) const; - Base::Vector3d getLocation(void) const; + Base::Vector3d getCenter() const; + Base::Vector3d getLocation() const; void setLocation(const Base::Vector3d& Center); /*! * \deprecated use setLocation * \brief setCenter */ void setCenter(const Base::Vector3d& Center); - double getAngleXU(void) const; + double getAngleXU() const; void setAngleXU(double angle); bool isReversed() const; - Base::Vector3d getAxisDirection(void) const; + Base::Vector3d getAxisDirection() const; - virtual unsigned int getMemSize(void) const = 0; - virtual PyObject *getPyObject(void) = 0; + virtual unsigned int getMemSize() const = 0; + virtual PyObject *getPyObject() = 0; const Handle(Geom_Geometry)& handle() const = 0; }; @@ -384,14 +384,14 @@ public: GeomTrimmedCurve(); GeomTrimmedCurve(const Handle(Geom_TrimmedCurve)&); virtual ~GeomTrimmedCurve(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_TrimmedCurve)&); const Handle(Geom_Geometry)& handle() const; @@ -418,7 +418,7 @@ protected: public: virtual ~GeomArcOfConic(); - virtual Geometry *copy(void) const = 0; + virtual Geometry *copy() const = 0; Base::Vector3d getStartPoint(bool emulateCCWXY) const; Base::Vector3d getEndPoint(bool emulateCCWXY) const; @@ -429,8 +429,8 @@ public: * \deprecated use getLocation * \brief getCenter */ - Base::Vector3d getCenter(void) const; - Base::Vector3d getLocation(void) const; + Base::Vector3d getCenter() const; + Base::Vector3d getLocation() const; void setLocation(const Base::Vector3d& Center); /*! * \deprecated use setLocation @@ -438,7 +438,7 @@ public: */ void setCenter(const Base::Vector3d& Center); - Base::Vector3d getAxisDirection(void) const; + Base::Vector3d getAxisDirection() const; virtual void getRange(double& u, double& v, bool emulateCCWXY) const = 0; virtual void setRange(double u, double v, bool emulateCCWXY) = 0; @@ -447,14 +447,14 @@ public: inline virtual void setRange(double u, double v) { setRange(u,v,false);} bool isReversed() const; - double getAngleXU(void) const; + double getAngleXU() const; void setAngleXU(double angle); Base::Vector3d getXAxisDir() const; void setXAxisDir(const Base::Vector3d& newdir); - virtual unsigned int getMemSize(void) const = 0; - virtual PyObject *getPyObject(void) = 0; + virtual unsigned int getMemSize() const = 0; + virtual PyObject *getPyObject() = 0; const Handle(Geom_Geometry)& handle() const = 0; }; @@ -466,17 +466,17 @@ public: GeomCircle(); GeomCircle(const Handle(Geom_Circle)&); virtual ~GeomCircle(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getRadius(void) const; + double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; const Handle(Geom_Geometry)& handle() const; @@ -494,20 +494,20 @@ public: GeomArcOfCircle(); GeomArcOfCircle(const Handle(Geom_Circle)&); virtual ~GeomArcOfCircle(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getRadius(void) const; + double getRadius() const; void setRadius(double Radius); virtual void getRange(double& u, double& v, bool emulateCCWXY) const; virtual void setRange(double u, double v, bool emulateCCWXY); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; void setHandle(const Handle(Geom_TrimmedCurve)&); @@ -523,22 +523,22 @@ public: GeomEllipse(); GeomEllipse(const Handle(Geom_Ellipse)&); virtual ~GeomEllipse(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); Base::Vector3d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector3d newdir); Base::Vector3d getMinorAxisDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; void setHandle(const Handle(Geom_Ellipse) &e); @@ -555,11 +555,11 @@ public: GeomArcOfEllipse(); GeomArcOfEllipse(const Handle(Geom_Ellipse)&); virtual ~GeomArcOfEllipse(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); Base::Vector3d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector3d newdir); @@ -568,11 +568,11 @@ public: virtual void setRange(double u, double v, bool emulateCCWXY); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; void setHandle(const Handle(Geom_TrimmedCurve)&); @@ -588,19 +588,19 @@ public: GeomHyperbola(); GeomHyperbola(const Handle(Geom_Hyperbola)&); virtual ~GeomHyperbola(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; const Handle(Geom_Geometry)& handle() const; @@ -617,11 +617,11 @@ public: GeomArcOfHyperbola(); GeomArcOfHyperbola(const Handle(Geom_Hyperbola)&); virtual ~GeomArcOfHyperbola(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); Base::Vector3d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector3d newdir); @@ -630,11 +630,11 @@ public: virtual void setRange(double u, double v, bool emulateCCWXY); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; void setHandle(const Handle(Geom_TrimmedCurve)&); @@ -649,17 +649,17 @@ public: GeomParabola(); GeomParabola(const Handle(Geom_Parabola)&); virtual ~GeomParabola(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getFocal(void) const; + double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; const Handle(Geom_Geometry)& handle() const; @@ -676,22 +676,22 @@ public: GeomArcOfParabola(); GeomArcOfParabola(const Handle(Geom_Parabola)&); virtual ~GeomArcOfParabola(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; - double getFocal(void) const; + double getFocal() const; void setFocal(double length); - Base::Vector3d getFocus(void) const; + Base::Vector3d getFocus() const; virtual void getRange(double& u, double& v, bool emulateCCWXY) const; virtual void setRange(double u, double v, bool emulateCCWXY); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual GeomBSplineCurve* toNurbs(double first, double last) const; void setHandle(const Handle(Geom_TrimmedCurve)&); @@ -707,18 +707,18 @@ public: GeomLine(const Handle(Geom_Line)&); GeomLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir); virtual ~GeomLine(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; void setLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir); - Base::Vector3d getPos(void) const; - Base::Vector3d getDir(void) const; + Base::Vector3d getPos() const; + Base::Vector3d getDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom_Geometry)& handle() const; void setHandle(const Handle(Geom_Line)&); @@ -734,7 +734,7 @@ public: GeomLineSegment(); GeomLineSegment(const Handle(Geom_Line)& l); virtual ~GeomLineSegment(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; Base::Vector3d getStartPoint() const; Base::Vector3d getEndPoint() const; @@ -743,11 +743,11 @@ public: const Base::Vector3d& p2); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Line)&); @@ -764,14 +764,14 @@ public: GeomOffsetCurve(const Handle(Geom_Curve)&, double, Base::Vector3d&); GeomOffsetCurve(const Handle(Geom_OffsetCurve)&); virtual ~GeomOffsetCurve(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_OffsetCurve)& c); const Handle(Geom_Geometry)& handle() const; @@ -819,14 +819,14 @@ public: GeomBezierSurface(); GeomBezierSurface(const Handle(Geom_BezierSurface)&); virtual ~GeomBezierSurface(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_BezierSurface)& b); const Handle(Geom_Geometry)& handle() const; @@ -842,15 +842,15 @@ public: GeomBSplineSurface(); GeomBSplineSurface(const Handle(Geom_BSplineSurface)&); virtual ~GeomBSplineSurface(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; void setBounds(double u0, double u1, double v0, double v1); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_BSplineSurface)&); const Handle(Geom_Geometry)& handle() const; @@ -866,14 +866,14 @@ public: GeomCylinder(); GeomCylinder(const Handle(Geom_CylindricalSurface)&); virtual ~GeomCylinder(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_CylindricalSurface)&); const Handle(Geom_Geometry)& handle() const; @@ -889,14 +889,14 @@ public: GeomCone(); GeomCone(const Handle(Geom_ConicalSurface)&); virtual ~GeomCone(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_ConicalSurface)&); const Handle(Geom_Geometry)& handle() const; @@ -915,14 +915,14 @@ public: GeomSphere(); GeomSphere(const Handle(Geom_SphericalSurface)&); virtual ~GeomSphere(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_SphericalSurface)&); const Handle(Geom_Geometry)& handle() const; @@ -938,14 +938,14 @@ public: GeomToroid(); GeomToroid(const Handle(Geom_ToroidalSurface)&); virtual ~GeomToroid(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_ToroidalSurface)&); const Handle(Geom_Geometry)& handle() const; @@ -961,14 +961,14 @@ public: GeomPlane(); GeomPlane(const Handle(Geom_Plane)&); virtual ~GeomPlane(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_Plane)&); const Handle(Geom_Geometry)& handle() const; @@ -985,14 +985,14 @@ public: GeomOffsetSurface(const Handle(Geom_Surface)&, double); GeomOffsetSurface(const Handle(Geom_OffsetSurface)&); virtual ~GeomOffsetSurface(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_OffsetSurface)& s); const Handle(Geom_Geometry)& handle() const; @@ -1010,14 +1010,14 @@ public: GeomPlateSurface(const GeomPlate_BuildPlateSurface&); GeomPlateSurface(const Handle(GeomPlate_Surface)&); virtual ~GeomPlateSurface(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(GeomPlate_Surface)& s); const Handle(Geom_Geometry)& handle() const; @@ -1033,14 +1033,14 @@ public: GeomTrimmedSurface(); GeomTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)&); virtual ~GeomTrimmedSurface(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_RectangularTrimmedSurface)& s); const Handle(Geom_Geometry)& handle() const; @@ -1057,14 +1057,14 @@ public: GeomSurfaceOfRevolution(const Handle(Geom_Curve)&, const gp_Ax1&); GeomSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)&); virtual ~GeomSurfaceOfRevolution(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_SurfaceOfRevolution)& c); const Handle(Geom_Geometry)& handle() const; @@ -1081,14 +1081,14 @@ public: GeomSurfaceOfExtrusion(const Handle(Geom_Curve)&, const gp_Dir&); GeomSurfaceOfExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)&); virtual ~GeomSurfaceOfExtrusion(); - virtual Geometry *copy(void) const; + virtual Geometry *copy() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom_SurfaceOfLinearExtrusion)& c); const Handle(Geom_Geometry)& handle() const; diff --git a/src/Mod/Part/App/Geometry2d.cpp b/src/Mod/Part/App/Geometry2d.cpp index 247beca2d4..9d362598a2 100644 --- a/src/Mod/Part/App/Geometry2d.cpp +++ b/src/Mod/Part/App/Geometry2d.cpp @@ -94,7 +94,7 @@ Geometry2d::~Geometry2d() { } -unsigned int Geometry2d::getMemSize (void) const +unsigned int Geometry2d::getMemSize () const { return sizeof(Geometry2d); } @@ -148,13 +148,13 @@ const Handle(Geom2d_Geometry)& Geom2dPoint::handle() const return myPoint; } -Geometry2d *Geom2dPoint::clone(void) const +Geometry2d *Geom2dPoint::clone() const { Geom2dPoint *newPoint = new Geom2dPoint(myPoint); return newPoint; } -Base::Vector2d Geom2dPoint::getPoint(void)const +Base::Vector2d Geom2dPoint::getPoint()const { return Base::Vector2d(myPoint->X(),myPoint->Y()); } @@ -164,7 +164,7 @@ void Geom2dPoint::setPoint(const Base::Vector2d& p) this->myPoint->SetCoord(p.x,p.y); } -unsigned int Geom2dPoint::getMemSize (void) const +unsigned int Geom2dPoint::getMemSize () const { return sizeof(Geom2d_CartesianPoint); } @@ -199,7 +199,7 @@ void Geom2dPoint::Restore(Base::XMLReader &reader) setPoint(Base::Vector2d(X,Y)); } -PyObject *Geom2dPoint::getPyObject(void) +PyObject *Geom2dPoint::getPyObject() { Handle(Geom2d_CartesianPoint) c = Handle(Geom2d_CartesianPoint)::DownCast(handle()); gp_Pnt2d xy = c->Pnt2d(); @@ -361,13 +361,13 @@ const Handle(Geom2d_Geometry)& Geom2dBezierCurve::handle() const return myCurve; } -Geometry2d *Geom2dBezierCurve::clone(void) const +Geometry2d *Geom2dBezierCurve::clone() const { Geom2dBezierCurve *newCurve = new Geom2dBezierCurve(myCurve); return newCurve; } -unsigned int Geom2dBezierCurve::getMemSize (void) const +unsigned int Geom2dBezierCurve::getMemSize () const { throw Base::NotImplementedError("Geom2dBezierCurve::getMemSize"); } @@ -382,7 +382,7 @@ void Geom2dBezierCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("Geom2dBezierCurve::Restore"); } -PyObject *Geom2dBezierCurve::getPyObject(void) +PyObject *Geom2dBezierCurve::getPyObject() { return new BezierCurve2dPy(static_cast(this->clone())); } @@ -427,7 +427,7 @@ const Handle(Geom2d_Geometry)& Geom2dBSplineCurve::handle() const return myCurve; } -Geometry2d *Geom2dBSplineCurve::clone(void) const +Geometry2d *Geom2dBSplineCurve::clone() const { Geom2dBSplineCurve *newCurve = new Geom2dBSplineCurve(myCurve); return newCurve; @@ -571,7 +571,7 @@ std::list Geom2dBSplineCurve::toBiArcs(double /*tolerance*/) const return std::list(); } -unsigned int Geom2dBSplineCurve::getMemSize(void) const +unsigned int Geom2dBSplineCurve::getMemSize() const { throw Base::NotImplementedError("Geom2dBSplineCurve::getMemSize"); } @@ -586,7 +586,7 @@ void Geom2dBSplineCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("Geom2dBSplineCurve::Restore"); } -PyObject *Geom2dBSplineCurve::getPyObject(void) +PyObject *Geom2dBSplineCurve::getPyObject() { return new BSplineCurve2dPy(static_cast(this->clone())); } @@ -603,7 +603,7 @@ Geom2dConic::~Geom2dConic() { } -Base::Vector2d Geom2dConic::getLocation(void) const +Base::Vector2d Geom2dConic::getLocation() const { Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(handle()); const gp_Pnt2d& loc = conic->Location(); @@ -680,7 +680,7 @@ Geom2dArcOfConic::~Geom2dArcOfConic() { } -Base::Vector2d Geom2dArcOfConic::getLocation(void) const +Base::Vector2d Geom2dArcOfConic::getLocation() const { Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); @@ -826,13 +826,13 @@ const Handle(Geom2d_Geometry)& Geom2dCircle::handle() const return myCurve; } -Geometry2d *Geom2dCircle::clone(void) const +Geometry2d *Geom2dCircle::clone() const { Geom2dCircle *newCirc = new Geom2dCircle(myCurve); return newCirc; } -double Geom2dCircle::getRadius(void) const +double Geom2dCircle::getRadius() const { Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(handle()); return circle->Radius(); @@ -852,7 +852,7 @@ void Geom2dCircle::setRadius(double Radius) } } -unsigned int Geom2dCircle::getMemSize (void) const +unsigned int Geom2dCircle::getMemSize () const { return sizeof(Geom2d_Circle); } @@ -900,7 +900,7 @@ void Geom2dCircle::Restore(Base::XMLReader& reader) } } -PyObject *Geom2dCircle::getPyObject(void) +PyObject *Geom2dCircle::getPyObject() { return new Circle2dPy(static_cast(this->clone())); } @@ -983,14 +983,14 @@ const Handle(Geom2d_Geometry)& Geom2dArcOfCircle::handle() const return myCurve; } -Geometry2d *Geom2dArcOfCircle::clone(void) const +Geometry2d *Geom2dArcOfCircle::clone() const { Geom2dArcOfCircle* copy = new Geom2dArcOfCircle(); copy->setHandle(this->myCurve); return copy; } -double Geom2dArcOfCircle::getRadius(void) const +double Geom2dArcOfCircle::getRadius() const { Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(myCurve->BasisCurve()); return circle->Radius(); @@ -1010,7 +1010,7 @@ void Geom2dArcOfCircle::setRadius(double Radius) } } -unsigned int Geom2dArcOfCircle::getMemSize (void) const +unsigned int Geom2dArcOfCircle::getMemSize () const { return sizeof(Geom2d_Circle) + 2 *sizeof(double); } @@ -1069,7 +1069,7 @@ void Geom2dArcOfCircle::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dArcOfCircle::getPyObject(void) +PyObject *Geom2dArcOfCircle::getPyObject() { return new ArcOfCircle2dPy(static_cast(this->clone())); } @@ -1098,13 +1098,13 @@ const Handle(Geom2d_Geometry)& Geom2dEllipse::handle() const return myCurve; } -Geometry2d *Geom2dEllipse::clone(void) const +Geometry2d *Geom2dEllipse::clone() const { Geom2dEllipse *newEllipse = new Geom2dEllipse(myCurve); return newEllipse; } -double Geom2dEllipse::getMajorRadius(void) const +double Geom2dEllipse::getMajorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); return ellipse->MajorRadius(); @@ -1122,7 +1122,7 @@ void Geom2dEllipse::setMajorRadius(double Radius) } } -double Geom2dEllipse::getMinorRadius(void) const +double Geom2dEllipse::getMinorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); return ellipse->MinorRadius(); @@ -1175,7 +1175,7 @@ void Geom2dEllipse::setMajorAxisDir(Base::Vector2d newdir) } } -unsigned int Geom2dEllipse::getMemSize (void) const +unsigned int Geom2dEllipse::getMemSize () const { return sizeof(Geom2d_Ellipse); } @@ -1224,7 +1224,7 @@ void Geom2dEllipse::Restore(Base::XMLReader& reader) } } -PyObject *Geom2dEllipse::getPyObject(void) +PyObject *Geom2dEllipse::getPyObject() { return new Ellipse2dPy(static_cast(this->clone())); } @@ -1266,14 +1266,14 @@ const Handle(Geom2d_Geometry)& Geom2dArcOfEllipse::handle() const return myCurve; } -Geometry2d *Geom2dArcOfEllipse::clone(void) const +Geometry2d *Geom2dArcOfEllipse::clone() const { Geom2dArcOfEllipse* copy = new Geom2dArcOfEllipse(); copy->setHandle(this->myCurve); return copy; } -double Geom2dArcOfEllipse::getMajorRadius(void) const +double Geom2dArcOfEllipse::getMajorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MajorRadius(); @@ -1291,7 +1291,7 @@ void Geom2dArcOfEllipse::setMajorRadius(double Radius) } } -double Geom2dArcOfEllipse::getMinorRadius(void) const +double Geom2dArcOfEllipse::getMinorRadius() const { Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MinorRadius(); @@ -1348,7 +1348,7 @@ void Geom2dArcOfEllipse::setMajorAxisDir(Base::Vector2d newdir) } } -unsigned int Geom2dArcOfEllipse::getMemSize (void) const +unsigned int Geom2dArcOfEllipse::getMemSize () const { return sizeof(Geom2d_Ellipse) + 2 *sizeof(double); } @@ -1410,7 +1410,7 @@ void Geom2dArcOfEllipse::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dArcOfEllipse::getPyObject(void) +PyObject *Geom2dArcOfEllipse::getPyObject() { return new ArcOfEllipse2dPy(static_cast(this->clone())); } @@ -1439,13 +1439,13 @@ const Handle(Geom2d_Geometry)& Geom2dHyperbola::handle() const return myCurve; } -Geometry2d *Geom2dHyperbola::clone(void) const +Geometry2d *Geom2dHyperbola::clone() const { Geom2dHyperbola *newHyp = new Geom2dHyperbola(myCurve); return newHyp; } -double Geom2dHyperbola::getMajorRadius(void) const +double Geom2dHyperbola::getMajorRadius() const { Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); return h->MajorRadius(); @@ -1463,7 +1463,7 @@ void Geom2dHyperbola::setMajorRadius(double Radius) } } -double Geom2dHyperbola::getMinorRadius(void) const +double Geom2dHyperbola::getMinorRadius() const { Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); return h->MinorRadius(); @@ -1481,7 +1481,7 @@ void Geom2dHyperbola::setMinorRadius(double Radius) } } -unsigned int Geom2dHyperbola::getMemSize (void) const +unsigned int Geom2dHyperbola::getMemSize () const { return sizeof(Geom2d_Hyperbola); } @@ -1530,7 +1530,7 @@ void Geom2dHyperbola::Restore(Base::XMLReader& reader) } } -PyObject *Geom2dHyperbola::getPyObject(void) +PyObject *Geom2dHyperbola::getPyObject() { return new Hyperbola2dPy(static_cast(this->clone())); } @@ -1567,14 +1567,14 @@ const Handle(Geom2d_Geometry)& Geom2dArcOfHyperbola::handle() const return myCurve; } -Geometry2d *Geom2dArcOfHyperbola::clone(void) const +Geometry2d *Geom2dArcOfHyperbola::clone() const { Geom2dArcOfHyperbola* copy = new Geom2dArcOfHyperbola(); copy->setHandle(this->myCurve); return copy; } -double Geom2dArcOfHyperbola::getMajorRadius(void) const +double Geom2dArcOfHyperbola::getMajorRadius() const { Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MajorRadius(); @@ -1592,7 +1592,7 @@ void Geom2dArcOfHyperbola::setMajorRadius(double Radius) } } -double Geom2dArcOfHyperbola::getMinorRadius(void) const +double Geom2dArcOfHyperbola::getMinorRadius() const { Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MinorRadius(); @@ -1610,7 +1610,7 @@ void Geom2dArcOfHyperbola::setMinorRadius(double Radius) } } -unsigned int Geom2dArcOfHyperbola::getMemSize (void) const +unsigned int Geom2dArcOfHyperbola::getMemSize () const { return sizeof(Geom2d_Hyperbola) + 2 *sizeof(double); } @@ -1672,7 +1672,7 @@ void Geom2dArcOfHyperbola::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dArcOfHyperbola::getPyObject(void) +PyObject *Geom2dArcOfHyperbola::getPyObject() { return new ArcOfHyperbola2dPy(static_cast(this->clone())); } @@ -1701,13 +1701,13 @@ const Handle(Geom2d_Geometry)& Geom2dParabola::handle() const return myCurve; } -Geometry2d *Geom2dParabola::clone(void) const +Geometry2d *Geom2dParabola::clone() const { Geom2dParabola *newPar = new Geom2dParabola(myCurve); return newPar; } -double Geom2dParabola::getFocal(void) const +double Geom2dParabola::getFocal() const { Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(handle()); return p->Focal(); @@ -1725,7 +1725,7 @@ void Geom2dParabola::setFocal(double length) } } -unsigned int Geom2dParabola::getMemSize (void) const +unsigned int Geom2dParabola::getMemSize () const { return sizeof(Geom2d_Parabola); } @@ -1773,7 +1773,7 @@ void Geom2dParabola::Restore(Base::XMLReader& reader) } } -PyObject *Geom2dParabola::getPyObject(void) +PyObject *Geom2dParabola::getPyObject() { return new Parabola2dPy(static_cast(this->clone())); } @@ -1810,14 +1810,14 @@ const Handle(Geom2d_Geometry)& Geom2dArcOfParabola::handle() const return myCurve; } -Geometry2d *Geom2dArcOfParabola::clone(void) const +Geometry2d *Geom2dArcOfParabola::clone() const { Geom2dArcOfParabola* copy = new Geom2dArcOfParabola(); copy->setHandle(this->myCurve); return copy; } -double Geom2dArcOfParabola::getFocal(void) const +double Geom2dArcOfParabola::getFocal() const { Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(myCurve->BasisCurve()); return p->Focal(); @@ -1835,7 +1835,7 @@ void Geom2dArcOfParabola::setFocal(double length) } } -unsigned int Geom2dArcOfParabola::getMemSize (void) const +unsigned int Geom2dArcOfParabola::getMemSize () const { return sizeof(Geom2d_Parabola) + 2 *sizeof(double); } @@ -1895,7 +1895,7 @@ void Geom2dArcOfParabola::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dArcOfParabola::getPyObject(void) +PyObject *Geom2dArcOfParabola::getPyObject() { return new ArcOfParabola2dPy(static_cast(this->clone())); } @@ -1930,13 +1930,13 @@ void Geom2dLine::setLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir) this->myCurve->SetDirection(gp_Dir2d(Dir.x,Dir.y)); } -Base::Vector2d Geom2dLine::getPos(void) const +Base::Vector2d Geom2dLine::getPos() const { gp_Pnt2d Pos = this->myCurve->Lin2d().Location(); return Base::Vector2d(Pos.X(),Pos.Y()); } -Base::Vector2d Geom2dLine::getDir(void) const +Base::Vector2d Geom2dLine::getDir() const { gp_Dir2d Dir = this->myCurve->Lin2d().Direction(); return Base::Vector2d(Dir.X(),Dir.Y()); @@ -1947,13 +1947,13 @@ const Handle(Geom2d_Geometry)& Geom2dLine::handle() const return myCurve; } -Geometry2d *Geom2dLine::clone(void) const +Geometry2d *Geom2dLine::clone() const { Geom2dLine *newLine = new Geom2dLine(myCurve); return newLine; } -unsigned int Geom2dLine::getMemSize (void) const +unsigned int Geom2dLine::getMemSize () const { return sizeof(Geom2d_Line); } @@ -2004,7 +2004,7 @@ void Geom2dLine::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dLine::getPyObject(void) +PyObject *Geom2dLine::getPyObject() { return new Line2dPy(static_cast(this->clone())); } @@ -2039,7 +2039,7 @@ const Handle(Geom2d_Geometry)& Geom2dLineSegment::handle() const return myCurve; } -Geometry2d *Geom2dLineSegment::clone(void)const +Geometry2d *Geom2dLineSegment::clone()const { Geom2dLineSegment *tempCurve = new Geom2dLineSegment(); tempCurve->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(myCurve->Copy()); @@ -2087,7 +2087,7 @@ void Geom2dLineSegment::setPoints(const Base::Vector2d& Start, const Base::Vecto } } -unsigned int Geom2dLineSegment::getMemSize (void) const +unsigned int Geom2dLineSegment::getMemSize () const { return sizeof(Geom2d_TrimmedCurve) + sizeof(Geom2d_Line); } @@ -2139,7 +2139,7 @@ void Geom2dLineSegment::Restore(Base::XMLReader &reader) } } -PyObject *Geom2dLineSegment::getPyObject(void) +PyObject *Geom2dLineSegment::getPyObject() { return new Line2dSegmentPy(static_cast(this->clone())); } @@ -2166,7 +2166,7 @@ Geom2dOffsetCurve::~Geom2dOffsetCurve() { } -Geometry2d *Geom2dOffsetCurve::clone(void) const +Geometry2d *Geom2dOffsetCurve::clone() const { Geom2dOffsetCurve *newCurve = new Geom2dOffsetCurve(myCurve); return newCurve; @@ -2182,7 +2182,7 @@ const Handle(Geom2d_Geometry)& Geom2dOffsetCurve::handle() const return this->myCurve; } -unsigned int Geom2dOffsetCurve::getMemSize (void) const +unsigned int Geom2dOffsetCurve::getMemSize () const { throw Base::NotImplementedError("Geom2dOffsetCurve::getMemSize"); } @@ -2197,7 +2197,7 @@ void Geom2dOffsetCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("Geom2dOffsetCurve::Restore"); } -PyObject *Geom2dOffsetCurve::getPyObject(void) +PyObject *Geom2dOffsetCurve::getPyObject() { return new OffsetCurve2dPy(static_cast(this->clone())); } @@ -2229,13 +2229,13 @@ const Handle(Geom2d_Geometry)& Geom2dTrimmedCurve::handle() const return myCurve; } -Geometry2d *Geom2dTrimmedCurve::clone(void) const +Geometry2d *Geom2dTrimmedCurve::clone() const { Geom2dTrimmedCurve *newCurve = new Geom2dTrimmedCurve(myCurve); return newCurve; } -unsigned int Geom2dTrimmedCurve::getMemSize (void) const +unsigned int Geom2dTrimmedCurve::getMemSize () const { throw Base::NotImplementedError("Geom2dTrimmedCurve::getMemSize"); } @@ -2250,7 +2250,7 @@ void Geom2dTrimmedCurve::Restore(Base::XMLReader &/*reader*/) throw Base::NotImplementedError("Geom2dTrimmedCurve::Restore"); } -PyObject *Geom2dTrimmedCurve::getPyObject(void) +PyObject *Geom2dTrimmedCurve::getPyObject() { Handle(Geom2d_Curve) basis = this->myCurve->BasisCurve(); if (basis.IsNull()) diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h index 43241db924..cf19232004 100644 --- a/src/Mod/Part/App/Geometry2d.h +++ b/src/Mod/Part/App/Geometry2d.h @@ -57,11 +57,11 @@ public: virtual TopoDS_Shape toShape() const = 0; virtual const Handle(Geom2d_Geometry)& handle() const = 0; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); /// returns a cloned object - virtual Geometry2d *clone(void) const = 0; + virtual Geometry2d *clone() const = 0; protected: Geometry2d(); @@ -79,19 +79,19 @@ public: Geom2dPoint(const Handle(Geom2d_CartesianPoint)&); Geom2dPoint(const Base::Vector2d&); virtual ~Geom2dPoint(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; virtual TopoDS_Shape toShape() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom2d_Geometry)& handle() const; - Base::Vector2d getPoint(void)const; + Base::Vector2d getPoint()const; void setPoint(const Base::Vector2d&); private: @@ -122,14 +122,14 @@ public: Geom2dBezierCurve(); Geom2dBezierCurve(const Handle(Geom2d_BezierCurve)&); virtual ~Geom2dBezierCurve(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize (void) const; + virtual unsigned int getMemSize () const; virtual void Save (Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_BezierCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -145,7 +145,7 @@ public: Geom2dBSplineCurve(); Geom2dBSplineCurve(const Handle(Geom2d_BSplineCurve)&); virtual ~Geom2dBSplineCurve(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; /*! * Set the poles and tangents for the cubic Hermite spline @@ -174,11 +174,11 @@ public: std::list toBiArcs(double tolerance) const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_BSplineCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -202,14 +202,14 @@ protected: public: virtual ~Geom2dConic(); - virtual Geometry2d *clone(void) const = 0; + virtual Geometry2d *clone() const = 0; - Base::Vector2d getLocation(void) const; + Base::Vector2d getLocation() const; void setLocation(const Base::Vector2d& Center); bool isReversed() const; - virtual unsigned int getMemSize(void) const = 0; - virtual PyObject *getPyObject(void) = 0; + virtual unsigned int getMemSize() const = 0; + virtual PyObject *getPyObject() = 0; const Handle(Geom2d_Geometry)& handle() const = 0; @@ -226,9 +226,9 @@ protected: public: virtual ~Geom2dArcOfConic(); - virtual Geometry2d *clone(void) const = 0; + virtual Geometry2d *clone() const = 0; - Base::Vector2d getLocation(void) const; + Base::Vector2d getLocation() const; void setLocation(const Base::Vector2d& Center); bool isReversed() const; @@ -238,8 +238,8 @@ public: void getRange(double& u, double& v) const; void setRange(double u, double v); - virtual unsigned int getMemSize(void) const = 0; - virtual PyObject *getPyObject(void) = 0; + virtual unsigned int getMemSize() const = 0; + virtual PyObject *getPyObject() = 0; const Handle(Geom2d_Geometry)& handle() const = 0; @@ -255,17 +255,17 @@ public: Geom2dCircle(); Geom2dCircle(const Handle(Geom2d_Circle)&); virtual ~Geom2dCircle(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getRadius(void) const; + double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom2d_Geometry)& handle() const; @@ -282,17 +282,17 @@ public: Geom2dArcOfCircle(); Geom2dArcOfCircle(const Handle(Geom2d_Circle)&); virtual ~Geom2dArcOfCircle(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getRadius(void) const; + double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -308,21 +308,21 @@ public: Geom2dEllipse(); Geom2dEllipse(const Handle(Geom2d_Ellipse)&); virtual ~Geom2dEllipse(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); Base::Vector2d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector2d newdir); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_Ellipse) &e); const Handle(Geom2d_Geometry)& handle() const; @@ -338,21 +338,21 @@ public: Geom2dArcOfEllipse(); Geom2dArcOfEllipse(const Handle(Geom2d_Ellipse)&); virtual ~Geom2dArcOfEllipse(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); Base::Vector2d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector2d newdir); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -368,19 +368,19 @@ public: Geom2dHyperbola(); Geom2dHyperbola(const Handle(Geom2d_Hyperbola)&); virtual ~Geom2dHyperbola(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom2d_Geometry)& handle() const; @@ -395,19 +395,19 @@ public: Geom2dArcOfHyperbola(); Geom2dArcOfHyperbola(const Handle(Geom2d_Hyperbola)&); virtual ~Geom2dArcOfHyperbola(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getMajorRadius(void) const; + double getMajorRadius() const; void setMajorRadius(double Radius); - double getMinorRadius(void) const; + double getMinorRadius() const; void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -423,17 +423,17 @@ public: Geom2dParabola(); Geom2dParabola(const Handle(Geom2d_Parabola)&); virtual ~Geom2dParabola(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getFocal(void) const; + double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom2d_Geometry)& handle() const; @@ -448,17 +448,17 @@ public: Geom2dArcOfParabola(); Geom2dArcOfParabola(const Handle(Geom2d_Parabola)&); virtual ~Geom2dArcOfParabola(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; - double getFocal(void) const; + double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -475,18 +475,18 @@ public: Geom2dLine(const Handle(Geom2d_Line)&); Geom2dLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir); virtual ~Geom2dLine(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; void setLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir); - Base::Vector2d getPos(void) const; - Base::Vector2d getDir(void) const; + Base::Vector2d getPos() const; + Base::Vector2d getDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); const Handle(Geom2d_Geometry)& handle() const; @@ -500,7 +500,7 @@ class PartExport Geom2dLineSegment : public Geom2dCurve public: Geom2dLineSegment(); virtual ~Geom2dLineSegment(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; Base::Vector2d getStartPoint() const; Base::Vector2d getEndPoint() const; @@ -509,11 +509,11 @@ public: const Base::Vector2d& p2); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; @@ -530,14 +530,14 @@ public: Geom2dOffsetCurve(const Handle(Geom2d_Curve)&, double); Geom2dOffsetCurve(const Handle(Geom2d_OffsetCurve)&); virtual ~Geom2dOffsetCurve(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_OffsetCurve)& c); const Handle(Geom2d_Geometry)& handle() const; @@ -553,14 +553,14 @@ public: Geom2dTrimmedCurve(); Geom2dTrimmedCurve(const Handle(Geom2d_TrimmedCurve)&); virtual ~Geom2dTrimmedCurve(); - virtual Geometry2d *clone(void) const; + virtual Geometry2d *clone() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); // Base implementer ---------------------------- - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); void setHandle(const Handle(Geom2d_TrimmedCurve)&); const Handle(Geom2d_Geometry)& handle() const; diff --git a/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp b/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp index 67f09e988e..1d27427e24 100644 --- a/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp +++ b/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp @@ -29,7 +29,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryBoolExtensionPy::representation(void) const +std::string GeometryBoolExtensionPy::representation() const { std::stringstream str; bool val = getGeometryBoolExtensionPtr()->getValue(); @@ -81,7 +81,7 @@ int GeometryBoolExtensionPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Boolean GeometryBoolExtensionPy::getValue(void) const +Py::Boolean GeometryBoolExtensionPy::getValue() const { return Py::Boolean(this->getGeometryBoolExtensionPtr()->getValue()); } diff --git a/src/Mod/Part/App/GeometryCurvePyImp.cpp b/src/Mod/Part/App/GeometryCurvePyImp.cpp index 1b17d1e969..f0c4d7904b 100644 --- a/src/Mod/Part/App/GeometryCurvePyImp.cpp +++ b/src/Mod/Part/App/GeometryCurvePyImp.cpp @@ -80,7 +80,7 @@ extern const Py::Object makeTrimmedCurvePy(const Handle(Geom_Curve)& c, double f using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryCurvePy::representation(void) const +std::string GeometryCurvePy::representation() const { return ""; } @@ -975,7 +975,7 @@ PyObject* GeometryCurvePy::continuityWith(PyObject *args) return nullptr; } -Py::String GeometryCurvePy::getContinuity(void) const +Py::String GeometryCurvePy::getContinuity() const { GeomAbs_Shape c = Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->Continuity(); @@ -1009,13 +1009,13 @@ Py::String GeometryCurvePy::getContinuity(void) const return Py::String(str); } -Py::Float GeometryCurvePy::getFirstParameter(void) const +Py::Float GeometryCurvePy::getFirstParameter() const { return Py::Float(Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->FirstParameter()); } -Py::Float GeometryCurvePy::getLastParameter(void) const +Py::Float GeometryCurvePy::getLastParameter() const { return Py::Float(Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->LastParameter()); @@ -1135,7 +1135,7 @@ PyObject* GeometryCurvePy::intersect(PyObject *args) return nullptr; } -Py::Object GeometryCurvePy::getRotation(void) const +Py::Object GeometryCurvePy::getRotation() const { Handle(Geom_Conic) s = Handle(Geom_Conic)::DownCast(getGeometryPtr()->handle()); if(!s) diff --git a/src/Mod/Part/App/GeometryDefaultExtension.cpp b/src/Mod/Part/App/GeometryDefaultExtension.cpp index 4fecdd4d6a..d66cdb8479 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.cpp +++ b/src/Mod/Part/App/GeometryDefaultExtension.cpp @@ -66,7 +66,7 @@ void GeometryDefaultExtension::saveAttributes(Base::Writer &writer) const } template -std::unique_ptr GeometryDefaultExtension::copy(void) const +std::unique_ptr GeometryDefaultExtension::copy() const { std::unique_ptr> cpy = std::make_unique>(); @@ -93,7 +93,7 @@ std::unique_ptr GeometryDefaultExtension::copy(void) } template -PyObject * GeometryDefaultExtension::getPyObject(void) +PyObject * GeometryDefaultExtension::getPyObject() { THROWM(Base::NotImplementedError,"Python object not implemented for default geometry extension template type. Template Specialisation missing."); // use template specialisation to provide the actual object } @@ -108,7 +108,7 @@ namespace Part { TYPESYSTEM_SOURCE_TEMPLATE_T(Part::GeometryIntExtension,Part::GeometryPersistenceExtension) template <> -PyObject * GeometryDefaultExtension::getPyObject(void) +PyObject * GeometryDefaultExtension::getPyObject() { return new GeometryIntExtensionPy(new GeometryIntExtension(*this)); } @@ -125,7 +125,7 @@ void GeometryDefaultExtension::restoreAttributes(Base::XMLReader &reader) TYPESYSTEM_SOURCE_TEMPLATE_T(Part::GeometryStringExtension,Part::GeometryPersistenceExtension) template <> -PyObject * GeometryDefaultExtension::getPyObject(void) +PyObject * GeometryDefaultExtension::getPyObject() { return new GeometryStringExtensionPy(new GeometryStringExtension(*this)); } @@ -134,7 +134,7 @@ PyObject * GeometryDefaultExtension::getPyObject(void) TYPESYSTEM_SOURCE_TEMPLATE_T(Part::GeometryBoolExtension,Part::GeometryPersistenceExtension) template <> -PyObject * GeometryDefaultExtension::getPyObject(void) +PyObject * GeometryDefaultExtension::getPyObject() { return new GeometryBoolExtensionPy(new GeometryBoolExtension(*this)); } @@ -151,7 +151,7 @@ void GeometryDefaultExtension::restoreAttributes(Base::XMLReader &reader) TYPESYSTEM_SOURCE_TEMPLATE_T(Part::GeometryDoubleExtension,Part::GeometryPersistenceExtension) template <> -PyObject * GeometryDefaultExtension::getPyObject(void) +PyObject * GeometryDefaultExtension::getPyObject() { return new GeometryDoubleExtensionPy(new GeometryDoubleExtension(*this)); } diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h index 9ab4bdfdd3..9d84f747de 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.h +++ b/src/Mod/Part/App/GeometryDefaultExtension.h @@ -41,9 +41,9 @@ namespace Part { inline void setValue(const T& val) {value = val;}; inline const T &getValue() const {return value;}; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; protected: virtual void copyAttributes(Part::GeometryExtension * cpy) const override; diff --git a/src/Mod/Part/App/GeometryDoubleExtensionPyImp.cpp b/src/Mod/Part/App/GeometryDoubleExtensionPyImp.cpp index c93d472500..8e9d0a2c75 100644 --- a/src/Mod/Part/App/GeometryDoubleExtensionPyImp.cpp +++ b/src/Mod/Part/App/GeometryDoubleExtensionPyImp.cpp @@ -31,7 +31,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryDoubleExtensionPy::representation(void) const +std::string GeometryDoubleExtensionPy::representation() const { std::stringstream str; double val = getGeometryDoubleExtensionPtr()->getValue(); @@ -83,7 +83,7 @@ int GeometryDoubleExtensionPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Float GeometryDoubleExtensionPy::getValue(void) const +Py::Float GeometryDoubleExtensionPy::getValue() const { return Py::Float(this->getGeometryDoubleExtensionPtr()->getValue()); } diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h index 228d537530..fc1e1a54f3 100644 --- a/src/Mod/Part/App/GeometryExtension.h +++ b/src/Mod/Part/App/GeometryExtension.h @@ -40,9 +40,9 @@ class PartExport GeometryExtension: public Base::BaseClass public: virtual ~GeometryExtension() = default; - virtual std::unique_ptr copy(void) const = 0; + virtual std::unique_ptr copy() const = 0; - virtual PyObject *getPyObject(void) = 0; + virtual PyObject *getPyObject() = 0; PyObject* copyPyObject() const; inline void setName(const std::string& str) {name = str;} diff --git a/src/Mod/Part/App/GeometryExtensionPyImp.cpp b/src/Mod/Part/App/GeometryExtensionPyImp.cpp index ae5ac1af5a..2f434389e2 100644 --- a/src/Mod/Part/App/GeometryExtensionPyImp.cpp +++ b/src/Mod/Part/App/GeometryExtensionPyImp.cpp @@ -30,7 +30,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryExtensionPy::representation(void) const +std::string GeometryExtensionPy::representation() const { return ""; } @@ -76,7 +76,7 @@ PyObject* GeometryExtensionPy::copy(PyObject *args) return cpy; } -Py::String GeometryExtensionPy::getName(void) const +Py::String GeometryExtensionPy::getName() const { std::string name = this->getGeometryExtensionPtr()->getName(); diff --git a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp index bd3c91b397..3b8cfc3e17 100644 --- a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp +++ b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp @@ -29,7 +29,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryIntExtensionPy::representation(void) const +std::string GeometryIntExtensionPy::representation() const { std::stringstream str; long val = getGeometryIntExtensionPtr()->getValue(); @@ -81,7 +81,7 @@ int GeometryIntExtensionPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Long GeometryIntExtensionPy::getValue(void) const +Py::Long GeometryIntExtensionPy::getValue() const { return Py::Long(this->getGeometryIntExtensionPtr()->getValue()); } diff --git a/src/Mod/Part/App/GeometryMigrationExtension.cpp b/src/Mod/Part/App/GeometryMigrationExtension.cpp index 806412d54a..48ec344025 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.cpp +++ b/src/Mod/Part/App/GeometryMigrationExtension.cpp @@ -44,7 +44,7 @@ void GeometryMigrationExtension::copyAttributes(Part::GeometryExtension * cpy) c static_cast(cpy)->GeometryMigrationFlags = this->GeometryMigrationFlags; } -std::unique_ptr GeometryMigrationExtension::copy(void) const +std::unique_ptr GeometryMigrationExtension::copy() const { auto cpy = std::make_unique(); @@ -57,7 +57,7 @@ std::unique_ptr GeometryMigrationExtension::copy(void) #endif } -PyObject * GeometryMigrationExtension::getPyObject(void) +PyObject * GeometryMigrationExtension::getPyObject() { THROWM(Base::NotImplementedError, "GeometryMigrationExtension does not have a Python counterpart"); } diff --git a/src/Mod/Part/App/GeometryMigrationExtension.h b/src/Mod/Part/App/GeometryMigrationExtension.h index a9c68c5272..9a2a49641f 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.h +++ b/src/Mod/Part/App/GeometryMigrationExtension.h @@ -55,9 +55,9 @@ public: GeometryMigrationExtension(); virtual ~GeometryMigrationExtension() override = default; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual bool getConstruction() const {return ConstructionState;} diff --git a/src/Mod/Part/App/GeometryPyImp.cpp b/src/Mod/Part/App/GeometryPyImp.cpp index 1215901435..88db0fdfe7 100644 --- a/src/Mod/Part/App/GeometryPyImp.cpp +++ b/src/Mod/Part/App/GeometryPyImp.cpp @@ -43,7 +43,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryPy::representation(void) const +std::string GeometryPy::representation() const { return ""; } @@ -425,7 +425,7 @@ PyObject* GeometryPy::getExtensions(PyObject *args) } -Py::String GeometryPy::getTag(void) const +Py::String GeometryPy::getTag() const { std::string tmp = boost::uuids::to_string(getGeometryPtr()->getTag()); return Py::String(tmp); diff --git a/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp b/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp index 8e34ea05da..b5a03a6db5 100644 --- a/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp +++ b/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp @@ -33,7 +33,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometryStringExtensionPy::representation(void) const +std::string GeometryStringExtensionPy::representation() const { std::stringstream str; str << "getGeometryStringExtensionPtr()->getValue()); } diff --git a/src/Mod/Part/App/GeometrySurfacePyImp.cpp b/src/Mod/Part/App/GeometrySurfacePyImp.cpp index fdbf4069b9..aecc71d843 100644 --- a/src/Mod/Part/App/GeometrySurfacePyImp.cpp +++ b/src/Mod/Part/App/GeometrySurfacePyImp.cpp @@ -85,7 +85,7 @@ const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c) using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string GeometrySurfacePy::representation(void) const +std::string GeometrySurfacePy::representation() const { return ""; } @@ -687,7 +687,7 @@ PyObject* GeometrySurfacePy::VPeriod(PyObject * args) } } -Py::String GeometrySurfacePy::getContinuity(void) const +Py::String GeometrySurfacePy::getContinuity() const { GeomAbs_Shape c = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle())->Continuity(); @@ -876,7 +876,7 @@ PyObject* GeometrySurfacePy::intersect(PyObject *args) return nullptr; } -Py::Object GeometrySurfacePy::getRotation(void) const +Py::Object GeometrySurfacePy::getRotation() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp index 9cd15a9956..8337afd4b2 100644 --- a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp +++ b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp @@ -58,7 +58,7 @@ int HLRBRep_AlgoPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) } // returns a string which represents the object e.g. when printed in python -std::string HLRBRep_AlgoPy::representation(void) const +std::string HLRBRep_AlgoPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp index 10103b18c2..e5c296dd7e 100644 --- a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp +++ b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp @@ -72,7 +72,7 @@ int HLRBRep_PolyAlgoPy::PyInit(PyObject* args, PyObject* /*kwds*/) } // returns a string which represents the object e.g. when printed in python -std::string HLRBRep_PolyAlgoPy::representation(void) const +std::string HLRBRep_PolyAlgoPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp index 9e39f386a6..9cd935c9c0 100644 --- a/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp +++ b/src/Mod/Part/App/HLRBRep/HLRToShapePyImp.cpp @@ -50,7 +50,7 @@ int HLRToShapePy::PyInit(PyObject* args, PyObject* /*kwds*/) } // returns a string which represents the object e.g. when printed in python -std::string HLRToShapePy::representation(void) const +std::string HLRToShapePy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp b/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp index d31cc0f34b..6d2978ec84 100644 --- a/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp +++ b/src/Mod/Part/App/HLRBRep/PolyHLRToShapePyImp.cpp @@ -52,7 +52,7 @@ int PolyHLRToShapePy::PyInit(PyObject* args, PyObject* /*kwds*/) } // returns a string which represents the object e.g. when printed in python -std::string PolyHLRToShapePy::representation(void) const +std::string PolyHLRToShapePy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/HyperbolaPyImp.cpp b/src/Mod/Part/App/HyperbolaPyImp.cpp index b3a65c4d99..0abf235705 100644 --- a/src/Mod/Part/App/HyperbolaPyImp.cpp +++ b/src/Mod/Part/App/HyperbolaPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string HyperbolaPy::representation(void) const +std::string HyperbolaPy::representation() const { return ""; } @@ -125,7 +125,7 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Float HyperbolaPy::getMajorRadius(void) const +Py::Float HyperbolaPy::getMajorRadius() const { Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->MajorRadius()); @@ -137,7 +137,7 @@ void HyperbolaPy::setMajorRadius(Py::Float arg) hyperbola->SetMajorRadius((double)arg); } -Py::Float HyperbolaPy::getMinorRadius(void) const +Py::Float HyperbolaPy::getMinorRadius() const { Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->MinorRadius()); @@ -149,20 +149,20 @@ void HyperbolaPy::setMinorRadius(Py::Float arg) hyperbola->SetMinorRadius((double)arg); } -Py::Float HyperbolaPy::getFocal(void) const +Py::Float HyperbolaPy::getFocal() const { Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->Focal()); } -Py::Object HyperbolaPy::getFocus1(void) const +Py::Object HyperbolaPy::getFocus1() const { Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); gp_Pnt loc = hyperbola->Focus1(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } -Py::Object HyperbolaPy::getFocus2(void) const +Py::Object HyperbolaPy::getFocus2() const { Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); gp_Pnt loc = hyperbola->Focus2(); diff --git a/src/Mod/Part/App/LinePyImp.cpp b/src/Mod/Part/App/LinePyImp.cpp index 2a43b36023..b593074341 100644 --- a/src/Mod/Part/App/LinePyImp.cpp +++ b/src/Mod/Part/App/LinePyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string LinePy::representation(void) const +std::string LinePy::representation() const { return ""; } @@ -119,7 +119,7 @@ int LinePy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Object LinePy::getLocation(void) const +Py::Object LinePy::getLocation() const { Handle(Geom_Line) this_curve = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); @@ -169,7 +169,7 @@ void LinePy::setLocation(Py::Object arg) } } -Py::Object LinePy::getDirection(void) const +Py::Object LinePy::getDirection() const { Handle(Geom_Line) this_curve = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); diff --git a/src/Mod/Part/App/OffsetCurvePyImp.cpp b/src/Mod/Part/App/OffsetCurvePyImp.cpp index 6b18074a0b..2b5f132473 100644 --- a/src/Mod/Part/App/OffsetCurvePyImp.cpp +++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string OffsetCurvePy::representation(void) const +std::string OffsetCurvePy::representation() const { return ""; } @@ -82,7 +82,7 @@ int OffsetCurvePy::PyInit(PyObject* args, PyObject* /*kwd*/) } } -Py::Float OffsetCurvePy::getOffsetValue(void) const +Py::Float OffsetCurvePy::getOffsetValue() const { Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Offset()); @@ -94,7 +94,7 @@ void OffsetCurvePy::setOffsetValue(Py::Float arg) curve->SetOffsetValue((double)arg); } -Py::Object OffsetCurvePy::getOffsetDirection(void) const +Py::Object OffsetCurvePy::getOffsetDirection() const { Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); const gp_Dir& dir = curve->Direction(); @@ -121,7 +121,7 @@ void OffsetCurvePy::setOffsetDirection(Py::Object arg) } } -Py::Object OffsetCurvePy::getBasisCurve(void) const +Py::Object OffsetCurvePy::getBasisCurve() const { Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); Handle(Geom_Curve) basis = curve->BasisCurve(); diff --git a/src/Mod/Part/App/OffsetSurfacePyImp.cpp b/src/Mod/Part/App/OffsetSurfacePyImp.cpp index 792333c817..29a8a3ac2f 100644 --- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp +++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp @@ -34,7 +34,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string OffsetSurfacePy::representation(void) const +std::string OffsetSurfacePy::representation() const { return ""; } @@ -75,7 +75,7 @@ int OffsetSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) } } -Py::Float OffsetSurfacePy::getOffsetValue(void) const +Py::Float OffsetSurfacePy::getOffsetValue() const { Handle(Geom_OffsetSurface) surf = Handle(Geom_OffsetSurface)::DownCast(getGeometryPtr()->handle()); return Py::Float(surf->Offset()); @@ -87,7 +87,7 @@ void OffsetSurfacePy::setOffsetValue(Py::Float arg) surf->SetOffsetValue((double)arg); } -Py::Object OffsetSurfacePy::getBasisSurface(void) const +Py::Object OffsetSurfacePy::getBasisSurface() const { Handle(Geom_OffsetSurface) surf = Handle(Geom_OffsetSurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/ParabolaPyImp.cpp b/src/Mod/Part/App/ParabolaPyImp.cpp index 83947e9ed0..d7c676802c 100644 --- a/src/Mod/Part/App/ParabolaPyImp.cpp +++ b/src/Mod/Part/App/ParabolaPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ParabolaPy::representation(void) const +std::string ParabolaPy::representation() const { return ""; } @@ -157,7 +157,7 @@ PyObject* ParabolaPy::compute(PyObject *args) Py_Return; } -Py::Float ParabolaPy::getFocal(void) const +Py::Float ParabolaPy::getFocal() const { Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Focal()); @@ -169,7 +169,7 @@ void ParabolaPy::setFocal(Py::Float arg) curve->SetFocal((double)arg); } -Py::Object ParabolaPy::getFocus(void) const +Py::Object ParabolaPy::getFocus() const { Handle(Geom_Parabola) c = Handle(Geom_Parabola)::DownCast (getGeometryPtr()->handle()); @@ -177,7 +177,7 @@ Py::Object ParabolaPy::getFocus(void) const return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } -Py::Float ParabolaPy::getParameter(void) const +Py::Float ParabolaPy::getParameter() const { Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Parameter()); diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h index 4291c38019..157953e6c0 100644 --- a/src/Mod/Part/App/Part2DObject.h +++ b/src/Mod/Part/App/Part2DObject.h @@ -58,7 +58,7 @@ public: virtual void transformPlacement(const Base::Placement &transform) override; /// returns the number of construction lines (to be used as axes) - virtual int getAxisCount(void) const; + virtual int getAxisCount() const; /// retrieves an axis iterating through the construction lines of the sketch (indices start at 0) virtual Base::Axis getAxis(int axId) const; /// verify and accept the assigned geometry @@ -85,10 +85,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartGui::ViewProvider2DObject"; } //@} diff --git a/src/Mod/Part/App/Part2DObjectPyImp.cpp b/src/Mod/Part/App/Part2DObjectPyImp.cpp index fb0dd3b01b..cce74f31d6 100644 --- a/src/Mod/Part/App/Part2DObjectPyImp.cpp +++ b/src/Mod/Part/App/Part2DObjectPyImp.cpp @@ -33,7 +33,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string Part2DObjectPy::representation(void) const +std::string Part2DObjectPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index f469ca6867..30a2717984 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -74,7 +74,7 @@ FC_LOG_LEVEL_INIT("Part",true,true) PROPERTY_SOURCE(Part::Feature, App::GeoFeature) -Feature::Feature(void) +Feature::Feature() { ADD_PROPERTY(Shape, (TopoDS_Shape())); } @@ -83,12 +83,12 @@ Feature::~Feature() { } -short Feature::mustExecute(void) const +short Feature::mustExecute() const { return GeoFeature::mustExecute(); } -App::DocumentObjectExecReturn *Feature::recompute(void) +App::DocumentObjectExecReturn *Feature::recompute() { try { return App::GeoFeature::recompute(); @@ -101,13 +101,13 @@ App::DocumentObjectExecReturn *Feature::recompute(void) } } -App::DocumentObjectExecReturn *Feature::execute(void) +App::DocumentObjectExecReturn *Feature::execute() { this->Shape.touch(); return GeoFeature::execute(); } -PyObject *Feature::getPyObject(void) +PyObject *Feature::getPyObject() { if (PythonObject.is(Py::_None())){ // ref counter is set to 1 @@ -645,7 +645,7 @@ ShapeHistory Feature::joinHistory(const ShapeHistory& oldH, const ShapeHistory& } /// returns the type name of the ViewProvider -const char* Feature::getViewProviderName(void) const { +const char* Feature::getViewProviderName() const { return "PartGui::ViewProviderPart"; } @@ -681,10 +681,10 @@ PROPERTY_SOURCE(Part::FeatureExt, Part::Feature) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Part::FeaturePython, Part::Feature) -template<> const char* Part::FeaturePython::getViewProviderName(void) const { +template<> const char* Part::FeaturePython::getViewProviderName() const { return "PartGui::ViewProviderPython"; } -template<> PyObject* Part::FeaturePython::getPyObject(void) { +template<> PyObject* Part::FeaturePython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h index 9bcfd0d9e3..41e84f4009 100644 --- a/src/Mod/Part/App/PartFeature.h +++ b/src/Mod/Part/App/PartFeature.h @@ -48,7 +48,7 @@ class PartExport Feature : public App::GeoFeature public: /// Constructor - Feature(void); + Feature(); virtual ~Feature(); PropertyPartShape Shape; @@ -148,7 +148,7 @@ class PartExport FeatureExt : public Feature PROPERTY_HEADER(Part::FeatureExt); public: - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderPartExt"; } }; diff --git a/src/Mod/Part/App/PartFeaturePyImp.cpp b/src/Mod/Part/App/PartFeaturePyImp.cpp index b4e1d618d8..7f184ea346 100644 --- a/src/Mod/Part/App/PartFeaturePyImp.cpp +++ b/src/Mod/Part/App/PartFeaturePyImp.cpp @@ -32,7 +32,7 @@ using namespace Part; // returns a string which represent the object e.g. when printed in python -std::string PartFeaturePy::representation(void) const +std::string PartFeaturePy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/PartFeatureReference.cpp b/src/Mod/Part/App/PartFeatureReference.cpp index 0a2bfd4cdf..74d1aa0b5e 100644 --- a/src/Mod/Part/App/PartFeatureReference.cpp +++ b/src/Mod/Part/App/PartFeatureReference.cpp @@ -37,7 +37,7 @@ using namespace Part; PROPERTY_SOURCE(Part::FeatureReference, App::GeoFeature) -FeatureReference::FeatureReference(void) +FeatureReference::FeatureReference() { ADD_PROPERTY(Reference, (nullptr)); } @@ -46,12 +46,12 @@ FeatureReference::~FeatureReference() { } -short FeatureReference::mustExecute(void) const +short FeatureReference::mustExecute() const { return GeoFeature::mustExecute(); } -App::DocumentObjectExecReturn *FeatureReference::execute(void) +App::DocumentObjectExecReturn *FeatureReference::execute() { return App::DocumentObject::StdReturn; } diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h index f6b6074f31..1520819fc0 100644 --- a/src/Mod/Part/App/PartFeatureReference.h +++ b/src/Mod/Part/App/PartFeatureReference.h @@ -41,7 +41,7 @@ class PartExport FeatureReference : public App::GeoFeature public: /// Constructor - FeatureReference(void); + FeatureReference(); virtual ~FeatureReference(); App::PropertyLink Reference; @@ -49,12 +49,12 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(void); - virtual short mustExecute(void) const; + virtual App::DocumentObjectExecReturn *execute(); + virtual short mustExecute() const; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PartGui::ViewProviderPartReference"; } protected: diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp index 9d39428935..51fe06145c 100644 --- a/src/Mod/Part/App/PartFeatures.cpp +++ b/src/Mod/Part/App/PartFeatures.cpp @@ -111,7 +111,7 @@ App::DocumentObjectExecReturn* RuledSurface::getShape(const App::PropertyLinkSub return nullptr; } -App::DocumentObjectExecReturn *RuledSurface::execute(void) +App::DocumentObjectExecReturn *RuledSurface::execute() { try { App::DocumentObjectExecReturn* ret; @@ -278,7 +278,7 @@ void Loft::onChanged(const App::Property* prop) Part::Feature::onChanged(prop); } -App::DocumentObjectExecReturn *Loft::execute(void) +App::DocumentObjectExecReturn *Loft::execute() { if (Sections.getSize() == 0) return new App::DocumentObjectExecReturn("No sections linked."); @@ -394,7 +394,7 @@ void Sweep::onChanged(const App::Property* prop) Part::Feature::onChanged(prop); } -App::DocumentObjectExecReturn *Sweep::execute(void) +App::DocumentObjectExecReturn *Sweep::execute() { if (Sections.getSize() == 0) return new App::DocumentObjectExecReturn("No sections linked."); @@ -615,7 +615,7 @@ void Thickness::handleChangedPropertyType(Base::XMLReader &reader, const char *T } } -App::DocumentObjectExecReturn *Thickness::execute(void) +App::DocumentObjectExecReturn *Thickness::execute() { App::DocumentObject* source = Faces.getValue(); if (!source) @@ -663,7 +663,7 @@ Refine::Refine() ADD_PROPERTY_TYPE(Source,(nullptr),"Refine",App::Prop_None,"Source shape"); } -App::DocumentObjectExecReturn *Refine::execute(void) +App::DocumentObjectExecReturn *Refine::execute() { Part::Feature* source = Source.getValue(); if (!source) @@ -688,7 +688,7 @@ Reverse::Reverse() ADD_PROPERTY_TYPE(Source, (nullptr), "Reverse", App::Prop_None, "Source shape"); } -App::DocumentObjectExecReturn* Reverse::execute(void) +App::DocumentObjectExecReturn* Reverse::execute() { App::DocumentObject* source = Source.getValue(); Part::TopoShape topoShape = Part::Feature::getShape(source); diff --git a/src/Mod/Part/App/PartFeatures.h b/src/Mod/Part/App/PartFeatures.h index 1b25bee920..fc6d89040b 100644 --- a/src/Mod/Part/App/PartFeatures.h +++ b/src/Mod/Part/App/PartFeatures.h @@ -46,9 +46,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderRuledSurface"; } //@} @@ -79,9 +79,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderLoft"; } //@} @@ -109,9 +109,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderSweep"; } //@} @@ -140,9 +140,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderThickness"; } //@} @@ -167,8 +167,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); - const char* getViewProviderName(void) const { + App::DocumentObjectExecReturn *execute(); + const char* getViewProviderName() const { return "PartGui::ViewProviderRefine"; } //@} @@ -186,8 +186,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn* execute(void); - const char* getViewProviderName(void) const { + App::DocumentObjectExecReturn* execute(); + const char* getViewProviderName() const { return "PartGui::ViewProviderReverse"; } //@} diff --git a/src/Mod/Part/App/PlanePyImp.cpp b/src/Mod/Part/App/PlanePyImp.cpp index 0ec88baec3..37a26e00a4 100644 --- a/src/Mod/Part/App/PlanePyImp.cpp +++ b/src/Mod/Part/App/PlanePyImp.cpp @@ -44,7 +44,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string PlanePy::representation(void) const +std::string PlanePy::representation() const { return ""; } @@ -167,7 +167,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) return -1; } -Py::Object PlanePy::getPosition(void) const +Py::Object PlanePy::getPosition() const { Handle(Geom_Plane) this_surf = Handle(Geom_Plane)::DownCast (this->getGeomPlanePtr()->handle()); @@ -207,7 +207,7 @@ void PlanePy::setPosition(Py::Object arg) } } -Py::Object PlanePy::getAxis(void) const +Py::Object PlanePy::getAxis() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/PlateSurfacePyImp.cpp b/src/Mod/Part/App/PlateSurfacePyImp.cpp index 1233510ead..d02f5a811a 100644 --- a/src/Mod/Part/App/PlateSurfacePyImp.cpp +++ b/src/Mod/Part/App/PlateSurfacePyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string PlateSurfacePy::representation(void) const +std::string PlateSurfacePy::representation() const { return ""; } diff --git a/src/Mod/Part/App/PointPyImp.cpp b/src/Mod/Part/App/PointPyImp.cpp index 18faf0f5fe..d90946744d 100644 --- a/src/Mod/Part/App/PointPyImp.cpp +++ b/src/Mod/Part/App/PointPyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string PointPy::representation(void) const +std::string PointPy::representation() const { std::stringstream str; Base::Vector3d coords = getGeomPointPtr()->getPoint(); @@ -122,7 +122,7 @@ PyObject* PointPy::toShape(PyObject *args) return nullptr; } -Py::Float PointPy::getX(void) const +Py::Float PointPy::getX() const { Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); @@ -142,7 +142,7 @@ void PointPy::setX(Py::Float X) } } -Py::Float PointPy::getY(void) const +Py::Float PointPy::getY() const { Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); @@ -162,7 +162,7 @@ void PointPy::setY(Py::Float Y) } } -Py::Float PointPy::getZ(void) const +Py::Float PointPy::getZ() const { Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp index 0ca8b6285a..571023ebe1 100644 --- a/src/Mod/Part/App/PrimitiveFeature.cpp +++ b/src/Mod/Part/App/PrimitiveFeature.cpp @@ -69,7 +69,7 @@ using namespace Part; PROPERTY_SOURCE_ABSTRACT_WITH_EXTENSIONS(Part::Primitive, Part::Feature) -Primitive::Primitive(void) +Primitive::Primitive() { AttachExtension::initExtension(this); touch(); @@ -79,12 +79,12 @@ Primitive::~Primitive() { } -short Primitive::mustExecute(void) const +short Primitive::mustExecute() const { return Feature::mustExecute(); } -App::DocumentObjectExecReturn* Primitive::execute(void) { +App::DocumentObjectExecReturn* Primitive::execute() { return Part::Feature::execute(); } @@ -183,7 +183,7 @@ short Vertex::mustExecute() const return Part::Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Vertex::execute(void) +App::DocumentObjectExecReturn *Vertex::execute() { gp_Pnt point; point.SetX(this->X.getValue()); @@ -241,7 +241,7 @@ short Line::mustExecute() const return Part::Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Line::execute(void) +App::DocumentObjectExecReturn *Line::execute() { gp_Pnt point1; point1.SetX(this->X1.getValue()); @@ -293,7 +293,7 @@ short Plane::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Plane::execute(void) +App::DocumentObjectExecReturn *Plane::execute() { double L = this->Length.getValue(); double W = this->Width.getValue(); @@ -341,7 +341,7 @@ App::DocumentObjectExecReturn *Plane::execute(void) PROPERTY_SOURCE(Part::Sphere, Part::Primitive) -Sphere::Sphere(void) +Sphere::Sphere() { ADD_PROPERTY_TYPE(Radius,(5.0),"Sphere",App::Prop_None,"The radius of the sphere"); Radius.setConstraints(&quantityRange); @@ -366,7 +366,7 @@ short Sphere::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Sphere::execute(void) +App::DocumentObjectExecReturn *Sphere::execute() { // Build a sphere if (Radius.getValue() < Precision::Confusion()) @@ -389,7 +389,7 @@ App::DocumentObjectExecReturn *Sphere::execute(void) PROPERTY_SOURCE(Part::Ellipsoid, Part::Primitive) -Ellipsoid::Ellipsoid(void) +Ellipsoid::Ellipsoid() { ADD_PROPERTY_TYPE(Radius1,(2.0),"Ellipsoid",App::Prop_None,"The radius of the ellipsoid"); Radius1.setConstraints(&quantityRange); @@ -422,7 +422,7 @@ short Ellipsoid::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Ellipsoid::execute(void) +App::DocumentObjectExecReturn *Ellipsoid::execute() { // Build a sphere if (Radius1.getValue() < Precision::Confusion()) @@ -471,7 +471,7 @@ App::DocumentObjectExecReturn *Ellipsoid::execute(void) PROPERTY_SOURCE(Part::Cylinder, Part::Primitive) -Cylinder::Cylinder(void) +Cylinder::Cylinder() { ADD_PROPERTY_TYPE(Radius,(2.0),"Cylinder",App::Prop_None,"The radius of the cylinder"); ADD_PROPERTY_TYPE(Height,(10.0f),"Cylinder",App::Prop_None,"The height of the cylinder"); @@ -492,7 +492,7 @@ short Cylinder::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Cylinder::execute(void) +App::DocumentObjectExecReturn *Cylinder::execute() { // Build a cylinder if (Radius.getValue() < Precision::Confusion()) @@ -522,7 +522,7 @@ App::PropertyIntegerConstraint::Constraints Prism::polygonRange = {3,INT_MAX,1}; PROPERTY_SOURCE(Part::Prism, Part::Primitive) -Prism::Prism(void) +Prism::Prism() { ADD_PROPERTY_TYPE(Polygon, (6.0), "Prism", App::Prop_None, "Number of sides in the polygon, of the prism"); ADD_PROPERTY_TYPE(Circumradius, (2.0), "Prism", App::Prop_None, "Circumradius (centre to vertex) of the polygon, of the prism"); @@ -543,7 +543,7 @@ short Prism::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Prism::execute(void) +App::DocumentObjectExecReturn *Prism::execute() { // Build a prism if (Polygon.getValue() < 3) @@ -581,7 +581,7 @@ App::PropertyIntegerConstraint::Constraints RegularPolygon::polygon = {3,INT_MAX PROPERTY_SOURCE(Part::RegularPolygon, Part::Primitive) -RegularPolygon::RegularPolygon(void) +RegularPolygon::RegularPolygon() { ADD_PROPERTY_TYPE(Polygon,(6.0),"RegularPolygon",App::Prop_None,"Number of sides in the regular polygon"); ADD_PROPERTY_TYPE(Circumradius,(2.0),"RegularPolygon",App::Prop_None,"Circumradius (centre to vertex) of the polygon"); @@ -597,7 +597,7 @@ short RegularPolygon::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *RegularPolygon::execute(void) +App::DocumentObjectExecReturn *RegularPolygon::execute() { // Build a regular polygon if (Polygon.getValue() < 3) @@ -632,7 +632,7 @@ App::DocumentObjectExecReturn *RegularPolygon::execute(void) PROPERTY_SOURCE(Part::Cone, Part::Primitive) -Cone::Cone(void) +Cone::Cone() { ADD_PROPERTY_TYPE(Radius1,(2.0),"Cone",App::Prop_None,"The radius of the cone"); ADD_PROPERTY_TYPE(Radius2,(4.0),"Cone",App::Prop_None,"The radius of the cone"); @@ -654,7 +654,7 @@ short Cone::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Cone::execute(void) +App::DocumentObjectExecReturn *Cone::execute() { if (Radius1.getValue() < 0) return new App::DocumentObjectExecReturn("Radius of cone too small"); @@ -681,7 +681,7 @@ App::DocumentObjectExecReturn *Cone::execute(void) PROPERTY_SOURCE(Part::Torus, Part::Primitive) -Torus::Torus(void) +Torus::Torus() { ADD_PROPERTY_TYPE(Radius1,(10.0),"Torus",App::Prop_None,"The radius of the torus"); Radius1.setConstraints(&quantityRange); @@ -710,7 +710,7 @@ short Torus::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Torus::execute(void) +App::DocumentObjectExecReturn *Torus::execute() { if (Radius1.getValue() < Precision::Confusion()) return new App::DocumentObjectExecReturn("Radius of torus too small"); @@ -736,7 +736,7 @@ PROPERTY_SOURCE(Part::Helix, Part::Primitive) const char* Part::Helix::LocalCSEnums[]= {"Right-handed","Left-handed",nullptr}; const char* Part::Helix::StyleEnums []= {"Old style","New style",nullptr}; -Helix::Helix(void) +Helix::Helix() { ADD_PROPERTY_TYPE(Pitch, (1.0),"Helix",App::Prop_None,"The pitch of the helix"); Pitch.setConstraints(&quantityRange); @@ -788,7 +788,7 @@ short Helix::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Helix::execute(void) +App::DocumentObjectExecReturn *Helix::execute() { try { Standard_Real myPitch = Pitch.getValue(); @@ -816,7 +816,7 @@ App::DocumentObjectExecReturn *Helix::execute(void) PROPERTY_SOURCE(Part::Spiral, Part::Primitive) -Spiral::Spiral(void) +Spiral::Spiral() { ADD_PROPERTY_TYPE(Growth, (1.0),"Spiral",App::Prop_None,"The growth of the spiral per rotation"); Growth.setConstraints(&quantityRange); @@ -855,7 +855,7 @@ short Spiral::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Spiral::execute(void) +App::DocumentObjectExecReturn *Spiral::execute() { try { Standard_Real myNumRot = Rotations.getValue(); @@ -907,7 +907,7 @@ short Wedge::mustExecute() const return Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Wedge::execute(void) +App::DocumentObjectExecReturn *Wedge::execute() { double xmin = Xmin.getValue(); double ymin = Ymin.getValue(); @@ -1002,7 +1002,7 @@ short Ellipse::mustExecute() const return Part::Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Ellipse::execute(void) +App::DocumentObjectExecReturn *Ellipse::execute() { if (this->MinorRadius.getValue() > this->MajorRadius.getValue()) return new App::DocumentObjectExecReturn("Minor radius greater than major radius"); diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h index 9c5d0801fa..c7618311b5 100644 --- a/src/Mod/Part/App/PrimitiveFeature.h +++ b/src/Mod/Part/App/PrimitiveFeature.h @@ -41,7 +41,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; PyObject* getPyObject() override; //@} @@ -68,11 +68,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; void onChanged(const App::Property*); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderPointParametric"; } //@} @@ -96,11 +96,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; void onChanged(const App::Property*); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderLineParametric"; } //@} @@ -119,10 +119,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderPlaneParametric"; } //@} @@ -143,10 +143,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderSphereParametric"; } //@} @@ -169,10 +169,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PartGui::ViewProviderEllipsoid"; } }; @@ -192,10 +192,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderCylinderParametric"; } //@} @@ -216,10 +216,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderPrism"; } //@} @@ -240,10 +240,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderRegularPolygon"; } //@} @@ -266,10 +266,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderConeParametric"; } //@} @@ -291,10 +291,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderTorusParametric"; } //@} @@ -318,10 +318,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderHelixParametric"; } //@} @@ -349,10 +349,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderSpiralParametric"; } //@} @@ -382,10 +382,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderWedge"; } //@} @@ -410,11 +410,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; void onChanged(const App::Property*); /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartGui::ViewProviderEllipseParametric"; } //@} diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h index dff9b5dcfe..f0ccf5593c 100644 --- a/src/Mod/Part/App/PrismExtension.h +++ b/src/Mod/Part/App/PrismExtension.h @@ -46,8 +46,8 @@ public: TopoDS_Shape makePrism(double height, const TopoDS_Face& face) const; - virtual short int extensionMustExecute(void); - virtual App::DocumentObjectExecReturn *extensionExecute(void); + virtual short int extensionMustExecute(); + virtual App::DocumentObjectExecReturn *extensionExecute(); protected: virtual void extensionOnChanged(const App::Property* /*prop*/); diff --git a/src/Mod/Part/App/PropertyGeometryList.cpp b/src/Mod/Part/App/PropertyGeometryList.cpp index cfdd64fdc6..26ea2096be 100644 --- a/src/Mod/Part/App/PropertyGeometryList.cpp +++ b/src/Mod/Part/App/PropertyGeometryList.cpp @@ -65,7 +65,7 @@ void PropertyGeometryList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyGeometryList::getSize(void) const +int PropertyGeometryList::getSize() const { return static_cast(_lValueList.size()); } @@ -118,7 +118,7 @@ void PropertyGeometryList::set1Value(int idx, std::unique_ptr &&lValue hasSetValue(); } -PyObject *PropertyGeometryList::getPyObject(void) +PyObject *PropertyGeometryList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -219,7 +219,7 @@ void PropertyGeometryList::Restore(Base::XMLReader &reader) setValues(std::move(values)); } -App::Property *PropertyGeometryList::Copy(void) const +App::Property *PropertyGeometryList::Copy() const { PropertyGeometryList *p = new PropertyGeometryList(); p->setValues(_lValueList); @@ -232,7 +232,7 @@ void PropertyGeometryList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyGeometryList::getMemSize(void) const +unsigned int PropertyGeometryList::getMemSize() const { int size = sizeof(PropertyGeometryList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h index 3a31b07f9b..43991a2188 100644 --- a/src/Mod/Part/App/PropertyGeometryList.h +++ b/src/Mod/Part/App/PropertyGeometryList.h @@ -56,7 +56,7 @@ public: virtual ~PropertyGeometryList(); virtual void setSize(int newSize); - virtual int getSize(void) const; + virtual int getSize() const; /** Sets the property */ @@ -69,22 +69,22 @@ public: return _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } void set1Value(int idx, std::unique_ptr &&); - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual void setPyObject(PyObject *); virtual void Save(Base::Writer &writer) const; virtual void Restore(Base::XMLReader &reader); - virtual App::Property *Copy(void) const; + virtual App::Property *Copy() const; virtual void Paste(const App::Property &from); - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; private: std::vector _lValueList; diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h index 0a0fe92fd6..323c7c6640 100644 --- a/src/Mod/Part/App/PropertyTopoShape.h +++ b/src/Mod/Part/App/PropertyTopoShape.h @@ -53,7 +53,7 @@ public: /// set the part shape void setValue(const TopoDS_Shape&); /// get the part shape - const TopoDS_Shape& getValue(void) const; + const TopoDS_Shape& getValue() const; const TopoShape& getShape() const; const Data::ComplexGeoData* getComplexData() const; //@} @@ -76,7 +76,7 @@ public: /** @name Python interface */ //@{ - PyObject* getPyObject(void); + PyObject* getPyObject(); void setPyObject(PyObject *value); //@} @@ -88,9 +88,9 @@ public: void SaveDocFile (Base::Writer &writer) const; void RestoreDocFile(Base::Reader &reader); - App::Property *Copy(void) const; + App::Property *Copy() const; void Paste(const App::Property &from); - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; //@} /// Get valid paths for this property; used by auto completer @@ -128,7 +128,7 @@ public: virtual void setSize(int newSize) { _lValueList.resize(newSize); } - virtual int getSize(void) const { + virtual int getSize() const { return _lValueList.size(); } @@ -138,11 +138,11 @@ public: void setValues (const std::vector& values); - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual void setPyObject(PyObject *); virtual void Save (Base::Writer &writer) const; @@ -151,10 +151,10 @@ public: virtual void SaveDocFile (Base::Writer &writer) const; virtual void RestoreDocFile(Base::Reader &reader); - virtual Property *Copy(void) const; + virtual Property *Copy() const; virtual void Paste(const Property &from); - virtual unsigned int getMemSize (void) const { + virtual unsigned int getMemSize () const { return _lValueList.size() * sizeof(ShapeHistory); } @@ -181,7 +181,7 @@ public: virtual void setSize(int newSize) { _lValueList.resize(newSize); } - virtual int getSize(void) const { + virtual int getSize() const { return _lValueList.size(); } @@ -191,11 +191,11 @@ public: void setValues (const std::vector& values); - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual void setPyObject(PyObject *); virtual void Save (Base::Writer &writer) const; @@ -204,10 +204,10 @@ public: virtual void SaveDocFile (Base::Writer &writer) const; virtual void RestoreDocFile(Base::Reader &reader); - virtual Property *Copy(void) const; + virtual Property *Copy() const; virtual void Paste(const Property &from); - virtual unsigned int getMemSize (void) const { + virtual unsigned int getMemSize () const { return _lValueList.size() * sizeof(FilletElement); } diff --git a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp index 09a7658b88..ab808449f4 100644 --- a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp +++ b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp @@ -36,7 +36,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string RectangularTrimmedSurfacePy::representation(void) const +std::string RectangularTrimmedSurfacePy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp index 7f6120cbcd..849568b52c 100644 --- a/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp +++ b/src/Mod/Part/App/ShapeUpgrade/UnifySameDomainPyImp.cpp @@ -106,7 +106,7 @@ PyObject* UnifySameDomainPy::initialize(PyObject *args, PyObject* kwds) } // returns a string which represents the object e.g. when printed in python -std::string UnifySameDomainPy::representation(void) const +std::string UnifySameDomainPy::representation() const { return std::string(""); } diff --git a/src/Mod/Part/App/SpherePyImp.cpp b/src/Mod/Part/App/SpherePyImp.cpp index 554677caf9..9f76fa4b3a 100644 --- a/src/Mod/Part/App/SpherePyImp.cpp +++ b/src/Mod/Part/App/SpherePyImp.cpp @@ -37,7 +37,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string SpherePy::representation(void) const +std::string SpherePy::representation() const { Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); @@ -75,7 +75,7 @@ int SpherePy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Float SpherePy::getRadius(void) const +Py::Float SpherePy::getRadius() const { Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); @@ -89,21 +89,21 @@ void SpherePy::setRadius(Py::Float arg) sphere->SetRadius((double)arg); } -Py::Float SpherePy::getArea(void) const +Py::Float SpherePy::getArea() const { Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); return Py::Float(sphere->Area()); } -Py::Float SpherePy::getVolume(void) const +Py::Float SpherePy::getVolume() const { Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); return Py::Float(sphere->Volume()); } -Py::Object SpherePy::getCenter(void) const +Py::Object SpherePy::getCenter() const { Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); @@ -133,7 +133,7 @@ void SpherePy::setCenter(Py::Object arg) } } -Py::Object SpherePy::getAxis(void) const +Py::Object SpherePy::getAxis() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp index 670bf36ebf..be53783f48 100644 --- a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp +++ b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp @@ -38,7 +38,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string SurfaceOfExtrusionPy::representation(void) const +std::string SurfaceOfExtrusionPy::representation() const { return std::string(""); } @@ -81,7 +81,7 @@ int SurfaceOfExtrusionPy::PyInit(PyObject* args, PyObject* /*kwd*/) } } -Py::Object SurfaceOfExtrusionPy::getDirection(void) const +Py::Object SurfaceOfExtrusionPy::getDirection() const { Handle(Geom_SurfaceOfLinearExtrusion) curve = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); @@ -115,7 +115,7 @@ namespace Part { extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c); } -Py::Object SurfaceOfExtrusionPy::getBasisCurve(void) const +Py::Object SurfaceOfExtrusionPy::getBasisCurve() const { Handle(Geom_SurfaceOfLinearExtrusion) surf = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp index f338abab48..df7164cb16 100644 --- a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp +++ b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp @@ -36,7 +36,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string SurfaceOfRevolutionPy::representation(void) const +std::string SurfaceOfRevolutionPy::representation() const { return std::string(""); } @@ -83,7 +83,7 @@ int SurfaceOfRevolutionPy::PyInit(PyObject* args, PyObject* /*kwd*/) } } -Py::Object SurfaceOfRevolutionPy::getLocation(void) const +Py::Object SurfaceOfRevolutionPy::getLocation() const { Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); @@ -113,7 +113,7 @@ void SurfaceOfRevolutionPy::setLocation(Py::Object arg) } } -Py::Object SurfaceOfRevolutionPy::getDirection(void) const +Py::Object SurfaceOfRevolutionPy::getDirection() const { Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); @@ -147,7 +147,7 @@ namespace Part { extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c); } -Py::Object SurfaceOfRevolutionPy::getBasisCurve(void) const +Py::Object SurfaceOfRevolutionPy::getBasisCurve() const { Handle(Geom_SurfaceOfRevolution) surf = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 949a45115d..e81defea55 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -297,7 +297,7 @@ TopoShape::TopoShape(const TopoShape& shape) Tag = shape.Tag; } -std::vector TopoShape::getElementTypes(void) const +std::vector TopoShape::getElementTypes() const { static const std::vector temp = {"Face","Edge","Vertex"}; return temp; @@ -642,7 +642,7 @@ void TopoShape::setTransform(const Base::Matrix4D& rclTrf) _Shape.Location(loc); } -Base::Matrix4D TopoShape::getTransform(void) const +Base::Matrix4D TopoShape::getTransform() const { Base::Matrix4D mtrx; gp_Trsf Trf = _Shape.Location().Transformation(); @@ -670,7 +670,7 @@ void TopoShape::setShapePlacement(const Base::Placement& rclTrf) /*! * \obsolete */ -Base::Placement TopoShape::getShapePlacement(void) const +Base::Placement TopoShape::getShapePlacement() const { TopLoc_Location loc = _Shape.Location(); gp_Trsf trsf = loc.Transformation(); @@ -1136,7 +1136,7 @@ void TopoShape::exportLineSet(std::ostream& str) const } } -Base::BoundBox3d TopoShape::getBoundBox(void) const +Base::BoundBox3d TopoShape::getBoundBox() const { Base::BoundBox3d box; try { @@ -1218,7 +1218,7 @@ unsigned int TopoShape_RefCountShapes(const TopoDS_Shape& aShape) return size; } -unsigned int TopoShape::getMemSize (void) const +unsigned int TopoShape::getMemSize () const { if (!_Shape.IsNull()) { // Count total amount of references of TopoDS_Shape objects diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 1b9b177583..454fc76fae 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -116,11 +116,11 @@ public: /// set the transformation of the CasCade Shape void setShapePlacement(const Base::Placement& rclTrf); /// get the transformation of the CasCade Shape - Base::Placement getShapePlacement(void) const; + Base::Placement getShapePlacement() const; /// get the transformation of the CasCade Shape - Base::Matrix4D getTransform(void) const; + Base::Matrix4D getTransform() const; /// Bound box from the CasCade shape - Base::BoundBox3d getBoundBox(void)const; + Base::BoundBox3d getBoundBox()const; virtual bool getCenterOfGravity(Base::Vector3d& center) const; static void convertTogpTrsf(const Base::Matrix4D& mtrx, gp_Trsf& trsf); static void convertToMatrix(const gp_Trsf& trsf, Base::Matrix4D& mtrx); @@ -134,7 +134,7 @@ public: * List of different subelement types * it is NOT a list of the subelements itself */ - virtual std::vector getElementTypes(void) const; + virtual std::vector getElementTypes() const; virtual unsigned long countSubElements(const char* Type) const; /// get the subelement by type and number virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; @@ -171,7 +171,7 @@ public: void SaveDocFile (Base::Writer &writer) const; void RestoreDocFile(Base::Reader &reader); - unsigned int getMemSize (void) const; + unsigned int getMemSize () const; //@} /** @name Input/Output */ diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp index 416a30bdbd..cf2f42c20d 100644 --- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeCompSolidPy::representation(void) const +std::string TopoShapeCompSolidPy::representation() const { std::stringstream str; str << ""; diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp index 93f8f4de73..37f9c170e8 100644 --- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp @@ -44,7 +44,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeCompoundPy::representation(void) const +std::string TopoShapeCompoundPy::representation() const { std::stringstream str; str << ""; diff --git a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp index 6d2dbf75d0..e207f030ba 100644 --- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp @@ -91,7 +91,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeEdgePy::representation(void) const +std::string TopoShapeEdgePy::representation() const { std::stringstream str; str << ""; @@ -769,7 +769,7 @@ Py::String TopoShapeEdgePy::getContinuity() const return Py::String(cont); } -Py::Float TopoShapeEdgePy::getTolerance(void) const +Py::Float TopoShapeEdgePy::getTolerance() const { const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape()); return Py::Float(BRep_Tool::Tolerance(e)); @@ -782,7 +782,7 @@ void TopoShapeEdgePy::setTolerance(Py::Float tol) aBuilder.UpdateEdge(e, (double)tol); } -Py::Float TopoShapeEdgePy::getLength(void) const +Py::Float TopoShapeEdgePy::getLength() const { const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape()); BRepAdaptor_Curve adapt(e); @@ -884,7 +884,7 @@ Py::Object TopoShapeEdgePy::getCurve() const throw Py::TypeError("undefined curve type"); } -Py::Tuple TopoShapeEdgePy::getParameterRange(void) const +Py::Tuple TopoShapeEdgePy::getParameterRange() const { const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape()); BRepAdaptor_Curve adapt(e); @@ -897,7 +897,7 @@ Py::Tuple TopoShapeEdgePy::getParameterRange(void) const return t; } -Py::Float TopoShapeEdgePy::getFirstParameter(void) const +Py::Float TopoShapeEdgePy::getFirstParameter() const { const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape()); BRepAdaptor_Curve adapt(e); @@ -905,7 +905,7 @@ Py::Float TopoShapeEdgePy::getFirstParameter(void) const return Py::Float(t); } -Py::Float TopoShapeEdgePy::getLastParameter(void) const +Py::Float TopoShapeEdgePy::getLastParameter() const { const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape()); BRepAdaptor_Curve adapt(e); @@ -913,7 +913,7 @@ Py::Float TopoShapeEdgePy::getLastParameter(void) const return Py::Float(t); } -Py::Object TopoShapeEdgePy::getMass(void) const +Py::Object TopoShapeEdgePy::getMass() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -921,7 +921,7 @@ Py::Object TopoShapeEdgePy::getMass(void) const return Py::Float(c); } -Py::Object TopoShapeEdgePy::getCenterOfMass(void) const +Py::Object TopoShapeEdgePy::getCenterOfMass() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -929,7 +929,7 @@ Py::Object TopoShapeEdgePy::getCenterOfMass(void) const return Py::Vector(Base::Vector3d(c.X(),c.Y(),c.Z())); } -Py::Object TopoShapeEdgePy::getMatrixOfInertia(void) const +Py::Object TopoShapeEdgePy::getMatrixOfInertia() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -943,7 +943,7 @@ Py::Object TopoShapeEdgePy::getMatrixOfInertia(void) const return Py::Matrix(mat); } -Py::Object TopoShapeEdgePy::getStaticMoments(void) const +Py::Object TopoShapeEdgePy::getStaticMoments() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -956,7 +956,7 @@ Py::Object TopoShapeEdgePy::getStaticMoments(void) const return tuple; } -Py::Dict TopoShapeEdgePy::getPrincipalProperties(void) const +Py::Dict TopoShapeEdgePy::getPrincipalProperties() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -989,7 +989,7 @@ Py::Dict TopoShapeEdgePy::getPrincipalProperties(void) const return dict; } -Py::Boolean TopoShapeEdgePy::getClosed(void) const +Py::Boolean TopoShapeEdgePy::getClosed() const { if (getTopoShapePtr()->getShape().IsNull()) throw Py::RuntimeError("Cannot determine the 'Closed'' flag of an empty shape"); @@ -997,7 +997,7 @@ Py::Boolean TopoShapeEdgePy::getClosed(void) const return Py::Boolean(ok ? true : false); } -Py::Boolean TopoShapeEdgePy::getDegenerated(void) const +Py::Boolean TopoShapeEdgePy::getDegenerated() const { Standard_Boolean ok = BRep_Tool::Degenerated(TopoDS::Edge(getTopoShapePtr()->getShape())); return Py::Boolean(ok ? true : false); diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index 039514992b..127e41db41 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -97,7 +97,7 @@ namespace Part { } // returns a string which represent the object e.g. when printed in python -std::string TopoShapeFacePy::representation(void) const +std::string TopoShapeFacePy::representation() const { std::stringstream str; str << ""; @@ -982,7 +982,7 @@ Py::Object TopoShapeFacePy::getSurface() const throw Py::TypeError("undefined surface type"); } -Py::Float TopoShapeFacePy::getTolerance(void) const +Py::Float TopoShapeFacePy::getTolerance() const { const TopoDS_Face& f = TopoDS::Face(getTopoShapePtr()->getShape()); return Py::Float(BRep_Tool::Tolerance(f)); @@ -995,7 +995,7 @@ void TopoShapeFacePy::setTolerance(Py::Float tol) aBuilder.UpdateFace(f, (double)tol); } -Py::Tuple TopoShapeFacePy::getParameterRange(void) const +Py::Tuple TopoShapeFacePy::getParameterRange() const { const TopoDS_Face& f = TopoDS::Face(getTopoShapePtr()->getShape()); BRepAdaptor_Surface adapt(f); @@ -1013,7 +1013,7 @@ Py::Tuple TopoShapeFacePy::getParameterRange(void) const } // deprecated -Py::Object TopoShapeFacePy::getWire(void) const +Py::Object TopoShapeFacePy::getWire() const { try { Py::Object sys_out(PySys_GetObject("stdout")); @@ -1027,7 +1027,7 @@ Py::Object TopoShapeFacePy::getWire(void) const return getOuterWire(); } -Py::Object TopoShapeFacePy::getOuterWire(void) const +Py::Object TopoShapeFacePy::getOuterWire() const { const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); if (shape.IsNull()) @@ -1043,7 +1043,7 @@ Py::Object TopoShapeFacePy::getOuterWire(void) const } } -Py::Object TopoShapeFacePy::getMass(void) const +Py::Object TopoShapeFacePy::getMass() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -1051,7 +1051,7 @@ Py::Object TopoShapeFacePy::getMass(void) const return Py::Float(c); } -Py::Object TopoShapeFacePy::getCenterOfMass(void) const +Py::Object TopoShapeFacePy::getCenterOfMass() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -1059,7 +1059,7 @@ Py::Object TopoShapeFacePy::getCenterOfMass(void) const return Py::Vector(Base::Vector3d(c.X(),c.Y(),c.Z())); } -Py::Object TopoShapeFacePy::getMatrixOfInertia(void) const +Py::Object TopoShapeFacePy::getMatrixOfInertia() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -1073,7 +1073,7 @@ Py::Object TopoShapeFacePy::getMatrixOfInertia(void) const return Py::Matrix(mat); } -Py::Object TopoShapeFacePy::getStaticMoments(void) const +Py::Object TopoShapeFacePy::getStaticMoments() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -1086,7 +1086,7 @@ Py::Object TopoShapeFacePy::getStaticMoments(void) const return tuple; } -Py::Dict TopoShapeFacePy::getPrincipalProperties(void) const +Py::Dict TopoShapeFacePy::getPrincipalProperties() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index 4e88fd28e7..0367fc094a 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -103,7 +103,7 @@ using namespace Part; #endif // returns a string which represents the object e.g. when printed in python -std::string TopoShapePy::representation(void) const +std::string TopoShapePy::representation() const { std::stringstream str; str << ""; @@ -2812,7 +2812,7 @@ void TopoShapePy::setLocation(Py::Object o) } #endif -Py::String TopoShapePy::getShapeType(void) const +Py::String TopoShapePy::getShapeType() const { TopoDS_Shape sh = getTopoShapePtr()->getShape(); if (sh.IsNull()) @@ -2853,7 +2853,7 @@ Py::String TopoShapePy::getShapeType(void) const return Py::String(name); } -Py::String TopoShapePy::getOrientation(void) const +Py::String TopoShapePy::getOrientation() const { TopoDS_Shape sh = getTopoShapePtr()->getShape(); if (sh.IsNull()) @@ -2907,7 +2907,7 @@ void TopoShapePy::setOrientation(Py::String arg) getTopoShapePtr()->setShape(sh); } -Py::List TopoShapePy::getSubShapes(void) const +Py::List TopoShapePy::getSubShapes() const { Py::List ret; const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); @@ -2940,47 +2940,47 @@ template Py::List getShapes(const TopoShape* shapePtr) return ret; } -Py::List TopoShapePy::getFaces(void) const +Py::List TopoShapePy::getFaces() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getVertexes(void) const +Py::List TopoShapePy::getVertexes() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getShells(void) const +Py::List TopoShapePy::getShells() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getSolids(void) const +Py::List TopoShapePy::getSolids() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getCompSolids(void) const +Py::List TopoShapePy::getCompSolids() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getEdges(void) const +Py::List TopoShapePy::getEdges() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getWires(void) const +Py::List TopoShapePy::getWires() const { return getShapes(getTopoShapePtr()); } -Py::List TopoShapePy::getCompounds(void) const +Py::List TopoShapePy::getCompounds() const { return getShapes(getTopoShapePtr()); } -Py::Float TopoShapePy::getLength(void) const +Py::Float TopoShapePy::getLength() const { const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); if (shape.IsNull()) @@ -2990,7 +2990,7 @@ Py::Float TopoShapePy::getLength(void) const return Py::Float(props.Mass()); } -Py::Float TopoShapePy::getArea(void) const +Py::Float TopoShapePy::getArea() const { const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); if (shape.IsNull()) @@ -3000,7 +3000,7 @@ Py::Float TopoShapePy::getArea(void) const return Py::Float(props.Mass()); } -Py::Float TopoShapePy::getVolume(void) const +Py::Float TopoShapePy::getVolume() const { const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); if (shape.IsNull()) diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp index 9add67ec72..25f9892026 100644 --- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp @@ -50,7 +50,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeShellPy::representation(void) const +std::string TopoShapeShellPy::representation() const { // Note: As the return type is 'const char*' we cannot create a temporary // char array neither on the stack because the array would be freed when @@ -199,7 +199,7 @@ PyObject* TopoShapeShellPy::makeHalfSpace(PyObject *args) } } -Py::Object TopoShapeShellPy::getMass(void) const +Py::Object TopoShapeShellPy::getMass() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -207,7 +207,7 @@ Py::Object TopoShapeShellPy::getMass(void) const return Py::Float(c); } -Py::Object TopoShapeShellPy::getCenterOfMass(void) const +Py::Object TopoShapeShellPy::getCenterOfMass() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -215,7 +215,7 @@ Py::Object TopoShapeShellPy::getCenterOfMass(void) const return Py::Vector(Base::Vector3d(c.X(),c.Y(),c.Z())); } -Py::Object TopoShapeShellPy::getMatrixOfInertia(void) const +Py::Object TopoShapeShellPy::getMatrixOfInertia() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -229,7 +229,7 @@ Py::Object TopoShapeShellPy::getMatrixOfInertia(void) const return Py::Matrix(mat); } -Py::Object TopoShapeShellPy::getStaticMoments(void) const +Py::Object TopoShapeShellPy::getStaticMoments() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); @@ -242,7 +242,7 @@ Py::Object TopoShapeShellPy::getStaticMoments(void) const return tuple; } -Py::Dict TopoShapeShellPy::getPrincipalProperties(void) const +Py::Dict TopoShapeShellPy::getPrincipalProperties() const { GProp_GProps props; BRepGProp::SurfaceProperties(getTopoShapePtr()->getShape(), props); diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp index e5b13afc9c..3b069d8e06 100644 --- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp @@ -58,7 +58,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeSolidPy::representation(void) const +std::string TopoShapeSolidPy::representation() const { std::stringstream str; str << ""; @@ -134,7 +134,7 @@ int TopoShapeSolidPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } -Py::Object TopoShapeSolidPy::getMass(void) const +Py::Object TopoShapeSolidPy::getMass() const { GProp_GProps props; BRepGProp::VolumeProperties(getTopoShapePtr()->getShape(), props); @@ -142,7 +142,7 @@ Py::Object TopoShapeSolidPy::getMass(void) const return Py::Float(c); } -Py::Object TopoShapeSolidPy::getCenterOfMass(void) const +Py::Object TopoShapeSolidPy::getCenterOfMass() const { GProp_GProps props; BRepGProp::VolumeProperties(getTopoShapePtr()->getShape(), props); @@ -150,7 +150,7 @@ Py::Object TopoShapeSolidPy::getCenterOfMass(void) const return Py::Vector(Base::Vector3d(c.X(),c.Y(),c.Z())); } -Py::Object TopoShapeSolidPy::getMatrixOfInertia(void) const +Py::Object TopoShapeSolidPy::getMatrixOfInertia() const { GProp_GProps props; BRepGProp::VolumeProperties(getTopoShapePtr()->getShape(), props); @@ -164,7 +164,7 @@ Py::Object TopoShapeSolidPy::getMatrixOfInertia(void) const return Py::Matrix(mat); } -Py::Object TopoShapeSolidPy::getStaticMoments(void) const +Py::Object TopoShapeSolidPy::getStaticMoments() const { GProp_GProps props; BRepGProp::VolumeProperties(getTopoShapePtr()->getShape(), props); @@ -177,7 +177,7 @@ Py::Object TopoShapeSolidPy::getStaticMoments(void) const return tuple; } -Py::Dict TopoShapeSolidPy::getPrincipalProperties(void) const +Py::Dict TopoShapeSolidPy::getPrincipalProperties() const { GProp_GProps props; BRepGProp::VolumeProperties(getTopoShapePtr()->getShape(), props); @@ -210,7 +210,7 @@ Py::Dict TopoShapeSolidPy::getPrincipalProperties(void) const return dict; } -Py::Object TopoShapeSolidPy::getOuterShell(void) const +Py::Object TopoShapeSolidPy::getOuterShell() const { TopoDS_Shell shell; const TopoDS_Shape& shape = getTopoShapePtr()->getShape(); diff --git a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp index fcbac65cd0..158211ef0c 100644 --- a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp @@ -44,7 +44,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TopoShapeVertexPy::representation(void) const +std::string TopoShapeVertexPy::representation() const { std::stringstream str; str << ""; @@ -137,7 +137,7 @@ int TopoShapeVertexPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } -Py::Float TopoShapeVertexPy::getTolerance(void) const +Py::Float TopoShapeVertexPy::getTolerance() const { const TopoDS_Vertex& v = TopoDS::Vertex(getTopoShapePtr()->getShape()); return Py::Float(BRep_Tool::Tolerance(v)); @@ -150,7 +150,7 @@ void TopoShapeVertexPy::setTolerance(Py::Float tol) aBuilder.UpdateVertex(v, (double)tol); } -Py::Float TopoShapeVertexPy::getX(void) const +Py::Float TopoShapeVertexPy::getX() const { try { const TopoDS_Vertex& v = TopoDS::Vertex(getTopoShapePtr()->getShape()); @@ -162,7 +162,7 @@ Py::Float TopoShapeVertexPy::getX(void) const } } -Py::Float TopoShapeVertexPy::getY(void) const +Py::Float TopoShapeVertexPy::getY() const { try { const TopoDS_Vertex& v = TopoDS::Vertex(getTopoShapePtr()->getShape()); @@ -174,7 +174,7 @@ Py::Float TopoShapeVertexPy::getY(void) const } } -Py::Float TopoShapeVertexPy::getZ(void) const +Py::Float TopoShapeVertexPy::getZ() const { try { const TopoDS_Vertex& v = TopoDS::Vertex(getTopoShapePtr()->getShape()); @@ -186,7 +186,7 @@ Py::Float TopoShapeVertexPy::getZ(void) const } } -Py::Object TopoShapeVertexPy::getPoint(void) const +Py::Object TopoShapeVertexPy::getPoint() const { try { const TopoDS_Vertex& v = TopoDS::Vertex(getTopoShapePtr()->getShape()); diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp index 3a89674785..bd18e40401 100644 --- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp @@ -63,7 +63,7 @@ namespace Part { // returns a string which represents the object e.g. when printed in python -std::string TopoShapeWirePy::representation(void) const +std::string TopoShapeWirePy::representation() const { std::stringstream str; str << ""; @@ -612,7 +612,7 @@ Py::String TopoShapeWirePy::getContinuity() const return Py::String(cont); } -Py::Object TopoShapeWirePy::getMass(void) const +Py::Object TopoShapeWirePy::getMass() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -620,7 +620,7 @@ Py::Object TopoShapeWirePy::getMass(void) const return Py::Float(c); } -Py::Object TopoShapeWirePy::getCenterOfMass(void) const +Py::Object TopoShapeWirePy::getCenterOfMass() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -628,7 +628,7 @@ Py::Object TopoShapeWirePy::getCenterOfMass(void) const return Py::Vector(Base::Vector3d(c.X(),c.Y(),c.Z())); } -Py::Object TopoShapeWirePy::getMatrixOfInertia(void) const +Py::Object TopoShapeWirePy::getMatrixOfInertia() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -642,7 +642,7 @@ Py::Object TopoShapeWirePy::getMatrixOfInertia(void) const return Py::Matrix(mat); } -Py::Object TopoShapeWirePy::getStaticMoments(void) const +Py::Object TopoShapeWirePy::getStaticMoments() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -655,7 +655,7 @@ Py::Object TopoShapeWirePy::getStaticMoments(void) const return tuple; } -Py::Dict TopoShapeWirePy::getPrincipalProperties(void) const +Py::Dict TopoShapeWirePy::getPrincipalProperties() const { GProp_GProps props; BRepGProp::LinearProperties(getTopoShapePtr()->getShape(), props); @@ -688,7 +688,7 @@ Py::Dict TopoShapeWirePy::getPrincipalProperties(void) const return dict; } -Py::List TopoShapeWirePy::getOrderedEdges(void) const +Py::List TopoShapeWirePy::getOrderedEdges() const { Py::List ret; @@ -701,7 +701,7 @@ Py::List TopoShapeWirePy::getOrderedEdges(void) const return ret; } -Py::List TopoShapeWirePy::getOrderedVertexes(void) const +Py::List TopoShapeWirePy::getOrderedVertexes() const { Py::List ret; diff --git a/src/Mod/Part/App/ToroidPyImp.cpp b/src/Mod/Part/App/ToroidPyImp.cpp index 71eb2f0508..508142e7bd 100644 --- a/src/Mod/Part/App/ToroidPyImp.cpp +++ b/src/Mod/Part/App/ToroidPyImp.cpp @@ -37,7 +37,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string ToroidPy::representation(void) const +std::string ToroidPy::representation() const { return ""; } @@ -62,7 +62,7 @@ int ToroidPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } -Py::Float ToroidPy::getMajorRadius(void) const +Py::Float ToroidPy::getMajorRadius() const { Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); @@ -81,7 +81,7 @@ void ToroidPy::setMajorRadius(Py::Float arg) } } -Py::Float ToroidPy::getMinorRadius(void) const +Py::Float ToroidPy::getMinorRadius() const { Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); @@ -100,7 +100,7 @@ void ToroidPy::setMinorRadius(Py::Float arg) } } -Py::Object ToroidPy::getCenter(void) const +Py::Object ToroidPy::getCenter() const { Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); @@ -124,7 +124,7 @@ void ToroidPy::setCenter(Py::Object arg) } } -Py::Object ToroidPy::getAxis(void) const +Py::Object ToroidPy::getAxis() const { Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast (getGeometryPtr()->handle()); @@ -167,14 +167,14 @@ void ToroidPy::setAxis(Py::Object arg) } } -Py::Float ToroidPy::getArea(void) const +Py::Float ToroidPy::getArea() const { Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); return Py::Float(torus->Area()); } -Py::Float ToroidPy::getVolume(void) const +Py::Float ToroidPy::getVolume() const { Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); diff --git a/src/Mod/Part/App/TrimmedCurvePyImp.cpp b/src/Mod/Part/App/TrimmedCurvePyImp.cpp index 7a3e1913de..b4eb7fa7cb 100644 --- a/src/Mod/Part/App/TrimmedCurvePyImp.cpp +++ b/src/Mod/Part/App/TrimmedCurvePyImp.cpp @@ -33,7 +33,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string TrimmedCurvePy::representation(void) const +std::string TrimmedCurvePy::representation() const { return ""; } diff --git a/src/Mod/Part/App/edgecluster.cpp b/src/Mod/Part/App/edgecluster.cpp index 45789f6894..155ff215a7 100644 --- a/src/Mod/Part/App/edgecluster.cpp +++ b/src/Mod/Part/App/edgecluster.cpp @@ -42,7 +42,7 @@ Edgecluster::Edgecluster(const std::vector& unsorted_edges) m_final_cluster.clear(); } -Edgecluster::~Edgecluster(void) +Edgecluster::~Edgecluster() { } diff --git a/src/Mod/Part/App/edgecluster.h b/src/Mod/Part/App/edgecluster.h index a29208b84d..bed7dbc048 100644 --- a/src/Mod/Part/App/edgecluster.h +++ b/src/Mod/Part/App/edgecluster.h @@ -62,9 +62,9 @@ class PartExport Edgecluster { public: Edgecluster(const std::vector& usorted_edges); - virtual ~Edgecluster(void); + virtual ~Edgecluster(); - tEdgeClusterVector GetClusters(void); + tEdgeClusterVector GetClusters(); private: void Perform(); diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index e8e94dac8d..9d9577dee9 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -65,9 +65,9 @@ // use a different name to CreateCommand() -void CreatePartCommands(void); -void CreateSimplePartCommands(void); -void CreateParamPartCommands(void); +void CreatePartCommands(); +void CreateSimplePartCommands(); +void CreateParamPartCommands(); void loadPartResource() { diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index d0f9fb93cc..b8f61c3bc3 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -151,7 +151,7 @@ void CmdPartBox2::activated(int iMsg) updateActive(); } -bool CmdPartBox2::isActive(void) +bool CmdPartBox2::isActive() { if (getActiveGuiDocument()) return true; @@ -192,7 +192,7 @@ void CmdPartBox3::activated(int iMsg) updateActive(); } -bool CmdPartBox3::isActive(void) +bool CmdPartBox3::isActive() { if (getActiveGuiDocument()) return true; @@ -224,7 +224,7 @@ void CmdPartPrimitives::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdPartPrimitives::isActive(void) +bool CmdPartPrimitives::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -359,7 +359,7 @@ void CmdPartCut::activated(int iMsg) commitCommand(); } -bool CmdPartCut::isActive(void) +bool CmdPartCut::isActive() { return getSelection().countObjectsOfType( App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink)==2; @@ -459,7 +459,7 @@ void CmdPartCommon::activated(int iMsg) commitCommand(); } -bool CmdPartCommon::isActive(void) +bool CmdPartCommon::isActive() { return getSelection().countObjectsOfType( App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) >= 1; @@ -559,7 +559,7 @@ void CmdPartFuse::activated(int iMsg) commitCommand(); } -bool CmdPartFuse::isActive(void) +bool CmdPartFuse::isActive() { return getSelection().countObjectsOfType( App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) >= 1; @@ -603,7 +603,7 @@ void CmdPartCompJoinFeatures::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdPartCompJoinFeatures::createAction(void) +Gui::Action * CmdPartCompJoinFeatures::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -663,7 +663,7 @@ void CmdPartCompJoinFeatures::languageChange() } } -bool CmdPartCompJoinFeatures::isActive(void) +bool CmdPartCompJoinFeatures::isActive() { if (getActiveGuiDocument()) return true; @@ -711,7 +711,7 @@ void CmdPartCompSplitFeatures::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdPartCompSplitFeatures::createAction(void) +Gui::Action * CmdPartCompSplitFeatures::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -781,7 +781,7 @@ void CmdPartCompSplitFeatures::languageChange() } } -bool CmdPartCompSplitFeatures::isActive(void) +bool CmdPartCompSplitFeatures::isActive() { if (getActiveGuiDocument()) return true; @@ -827,7 +827,7 @@ void CmdPartCompCompoundTools::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdPartCompCompoundTools::createAction(void) +Gui::Action * CmdPartCompCompoundTools::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -887,7 +887,7 @@ void CmdPartCompCompoundTools::languageChange() } } -bool CmdPartCompCompoundTools::isActive(void) +bool CmdPartCompCompoundTools::isActive() { if (getActiveGuiDocument()) return true; @@ -948,7 +948,7 @@ void CmdPartCompound::activated(int iMsg) commitCommand(); } -bool CmdPartCompound::isActive(void) +bool CmdPartCompound::isActive() { return getSelection().countObjectsOfType( App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) >= 1; @@ -997,7 +997,7 @@ void CmdPartSection::activated(int iMsg) commitCommand(); } -bool CmdPartSection::isActive(void) +bool CmdPartSection::isActive() { return getSelection().countObjectsOfType(App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) == 2; } @@ -1057,7 +1057,7 @@ void CmdPartImport::activated(int iMsg) } } -bool CmdPartImport::isActive(void) +bool CmdPartImport::isActive() { if (getActiveGuiDocument()) return true; @@ -1108,7 +1108,7 @@ void CmdPartExport::activated(int iMsg) } } -bool CmdPartExport::isActive(void) +bool CmdPartExport::isActive() { return Gui::Selection().countObjectsOfType(App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) > 0; } @@ -1153,7 +1153,7 @@ void CmdPartImportCurveNet::activated(int iMsg) } } -bool CmdPartImportCurveNet::isActive(void) +bool CmdPartImportCurveNet::isActive() { if (getActiveGuiDocument()) return true; @@ -1234,7 +1234,7 @@ void CmdPartMakeSolid::activated(int iMsg) } } -bool CmdPartMakeSolid::isActive(void) +bool CmdPartMakeSolid::isActive() { return Gui::Selection().countObjectsOfType (App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) > 0; @@ -1297,7 +1297,7 @@ void CmdPartReverseShape::activated(int iMsg) updateActive(); } -bool CmdPartReverseShape::isActive(void) +bool CmdPartReverseShape::isActive() { return PartGui::hasShapesInSelection(); } @@ -1328,7 +1328,7 @@ void CmdPartBoolean::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdPartBoolean::isActive(void) +bool CmdPartBoolean::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1356,7 +1356,7 @@ void CmdPartExtrude::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskExtrusion()); } -bool CmdPartExtrude::isActive(void) +bool CmdPartExtrude::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1407,7 +1407,7 @@ void CmdPartMakeFace::activated(int iMsg) } } -bool CmdPartMakeFace::isActive(void) +bool CmdPartMakeFace::isActive() { return (Gui::Selection().countObjectsOfType(App::DocumentObject::getClassTypeId(), nullptr, Gui::ResolveMode::FollowLink) > 0 && !Gui::Control().activeDialog()); @@ -1436,7 +1436,7 @@ void CmdPartRevolve::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskRevolution()); } -bool CmdPartRevolve::isActive(void) +bool CmdPartRevolve::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1464,7 +1464,7 @@ void CmdPartFillet::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskFilletEdges(nullptr)); } -bool CmdPartFillet::isActive(void) +bool CmdPartFillet::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1492,7 +1492,7 @@ void CmdPartChamfer::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskChamferEdges(nullptr)); } -bool CmdPartChamfer::isActive(void) +bool CmdPartChamfer::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1520,7 +1520,7 @@ void CmdPartMirror::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskMirroring()); } -bool CmdPartMirror::isActive(void) +bool CmdPartMirror::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1557,7 +1557,7 @@ void CmdPartCrossSections::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdPartCrossSections::isActive(void) +bool CmdPartCrossSections::isActive() { bool hasShapes = PartGui::hasShapesInSelection(); return (hasShapes && !Gui::Control().activeDialog()); @@ -1587,7 +1587,7 @@ void CmdPartBuilder::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskShapeBuilder()); } -bool CmdPartBuilder::isActive(void) +bool CmdPartBuilder::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1616,7 +1616,7 @@ void CmdPartLoft::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskLoft()); } -bool CmdPartLoft::isActive(void) +bool CmdPartLoft::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1645,7 +1645,7 @@ void CmdPartSweep::activated(int iMsg) Gui::Control().showDialog(new PartGui::TaskSweep()); } -bool CmdPartSweep::isActive(void) +bool CmdPartSweep::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -1701,7 +1701,7 @@ void CmdPartOffset::activated(int iMsg) copyVisual(offset.c_str(), "PointColor", shape->getNameInDocument()); } -bool CmdPartOffset::isActive(void) +bool CmdPartOffset::isActive() { { bool hasShapes = PartGui::hasShapesInSelection(); @@ -1767,7 +1767,7 @@ void CmdPartOffset2D::activated(int iMsg) copyVisual(offset.c_str(), "PointColor", shape->getNameInDocument()); } -bool CmdPartOffset2D::isActive(void) +bool CmdPartOffset2D::isActive() { bool hasShapes = PartGui::hasShapesInSelection(); std::vector docobjs = Gui::Selection().getObjectsOfType(App::DocumentObject::getClassTypeId()); @@ -1810,7 +1810,7 @@ void CmdPartCompOffset::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdPartCompOffset::createAction(void) +Gui::Action * CmdPartCompOffset::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1860,7 +1860,7 @@ void CmdPartCompOffset::languageChange() } } -bool CmdPartCompOffset::isActive(void) +bool CmdPartCompOffset::isActive() { bool hasShapes = PartGui::hasShapesInSelection(); std::vector docobjs = Gui::Selection().getObjectsOfType(App::DocumentObject::getClassTypeId()); @@ -1953,7 +1953,7 @@ void CmdPartThickness::activated(int iMsg) copyVisual(thick.c_str(), "PointColor", obj->getNameInDocument()); } -bool CmdPartThickness::isActive(void) +bool CmdPartThickness::isActive() { Base::Type partid = Base::Type::fromName("Part::Feature"); bool objectsSelected = Gui::Selection().countObjectsOfType(partid, nullptr, Gui::ResolveMode::FollowLink) > 0; @@ -2045,7 +2045,7 @@ void CmdShapeInfo::activated(int iMsg) // } } -bool CmdShapeInfo::isActive(void) +bool CmdShapeInfo::isActive() { App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc || doc->countObjectsOfType(Part::Feature::getClassTypeId()) == 0) @@ -2162,7 +2162,7 @@ void CmdPartRuledSurface::activated(int iMsg) updateActive(); } -bool CmdPartRuledSurface::isActive(void) +bool CmdPartRuledSurface::isActive() { return getActiveGuiDocument(); } @@ -2194,7 +2194,7 @@ void CmdCheckGeometry::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdCheckGeometry::isActive(void) +bool CmdCheckGeometry::isActive() { bool hasShapes = PartGui::hasShapesInSelection(); return (hasShapes && !Gui::Control().activeDialog()); @@ -2232,7 +2232,7 @@ void CmdColorPerFace::activated(int iMsg) vp->changeFaceColors(); } -bool CmdColorPerFace::isActive(void) +bool CmdColorPerFace::isActive() { Base::Type partid = Base::Type::fromName("Part::Feature"); bool objectSelected = Gui::Selection().countObjectsOfType(partid) == 1; @@ -2265,7 +2265,7 @@ void CmdMeasureLinear::activated(int iMsg) PartGui::goDimensionLinearRoot(); } -bool CmdMeasureLinear::isActive(void) +bool CmdMeasureLinear::isActive() { return hasActiveDocument(); } @@ -2294,7 +2294,7 @@ void CmdMeasureAngular::activated(int iMsg) PartGui::goDimensionAngularRoot(); } -bool CmdMeasureAngular::isActive(void) +bool CmdMeasureAngular::isActive() { return hasActiveDocument(); } @@ -2324,7 +2324,7 @@ void CmdMeasureRefresh::activated(int iMsg) PartGui::refreshDimensions(); } -bool CmdMeasureRefresh::isActive(void) +bool CmdMeasureRefresh::isActive() { return hasActiveDocument(); } @@ -2353,7 +2353,7 @@ void CmdMeasureClearAll::activated(int iMsg) PartGui::eraseAllDimensions(); } -bool CmdMeasureClearAll::isActive(void) +bool CmdMeasureClearAll::isActive() { return hasActiveDocument(); } @@ -2390,7 +2390,7 @@ void CmdMeasureToggleAll::activated(int iMsg) group->SetBool("DimensionsVisible", true); } -bool CmdMeasureToggleAll::isActive(void) +bool CmdMeasureToggleAll::isActive() { return hasActiveDocument(); } @@ -2421,7 +2421,7 @@ void CmdMeasureToggle3d::activated(int iMsg) PartGui::toggle3d(); } -bool CmdMeasureToggle3d::isActive(void) +bool CmdMeasureToggle3d::isActive() { return hasActiveDocument(); } @@ -2453,7 +2453,7 @@ void CmdMeasureToggleDelta::activated(int iMsg) PartGui::toggleDelta(); } -bool CmdMeasureToggleDelta::isActive(void) +bool CmdMeasureToggleDelta::isActive() { return hasActiveDocument(); } @@ -2484,7 +2484,7 @@ void CmdBoxSelection::activated(int iMsg) sel->start(TopAbs_FACE); } -bool CmdBoxSelection::isActive(void) +bool CmdBoxSelection::isActive() { return hasActiveDocument(); } @@ -2516,7 +2516,7 @@ void CmdPartProjectionOnSurface::activated(int iMsg) Gui::Control().showDialog(dlg); } -bool CmdPartProjectionOnSurface::isActive(void) +bool CmdPartProjectionOnSurface::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -2540,7 +2540,7 @@ CmdPartSectionCut::CmdPartSectionCut() eType = AlterDoc | Alter3DView; } -Gui::Action* CmdPartSectionCut::createAction(void) +Gui::Action* CmdPartSectionCut::createAction() { Gui::Action* pcAction = (Gui::Action*)Gui::Command::createAction(); #if 0 @@ -2558,14 +2558,14 @@ void CmdPartSectionCut::activated(int iMsg) } } -bool CmdPartSectionCut::isActive(void) +bool CmdPartSectionCut::isActive() { return hasActiveDocument(); } //--------------------------------------------------------------- -void CreatePartCommands(void) +void CreatePartCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index 87263d5a99..72dfd89aa9 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -81,7 +81,7 @@ void CmdPartSimpleCylinder::activated(int iMsg) } } -bool CmdPartSimpleCylinder::isActive(void) +bool CmdPartSimpleCylinder::isActive() { if (getActiveGuiDocument()) return true; @@ -114,7 +114,7 @@ void CmdPartShapeFromMesh::activated(int iMsg) dlg.exec(); } -bool CmdPartShapeFromMesh::isActive(void) +bool CmdPartShapeFromMesh::isActive() { Base::Type meshid = Base::Type::fromName("Mesh::Feature"); return Gui::Selection().countObjectsOfType(meshid) > 0; @@ -163,7 +163,7 @@ void CmdPartPointsFromMesh::activated(int iMsg) commitCommand(); } -bool CmdPartPointsFromMesh::isActive(void) +bool CmdPartPointsFromMesh::isActive() { Base::Type meshid = Base::Type::fromName("Mesh::Feature"); return Gui::Selection().countObjectsOfType(meshid) > 0; @@ -239,7 +239,7 @@ void CmdPartSimpleCopy::activated(int iMsg) _copyShape("Simple copy",true); } -bool CmdPartSimpleCopy::isActive(void) +bool CmdPartSimpleCopy::isActive() { return Gui::Selection().hasSelection(); } @@ -267,7 +267,7 @@ void CmdPartTransformedCopy::activated(int iMsg) _copyShape("Transformed copy",false); } -bool CmdPartTransformedCopy::isActive(void) +bool CmdPartTransformedCopy::isActive() { return Gui::Selection().hasSelection(); } @@ -295,7 +295,7 @@ void CmdPartElementCopy::activated(int iMsg) _copyShape("Element copy",false,true); } -bool CmdPartElementCopy::isActive(void) +bool CmdPartElementCopy::isActive() { return Gui::Selection().hasSelection(); } @@ -355,7 +355,7 @@ void CmdPartRefineShape::activated(int iMsg) } } -bool CmdPartRefineShape::isActive(void) +bool CmdPartRefineShape::isActive() { return Gui::Selection().hasSelection(); } @@ -421,7 +421,7 @@ void CmdPartDefeaturing::activated(int iMsg) updateActive(); } -bool CmdPartDefeaturing::isActive(void) +bool CmdPartDefeaturing::isActive() { Base::Type partid = Base::Type::fromName("Part::Feature"); std::vector objs = Gui::Selection().getSelectionEx(nullptr, partid); @@ -439,7 +439,7 @@ bool CmdPartDefeaturing::isActive(void) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void CreateSimplePartCommands(void) +void CreateSimplePartCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdPartSimpleCylinder()); diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index 1f08df86f1..04fa92afbb 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -82,7 +82,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Apply | QDialogButtonBox::Close; } - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return true; } virtual bool needsFullSpace() const { return true; } diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index a6cdd36564..0b2ebce66d 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -230,13 +230,13 @@ void PartGui::DlgProjectionOnSurface::slotDeletedObject(const App::DocumentObjec } } -void PartGui::DlgProjectionOnSurface::apply(void) +void PartGui::DlgProjectionOnSurface::apply() { if (m_partDocument) m_partDocument->commitTransaction(); } -void PartGui::DlgProjectionOnSurface::reject(void) +void PartGui::DlgProjectionOnSurface::reject() { if (m_partDocument) m_partDocument->abortTransaction(); @@ -338,7 +338,7 @@ void PartGui::DlgProjectionOnSurface::onSelectionChanged(const Gui::SelectionCha } } -void PartGui::DlgProjectionOnSurface::get_camera_direction(void) +void PartGui::DlgProjectionOnSurface::get_camera_direction() { auto mainWindow = Gui::getMainWindow(); diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.h b/src/Mod/Part/Gui/DlgProjectionOnSurface.h index 5130fe9850..a62f39ae29 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.h +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.h @@ -55,8 +55,8 @@ public: explicit DlgProjectionOnSurface(QWidget *parent = nullptr); ~DlgProjectionOnSurface(); - void apply(void); - void reject(void); + void apply(); + void reject(); private Q_SLOTS: @@ -100,7 +100,7 @@ private: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - void get_camera_direction(void); + void get_camera_direction(); void store_current_selected_parts(std::vector& iStoreVec, const unsigned int iColor); bool store_part_in_vector(SShapeStore& iCurrentShape, std::vector& iStoreVec); void create_projection_wire(std::vector& iCurrentShape); diff --git a/src/Mod/Part/Gui/Mirroring.h b/src/Mod/Part/Gui/Mirroring.h index a133fce923..656202e9b0 100644 --- a/src/Mod/Part/Gui/Mirroring.h +++ b/src/Mod/Part/Gui/Mirroring.h @@ -68,7 +68,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } virtual bool needsFullSpace() const { return false; } diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 841510aec8..0bfcfa053a 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -147,7 +147,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const {return QDialogButtonBox::Ok | QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const {return false;} virtual bool needsFullSpace() const {return true;} diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h index 5936bdabf5..11c1f68d9d 100644 --- a/src/Mod/Part/Gui/TaskDimension.h +++ b/src/Mod/Part/Gui/TaskDimension.h @@ -251,7 +251,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const {return QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument(void) const {return false;} + virtual bool isAllowedAlterDocument() const {return false;} virtual bool needsFullSpace() const {return false;} protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); @@ -330,7 +330,7 @@ public: virtual QDialogButtonBox::StandardButtons getStandardButtons() const {return QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument(void) const {return false;} + virtual bool isAllowedAlterDocument() const {return false;} virtual bool needsFullSpace() const {return false;} protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); diff --git a/src/Mod/Part/Gui/ViewProvider.cpp b/src/Mod/Part/Gui/ViewProvider.cpp index 5a3c91ef98..f44a7fe282 100644 --- a/src/Mod/Part/Gui/ViewProvider.cpp +++ b/src/Mod/Part/Gui/ViewProvider.cpp @@ -44,7 +44,7 @@ ViewProviderPart::~ViewProviderPart() { } -bool ViewProviderPart::doubleClicked(void) +bool ViewProviderPart::doubleClicked() { try { QString text = QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())); diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index 6981743ccc..f0578cd822 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -90,7 +90,7 @@ ViewProvider2DObjectGrid::~ViewProvider2DObjectGrid() // ********************************************************************************** -SoSeparator* ViewProvider2DObjectGrid::createGrid(void) +SoSeparator* ViewProvider2DObjectGrid::createGrid() { //double dx = 10 * GridSize.getValue(); // carpet size //double dy = 10 * GridSize.getValue(); @@ -358,7 +358,7 @@ ViewProvider2DObject::~ViewProvider2DObject() { } -std::vector ViewProvider2DObject::getDisplayModes(void) const +std::vector ViewProvider2DObject::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index 135265d0b8..08726c5f6a 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -46,7 +46,7 @@ public: ViewProvider2DObject(); /// destructor virtual ~ViewProvider2DObject(); - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; virtual const char* getDefaultDisplayMode() const; }; @@ -74,7 +74,7 @@ public: virtual void updateData(const App::Property*); /// creates the grid - SoSeparator* createGrid(void); + SoSeparator* createGrid(); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/Part/Gui/ViewProviderAttachExtension.h b/src/Mod/Part/Gui/ViewProviderAttachExtension.h index eb41508b18..ffae2778cf 100644 --- a/src/Mod/Part/Gui/ViewProviderAttachExtension.h +++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.h @@ -36,7 +36,7 @@ class PartGuiExport ViewProviderAttachExtension : public Gui::ViewProviderExtens public: /// Constructor - ViewProviderAttachExtension(void); + ViewProviderAttachExtension(); virtual ~ViewProviderAttachExtension() = default; virtual QIcon extensionMergeColorfullOverlayIcons (const QIcon & orig) const override; diff --git a/src/Mod/Part/Gui/ViewProviderBoolean.cpp b/src/Mod/Part/Gui/ViewProviderBoolean.cpp index 96bac5ead0..34bb110c64 100644 --- a/src/Mod/Part/Gui/ViewProviderBoolean.cpp +++ b/src/Mod/Part/Gui/ViewProviderBoolean.cpp @@ -47,7 +47,7 @@ ViewProviderBoolean::~ViewProviderBoolean() { } -std::vector ViewProviderBoolean::claimChildren(void)const +std::vector ViewProviderBoolean::claimChildren()const { std::vector temp; temp.push_back(static_cast(getObject())->Base.getValue()); @@ -56,7 +56,7 @@ std::vector ViewProviderBoolean::claimChildren(void)const return temp; } -QIcon ViewProviderBoolean::getIcon(void) const +QIcon ViewProviderBoolean::getIcon() const { App::DocumentObject* obj = getObject(); if (obj) { @@ -169,12 +169,12 @@ ViewProviderMultiFuse::~ViewProviderMultiFuse() { } -std::vector ViewProviderMultiFuse::claimChildren(void)const +std::vector ViewProviderMultiFuse::claimChildren()const { return std::vector(static_cast(getObject())->Shapes.getValues()); } -QIcon ViewProviderMultiFuse::getIcon(void) const +QIcon ViewProviderMultiFuse::getIcon() const { return Gui::BitmapFactory().iconFromTheme("Part_Fuse"); } @@ -306,12 +306,12 @@ ViewProviderMultiCommon::~ViewProviderMultiCommon() { } -std::vector ViewProviderMultiCommon::claimChildren(void)const +std::vector ViewProviderMultiCommon::claimChildren()const { return std::vector(static_cast(getObject())->Shapes.getValues()); } -QIcon ViewProviderMultiCommon::getIcon(void) const +QIcon ViewProviderMultiCommon::getIcon() const { return Gui::BitmapFactory().iconFromTheme("Part_Common"); } diff --git a/src/Mod/Part/Gui/ViewProviderBoolean.h b/src/Mod/Part/Gui/ViewProviderBoolean.h index 3c379309ab..21d88adfb7 100644 --- a/src/Mod/Part/Gui/ViewProviderBoolean.h +++ b/src/Mod/Part/Gui/ViewProviderBoolean.h @@ -40,8 +40,8 @@ public: virtual ~ViewProviderBoolean(); /// grouping handling - std::vector claimChildren(void) const; - QIcon getIcon(void) const; + std::vector claimChildren() const; + QIcon getIcon() const; void updateData(const App::Property*); bool onDelete(const std::vector &); }; @@ -58,8 +58,8 @@ public: virtual ~ViewProviderMultiFuse(); /// grouping handling - std::vector claimChildren(void) const; - QIcon getIcon(void) const; + std::vector claimChildren() const; + QIcon getIcon() const; void updateData(const App::Property*); bool onDelete(const std::vector &); @@ -84,8 +84,8 @@ public: virtual ~ViewProviderMultiCommon(); /// grouping handling - std::vector claimChildren(void) const; - QIcon getIcon(void) const; + std::vector claimChildren() const; + QIcon getIcon() const; void updateData(const App::Property*); bool onDelete(const std::vector &); diff --git a/src/Mod/Part/Gui/ViewProviderBox.cpp b/src/Mod/Part/Gui/ViewProviderBox.cpp index 4760e2572a..1189019c01 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.cpp +++ b/src/Mod/Part/Gui/ViewProviderBox.cpp @@ -48,7 +48,7 @@ ViewProviderBox::~ViewProviderBox() // ********************************************************************************** -std::vector ViewProviderBox::getDisplayModes(void) const +std::vector ViewProviderBox::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h index 6ea74f83cb..32b5846773 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.h +++ b/src/Mod/Part/Gui/ViewProviderBox.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderBox(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp index fe1f508d3b..5d5c9f7771 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp @@ -48,7 +48,7 @@ ViewProviderCircleParametric::~ViewProviderCircleParametric() // ********************************************************************************** -std::vector ViewProviderCircleParametric::getDisplayModes(void) const +std::vector ViewProviderCircleParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp index 2b109e038d..9cbd9831cc 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp @@ -48,7 +48,7 @@ ViewProviderConeParametric::~ViewProviderConeParametric() // ********************************************************************************** -std::vector ViewProviderConeParametric::getDisplayModes(void) const +std::vector ViewProviderConeParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h index 230d7b258d..fb20406278 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.h +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderConeParametric(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp index f60817f40b..fb5dd51d85 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp @@ -129,7 +129,7 @@ void ViewProviderCurveNet::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode(ModeName); } -std::vector ViewProviderCurveNet::getDisplayModes(void) const +std::vector ViewProviderCurveNet::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h index 2d75003f44..cf19d526d8 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.h +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h @@ -54,7 +54,7 @@ public: virtual void attach(App::DocumentObject *); virtual void setDisplayMode(const char* ModeName); /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; /// Update the Part representation virtual void updateData(const App::Property*); diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp index 541c14b1ae..1502a0704b 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp @@ -48,7 +48,7 @@ ViewProviderCylinderParametric::~ViewProviderCylinderParametric() // ********************************************************************************** -std::vector ViewProviderCylinderParametric::getDisplayModes(void) const +std::vector ViewProviderCylinderParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h index 39af793a07..9a0725773c 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderCylinderParametric(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp index ac37c51ca9..dd908763b6 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp @@ -48,7 +48,7 @@ ViewProviderEllipseParametric::~ViewProviderEllipseParametric() // ********************************************************************************** -std::vector ViewProviderEllipseParametric::getDisplayModes(void) const +std::vector ViewProviderEllipseParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h index 8be4d7a183..b91ad4fdda 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderEllipseParametric(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp index b7125fa6a4..467de2c505 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.cpp +++ b/src/Mod/Part/Gui/ViewProviderExt.cpp @@ -469,7 +469,7 @@ void ViewProviderPartExt::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode( ModeName ); } -std::vector ViewProviderPartExt::getDisplayModes(void) const +std::vector ViewProviderPartExt::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); diff --git a/src/Mod/Part/Gui/ViewProviderExtrusion.cpp b/src/Mod/Part/Gui/ViewProviderExtrusion.cpp index 436e61b0f4..cfe4310662 100644 --- a/src/Mod/Part/Gui/ViewProviderExtrusion.cpp +++ b/src/Mod/Part/Gui/ViewProviderExtrusion.cpp @@ -40,7 +40,7 @@ ViewProviderExtrusion::~ViewProviderExtrusion() { } -std::vector ViewProviderExtrusion::claimChildren(void)const +std::vector ViewProviderExtrusion::claimChildren()const { std::vector temp; temp.push_back(static_cast(getObject())->Base.getValue()); diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp index e1c7f2d1ee..7f17b5a0b0 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp @@ -48,7 +48,7 @@ ViewProviderLineParametric::~ViewProviderLineParametric() // ********************************************************************************** -std::vector ViewProviderLineParametric::getDisplayModes(void) const +std::vector ViewProviderLineParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderMirror.h b/src/Mod/Part/Gui/ViewProviderMirror.h index 1753a66291..c965617bb9 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.h +++ b/src/Mod/Part/Gui/ViewProviderMirror.h @@ -109,7 +109,7 @@ public: virtual ~ViewProviderRevolution(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; bool onDelete(const std::vector &); }; @@ -124,7 +124,7 @@ public: virtual ~ViewProviderLoft(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; bool onDelete(const std::vector &); }; @@ -139,7 +139,7 @@ public: virtual ~ViewProviderSweep(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; bool onDelete(const std::vector &); }; @@ -154,7 +154,7 @@ public: virtual ~ViewProviderOffset(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; void setupContextMenu(QMenu*, QObject*, const char*); bool onDelete(const std::vector &); @@ -184,7 +184,7 @@ public: virtual ~ViewProviderThickness(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; void setupContextMenu(QMenu*, QObject*, const char*); bool onDelete(const std::vector &); diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp index 4264afea4f..d13e8505d9 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp @@ -45,7 +45,7 @@ ViewProviderPlaneParametric::~ViewProviderPlaneParametric() } -std::vector ViewProviderPlaneParametric::getDisplayModes(void) const +std::vector ViewProviderPlaneParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; @@ -72,7 +72,7 @@ ViewProviderFace::~ViewProviderFace() { } -std::vector ViewProviderFace::claimChildren(void) const +std::vector ViewProviderFace::claimChildren() const { return std::vector(static_cast(getObject())->Sources.getValues()); } diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h index 20423224f0..09f6716fa5 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderPlaneParametric(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: @@ -60,7 +60,7 @@ public: ViewProviderFace(); virtual ~ViewProviderFace(); - virtual std::vector claimChildren(void) const; + virtual std::vector claimChildren() const; virtual bool canDragObjects() const; virtual bool canDragObject(App::DocumentObject*) const; virtual void dragObject(App::DocumentObject*); diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp index 4abd1edc54..6ac37aee31 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp @@ -48,7 +48,7 @@ ViewProviderPointParametric::~ViewProviderPointParametric() // ********************************************************************************** -std::vector ViewProviderPointParametric::getDisplayModes(void) const +std::vector ViewProviderPointParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h index 443a08cfee..ffd4ca1a8c 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h @@ -46,7 +46,7 @@ public: /// destructor virtual ~ViewProviderPointParametric(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderPrism.cpp b/src/Mod/Part/Gui/ViewProviderPrism.cpp index 1c05339f71..28434e108c 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.cpp +++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp @@ -46,7 +46,7 @@ ViewProviderPrism::~ViewProviderPrism() // ********************************************************************************** -std::vector ViewProviderPrism::getDisplayModes(void) const +std::vector ViewProviderPrism::getDisplayModes() const { // get the modes of the father std::vector StrList; @@ -78,7 +78,7 @@ ViewProviderWedge::~ViewProviderWedge() // ********************************************************************************** -std::vector ViewProviderWedge::getDisplayModes(void) const +std::vector ViewProviderWedge::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderPrism.h b/src/Mod/Part/Gui/ViewProviderPrism.h index 8c2c233cf1..9540d4c8fc 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.h +++ b/src/Mod/Part/Gui/ViewProviderPrism.h @@ -40,7 +40,7 @@ public: /// destructor virtual ~ViewProviderPrism(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: @@ -56,7 +56,7 @@ public: /// destructor virtual ~ViewProviderWedge(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderReference.cpp b/src/Mod/Part/Gui/ViewProviderReference.cpp index 41f21ebac9..fa9482dbf0 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.cpp +++ b/src/Mod/Part/Gui/ViewProviderReference.cpp @@ -226,7 +226,7 @@ void ViewProviderPartReference::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode( ModeName ); } -std::vector ViewProviderPartReference::getDisplayModes(void) const +std::vector ViewProviderPartReference::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderGeometryObject::getDisplayModes(); diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp index fa6ccf5e75..f2e33549fd 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp @@ -48,7 +48,7 @@ ViewProviderRegularPolygon::~ViewProviderRegularPolygon() // ********************************************************************************** -std::vector ViewProviderRegularPolygon::getDisplayModes(void) const +std::vector ViewProviderRegularPolygon::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h index 63f7dddbb5..0e25562f3a 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h @@ -40,7 +40,7 @@ public: /// destructor virtual ~ViewProviderRegularPolygon(); - std::vector getDisplayModes(void) const; + std::vector getDisplayModes() const; protected: diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp index a100496461..6e76556cdf 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp @@ -96,7 +96,7 @@ bool ViewProviderRuledSurface::onDelete(const std::vector &) // ********************************************************************************** -std::vector ViewProviderRuledSurface::getDisplayModes(void) const +std::vector ViewProviderRuledSurface::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp index 8a2c731a35..427310794e 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp @@ -42,7 +42,7 @@ ViewProviderSphereParametric::~ViewProviderSphereParametric() } -std::vector ViewProviderSphereParametric::getDisplayModes(void) const +std::vector ViewProviderSphereParametric::getDisplayModes() const { std::vector StrList; @@ -68,7 +68,7 @@ ViewProviderEllipsoid::~ViewProviderEllipsoid() { } -std::vector ViewProviderEllipsoid::getDisplayModes(void) const +std::vector ViewProviderEllipsoid::getDisplayModes() const { std::vector StrList; diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp index 81cc0258fe..3a27dc70ad 100644 --- a/src/Mod/PartDesign/App/Body.cpp +++ b/src/Mod/PartDesign/App/Body.cpp @@ -373,7 +373,7 @@ std::vector Body::removeObject(App::DocumentObject* featur } -App::DocumentObjectExecReturn *Body::execute(void) +App::DocumentObjectExecReturn *Body::execute() { /* Base::Console().Error("Body '%s':\n", getNameInDocument()); @@ -476,7 +476,7 @@ void Body::unsetupObject () { Part::BodyBase::unsetupObject (); } -PyObject *Body::getPyObject(void) +PyObject *Body::getPyObject() { if (PythonObject.is(Py::_None())){ // ref counter is set to 1 diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index 4b57f61969..4df617b81d 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -50,11 +50,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderBody"; } //@} @@ -115,7 +115,7 @@ public: */ static Body *findBodyOf(const App::DocumentObject* feature); - PyObject *getPyObject(void) override; + PyObject *getPyObject() override; virtual std::vector getSubObjects(int reason=0) const override; virtual App::DocumentObject *getSubObject(const char *subname, @@ -138,7 +138,7 @@ public: App::DocumentObject *getNextSolidFeature(App::DocumentObject* start = nullptr); // a body is solid if it has features that are solid according to member isSolidFeature. - bool isSolid(void); + bool isSolid(); protected: virtual void onSettingDocument() override; diff --git a/src/Mod/PartDesign/App/BodyPyImp.cpp b/src/Mod/PartDesign/App/BodyPyImp.cpp index c1d342afc6..6f3bcf4e1e 100644 --- a/src/Mod/PartDesign/App/BodyPyImp.cpp +++ b/src/Mod/PartDesign/App/BodyPyImp.cpp @@ -33,7 +33,7 @@ using namespace PartDesign; // returns a string which represents the object e.g. when printed in python -std::string BodyPy::representation(void) const +std::string BodyPy::representation() const { return std::string(""); } diff --git a/src/Mod/PartDesign/App/DatumCS.h b/src/Mod/PartDesign/App/DatumCS.h index 40742300ca..a062f60424 100644 --- a/src/Mod/PartDesign/App/DatumCS.h +++ b/src/Mod/PartDesign/App/DatumCS.h @@ -38,7 +38,7 @@ public: CoordinateSystem(); virtual ~CoordinateSystem(); - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumCoordinateSystem"; } diff --git a/src/Mod/PartDesign/App/DatumLine.h b/src/Mod/PartDesign/App/DatumLine.h index 6a4497c6cc..b4afc0a0cf 100644 --- a/src/Mod/PartDesign/App/DatumLine.h +++ b/src/Mod/PartDesign/App/DatumLine.h @@ -44,7 +44,7 @@ public: App::PropertyLength Length; virtual void onChanged(const App::Property *prop); - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderDatumLine"; } diff --git a/src/Mod/PartDesign/App/DatumPlane.h b/src/Mod/PartDesign/App/DatumPlane.h index 8c2035be35..4c2672b8f6 100644 --- a/src/Mod/PartDesign/App/DatumPlane.h +++ b/src/Mod/PartDesign/App/DatumPlane.h @@ -45,7 +45,7 @@ public: App::PropertyLength Width; virtual void onChanged(const App::Property *prop); - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderDatumPlane"; } diff --git a/src/Mod/PartDesign/App/DatumPoint.h b/src/Mod/PartDesign/App/DatumPoint.h index bf58b1fe5d..09c3da681a 100644 --- a/src/Mod/PartDesign/App/DatumPoint.h +++ b/src/Mod/PartDesign/App/DatumPoint.h @@ -39,7 +39,7 @@ public: Point(); virtual ~Point(); - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumPoint"; } diff --git a/src/Mod/PartDesign/App/Feature.cpp b/src/Mod/PartDesign/App/Feature.cpp index 038843f961..9ac0fe8c8a 100644 --- a/src/Mod/PartDesign/App/Feature.cpp +++ b/src/Mod/PartDesign/App/Feature.cpp @@ -239,10 +239,10 @@ Body* Feature::getFeatureBody() const { namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(PartDesign::FeaturePython, PartDesign::Feature) -template<> const char* PartDesign::FeaturePython::getViewProviderName(void) const { +template<> const char* PartDesign::FeaturePython::getViewProviderName() const { return "PartDesignGui::ViewProviderPython"; } -template<> PyObject* PartDesign::FeaturePython::getPyObject(void) { +template<> PyObject* PartDesign::FeaturePython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/PartDesign/App/Feature.h b/src/Mod/PartDesign/App/Feature.h index cb430ee80d..78fb580ba7 100644 --- a/src/Mod/PartDesign/App/Feature.h +++ b/src/Mod/PartDesign/App/Feature.h @@ -75,7 +75,7 @@ public: /// Returns the BaseFeature property's TopoShape (if any) Part::TopoShape getBaseTopoShape(bool silent=false) const; - virtual PyObject* getPyObject(void); + virtual PyObject* getPyObject(); virtual const char* getViewProviderName() const { return "PartDesignGui::ViewProvider"; diff --git a/src/Mod/PartDesign/App/FeatureBase.cpp b/src/Mod/PartDesign/App/FeatureBase.cpp index c80c0169b6..40aeebfb32 100644 --- a/src/Mod/PartDesign/App/FeatureBase.cpp +++ b/src/Mod/PartDesign/App/FeatureBase.cpp @@ -47,7 +47,7 @@ Part::Feature* FeatureBase::getBaseObject(bool) const { return nullptr; } -short int FeatureBase::mustExecute(void) const { +short int FeatureBase::mustExecute() const { if(BaseFeature.isTouched()) return 1; @@ -56,7 +56,7 @@ short int FeatureBase::mustExecute(void) const { } -App::DocumentObjectExecReturn* FeatureBase::execute(void) { +App::DocumentObjectExecReturn* FeatureBase::execute() { if(!BaseFeature.getValue()) return new App::DocumentObjectExecReturn("BaseFeature link is not set"); diff --git a/src/Mod/PartDesign/App/FeatureBase.h b/src/Mod/PartDesign/App/FeatureBase.h index 0324e6316f..d27d3c154f 100644 --- a/src/Mod/PartDesign/App/FeatureBase.h +++ b/src/Mod/PartDesign/App/FeatureBase.h @@ -37,7 +37,7 @@ class PartDesignExport FeatureBase : public PartDesign::Feature public: FeatureBase(); - virtual short int mustExecute(void) const; + virtual short int mustExecute() const; virtual Part::Feature* getBaseObject(bool silent=false) const; @@ -46,7 +46,7 @@ public: } virtual void onChanged(const App::Property* prop); - virtual App::DocumentObjectExecReturn* execute(void); + virtual App::DocumentObjectExecReturn* execute(); virtual void onDocumentRestored(); }; diff --git a/src/Mod/PartDesign/App/FeatureBoolean.cpp b/src/Mod/PartDesign/App/FeatureBoolean.cpp index 59aaead73f..c9da6922bb 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.cpp +++ b/src/Mod/PartDesign/App/FeatureBoolean.cpp @@ -66,7 +66,7 @@ short Boolean::mustExecute() const return PartDesign::Feature::mustExecute(); } -App::DocumentObjectExecReturn *Boolean::execute(void) +App::DocumentObjectExecReturn *Boolean::execute() { // Get the operation type std::string type = Type.getValueAsString(); diff --git a/src/Mod/PartDesign/App/FeatureBoolean.h b/src/Mod/PartDesign/App/FeatureBoolean.h index 537a81dcb3..e85d33e818 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.h +++ b/src/Mod/PartDesign/App/FeatureBoolean.h @@ -51,10 +51,10 @@ public: /** @name methods override feature */ //@{ /// Recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderBoolean"; } virtual void onChanged(const App::Property* prop) override; diff --git a/src/Mod/PartDesign/App/FeatureChamfer.cpp b/src/Mod/PartDesign/App/FeatureChamfer.cpp index 9749af28e8..f595e34a06 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.cpp +++ b/src/Mod/PartDesign/App/FeatureChamfer.cpp @@ -102,7 +102,7 @@ short Chamfer::mustExecute() const return DressUp::mustExecute(); } -App::DocumentObjectExecReturn *Chamfer::execute(void) +App::DocumentObjectExecReturn *Chamfer::execute() { // NOTE: Normally the Base property and the BaseFeature property should point to the same object. // The only difference is that the Base property also stores the edges that are to be chamfered diff --git a/src/Mod/PartDesign/App/FeatureChamfer.h b/src/Mod/PartDesign/App/FeatureChamfer.h index 8d846509b6..bc17953588 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.h +++ b/src/Mod/PartDesign/App/FeatureChamfer.h @@ -48,10 +48,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderChamfer"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index e8c5e66ac4..6a031b131c 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -95,7 +95,7 @@ short Draft::mustExecute() const return DressUp::mustExecute(); } -App::DocumentObjectExecReturn *Draft::execute(void) +App::DocumentObjectExecReturn *Draft::execute() { // Get parameters // Base shape diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h index 9b7b92510d..8375075feb 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.h +++ b/src/Mod/PartDesign/App/FeatureDraft.h @@ -48,10 +48,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderDraft"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureDressUp.cpp b/src/Mod/PartDesign/App/FeatureDressUp.cpp index b36f07d6fa..a718b9dcc8 100644 --- a/src/Mod/PartDesign/App/FeatureDressUp.cpp +++ b/src/Mod/PartDesign/App/FeatureDressUp.cpp @@ -63,7 +63,7 @@ short DressUp::mustExecute() const return PartDesign::FeatureAddSub::mustExecute(); } -void DressUp::positionByBaseFeature(void) +void DressUp::positionByBaseFeature() { Part::Feature *base = static_cast(BaseFeature.getValue()); if (base && base->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h index 2b1e2e77d0..7f48fed51a 100644 --- a/src/Mod/PartDesign/App/FeatureDressUp.h +++ b/src/Mod/PartDesign/App/FeatureDressUp.h @@ -46,7 +46,7 @@ public: short mustExecute() const; /// updates the Placement property from the Placement of the BaseFeature - void positionByBaseFeature(void); + void positionByBaseFeature(); /** * Returns the BaseFeature property's object if it's set otherwise returns Base's * feature property object otherwise feature property's object (if any) diff --git a/src/Mod/PartDesign/App/FeatureFillet.cpp b/src/Mod/PartDesign/App/FeatureFillet.cpp index 5a0d6b1f5f..22f3f595f5 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.cpp +++ b/src/Mod/PartDesign/App/FeatureFillet.cpp @@ -63,7 +63,7 @@ short Fillet::mustExecute() const return DressUp::mustExecute(); } -App::DocumentObjectExecReturn *Fillet::execute(void) +App::DocumentObjectExecReturn *Fillet::execute() { Part::TopoShape TopShape; try { diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp b/src/Mod/PartDesign/App/FeatureGroove.cpp index 810c55e952..835a3aaa5f 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.cpp +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp @@ -70,7 +70,7 @@ short Groove::mustExecute() const return ProfileBased::mustExecute(); } -App::DocumentObjectExecReturn *Groove::execute(void) +App::DocumentObjectExecReturn *Groove::execute() { // Validate parameters double angle = Angle.getValue(); @@ -187,13 +187,13 @@ App::DocumentObjectExecReturn *Groove::execute(void) } } -bool Groove::suggestReversed(void) +bool Groove::suggestReversed() { updateAxis(); return ProfileBased::getReversedAngle(Base.getValue(), Axis.getValue()) > 0.0; } -void Groove::updateAxis(void) +void Groove::updateAxis() { App::DocumentObject *pcReferenceAxis = ReferenceAxis.getValue(); const std::vector &subReferenceAxis = ReferenceAxis.getSubValues(); diff --git a/src/Mod/PartDesign/App/FeatureGroove.h b/src/Mod/PartDesign/App/FeatureGroove.h index e60f791c73..f25fb8793f 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.h +++ b/src/Mod/PartDesign/App/FeatureGroove.h @@ -55,19 +55,19 @@ public: * If Reversed is true then the direction of revolution will be reversed. * The created material will be cut out of the sketch support */ - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderGroove"; } //@} /// suggests a value for Reversed flag so that material is always removed from the support - bool suggestReversed(void); + bool suggestReversed(); protected: /// updates Axis from ReferenceAxis - void updateAxis(void); + void updateAxis(); static const App::PropertyAngle::Constraints floatAngle; }; diff --git a/src/Mod/PartDesign/App/FeatureHelix.cpp b/src/Mod/PartDesign/App/FeatureHelix.cpp index e083472758..3586537a32 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.cpp +++ b/src/Mod/PartDesign/App/FeatureHelix.cpp @@ -118,7 +118,7 @@ short Helix::mustExecute() const return ProfileBased::mustExecute(); } -App::DocumentObjectExecReturn* Helix::execute(void) +App::DocumentObjectExecReturn* Helix::execute() { // Validate and normalize parameters HelixMode mode = static_cast(Mode.getValue()); @@ -379,7 +379,7 @@ App::DocumentObjectExecReturn* Helix::execute(void) } } -void Helix::updateAxis(void) +void Helix::updateAxis() { App::DocumentObject* pcReferenceAxis = ReferenceAxis.getValue(); const std::vector& subReferenceAxis = ReferenceAxis.getSubValues(); diff --git a/src/Mod/PartDesign/App/FeatureHelix.h b/src/Mod/PartDesign/App/FeatureHelix.h index 02b0735eb6..435f0fd7dc 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.h +++ b/src/Mod/PartDesign/App/FeatureHelix.h @@ -64,20 +64,20 @@ public: /** @name methods override feature */ //@{ - App::DocumentObjectExecReturn* execute(void); + App::DocumentObjectExecReturn* execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderHelix"; } //@} void proposeParameters(bool force = false); - double safePitch(void); + double safePitch(); protected: /// updates Axis from ReferenceAxis - void updateAxis(void); + void updateAxis(); /// generate helix and move it to the right location. TopoDS_Shape generateHelixPath(double startOffset0 = 0.0); diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 6a2e41e385..22c91d4435 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -1630,7 +1630,7 @@ static gp_Pnt toPnt(gp_Vec dir) return gp_Pnt(dir.X(), dir.Y(), dir.Z()); } -App::DocumentObjectExecReturn* Hole::execute(void) +App::DocumentObjectExecReturn* Hole::execute() { TopoDS_Shape profileshape; try { diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h index 3400470aab..023981a8a3 100644 --- a/src/Mod/PartDesign/App/FeatureHole.h +++ b/src/Mod/PartDesign/App/FeatureHole.h @@ -77,10 +77,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderHole"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h index bd4189ecc7..2e516e162f 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.h +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h @@ -47,7 +47,7 @@ public: short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderLinearPattern"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureLoft.cpp b/src/Mod/PartDesign/App/FeatureLoft.cpp index 4e7f861816..af4779044b 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.cpp +++ b/src/Mod/PartDesign/App/FeatureLoft.cpp @@ -68,7 +68,7 @@ short Loft::mustExecute() const return ProfileBased::mustExecute(); } -App::DocumentObjectExecReturn *Loft::execute(void) +App::DocumentObjectExecReturn *Loft::execute() { auto getSectionShape = [](App::DocumentObject* feature, const std::vector &subs) -> TopoDS_Shape { diff --git a/src/Mod/PartDesign/App/FeatureLoft.h b/src/Mod/PartDesign/App/FeatureLoft.h index 70fc16a8af..4c212a54f5 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.h +++ b/src/Mod/PartDesign/App/FeatureLoft.h @@ -42,10 +42,10 @@ public: /** @name methods override feature */ //@{ - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderLoft"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureMirrored.h b/src/Mod/PartDesign/App/FeatureMirrored.h index 643f32f8be..3e1d66a306 100644 --- a/src/Mod/PartDesign/App/FeatureMirrored.h +++ b/src/Mod/PartDesign/App/FeatureMirrored.h @@ -44,7 +44,7 @@ public: short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderMirrored"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.cpp b/src/Mod/PartDesign/App/FeatureMultiTransform.cpp index d506916819..66feeda17a 100644 --- a/src/Mod/PartDesign/App/FeatureMultiTransform.cpp +++ b/src/Mod/PartDesign/App/FeatureMultiTransform.cpp @@ -46,7 +46,7 @@ MultiTransform::MultiTransform() Transformations.setSize(0); } -void MultiTransform::positionBySupport(void) +void MultiTransform::positionBySupport() { PartDesign::Transformed::positionBySupport(); std::vector transFeatures = Transformations.getValues(); diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.h b/src/Mod/PartDesign/App/FeatureMultiTransform.h index dca8054d7e..8a4f120da6 100644 --- a/src/Mod/PartDesign/App/FeatureMultiTransform.h +++ b/src/Mod/PartDesign/App/FeatureMultiTransform.h @@ -44,7 +44,7 @@ public: short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderMultiTransform"; } //@} @@ -59,7 +59,7 @@ public: const std::list getTransformations(const std::vector originals); protected: - virtual void positionBySupport(void); + virtual void positionBySupport(); }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 5fc5dbfb42..55e53d7aac 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -96,7 +96,7 @@ short Pipe::mustExecute() const return ProfileBased::mustExecute(); } -App::DocumentObjectExecReturn *Pipe::execute(void) +App::DocumentObjectExecReturn *Pipe::execute() { auto getSectionShape = [](App::DocumentObject* feature, const std::vector &subs) -> TopoDS_Shape { diff --git a/src/Mod/PartDesign/App/FeaturePipe.h b/src/Mod/PartDesign/App/FeaturePipe.h index fd752ca3a4..c825fc36a7 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.h +++ b/src/Mod/PartDesign/App/FeaturePipe.h @@ -48,10 +48,10 @@ public: App::PropertyEnumeration Transformation; App::PropertyLinkSubList Sections; - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderPipe"; } diff --git a/src/Mod/PartDesign/App/FeaturePocket.h b/src/Mod/PartDesign/App/FeaturePocket.h index 3c83e7becf..9af109c0dc 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.h +++ b/src/Mod/PartDesign/App/FeaturePocket.h @@ -50,7 +50,7 @@ public: */ App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderPocket"; } //@} diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.h b/src/Mod/PartDesign/App/FeaturePolarPattern.h index 0ade352ee0..f6980a5f6d 100644 --- a/src/Mod/PartDesign/App/FeaturePolarPattern.h +++ b/src/Mod/PartDesign/App/FeaturePolarPattern.h @@ -49,7 +49,7 @@ public: short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderPolarPattern"; } //@} diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index 6ed15a88c9..b1e916e6c8 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -189,7 +189,7 @@ Box::Box() primitiveType = FeaturePrimitive::Box; } -App::DocumentObjectExecReturn* Box::execute(void) +App::DocumentObjectExecReturn* Box::execute() { double L = Length.getValue(); double W = Width.getValue(); @@ -242,7 +242,7 @@ Cylinder::Cylinder() primitiveType = FeaturePrimitive::Cylinder; } -App::DocumentObjectExecReturn* Cylinder::execute(void) +App::DocumentObjectExecReturn* Cylinder::execute() { // Build a cylinder if (Radius.getValue() < Precision::Confusion()) @@ -299,7 +299,7 @@ Sphere::Sphere() primitiveType = FeaturePrimitive::Sphere; } -App::DocumentObjectExecReturn* Sphere::execute(void) +App::DocumentObjectExecReturn* Sphere::execute() { // Build a sphere if (Radius.getValue() < Precision::Confusion()) @@ -349,7 +349,7 @@ Cone::Cone() primitiveType = FeaturePrimitive::Cone; } -App::DocumentObjectExecReturn* Cone::execute(void) +App::DocumentObjectExecReturn* Cone::execute() { if (Radius1.getValue() < 0.0) return new App::DocumentObjectExecReturn("Radius of cone cannot be negative"); @@ -411,7 +411,7 @@ Ellipsoid::Ellipsoid() primitiveType = FeaturePrimitive::Ellipsoid; } -App::DocumentObjectExecReturn* Ellipsoid::execute(void) +App::DocumentObjectExecReturn* Ellipsoid::execute() { // Build a sphere if (Radius1.getValue() < Precision::Confusion()) @@ -496,7 +496,7 @@ Torus::Torus() primitiveType = FeaturePrimitive::Torus; } -App::DocumentObjectExecReturn* Torus::execute(void) +App::DocumentObjectExecReturn* Torus::execute() { if (Radius1.getValue() < Precision::Confusion()) return new App::DocumentObjectExecReturn("Radius of torus too small"); @@ -560,7 +560,7 @@ Prism::Prism() primitiveType = FeaturePrimitive::Prism; } -App::DocumentObjectExecReturn* Prism::execute(void) +App::DocumentObjectExecReturn* Prism::execute() { // Build a prism if (Polygon.getValue() < 3) @@ -629,7 +629,7 @@ Wedge::Wedge() primitiveType = FeaturePrimitive::Wedge; } -App::DocumentObjectExecReturn* Wedge::execute(void) +App::DocumentObjectExecReturn* Wedge::execute() { double xmin = Xmin.getValue(); double ymin = Ymin.getValue(); diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h index 91edae7825..9011912a3a 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.h +++ b/src/Mod/PartDesign/App/FeaturePrimitive.h @@ -49,7 +49,7 @@ public: FeaturePrimitive(); - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPrimitive"; } Type getPrimitiveType() {return primitiveType;} @@ -80,7 +80,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: @@ -119,7 +119,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; }; @@ -156,7 +156,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: @@ -195,7 +195,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: @@ -237,7 +237,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: @@ -278,7 +278,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: @@ -316,7 +316,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; }; @@ -359,7 +359,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; protected: diff --git a/src/Mod/PartDesign/App/FeatureRevolution.cpp b/src/Mod/PartDesign/App/FeatureRevolution.cpp index fbdd9571c7..dc1431a3c8 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.cpp +++ b/src/Mod/PartDesign/App/FeatureRevolution.cpp @@ -69,7 +69,7 @@ short Revolution::mustExecute() const return ProfileBased::mustExecute(); } -App::DocumentObjectExecReturn *Revolution::execute(void) +App::DocumentObjectExecReturn *Revolution::execute() { // Validate parameters double angle = Angle.getValue(); @@ -179,7 +179,7 @@ App::DocumentObjectExecReturn *Revolution::execute(void) } } -bool Revolution::suggestReversed(void) +bool Revolution::suggestReversed() { try { updateAxis(); @@ -190,7 +190,7 @@ bool Revolution::suggestReversed(void) return ProfileBased::getReversedAngle(Base.getValue(), Axis.getValue()) < 0.0; } -void Revolution::updateAxis(void) +void Revolution::updateAxis() { App::DocumentObject *pcReferenceAxis = ReferenceAxis.getValue(); const std::vector &subReferenceAxis = ReferenceAxis.getSubValues(); diff --git a/src/Mod/PartDesign/App/FeatureRevolution.h b/src/Mod/PartDesign/App/FeatureRevolution.h index 5689843774..e37812b521 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.h +++ b/src/Mod/PartDesign/App/FeatureRevolution.h @@ -55,19 +55,19 @@ public: * If Reversed is true then the direction of revolution will be reversed. * The created material will be fused with the sketch support (if there is one) */ - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderRevolution"; } //@} /// suggests a value for Reversed flag so that material is always added to the support - bool suggestReversed(void); + bool suggestReversed(); protected: /// updates Axis from ReferenceAxis - void updateAxis(void); + void updateAxis(); static const App::PropertyAngle::Constraints floatAngle; }; diff --git a/src/Mod/PartDesign/App/FeatureScaled.h b/src/Mod/PartDesign/App/FeatureScaled.h index b6ef13b3f4..29d26823de 100644 --- a/src/Mod/PartDesign/App/FeatureScaled.h +++ b/src/Mod/PartDesign/App/FeatureScaled.h @@ -46,7 +46,7 @@ public: short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderScaled"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp index 07a7bbd977..98f2dc1c77 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp +++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp @@ -91,7 +91,7 @@ void ProfileBased::setupObject() AllowMultiFace.setValue(true); } -void ProfileBased::positionByPrevious(void) +void ProfileBased::positionByPrevious() { Part::Feature* feat = getBaseObject(/* silent = */ true); if (feat) { @@ -357,7 +357,7 @@ TopoDS_Face ProfileBased::getSupportFace(const App::PropertyLinkSub& link) const return face; } -int ProfileBased::getSketchAxisCount(void) const +int ProfileBased::getSketchAxisCount() const { Part::Part2DObject* sketch = static_cast(Profile.getValue()); if (!sketch) diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h index 62629e288b..802bd7434f 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.h +++ b/src/Mod/PartDesign/App/FeatureSketchBased.h @@ -68,7 +68,7 @@ public: * this one is made from: either from Base, if there is one, or from sketch, * if there is no base. */ - void positionByPrevious(void); + void positionByPrevious(); /** applies a transform on the Placement of the Sketch or its * support if it has one @@ -110,7 +110,7 @@ public: Part::TopoShape getProfileShape() const; /// retrieves the number of axes in the linked sketch (defined as construction lines) - int getSketchAxisCount(void) const; + int getSketchAxisCount() const; virtual Part::Feature* getBaseObject(bool silent=false) const; diff --git a/src/Mod/PartDesign/App/FeatureThickness.cpp b/src/Mod/PartDesign/App/FeatureThickness.cpp index 65a1807ecd..2c3c2c4b64 100644 --- a/src/Mod/PartDesign/App/FeatureThickness.cpp +++ b/src/Mod/PartDesign/App/FeatureThickness.cpp @@ -59,7 +59,7 @@ short Thickness::mustExecute() const return DressUp::mustExecute(); } -App::DocumentObjectExecReturn *Thickness::execute(void) +App::DocumentObjectExecReturn *Thickness::execute() { // Base shape Part::TopoShape TopShape; diff --git a/src/Mod/PartDesign/App/FeatureThickness.h b/src/Mod/PartDesign/App/FeatureThickness.h index 2a1078a4da..4a54b57fb6 100644 --- a/src/Mod/PartDesign/App/FeatureThickness.h +++ b/src/Mod/PartDesign/App/FeatureThickness.h @@ -47,10 +47,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "PartDesignGui::ViewProviderThickness"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp index 1bf7dd51a1..0167939037 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.cpp +++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp @@ -69,7 +69,7 @@ Transformed::Transformed() this->Refine.setValue(hGrp->GetBool("RefineModel", false)); } -void Transformed::positionBySupport(void) +void Transformed::positionBySupport() { // TODO May be here better to throw exception (silent=false) (2015-07-27, Fat-Zer) Part::Feature *support = getBaseObject(/* silent =*/ true); @@ -163,7 +163,7 @@ short Transformed::mustExecute() const return PartDesign::Feature::mustExecute(); } -App::DocumentObjectExecReturn *Transformed::execute(void) +App::DocumentObjectExecReturn *Transformed::execute() { std::vector originals = Originals.getValues(); if (originals.empty()) // typically InsideMultiTransform diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h index edd7d59dbb..45107dad11 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.h +++ b/src/Mod/PartDesign/App/FeatureTransformed.h @@ -78,7 +78,7 @@ public: * If Originals is empty, execute() returns immediately without doing anything as * the actual processing will happen in the MultiTransform feature */ - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; //@} @@ -90,7 +90,7 @@ public: protected: void Restore(Base::XMLReader &reader); void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); - virtual void positionBySupport(void); + virtual void positionBySupport(); TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const; void divideTools(const std::vector &toolsIn, std::vector &individualsOut, TopoDS_Compound &compoundOut) const; diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp index ca9f09274a..92c33afac4 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -73,7 +73,7 @@ void ShapeBinder::onChanged(const App::Property* prop) Feature::onChanged(prop); } -short int ShapeBinder::mustExecute(void) const { +short int ShapeBinder::mustExecute() const { if (Support.isTouched()) return 1; @@ -117,7 +117,7 @@ bool ShapeBinder::hasPlacementChanged() const return this->Placement.getValue() != placement; } -App::DocumentObjectExecReturn* ShapeBinder::execute(void) { +App::DocumentObjectExecReturn* ShapeBinder::execute() { if (!this->isRestoring()) { Part::TopoShape shape(updatedShape()); @@ -805,7 +805,7 @@ void SubShapeBinder::slotRecomputedObject(const App::DocumentObject& Obj) { } } -App::DocumentObjectExecReturn* SubShapeBinder::execute(void) { +App::DocumentObjectExecReturn* SubShapeBinder::execute() { setupCopyOnChange(); @@ -988,7 +988,7 @@ void SubShapeBinder::handleChangedPropertyType( namespace App { PROPERTY_SOURCE_TEMPLATE(PartDesign::SubShapeBinderPython, PartDesign::SubShapeBinder) - template<> const char* PartDesign::SubShapeBinderPython::getViewProviderName(void) const { + template<> const char* PartDesign::SubShapeBinderPython::getViewProviderName() const { return "PartDesignGui::ViewProviderSubShapeBinderPython"; } template class PartDesignExport FeaturePythonT; diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index 75c5b13d90..815efa31b9 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -55,7 +55,7 @@ public: static void getFilteredReferences(const App::PropertyLinkSubList* prop, App::GeoFeature*& object, std::vector< std::string >& subobjects); static Part::TopoShape buildShapeFromReferences(App::GeoFeature* obj, std::vector< std::string > subs); - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderShapeBinder"; } @@ -63,8 +63,8 @@ protected: Part::TopoShape updatedShape() const; bool hasPlacementChanged() const; virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; - virtual short int mustExecute(void) const override; - virtual App::DocumentObjectExecReturn* execute(void) override; + virtual short int mustExecute() const override; + virtual App::DocumentObjectExecReturn* execute() override; virtual void onChanged(const App::Property* prop) override; private: @@ -83,7 +83,7 @@ public: SubShapeBinder(); ~SubShapeBinder(); - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderSubShapeBinder"; } @@ -123,7 +123,7 @@ public: Base::Matrix4D *mat=nullptr, bool transform=true, int depth=0) const override; protected: - virtual App::DocumentObjectExecReturn* execute(void) override; + virtual App::DocumentObjectExecReturn* execute() override; virtual void onChanged(const App::Property *prop) override; virtual void handleChangedPropertyType( diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index a34517d787..b3fcda7f22 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -172,7 +172,7 @@ void CmdPartDesignPlane::activated(int iMsg) UnifiedDatumCommand(*this, Base::Type::fromName("PartDesign::Plane"),"DatumPlane"); } -bool CmdPartDesignPlane::isActive(void) +bool CmdPartDesignPlane::isActive() { if (getActiveGuiDocument()) return true; @@ -200,7 +200,7 @@ void CmdPartDesignLine::activated(int iMsg) UnifiedDatumCommand(*this, Base::Type::fromName("PartDesign::Line"),"DatumLine"); } -bool CmdPartDesignLine::isActive(void) +bool CmdPartDesignLine::isActive() { if (getActiveGuiDocument()) return true; @@ -228,7 +228,7 @@ void CmdPartDesignPoint::activated(int iMsg) UnifiedDatumCommand(*this, Base::Type::fromName("PartDesign::Point"),"DatumPoint"); } -bool CmdPartDesignPoint::isActive(void) +bool CmdPartDesignPoint::isActive() { if (getActiveGuiDocument()) return true; @@ -256,7 +256,7 @@ void CmdPartDesignCS::activated(int iMsg) UnifiedDatumCommand(*this, Base::Type::fromName("PartDesign::CoordinateSystem"),"Local_CS"); } -bool CmdPartDesignCS::isActive(void) +bool CmdPartDesignCS::isActive() { if (getActiveGuiDocument()) return true; @@ -325,7 +325,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) // TODO do a proper error processing (2015-09-11, Fat-Zer) } -bool CmdPartDesignShapeBinder::isActive(void) +bool CmdPartDesignShapeBinder::isActive() { return hasActiveDocument (); } @@ -410,7 +410,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg) } } -bool CmdPartDesignSubShapeBinder::isActive(void) { +bool CmdPartDesignSubShapeBinder::isActive() { return hasActiveDocument(); } @@ -466,7 +466,7 @@ void CmdPartDesignClone::activated(int iMsg) } } -bool CmdPartDesignClone::isActive(void) +bool CmdPartDesignClone::isActive() { return getSelection().countObjectsOfType(Part::Feature::getClassTypeId()) == 1; } @@ -830,7 +830,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) } } -bool CmdPartDesignNewSketch::isActive(void) +bool CmdPartDesignNewSketch::isActive() { if (getActiveGuiDocument()) return true; @@ -1320,7 +1320,7 @@ void CmdPartDesignPad::activated(int iMsg) prepareProfileBased(this, "Pad", 10.0); } -bool CmdPartDesignPad::isActive(void) +bool CmdPartDesignPad::isActive() { return hasActiveDocument(); } @@ -1352,7 +1352,7 @@ void CmdPartDesignPocket::activated(int iMsg) prepareProfileBased(this, "Pocket", 5.0); } -bool CmdPartDesignPocket::isActive(void) +bool CmdPartDesignPocket::isActive() { return hasActiveDocument(); } @@ -1399,7 +1399,7 @@ void CmdPartDesignHole::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "Hole", worker); } -bool CmdPartDesignHole::isActive(void) +bool CmdPartDesignHole::isActive() { return hasActiveDocument(); } @@ -1458,7 +1458,7 @@ void CmdPartDesignRevolution::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "Revolution", worker); } -bool CmdPartDesignRevolution::isActive(void) +bool CmdPartDesignRevolution::isActive() { return hasActiveDocument(); } @@ -1525,7 +1525,7 @@ void CmdPartDesignGroove::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "Groove", worker); } -bool CmdPartDesignGroove::isActive(void) +bool CmdPartDesignGroove::isActive() { return hasActiveDocument(); } @@ -1575,7 +1575,7 @@ void CmdPartDesignAdditivePipe::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "AdditivePipe", worker); } -bool CmdPartDesignAdditivePipe::isActive(void) +bool CmdPartDesignAdditivePipe::isActive() { return hasActiveDocument(); } @@ -1626,7 +1626,7 @@ void CmdPartDesignSubtractivePipe::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "SubtractivePipe", worker); } -bool CmdPartDesignSubtractivePipe::isActive(void) +bool CmdPartDesignSubtractivePipe::isActive() { return hasActiveDocument(); } @@ -1677,7 +1677,7 @@ void CmdPartDesignAdditiveLoft::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "AdditiveLoft", worker); } -bool CmdPartDesignAdditiveLoft::isActive(void) +bool CmdPartDesignAdditiveLoft::isActive() { return hasActiveDocument(); } @@ -1728,7 +1728,7 @@ void CmdPartDesignSubtractiveLoft::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "SubtractiveLoft", worker); } -bool CmdPartDesignSubtractiveLoft::isActive(void) +bool CmdPartDesignSubtractiveLoft::isActive() { return hasActiveDocument(); } @@ -1804,7 +1804,7 @@ void CmdPartDesignAdditiveHelix::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "AdditiveHelix", worker); } -bool CmdPartDesignAdditiveHelix::isActive(void) +bool CmdPartDesignAdditiveHelix::isActive() { return hasActiveDocument(); } @@ -1862,7 +1862,7 @@ void CmdPartDesignSubtractiveHelix::activated(int iMsg) prepareProfileBased(pcActiveBody, this, "SubtractiveHelix", worker); } -bool CmdPartDesignSubtractiveHelix::isActive(void) +bool CmdPartDesignSubtractiveHelix::isActive() { return hasActiveDocument(); } @@ -2021,7 +2021,7 @@ void CmdPartDesignFillet::activated(int iMsg) makeChamferOrFillet(this, "Fillet"); } -bool CmdPartDesignFillet::isActive(void) +bool CmdPartDesignFillet::isActive() { return hasActiveDocument(); } @@ -2050,7 +2050,7 @@ void CmdPartDesignChamfer::activated(int iMsg) doCommand(Gui,"Gui.Selection.clearSelection()"); } -bool CmdPartDesignChamfer::isActive(void) +bool CmdPartDesignChamfer::isActive() { return hasActiveDocument(); } @@ -2107,7 +2107,7 @@ void CmdPartDesignDraft::activated(int iMsg) finishDressupFeature (this, "Draft", base, SubNames, useAllEdges); } -bool CmdPartDesignDraft::isActive(void) +bool CmdPartDesignDraft::isActive() { return hasActiveDocument(); } @@ -2157,7 +2157,7 @@ void CmdPartDesignThickness::activated(int iMsg) finishDressupFeature (this, "Thickness", base, SubNames, useAllEdges); } -bool CmdPartDesignThickness::isActive(void) +bool CmdPartDesignThickness::isActive() { return hasActiveDocument(); } @@ -2319,7 +2319,7 @@ void CmdPartDesignMirrored::activated(int iMsg) prepareTransformed(pcActiveBody, this, "Mirrored", worker); } -bool CmdPartDesignMirrored::isActive(void) +bool CmdPartDesignMirrored::isActive() { return hasActiveDocument(); } @@ -2383,7 +2383,7 @@ void CmdPartDesignLinearPattern::activated(int iMsg) prepareTransformed(pcActiveBody, this, "LinearPattern", worker); } -bool CmdPartDesignLinearPattern::isActive(void) +bool CmdPartDesignLinearPattern::isActive() { return hasActiveDocument(); } @@ -2448,7 +2448,7 @@ void CmdPartDesignPolarPattern::activated(int iMsg) prepareTransformed(pcActiveBody, this, "PolarPattern", worker); } -bool CmdPartDesignPolarPattern::isActive(void) +bool CmdPartDesignPolarPattern::isActive() { return hasActiveDocument(); } @@ -2497,7 +2497,7 @@ void CmdPartDesignScaled::activated(int iMsg) prepareTransformed(pcActiveBody, this, "Scaled", worker); } -bool CmdPartDesignScaled::isActive(void) +bool CmdPartDesignScaled::isActive() { return hasActiveDocument(); } @@ -2619,7 +2619,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg) } } -bool CmdPartDesignMultiTransform::isActive(void) +bool CmdPartDesignMultiTransform::isActive() { return hasActiveDocument(); } @@ -2680,7 +2680,7 @@ void CmdPartDesignBoolean::activated(int iMsg) finishFeature(this, Feat, nullptr, false, updateDocument); } -bool CmdPartDesignBoolean::isActive(void) +bool CmdPartDesignBoolean::isActive() { if (getActiveGuiDocument()) return true; @@ -2693,7 +2693,7 @@ bool CmdPartDesignBoolean::isActive(void) // Initialization //=========================================================================== -void CreatePartDesignCommands(void) +void CreatePartDesignCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 2cff9db92b..f41814444c 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -290,7 +290,7 @@ void CmdPartDesignBody::activated(int iMsg) updateActive(); } -bool CmdPartDesignBody::isActive(void) +bool CmdPartDesignBody::isActive() { return hasActiveDocument() && !PartDesignGui::isLegacyWorkflow ( getDocument () ); } @@ -506,7 +506,7 @@ void CmdPartDesignMigrate::activated(int iMsg) updateActive(); } -bool CmdPartDesignMigrate::isActive(void) +bool CmdPartDesignMigrate::isActive() { return hasActiveDocument(); } @@ -584,7 +584,7 @@ void CmdPartDesignMoveTip::activated(int iMsg) updateActive(); } -bool CmdPartDesignMoveTip::isActive(void) +bool CmdPartDesignMoveTip::isActive() { return hasActiveDocument(); } @@ -640,7 +640,7 @@ void CmdPartDesignDuplicateSelection::activated(int iMsg) updateActive(); } -bool CmdPartDesignDuplicateSelection::isActive(void) +bool CmdPartDesignDuplicateSelection::isActive() { return hasActiveDocument(); } @@ -811,7 +811,7 @@ void CmdPartDesignMoveFeature::activated(int iMsg) updateActive(); } -bool CmdPartDesignMoveFeature::isActive(void) +bool CmdPartDesignMoveFeature::isActive() { return hasActiveDocument () && !PartDesignGui::isLegacyWorkflow ( getDocument () ); } @@ -963,7 +963,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) updateActive(); } -bool CmdPartDesignMoveFeatureInTree::isActive(void) +bool CmdPartDesignMoveFeatureInTree::isActive() { return hasActiveDocument () && !PartDesignGui::isLegacyWorkflow ( getDocument () ); } @@ -973,7 +973,7 @@ bool CmdPartDesignMoveFeatureInTree::isActive(void) // Initialization //=========================================================================== -void CreatePartDesignBodyCommands(void) +void CreatePartDesignBodyCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h index d9023eae9a..f43125c098 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h @@ -51,13 +51,13 @@ public: TaskBooleanParameters(ViewProviderBoolean *BooleanView, QWidget *parent=nullptr); ~TaskBooleanParameters(); - const std::vector getBodies(void) const; - int getType(void) const; + const std::vector getBodies() const; + int getType() const; private Q_SLOTS: void onButtonBodyAdd(const bool checked); void onButtonBodyRemove(const bool checked); - void onBodyDeleted(void); + void onBodyDeleted(); void onTypeChanged(int index); protected: @@ -100,11 +100,11 @@ public: /// is called by the framework if the dialog is rejected (Cancel) virtual bool reject(); /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp index c6b683f6e1..ad09973d74 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp @@ -208,7 +208,7 @@ void TaskChamferParameters::clearButtons(const selectionModes notThis) DressUpView->highlightReferences(false); } -void TaskChamferParameters::onRefDeleted(void) +void TaskChamferParameters::onRefDeleted() { // assure we we are not in selection mode exitSelectionMode(); @@ -260,7 +260,7 @@ void TaskChamferParameters::onRefDeleted(void) } } -void TaskChamferParameters::onAddAllEdges(void) +void TaskChamferParameters::onAddAllEdges() { TaskDressUpParameters::addAllEdges(ui->listWidgetReferences); ui->buttonRefRemove->setEnabled(true); @@ -317,27 +317,27 @@ void TaskChamferParameters::onFlipDirection(bool flip) hideOnError(); } -int TaskChamferParameters::getType(void) const +int TaskChamferParameters::getType() const { return ui->chamferType->currentIndex(); } -double TaskChamferParameters::getSize(void) const +double TaskChamferParameters::getSize() const { return ui->chamferSize->value().getValue(); } -double TaskChamferParameters::getSize2(void) const +double TaskChamferParameters::getSize2() const { return ui->chamferSize2->value().getValue(); } -double TaskChamferParameters::getAngle(void) const +double TaskChamferParameters::getAngle() const { return ui->chamferAngle->value().getValue(); } -bool TaskChamferParameters::getFlipDirection(void) const +bool TaskChamferParameters::getFlipDirection() const { return ui->flipDirection->isChecked(); } diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.h b/src/Mod/PartDesign/Gui/TaskDraftParameters.h index 6aa4ed66f0..63227fc17c 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.h @@ -40,9 +40,9 @@ public: TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); ~TaskDraftParameters(); - double getAngle(void) const; - bool getReversed(void) const; - const std::vector getFaces(void) const; + double getAngle() const; + bool getReversed() const; + const std::vector getFaces() const; void getPlane(App::DocumentObject*& obj, std::vector& sub) const; void getLine(App::DocumentObject*& obj, std::vector& sub) const; @@ -51,7 +51,7 @@ private Q_SLOTS: void onReversedChanged(bool reversed); void onButtonPlane(const bool checked); void onButtonLine(const bool checked); - void onRefDeleted(void); + void onRefDeleted(); protected: virtual void clearButtons(const selectionModes notThis); diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp index 33c1851bbf..7880c04668 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp @@ -745,22 +745,22 @@ void TaskExtrudeParameters::translateFaceName() } } -double TaskExtrudeParameters::getOffset(void) const +double TaskExtrudeParameters::getOffset() const { return ui->offsetEdit->value().getValue(); } -bool TaskExtrudeParameters::getAlongSketchNormal(void) const +bool TaskExtrudeParameters::getAlongSketchNormal() const { return ui->checkBoxAlongDirection->isChecked(); } -bool TaskExtrudeParameters::getCustom(void) const +bool TaskExtrudeParameters::getCustom() const { return (ui->directionCB->currentIndex() == DirectionModes::Custom); } -std::string TaskExtrudeParameters::getReferenceAxis(void) const +std::string TaskExtrudeParameters::getReferenceAxis() const { std::vector sub; App::DocumentObject* obj; @@ -768,37 +768,37 @@ std::string TaskExtrudeParameters::getReferenceAxis(void) const return buildLinkSingleSubPythonStr(obj, sub); } -double TaskExtrudeParameters::getXDirection(void) const +double TaskExtrudeParameters::getXDirection() const { return ui->XDirectionEdit->value(); } -double TaskExtrudeParameters::getYDirection(void) const +double TaskExtrudeParameters::getYDirection() const { return ui->YDirectionEdit->value(); } -double TaskExtrudeParameters::getZDirection(void) const +double TaskExtrudeParameters::getZDirection() const { return ui->ZDirectionEdit->value(); } -bool TaskExtrudeParameters::getReversed(void) const +bool TaskExtrudeParameters::getReversed() const { return ui->checkBoxReversed->isChecked(); } -bool TaskExtrudeParameters::getMidplane(void) const +bool TaskExtrudeParameters::getMidplane() const { return ui->checkBoxMidplane->isChecked(); } -int TaskExtrudeParameters::getMode(void) const +int TaskExtrudeParameters::getMode() const { return ui->changeMode->currentIndex(); } -QString TaskExtrudeParameters::getFaceName(void) const +QString TaskExtrudeParameters::getFaceName() const { QVariant featureName = ui->lineFaceName->property("FeatureName"); if (featureName.isValid()) { @@ -847,7 +847,7 @@ void TaskExtrudeParameters::changeEvent(QEvent *e) } } -void TaskExtrudeParameters::saveHistory(void) +void TaskExtrudeParameters::saveHistory() { // save the user values to history ui->lengthEdit->pushToHistory(); @@ -892,12 +892,12 @@ void TaskExtrudeParameters::translateModeList(int) // implement in sub-class } -void TaskExtrudeParameters::handleLineFaceNameClick(void) +void TaskExtrudeParameters::handleLineFaceNameClick() { ui->lineFaceName->setPlaceholderText(tr("Click on a face in the model")); } -void TaskExtrudeParameters::handleLineFaceNameNo(void) +void TaskExtrudeParameters::handleLineFaceNameNo() { ui->lineFaceName->setPlaceholderText(tr("No face selected")); } diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h index 144211c7ef..f285f28f23 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h @@ -44,7 +44,7 @@ public: virtual ~TaskFeatureParameters() {} /// save field history - virtual void saveHistory(void) {} + virtual void saveHistory() {} /// apply changes made in the parameters input to the model via commands virtual void apply() {} diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp index 5b79e664e2..2a75621bed 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp @@ -162,7 +162,7 @@ void TaskFilletParameters::clearButtons(const selectionModes notThis) DressUpView->highlightReferences(false); } -void TaskFilletParameters::onRefDeleted(void) +void TaskFilletParameters::onRefDeleted() { // assure we we are not in selection mode exitSelectionMode(); @@ -214,7 +214,7 @@ void TaskFilletParameters::onRefDeleted(void) } } -void TaskFilletParameters::onAddAllEdges(void) +void TaskFilletParameters::onAddAllEdges() { TaskDressUpParameters::addAllEdges(ui->listWidgetReferences); ui->buttonRefRemove->setEnabled(true); @@ -231,7 +231,7 @@ void TaskFilletParameters::onLengthChanged(double len) hideOnError(); } -double TaskFilletParameters::getLength(void) const +double TaskFilletParameters::getLength() const { return ui->filletRadius->value().getValue(); } diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.h b/src/Mod/PartDesign/Gui/TaskFilletParameters.h index e8ada661bc..7927f77818 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.h @@ -43,12 +43,12 @@ public: private Q_SLOTS: void onLengthChanged(double); - void onRefDeleted(void); - void onAddAllEdges(void); + void onRefDeleted(); + void onAddAllEdges(); void onCheckBoxUseAllEdgesToggled(bool checked); protected: - double getLength(void) const; + double getLength() const; virtual void clearButtons(const selectionModes notThis); bool event(QEvent *e); void changeEvent(QEvent *e); diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index 782b73067d..a85e98f801 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -62,7 +62,7 @@ private Q_SLOTS: void onLength(const double l); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(void); + virtual void onFeatureDeleted(); protected: virtual void addObject(App::DocumentObject*); @@ -71,9 +71,9 @@ protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); virtual void clearButtons(); void getDirection(App::DocumentObject*& obj, std::vector& sub) const; - bool getReverse(void) const; - double getLength(void) const; - unsigned getOccurrences(void) const; + bool getReverse() const; + double getLength() const; + unsigned getOccurrences() const; private: void connectSignals(); diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index e163c365a9..3eaeda48b4 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -265,7 +265,7 @@ void TaskMirroredParameters::onUpdateView(bool on) } } -void TaskMirroredParameters::onFeatureDeleted(void) +void TaskMirroredParameters::onFeatureDeleted() { PartDesign::Transformed* pcTransformed = getObject(); std::vector originals = pcTransformed->Originals.getValues(); diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 4087a91c83..86472ba61d 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -60,7 +60,7 @@ public: private Q_SLOTS: void onPlaneChanged(int num); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(void); + virtual void onFeatureDeleted(); protected: virtual void addObject(App::DocumentObject*); diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 563d2b9e26..ea624c1214 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -188,7 +188,7 @@ void TaskMultiTransformParameters::clearButtons() ui->buttonRemoveFeature->setChecked(false); } -void TaskMultiTransformParameters::onFeatureDeleted(void) +void TaskMultiTransformParameters::onFeatureDeleted() { PartDesign::Transformed* pcTransformed = getObject(); std::vector originals = pcTransformed->Originals.getValues(); @@ -504,7 +504,7 @@ void TaskMultiTransformParameters::onUpdateView(bool on) } } -const std::vector TaskMultiTransformParameters::getTransformFeatures(void) const +const std::vector TaskMultiTransformParameters::getTransformFeatures() const { PartDesign::MultiTransform* pcMultiTransform = static_cast(TransformedView->getObject()); return pcMultiTransform->Transformations.getValues(); diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 8c7c54429b..3d89c15b38 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -54,10 +54,10 @@ public: TaskMultiTransformParameters(ViewProviderTransformed *TransformedView,QWidget *parent = nullptr); virtual ~TaskMultiTransformParameters(); - const std::vector getTransformFeatures(void) const; + const std::vector getTransformFeatures() const; /// Return the currently active subFeature - PartDesign::Transformed* getSubFeature(void) { + PartDesign::Transformed* getSubFeature() { return subFeature; } @@ -78,7 +78,7 @@ private Q_SLOTS: // Note: There is no Cancel button because I couldn't work out how to save the state of // a subFeature so as to revert the changes of an edit operation virtual void onUpdateView(bool); - virtual void onFeatureDeleted(void); + virtual void onFeatureDeleted(); /** Notifies when the object is about to be removed. */ virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index ae9609f940..a8a3830ad4 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -62,7 +62,7 @@ private Q_SLOTS: void onAngle(const double a); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(void); + virtual void onFeatureDeleted(); protected: virtual void addObject(App::DocumentObject*); @@ -71,11 +71,11 @@ protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); virtual void clearButtons(); void getAxis(App::DocumentObject*& obj, std::vector& sub) const; - const std::string getStdAxis(void) const; - const std::string getAxis(void) const; - bool getReverse(void) const; - double getAngle(void) const; - unsigned getOccurrences(void) const; + const std::string getStdAxis() const; + const std::string getAxis() const; + bool getReverse() const; + double getAngle() const; + unsigned getOccurrences() const; private: void connectSignals(); diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h index c3607bbf85..37a6249906 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h @@ -116,7 +116,7 @@ public: ~TaskPrimitiveParameters(); protected: - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const; + virtual QDialogButtonBox::StandardButtons getStandardButtons() const; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp index 43eb0331db..8874da9480 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp @@ -305,7 +305,7 @@ void TaskRevolutionParameters::onReversed(bool on) recomputeFeature(); } -double TaskRevolutionParameters::getAngle(void) const +double TaskRevolutionParameters::getAngle() const { return ui->revolveAngle->value().getValue(); } @@ -330,12 +330,12 @@ void TaskRevolutionParameters::getReferenceAxis(App::DocumentObject*& obj, std:: } } -bool TaskRevolutionParameters::getMidplane(void) const +bool TaskRevolutionParameters::getMidplane() const { return ui->checkBoxMidplane->isChecked(); } -bool TaskRevolutionParameters::getReversed(void) const +bool TaskRevolutionParameters::getReversed() const { return ui->checkBoxReversed->isChecked(); } diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h index 3a76ca7321..dab3439c03 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h @@ -72,9 +72,9 @@ protected: void changeEvent(QEvent *e) override; bool updateView() const; void getReferenceAxis(App::DocumentObject *&obj, std::vector &sub) const; - double getAngle(void) const; - bool getMidplane(void) const; - bool getReversed(void) const; + double getAngle() const; + bool getMidplane() const; + bool getReversed() const; //mirrors of revolution's or groove's properties //should have been done by inheriting revolution and groove from common class... diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index 2b45a05cc5..fc694aa3dc 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -58,14 +58,14 @@ private Q_SLOTS: void onFactor(const double f); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(void); + virtual void onFeatureDeleted(); protected: virtual void changeEvent(QEvent *e); virtual void onSelectionChanged(const Gui::SelectionChanges& msg); virtual void clearButtons(); - double getFactor(void) const; - unsigned getOccurrences(void) const; + double getFactor() const; + unsigned getOccurrences() const; private: void setupUI(); diff --git a/src/Mod/PartDesign/Gui/Utils.h b/src/Mod/PartDesign/Gui/Utils.h index 3ebf9dda1e..3de0003515 100644 --- a/src/Mod/PartDesign/Gui/Utils.h +++ b/src/Mod/PartDesign/Gui/Utils.h @@ -67,7 +67,7 @@ PartDesign::Body * makeBodyActive(App::DocumentObject *body, App::Document *doc, std::string *subname=nullptr); /// Display error when there are existing Body objects, but none are active -void needActiveBodyError(void); +void needActiveBodyError(); /// Create a Body object in doc, set it active, and return pointer to it PartDesign::Body * makeBody(App::Document *doc); diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 4f9d631a3e..b7ae0e3413 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -59,7 +59,7 @@ ViewProvider::~ViewProvider() { } -bool ViewProvider::doubleClicked(void) +bool ViewProvider::doubleClicked() { try { QString text = QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.cpp b/src/Mod/PartDesign/Gui/ViewProviderBase.cpp index db17190d89..7fa0087c3a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBase.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBase.cpp @@ -44,7 +44,7 @@ ViewProviderBase::~ViewProviderBase() } -bool ViewProviderBase::doubleClicked(void) +bool ViewProviderBase::doubleClicked() { // If the Placement is mutable then open the transform panel. // If the Placement can't be modified then just do nothing on double-click. diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.h b/src/Mod/PartDesign/Gui/ViewProviderBase.h index 6158fc99b0..4fc55ff710 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBase.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBase.h @@ -38,7 +38,7 @@ public: /// destructor virtual ~ViewProviderBase(); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); protected: diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 41e25c5dd9..9c564aa1a5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -136,7 +136,7 @@ void ViewProviderBody::setupContextMenu(QMenu* menu, QObject* receiver, const ch Gui::ViewProviderGeometryObject::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } -bool ViewProviderBody::doubleClicked(void) +bool ViewProviderBody::doubleClicked() { //first, check if the body is already active. auto activeDoc = Gui::Application::Instance->activeDocument(); @@ -442,7 +442,7 @@ void ViewProviderBody::setVisualBodyMode(bool bodymode) { } } -std::vector< std::string > ViewProviderBody::getDisplayModes(void) const { +std::vector< std::string > ViewProviderBody::getDisplayModes() const { //we get all display modes and remove the "Group" mode, as this is what we use for "Through" //body display mode diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp index 637802783d..515c1825e4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp @@ -107,7 +107,7 @@ void ViewProviderDatum::attach(App::DocumentObject *obj) App::DocumentObject* o = getObject(); if (o->getTypeId() == PartDesign::Plane::getClassTypeId()) { datumType = QString::fromLatin1("Plane"); - datumText = QObject::tr("Plane"); + datumText = QObject::tr("Plane"); datumMenuText = tr("Datum Plane parameters"); } else if (o->getTypeId() == PartDesign::Line::getClassTypeId()) { @@ -158,7 +158,7 @@ bool ViewProviderDatum::onDelete(const std::vector &) return true; } -std::vector ViewProviderDatum::getDisplayModes(void) const +std::vector ViewProviderDatum::getDisplayModes() const { return { "Base" }; } @@ -214,7 +214,7 @@ SoDetail* ViewProviderDatum::getDetail(const char* subelement) const return nullptr; } -bool ViewProviderDatum::isSelectable(void) const +bool ViewProviderDatum::isSelectable() const { return true; } @@ -272,7 +272,7 @@ bool ViewProviderDatum::setEdit(int ModNum) } } -bool ViewProviderDatum::doubleClicked(void) +bool ViewProviderDatum::doubleClicked() { auto activeDoc = Gui::Application::Instance->activeDocument(); if(!activeDoc) diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp index 4edf82c6f6..f9e579d460 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp @@ -50,7 +50,7 @@ ViewProviderHole::~ViewProviderHole() { } -std::vector ViewProviderHole::claimChildren(void)const +std::vector ViewProviderHole::claimChildren()const { std::vector temp; temp.push_back(static_cast(getObject())->Profile.getValue()); diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.h b/src/Mod/PartDesign/Gui/ViewProviderHole.h index 9a56cc6e19..d5ab7db82a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.h @@ -40,7 +40,7 @@ public: virtual ~ViewProviderHole(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; void setupContextMenu(QMenu *menu, QObject *receiver, const char *member); bool onDelete(const std::vector &s); protected: diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp index 80e99d6b65..27917d3eaf 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp @@ -47,7 +47,7 @@ ViewProviderLoft::~ViewProviderLoft() { } -std::vector ViewProviderLoft::claimChildren(void)const +std::vector ViewProviderLoft::claimChildren()const { std::vector temp; @@ -173,7 +173,7 @@ void ViewProviderLoft::highlightReferences(Part::Feature* base, const std::vecto } } -QIcon ViewProviderLoft::getIcon(void) const { +QIcon ViewProviderLoft::getIcon() const { QString str = QString::fromLatin1("PartDesign_"); auto* prim = static_cast(getObject()); if(prim->getAddSubType() == PartDesign::FeatureAddSub::Additive) diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index fbc357ff13..2ee4d174a7 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -43,7 +43,7 @@ void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } -std::vector ViewProviderMultiTransform::claimChildren(void) const +std::vector ViewProviderMultiTransform::claimChildren() const { PartDesign::MultiTransform* pcMultiTransform = static_cast(getObject()); if (!pcMultiTransform) diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h index 64cf6d42a8..c547b99d82 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h @@ -39,7 +39,7 @@ public: sPixmap = "PartDesign_MultiTransform.svg"; } - std::vector claimChildren(void) const; + std::vector claimChildren() const; void setupContextMenu(QMenu*, QObject*, const char*); virtual bool onDelete(const std::vector &); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp index 4bc009bd5d..a13319096c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp @@ -47,7 +47,7 @@ ViewProviderPipe::~ViewProviderPipe() { } -std::vector ViewProviderPipe::claimChildren(void)const +std::vector ViewProviderPipe::claimChildren()const { std::vector temp; @@ -174,7 +174,7 @@ void ViewProviderPipe::highlightReferences(Part::Feature* base, const std::vecto } } -QIcon ViewProviderPipe::getIcon(void) const { +QIcon ViewProviderPipe::getIcon() const { QString str = QString::fromLatin1("PartDesign_"); auto* prim = static_cast(getObject()); if(prim->getAddSubType() == PartDesign::FeatureAddSub::Additive) diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h index 182cfcb109..38ff14c8ac 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h @@ -46,14 +46,14 @@ public: virtual ~ViewProviderPipe(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; void setupContextMenu(QMenu*, QObject*, const char*); virtual bool onDelete(const std::vector &); void highlightReferences(Reference mode, bool on); protected: - virtual QIcon getIcon(void) const; + virtual QIcon getIcon() const; virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp index 27ebe48b3d..72d4cbecf1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp @@ -117,7 +117,7 @@ void ViewProviderPrimitive::updateData(const App::Property* p) { PartDesignGui::ViewProviderAddSub::updateData(p); } -QIcon ViewProviderPrimitive::getIcon(void) const { +QIcon ViewProviderPrimitive::getIcon() const { QString str = QString::fromLatin1("PartDesign_"); auto* prim = static_cast(getObject()); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPyImp.cpp b/src/Mod/PartDesign/Gui/ViewProviderPyImp.cpp index 0c01560189..5f3d0730ce 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPyImp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPyImp.cpp @@ -32,7 +32,7 @@ using namespace PartDesignGui; // returns a string which represent the object e.g. when printed in python -std::string ViewProviderPy::representation(void) const +std::string ViewProviderPy::representation() const { return std::string(""); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 6af3f70e8b..5c83b5da7b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -67,7 +67,7 @@ public: const char *subname, const std::vector &elements) const override; std::string dropObjectEx(App::DocumentObject*, App::DocumentObject*, const char *, const std::vector &) override; - std::vector claimChildren(void) const override; + std::vector claimChildren() const override; virtual bool doubleClicked() override; virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp index eacdcd2750..5a596c6caa 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp @@ -45,7 +45,7 @@ ViewProviderSketchBased::~ViewProviderSketchBased() } -std::vector ViewProviderSketchBased::claimChildren(void) const { +std::vector ViewProviderSketchBased::claimChildren() const { std::vector temp; App::DocumentObject* sketch = static_cast(getObject())->Profile.getValue(); if (sketch && sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h index 5478d1a869..c6df4d3ae8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h +++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h @@ -41,7 +41,7 @@ public: virtual ~ViewProviderSketchBased(); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren()const; virtual bool onDelete(const std::vector &); diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp index 7832162193..a39776231a 100644 --- a/src/Mod/Path/App/AreaPyImp.cpp +++ b/src/Mod/Path/App/AreaPyImp.cpp @@ -149,7 +149,7 @@ static const PyMethodDef areaOverrides[] = { "of this Area is used if section mode is 'Workplane'.", }, { - "setDefaultParams",reinterpret_cast(reinterpret_cast(areaSetParams)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, + "setDefaultParams",reinterpret_cast(reinterpret_cast(areaSetParams)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, "setDefaultParams(key=value...):\n" "Static method to set the default parameters of all following Path.Area, plus the following\n" "additional parameters.\n" @@ -159,13 +159,13 @@ static const PyMethodDef areaOverrides[] = { "getDefaultParams(): Static method to return the current default parameters." }, { - "abort",reinterpret_cast(reinterpret_cast(areaAbort)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, + "abort",reinterpret_cast(reinterpret_cast(areaAbort)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, "abort(aborting=True): Static method to abort any ongoing operation\n" "\nTo ensure no stray abortion is left in the previous operation, it is advised to manually clear\n" "the aborting flag by calling abort(False) before starting a new operation.", }, { - "getParamsDesc",reinterpret_cast(reinterpret_cast(areaGetParamsDesc)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, + "getParamsDesc",reinterpret_cast(reinterpret_cast(areaGetParamsDesc)), METH_VARARGS|METH_KEYWORDS|METH_STATIC, "getParamsDesc(as_string=False): Returns a list of supported parameters and their descriptions.\n" "\n* as_string: if False, then return a dictionary of documents of all supported parameters." }, @@ -195,7 +195,7 @@ static AreaPyModifier mod; using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string AreaPy::representation(void) const +std::string AreaPy::representation() const { std::stringstream str; str << ""; @@ -445,7 +445,7 @@ PyObject* AreaPy::getParamsDesc(PyObject *, PyObject *) return nullptr; } -Py::List AreaPy::getSections(void) const { +Py::List AreaPy::getSections() const { Py::List ret; Area *area = getAreaPtr(); for(size_t i=0,count=area->getSectionCount(); i &shapes = area->getChildren(); @@ -462,7 +462,7 @@ Py::List AreaPy::getShapes(void) const { return ret; } -Py::Object AreaPy::getWorkplane(void) const { +Py::Object AreaPy::getWorkplane() const { return Part::shape2pyshape(getAreaPtr()->getPlane()); } diff --git a/src/Mod/Path/App/Command.cpp b/src/Mod/Path/App/Command.cpp index a81d3f010c..3f78109903 100644 --- a/src/Mod/Path/App/Command.cpp +++ b/src/Mod/Path/App/Command.cpp @@ -75,7 +75,7 @@ Placement Command::getPlacement (const Base::Vector3d pos) const return plac; } -Vector3d Command::getCenter (void) const +Vector3d Command::getCenter () const { static const std::string i = "I"; static const std::string j = "J"; @@ -301,7 +301,7 @@ void Command::scaleBy(double factor) // Reimplemented from base class -unsigned int Command::getMemSize (void) const +unsigned int Command::getMemSize () const { return toGCode().size(); } diff --git a/src/Mod/Path/App/CommandPyImp.cpp b/src/Mod/Path/App/CommandPyImp.cpp index 80c73059c2..ab3d366dc7 100644 --- a/src/Mod/Path/App/CommandPyImp.cpp +++ b/src/Mod/Path/App/CommandPyImp.cpp @@ -40,7 +40,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string CommandPy::representation(void) const +std::string CommandPy::representation() const { std::stringstream str; str.precision(5); @@ -137,7 +137,7 @@ int CommandPy::PyInit(PyObject* args, PyObject* kwd) // Name attribute -Py::String CommandPy::getName(void) const +Py::String CommandPy::getName() const { return Py::String(getCommandPtr()->Name.c_str()); } @@ -151,7 +151,7 @@ void CommandPy::setName(Py::String arg) // Parameters attribute get/set -Py::Dict CommandPy::getParameters(void) const +Py::Dict CommandPy::getParameters() const { // dict now a class member , https://forum.freecadweb.org/viewtopic.php?f=15&t=50583 if (parameters_copy_dict.length()==0) { @@ -224,7 +224,7 @@ PyObject* CommandPy::setFromGCode(PyObject *args) // Placement attribute get/set -Py::Object CommandPy::getPlacement(void) const +Py::Object CommandPy::getPlacement() const { return Py::asObject(new Base::PlacementPy(new Base::Placement(getCommandPtr()->getPlacement()))); } diff --git a/src/Mod/Path/App/FeatureArea.cpp b/src/Mod/Path/App/FeatureArea.cpp index c5c48b5c53..26dd7cc07b 100644 --- a/src/Mod/Path/App/FeatureArea.cpp +++ b/src/Mod/Path/App/FeatureArea.cpp @@ -69,7 +69,7 @@ Area &FeatureArea::getArea() { return myArea; } -App::DocumentObjectExecReturn *FeatureArea::execute(void) +App::DocumentObjectExecReturn *FeatureArea::execute() { myInited = true; @@ -143,7 +143,7 @@ const std::vector &FeatureArea::getShapes() { return myShapes; } -short FeatureArea::mustExecute(void) const +short FeatureArea::mustExecute() const { if(myInited && !myArea.isBuilt()) return 1; @@ -206,7 +206,7 @@ std::list FeatureAreaView::getShapes() { return shapes; } -App::DocumentObjectExecReturn *FeatureAreaView::execute(void) +App::DocumentObjectExecReturn *FeatureAreaView::execute() { App::DocumentObject* pObj = Source.getValue(); if (!pObj) @@ -244,10 +244,10 @@ namespace App { PROPERTY_SOURCE_TEMPLATE(Path::FeatureAreaPython, Path::FeatureArea) PROPERTY_SOURCE_TEMPLATE(Path::FeatureAreaViewPython, Path::FeatureAreaView) -template<> const char* Path::FeatureAreaPython::getViewProviderName(void) const { +template<> const char* Path::FeatureAreaPython::getViewProviderName() const { return "PathGui::ViewProviderAreaPython"; } -template<> const char* Path::FeatureAreaViewPython::getViewProviderName(void) const { +template<> const char* Path::FeatureAreaViewPython::getViewProviderName() const { return "PathGui::ViewProviderAreaViewPython"; } /// @endcond diff --git a/src/Mod/Path/App/FeatureArea.h b/src/Mod/Path/App/FeatureArea.h index 8ff370217d..7febfa77c2 100644 --- a/src/Mod/Path/App/FeatureArea.h +++ b/src/Mod/Path/App/FeatureArea.h @@ -40,19 +40,19 @@ class PathExport FeatureArea : public Part::Feature public: /// Constructor - FeatureArea(void); + FeatureArea(); virtual ~FeatureArea(); Area &getArea(); const std::vector &getShapes(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PathGui::ViewProviderArea"; } - virtual App::DocumentObjectExecReturn *execute(void); - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual App::DocumentObjectExecReturn *execute(); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); App::PropertyLinkList Sources; Part::PropertyPartShape WorkPlane; @@ -78,14 +78,14 @@ class PathExport FeatureAreaView : public Part::Feature public: /// Constructor - FeatureAreaView(void); + FeatureAreaView(); std::list getShapes(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PathGui::ViewProviderAreaView"; } - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); App::PropertyLink Source; App::PropertyInteger SectionIndex; diff --git a/src/Mod/Path/App/FeatureAreaPyImp.cpp b/src/Mod/Path/App/FeatureAreaPyImp.cpp index 2d8824a322..cc975a8ca4 100644 --- a/src/Mod/Path/App/FeatureAreaPyImp.cpp +++ b/src/Mod/Path/App/FeatureAreaPyImp.cpp @@ -36,7 +36,7 @@ using namespace Path; // returns a string which represent the object e.g. when printed in python -std::string FeatureAreaPy::representation(void) const +std::string FeatureAreaPy::representation() const { return std::string(""); } @@ -81,7 +81,7 @@ PyObject* FeatureAreaPy::setParams(PyObject *args, PyObject *keywds) return Py_None; } -Py::Object FeatureAreaPy::getWorkPlane(void) const { +Py::Object FeatureAreaPy::getWorkPlane() const { return Part::shape2pyshape(getFeatureAreaPtr()->getArea().getPlane()); } diff --git a/src/Mod/Path/App/FeaturePath.cpp b/src/Mod/Path/App/FeaturePath.cpp index 55cdc02c96..ad41da82c7 100644 --- a/src/Mod/Path/App/FeaturePath.cpp +++ b/src/Mod/Path/App/FeaturePath.cpp @@ -44,7 +44,7 @@ Feature::~Feature() { } -short Feature::mustExecute(void) const +short Feature::mustExecute() const { return App::GeoFeature::mustExecute(); } @@ -68,7 +68,7 @@ void Feature::onChanged(const App::Property* prop) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Path::FeaturePython, Path::Feature) -template<> const char* Path::FeaturePython::getViewProviderName(void) const { +template<> const char* Path::FeaturePython::getViewProviderName() const { return "PathGui::ViewProviderPathPython"; } /// @endcond diff --git a/src/Mod/Path/App/FeaturePathCompound.cpp b/src/Mod/Path/App/FeaturePathCompound.cpp index 12719a738b..c29329c59f 100644 --- a/src/Mod/Path/App/FeaturePathCompound.cpp +++ b/src/Mod/Path/App/FeaturePathCompound.cpp @@ -48,7 +48,7 @@ FeatureCompound::~FeatureCompound() { } -App::DocumentObjectExecReturn *FeatureCompound::execute(void) +App::DocumentObjectExecReturn *FeatureCompound::execute() { const std::vector &Paths = Group.getValues(); Path::Toolpath result; @@ -121,7 +121,7 @@ PyObject *FeatureCompound::getPyObject() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Path::FeatureCompoundPython, Path::FeatureCompound) -template<> const char* Path::FeatureCompoundPython::getViewProviderName(void) const { +template<> const char* Path::FeatureCompoundPython::getViewProviderName() const { return "PathGui::ViewProviderPathCompoundPython"; } /// @endcond diff --git a/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp b/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp index 7982fa1fa2..82ba77bd63 100644 --- a/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp +++ b/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp @@ -34,7 +34,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string FeaturePathCompoundPy::representation(void) const +std::string FeaturePathCompoundPy::representation() const { return std::string(""); } diff --git a/src/Mod/Path/App/FeaturePathShape.cpp b/src/Mod/Path/App/FeaturePathShape.cpp index ca7e2e68a7..5b2430398d 100644 --- a/src/Mod/Path/App/FeaturePathShape.cpp +++ b/src/Mod/Path/App/FeaturePathShape.cpp @@ -64,7 +64,7 @@ FeatureShape::~FeatureShape() { } -App::DocumentObjectExecReturn *FeatureShape::execute(void) +App::DocumentObjectExecReturn *FeatureShape::execute() { Toolpath path; std::vector links = Sources.getValues(); @@ -97,7 +97,7 @@ App::DocumentObjectExecReturn *FeatureShape::execute(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Path::FeatureShapePython, Path::FeatureShape) -template<> const char* Path::FeatureShapePython::getViewProviderName(void) const { +template<> const char* Path::FeatureShapePython::getViewProviderName() const { return "PathGui::ViewProviderPathShape"; } /// @endcond diff --git a/src/Mod/Path/App/FeaturePathShape.h b/src/Mod/Path/App/FeaturePathShape.h index 4ee41d607b..2480f9fcbb 100644 --- a/src/Mod/Path/App/FeaturePathShape.h +++ b/src/Mod/Path/App/FeaturePathShape.h @@ -47,7 +47,7 @@ class PathExport FeatureShape : public Path::Feature public: /// Constructor - FeatureShape(void); + FeatureShape(); virtual ~FeatureShape(); // Part::PropertyPartShape Shape; @@ -58,11 +58,11 @@ public: //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "PathGui::ViewProviderPathShape"; } diff --git a/src/Mod/Path/App/Path.cpp b/src/Mod/Path/App/Path.cpp index c4a04e8547..426d376616 100644 --- a/src/Mod/Path/App/Path.cpp +++ b/src/Mod/Path/App/Path.cpp @@ -82,7 +82,7 @@ Toolpath &Toolpath::operator=(const Toolpath& otherPath) return *this; } -void Toolpath::clear(void) +void Toolpath::clear() { for(std::vector::iterator it = vpcCommands.begin();it!=vpcCommands.end();++it) delete ( *it ); @@ -357,7 +357,7 @@ void Toolpath::setFromGCode(const std::string instr) recalculate(); } -std::string Toolpath::toGCode(void) const +std::string Toolpath::toGCode() const { std::string result; for (std::vector::const_iterator it=vpcCommands.begin();it!=vpcCommands.end();++it) { @@ -367,7 +367,7 @@ std::string Toolpath::toGCode(void) const return result; } -void Toolpath::recalculate(void) // recalculates the path cache +void Toolpath::recalculate() // recalculates the path cache { if(vpcCommands.empty()) @@ -432,7 +432,7 @@ void Toolpath::recalculate(void) // recalculates the path cache // reimplemented from base class -unsigned int Toolpath::getMemSize (void) const +unsigned int Toolpath::getMemSize () const { return toGCode().size(); } diff --git a/src/Mod/Path/App/PathPyImp.cpp b/src/Mod/Path/App/PathPyImp.cpp index e84088e25f..cb6f2daca8 100644 --- a/src/Mod/Path/App/PathPyImp.cpp +++ b/src/Mod/Path/App/PathPyImp.cpp @@ -36,7 +36,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string PathPy::representation(void) const +std::string PathPy::representation() const { std::stringstream str; str.precision(5); @@ -86,7 +86,7 @@ int PathPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Commands get/set -Py::List PathPy::getCommands(void) const +Py::List PathPy::getCommands() const { Py::List list; for(unsigned int i = 0; i < getToolpathPtr()->getSize(); i++) @@ -107,7 +107,7 @@ void PathPy::setCommands(Py::List list) } } -Py::Object PathPy::getCenter(void) const +Py::Object PathPy::getCenter() const { return Py::Vector(getToolpathPtr()->getCenter()); } @@ -119,17 +119,17 @@ void PathPy::setCenter(Py::Object obj) // read-only attributes -Py::Float PathPy::getLength(void) const +Py::Float PathPy::getLength() const { return Py::Float(getToolpathPtr()->getLength()); } -Py::Long PathPy::getSize(void) const +Py::Long PathPy::getSize() const { return Py::Long((long)getToolpathPtr()->getSize()); } -Py::Object PathPy::getBoundBox(void) const +Py::Object PathPy::getBoundBox() const { return Py::BoundingBox(getToolpathPtr()->getBoundBox()); } diff --git a/src/Mod/Path/App/PropertyPath.cpp b/src/Mod/Path/App/PropertyPath.cpp index ef18ae1d2f..7281caeafc 100644 --- a/src/Mod/Path/App/PropertyPath.cpp +++ b/src/Mod/Path/App/PropertyPath.cpp @@ -60,12 +60,12 @@ void PropertyPath::setValue(const Toolpath& pa) } -const Toolpath &PropertyPath::getValue(void)const +const Toolpath &PropertyPath::getValue()const { return _Path; } -PyObject *PropertyPath::getPyObject(void) +PyObject *PropertyPath::getPyObject() { return new PathPy(new Toolpath(_Path)); } @@ -83,7 +83,7 @@ void PropertyPath::setPyObject(PyObject *value) } } -App::Property *PropertyPath::Copy(void) const +App::Property *PropertyPath::Copy() const { PropertyPath *prop = new PropertyPath(); prop->_Path = this->_Path; @@ -98,7 +98,7 @@ void PropertyPath::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyPath::getMemSize (void) const +unsigned int PropertyPath::getMemSize () const { return _Path.getMemSize(); } diff --git a/src/Mod/Path/App/PropertyTool.cpp b/src/Mod/Path/App/PropertyTool.cpp index 1083866f14..43741c1d01 100644 --- a/src/Mod/Path/App/PropertyTool.cpp +++ b/src/Mod/Path/App/PropertyTool.cpp @@ -58,12 +58,12 @@ void PropertyTool::setValue(const Tool& tt) } -const Tool &PropertyTool::getValue(void)const +const Tool &PropertyTool::getValue()const { return _Tool; } -PyObject *PropertyTool::getPyObject(void) +PyObject *PropertyTool::getPyObject() { return new ToolPy(new Tool(_Tool)); } @@ -81,7 +81,7 @@ void PropertyTool::setPyObject(PyObject *value) } } -App::Property *PropertyTool::Copy(void) const +App::Property *PropertyTool::Copy() const { PropertyTool *prop = new PropertyTool(); prop->_Tool = this->_Tool; @@ -96,7 +96,7 @@ void PropertyTool::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyTool::getMemSize (void) const +unsigned int PropertyTool::getMemSize () const { return _Tool.getMemSize(); } diff --git a/src/Mod/Path/App/PropertyTooltable.cpp b/src/Mod/Path/App/PropertyTooltable.cpp index 26d19d0016..7c4a3bc8f5 100644 --- a/src/Mod/Path/App/PropertyTooltable.cpp +++ b/src/Mod/Path/App/PropertyTooltable.cpp @@ -58,12 +58,12 @@ void PropertyTooltable::setValue(const Tooltable& tt) } -const Tooltable &PropertyTooltable::getValue(void)const +const Tooltable &PropertyTooltable::getValue()const { return _Tooltable; } -PyObject *PropertyTooltable::getPyObject(void) +PyObject *PropertyTooltable::getPyObject() { return new TooltablePy(new Tooltable(_Tooltable)); } @@ -81,7 +81,7 @@ void PropertyTooltable::setPyObject(PyObject *value) } } -App::Property *PropertyTooltable::Copy(void) const +App::Property *PropertyTooltable::Copy() const { PropertyTooltable *prop = new PropertyTooltable(); prop->_Tooltable = this->_Tooltable; @@ -96,7 +96,7 @@ void PropertyTooltable::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyTooltable::getMemSize (void) const +unsigned int PropertyTooltable::getMemSize () const { return _Tooltable.getMemSize(); } diff --git a/src/Mod/Path/App/Tool.cpp b/src/Mod/Path/App/Tool.cpp index 7705c3780b..0e0afda51e 100644 --- a/src/Mod/Path/App/Tool.cpp +++ b/src/Mod/Path/App/Tool.cpp @@ -69,7 +69,7 @@ Tool::~Tool() } // Reimplemented from base class -unsigned int Tool::getMemSize (void) const +unsigned int Tool::getMemSize () const { return 0; } @@ -108,7 +108,7 @@ void Tool::Restore(XMLReader &reader) } -const std::vector Tool::ToolTypes(void) +const std::vector Tool::ToolTypes() { std::vector toolTypes(13); toolTypes[0] ="EndMill"; @@ -128,7 +128,7 @@ const std::vector Tool::ToolTypes(void) } -const std::vector Tool::ToolMaterials(void) +const std::vector Tool::ToolMaterials() { std::vector toolMat(7); toolMat[0] ="Carbide"; diff --git a/src/Mod/Path/App/ToolPyImp.cpp b/src/Mod/Path/App/ToolPyImp.cpp index 0d4299d27b..17cfe90d2c 100644 --- a/src/Mod/Path/App/ToolPyImp.cpp +++ b/src/Mod/Path/App/ToolPyImp.cpp @@ -39,7 +39,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string ToolPy::representation(void) const +std::string ToolPy::representation() const { std::stringstream str; str.precision(5); @@ -111,7 +111,7 @@ int ToolPy::PyInit(PyObject* args, PyObject* kwd) // attributes get/setters -Py::String ToolPy::getName(void) const +Py::String ToolPy::getName() const { return Py::String(getToolPtr()->Name.c_str()); } @@ -122,7 +122,7 @@ void ToolPy::setName(Py::String arg) getToolPtr()->Name = name; } -Py::String ToolPy::getToolType(void) const +Py::String ToolPy::getToolType() const { return Py::String(Tool::TypeName(getToolPtr()->Type)); } @@ -134,7 +134,7 @@ void ToolPy::setToolType(Py::String arg) } -Py::String ToolPy::getMaterial(void) const +Py::String ToolPy::getMaterial() const { return Py::String(Tool::MaterialName(getToolPtr()->Material)); } @@ -145,7 +145,7 @@ void ToolPy::setMaterial(Py::String arg) getToolPtr()->Material = Tool::getToolMaterial(matStr); } -Py::Float ToolPy::getDiameter(void) const +Py::Float ToolPy::getDiameter() const { return Py::Float(getToolPtr()->Diameter); } @@ -155,7 +155,7 @@ void ToolPy::setDiameter(Py::Float arg) getToolPtr()->Diameter = arg.operator double(); } -Py::Float ToolPy::getLengthOffset(void) const +Py::Float ToolPy::getLengthOffset() const { return Py::Float(getToolPtr()->LengthOffset); } @@ -165,7 +165,7 @@ void ToolPy::setLengthOffset(Py::Float arg) getToolPtr()->LengthOffset = arg.operator double(); } -Py::Float ToolPy::getFlatRadius(void) const +Py::Float ToolPy::getFlatRadius() const { return Py::Float(getToolPtr()->FlatRadius); } @@ -175,7 +175,7 @@ void ToolPy::setFlatRadius(Py::Float arg) getToolPtr()->FlatRadius = arg.operator double(); } -Py::Float ToolPy::getCornerRadius(void) const +Py::Float ToolPy::getCornerRadius() const { return Py::Float(getToolPtr()->CornerRadius); } @@ -185,7 +185,7 @@ void ToolPy::setCornerRadius(Py::Float arg) getToolPtr()->CornerRadius = arg.operator double(); } -Py::Float ToolPy::getCuttingEdgeAngle(void) const +Py::Float ToolPy::getCuttingEdgeAngle() const { return Py::Float(getToolPtr()->CuttingEdgeAngle); } @@ -195,7 +195,7 @@ void ToolPy::setCuttingEdgeAngle(Py::Float arg) getToolPtr()->CuttingEdgeAngle = arg.operator double(); } -Py::Float ToolPy::getCuttingEdgeHeight(void) const +Py::Float ToolPy::getCuttingEdgeHeight() const { return Py::Float(getToolPtr()->CuttingEdgeHeight); } diff --git a/src/Mod/Path/App/Tooltable.cpp b/src/Mod/Path/App/Tooltable.cpp index 504a8c09ea..a7d10877dc 100644 --- a/src/Mod/Path/App/Tooltable.cpp +++ b/src/Mod/Path/App/Tooltable.cpp @@ -79,7 +79,7 @@ void Tooltable::deleteTool(int pos) } } -unsigned int Tooltable::getMemSize (void) const +unsigned int Tooltable::getMemSize () const { return 0; } diff --git a/src/Mod/Path/App/TooltablePyImp.cpp b/src/Mod/Path/App/TooltablePyImp.cpp index 5fb636d285..42b319e8ba 100644 --- a/src/Mod/Path/App/TooltablePyImp.cpp +++ b/src/Mod/Path/App/TooltablePyImp.cpp @@ -39,7 +39,7 @@ using namespace Path; #define PYINT_ASLONG(o) PyLong_AsLong(o) // returns a string which represents the object e.g. when printed in python -std::string TooltablePy::representation(void) const +std::string TooltablePy::representation() const { std::stringstream str; str.precision(5); @@ -94,7 +94,7 @@ int TooltablePy::PyInit(PyObject* args, PyObject* /*kwd*/) // Commands get/set -Py::Dict TooltablePy::getTools(void) const +Py::Dict TooltablePy::getTools() const { Py::Dict dict; for(std::map::iterator i = getTooltablePtr()->Tools.begin(); i != getTooltablePtr()->Tools.end(); ++i) { @@ -230,7 +230,7 @@ int TooltablePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) return 0; } -Py::Int TooltablePy::getVersion(void) const +Py::Int TooltablePy::getVersion() const { return Py::Int(getTooltablePtr()->Version); } @@ -239,7 +239,7 @@ void TooltablePy::setVersion(Py::Int version) { getTooltablePtr()->Version = version; } -Py::String TooltablePy::getName(void) const +Py::String TooltablePy::getName() const { return Py::String(getTooltablePtr()->Name.c_str()); } diff --git a/src/Mod/Path/App/VoronoiCell.cpp b/src/Mod/Path/App/VoronoiCell.cpp index 36dfeac720..2e7be77b28 100644 --- a/src/Mod/Path/App/VoronoiCell.cpp +++ b/src/Mod/Path/App/VoronoiCell.cpp @@ -54,7 +54,7 @@ VoronoiCell::VoronoiCell(Voronoi::diagram_type *d, const Voronoi::diagram_type:: VoronoiCell::~VoronoiCell() { } -bool VoronoiCell::isBound(void) const { +bool VoronoiCell::isBound() const { if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) { if (&(dia->cells()[index]) == ptr) { return true; diff --git a/src/Mod/Path/App/VoronoiCellPyImp.cpp b/src/Mod/Path/App/VoronoiCellPyImp.cpp index b338f0c9cf..b1454e0b56 100644 --- a/src/Mod/Path/App/VoronoiCellPyImp.cpp +++ b/src/Mod/Path/App/VoronoiCellPyImp.cpp @@ -36,7 +36,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string VoronoiCellPy::representation(void) const +std::string VoronoiCellPy::representation() const { std::stringstream ss; ss.precision(5); @@ -103,7 +103,7 @@ VoronoiCell* getVoronoiCellFromPy(const VoronoiCellPy *c, PyObject *args = nullp return self; } -Py::Long VoronoiCellPy::getIndex(void) const { +Py::Long VoronoiCellPy::getIndex() const { VoronoiCell *c = getVoronoiCellPtr(); if (c->isBound()) { return Py::Long(c->dia->index(c->ptr)); @@ -111,7 +111,7 @@ Py::Long VoronoiCellPy::getIndex(void) const { return Py::Long(-1); } -Py::Long VoronoiCellPy::getColor(void) const { +Py::Long VoronoiCellPy::getColor() const { VoronoiCell *c = getVoronoiCellPtr(); if (c->isBound()) { Voronoi::color_type color = c->ptr->color() & Voronoi::ColorMask; @@ -124,20 +124,20 @@ void VoronoiCellPy::setColor(Py::Long color) { getCellFromPy(this)->color(long(color) & Voronoi::ColorMask); } -Py::Long VoronoiCellPy::getSourceIndex(void) const +Py::Long VoronoiCellPy::getSourceIndex() const { VoronoiCell *c = getVoronoiCellFromPy(this); long index = c->ptr->source_index(); return Py::Long(index); } -Py::Int VoronoiCellPy::getSourceCategory(void) const +Py::Int VoronoiCellPy::getSourceCategory() const { VoronoiCell *c = getVoronoiCellFromPy(this); return Py::Int(c->ptr->source_category()); } -Py::String VoronoiCellPy::getSourceCategoryName(void) const +Py::String VoronoiCellPy::getSourceCategoryName() const { VoronoiCell *c = getVoronoiCellFromPy(this); switch (c->ptr->source_category()) { @@ -152,7 +152,7 @@ Py::String VoronoiCellPy::getSourceCategoryName(void) const return Py::String(""); } -Py::Object VoronoiCellPy::getIncidentEdge(void) const +Py::Object VoronoiCellPy::getIncidentEdge() const { VoronoiCell *c = getVoronoiCellFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(c->dia, c->ptr->incident_edge()))); diff --git a/src/Mod/Path/App/VoronoiEdge.cpp b/src/Mod/Path/App/VoronoiEdge.cpp index c88520be47..02453e259c 100644 --- a/src/Mod/Path/App/VoronoiEdge.cpp +++ b/src/Mod/Path/App/VoronoiEdge.cpp @@ -55,7 +55,7 @@ VoronoiEdge::VoronoiEdge(Voronoi::diagram_type *d, const Voronoi::diagram_type:: VoronoiEdge::~VoronoiEdge() { } -bool VoronoiEdge::isBound(void) const { +bool VoronoiEdge::isBound() const { if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) { if (&(dia->edges()[index]) == ptr) { return true; diff --git a/src/Mod/Path/App/VoronoiEdgePyImp.cpp b/src/Mod/Path/App/VoronoiEdgePyImp.cpp index 3684ad85f8..7c941bdecb 100644 --- a/src/Mod/Path/App/VoronoiEdgePyImp.cpp +++ b/src/Mod/Path/App/VoronoiEdgePyImp.cpp @@ -195,7 +195,7 @@ std::ostream& operator<<(std::ostream& os, const Voronoi::segment_type &s) { // returns a string which represents the object e.g. when printed in python -std::string VoronoiEdgePy::representation(void) const +std::string VoronoiEdgePy::representation() const { std::stringstream ss; ss.precision(5); @@ -274,7 +274,7 @@ VoronoiEdge* getVoronoiEdgeFromPy(const VoronoiEdgePy *e, PyObject *args = nullp return self; } -Py::Long VoronoiEdgePy::getIndex(void) const { +Py::Long VoronoiEdgePy::getIndex() const { VoronoiEdge *e = getVoronoiEdgePtr(); if (e->isBound()) { return Py::Long(e->dia->index(e->ptr)); @@ -282,7 +282,7 @@ Py::Long VoronoiEdgePy::getIndex(void) const { return Py::Long(-1); } -Py::Long VoronoiEdgePy::getColor(void) const { +Py::Long VoronoiEdgePy::getColor() const { VoronoiEdge *e = getVoronoiEdgePtr(); if (e->isBound()) { Voronoi::color_type color = e->ptr->color() & Voronoi::ColorMask; @@ -295,7 +295,7 @@ void VoronoiEdgePy::setColor(Py::Long color) { getEdgeFromPy(this)->color(long(color) & Voronoi::ColorMask); } -Py::List VoronoiEdgePy::getVertices(void) const +Py::List VoronoiEdgePy::getVertices() const { Py::List list; VoronoiEdge *e = getVoronoiEdgePtr(); @@ -318,37 +318,37 @@ Py::List VoronoiEdgePy::getVertices(void) const return list; } -Py::Object VoronoiEdgePy::getTwin(void) const +Py::Object VoronoiEdgePy::getTwin() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(e->dia, e->ptr->twin()))); } -Py::Object VoronoiEdgePy::getNext(void) const +Py::Object VoronoiEdgePy::getNext() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(e->dia, e->ptr->next()))); } -Py::Object VoronoiEdgePy::getPrev(void) const +Py::Object VoronoiEdgePy::getPrev() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(e->dia, e->ptr->prev()))); } -Py::Object VoronoiEdgePy::getRotNext(void) const +Py::Object VoronoiEdgePy::getRotNext() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(e->dia, e->ptr->rot_next()))); } -Py::Object VoronoiEdgePy::getRotPrev(void) const +Py::Object VoronoiEdgePy::getRotPrev() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiEdgePy(new VoronoiEdge(e->dia, e->ptr->rot_prev()))); } -Py::Object VoronoiEdgePy::getCell(void) const +Py::Object VoronoiEdgePy::getCell() const { VoronoiEdge *e = getVoronoiEdgeFromPy(this); return Py::asObject(new VoronoiCellPy(new VoronoiCell(e->dia, e->ptr->cell()))); diff --git a/src/Mod/Path/App/VoronoiPyImp.cpp b/src/Mod/Path/App/VoronoiPyImp.cpp index 12ca293f24..416f09b8f7 100644 --- a/src/Mod/Path/App/VoronoiPyImp.cpp +++ b/src/Mod/Path/App/VoronoiPyImp.cpp @@ -41,7 +41,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string VoronoiPy::representation(void) const +std::string VoronoiPy::representation() const { std::stringstream ss; ss.precision(5); @@ -143,7 +143,7 @@ PyObject* VoronoiPy::numVertices(PyObject *args) return PyLong_FromLong(getVoronoiPtr()->numVertices()); } -Py::List VoronoiPy::getVertices(void) const { +Py::List VoronoiPy::getVertices() const { Py::List list; for (int i=0; inumVertices(); ++i) { list.append(Py::asObject(new VoronoiVertexPy(getVoronoiPtr()->create(i)))); @@ -151,7 +151,7 @@ Py::List VoronoiPy::getVertices(void) const { return list; } -Py::List VoronoiPy::getEdges(void) const { +Py::List VoronoiPy::getEdges() const { Py::List list; for (int i=0; inumEdges(); ++i) { list.append(Py::asObject(new VoronoiEdgePy(getVoronoiPtr()->create(i)))); @@ -159,7 +159,7 @@ Py::List VoronoiPy::getEdges(void) const { return list; } -Py::List VoronoiPy::getCells(void) const { +Py::List VoronoiPy::getCells() const { Py::List list; for (int i=0; inumCells(); ++i) { list.append(Py::asObject(new VoronoiCellPy(getVoronoiPtr()->create(i)))); diff --git a/src/Mod/Path/App/VoronoiVertex.cpp b/src/Mod/Path/App/VoronoiVertex.cpp index 94c384ce48..bd3893af9a 100644 --- a/src/Mod/Path/App/VoronoiVertex.cpp +++ b/src/Mod/Path/App/VoronoiVertex.cpp @@ -55,7 +55,7 @@ VoronoiVertex::VoronoiVertex(Voronoi::diagram_type *d, const Voronoi::diagram_ty VoronoiVertex::~VoronoiVertex() { } -bool VoronoiVertex::isBound(void) const { +bool VoronoiVertex::isBound() const { if (ptr && dia.isValid() && index != Voronoi::InvalidIndex) { if (&(dia->vertices()[index]) == ptr) { return true; diff --git a/src/Mod/Path/App/VoronoiVertexPyImp.cpp b/src/Mod/Path/App/VoronoiVertexPyImp.cpp index 208dbf3194..5e116ce30d 100644 --- a/src/Mod/Path/App/VoronoiVertexPyImp.cpp +++ b/src/Mod/Path/App/VoronoiVertexPyImp.cpp @@ -36,7 +36,7 @@ using namespace Path; // returns a string which represents the object e.g. when printed in python -std::string VoronoiVertexPy::representation(void) const +std::string VoronoiVertexPy::representation() const { std::stringstream ss; ss.precision(5); @@ -104,7 +104,7 @@ VoronoiVertex* getVoronoiVertexFromPy(const VoronoiVertexPy *v, PyObject *args = } -Py::Long VoronoiVertexPy::getIndex(void) const { +Py::Long VoronoiVertexPy::getIndex() const { VoronoiVertex *v = getVoronoiVertexPtr(); if (v->isBound()) { return Py::Long(v->dia->index(v->ptr)); @@ -112,7 +112,7 @@ Py::Long VoronoiVertexPy::getIndex(void) const { return Py::Long(-1); } -Py::Long VoronoiVertexPy::getColor(void) const { +Py::Long VoronoiVertexPy::getColor() const { VoronoiVertex *v = getVoronoiVertexPtr(); if (v->isBound()) { Voronoi::color_type color = v->ptr->color() & Voronoi::ColorMask; @@ -125,13 +125,13 @@ void VoronoiVertexPy::setColor(Py::Long color) { getVertexFromPy(this)->color(long(color) & Voronoi::ColorMask); } -Py::Float VoronoiVertexPy::getX(void) const +Py::Float VoronoiVertexPy::getX() const { VoronoiVertex *v = getVoronoiVertexFromPy(this); return Py::Float(v->ptr->x() / v->dia->getScale()); } -Py::Float VoronoiVertexPy::getY(void) const +Py::Float VoronoiVertexPy::getY() const { VoronoiVertex *v = getVoronoiVertexFromPy(this); return Py::Float(v->ptr->y() / v->dia->getScale()); diff --git a/src/Mod/Path/Gui/AppPathGui.cpp b/src/Mod/Path/Gui/AppPathGui.cpp index f2a1592683..e73817a263 100644 --- a/src/Mod/Path/Gui/AppPathGui.cpp +++ b/src/Mod/Path/Gui/AppPathGui.cpp @@ -36,7 +36,7 @@ // use a different name to CreateCommand() -void CreatePathCommands(void); +void CreatePathCommands(); void loadPathResource() { diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp index 8b5baeed13..3b5aaa8fef 100644 --- a/src/Mod/Path/Gui/Command.cpp +++ b/src/Mod/Path/Gui/Command.cpp @@ -123,7 +123,7 @@ void CmdPathArea::activated(int iMsg) updateActive(); } -bool CmdPathArea::isActive(void) +bool CmdPathArea::isActive() { return hasActiveDocument(); } @@ -210,7 +210,7 @@ void CmdPathAreaWorkplane::activated(int iMsg) updateActive(); } -bool CmdPathAreaWorkplane::isActive(void) +bool CmdPathAreaWorkplane::isActive() { return !getSelection().getSelectionEx(nullptr, Path::FeatureArea::getClassTypeId()).empty(); } @@ -263,7 +263,7 @@ void CmdPathCompound::activated(int iMsg) } } -bool CmdPathCompound::isActive(void) +bool CmdPathCompound::isActive() { return hasActiveDocument(); } @@ -332,14 +332,14 @@ void CmdPathShape::activated(int iMsg) updateActive(); } -bool CmdPathShape::isActive(void) +bool CmdPathShape::isActive() { return hasActiveDocument(); } -void CreatePathCommands(void) +void CreatePathCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdPathCompound()); diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp index b8e48cc13c..66d1dc282b 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp +++ b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp @@ -79,7 +79,7 @@ TaskWidgetPathCompound::~TaskWidgetPathCompound() delete ui; } -std::vector TaskWidgetPathCompound::getList(void) const { +std::vector TaskWidgetPathCompound::getList() const { std::vector names; for(int i = 0; i < ui->PathsList->count(); i++) { diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/Path/Gui/TaskDlgPathCompound.h index 92e85b2ece..b62683a8fc 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.h +++ b/src/Mod/Path/Gui/TaskDlgPathCompound.h @@ -44,7 +44,7 @@ public: TaskWidgetPathCompound(ViewProviderPathCompound *CompoundView, QWidget *parent=nullptr); ~TaskWidgetPathCompound(); - std::vector getList(void) const; + std::vector getList() const; protected: void changeEvent(QEvent *e); diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/Path/Gui/ViewProviderArea.cpp index cb5c9e9a07..1e8f28a8e2 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.cpp +++ b/src/Mod/Path/Gui/ViewProviderArea.cpp @@ -42,7 +42,7 @@ ViewProviderArea::~ViewProviderArea() { } -std::vector ViewProviderArea::claimChildren(void) const +std::vector ViewProviderArea::claimChildren() const { return std::vector( static_cast(getObject())->Sources.getValues()); @@ -126,7 +126,7 @@ ViewProviderAreaView::~ViewProviderAreaView() { } -std::vector ViewProviderAreaView::claimChildren(void) const +std::vector ViewProviderAreaView::claimChildren() const { std::vector ret; Path::FeatureAreaView* feature = static_cast(getObject()); diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index e720b6f6b8..2b63d14682 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -280,7 +280,7 @@ void ViewProviderPath::attach(App::DocumentObject *pcObj) addDisplayMaskMode(pcPathRoot, "Waypoints"); } -bool ViewProviderPath::useNewSelectionModel(void) const { +bool ViewProviderPath::useNewSelectionModel() const { return SelectionStyle.getValue()!=2; } @@ -291,7 +291,7 @@ void ViewProviderPath::setDisplayMode(const char* ModeName) inherited::setDisplayMode( ModeName ); } -std::vector ViewProviderPath::getDisplayModes(void) const +std::vector ViewProviderPath::getDisplayModes() const { std::vector StrList; StrList.emplace_back("Waypoints"); diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp index ee908a97cd..bf25db0cce 100644 --- a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp @@ -55,7 +55,7 @@ void ViewProviderPathCompound::unsetEdit(int ModNum) Gui::Control().closeDialog(); } -std::vector ViewProviderPathCompound::claimChildren(void)const +std::vector ViewProviderPathCompound::claimChildren()const { return std::vector(static_cast(getObject())->Group.getValues()); } diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/Path/Gui/ViewProviderPathShape.cpp index c0cbecf4b1..bbb9b88e8a 100644 --- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathShape.cpp @@ -42,7 +42,7 @@ QIcon ViewProviderPathShape::getIcon() const return Gui::BitmapFactory().pixmap("Path_Shape"); } -std::vector ViewProviderPathShape::claimChildren(void) const +std::vector ViewProviderPathShape::claimChildren() const { return std::vector( static_cast(getObject())->Sources.getValues()); diff --git a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp b/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp index d8ea0514dd..5809ffe250 100644 --- a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp +++ b/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp @@ -37,7 +37,7 @@ using namespace PathSimulator; // returns a string which represents the object e.g. when printed in python -std::string PathSimPy::representation(void) const +std::string PathSimPy::representation() const { return std::string(""); } @@ -122,7 +122,7 @@ PyObject* PathSimPy::ApplyCommand(PyObject * args, PyObject * kwds) return newposPy; } -Py::Object PathSimPy::getTool(void) const +Py::Object PathSimPy::getTool() const { //return Py::Object(); throw Py::AttributeError("Not yet implemented"); diff --git a/src/Mod/Robot/App/PropertyTrajectory.cpp b/src/Mod/Robot/App/PropertyTrajectory.cpp index 458e1177d7..8bd149f72a 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.cpp +++ b/src/Mod/Robot/App/PropertyTrajectory.cpp @@ -58,7 +58,7 @@ void PropertyTrajectory::setValue(const Trajectory& sh) } -const Trajectory &PropertyTrajectory::getValue(void)const +const Trajectory &PropertyTrajectory::getValue()const { return _Trajectory; } @@ -91,7 +91,7 @@ Base::BoundBox3d PropertyTrajectory::getBoundingBox() const } -PyObject *PropertyTrajectory::getPyObject(void) +PyObject *PropertyTrajectory::getPyObject() { return new TrajectoryPy(new Trajectory(_Trajectory)); } @@ -109,7 +109,7 @@ void PropertyTrajectory::setPyObject(PyObject *value) } } -App::Property *PropertyTrajectory::Copy(void) const +App::Property *PropertyTrajectory::Copy() const { PropertyTrajectory *prop = new PropertyTrajectory(); prop->_Trajectory = this->_Trajectory; @@ -124,7 +124,7 @@ void PropertyTrajectory::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyTrajectory::getMemSize (void) const +unsigned int PropertyTrajectory::getMemSize () const { return _Trajectory.getMemSize(); } diff --git a/src/Mod/Robot/App/Robot6Axis.cpp b/src/Mod/Robot/App/Robot6Axis.cpp index f54a4ce4d2..8f327f489a 100644 --- a/src/Mod/Robot/App/Robot6Axis.cpp +++ b/src/Mod/Robot/App/Robot6Axis.cpp @@ -166,7 +166,7 @@ void Robot6Axis::readKinematic(const char * FileName) setKinematic(temp); } -unsigned int Robot6Axis::getMemSize (void) const +unsigned int Robot6Axis::getMemSize () const { return 0; } @@ -253,14 +253,14 @@ bool Robot6Axis::setTo(const Placement &To) } } -Base::Placement Robot6Axis::getTcp(void) +Base::Placement Robot6Axis::getTcp() { double x,y,z,w; Tcp.M.GetQuaternion(x,y,z,w); return Base::Placement(Base::Vector3d(Tcp.p[0],Tcp.p[1],Tcp.p[2]),Base::Rotation(x,y,z,w)); } -bool Robot6Axis::calcTcp(void) +bool Robot6Axis::calcTcp() { // Create solver based on kinematic chain ChainFkSolverPos_recursive fksolver = ChainFkSolverPos_recursive(Kinematic); diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h index 55bdc05026..357e063987 100644 --- a/src/Mod/Robot/App/Robot6Axis.h +++ b/src/Mod/Robot/App/Robot6Axis.h @@ -58,7 +58,7 @@ public: ~Robot6Axis(); // from base class - virtual unsigned int getMemSize (void) const; + virtual unsigned int getMemSize () const; virtual void Save (Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); @@ -75,8 +75,8 @@ public: double getMaxAngle(int Axis); double getMinAngle(int Axis); /// calculate the new Tcp out of the Axis - bool calcTcp(void); - Base::Placement getTcp(void); + bool calcTcp(); + Base::Placement getTcp(); //void setKinematik(const std::vector > &KinTable); diff --git a/src/Mod/Robot/App/Robot6AxisPyImp.cpp b/src/Mod/Robot/App/Robot6AxisPyImp.cpp index 0295b67264..a9609f1a9b 100644 --- a/src/Mod/Robot/App/Robot6AxisPyImp.cpp +++ b/src/Mod/Robot/App/Robot6AxisPyImp.cpp @@ -36,7 +36,7 @@ using namespace Robot; // returns a string which represents the object e.g. when printed in python -std::string Robot6AxisPy::representation(void) const +std::string Robot6AxisPy::representation() const { std::stringstream str; @@ -78,7 +78,7 @@ PyObject* Robot6AxisPy::check(PyObject * /*args*/) -Py::Float Robot6AxisPy::getAxis1(void) const +Py::Float Robot6AxisPy::getAxis1() const { return Py::Float(getRobot6AxisPtr()->getAxis(0)); } @@ -88,7 +88,7 @@ void Robot6AxisPy::setAxis1(Py::Float arg) getRobot6AxisPtr()->setAxis(0,(float)arg.operator double()); } -Py::Float Robot6AxisPy::getAxis2(void) const +Py::Float Robot6AxisPy::getAxis2() const { return Py::Float(getRobot6AxisPtr()->getAxis(1)); } @@ -98,7 +98,7 @@ void Robot6AxisPy::setAxis2(Py::Float arg) getRobot6AxisPtr()->setAxis(1,(float)arg.operator double()); } -Py::Float Robot6AxisPy::getAxis3(void) const +Py::Float Robot6AxisPy::getAxis3() const { return Py::Float(getRobot6AxisPtr()->getAxis(2)); } @@ -108,7 +108,7 @@ void Robot6AxisPy::setAxis3(Py::Float arg) getRobot6AxisPtr()->setAxis(2,(float)arg.operator double()); } -Py::Float Robot6AxisPy::getAxis4(void) const +Py::Float Robot6AxisPy::getAxis4() const { return Py::Float(getRobot6AxisPtr()->getAxis(3)); } @@ -118,7 +118,7 @@ void Robot6AxisPy::setAxis4(Py::Float arg) getRobot6AxisPtr()->setAxis(3,(float)arg.operator double()); } -Py::Float Robot6AxisPy::getAxis5(void) const +Py::Float Robot6AxisPy::getAxis5() const { return Py::Float(getRobot6AxisPtr()->getAxis(4)); } @@ -128,7 +128,7 @@ void Robot6AxisPy::setAxis5(Py::Float arg) getRobot6AxisPtr()->setAxis(4,(float)arg.operator double()); } -Py::Float Robot6AxisPy::getAxis6(void) const +Py::Float Robot6AxisPy::getAxis6() const { return Py::Float(getRobot6AxisPtr()->getAxis(5)); } @@ -138,7 +138,7 @@ void Robot6AxisPy::setAxis6(Py::Float arg) getRobot6AxisPtr()->setAxis(5,(float)arg.operator double()); } -Py::Object Robot6AxisPy::getTcp(void) const +Py::Object Robot6AxisPy::getTcp() const { return Py::asObject(new Base::PlacementPy(new Base::Placement(getRobot6AxisPtr()->getTcp()))); } @@ -164,7 +164,7 @@ void Robot6AxisPy::setTcp(Py::Object value) } -Py::Object Robot6AxisPy::getBase(void) const +Py::Object Robot6AxisPy::getBase() const { return Py::Object(); } diff --git a/src/Mod/Robot/App/RobotAlgos.cpp b/src/Mod/Robot/App/RobotAlgos.cpp index 21aea6cbb8..fe40610606 100644 --- a/src/Mod/Robot/App/RobotAlgos.cpp +++ b/src/Mod/Robot/App/RobotAlgos.cpp @@ -31,10 +31,10 @@ #include "kdl_cp/chainfksolver.hpp" #include "kdl_cp/chainfksolverpos_recursive.hpp" #include "kdl_cp/frames_io.hpp" -#include "kdl_cp/chainiksolver.hpp" -#include "kdl_cp/chainiksolvervel_pinv.hpp" -#include "kdl_cp/chainjnttojacsolver.hpp" -#include "kdl_cp/chainiksolverpos_nr.hpp" +#include "kdl_cp/chainiksolver.hpp" +#include "kdl_cp/chainiksolvervel_pinv.hpp" +#include "kdl_cp/chainjnttojacsolver.hpp" +#include "kdl_cp/chainiksolverpos_nr.hpp" #include #include @@ -64,7 +64,7 @@ using namespace KDL; -RobotAlgos::RobotAlgos(void) +RobotAlgos::RobotAlgos() { } @@ -73,7 +73,7 @@ RobotAlgos::~RobotAlgos() { } -void RobotAlgos::Test(void) +void RobotAlgos::Test() { //Definition of a kinematic chain & add segments to the chain KDL::Chain chain; @@ -133,4 +133,4 @@ void RobotAlgos::Test(void) } -} +} diff --git a/src/Mod/Robot/App/RobotObject.cpp b/src/Mod/Robot/App/RobotObject.cpp index cca5f32c3c..54c0a40f2d 100644 --- a/src/Mod/Robot/App/RobotObject.cpp +++ b/src/Mod/Robot/App/RobotObject.cpp @@ -67,7 +67,7 @@ RobotObject::~RobotObject() { } -short RobotObject::mustExecute(void) const +short RobotObject::mustExecute() const { return 0; } diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index 2bb2c572fe..e37659e11c 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -40,23 +40,23 @@ class RobotExport RobotObject : public App::GeoFeature public: /// Constructor - RobotObject(void); + RobotObject(); virtual ~RobotObject(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "RobotGui::ViewProviderRobotObject"; } - virtual App::DocumentObjectExecReturn *execute(void) { + virtual App::DocumentObjectExecReturn *execute() { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + virtual short mustExecute() const; + virtual PyObject *getPyObject(); virtual void Save (Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); - Robot6Axis &getRobot(void){return robot;} + Robot6Axis &getRobot(){return robot;} App::PropertyFileIncluded RobotVrmlFile; App::PropertyFileIncluded RobotKinematicFile; diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp index ac95303829..86fda96b77 100644 --- a/src/Mod/Robot/App/RobotObjectPyImp.cpp +++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp @@ -32,7 +32,7 @@ using namespace Robot; // returns a string which represents the object e.g. when printed in python -std::string RobotObjectPy::representation(void) const +std::string RobotObjectPy::representation() const { return std::string(""); } diff --git a/src/Mod/Robot/App/Simulation.cpp b/src/Mod/Robot/App/Simulation.cpp index 6445340982..c01e4043c7 100644 --- a/src/Mod/Robot/App/Simulation.cpp +++ b/src/Mod/Robot/App/Simulation.cpp @@ -97,7 +97,7 @@ void Simulation::setToTime(float t) } -void Simulation::reset(void) +void Simulation::reset() { Rob.setAxis(0,startAxis[0]); Rob.setAxis(1,startAxis[1]); diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h index f33c84a637..5c1b99de9c 100644 --- a/src/Mod/Robot/App/Simulation.h +++ b/src/Mod/Robot/App/Simulation.h @@ -44,17 +44,17 @@ public: Simulation(const Trajectory &Trac,Robot6Axis &Rob); virtual ~Simulation(); - double getLength(void){return Trac.getLength();} - double getDuration(void){return Trac.getDuration();} + double getLength(){return Trac.getLength();} + double getDuration(){return Trac.getDuration();} - Base::Placement getPosition(void){return Trac.getPosition(Pos);} - double getVelocity(void){return Trac.getVelocity(Pos);} + Base::Placement getPosition(){return Trac.getPosition(Pos);} + double getVelocity(){return Trac.getVelocity(Pos);} void step(double tick); void setToWaypoint(unsigned int n); void setToTime(float t); // apply the start axis angles and set to time 0. Restores the exact start position - void reset(void); + void reset(); double Pos; double Axis[6]; diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index 9a13911daf..b827ad0a95 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -146,7 +146,7 @@ void Trajectory::deleteLast(unsigned int n) } -void Trajectory::generateTrajectory(void) +void Trajectory::generateTrajectory() { if (vpcWaypoints.empty()) return; @@ -293,7 +293,7 @@ void Trajectory::addWaypoint(const Waypoint &WPnt) -unsigned int Trajectory::getMemSize (void) const +unsigned int Trajectory::getMemSize () const { return 0; } diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp index c01f1aa738..fb4d21c100 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp @@ -69,7 +69,7 @@ TrajectoryDressUpObject::~TrajectoryDressUpObject() { } -App::DocumentObjectExecReturn* TrajectoryDressUpObject::execute(void) +App::DocumentObjectExecReturn* TrajectoryDressUpObject::execute() { Robot::Trajectory result; diff --git a/src/Mod/Robot/App/TrajectoryPyImp.cpp b/src/Mod/Robot/App/TrajectoryPyImp.cpp index d80ff36927..9a2a621f91 100644 --- a/src/Mod/Robot/App/TrajectoryPyImp.cpp +++ b/src/Mod/Robot/App/TrajectoryPyImp.cpp @@ -35,7 +35,7 @@ using namespace Robot; // returns a string which represents the object e.g. when printed in python -std::string TrajectoryPy::representation(void) const +std::string TrajectoryPy::representation() const { std::stringstream str; str.precision(5); @@ -145,12 +145,12 @@ PyObject* TrajectoryPy::deleteLast(PyObject *args) -Py::Float TrajectoryPy::getDuration(void) const +Py::Float TrajectoryPy::getDuration() const { return Py::Float(getTrajectoryPtr()->getDuration()); } -Py::List TrajectoryPy::getWaypoints(void) const +Py::List TrajectoryPy::getWaypoints() const { Py::List list; for(unsigned int i = 0; i < getTrajectoryPtr()->getSize(); i++) @@ -159,7 +159,7 @@ Py::List TrajectoryPy::getWaypoints(void) const return list; } -Py::Float TrajectoryPy::getLength(void) const +Py::Float TrajectoryPy::getLength() const { return Py::Float(getTrajectoryPtr()->getLength()); } diff --git a/src/Mod/Robot/App/Waypoint.cpp b/src/Mod/Robot/App/Waypoint.cpp index 411ffde3e6..a098a181d8 100644 --- a/src/Mod/Robot/App/Waypoint.cpp +++ b/src/Mod/Robot/App/Waypoint.cpp @@ -90,7 +90,7 @@ Waypoint::~Waypoint() { } -unsigned int Waypoint::getMemSize (void) const +unsigned int Waypoint::getMemSize () const { return 0; } diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index 9f228d7b4d..6ef5810a0a 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -40,7 +40,7 @@ using namespace Robot; using namespace Base; // returns a string which represents the object e.g. when printed in python -std::string WaypointPy::representation(void) const +std::string WaypointPy::representation() const { double A,B,C; std::stringstream str; @@ -141,7 +141,7 @@ int WaypointPy::PyInit(PyObject* args, PyObject* kwd) } -Py::Float WaypointPy::getVelocity(void) const +Py::Float WaypointPy::getVelocity() const { return Py::Float(getWaypointPtr()->Velocity); } @@ -152,7 +152,7 @@ void WaypointPy::setVelocity(Py::Float arg) } -Py::String WaypointPy::getName(void) const +Py::String WaypointPy::getName() const { return Py::String(getWaypointPtr()->Name.c_str()); } @@ -162,7 +162,7 @@ void WaypointPy::setName(Py::String arg) getWaypointPtr()->Name = arg.as_std_string("ascii"); } -Py::String WaypointPy::getType(void) const +Py::String WaypointPy::getType() const { if(getWaypointPtr()->Type == Waypoint::PTP) return Py::String("PTP"); @@ -194,7 +194,7 @@ void WaypointPy::setType(Py::String arg) } -Py::Object WaypointPy::getPos(void) const +Py::Object WaypointPy::getPos() const { return Py::Object(new PlacementPy(new Placement(getWaypointPtr()->EndPos)),true); } @@ -206,7 +206,7 @@ void WaypointPy::setPos(Py::Object arg) getWaypointPtr()->EndPos = *static_cast((*arg))->getPlacementPtr(); } -Py::Boolean WaypointPy::getCont(void) const +Py::Boolean WaypointPy::getCont() const { return Py::Boolean(getWaypointPtr()->Cont); } @@ -216,7 +216,7 @@ void WaypointPy::setCont(Py::Boolean arg) getWaypointPtr()->Cont = (bool)arg; } -Py::Long WaypointPy::getTool(void) const +Py::Long WaypointPy::getTool() const { return Py::Long((long)getWaypointPtr()->Tool); } @@ -230,7 +230,7 @@ void WaypointPy::setTool(Py::Long arg) throw Py::ValueError("negative tool not allowed!"); } -Py::Long WaypointPy::getBase(void) const +Py::Long WaypointPy::getBase() const { return Py::Long((long)getWaypointPtr()->Base); } diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index 63ef038c0e..44472c722a 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -39,10 +39,10 @@ // use a different name to CreateCommand() -void CreateRobotCommands(void); -void CreateRobotCommandsExport(void); -void CreateRobotCommandsInsertRobots(void); -void CreateRobotCommandsTrajectory(void); +void CreateRobotCommands(); +void CreateRobotCommandsExport(); +void CreateRobotCommandsInsertRobots(); +void CreateRobotCommandsTrajectory(); void loadRobotResource() { diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 060e95f971..0065469030 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -89,7 +89,7 @@ void CmdRobotSetHomePos::activated(int) } -bool CmdRobotSetHomePos::isActive(void) +bool CmdRobotSetHomePos::isActive() { return hasActiveDocument(); } @@ -143,7 +143,7 @@ void CmdRobotRestoreHomePos::activated(int) } -bool CmdRobotRestoreHomePos::isActive(void) +bool CmdRobotRestoreHomePos::isActive() { return hasActiveDocument(); } @@ -183,7 +183,7 @@ void CmdRobotConstraintAxle::activated(int) } -bool CmdRobotConstraintAxle::isActive(void) +bool CmdRobotConstraintAxle::isActive() { return hasActiveDocument(); } @@ -260,7 +260,7 @@ void CmdRobotSimulate::activated(int) #endif } -bool CmdRobotSimulate::isActive(void) +bool CmdRobotSimulate::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -271,7 +271,7 @@ bool CmdRobotSimulate::isActive(void) -void CreateRobotCommands(void) +void CreateRobotCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 117c2ed637..4b791c2acd 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -95,7 +95,7 @@ void CmdRobotExportKukaCompact::activated(int) doCommand(Doc,"ExportCompactSub(App.activeDocument().%s,App.activeDocument().%s,'%s')",pcRobotObject->getNameInDocument(),pcTrajectoryObject->getNameInDocument(),(const char*)fn.toLatin1()); } -bool CmdRobotExportKukaCompact::isActive(void) +bool CmdRobotExportKukaCompact::isActive() { return hasActiveDocument(); } @@ -157,7 +157,7 @@ void CmdRobotExportKukaFull::activated(int) doCommand(Doc,"ExportFullSub(App.activeDocument().%s,App.activeDocument().%s,'%s')",pcRobotObject->getNameInDocument(),pcTrajectoryObject->getNameInDocument(),(const char*)fn.toLatin1()); } -bool CmdRobotExportKukaFull::isActive(void) +bool CmdRobotExportKukaFull::isActive() { return hasActiveDocument(); } @@ -166,7 +166,7 @@ bool CmdRobotExportKukaFull::isActive(void) -void CreateRobotCommandsExport(void) +void CreateRobotCommandsExport() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp index 98d9b3745e..b6ff92c5de 100644 --- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp +++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp @@ -76,7 +76,7 @@ void CmdRobotInsertKukaIR500::activated(int) } -bool CmdRobotInsertKukaIR500::isActive(void) +bool CmdRobotInsertKukaIR500::isActive() { return hasActiveDocument(); } @@ -117,7 +117,7 @@ void CmdRobotInsertKukaIR16::activated(int) } -bool CmdRobotInsertKukaIR16::isActive(void) +bool CmdRobotInsertKukaIR16::isActive() { return hasActiveDocument(); } @@ -158,7 +158,7 @@ void CmdRobotInsertKukaIR210::activated(int) } -bool CmdRobotInsertKukaIR210::isActive(void) +bool CmdRobotInsertKukaIR210::isActive() { return hasActiveDocument(); } @@ -198,7 +198,7 @@ void CmdRobotInsertKukaIR125::activated(int) } -bool CmdRobotInsertKukaIR125::isActive(void) +bool CmdRobotInsertKukaIR125::isActive() { return hasActiveDocument(); } @@ -250,13 +250,13 @@ void CmdRobotAddToolShape::activated(int) commitCommand(); } -bool CmdRobotAddToolShape::isActive(void) +bool CmdRobotAddToolShape::isActive() { //return false; // not yet implemetned thus not active return hasActiveDocument(); } -void CreateRobotCommandsInsertRobots(void) +void CreateRobotCommandsInsertRobots() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 0262a35ca9..804ce84724 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -79,7 +79,7 @@ void CmdRobotCreateTrajectory::activated(int) } -bool CmdRobotCreateTrajectory::isActive(void) +bool CmdRobotCreateTrajectory::isActive() { return hasActiveDocument(); } @@ -136,7 +136,7 @@ void CmdRobotInsertWaypoint::activated(int) } -bool CmdRobotInsertWaypoint::isActive(void) +bool CmdRobotInsertWaypoint::isActive() { return hasActiveDocument(); } @@ -200,7 +200,7 @@ void CmdRobotInsertWaypointPreselect::activated(int) } -bool CmdRobotInsertWaypointPreselect::isActive(void) +bool CmdRobotInsertWaypointPreselect::isActive() { return hasActiveDocument(); } @@ -238,7 +238,7 @@ void CmdRobotSetDefaultOrientation::activated(int) } } -bool CmdRobotSetDefaultOrientation::isActive(void) +bool CmdRobotSetDefaultOrientation::isActive() { return true; } @@ -304,7 +304,7 @@ void CmdRobotSetDefaultValues::activated(int) } -bool CmdRobotSetDefaultValues::isActive(void) +bool CmdRobotSetDefaultValues::isActive() { return true; } @@ -368,7 +368,7 @@ void CmdRobotEdge2Trac::activated(int) } -bool CmdRobotEdge2Trac::isActive(void) +bool CmdRobotEdge2Trac::isActive() { return true; } @@ -415,7 +415,7 @@ void CmdRobotTrajectoryDressUp::activated(int) } } -bool CmdRobotTrajectoryDressUp::isActive(void) +bool CmdRobotTrajectoryDressUp::isActive() { return true; } @@ -455,7 +455,7 @@ void CmdRobotTrajectoryCompound::activated(int) } } -bool CmdRobotTrajectoryCompound::isActive(void) +bool CmdRobotTrajectoryCompound::isActive() { return true; } @@ -466,7 +466,7 @@ bool CmdRobotTrajectoryCompound::isActive(void) -void CreateRobotCommandsTrajectory(void) +void CreateRobotCommandsTrajectory() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h index e676e83041..120de366a9 100644 --- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h +++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h @@ -60,7 +60,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.h b/src/Mod/Robot/Gui/TaskDlgSimulate.h index dd2b18fe25..8d70497f65 100644 --- a/src/Mod/Robot/Gui/TaskDlgSimulate.h +++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h @@ -58,7 +58,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Close|QDialogButtonBox::Help; } protected: diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h index 5b3f55d508..bbfe36b323 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h @@ -60,7 +60,7 @@ public: virtual void helpRequested(); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp index bfd8baabf9..1ffe3fa893 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp @@ -65,7 +65,7 @@ TaskEdge2TracParameter::TaskEdge2TracParameter(Robot::Edge2TracObject *pcObject, setHideShowObject(); } -void TaskEdge2TracParameter::setHideShowObject(void) +void TaskEdge2TracParameter::setHideShowObject() { HideShowObj = pcObject->Source.getValue(); @@ -77,7 +77,7 @@ void TaskEdge2TracParameter::setHideShowObject(void) } } -void TaskEdge2TracParameter::hideShow(void) +void TaskEdge2TracParameter::hideShow() { setHideShowObject(); diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h index c93391c545..825c4f4bcf 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h @@ -56,7 +56,7 @@ public: void setEdgeAndClusterNbr(int NbrEdges,int NbrClusters); private Q_SLOTS: - void hideShow(void); + void hideShow(); void sizingValueChanged(double Value); void orientationToggled(bool Value); @@ -64,7 +64,7 @@ protected: Robot::Edge2TracObject *pcObject; App::DocumentObject *HideShowObj; - void setHideShowObject(void); + void setHideShowObject(); private: private: diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp index 005ffcabdd..7b839058b8 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp @@ -115,7 +115,7 @@ void TaskRobot6Axis::setRobot(Robot::RobotObject *pcRobotObject) viewTool(pcRobot->Tool.getValue()); } -void TaskRobot6Axis::createPlacementDlg(void) +void TaskRobot6Axis::createPlacementDlg() { Gui::Dialog::Placement plc; plc.setPlacement(pcRobot->Tool.getValue()); diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.h b/src/Mod/Robot/Gui/TaskRobot6Axis.h index 80147ec32d..8e36a9b316 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.h +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.h @@ -64,7 +64,7 @@ private Q_SLOTS: void changeSliderA4(int value); void changeSliderA5(int value); void changeSliderA6(int value); - void createPlacementDlg(void); + void createPlacementDlg(); protected: Robot::RobotObject *pcRobot; diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp index 0a37843825..9edcc38613 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp @@ -129,7 +129,7 @@ void TaskTrajectory::viewTool(const Base::Placement& pos) ui->label_Pos->setText(result); } -void TaskTrajectory::setTo(void) +void TaskTrajectory::setTo() { sim.Tool = pcRobot->Tool.getValue(); @@ -143,7 +143,7 @@ void TaskTrajectory::setTo(void) viewTool(sim.Rob.getTcp()); } -void TaskTrajectory::start(void) +void TaskTrajectory::start() { timePos = 0.0f; ui->timeSpinBox->setValue(timePos); @@ -151,23 +151,23 @@ void TaskTrajectory::start(void) setTo(); } -void TaskTrajectory::stop(void) +void TaskTrajectory::stop() { timer->stop(); Run = false; } -void TaskTrajectory::run(void) +void TaskTrajectory::run() { timer->start(); Run = true; } -void TaskTrajectory::back(void) +void TaskTrajectory::back() { } -void TaskTrajectory::forward(void) +void TaskTrajectory::forward() { } -void TaskTrajectory::end(void) +void TaskTrajectory::end() { timePos = duration; ui->timeSpinBox->setValue(timePos); @@ -175,7 +175,7 @@ void TaskTrajectory::end(void) setTo(); } -void TaskTrajectory::timerDone(void) +void TaskTrajectory::timerDone() { if(timePos < duration){ timePos += .1f; diff --git a/src/Mod/Robot/Gui/TaskTrajectory.h b/src/Mod/Robot/Gui/TaskTrajectory.h index b1f6ffe5e2..0be7b1c905 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.h +++ b/src/Mod/Robot/Gui/TaskTrajectory.h @@ -65,14 +65,14 @@ public: Gui::SelectionSingleton::MessageType Reason); private Q_SLOTS: - void start(void); - void stop(void); - void run(void); - void back(void); - void forward(void); - void end(void); + void start(); + void stop(); + void run(); + void back(); + void forward(); + void end(); - void timerDone(void); + void timerDone(); void valueChanged ( int value ); void valueChanged ( double d ); @@ -80,7 +80,7 @@ Q_SIGNALS: void axisChanged(float A1,float A2,float A3,float A4,float A5,float A6,const Base::Placement &Tcp); protected: - void setTo(void); + void setTo(); void viewTool(const Base::Placement& pos); QTimer *timer; diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp index e515562a12..2042746665 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp @@ -80,7 +80,7 @@ TaskTrajectoryDressUpParameter::~TaskTrajectoryDressUpParameter() delete ui; } -void TaskTrajectoryDressUpParameter::writeValues(void) +void TaskTrajectoryDressUpParameter::writeValues() { pcObject->Speed.setValue ( ui->doubleSpinBoxSpeed->value()*1000.0); pcObject->Acceleration.setValue ( ui->doubleSpinBoxAccel->value()*1000.0); @@ -91,7 +91,7 @@ void TaskTrajectoryDressUpParameter::writeValues(void) pcObject->PosAdd.setValue(PosAdd); } -void TaskTrajectoryDressUpParameter::createPlacementDlg(void) +void TaskTrajectoryDressUpParameter::createPlacementDlg() { Gui::Dialog::Placement plc; plc.setPlacement(PosAdd); @@ -103,7 +103,7 @@ void TaskTrajectoryDressUpParameter::createPlacementDlg(void) } -void TaskTrajectoryDressUpParameter::viewPlacement(void) +void TaskTrajectoryDressUpParameter::viewPlacement() { double A,B,C; Base::Vector3d pos = PosAdd.getPosition(); diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h index 600a049a63..ec704ccb47 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h @@ -48,17 +48,17 @@ public: ~TaskTrajectoryDressUpParameter(); /// this methode write the values from the Gui to the object, usually in accept() - void writeValues(void); + void writeValues(); private Q_SLOTS: /// edit the placement - void createPlacementDlg(void); + void createPlacementDlg(); protected: Base::Placement PosAdd; - void viewPlacement(void); + void viewPlacement(); private: QWidget* proxy; diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h index ada9668270..d886ed28cf 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.h +++ b/src/Mod/Robot/Gui/TaskWatcher.h @@ -46,7 +46,7 @@ public: ~TaskWatcherRobot(); /// is called when the document or the selection changes. - virtual bool shouldShow(void); + virtual bool shouldShow(); protected: TaskRobot6Axis *rob; diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.cpp b/src/Mod/Robot/Gui/TrajectorySimulate.cpp index 4d0724fa76..20661926dc 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.cpp +++ b/src/Mod/Robot/Gui/TrajectorySimulate.cpp @@ -109,13 +109,13 @@ TrajectorySimulate::~TrajectorySimulate() { } -void TrajectorySimulate::setTo(void) +void TrajectorySimulate::setTo() { sim.setToTime(timePos); ViewProv->setAxisTo(sim.Axis[0],sim.Axis[1],sim.Axis[2],sim.Axis[3],sim.Axis[4],sim.Axis[5],sim.Rob.getTcp()); } -void TrajectorySimulate::start(void) +void TrajectorySimulate::start() { timePos = 0.0f; ui->timeSpinBox->setValue(timePos); @@ -123,23 +123,23 @@ void TrajectorySimulate::start(void) setTo(); } -void TrajectorySimulate::stop(void) +void TrajectorySimulate::stop() { timer->stop(); Run = false; } -void TrajectorySimulate::run(void) +void TrajectorySimulate::run() { timer->start(); Run = true; } -void TrajectorySimulate::back(void) +void TrajectorySimulate::back() { } -void TrajectorySimulate::forward(void) +void TrajectorySimulate::forward() { } -void TrajectorySimulate::end(void) +void TrajectorySimulate::end() { timePos = duration; ui->timeSpinBox->setValue(timePos); @@ -147,7 +147,7 @@ void TrajectorySimulate::end(void) setTo(); } -void TrajectorySimulate::timerDone(void) +void TrajectorySimulate::timerDone() { if(timePos < duration){ timePos += .1f; diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.h b/src/Mod/Robot/Gui/TrajectorySimulate.h index 86fe1c2531..7ecbcf8276 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.h +++ b/src/Mod/Robot/Gui/TrajectorySimulate.h @@ -50,19 +50,19 @@ public: ~TrajectorySimulate(); private Q_SLOTS: - void start(void); - void stop(void); - void run(void); - void back(void); - void forward(void); - void end(void); + void start(); + void stop(); + void run(); + void back(); + void forward(); + void end(); - void timerDone(void); + void timerDone(); void valueChanged ( int value ); void valueChanged ( double d ); protected: - void setTo(void); + void setTo(); QTimer *timer; diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp index a772c57bc7..a07ff7b290 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp @@ -35,7 +35,7 @@ using namespace RobotGui; PROPERTY_SOURCE(RobotGui::ViewProviderEdge2TracObject, RobotGui::ViewProviderTrajectory) -bool ViewProviderEdge2TracObject::doubleClicked(void) +bool ViewProviderEdge2TracObject::doubleClicked() { Gui::TaskView::TaskDialog* dlg = new TaskDlgEdge2Trac(static_cast(getObject())); Gui::Control().showDialog(dlg); diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index bb28ab1d7a..45ae12a071 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -146,7 +146,7 @@ void ViewProviderRobotObject::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode( ModeName ); } -std::vector ViewProviderRobotObject::getDisplayModes(void) const +std::vector ViewProviderRobotObject::getDisplayModes() const { std::vector StrList; StrList.emplace_back("VRML"); diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index a90084dcd0..ade7eb6171 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -130,7 +130,7 @@ void ViewProviderTrajectory::setDisplayMode(const char* ModeName) ViewProviderGeometryObject::setDisplayMode( ModeName ); } -std::vector ViewProviderTrajectory::getDisplayModes(void) const +std::vector ViewProviderTrajectory::getDisplayModes() const { std::vector StrList; StrList.emplace_back("Waypoints"); diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp index 94a17da9ba..0b426e093e 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp @@ -60,7 +60,7 @@ void ViewProviderTrajectoryCompound::unsetEdit(int) } -std::vector ViewProviderTrajectoryCompound::claimChildren(void)const +std::vector ViewProviderTrajectoryCompound::claimChildren()const { return std::vector(static_cast(getObject())->Source.getValues()); } diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp index 1fdee009a5..6397e31635 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp @@ -58,7 +58,7 @@ void ViewProviderTrajectoryDressUp::unsetEdit(int) } -std::vector ViewProviderTrajectoryDressUp::claimChildren(void)const +std::vector ViewProviderTrajectoryDressUp::claimChildren()const { std::vector temp; temp.push_back(static_cast(getObject())->Source.getValue()); diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp index ba88abce23..802dc7fe84 100644 --- a/src/Mod/Sketcher/App/Constraint.cpp +++ b/src/Mod/Sketcher/App/Constraint.cpp @@ -74,12 +74,12 @@ Constraint::Constraint() tag = gen(); } -Constraint *Constraint::clone(void) const +Constraint *Constraint::clone() const { return new Constraint(*this); } -Constraint *Constraint::copy(void) const +Constraint *Constraint::copy() const { Constraint *temp = new Constraint(); temp->Value = this->Value; @@ -102,7 +102,7 @@ Constraint *Constraint::copy(void) const return temp; } -PyObject *Constraint::getPyObject(void) +PyObject *Constraint::getPyObject() { return new ConstraintPy(new Constraint(*this)); } @@ -140,7 +140,7 @@ Quantity Constraint::getPresentationValue() const return quantity; } -unsigned int Constraint::getMemSize (void) const +unsigned int Constraint::getMemSize () const { return 0; } diff --git a/src/Mod/Sketcher/App/Constraint.h b/src/Mod/Sketcher/App/Constraint.h index 46b462b0de..8c9620d022 100644 --- a/src/Mod/Sketcher/App/Constraint.h +++ b/src/Mod/Sketcher/App/Constraint.h @@ -97,15 +97,15 @@ public: virtual ~Constraint() = default; - Constraint *clone(void) const; // does copy the tag, it will be treated as a rename by the expression engine. - Constraint *copy(void) const; // does not copy the tag, but generates a new one + Constraint *clone() const; // does copy the tag, it will be treated as a rename by the expression engine. + Constraint *copy() const; // does not copy the tag, but generates a new one // from base class - virtual unsigned int getMemSize(void) const override; + virtual unsigned int getMemSize() const override; virtual void Save(Base::Writer &/*writer*/) const override; virtual void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; Base::Quantity getPresentationValue() const; inline void setValue(double newValue) { diff --git a/src/Mod/Sketcher/App/ConstraintPyImp.cpp b/src/Mod/Sketcher/App/ConstraintPyImp.cpp index 2992e1f7da..6c83337376 100644 --- a/src/Mod/Sketcher/App/ConstraintPyImp.cpp +++ b/src/Mod/Sketcher/App/ConstraintPyImp.cpp @@ -470,7 +470,7 @@ int ConstraintPy::PyInit(PyObject* args, PyObject* /*kwd*/) } // returns a string which represents the object e.g. when printed in python -std::string ConstraintPy::representation(void) const +std::string ConstraintPy::representation() const { std::stringstream result; result << "getConstraintPtr()->Type) { case None : return Py::String("None");break; @@ -551,7 +551,7 @@ Py::String ConstraintPy::getType(void) const } } -Py::Long ConstraintPy::getFirst(void) const +Py::Long ConstraintPy::getFirst() const { return Py::Long(this->getConstraintPtr()->First); } @@ -561,7 +561,7 @@ void ConstraintPy::setFirst(Py::Long arg) this->getConstraintPtr()->First = arg; } -Py::Long ConstraintPy::getFirstPos(void) const +Py::Long ConstraintPy::getFirstPos() const { return Py::Long(static_cast(this->getConstraintPtr()->FirstPos)); } @@ -581,7 +581,7 @@ void ConstraintPy::setFirstPos(Py::Long arg) } } -Py::Long ConstraintPy::getSecond(void) const +Py::Long ConstraintPy::getSecond() const { return Py::Long(this->getConstraintPtr()->Second); } @@ -591,7 +591,7 @@ void ConstraintPy::setSecond(Py::Long arg) this->getConstraintPtr()->Second = arg; } -Py::Long ConstraintPy::getSecondPos(void) const +Py::Long ConstraintPy::getSecondPos() const { return Py::Long(static_cast(this->getConstraintPtr()->SecondPos)); } @@ -611,7 +611,7 @@ void ConstraintPy::setSecondPos(Py::Long arg) } } -Py::Long ConstraintPy::getThird(void) const +Py::Long ConstraintPy::getThird() const { return Py::Long(this->getConstraintPtr()->Third); } @@ -621,7 +621,7 @@ void ConstraintPy::setThird(Py::Long arg) this->getConstraintPtr()->Third = arg; } -Py::Long ConstraintPy::getThirdPos(void) const +Py::Long ConstraintPy::getThirdPos() const { return Py::Long(static_cast(this->getConstraintPtr()->ThirdPos)); } @@ -641,7 +641,7 @@ void ConstraintPy::setThirdPos(Py::Long arg) } } -Py::String ConstraintPy::getName(void) const +Py::String ConstraintPy::getName() const { return Py::String(this->getConstraintPtr()->Name); } @@ -651,22 +651,22 @@ void ConstraintPy::setName(Py::String arg) this->getConstraintPtr()->Name = arg; } -Py::Float ConstraintPy::getValue(void) const +Py::Float ConstraintPy::getValue() const { return Py::Float(this->getConstraintPtr()->getValue()); } -Py::Boolean ConstraintPy::getDriving(void) const +Py::Boolean ConstraintPy::getDriving() const { return Py::Boolean(this->getConstraintPtr()->isDriving); } -Py::Boolean ConstraintPy::getInVirtualSpace(void) const +Py::Boolean ConstraintPy::getInVirtualSpace() const { return Py::Boolean(this->getConstraintPtr()->isInVirtualSpace); } -Py::Boolean ConstraintPy::getIsActive(void) const +Py::Boolean ConstraintPy::getIsActive() const { return Py::Boolean(this->getConstraintPtr()->isActive); } diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp index 93e40f7603..a0921a5473 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp @@ -61,7 +61,7 @@ void ExternalGeometryExtension::saveAttributes(Base::Writer &writer) const << "\" Flags=\"" << Flags.to_string(); } -std::unique_ptr ExternalGeometryExtension::copy(void) const +std::unique_ptr ExternalGeometryExtension::copy() const { auto cpy = std::make_unique(); @@ -74,7 +74,7 @@ std::unique_ptr ExternalGeometryExtension::copy(void) c #endif } -PyObject * ExternalGeometryExtension::getPyObject(void) +PyObject * ExternalGeometryExtension::getPyObject() { return new ExternalGeometryExtensionPy(new ExternalGeometryExtension(*this)); } diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 1c0422996f..9886d38285 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -68,9 +68,9 @@ public: ExternalGeometryExtension() = default; virtual ~ExternalGeometryExtension() override = default; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; // START_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) virtual bool testFlag(int flag) const override { return Flags.test((size_t)(flag)); } diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp index bbe35e3d03..f4d9c9eedd 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp +++ b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp @@ -35,7 +35,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string ExternalGeometryExtensionPy::representation(void) const +std::string ExternalGeometryExtensionPy::representation() const { std::stringstream str; @@ -140,7 +140,7 @@ PyObject* ExternalGeometryExtensionPy::setFlag(PyObject *args) Py_Return; } -Py::String ExternalGeometryExtensionPy::getRef(void) const +Py::String ExternalGeometryExtensionPy::getRef() const { return Py::String(this->getExternalGeometryExtensionPtr()->getRef()); } diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp index 341f4e7fff..7e11451732 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp +++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp @@ -140,7 +140,7 @@ void ExternalGeometryFacade::copyId(const Part::Geometry * src, Part::Geometry * gfdst->setId(gfsrc->getId()); } -PyObject * ExternalGeometryFacade::getPyObject(void) +PyObject * ExternalGeometryFacade::getPyObject() { return new ExternalGeometryFacadePy(new ExternalGeometryFacade(this->Geo)); } diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.h b/src/Mod/Sketcher/App/ExternalGeometryFacade.h index 8db4252fa3..05f3338db3 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacade.h +++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.h @@ -97,7 +97,7 @@ public: bool getBlocked() const { return this->testGeometryMode(GeometryMode::Blocked);} void setBlocked(bool status = true) {this->setGeometryMode(GeometryMode::Blocked, status);} - inline bool getConstruction(void) const {return this->testGeometryMode(GeometryMode::Construction);}; + inline bool getConstruction() const {return this->testGeometryMode(GeometryMode::Construction);}; inline void setConstruction(bool construction) {this->setGeometryMode(GeometryMode::Construction, construction);}; // Geometry Extension Information @@ -120,13 +120,13 @@ public: > GeometryT * getGeometry() const {return dynamic_cast(Geo);} - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; /** Geometry Interface **/ TopoDS_Shape toShape() const {return getGeo()->toShape();}; const Handle(Geom_Geometry)& handle() const {return getGeo()->handle();}; - Part::Geometry *copy(void) const {return getGeo()->copy();}; - Part::Geometry *clone(void) const {return getGeo()->clone();}; + Part::Geometry *copy() const {return getGeo()->copy();}; + Part::Geometry *clone() const {return getGeo()->clone();}; boost::uuids::uuid getTag() const {return getGeo()->getTag();}; std::vector> getExtensions() const {return getGeo()->getExtensions();}; @@ -146,17 +146,17 @@ public: void translate(const Base::Vector3d & vec) {return getGeo()->translate(vec);}; private: - void initExtensions(void); - void initExtensions(void) const; + void initExtensions(); + void initExtensions() const; - const Part::Geometry * getGeo(void) const {return Geo;} - Part::Geometry * getGeo(void) {return const_cast(Geo);} + const Part::Geometry * getGeo() const {return Geo;} + Part::Geometry * getGeo() {return const_cast(Geo);} - std::shared_ptr getGeoExt(void) const {return SketchGeoExtension;} - std::shared_ptr getGeoExt (void) {return std::const_pointer_cast(SketchGeoExtension);} + std::shared_ptr getGeoExt() const {return SketchGeoExtension;} + std::shared_ptr getGeoExt () {return std::const_pointer_cast(SketchGeoExtension);} - std::shared_ptr getExternalGeoExt(void) const {return ExternalGeoExtension;} - std::shared_ptr getExternalGeoExt (void) {return std::const_pointer_cast(ExternalGeoExtension);} + std::shared_ptr getExternalGeoExt() const {return ExternalGeoExtension;} + std::shared_ptr getExternalGeoExt () {return std::const_pointer_cast(ExternalGeoExtension);} private: const Part::Geometry * Geo; diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp index 8fbe92bc97..f757e45ef4 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp +++ b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp @@ -49,7 +49,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string ExternalGeometryFacadePy::representation(void) const +std::string ExternalGeometryFacadePy::representation() const { std::stringstream str; str << "getBlocked()); } @@ -496,7 +496,7 @@ PyObject* ExternalGeometryFacadePy::getExtensions(PyObject *args) } -Py::Boolean ExternalGeometryFacadePy::getConstruction(void) const +Py::Boolean ExternalGeometryFacadePy::getConstruction() const { return Py::Boolean(getExternalGeometryFacadePtr()->getConstruction()); } @@ -507,7 +507,7 @@ void ExternalGeometryFacadePy::setConstruction(Py::Boolean arg) getExternalGeometryFacadePtr()->setConstruction(arg); } -Py::Long ExternalGeometryFacadePy::getGeometryLayerId(void) const +Py::Long ExternalGeometryFacadePy::getGeometryLayerId() const { return Py::Long(this->getExternalGeometryFacadePtr()->getGeometryLayerId()); } @@ -517,13 +517,13 @@ void ExternalGeometryFacadePy::setGeometryLayerId(Py::Long Id) this->getExternalGeometryFacadePtr()->setGeometryLayerId(long(Id)); } -Py::String ExternalGeometryFacadePy::getTag(void) const +Py::String ExternalGeometryFacadePy::getTag() const { std::string tmp = boost::uuids::to_string(getExternalGeometryFacadePtr()->getTag()); return Py::String(tmp); } -Py::Object ExternalGeometryFacadePy::getGeometry(void) const +Py::Object ExternalGeometryFacadePy::getGeometry() const { // We return a clone std::unique_ptr geo(getExternalGeometryFacadePtr()->getGeometry()->clone()); diff --git a/src/Mod/Sketcher/App/GeoList.cpp b/src/Mod/Sketcher/App/GeoList.cpp index e6d21e455e..f3a97d18c5 100644 --- a/src/Mod/Sketcher/App/GeoList.cpp +++ b/src/Mod/Sketcher/App/GeoList.cpp @@ -224,7 +224,7 @@ Base::Vector3d GeoListModel::getPoint(const Part::Geometry * geo, Sketcher::P } template -void GeoListModel::rebuildVertexIndex(void) const +void GeoListModel::rebuildVertexIndex() const { VertexId2GeoElementId.clear(); GeoElementId2VertexId.clear(); diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp index 02352c9ec0..f8d174423a 100644 --- a/src/Mod/Sketcher/App/GeometryFacade.cpp +++ b/src/Mod/Sketcher/App/GeometryFacade.cpp @@ -168,7 +168,7 @@ bool GeometryFacade::getBlocked(const Part::Geometry * geometry) return gf->getBlocked(); } -PyObject * GeometryFacade::getPyObject(void) +PyObject * GeometryFacade::getPyObject() { return new GeometryFacadePy(new GeometryFacade(this->Geo)); } diff --git a/src/Mod/Sketcher/App/GeometryFacade.h b/src/Mod/Sketcher/App/GeometryFacade.h index f7a7479a42..2c4d6844a1 100644 --- a/src/Mod/Sketcher/App/GeometryFacade.h +++ b/src/Mod/Sketcher/App/GeometryFacade.h @@ -162,7 +162,7 @@ public: bool getBlocked() const { return this->testGeometryMode(GeometryMode::Blocked);} void setBlocked(bool status = true) {this->setGeometryMode(GeometryMode::Blocked, status);} - inline bool getConstruction(void) const {return this->testGeometryMode(GeometryMode::Construction);} + inline bool getConstruction() const {return this->testGeometryMode(GeometryMode::Construction);} inline void setConstruction(bool construction) {this->setGeometryMode(GeometryMode::Construction, construction);} bool isInternalAligned() const { return this->getInternalType() != InternalType::None; } @@ -186,13 +186,13 @@ public: > const GeometryT * getGeometry() const {return dynamic_cast(Geo);} - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; // Geometry Interface TopoDS_Shape toShape() const {return getGeo()->toShape();} const Handle(Geom_Geometry)& handle() const {return getGeo()->handle();} - Part::Geometry *copy(void) const {return getGeo()->copy();} - Part::Geometry *clone(void) const {return getGeo()->clone();} + Part::Geometry *copy() const {return getGeo()->copy();} + Part::Geometry *clone() const {return getGeo()->clone();} boost::uuids::uuid getTag() const {return getGeo()->getTag();} std::vector> getExtensions() const {return getGeo()->getExtensions();} @@ -215,14 +215,14 @@ public: bool isGeoType(const Base::Type &type) const { return getGeo()->getTypeId() == type;} private: - void initExtension(void); - void initExtension(void) const; + void initExtension(); + void initExtension() const; - const Part::Geometry * getGeo(void) const {return Geo;} - Part::Geometry * getGeo(void) {return const_cast(Geo);} + const Part::Geometry * getGeo() const {return Geo;} + Part::Geometry * getGeo() {return const_cast(Geo);} - std::shared_ptr getGeoExt(void) const {return SketchGeoExtension;} - std::shared_ptr getGeoExt (void) {return std::const_pointer_cast(SketchGeoExtension);} + std::shared_ptr getGeoExt() const {return SketchGeoExtension;} + std::shared_ptr getGeoExt () {return std::const_pointer_cast(SketchGeoExtension);} static void throwOnNullPtr(const Part::Geometry * geo); diff --git a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp index 7e06147854..0521e9395d 100644 --- a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp +++ b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp @@ -49,7 +49,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string GeometryFacadePy::representation(void) const +std::string GeometryFacadePy::representation() const { std::stringstream str; str << "getBlocked()); } @@ -473,7 +473,7 @@ PyObject* GeometryFacadePy::getExtensions(PyObject *args) } -Py::Boolean GeometryFacadePy::getConstruction(void) const +Py::Boolean GeometryFacadePy::getConstruction() const { return Py::Boolean(getGeometryFacadePtr()->getConstruction()); } @@ -483,7 +483,7 @@ void GeometryFacadePy::setConstruction(Py::Boolean arg) getGeometryFacadePtr()->setConstruction(arg); } -Py::Long GeometryFacadePy::getGeometryLayerId(void) const +Py::Long GeometryFacadePy::getGeometryLayerId() const { return Py::Long(this->getGeometryFacadePtr()->getGeometryLayerId()); } @@ -493,13 +493,13 @@ void GeometryFacadePy::setGeometryLayerId(Py::Long Id) this->getGeometryFacadePtr()->setGeometryLayerId(long(Id)); } -Py::String GeometryFacadePy::getTag(void) const +Py::String GeometryFacadePy::getTag() const { std::string tmp = boost::uuids::to_string(getGeometryFacadePtr()->getTag()); return Py::String(tmp); } -Py::Object GeometryFacadePy::getGeometry(void) const +Py::Object GeometryFacadePy::getGeometry() const { // We return a clone std::unique_ptr geo(getGeometryFacadePtr()->getGeometry()->clone()); diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp index 31268fd16b..0a40474f1a 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp +++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp @@ -110,7 +110,7 @@ void PropertyConstraintList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyConstraintList::getSize(void) const +int PropertyConstraintList::getSize() const { return static_cast(_lValueList.size()); } @@ -242,7 +242,7 @@ void PropertyConstraintList::applyValues(std::vector&& lValue) delete v; } -PyObject *PropertyConstraintList::getPyObject(void) +PyObject *PropertyConstraintList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -345,7 +345,7 @@ void PropertyConstraintList::Restore(Base::XMLReader &reader) setValues(std::move(values)); } -Property *PropertyConstraintList::Copy(void) const +Property *PropertyConstraintList::Copy() const { PropertyConstraintList *p = new PropertyConstraintList(); p->applyValidGeometryKeys(validGeometryKeys); @@ -360,7 +360,7 @@ void PropertyConstraintList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyConstraintList::getMemSize(void) const +unsigned int PropertyConstraintList::getMemSize() const { int size = sizeof(PropertyConstraintList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index f2daec8cf6..3211695532 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -61,9 +61,9 @@ public: virtual ~PropertyConstraintList(); virtual void setSize(int newSize) override; - virtual int getSize(void) const override; + virtual int getSize() const override; - const char* getEditorName(void) const override { + const char* getEditorName() const override { return "SketcherGui::PropertyConstraintListItem"; } @@ -102,23 +102,23 @@ public: return (invalidGeometry || invalidIndices) ? nullptr : _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return (invalidGeometry || invalidIndices) ? _emptyValueList : _lValueList; } - const std::vector &getValuesForce(void) const {//to suppress check for invalid geometry, to be used for sketch repairing. + const std::vector &getValuesForce() const {//to suppress check for invalid geometry, to be used for sketch repairing. return _lValueList; } - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual void setPyObject(PyObject *) override; virtual void Save(Base::Writer &writer) const override; virtual void Restore(Base::XMLReader &reader) override; - virtual Property *Copy(void) const override; + virtual Property *Copy() const override; virtual void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const override; + virtual unsigned int getMemSize() const override; void acceptGeometry(const std::vector &GeoList); bool checkGeometry(const std::vector &GeoList); diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index 2376e5a8fb..7404ddd63d 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -88,7 +88,7 @@ Sketch::~Sketch() clear(); } -void Sketch::clear(void) +void Sketch::clear() { // clear all internal data sets Points.clear(); @@ -425,12 +425,12 @@ bool Sketch::analyseBlockedConstraintDependentParameters(std::vector &block } -void Sketch::clearTemporaryConstraints(void) +void Sketch::clearTemporaryConstraints() { GCSsys.clearByTag(GCS::DefaultTemporaryConstraint); } -void Sketch::calculateDependentParametersElements(void) +void Sketch::calculateDependentParametersElements() { // initialize solve extensions to a know state solverExtensions.resize(Geoms.size()); @@ -1477,7 +1477,7 @@ void Sketch::updateExtension(int geoId, std::unique_ptr } -Py::Tuple Sketch::getPyGeometry(void) const +Py::Tuple Sketch::getPyGeometry() const { Py::Tuple tuple(Geoms.size()); int i=0; @@ -3577,7 +3577,7 @@ bool Sketch::updateNonDrivingConstraints() // solving ========================================================== -int Sketch::solve(void) +int Sketch::solve() { Base::TimeInfo start_time; std::string solvername; @@ -4226,7 +4226,7 @@ Base::Vector3d Sketch::getPoint(int geoId, PointPos pos) const return Base::Vector3d(); } -TopoShape Sketch::toShape(void) const +TopoShape Sketch::toShape() const { TopoShape result; std::vector::const_iterator it=Geoms.begin(); @@ -4333,7 +4333,7 @@ TopoShape Sketch::toShape(void) const // Persistence implementer ------------------------------------------------- -unsigned int Sketch::getMemSize(void) const +unsigned int Sketch::getMemSize() const { return 0; } diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index b6f33e7663..abc3b2018f 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -48,18 +48,18 @@ public: ~Sketch(); // from base class - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); /// solve the actual set up sketch - int solve(void); + int solve(); /// resets the solver int resetSolver(); /// get standard (aka fine) solver precision double getSolverPrecision(){ return GCSsys.getFinePrecision(); } /// delete all geometry and constraints, leave an empty sketch - void clear(void); + void clear(); /** set the sketch up with geoms and constraints * * returns the degree of freedom of a sketch and calculates a list of @@ -76,7 +76,7 @@ public: int setUpSketch(const std::vector &GeoList, const std::vector &ConstraintList, int extGeoCount=0); /// return the actual geometry of the sketch a TopoShape - Part::TopoShape toShape(void) const; + Part::TopoShape toShape() const; /// add unspecified geometry int addGeometry(const Part::Geometry *geo, bool fixed=false); /// add unspecified geometry @@ -96,7 +96,7 @@ public: void updateExtension(int geoId, std::unique_ptr && ext); /// get the geometry as python objects - Py::Tuple getPyGeometry(void) const; + Py::Tuple getPyGeometry() const; /// retrieves the index of a point int getPointId(int geoId, PointPos pos) const; @@ -104,17 +104,17 @@ public: Base::Vector3d getPoint(int geoId, PointPos pos) const; // Inline methods - inline bool hasConflicts(void) const { return !Conflicting.empty(); } - inline const std::vector &getConflicting(void) const { return Conflicting; } - inline bool hasRedundancies(void) const { return !Redundant.empty(); } - inline const std::vector &getRedundant(void) const { return Redundant; } - inline bool hasPartialRedundancies(void) const { return !PartiallyRedundant.empty(); } - inline const std::vector &getPartiallyRedundant(void) const { return PartiallyRedundant; } + inline bool hasConflicts() const { return !Conflicting.empty(); } + inline const std::vector &getConflicting() const { return Conflicting; } + inline bool hasRedundancies() const { return !Redundant.empty(); } + inline const std::vector &getRedundant() const { return Redundant; } + inline bool hasPartialRedundancies() const { return !PartiallyRedundant.empty(); } + inline const std::vector &getPartiallyRedundant() const { return PartiallyRedundant; } inline float getSolveTime() const { return SolveTime; } - inline bool hasMalformedConstraints(void) const { return !MalformedConstraints.empty(); } - inline const std::vector &getMalformedConstraints(void) const { return MalformedConstraints; } + inline bool hasMalformedConstraints() const { return !MalformedConstraints.empty(); } + inline const std::vector &getMalformedConstraints() const { return MalformedConstraints; } public: std::set < std::pair< int, Sketcher::PointPos>> getDependencyGroup(int geoId, PointPos pos) const; @@ -394,7 +394,7 @@ public: double calculateConstraintError(int icstr) { return GCSsys.calculateConstraintErrorByTag(icstr);} /// Returns the size of the Geometry - int getGeometrySize(void) const {return Geoms.size();} + int getGeometrySize() const {return Geoms.size();} enum GeoType { None = 0, @@ -486,7 +486,7 @@ public: GCS::Algorithm defaultSolverRedundant; inline void setDogLegGaussStep(GCS::DogLegGaussStep mode){GCSsys.dogLegGaussStep=mode;} inline void setDebugMode(GCS::DebugMode mode) {debugMode=mode;GCSsys.debugMode=mode;} - inline GCS::DebugMode getDebugMode(void) {return debugMode;} + inline GCS::DebugMode getDebugMode() {return debugMode;} inline void setMaxIter(int maxiter){GCSsys.maxIter=maxiter;} inline void setMaxIterRedundant(int maxiter){GCSsys.maxIterRedundant=maxiter;} inline void setSketchSizeMultiplier(bool mult){GCSsys.sketchSizeMultiplier=mult;} @@ -514,12 +514,12 @@ protected: private: - bool updateGeometry(void); - bool updateNonDrivingConstraints(void); + bool updateGeometry(); + bool updateNonDrivingConstraints(); - void calculateDependentParametersElements(void); + void calculateDependentParametersElements(); - void clearTemporaryConstraints(void); + void clearTemporaryConstraints(); int internalSolve(std::string & solvername, int level = 0); diff --git a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp index 1da74374a4..8c690bcb97 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.cpp +++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp @@ -881,7 +881,7 @@ int SketchAnalysis::autoconstraint(double precision, double angleprecision, bool } -std::vector SketchAnalysis::getOpenVertices(void) const +std::vector SketchAnalysis::getOpenVertices() const { std::vector points; TopoDS_Shape shape = sketch->Shape.getValue(); diff --git a/src/Mod/Sketcher/App/SketchAnalysis.h b/src/Mod/Sketcher/App/SketchAnalysis.h index ee7936623f..b9bb589483 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.h +++ b/src/Mod/Sketcher/App/SketchAnalysis.h @@ -74,7 +74,7 @@ public: /// Point on Point constraint simple routine Analyse step (see constructor) void analyseMissingPointOnPointCoincident(double angleprecision = M_PI/8); /// Point on Point constraint simple routine Get step (see constructor) - std::vector &getMissingPointOnPointConstraints(void) {return vertexConstraints;} + std::vector &getMissingPointOnPointConstraints() {return vertexConstraints;} /// Vertical/Horizontal constraints simple routine Set step (see constructor) void setMissingPointOnPointConstraints(std::vector& cl) {vertexConstraints = cl;} /// Point on Point constraint simple routine Make step (see constructor) @@ -84,7 +84,7 @@ public: /// Vertical/Horizontal constraints simple routine Detect step (see constructor) int detectMissingVerticalHorizontalConstraints(double angleprecision = M_PI/8); /// Vertical/Horizontal constraints simple routine Get step (see constructor) - std::vector &getMissingVerticalHorizontalConstraints(void) {return verthorizConstraints;} + std::vector &getMissingVerticalHorizontalConstraints() {return verthorizConstraints;} /// Vertical/Horizontal constraints simple routine Set step (see constructor) void setMissingVerticalHorizontalConstraints(std::vector& cl) {verthorizConstraints = cl;} /// Vertical/Horizontal constraints simple routine Make step (see constructor) @@ -93,9 +93,9 @@ public: /// Equality constraints simple routine Detect step (see constructor) int detectMissingEqualityConstraints(double precision); /// Equality constraints simple routine Get step for line segments (see constructor) - std::vector &getMissingLineEqualityConstraints(void) {return lineequalityConstraints;} + std::vector &getMissingLineEqualityConstraints() {return lineequalityConstraints;} /// Equality constraints simple routine Get step for radii (see constructor) - std::vector &getMissingRadiusConstraints(void) {return radiusequalityConstraints;} + std::vector &getMissingRadiusConstraints() {return radiusequalityConstraints;} /// Equality constraints simple routine Set step for line segments (see constructor) void setMissingLineEqualityConstraints(std::vector& cl) {lineequalityConstraints = cl;} /// Equality constraints simple routine Set step for radii (see constructor) @@ -124,7 +124,7 @@ public: void solvesketch(int &status, int &dofs, bool updategeo); // third type of routines - std::vector getOpenVertices(void) const; + std::vector getOpenVertices() const; protected: Sketcher::SketchObject* sketch; diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp index 9ed69b1757..eb8d422c78 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp @@ -91,7 +91,7 @@ void SketchGeometryExtension::saveAttributes(Base::Writer &writer) const << "\" geometryLayer=\"" << GeometryLayer; } -std::unique_ptr SketchGeometryExtension::copy(void) const +std::unique_ptr SketchGeometryExtension::copy() const { auto cpy = std::make_unique(); @@ -104,7 +104,7 @@ std::unique_ptr SketchGeometryExtension::copy(void) con #endif } -PyObject * SketchGeometryExtension::getPyObject(void) +PyObject * SketchGeometryExtension::getPyObject() { return new SketchGeometryExtensionPy(new SketchGeometryExtension(*this)); } diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index 9276c1d849..ba2f6a05ee 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -86,9 +86,9 @@ public: SketchGeometryExtension(long cid); virtual ~SketchGeometryExtension() override = default; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual long getId() const override {return Id;} virtual void setId(long id) override {Id = id;} diff --git a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp index 9cbdfa23a3..357ae797a2 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp @@ -35,7 +35,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string SketchGeometryExtensionPy::representation(void) const +std::string SketchGeometryExtensionPy::representation() const { std::stringstream str; str << "getSketchGeometryExtensionPtr()->getId()); } @@ -89,7 +89,7 @@ void SketchGeometryExtensionPy::setId(Py::Long Id) this->getSketchGeometryExtensionPtr()->setId(long(Id)); } -Py::String SketchGeometryExtensionPy::getInternalType(void) const +Py::String SketchGeometryExtensionPy::getInternalType() const { int internaltypeindex = (int)this->getSketchGeometryExtensionPtr()->getInternalType(); @@ -114,7 +114,7 @@ void SketchGeometryExtensionPy::setInternalType(Py::String arg) throw Py::ValueError("Argument is not a valid internal geometry type."); } -Py::Boolean SketchGeometryExtensionPy::getBlocked(void) const +Py::Boolean SketchGeometryExtensionPy::getBlocked() const { return Py::Boolean(getSketchGeometryExtensionPtr()->testGeometryMode(GeometryMode::Blocked)); } @@ -124,7 +124,7 @@ void SketchGeometryExtensionPy::setBlocked(Py::Boolean arg) getSketchGeometryExtensionPtr()->setGeometryMode(GeometryMode::Blocked, arg); } -Py::Boolean SketchGeometryExtensionPy::getConstruction(void) const +Py::Boolean SketchGeometryExtensionPy::getConstruction() const { return Py::Boolean(getSketchGeometryExtensionPtr()->testGeometryMode(GeometryMode::Construction)); } @@ -173,7 +173,7 @@ PyObject* SketchGeometryExtensionPy::setGeometryMode(PyObject *args) Py_Return; } -Py::Long SketchGeometryExtensionPy::getGeometryLayerId(void) const +Py::Long SketchGeometryExtensionPy::getGeometryLayerId() const { return Py::Long(this->getSketchGeometryExtensionPtr()->getGeometryLayerId()); } diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index b50d09fb48..6283553543 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -169,7 +169,7 @@ short SketchObject::mustExecute() const return Part2DObject::mustExecute(); } -App::DocumentObjectExecReturn *SketchObject::execute(void) +App::DocumentObjectExecReturn *SketchObject::execute() { try { App::DocumentObjectExecReturn* rtn = Part2DObject::execute();//to positionBySupport @@ -227,7 +227,7 @@ App::DocumentObjectExecReturn *SketchObject::execute(void) return App::DocumentObject::StdReturn; } -int SketchObject::hasConflicts(void) const +int SketchObject::hasConflicts() const { if (lastDoF < 0) // over-constrained sketch return -2; @@ -560,7 +560,7 @@ int SketchObject::setDatumsDriving(bool isdriving) return 0; } -int SketchObject::moveDatumsToEnd(void) +int SketchObject::moveDatumsToEnd() { Base::StateLocker lock(managedoperation, true); // no need to check input data validity as this is an sketchobject managed operation. @@ -828,7 +828,7 @@ Base::Vector3d SketchObject::getPoint(int GeoId, PointPos PosId) const return Base::Vector3d(); } -int SketchObject::getAxisCount(void) const +int SketchObject::getAxisCount() const { const std::vector< Part::Geometry * > &vals = getInternalGeometry(); @@ -6536,7 +6536,7 @@ Part::Geometry* projectLine(const BRepAdaptor_Curve& curve, const Handle(Geom_Pl } } -bool SketchObject::evaluateSupport(void) +bool SketchObject::evaluateSupport() { // returns false if the shape is broken, null or non-planar App::DocumentObject *link = Support.getValue(); @@ -6545,7 +6545,7 @@ bool SketchObject::evaluateSupport(void) return true; } -void SketchObject::validateExternalLinks(void) +void SketchObject::validateExternalLinks() { Base::StateLocker lock(managedoperation, true); // no need to check input data validity as this is an sketchobject managed operation. @@ -6609,7 +6609,7 @@ void SketchObject::validateExternalLinks(void) } } -void SketchObject::rebuildExternalGeometry(void) +void SketchObject::rebuildExternalGeometry() { // get the actual lists of the externals std::vector Objects = ExternalGeometry.getValues(); @@ -7182,14 +7182,14 @@ void SketchObject::rebuildExternalGeometry(void) rebuildVertexIndex(); } -std::vector SketchObject::getCompleteGeometry(void) const +std::vector SketchObject::getCompleteGeometry() const { std::vector vals = getInternalGeometry(); vals.insert(vals.end(), ExternalGeo.rbegin(), ExternalGeo.rend()); // in reverse order return vals; } -GeoListFacade SketchObject::getGeoListFacade(void) const +GeoListFacade SketchObject::getGeoListFacade() const { std::vector facade; facade.reserve( Geometry.getSize() + ExternalGeo.size() ); @@ -7203,7 +7203,7 @@ GeoListFacade SketchObject::getGeoListFacade(void) const return GeoListFacade::getGeoListModel(std::move(facade), Geometry.getSize()); } -void SketchObject::rebuildVertexIndex(void) +void SketchObject::rebuildVertexIndex() { VertexId2GeoId.resize(0); VertexId2PosId.resize(0); @@ -7794,7 +7794,7 @@ double SketchObject::calculateConstraintError(int ConstrId) return result; } -PyObject *SketchObject::getPyObject(void) +PyObject *SketchObject::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -7803,7 +7803,7 @@ PyObject *SketchObject::getPyObject(void) return Py::new_reference_to(PythonObject); } -unsigned int SketchObject::getMemSize(void) const +unsigned int SketchObject::getMemSize() const { return 0; } @@ -8039,7 +8039,7 @@ void SketchObject::restoreFinished() } } -void SketchObject::migrateSketch(void) +void SketchObject::migrateSketch() { bool noextensions = false; @@ -8366,22 +8366,22 @@ int SketchObject::detectMissingEqualityConstraints(double precision) return analyser->detectMissingEqualityConstraints(precision); } -std::vector & SketchObject::getMissingPointOnPointConstraints(void) +std::vector & SketchObject::getMissingPointOnPointConstraints() { return analyser->getMissingPointOnPointConstraints(); } -std::vector & SketchObject::getMissingVerticalHorizontalConstraints(void) +std::vector & SketchObject::getMissingVerticalHorizontalConstraints() { return analyser->getMissingVerticalHorizontalConstraints(); } -std::vector & SketchObject::getMissingLineEqualityConstraints(void) +std::vector & SketchObject::getMissingLineEqualityConstraints() { return analyser->getMissingLineEqualityConstraints(); } -std::vector & SketchObject::getMissingRadiusConstraints(void) +std::vector & SketchObject::getMissingRadiusConstraints() { return analyser->getMissingRadiusConstraints(); } @@ -8464,7 +8464,7 @@ int SketchObject::renameConstraint(int GeoId, std::string name) return -1; } -std::vector SketchObject::getOpenVertices(void) const +std::vector SketchObject::getOpenVertices() const { std::vector points; @@ -8529,10 +8529,10 @@ int SketchObject::getGeometryId(int GeoId, long &id) const namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Sketcher::SketchObjectPython, Sketcher::SketchObject) -template<> const char* Sketcher::SketchObjectPython::getViewProviderName(void) const { +template<> const char* Sketcher::SketchObjectPython::getViewProviderName() const { return "SketcherGui::ViewProviderPython"; } -template<> PyObject* Sketcher::SketchObjectPython::getPyObject(void) { +template<> PyObject* Sketcher::SketchObjectPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index e7ab10c28d..a436653f36 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -76,10 +76,10 @@ public: //@{ short mustExecute() const override; /// recalculate the Feature (if no recompute is needed see also solve() and solverNeedsUpdate boolean) - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "SketcherGui::ViewProviderSketch"; } //@} @@ -185,18 +185,18 @@ public: std::unique_ptr getGeometryFacade(int GeoId) const; /// returns a list of all internal geometries - const std::vector &getInternalGeometry(void) const { return Geometry.getValues(); } + const std::vector &getInternalGeometry() const { return Geometry.getValues(); } /// returns a list of projected external geometries - const std::vector &getExternalGeometry(void) const { return ExternalGeo; } + const std::vector &getExternalGeometry() const { return ExternalGeo; } /// rebuilds external geometry (projection onto the sketch plane) - void rebuildExternalGeometry(void); + void rebuildExternalGeometry(); /// returns the number of external Geometry entities - int getExternalGeometryCount(void) const { return ExternalGeo.size(); } + int getExternalGeometryCount() const { return ExternalGeo.size(); } /// retrieves a vector containing both normal and external Geometry (including the sketch axes) - std::vector getCompleteGeometry(void) const; + std::vector getCompleteGeometry() const; - GeoListFacade getGeoListFacade(void) const; + GeoListFacade getGeoListFacade() const; /// converts a GeoId index into an index of the CompleteGeometry vector int getCompleteGeometryIndex(int GeoId) const; @@ -204,7 +204,7 @@ public: int getGeoIdFromCompleteGeometryIndex(int completeGeometryIndex) const; /// returns non zero if the sketch contains conflicting constraints - int hasConflicts(void) const; + int hasConflicts() const; /** * sets the geometry of sketchObject as the solvedsketch geometry * returns the DoF of such a geometry. @@ -241,7 +241,7 @@ public: /// Make all dimensionals Driving/non-Driving int setDatumsDriving(bool isdriving); /// Move Dimensional constraints at the end of the properties array - int moveDatumsToEnd(void); + int moveDatumsToEnd(); /// set the driving status of this constraint and solve int setVirtualSpace(int ConstrId, bool isinvirtualspace); @@ -354,9 +354,9 @@ public: /// retrieves for a Vertex number the corresponding GeoId and PosId void getGeoVertexIndex(int VertexId, int &GeoId, PointPos &PosId) const; - int getHighestVertexIndex(void) const { return VertexId2GeoId.size() - 1; } // Most recently created - int getHighestCurveIndex(void) const { return Geometry.getSize() - 1; } - void rebuildVertexIndex(void); + int getHighestVertexIndex() const { return VertexId2GeoId.size() - 1; } // Most recently created + int getHighestCurveIndex() const { return Geometry.getSize() - 1; } + void rebuildVertexIndex(); /// retrieves for a GeoId and PosId the Vertex number int getVertexIndexGeoPos(int GeoId, PointPos PosId) const; @@ -397,13 +397,13 @@ public: int port_reversedExternalArcs(bool justAnalyze); // from base class - virtual PyObject *getPyObject(void) override; - virtual unsigned int getMemSize(void) const override; + virtual PyObject *getPyObject() override; + virtual unsigned int getMemSize() const override; virtual void Save(Base::Writer &/*writer*/) const override; virtual void Restore(Base::XMLReader &/*reader*/) override; /// returns the number of construction lines (to be used as axes) - virtual int getAxisCount(void) const override; + virtual int getAxisCount() const override; /// retrieves an axis iterating through the construction lines of the sketch (indices start at 0) virtual Base::Axis getAxis(int axId) const override; /// verify and accept the assigned geometry @@ -415,9 +415,9 @@ public: /// Remove constraints with invalid indexes void validateConstraints(); /// Checks if support is valid - bool evaluateSupport(void); + bool evaluateSupport(); /// validate External Links (remove invalid external links) - void validateExternalLinks(void); + void validateExternalLinks(); /// gets DoF of last solver execution inline int getLastDoF() const {return lastDoF;} @@ -434,17 +434,17 @@ public: /// gets solver SolveTime of last solver execution inline float getLastSolveTime() const {return lastSolveTime;} /// gets the conflicting constraints of the last solver execution - inline const std::vector &getLastConflicting(void) const { return lastConflicting; } + inline const std::vector &getLastConflicting() const { return lastConflicting; } /// gets the redundant constraints of last solver execution - inline const std::vector &getLastRedundant(void) const { return lastRedundant; } + inline const std::vector &getLastRedundant() const { return lastRedundant; } /// gets the redundant constraints of last solver execution - inline const std::vector &getLastPartiallyRedundant(void) const { return lastPartiallyRedundant; } + inline const std::vector &getLastPartiallyRedundant() const { return lastPartiallyRedundant; } /// gets the redundant constraints of last solver execution - inline const std::vector &getLastMalformedConstraints(void) const { return lastMalformedConstraints; } + inline const std::vector &getLastMalformedConstraints() const { return lastMalformedConstraints; } public: /* Solver exposed interface */ /// gets the solved sketch as a reference - inline const Sketch &getSolvedSketch(void) const {return solvedSketch;} + inline const Sketch &getSolvedSketch() const {return solvedSketch;} /// enables/disables solver initial solution recalculation when moving point mode (useful for dragging) inline void setRecalculateInitialSolutionWhileMovingPoint(bool recalculateInitialSolutionWhileMovingPoint) {solvedSketch.setRecalculateInitialSolutionWhileMovingPoint(recalculateInitialSolutionWhileMovingPoint);} @@ -517,10 +517,10 @@ public: int detectMissingVerticalHorizontalConstraints(double angleprecision = M_PI/8); int detectMissingEqualityConstraints(double precision); - std::vector &getMissingPointOnPointConstraints(void); - std::vector &getMissingVerticalHorizontalConstraints(void); - std::vector &getMissingLineEqualityConstraints(void); - std::vector &getMissingRadiusConstraints(void); + std::vector &getMissingPointOnPointConstraints(); + std::vector &getMissingVerticalHorizontalConstraints(); + std::vector &getMissingLineEqualityConstraints(); + std::vector &getMissingRadiusConstraints(); void setMissingRadiusConstraints(std::vector &cl); void setMissingLineEqualityConstraints(std::vector& cl); @@ -538,7 +538,7 @@ public: int renameConstraint(int GeoId, std::string name); // Validation routines - std::vector getOpenVertices(void) const; + std::vector getOpenVertices() const; public: // geometry extension functionalities for single element sketch object user convenience int setGeometryId(int GeoId, long id); @@ -584,7 +584,7 @@ protected: virtual void onUndoRedoFinished() override; // migration functions - void migrateSketch(void); + void migrateSketch(); static void appendConstraintsMsg(const std::vector &vector, const std::string & singularmsg, diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp index df194bb171..aa841dde63 100644 --- a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp @@ -51,7 +51,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string SketchObjectPy::representation(void) const +std::string SketchObjectPy::representation() const { return ""; } @@ -1682,7 +1682,7 @@ PyObject* SketchObjectPy::autoRemoveRedundants(PyObject *args) Py_Return; } -Py::List SketchObjectPy::getMissingPointOnPointConstraints(void) const +Py::List SketchObjectPy::getMissingPointOnPointConstraints() const { std::vector constraints = this->getSketchObjectPtr()->getMissingPointOnPointConstraints(); @@ -1723,7 +1723,7 @@ void SketchObjectPy::setMissingPointOnPointConstraints(Py::List arg) this->getSketchObjectPtr()->setMissingPointOnPointConstraints(constraints); } -Py::List SketchObjectPy::getMissingVerticalHorizontalConstraints(void) const +Py::List SketchObjectPy::getMissingVerticalHorizontalConstraints() const { std::vector constraints = this->getSketchObjectPtr()->getMissingVerticalHorizontalConstraints(); @@ -1764,7 +1764,7 @@ void SketchObjectPy::setMissingVerticalHorizontalConstraints(Py::List arg) this->getSketchObjectPtr()->setMissingVerticalHorizontalConstraints(constraints); } -Py::List SketchObjectPy::getMissingLineEqualityConstraints(void) const +Py::List SketchObjectPy::getMissingLineEqualityConstraints() const { std::vector constraints = this->getSketchObjectPtr()->getMissingLineEqualityConstraints(); @@ -1804,7 +1804,7 @@ void SketchObjectPy::setMissingLineEqualityConstraints(Py::List arg) this->getSketchObjectPtr()->setMissingLineEqualityConstraints(constraints); } -Py::List SketchObjectPy::getMissingRadiusConstraints(void) const +Py::List SketchObjectPy::getMissingRadiusConstraints() const { std::vector constraints = this->getSketchObjectPtr()->getMissingRadiusConstraints(); @@ -1863,7 +1863,7 @@ PyObject* SketchObjectPy::getGeometryWithDependentParameters(PyObject *args) return Py::new_reference_to(list); } -Py::List SketchObjectPy::getOpenVertices(void) const +Py::List SketchObjectPy::getOpenVertices() const { std::vector points = this->getSketchObjectPtr()->getOpenVertices(); @@ -1878,23 +1878,23 @@ Py::List SketchObjectPy::getOpenVertices(void) const return list; } -Py::Long SketchObjectPy::getConstraintCount(void) const +Py::Long SketchObjectPy::getConstraintCount() const { return Py::Long(this->getSketchObjectPtr()->Constraints.getSize()); } -Py::Long SketchObjectPy::getGeometryCount(void) const +Py::Long SketchObjectPy::getGeometryCount() const { return Py::Long(this->getSketchObjectPtr()->Geometry.getSize()); } -Py::Long SketchObjectPy::getAxisCount(void) const +Py::Long SketchObjectPy::getAxisCount() const { return Py::Long(this->getSketchObjectPtr()->getAxisCount()); } -Py::List SketchObjectPy::getGeometryFacadeList(void) const +Py::List SketchObjectPy::getGeometryFacadeList() const { Py::List list; diff --git a/src/Mod/Sketcher/App/SketchObjectSF.cpp b/src/Mod/Sketcher/App/SketchObjectSF.cpp index 62cda0f236..5356c1334b 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSF.cpp @@ -50,7 +50,7 @@ short SketchObjectSF::mustExecute() const return 0; } -App::DocumentObjectExecReturn *SketchObjectSF::execute(void) +App::DocumentObjectExecReturn *SketchObjectSF::execute() { Base::Console().Warning("%s: This feature is deprecated and won't be longer supported in future FreeCAD versions\n",this->getNameInDocument()); // do nothing diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index f2eb6b4b92..887311dc99 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -48,7 +48,7 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// Uses the standard ViewProvider //const char* getViewProviderName(void) const { diff --git a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp index 0e29918fe9..18a0d89b6c 100644 --- a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp @@ -31,7 +31,7 @@ using namespace Sketcher; // returns a string which represents the object e.g. when printed in python -std::string SketchObjectSFPy::representation(void) const +std::string SketchObjectSFPy::representation() const { return ""; } diff --git a/src/Mod/Sketcher/App/SketchPyImp.cpp b/src/Mod/Sketcher/App/SketchPyImp.cpp index 52f5455490..a00ea2669b 100644 --- a/src/Mod/Sketcher/App/SketchPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchPyImp.cpp @@ -41,7 +41,7 @@ using namespace Sketcher; using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string SketchPy::representation(void) const +std::string SketchPy::representation() const { return std::string(""); } @@ -165,13 +165,13 @@ PyObject* SketchPy::movePoint(PyObject *args) // +++ attributes implementer ++++++++++++++++++++++++++++++++++++++++++++++++ -Py::Long SketchPy::getConstraint(void) const +Py::Long SketchPy::getConstraint() const { //return Py::Int(); throw Py::AttributeError("Not yet implemented"); } -Py::Tuple SketchPy::getConflicts(void) const +Py::Tuple SketchPy::getConflicts() const { std::vector c = getSketchPtr()->getConflicting(); Py::Tuple t(c.size()); @@ -182,7 +182,7 @@ Py::Tuple SketchPy::getConflicts(void) const return t; } -Py::Tuple SketchPy::getRedundancies(void) const +Py::Tuple SketchPy::getRedundancies() const { std::vector c = getSketchPtr()->getRedundant(); Py::Tuple t(c.size()); @@ -193,12 +193,12 @@ Py::Tuple SketchPy::getRedundancies(void) const return t; } -Py::Tuple SketchPy::getGeometries(void) const +Py::Tuple SketchPy::getGeometries() const { return getSketchPtr()->getPyGeometry(); } -Py::Object SketchPy::getShape(void) const +Py::Object SketchPy::getShape() const { return Py::asObject(new TopoShapePy(new TopoShape(getSketchPtr()->toShape()))); } diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp index 83c90b737b..8d79c6ccea 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp @@ -51,7 +51,7 @@ void SolverGeometryExtension::copyAttributes(Part::GeometryExtension * cpy) cons static_cast(cpy)->Mid = this->Mid; } -std::unique_ptr SolverGeometryExtension::copy(void) const +std::unique_ptr SolverGeometryExtension::copy() const { auto cpy = std::make_unique(); @@ -64,7 +64,7 @@ std::unique_ptr SolverGeometryExtension::copy(void) con #endif } -PyObject * SolverGeometryExtension::getPyObject(void) +PyObject * SolverGeometryExtension::getPyObject() { THROWM(Base::NotImplementedError, "SolverGeometryExtension does not have a Python counterpart"); } diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.h b/src/Mod/Sketcher/App/SolverGeometryExtension.h index d893616294..d0daf18ed1 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.h +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h @@ -236,9 +236,9 @@ public: SolverGeometryExtension(); virtual ~SolverGeometryExtension() override = default; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual void notifyAttachment(Part::Geometry * geo) override; diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index d7d6104f1f..79ef7de576 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -43,13 +43,13 @@ // create the commands -void CreateSketcherCommands(void); -void CreateSketcherCommandsCreateGeo(void); -void CreateSketcherCommandsConstraints(void); -void CreateSketcherCommandsConstraintAccel(void); -void CreateSketcherCommandsAlterGeo(void); -void CreateSketcherCommandsBSpline(void); -void CreateSketcherCommandsVirtualSpace(void); +void CreateSketcherCommands(); +void CreateSketcherCommandsCreateGeo(); +void CreateSketcherCommandsConstraints(); +void CreateSketcherCommandsConstraintAccel(); +void CreateSketcherCommandsAlterGeo(); +void CreateSketcherCommandsBSpline(); +void CreateSketcherCommandsVirtualSpace(); void loadSketcherResource() { diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 0fed19135b..5ef5dee300 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -250,7 +250,7 @@ void CmdSketcherNewSketch::activated(int iMsg) } -bool CmdSketcherNewSketch::isActive(void) +bool CmdSketcherNewSketch::isActive() { if (getActiveGuiDocument()) return true; @@ -283,7 +283,7 @@ void CmdSketcherEditSketch::activated(int iMsg) } } -bool CmdSketcherEditSketch::isActive(void) +bool CmdSketcherEditSketch::isActive() { return Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) == 1; } @@ -320,7 +320,7 @@ void CmdSketcherLeaveSketch::activated(int iMsg) doCommand(Doc,"App.ActiveDocument.recompute()"); } -bool CmdSketcherLeaveSketch::isActive(void) +bool CmdSketcherLeaveSketch::isActive() { Gui::Document *doc = getActiveGuiDocument(); if (doc) { @@ -362,7 +362,7 @@ void CmdSketcherStopOperation::activated(int iMsg) } } -bool CmdSketcherStopOperation::isActive(void) +bool CmdSketcherStopOperation::isActive() { Gui::Document *doc = getActiveGuiDocument(); if (doc) { @@ -495,7 +495,7 @@ void CmdSketcherReorientSketch::activated(int iMsg) doCommand(Gui,"Gui.ActiveDocument.setEdit('%s')", sketch->getNameInDocument()); } -bool CmdSketcherReorientSketch::isActive(void) +bool CmdSketcherReorientSketch::isActive() { return Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) == 1; } @@ -664,7 +664,7 @@ void CmdSketcherMapSketch::activated(int iMsg) } } -bool CmdSketcherMapSketch::isActive(void) +bool CmdSketcherMapSketch::isActive() { App::Document* doc = App::GetApplication().getActiveDocument(); Base::Type sketch_type = Base::Type::fromName("Sketcher::SketchObject"); @@ -703,7 +703,7 @@ void CmdSketcherViewSketch::activated(int iMsg) } } -bool CmdSketcherViewSketch::isActive(void) +bool CmdSketcherViewSketch::isActive() { Gui::Document *doc = getActiveGuiDocument(); if (doc) { @@ -746,7 +746,7 @@ void CmdSketcherValidateSketch::activated(int iMsg) Gui::Control().showDialog(new TaskSketcherValidation(Obj)); } -bool CmdSketcherValidateSketch::isActive(void) +bool CmdSketcherValidateSketch::isActive() { if (Gui::Control().activeDialog()) return false; @@ -855,7 +855,7 @@ void CmdSketcherMirrorSketch::activated(int iMsg) doCommand(Gui,"App.activeDocument().recompute()"); } -bool CmdSketcherMirrorSketch::isActive(void) +bool CmdSketcherMirrorSketch::isActive() { return Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) > 0; } @@ -936,7 +936,7 @@ void CmdSketcherMergeSketches::activated(int iMsg) doCommand(Doc, "App.activeDocument().recompute()"); } -bool CmdSketcherMergeSketches::isActive(void) +bool CmdSketcherMergeSketches::isActive() { return Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) > 1; } @@ -967,7 +967,7 @@ void CmdSketcherViewSection::activated(int iMsg) doCommand(Doc,"ActiveSketch.ViewObject.TempoVis.sketchClipPlane(ActiveSketch)"); } -bool CmdSketcherViewSection::isActive(void) +bool CmdSketcherViewSection::isActive() { Gui::Document *doc = getActiveGuiDocument(); if (doc) { @@ -979,7 +979,7 @@ bool CmdSketcherViewSection::isActive(void) return false; } -void CreateSketcherCommands(void) +void CreateSketcherCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index 456cd72784..8d1bd371ac 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -192,14 +192,14 @@ void CmdSketcherToggleConstruction::activated(int iMsg) } } -bool CmdSketcherToggleConstruction::isActive(void) +bool CmdSketcherToggleConstruction::isActive() { return isAlterGeoActive( getActiveGuiDocument() ); } } -void CreateSketcherCommandsAlterGeo(void) +void CreateSketcherCommandsAlterGeo() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 239e42f240..5678895384 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -503,7 +503,7 @@ struct SketchSelection{ Circle, Arc }; - int setUp(void); + int setUp(); struct SketchSelectionItem { GeoType type; int GeoId; @@ -513,7 +513,7 @@ struct SketchSelection{ QString ErrorMsg; }; -int SketchSelection::setUp(void) +int SketchSelection::setUp() { std::vector selection = Gui::Selection().getSelectionEx(); @@ -668,7 +668,7 @@ protected: virtual void applyConstraint(std::vector &, int) {} virtual void activated(int /*iMsg*/); - virtual bool isActive(void) + virtual bool isActive() { return isCommandActive(getActiveGuiDocument()); } }; @@ -5618,7 +5618,7 @@ void CmdSketcherCompConstrainRadDia::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompConstrainRadDia::createAction(void) +Gui::Action * CmdSketcherCompConstrainRadDia::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -5701,7 +5701,7 @@ void CmdSketcherCompConstrainRadDia::languageChange() arc3->setStatusTip(QApplication::translate("Sketcher_ConstrainRadiam", "Fix the radius/diameter of a circle or an arc")); } -bool CmdSketcherCompConstrainRadDia::isActive(void) +bool CmdSketcherCompConstrainRadDia::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -6920,7 +6920,7 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg) } } -bool CmdSketcherConstrainSnellsLaw::isActive(void) +bool CmdSketcherConstrainSnellsLaw::isActive() { return isCreateConstraintActive( getActiveGuiDocument() ); } @@ -7382,7 +7382,7 @@ void CmdSketcherConstrainInternalAlignment::activated(int iMsg) } } -bool CmdSketcherConstrainInternalAlignment::isActive(void) +bool CmdSketcherConstrainInternalAlignment::isActive() { return isCreateConstraintActive(getActiveGuiDocument()); } @@ -7511,7 +7511,7 @@ void CmdSketcherToggleDrivingConstraint::activated(int iMsg) } } -bool CmdSketcherToggleDrivingConstraint::isActive(void) +bool CmdSketcherToggleDrivingConstraint::isActive() { return isCommandActive( getActiveGuiDocument() ); } @@ -7595,13 +7595,13 @@ void CmdSketcherToggleActiveConstraint::activated(int iMsg) } } -bool CmdSketcherToggleActiveConstraint::isActive(void) +bool CmdSketcherToggleActiveConstraint::isActive() { return isCreateConstraintActive( getActiveGuiDocument() ); } -void CreateSketcherCommandsConstraints(void) +void CreateSketcherCommandsConstraints() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index d3276f60ab..71978a4d28 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -138,7 +138,7 @@ void CmdSketcherCreateLine::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerLine() ); } -bool CmdSketcherCreateLine::isActive(void) +bool CmdSketcherCreateLine::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -170,7 +170,7 @@ void CmdSketcherCreateRectangle::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBox(DrawSketchHandlerBox::Diagonal) ); } -bool CmdSketcherCreateRectangle::isActive(void) +bool CmdSketcherCreateRectangle::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -199,7 +199,7 @@ void CmdSketcherCreateRectangleCenter::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBox(DrawSketchHandlerBox::CenterAndCorner) ); } -bool CmdSketcherCreateRectangleCenter::isActive(void) +bool CmdSketcherCreateRectangleCenter::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -231,7 +231,7 @@ void CmdSketcherCreateOblong::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerOblong()); } -bool CmdSketcherCreateOblong::isActive(void) +bool CmdSketcherCreateOblong::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -272,7 +272,7 @@ void CmdSketcherCompCreateRectangles::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action* CmdSketcherCompCreateRectangles::createAction(void) +Gui::Action* CmdSketcherCompCreateRectangles::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -342,7 +342,7 @@ void CmdSketcherCompCreateRectangles::languageChange() rectangle3->setStatusTip(rectangle3->toolTip()); } -bool CmdSketcherCompCreateRectangles::isActive(void) +bool CmdSketcherCompCreateRectangles::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -373,7 +373,7 @@ void CmdSketcherCreatePolyline::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerLineSet() ); } -bool CmdSketcherCreatePolyline::isActive(void) +bool CmdSketcherCreatePolyline::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -405,7 +405,7 @@ void CmdSketcherCreateArc::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArc() ); } -bool CmdSketcherCreateArc::isActive(void) +bool CmdSketcherCreateArc::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -437,7 +437,7 @@ void CmdSketcherCreate3PointArc::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandler3PointArc() ); } -bool CmdSketcherCreate3PointArc::isActive(void) +bool CmdSketcherCreate3PointArc::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -475,7 +475,7 @@ void CmdSketcherCompCreateArc::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateArc::createAction(void) +Gui::Action * CmdSketcherCompCreateArc::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -537,7 +537,7 @@ void CmdSketcherCompCreateArc::languageChange() arc2->setStatusTip(QApplication::translate("Sketcher_Create3PointArc","Create an arc by its end points and a point along the arc")); } -bool CmdSketcherCompCreateArc::isActive(void) +bool CmdSketcherCompCreateArc::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -570,7 +570,7 @@ void CmdSketcherCreateCircle::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerCircle() ); } -bool CmdSketcherCreateCircle::isActive(void) +bool CmdSketcherCreateCircle::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -604,7 +604,7 @@ void CmdSketcherCreateEllipseByCenter::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerEllipse(0) ); } -bool CmdSketcherCreateEllipseByCenter::isActive(void) +bool CmdSketcherCreateEllipseByCenter::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -637,7 +637,7 @@ void CmdSketcherCreateEllipseBy3Points::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerEllipse(1) ); } -bool CmdSketcherCreateEllipseBy3Points::isActive(void) +bool CmdSketcherCreateEllipseBy3Points::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -666,7 +666,7 @@ void CmdSketcherCreateArcOfEllipse::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArcOfEllipse() ); } -bool CmdSketcherCreateArcOfEllipse::isActive(void) +bool CmdSketcherCreateArcOfEllipse::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -694,7 +694,7 @@ void CmdSketcherCreateArcOfHyperbola::activated(int /*iMsg*/) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArcOfHyperbola() ); } -bool CmdSketcherCreateArcOfHyperbola::isActive(void) +bool CmdSketcherCreateArcOfHyperbola::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -722,7 +722,7 @@ void CmdSketcherCreateArcOfParabola::activated(int /*iMsg*/) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArcOfParabola() ); } -bool CmdSketcherCreateArcOfParabola::isActive(void) +bool CmdSketcherCreateArcOfParabola::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -777,7 +777,7 @@ void CmdSketcherCompCreateConic::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateConic::createAction(void) +Gui::Action * CmdSketcherCompCreateConic::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -867,7 +867,7 @@ void CmdSketcherCompCreateConic::languageChange() arcofparabola->setStatusTip(QApplication::translate("Sketcher_CreateArcOfParabola","Create an arc of parabola by its focus, vertex, and endpoints")); } -bool CmdSketcherCompCreateConic::isActive(void) +bool CmdSketcherCompCreateConic::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -898,7 +898,7 @@ void CmdSketcherCreateBSpline::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBSpline(0) ); } -bool CmdSketcherCreateBSpline::isActive(void) +bool CmdSketcherCreateBSpline::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -931,7 +931,7 @@ void CmdSketcherCreatePeriodicBSpline::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBSpline(1) ); } -bool CmdSketcherCreatePeriodicBSpline::isActive(void) +bool CmdSketcherCreatePeriodicBSpline::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -978,7 +978,7 @@ void CmdSketcherCompCreateBSpline::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateBSpline::createAction(void) +Gui::Action * CmdSketcherCompCreateBSpline::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1042,7 +1042,7 @@ void CmdSketcherCompCreateBSpline::languageChange() periodicbspline->setStatusTip(QApplication::translate("Sketcher_Create_Periodic_BSpline","Create a periodic B-spline by control points")); } -bool CmdSketcherCompCreateBSpline::isActive(void) +bool CmdSketcherCompCreateBSpline::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1074,7 +1074,7 @@ void CmdSketcherCreate3PointCircle::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandler3PointCircle() ); } -bool CmdSketcherCreate3PointCircle::isActive(void) +bool CmdSketcherCreate3PointCircle::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1112,7 +1112,7 @@ void CmdSketcherCompCreateCircle::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateCircle::createAction(void) +Gui::Action * CmdSketcherCompCreateCircle::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1174,7 +1174,7 @@ void CmdSketcherCompCreateCircle::languageChange() arc2->setStatusTip(QApplication::translate("Sketcher_Create3PointCircle", "Create a circle by 3 rim points")); } -bool CmdSketcherCompCreateCircle::isActive(void) +bool CmdSketcherCompCreateCircle::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1205,7 +1205,7 @@ void CmdSketcherCreatePoint::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerPoint()); } -bool CmdSketcherCreatePoint::isActive(void) +bool CmdSketcherCreatePoint::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1234,7 +1234,7 @@ void CmdSketcherCreateFillet::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerFillet(DrawSketchHandlerFillet::SimpleFillet)); } -bool CmdSketcherCreateFillet::isActive(void) +bool CmdSketcherCreateFillet::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1263,7 +1263,7 @@ void CmdSketcherCreatePointFillet::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerFillet(DrawSketchHandlerFillet::ConstraintPreservingFillet)); } -bool CmdSketcherCreatePointFillet::isActive(void) +bool CmdSketcherCreatePointFillet::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1309,7 +1309,7 @@ void CmdSketcherCompCreateFillets::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateFillets::createAction(void) +Gui::Action * CmdSketcherCompCreateFillets::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1364,7 +1364,7 @@ void CmdSketcherCompCreateFillets::languageChange() pointFillet->setStatusTip(QApplication::translate("Sketcher_CreatePointFillet","Fillet that preserves constraints and intersection point")); } -bool CmdSketcherCompCreateFillets::isActive(void) +bool CmdSketcherCompCreateFillets::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1393,7 +1393,7 @@ void CmdSketcherTrimming::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerTrimming()); } -bool CmdSketcherTrimming::isActive(void) +bool CmdSketcherTrimming::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1424,7 +1424,7 @@ void CmdSketcherExtend::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerExtend()); } -bool CmdSketcherExtend::isActive(void) +bool CmdSketcherExtend::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1455,7 +1455,7 @@ void CmdSketcherSplit::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerSplitting()); } -bool CmdSketcherSplit::isActive(void) +bool CmdSketcherSplit::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1482,7 +1482,7 @@ void CmdSketcherExternal::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerExternal()); } -bool CmdSketcherExternal::isActive(void) +bool CmdSketcherExternal::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1513,7 +1513,7 @@ void CmdSketcherCarbonCopy::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerCarbonCopy()); } -bool CmdSketcherCarbonCopy::isActive(void) +bool CmdSketcherCarbonCopy::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1547,7 +1547,7 @@ void CmdSketcherCreateSlot::activated(int iMsg) ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerSlot()); } -bool CmdSketcherCreateSlot::isActive(void) +bool CmdSketcherCreateSlot::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1578,7 +1578,7 @@ void CmdSketcherCreateTriangle::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(3) ); } -bool CmdSketcherCreateTriangle::isActive(void) +bool CmdSketcherCreateTriangle::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1607,7 +1607,7 @@ void CmdSketcherCreateSquare::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(4) ); } -bool CmdSketcherCreateSquare::isActive(void) +bool CmdSketcherCreateSquare::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1636,7 +1636,7 @@ void CmdSketcherCreatePentagon::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(5) ); } -bool CmdSketcherCreatePentagon::isActive(void) +bool CmdSketcherCreatePentagon::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1666,7 +1666,7 @@ void CmdSketcherCreateHexagon::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(6) ); } -bool CmdSketcherCreateHexagon::isActive(void) +bool CmdSketcherCreateHexagon::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1695,7 +1695,7 @@ void CmdSketcherCreateHeptagon::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(7) ); } -bool CmdSketcherCreateHeptagon::isActive(void) +bool CmdSketcherCreateHeptagon::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1724,7 +1724,7 @@ void CmdSketcherCreateOctagon::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(8) ); } -bool CmdSketcherCreateOctagon::isActive(void) +bool CmdSketcherCreateOctagon::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1757,7 +1757,7 @@ void CmdSketcherCreateRegularPolygon::activated(int iMsg) ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerRegularPolygon(srpd.sides)); } -bool CmdSketcherCreateRegularPolygon::isActive(void) +bool CmdSketcherCreateRegularPolygon::isActive() { return isCommandActive(getActiveGuiDocument()); } @@ -1813,7 +1813,7 @@ void CmdSketcherCompCreateRegularPolygon::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompCreateRegularPolygon::createAction(void) +Gui::Action * CmdSketcherCompCreateRegularPolygon::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1915,12 +1915,12 @@ void CmdSketcherCompCreateRegularPolygon::languageChange() regular->setStatusTip(QApplication::translate("Sketcher_CreateOctagon","Create a regular polygon by its center and by one corner")); } -bool CmdSketcherCompCreateRegularPolygon::isActive(void) +bool CmdSketcherCompCreateRegularPolygon::isActive() { return isCommandActive(getActiveGuiDocument()); } -void CreateSketcherCommandsCreateGeo(void) +void CreateSketcherCommandsCreateGeo() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 1d6ca9aa40..78be136dd1 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -158,7 +158,7 @@ void CmdSketcherBSplineDegree::activated(int iMsg) ShowRestoreInformationLayer("BSplineDegreeVisible"); } -bool CmdSketcherBSplineDegree::isActive(void) +bool CmdSketcherBSplineDegree::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -187,7 +187,7 @@ void CmdSketcherBSplinePolygon::activated(int iMsg) ShowRestoreInformationLayer("BSplineControlPolygonVisible"); } -bool CmdSketcherBSplinePolygon::isActive(void) +bool CmdSketcherBSplinePolygon::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -216,7 +216,7 @@ void CmdSketcherBSplineComb::activated(int iMsg) ShowRestoreInformationLayer("BSplineCombVisible"); } -bool CmdSketcherBSplineComb::isActive(void) +bool CmdSketcherBSplineComb::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -245,7 +245,7 @@ void CmdSketcherBSplineKnotMultiplicity::activated(int iMsg) ShowRestoreInformationLayer("BSplineKnotMultiplicityVisible"); } -bool CmdSketcherBSplineKnotMultiplicity::isActive(void) +bool CmdSketcherBSplineKnotMultiplicity::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -274,7 +274,7 @@ void CmdSketcherBSplinePoleWeight::activated(int iMsg) ShowRestoreInformationLayer("BSplinePoleWeightVisible"); } -bool CmdSketcherBSplinePoleWeight::isActive(void) +bool CmdSketcherBSplinePoleWeight::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -325,7 +325,7 @@ void CmdSketcherCompBSplineShowHideGeometryInformation::activated(int iMsg) pcAction->setToolTip(a[iMsg]->toolTip()); } -Gui::Action * CmdSketcherCompBSplineShowHideGeometryInformation::createAction(void) +Gui::Action * CmdSketcherCompBSplineShowHideGeometryInformation::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -403,7 +403,7 @@ void CmdSketcherCompBSplineShowHideGeometryInformation::updateAction(int /*mode* { } -bool CmdSketcherCompBSplineShowHideGeometryInformation::isActive(void) +bool CmdSketcherCompBSplineShowHideGeometryInformation::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -477,7 +477,7 @@ void CmdSketcherConvertToNURBS::activated(int iMsg) tryAutoRecomputeIfNotSolve(Obj); } -bool CmdSketcherConvertToNURBS::isActive(void) +bool CmdSketcherConvertToNURBS::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } @@ -549,7 +549,7 @@ void CmdSketcherIncreaseDegree::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherIncreaseDegree::isActive(void) +bool CmdSketcherIncreaseDegree::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } @@ -627,7 +627,7 @@ void CmdSketcherDecreaseDegree::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherDecreaseDegree::isActive(void) +bool CmdSketcherDecreaseDegree::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } @@ -766,7 +766,7 @@ void CmdSketcherIncreaseKnotMultiplicity::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherIncreaseKnotMultiplicity::isActive(void) +bool CmdSketcherIncreaseKnotMultiplicity::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } @@ -889,7 +889,7 @@ void CmdSketcherDecreaseKnotMultiplicity::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherDecreaseKnotMultiplicity::isActive(void) +bool CmdSketcherDecreaseKnotMultiplicity::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } @@ -934,7 +934,7 @@ void CmdSketcherCompModifyKnotMultiplicity::activated(int iMsg) pcAction->setIcon(a[iMsg]->icon()); } -Gui::Action * CmdSketcherCompModifyKnotMultiplicity::createAction(void) +Gui::Action * CmdSketcherCompModifyKnotMultiplicity::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -984,7 +984,7 @@ void CmdSketcherCompModifyKnotMultiplicity::updateAction(int /*mode*/) { } -bool CmdSketcherCompModifyKnotMultiplicity::isActive(void) +bool CmdSketcherCompModifyKnotMultiplicity::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), false); } @@ -1192,12 +1192,12 @@ void CmdSketcherInsertKnot::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherInsertKnot::isActive(void) +bool CmdSketcherInsertKnot::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } -void CreateSketcherCommandsBSpline(void) +void CreateSketcherCommandsBSpline() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index b20f7f40ea..a74ebce7e9 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -133,7 +133,7 @@ void CmdSketcherSelectConstraints::activated(int iMsg) } -bool CmdSketcherSelectConstraints::isActive(void) +bool CmdSketcherSelectConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -179,7 +179,7 @@ void CmdSketcherSelectOrigin::activated(int iMsg) Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); } -bool CmdSketcherSelectOrigin::isActive(void) +bool CmdSketcherSelectOrigin::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -223,7 +223,7 @@ void CmdSketcherSelectVerticalAxis::activated(int iMsg) Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); } -bool CmdSketcherSelectVerticalAxis::isActive(void) +bool CmdSketcherSelectVerticalAxis::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -267,7 +267,7 @@ void CmdSketcherSelectHorizontalAxis::activated(int iMsg) Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); } -bool CmdSketcherSelectHorizontalAxis::isActive(void) +bool CmdSketcherSelectHorizontalAxis::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -324,7 +324,7 @@ void CmdSketcherSelectRedundantConstraints::activated(int iMsg) Gui::Selection().addSelections(doc_name.c_str(), obj_name.c_str(), constraintSubNames); } -bool CmdSketcherSelectRedundantConstraints::isActive(void) +bool CmdSketcherSelectRedundantConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -380,7 +380,7 @@ void CmdSketcherSelectMalformedConstraints::activated(int iMsg) Gui::Selection().addSelections(doc_name.c_str(), obj_name.c_str(), constraintSubNames); } -bool CmdSketcherSelectMalformedConstraints::isActive(void) +bool CmdSketcherSelectMalformedConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -436,7 +436,7 @@ void CmdSketcherSelectPartiallyRedundantConstraints::activated(int iMsg) Gui::Selection().addSelections(doc_name.c_str(), obj_name.c_str(), constraintSubNames); } -bool CmdSketcherSelectPartiallyRedundantConstraints::isActive(void) +bool CmdSketcherSelectPartiallyRedundantConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -491,7 +491,7 @@ void CmdSketcherSelectConflictingConstraints::activated(int iMsg) Gui::Selection().addSelections(doc_name.c_str(), obj_name.c_str(), constraintSubNames); } -bool CmdSketcherSelectConflictingConstraints::isActive(void) +bool CmdSketcherSelectConflictingConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -612,7 +612,7 @@ void CmdSketcherSelectElementsAssociatedWithConstraints::activated(int iMsg) } -bool CmdSketcherSelectElementsAssociatedWithConstraints::isActive(void) +bool CmdSketcherSelectElementsAssociatedWithConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -703,7 +703,7 @@ void CmdSketcherSelectElementsWithDoFs::activated(int iMsg) } -bool CmdSketcherSelectElementsWithDoFs::isActive(void) +bool CmdSketcherSelectElementsWithDoFs::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -816,7 +816,7 @@ void CmdSketcherRestoreInternalAlignmentGeometry::activated(int iMsg) } } -bool CmdSketcherRestoreInternalAlignmentGeometry::isActive(void) +bool CmdSketcherRestoreInternalAlignmentGeometry::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1018,7 +1018,7 @@ void CmdSketcherSymmetry::activated(int iMsg) tryAutoRecomputeIfNotSolve(Obj); } -bool CmdSketcherSymmetry::isActive(void) +bool CmdSketcherSymmetry::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1357,7 +1357,7 @@ public: virtual void activate(); protected: virtual void activated(int iMsg); - virtual bool isActive(void); + virtual bool isActive(); }; CmdSketcherCopy::CmdSketcherCopy() @@ -1386,7 +1386,7 @@ void CmdSketcherCopy::activate() SketcherCopy::activate(SketcherCopy::Copy); } -bool CmdSketcherCopy::isActive(void) +bool CmdSketcherCopy::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1403,7 +1403,7 @@ public: virtual void activate(); protected: virtual void activated(int iMsg); - virtual bool isActive(void); + virtual bool isActive(); }; CmdSketcherClone::CmdSketcherClone() @@ -1431,7 +1431,7 @@ void CmdSketcherClone::activate() SketcherCopy::activate(SketcherCopy::Clone); } -bool CmdSketcherClone::isActive(void) +bool CmdSketcherClone::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1446,7 +1446,7 @@ public: virtual void activate(); protected: virtual void activated(int iMsg); - virtual bool isActive(void); + virtual bool isActive(); }; CmdSketcherMove::CmdSketcherMove() @@ -1474,7 +1474,7 @@ void CmdSketcherMove::activate() SketcherCopy::activate(SketcherCopy::Move); } -bool CmdSketcherMove::isActive(void) +bool CmdSketcherMove::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1526,7 +1526,7 @@ void CmdSketcherCompCopy::activated(int iMsg) } } -Gui::Action * CmdSketcherCompCopy::createAction(void) +Gui::Action * CmdSketcherCompCopy::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1574,7 +1574,7 @@ void CmdSketcherCompCopy::languageChange() move->setStatusTip(QApplication::translate("Sketcher_Move","Moves the geometry taking as reference the last selected point")); } -bool CmdSketcherCompCopy::isActive(void) +bool CmdSketcherCompCopy::isActive() { return isCommandActive( getActiveGuiDocument(), true ); } @@ -1896,7 +1896,7 @@ void CmdSketcherRectangularArray::activated(int iMsg) } } -bool CmdSketcherRectangularArray::isActive(void) +bool CmdSketcherRectangularArray::isActive() { return isCommandActive(getActiveGuiDocument(), true); } @@ -1959,7 +1959,7 @@ void CmdSketcherDeleteAllGeometry::activated(int iMsg) } } -bool CmdSketcherDeleteAllGeometry::isActive(void) +bool CmdSketcherDeleteAllGeometry::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -2022,7 +2022,7 @@ void CmdSketcherDeleteAllConstraints::activated(int iMsg) } -bool CmdSketcherDeleteAllConstraints::isActive(void) +bool CmdSketcherDeleteAllConstraints::isActive() { return isCommandActive(getActiveGuiDocument(), false); } @@ -2140,12 +2140,12 @@ void CmdSketcherRemoveAxesAlignment::activated(int iMsg) } -bool CmdSketcherRemoveAxesAlignment::isActive(void) +bool CmdSketcherRemoveAxesAlignment::isActive() { return isCommandActive(getActiveGuiDocument(), true); } -void CreateSketcherCommandsConstraintAccel(void) +void CreateSketcherCommandsConstraintAccel() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp index 5311c42768..fc28768b62 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp @@ -182,12 +182,12 @@ void CmdSketcherSwitchVirtualSpace::activated(int iMsg) } } -bool CmdSketcherSwitchVirtualSpace::isActive(void) +bool CmdSketcherSwitchVirtualSpace::isActive() { return isSketcherVirtualSpaceActive(getActiveGuiDocument(), false); } -void CreateSketcherCommandsVirtualSpace(void) +void CreateSketcherCommandsVirtualSpace() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.cpp b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.cpp index db57c3a17e..8cc4fc0147 100644 --- a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.cpp +++ b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.cpp @@ -37,7 +37,7 @@ using namespace SketcherGui; -ConstraintMultiFilterDialog::ConstraintMultiFilterDialog(void) +ConstraintMultiFilterDialog::ConstraintMultiFilterDialog() : QDialog(Gui::getMainWindow()), ui(new Ui_ConstraintMultiFilterDialog) { ui->setupUi(this); diff --git a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h index a3ccdebe15..e5c388282e 100644 --- a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h +++ b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h @@ -37,7 +37,7 @@ class ConstraintMultiFilterDialog : public QDialog Q_OBJECT public: - ConstraintMultiFilterDialog(void); + ConstraintMultiFilterDialog(); ~ConstraintMultiFilterDialog(); void setMultiFilter(const FilterValueBitset & bitset); diff --git a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.cpp b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.cpp index b107047610..cb6e479e84 100644 --- a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.cpp +++ b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.cpp @@ -38,7 +38,7 @@ using namespace SketcherGui; -ConstraintSettingsDialog::ConstraintSettingsDialog(void) +ConstraintSettingsDialog::ConstraintSettingsDialog() : QDialog(Gui::getMainWindow()), ui(new Ui_ConstraintSettingsDialog) { ui->setupUi(this); diff --git a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h index e190692ddd..a2a05e8cbe 100644 --- a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h +++ b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h @@ -37,7 +37,7 @@ class ConstraintSettingsDialog : public QDialog Q_OBJECT public: - ConstraintSettingsDialog(void); + ConstraintSettingsDialog(); ~ConstraintSettingsDialog(); Q_SIGNALS: diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index fbd82d908d..8377bb456f 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -123,14 +123,14 @@ public: virtual bool onSelectionChanged(const Gui::SelectionChanges&) { return false; } virtual void registerPressedKey(bool /*pressed*/, int /*key*/){} - virtual void quit(void); + virtual void quit(); friend class ViewProviderSketch; // get the actual highest vertex index, the next use will be +1 - int getHighestVertexIndex(void); + int getHighestVertexIndex(); // get the actual highest edge index, the next use will be +1 - int getHighestCurveIndex(void); + int getHighestCurveIndex(); int seekAutoConstraint(std::vector &suggestedConstraints, const Base::Vector2d &Pos, const Base::Vector2d &Dir, @@ -142,7 +142,7 @@ public: void setPositionText(const Base::Vector2d &Pos, const SbString &text); void setPositionText(const Base::Vector2d &Pos); - void resetPositionText(void); + void resetPositionText(); void renderSuggestConstraintsCursor(std::vector &suggestedConstraints); private: // NVI @@ -172,10 +172,10 @@ protected: void updateCursor(); /// restitutes the cursor that was in use at the moment of starting the DrawSketchHandler (i.e. oldCursor) - void unsetCursor(void); + void unsetCursor(); /// restitutes the DSH cached cursor (e.g. without any tail due to autoconstraints, ...) - void applyCursor(void); + void applyCursor(); /// returns the color to be used for the crosshair (configurable as a parameter) unsigned long getCrosshairColor(); @@ -196,9 +196,9 @@ protected: void drawPositionAtCursor(const Base::Vector2d & position); void drawDirectionAtCursor(const Base::Vector2d & position, const Base::Vector2d & origin); - int getPreselectPoint(void) const; - int getPreselectCurve(void) const; - int getPreselectCross(void) const; + int getPreselectPoint() const; + int getPreselectCurve() const; + int getPreselectCross() const; Sketcher::SketchObject * getSketchObject(); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 97cb52882a..123a14d715 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -281,7 +281,7 @@ public: return; } - virtual void quit(void) override + virtual void quit() override { // We must see if we need to create a B-spline before cancelling everything // and now just like any other Handler, diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index f754171473..6b19a7165e 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -583,7 +583,7 @@ public: return true; } - virtual void quit(void) override { + virtual void quit() override { // We must see if we need to create a B-spline before cancelling everything // and now just like any other Handler, diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp index 88988058ce..ce44190052 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp +++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp @@ -497,7 +497,7 @@ void EditModeCoinManager::setPositionText(const Base::Vector2d &Pos) setPositionText(Pos,text); } -void EditModeCoinManager::resetPositionText(void) +void EditModeCoinManager::resetPositionText() { editModeScenegraphNodes.textX->string = ""; } diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.h b/src/Mod/Sketcher/Gui/EditModeCoinManager.h index fb30f63631..40daa3b8cd 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.h @@ -194,7 +194,7 @@ public: void drawEdit(const std::list> &list); void setPositionText(const Base::Vector2d &Pos, const SbString &txt); void setPositionText(const Base::Vector2d &Pos); - void resetPositionText(void); + void resetPositionText(); void setAxisPickStyle(bool on); //@} diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp index 58d1e77209..fdea96b2bd 100644 --- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp +++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp @@ -1394,7 +1394,7 @@ void EditModeConstraintCoinManager::updateConstraintColor(const std::vectorsetupUi(this); @@ -68,7 +68,7 @@ void SketchRectangularArrayDialog::accept() QDialog::accept(); } -void SketchRectangularArrayDialog::updateValues(void) +void SketchRectangularArrayDialog::updateValues() { Rows = ui->RowsQuantitySpinBox->value(); Cols = ui->ColsQuantitySpinBox->value(); diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h index 602fb9fdc6..8ced6e22f2 100644 --- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h +++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h @@ -34,7 +34,7 @@ class SketchRectangularArrayDialog : public QDialog Q_OBJECT public: - SketchRectangularArrayDialog(void); + SketchRectangularArrayDialog(); ~SketchRectangularArrayDialog(); void accept(); @@ -46,7 +46,7 @@ public: bool Clone; protected: - void updateValues(void); + void updateValues(); private: std::unique_ptr ui; }; diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp index 91bbe2bd5a..ccf0ec3011 100644 --- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp +++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp @@ -37,7 +37,7 @@ using namespace SketcherGui; -SketcherRegularPolygonDialog::SketcherRegularPolygonDialog(void) +SketcherRegularPolygonDialog::SketcherRegularPolygonDialog() : QDialog(Gui::getMainWindow()), ui(new Ui_SketcherRegularPolygonDialog) { ui->setupUi(this); @@ -60,7 +60,7 @@ void SketcherRegularPolygonDialog::accept() QDialog::accept(); } -void SketcherRegularPolygonDialog::updateValues(void) +void SketcherRegularPolygonDialog::updateValues() { sides = ui->sidesQuantitySpinBox->value(); } diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h index 1a21de3945..4ce35769b3 100644 --- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h +++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h @@ -34,7 +34,7 @@ class SketcherRegularPolygonDialog : public QDialog Q_OBJECT public: - SketcherRegularPolygonDialog(void); + SketcherRegularPolygonDialog(); ~SketcherRegularPolygonDialog(); void accept(); @@ -42,7 +42,7 @@ public: int sides; protected: - void updateValues(void); + void updateValues(); private: std::unique_ptr ui; }; diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index 924ce5737a..4d20bddd18 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -59,11 +59,11 @@ public: virtual bool accept(); /// is called by the framework if the dialog is rejected (Cancel) virtual bool reject(); - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + virtual QDialogButtonBox::StandardButtons getStandardButtons() const { return QDialogButtonBox::Close; } protected: diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index 2fa85f4925..4984c53a04 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -1120,7 +1120,7 @@ void TaskSketcherConstraints::on_listWidgetConstraints_emitCenterSelectedItems() sketchView->centerSelection(); } -void TaskSketcherConstraints::on_listWidgetConstraints_itemSelectionChanged(void) +void TaskSketcherConstraints::on_listWidgetConstraints_itemSelectionChanged() { std::string doc_name = sketchView->getSketchObject()->getDocument()->getName(); std::string obj_name = sketchView->getSketchObject()->getNameInDocument(); @@ -1419,7 +1419,7 @@ bool TaskSketcherConstraints::isConstraintFiltered(QListWidgetItem * item) return !visible; } -void TaskSketcherConstraints::slotConstraintsChanged(void) +void TaskSketcherConstraints::slotConstraintsChanged() { assert(sketchView); // Build up ListView with the constraints diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h index 319e044ba3..86aec275ca 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h @@ -90,7 +90,7 @@ public: void onSelectionChanged(const Gui::SelectionChanges& msg); private: - void slotConstraintsChanged(void); + void slotConstraintsChanged(); bool isConstraintFiltered(QListWidgetItem * item); void change3DViewVisibilityToTrackFilter(); void changeFilteredVisibility(bool show, ActionTarget target = ActionTarget::All); @@ -106,12 +106,12 @@ private: public Q_SLOTS: void on_comboBoxFilter_currentIndexChanged(int); - void on_listWidgetConstraints_itemSelectionChanged(void); + void on_listWidgetConstraints_itemSelectionChanged(); void on_listWidgetConstraints_itemActivated(QListWidgetItem *item); void on_listWidgetConstraints_itemChanged(QListWidgetItem * item); void on_listWidgetConstraints_updateDrivingStatus(QListWidgetItem *item, bool status); void on_listWidgetConstraints_updateActiveStatus(QListWidgetItem *item, bool status); - void on_listWidgetConstraints_emitCenterSelectedItems(void); + void on_listWidgetConstraints_emitCenterSelectedItems(); void on_filterInternalAlignment_stateChanged(int state); void on_extendedInformation_stateChanged(int state); void on_visualisationTrackingFilter_stateChanged(int state); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index 0ff4d9c36b..25efa7000d 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -112,7 +112,7 @@ public: void onSelectionChanged(const Gui::SelectionChanges& msg); private: - void slotElementsChanged(void); + void slotElementsChanged(); void updateIcons(int element); void updatePreselection(); void updateVisibility(int filterindex); @@ -120,7 +120,7 @@ private: void clearWidget(); public Q_SLOTS: - void on_listWidgetElements_itemSelectionChanged(void); + void on_listWidgetElements_itemSelectionChanged(); void on_listWidgetElements_itemEntered(QListWidgetItem *item); void on_listWidgetElements_filterShortcutPressed(); void on_listWidgetElements_currentFilterChanged ( int index ); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp index affe5cc06e..3e46555bca 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp @@ -92,7 +92,7 @@ TaskSketcherSolverAdvanced::~TaskSketcherSolverAdvanced() { } -void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void) +void TaskSketcherSolverAdvanced::updateDefaultMethodParameters() { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/SolverAdvanced"); @@ -161,7 +161,7 @@ void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void) } } -void TaskSketcherSolverAdvanced::updateRedundantMethodParameters(void) +void TaskSketcherSolverAdvanced::updateRedundantMethodParameters() { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/SolverAdvanced"); @@ -560,7 +560,7 @@ void TaskSketcherSolverAdvanced::on_pushButtonDefaults_clicked(bool checked/* = updateSketchObject(); } -void TaskSketcherSolverAdvanced::updateSketchObject(void) +void TaskSketcherSolverAdvanced::updateSketchObject() { const_cast(sketchView->getSketchObject()->getSolvedSketch()).setDebugMode((GCS::DebugMode) ui->comboBoxDebugMode->currentIndex()); const_cast(sketchView->getSketchObject()->getSolvedSketch()).setSketchSizeMultiplierRedundant(ui->checkBoxRedundantSketchSizeMultiplier->isChecked()); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h index 2e2dcfde1b..a0db9e8f41 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h @@ -68,9 +68,9 @@ private Q_SLOTS: void on_pushButtonSolve_clicked(bool checked = false); protected: - void updateDefaultMethodParameters(void); - void updateRedundantMethodParameters(void); - void updateSketchObject(void); + void updateDefaultMethodParameters(); + void updateRedundantMethodParameters(); + void updateSketchObject(); protected: ViewProviderSketch *sketchView; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index a6158ea46e..a1ae8b5fa4 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -376,7 +376,7 @@ void ViewProviderSketch::deactivateHandler() } /// removes the active handler -void ViewProviderSketch::purgeHandler(void) +void ViewProviderSketch::purgeHandler() { deactivateHandler(); Gui::Selection().clearSelection(); @@ -1043,7 +1043,7 @@ bool ViewProviderSketch::mouseWheelEvent(int delta, const SbVec2s &cursorPos, co return true; } -void ViewProviderSketch::editDoubleClicked(void) +void ViewProviderSketch::editDoubleClicked() { if (preselection.isPreselectPointValid()) { Base::Console().Log("double click point:%d\n",preselection.PreselectPoint); @@ -1551,7 +1551,7 @@ void ViewProviderSketch::moveConstraint(int constNum, const Base::Vector2d &toPo draw(true,false); } -bool ViewProviderSketch::isSelectable(void) const +bool ViewProviderSketch::isSelectable() const { if (isEditing()) return false; @@ -2429,14 +2429,14 @@ void ViewProviderSketch::doBoxSelection(const SbVec2s &startPos, const SbVec2s & } } -void ViewProviderSketch::updateColor(void) +void ViewProviderSketch::updateColor() { assert(isInEditMode()); editCoinManager->updateColor(); } -bool ViewProviderSketch::doubleClicked(void) +bool ViewProviderSketch::doubleClicked() { Gui::Application::Instance->activeDocument()->setEdit(this); return true; @@ -3122,21 +3122,21 @@ void ViewProviderSketch::unsetEditViewer(Gui::View3DInventorViewer* viewer) static_cast(root)->selectionRole.setValue(true); } -int ViewProviderSketch::getPreselectPoint(void) const +int ViewProviderSketch::getPreselectPoint() const { if (isInEditMode()) return preselection.PreselectPoint; return -1; } -int ViewProviderSketch::getPreselectCurve(void) const +int ViewProviderSketch::getPreselectCurve() const { if (isInEditMode()) return preselection.PreselectCurve; return -1; } -int ViewProviderSketch::getPreselectCross(void) const +int ViewProviderSketch::getPreselectCross() const { // TODO: This function spreads over several files. It should be refactored into something less "numeric" at a second stage. if (isInEditMode()) @@ -3144,12 +3144,12 @@ int ViewProviderSketch::getPreselectCross(void) const return -1; } -Sketcher::SketchObject *ViewProviderSketch::getSketchObject(void) const +Sketcher::SketchObject *ViewProviderSketch::getSketchObject() const { return dynamic_cast(pcObject); } -const Sketcher::Sketch &ViewProviderSketch::getSolvedSketch(void) const +const Sketcher::Sketch &ViewProviderSketch::getSolvedSketch() const { return const_cast(getSketchObject())->getSolvedSketch(); } @@ -3379,7 +3379,7 @@ void ViewProviderSketch::setPositionText(const Base::Vector2d &Pos) editCoinManager->setPositionText(Pos); } -void ViewProviderSketch::resetPositionText(void) +void ViewProviderSketch::resetPositionText() { editCoinManager->resetPositionText(); } @@ -3401,7 +3401,7 @@ void ViewProviderSketch::setPreselectRootPoint() } -void ViewProviderSketch::resetPreselectPoint(void) +void ViewProviderSketch::resetPreselectPoint() { preselection.PreselectPoint = Preselection::InvalidPoint; preselection.PreselectCurve = Preselection::InvalidCurve; @@ -3419,7 +3419,7 @@ void ViewProviderSketch::removeSelectPoint(int SelectPoint) selection.SelPointSet.erase(SelectPoint); } -void ViewProviderSketch::clearSelectPoints(void) +void ViewProviderSketch::clearSelectPoints() { selection.SelPointSet.clear(); } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index a3f9a8d19f..f286f30295 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -415,7 +415,7 @@ public: /// sets an DrawSketchHandler in control void activateHandler(DrawSketchHandler *newHandler); /// removes the active handler - void purgeHandler(void); + void purgeHandler(); //@} @@ -443,7 +443,7 @@ public: /// is called by GuiCommands to set the drawing mode void setSketchMode(SketchMode mode) {Mode = mode;} /// get the sketch mode - SketchMode getSketchMode(void) const {return Mode;} + SketchMode getSketchMode() const {return Mode;} //@} /** @name Drawing functions */ @@ -454,13 +454,13 @@ public: void draw(bool temp=false, bool rebuildinformationoverlay=true); /// helper change the color of the sketch according to selection and solver status - void updateColor(void); + void updateColor(); //@} /** @name Selection functions */ //@{ /// Is the view provider selectable - bool isSelectable(void) const override; + bool isSelectable() const override; /// Observer message from the Selection virtual void onSelectionChanged(const Gui::SelectionChanges& msg) override; @@ -469,7 +469,7 @@ public: /** @name Access to Sketch and Solver objects */ //@{ /// get the pointer to the sketch document object - Sketcher::SketchObject *getSketchObject(void) const; + Sketcher::SketchObject *getSketchObject() const; /** returns a const reference to the last solved sketch object. It guarantees that * the solver object does not lose synchronisation with the SketchObject properties. @@ -481,7 +481,7 @@ public: * -> inline int moveTemporaryPoint(int geoId, PointPos pos, Base::Vector3d toPoint, bool relative=false) * -> inline void updateSolverExtension(int geoId, std::unique_ptr && ext) */ - const Sketcher::Sketch &getSolvedSketch(void) const; + const Sketcher::Sketch &getSolvedSketch() const; //@} /** @name miscelanea utilities */ @@ -495,11 +495,11 @@ public: /** @name constraint Virtual Space visibility management */ //@{ /// updates the visibility of the virtual space of constraints - void updateVirtualSpace(void); + void updateVirtualSpace(); /// determines whether the constraints in the normal space or the ones in the virtual are to be shown void setIsShownVirtualSpace(bool isshownvirtualspace); /// returns whether the virtual space is being shown - bool getIsShownVirtualSpace(void) const; + bool getIsShownVirtualSpace() const; //@} /** @name base class implementer */ @@ -515,7 +515,7 @@ public: /// If null is returned then no transaction will be opened. virtual const char* getTransactionText() const override { return nullptr; } /// is called by the tree if the user double clicks on the object - virtual bool doubleClicked(void) override; + virtual bool doubleClicked() override; /// is called when the Provider is in edit and the mouse is moved virtual bool mouseMove(const SbVec2s &pos, Gui::View3DInventorViewer *viewer) override; /// is called when the Provider is in edit and a key event ocours. Only ESC ends edit. @@ -558,13 +558,13 @@ protected: /// purges the DrawHandler if existing and tidies up void deactivateHandler(); /// get called if a subelement is double clicked while editing - void editDoubleClicked(void); + void editDoubleClicked(); //@} /** @name Solver Information */ //@{ /// update solver information based on last solving at SketchObject - void UpdateSolverInformation(void); + void UpdateSolverInformation(); /// Auxiliary function to generate messages about conflicting, redundant and malformed constraints static QString appendConstraintMsg( const QString & singularmsg, @@ -606,12 +606,12 @@ private: //@{ /// helper to detect preselection bool detectAndShowPreselection (SoPickedPoint * Point, const SbVec2s &cursorPos); - int getPreselectPoint(void) const; - int getPreselectCurve(void) const; - int getPreselectCross(void) const; + int getPreselectPoint() const; + int getPreselectCurve() const; + int getPreselectCross() const; void setPreselectPoint(int PreselectPoint); void setPreselectRootPoint(); - void resetPreselectPoint(void); + void resetPreselectPoint(); bool setPreselect(const std::string &subNameSuffix, float x = 0, float y = 0, float z = 0); //@} @@ -624,7 +624,7 @@ private: void addSelectPoint(int SelectPoint); void removeSelectPoint(int SelectPoint); - void clearSelectPoints(void); + void clearSelectPoints(); bool isSelected(const std::string & ss) const; void rmvSelection(const std::string &subNameSuffix); @@ -703,7 +703,7 @@ private: void setConstraintSelectability(bool enabled = true); void setPositionText(const Base::Vector2d &Pos, const SbString &txt); void setPositionText(const Base::Vector2d &Pos); - void resetPositionText(void); + void resetPositionText(); /// draw the edit curve void drawEdit(const std::vector &EditCurve); diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp index 42c491532e..66a45b099a 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp @@ -45,7 +45,7 @@ void ViewProviderSketchGeometryExtension::copyAttributes(Part::GeometryExtension static_cast(cpy)->RepresentationFactor = this->RepresentationFactor; } -std::unique_ptr ViewProviderSketchGeometryExtension::copy(void) const +std::unique_ptr ViewProviderSketchGeometryExtension::copy() const { auto cpy = std::make_unique(); @@ -58,7 +58,7 @@ std::unique_ptr ViewProviderSketchGeometryExtension::co #endif } -PyObject * ViewProviderSketchGeometryExtension::getPyObject(void) +PyObject * ViewProviderSketchGeometryExtension::getPyObject() { THROWM(Base::NotImplementedError, "ViewProviderSketchGeometryExtension does not have a Python counterpart"); } diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h index 3be807c066..78e471e959 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h @@ -36,9 +36,9 @@ public: ViewProviderSketchGeometryExtension(); virtual ~ViewProviderSketchGeometryExtension() override = default; - virtual std::unique_ptr copy(void) const override; + virtual std::unique_ptr copy() const override; - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; // Data Members diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h index 68d0349758..fb12306bfe 100644 --- a/src/Mod/Spreadsheet/App/Cell.h +++ b/src/Mod/Spreadsheet/App/Cell.h @@ -122,7 +122,7 @@ public: App::CellAddress getAddress() const { return address; } - std::string getFormattedQuantity(void); + std::string getFormattedQuantity(); /* Alignment */ static const int ALIGNMENT_LEFT; diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h index 324d8ac286..b46d8474f0 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h @@ -51,7 +51,7 @@ public: return i != end() ? i->second : defaultWidth; } - virtual Property *Copy(void) const; + virtual Property *Copy() const; virtual void Paste(const Property &from); @@ -65,7 +65,7 @@ public: const std::set & getDirty() const { return dirty; } - PyObject *getPyObject(void); + PyObject *getPyObject(); void clear(); diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp index 53f97d0a76..57b9e5ebba 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp @@ -32,7 +32,7 @@ using namespace Spreadsheet; // returns a string which represents the object e.g. when printed in python -std::string PropertyColumnWidthsPy::representation(void) const +std::string PropertyColumnWidthsPy::representation() const { return std::string(""); } diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.h b/src/Mod/Spreadsheet/App/PropertyRowHeights.h index 23bf24a642..e97247f8d2 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeights.h +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.h @@ -51,7 +51,7 @@ public: return *this; } - virtual App::Property *Copy(void) const; + virtual App::Property *Copy() const; virtual void Paste(const App::Property &from); @@ -65,7 +65,7 @@ public: const std::set & getDirty() const { return dirty; } - PyObject *getPyObject(void); + PyObject *getPyObject(); static const int defaultHeight; diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index f7ab1df950..39b6a47e2e 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -1633,10 +1633,10 @@ void PropertySpreadsheetQuantity::Paste(const Property &from) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Spreadsheet::SheetPython, Spreadsheet::Sheet) -template<> const char* Spreadsheet::SheetPython::getViewProviderName(void) const { +template<> const char* Spreadsheet::SheetPython::getViewProviderName() const { return "SpreadsheetGui::ViewProviderSheet"; } -template<> PyObject* Spreadsheet::SheetPython::getPyObject(void) { +template<> PyObject* Spreadsheet::SheetPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp index 489a9160c7..b538399765 100644 --- a/src/Mod/Start/Gui/AppStartGui.cpp +++ b/src/Mod/Start/Gui/AppStartGui.cpp @@ -34,7 +34,7 @@ // use a different name to CreateCommand() -void CreateStartCommands(void); +void CreateStartCommands(); void loadStartResource() { diff --git a/src/Mod/Start/Gui/Command.cpp b/src/Mod/Start/Gui/Command.cpp index 96c243c25e..72ba20b8af 100644 --- a/src/Mod/Start/Gui/Command.cpp +++ b/src/Mod/Start/Gui/Command.cpp @@ -51,7 +51,7 @@ void CmdStartPage::activated(int iMsg) } -void CreateStartCommands(void) +void CreateStartCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/Surface/App/FeatureCut.cpp b/src/Mod/Surface/App/FeatureCut.cpp index 7e617e4224..fbc7711a6e 100644 --- a/src/Mod/Surface/App/FeatureCut.cpp +++ b/src/Mod/Surface/App/FeatureCut.cpp @@ -56,7 +56,7 @@ short Cut::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Cut::execute(void) +App::DocumentObjectExecReturn *Cut::execute() { //Perform error checking diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h index eba82cbfa1..a0f133cecf 100644 --- a/src/Mod/Surface/App/FeatureCut.h +++ b/src/Mod/Surface/App/FeatureCut.h @@ -42,7 +42,7 @@ public: App::PropertyLinkSubList ShapeList; //Shapes to be cut. // recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider // const char* getViewProviderName(void) const { diff --git a/src/Mod/Surface/App/FeatureExtend.cpp b/src/Mod/Surface/App/FeatureExtend.cpp index da53f3415f..87877785d0 100644 --- a/src/Mod/Surface/App/FeatureExtend.cpp +++ b/src/Mod/Surface/App/FeatureExtend.cpp @@ -90,7 +90,7 @@ short Extend::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Extend::execute(void) +App::DocumentObjectExecReturn *Extend::execute() { App::DocumentObject* part = Face.getValue(); if (!part || !part->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h index e23917ae35..5032dc79d6 100644 --- a/src/Mod/Surface/App/FeatureExtend.h +++ b/src/Mod/Surface/App/FeatureExtend.h @@ -52,10 +52,10 @@ public: App::PropertyIntegerConstraint SampleV; // recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "SurfaceGui::ViewProviderExtend"; } diff --git a/src/Mod/Surface/App/FeatureFilling.cpp b/src/Mod/Surface/App/FeatureFilling.cpp index f0ef4ae9c0..eee6ef5476 100644 --- a/src/Mod/Surface/App/FeatureFilling.cpp +++ b/src/Mod/Surface/App/FeatureFilling.cpp @@ -261,7 +261,7 @@ void Filling::addConstraints(BRepFill_Filling& builder, } } -App::DocumentObjectExecReturn *Filling::execute(void) +App::DocumentObjectExecReturn *Filling::execute() { //Assign Variables unsigned int degree = Degree.getValue(); diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h index b5173e9832..161ef9bc24 100644 --- a/src/Mod/Surface/App/FeatureFilling.h +++ b/src/Mod/Surface/App/FeatureFilling.h @@ -66,10 +66,10 @@ public: App::PropertyInteger MaximumSegments; //Maximum number of segments // recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "SurfaceGui::ViewProviderFilling"; } diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp index f4ca4bd91b..0171a01fc2 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp @@ -63,7 +63,7 @@ ShapeValidator::ShapeValidator() initValidator(); } -void ShapeValidator::initValidator(void) +void ShapeValidator::initValidator() { willBezier = true; edgeCount = 0; @@ -162,7 +162,7 @@ void GeomFillSurface::onChanged(const App::Property* prop) Part::Spline::onChanged(prop); } -App::DocumentObjectExecReturn *GeomFillSurface::execute(void) +App::DocumentObjectExecReturn *GeomFillSurface::execute() { try { TopoDS_Wire aWire; diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h index 781b66257d..b71f12b158 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.h +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h @@ -45,7 +45,7 @@ protected: public: ShapeValidator(); - void initValidator(void); + void initValidator(); void checkEdge(const TopoDS_Shape& shape); void checkAndAdd(const TopoDS_Shape &shape, Handle(ShapeExtend_WireData) *aWD = nullptr); void checkAndAdd(const Part::TopoShape &ts, const char *subName, Handle(ShapeExtend_WireData) *aWire = nullptr); @@ -70,10 +70,10 @@ public: short mustExecute() const; void onChanged(const App::Property*); - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName() const { return "SurfaceGui::ViewProviderGeomFillSurface"; } diff --git a/src/Mod/Surface/App/FeatureSections.cpp b/src/Mod/Surface/App/FeatureSections.cpp index 7aeccce826..313569784d 100644 --- a/src/Mod/Surface/App/FeatureSections.cpp +++ b/src/Mod/Surface/App/FeatureSections.cpp @@ -53,7 +53,7 @@ Sections::~Sections() { } -App::DocumentObjectExecReturn *Sections::execute(void) +App::DocumentObjectExecReturn *Sections::execute() { TColGeom_SequenceOfCurve curveSeq; auto edge_obj = NSections.getValues(); diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h index e9e42f9213..41c7cef44a 100644 --- a/src/Mod/Surface/App/FeatureSections.h +++ b/src/Mod/Surface/App/FeatureSections.h @@ -43,9 +43,9 @@ public: App::PropertyLinkSubList NSections; // recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "SurfaceGui::ViewProviderSections"; } }; diff --git a/src/Mod/Surface/App/FeatureSewing.cpp b/src/Mod/Surface/App/FeatureSewing.cpp index 253acd2935..0c6be1a676 100644 --- a/src/Mod/Surface/App/FeatureSewing.cpp +++ b/src/Mod/Surface/App/FeatureSewing.cpp @@ -65,7 +65,7 @@ short Sewing::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Sewing::execute(void) +App::DocumentObjectExecReturn *Sewing::execute() { //Assign Variables double atol = Tolerance.getValue(); diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h index 239c2ee054..30c2b585cd 100644 --- a/src/Mod/Surface/App/FeatureSewing.h +++ b/src/Mod/Surface/App/FeatureSewing.h @@ -48,7 +48,7 @@ public: App::PropertyBool Nonmanifold; //Option for non-manifold processing // recalculate the feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(); short mustExecute() const; }; diff --git a/src/Mod/Surface/Gui/AppSurfaceGui.cpp b/src/Mod/Surface/Gui/AppSurfaceGui.cpp index 90849781c0..3ab418b53f 100644 --- a/src/Mod/Surface/Gui/AppSurfaceGui.cpp +++ b/src/Mod/Surface/Gui/AppSurfaceGui.cpp @@ -36,7 +36,7 @@ // use a different name to CreateCommand() -void CreateSurfaceCommands(void); +void CreateSurfaceCommands(); namespace SurfaceGui { diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp index 68aff54c08..c5fe56ffff 100644 --- a/src/Mod/Surface/Gui/Command.cpp +++ b/src/Mod/Surface/Gui/Command.cpp @@ -151,7 +151,7 @@ void CmdSurfaceFilling::activated(int iMsg) doCommand(Doc, "Gui.ActiveDocument.setEdit('%s',0)", FeatName.c_str()); } -bool CmdSurfaceFilling::isActive(void) +bool CmdSurfaceFilling::isActive() { return hasActiveDocument(); } @@ -173,7 +173,7 @@ CmdSurfaceGeomFillSurface::CmdSurfaceGeomFillSurface() sPixmap = "Surface_GeomFillSurface"; } -bool CmdSurfaceGeomFillSurface::isActive(void) +bool CmdSurfaceGeomFillSurface::isActive() { return hasActiveDocument(); } @@ -210,7 +210,7 @@ void CmdSurfaceCurveOnMesh::activated(int) "FreeCADGui.runCommand('MeshPart_CurveOnMesh')\n"); } -bool CmdSurfaceCurveOnMesh::isActive(void) +bool CmdSurfaceCurveOnMesh::isActive() { if (Gui::Control().activeDialog()) return false; @@ -261,7 +261,7 @@ void CmdSurfaceExtendFace::activated(int) } } -bool CmdSurfaceExtendFace::isActive(void) +bool CmdSurfaceExtendFace::isActive() { return Gui::Selection().countObjectsOfType(Part::Feature::getClassTypeId()) == 1; } @@ -290,12 +290,12 @@ void CmdSurfaceSections::activated(int iMsg) doCommand(Doc, "Gui.ActiveDocument.setEdit('%s',0)", FeatName.c_str()); } -bool CmdSurfaceSections::isActive(void) +bool CmdSurfaceSections::isActive() { return hasActiveDocument(); } -void CreateSurfaceCommands(void) +void CreateSurfaceCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); /* diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp index 56206cf51c..60485bf9af 100644 --- a/src/Mod/Surface/Gui/TaskFilling.cpp +++ b/src/Mod/Surface/Gui/TaskFilling.cpp @@ -95,7 +95,7 @@ void ViewProviderFilling::unsetEdit(int ModNum) PartGui::ViewProviderSpline::unsetEdit(ModNum); } -QIcon ViewProviderFilling::getIcon(void) const +QIcon ViewProviderFilling::getIcon() const { return Gui::BitmapFactory().pixmap("Surface_Filling"); } diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h index c069187adc..4f1293281a 100644 --- a/src/Mod/Surface/Gui/TaskFilling.h +++ b/src/Mod/Surface/Gui/TaskFilling.h @@ -50,7 +50,7 @@ public: virtual void setupContextMenu(QMenu*, QObject*, const char*); virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - QIcon getIcon(void) const; + QIcon getIcon() const; void highlightReferences(ShapeType type, const References& refs, bool on); }; @@ -100,7 +100,7 @@ private Q_SLOTS: void on_listBoundary_itemDoubleClicked(QListWidgetItem*); void on_buttonAccept_clicked(); void on_buttonIgnore_clicked(); - void onDeleteEdge(void); + void onDeleteEdge(); void onIndexesMoved(); void clearSelection(); }; diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.h b/src/Mod/Surface/Gui/TaskFillingEdge.h index 4c66b5f120..8f95bcf531 100644 --- a/src/Mod/Surface/Gui/TaskFillingEdge.h +++ b/src/Mod/Surface/Gui/TaskFillingEdge.h @@ -84,7 +84,7 @@ private Q_SLOTS: void on_listUnbound_itemDoubleClicked(QListWidgetItem*); void on_buttonUnboundAccept_clicked(); void on_buttonUnboundIgnore_clicked(); - void onDeleteUnboundEdge(void); + void onDeleteUnboundEdge(); void clearSelection(); }; diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.h b/src/Mod/Surface/Gui/TaskFillingVertex.h index 7b67493425..36dd18d7a4 100644 --- a/src/Mod/Surface/Gui/TaskFillingVertex.h +++ b/src/Mod/Surface/Gui/TaskFillingVertex.h @@ -78,7 +78,7 @@ protected: private Q_SLOTS: void on_buttonVertexAdd_clicked(); void on_buttonVertexRemove_clicked(); - void onDeleteVertex(void); + void onDeleteVertex(); void clearSelection(); }; diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp index de67a14a43..d24688319b 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp @@ -97,7 +97,7 @@ void ViewProviderGeomFillSurface::unsetEdit(int ModNum) } } -QIcon ViewProviderGeomFillSurface::getIcon(void) const +QIcon ViewProviderGeomFillSurface::getIcon() const { return Gui::BitmapFactory().pixmap("Surface_BSplineSurface"); } diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.h b/src/Mod/Surface/Gui/TaskGeomFillSurface.h index 90d7aa1ea7..ccf3af9d63 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.h +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.h @@ -46,7 +46,7 @@ public: virtual void setupContextMenu(QMenu*, QObject*, const char*); virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - QIcon getIcon(void) const; + QIcon getIcon() const; void highlightReferences(bool on); }; @@ -96,7 +96,7 @@ private Q_SLOTS: void on_buttonEdgeAdd_clicked(); void on_buttonEdgeRemove_clicked(); void on_listWidget_itemDoubleClicked(QListWidgetItem*); - void onDeleteEdge(void); + void onDeleteEdge(); void onFlipOrientation(); void clearSelection(); }; diff --git a/src/Mod/Surface/Gui/TaskSections.cpp b/src/Mod/Surface/Gui/TaskSections.cpp index d2076547ff..a26391ba45 100644 --- a/src/Mod/Surface/Gui/TaskSections.cpp +++ b/src/Mod/Surface/Gui/TaskSections.cpp @@ -99,7 +99,7 @@ void ViewProviderSections::unsetEdit(int ModNum) } } -QIcon ViewProviderSections::getIcon(void) const +QIcon ViewProviderSections::getIcon() const { return Gui::BitmapFactory().pixmap("Surface_Sections"); } diff --git a/src/Mod/Surface/Gui/TaskSections.h b/src/Mod/Surface/Gui/TaskSections.h index 03f1c5635c..0a99374445 100644 --- a/src/Mod/Surface/Gui/TaskSections.h +++ b/src/Mod/Surface/Gui/TaskSections.h @@ -49,7 +49,7 @@ public: virtual void setupContextMenu(QMenu*, QObject*, const char*); virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - QIcon getIcon(void) const; + QIcon getIcon() const; void highlightReferences(ShapeType type, const References& refs, bool on); }; @@ -93,7 +93,7 @@ protected: private Q_SLOTS: void on_buttonEdgeAdd_clicked(); void on_buttonEdgeRemove_clicked(); - void onDeleteEdge(void); + void onDeleteEdge(); void clearSelection(); void onIndexesMoved(); diff --git a/src/Mod/Surface/Gui/ViewProviderExtend.h b/src/Mod/Surface/Gui/ViewProviderExtend.h index 2c8b6824ea..7b2aff4ce2 100644 --- a/src/Mod/Surface/Gui/ViewProviderExtend.h +++ b/src/Mod/Surface/Gui/ViewProviderExtend.h @@ -34,7 +34,7 @@ class ViewProviderExtend : public PartGui::ViewProviderSpline PROPERTY_HEADER(SurfaceGui::ViewProviderExtend); public: - QIcon getIcon(void) const; + QIcon getIcon() const; }; } //namespace SurfaceGui diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp index 756bc0aedf..f7f20bfa7a 100644 --- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp +++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp @@ -35,7 +35,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string CenterLinePy::representation(void) const +std::string CenterLinePy::representation() const { std::stringstream ss; ss << " at " << std::hex << this; @@ -110,7 +110,7 @@ PyObject* CenterLinePy::copy(PyObject *args) return cpy; } -Py::Object CenterLinePy::getFormat(void) const +Py::Object CenterLinePy::getFormat() const { TechDraw::CenterLine* cl = this->getCenterLinePtr(); @@ -160,20 +160,20 @@ void CenterLinePy::setFormat(Py::Object arg) } } -Py::String CenterLinePy::getTag(void) const +Py::String CenterLinePy::getTag() const { std::string tmp = boost::uuids::to_string(getCenterLinePtr()->getTag()); return Py::String(tmp); } -Py::Long CenterLinePy::getType(void) const +Py::Long CenterLinePy::getType() const { int tmp = getCenterLinePtr()->m_type; return Py::Long(tmp); } -Py::Long CenterLinePy::getMode(void) const +Py::Long CenterLinePy::getMode() const { int tmp = getCenterLinePtr()->m_mode; return Py::Long(tmp); @@ -192,7 +192,7 @@ void CenterLinePy::setMode(Py::Long arg) } } -Py::Float CenterLinePy::getHorizShift(void) const +Py::Float CenterLinePy::getHorizShift() const { double shift = getCenterLinePtr()->getHShift(); return Py::asObject(PyFloat_FromDouble(shift)); @@ -212,7 +212,7 @@ void CenterLinePy::setHorizShift(Py::Float arg) } } -Py::Float CenterLinePy::getVertShift(void) const +Py::Float CenterLinePy::getVertShift() const { double shift = getCenterLinePtr()->getVShift(); return Py::asObject(PyFloat_FromDouble(shift)); @@ -232,7 +232,7 @@ void CenterLinePy::setVertShift(Py::Float arg) } } -Py::Float CenterLinePy::getRotation(void) const +Py::Float CenterLinePy::getRotation() const { double rot = getCenterLinePtr()->getRotate(); return Py::asObject(PyFloat_FromDouble(rot)); @@ -251,7 +251,7 @@ void CenterLinePy::setRotation(Py::Float arg) } } -Py::Float CenterLinePy::getExtension(void) const +Py::Float CenterLinePy::getExtension() const { double rot = getCenterLinePtr()->getExtend(); return Py::asObject(PyFloat_FromDouble(rot)); @@ -270,7 +270,7 @@ void CenterLinePy::setExtension(Py::Float arg) } } -Py::Boolean CenterLinePy::getFlip(void) const +Py::Boolean CenterLinePy::getFlip() const { bool flip = getCenterLinePtr()->getFlip(); return Py::Boolean(flip); @@ -292,7 +292,7 @@ void CenterLinePy::setFlip(Py::Boolean arg) } } -Py::Object CenterLinePy::getEdges(void) const +Py::Object CenterLinePy::getEdges() const { // Base::Console().Message("CLP::getEdges()\n"); TechDraw::CenterLine* cl = this->getCenterLinePtr(); @@ -331,7 +331,7 @@ void CenterLinePy::setEdges(Py::Object arg) Base::Console().Error("CLPI::setEdges - input not a list!\n"); } } -Py::Object CenterLinePy::getFaces(void) const +Py::Object CenterLinePy::getFaces() const { // Base::Console().Message("CLP::getFaces()\n"); TechDraw::CenterLine* cl = this->getCenterLinePtr(); @@ -371,7 +371,7 @@ void CenterLinePy::setFaces(Py::Object arg) } } -Py::Object CenterLinePy::getPoints(void) const +Py::Object CenterLinePy::getPoints() const { // Base::Console().Message("CLP::getPoints()\n"); TechDraw::CenterLine* cl = this->getCenterLinePtr(); diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp index 04324ca552..696f01b02f 100644 --- a/src/Mod/TechDraw/App/Cosmetic.cpp +++ b/src/Mod/TechDraw/App/Cosmetic.cpp @@ -91,7 +91,7 @@ void LineFormat::dump(const char* title) Base::Console().Message("LF::dump - %s \n",toString().c_str()); } -std::string LineFormat::toString(void) const +std::string LineFormat::toString() const { std::stringstream ss; ss << m_style << "," << @@ -180,7 +180,7 @@ void CosmeticVertex::moveRelative(Base::Vector3d movement) permaPoint += movement; } -std::string CosmeticVertex::toString(void) const +std::string CosmeticVertex::toString() const { std::stringstream ss; ss << permaPoint.x << "," << @@ -205,7 +205,7 @@ std::string CosmeticVertex::toString(void) const } // Persistence implementers -unsigned int CosmeticVertex::getMemSize (void) const +unsigned int CosmeticVertex::getMemSize () const { return 1; } @@ -265,7 +265,7 @@ boost::uuids::uuid CosmeticVertex::getTag() const return tag; } -std::string CosmeticVertex::getTagAsString(void) const +std::string CosmeticVertex::getTagAsString() const { return boost::uuids::to_string(getTag()); } @@ -293,13 +293,13 @@ void CosmeticVertex::assignTag(const TechDraw::CosmeticVertex * cv) throw Base::TypeError("CosmeticVertex tag can not be assigned as types do not match."); } -CosmeticVertex* CosmeticVertex::copy(void) const +CosmeticVertex* CosmeticVertex::copy() const { // Base::Console().Message("CV::copy()\n"); return new CosmeticVertex(this); } -CosmeticVertex* CosmeticVertex::clone(void) const +CosmeticVertex* CosmeticVertex::clone() const { // Base::Console().Message("CV::clone()\n"); CosmeticVertex* cpy = this->copy(); @@ -307,7 +307,7 @@ CosmeticVertex* CosmeticVertex::clone(void) const return cpy; } -PyObject* CosmeticVertex::getPyObject(void) +PyObject* CosmeticVertex::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -377,12 +377,12 @@ CosmeticEdge::CosmeticEdge(TechDraw::BaseGeomPtr g) initialize(); } -CosmeticEdge::~CosmeticEdge(void) +CosmeticEdge::~CosmeticEdge() { //shared pointer will delete m_geometry when ref count goes to zero. } -void CosmeticEdge::initialize(void) +void CosmeticEdge::initialize() { m_geometry->classOfEdge = ecHARD; m_geometry->hlrVisible = true; @@ -418,7 +418,7 @@ TechDraw::BaseGeomPtr CosmeticEdge::scaledGeometry(double scale) return newGeom; } -std::string CosmeticEdge::toString(void) const +std::string CosmeticEdge::toString() const { std::stringstream ss; ss << getTagAsString() << ", $$$, "; @@ -439,7 +439,7 @@ void CosmeticEdge::dump(const char* title) } // Persistence implementers -unsigned int CosmeticEdge::getMemSize (void) const +unsigned int CosmeticEdge::getMemSize () const { return 1; } @@ -518,7 +518,7 @@ boost::uuids::uuid CosmeticEdge::getTag() const return tag; } -std::string CosmeticEdge::getTagAsString(void) const +std::string CosmeticEdge::getTagAsString() const { return boost::uuids::to_string(getTag()); } @@ -546,7 +546,7 @@ void CosmeticEdge::assignTag(const TechDraw::CosmeticEdge * ce) throw Base::TypeError("CosmeticEdge tag can not be assigned as types do not match."); } -CosmeticEdge* CosmeticEdge::copy(void) const +CosmeticEdge* CosmeticEdge::copy() const { // Base::Console().Message("CE::copy()\n"); CosmeticEdge* newCE = new CosmeticEdge(); @@ -556,7 +556,7 @@ CosmeticEdge* CosmeticEdge::copy(void) const return newCE; } -CosmeticEdge* CosmeticEdge::clone(void) const +CosmeticEdge* CosmeticEdge::clone() const { // Base::Console().Message("CE::clone()\n"); CosmeticEdge* cpy = this->copy(); @@ -564,7 +564,7 @@ CosmeticEdge* CosmeticEdge::clone(void) const return cpy; } -PyObject* CosmeticEdge::getPyObject(void) +PyObject* CosmeticEdge::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -578,7 +578,7 @@ PyObject* CosmeticEdge::getPyObject(void) TYPESYSTEM_SOURCE(TechDraw::CenterLine,Base::Persistence) -CenterLine::CenterLine(void) +CenterLine::CenterLine() { m_start = Base::Vector3d(0.0, 0.0, 0.0); m_end = Base::Vector3d(0.0, 0.0, 0.0); @@ -788,7 +788,7 @@ TechDraw::BaseGeomPtr CenterLine::scaledGeometry(TechDraw::DrawViewPart* partFea return newGeom; } -std::string CenterLine::toString(void) const +std::string CenterLine::toString() const { std::stringstream ss; ss << m_start.x << "," << @@ -1172,7 +1172,7 @@ std::pair CenterLine::calcEndPoints2Points(DrawV } // Persistence implementers -unsigned int CenterLine::getMemSize (void) const +unsigned int CenterLine::getMemSize () const { return 1; } @@ -1368,7 +1368,7 @@ void CenterLine::Restore(Base::XMLReader &reader) } } -CenterLine* CenterLine::copy(void) const +CenterLine* CenterLine::copy() const { CenterLine* newCL = new CenterLine(); newCL->m_start = m_start; @@ -1398,7 +1398,7 @@ boost::uuids::uuid CenterLine::getTag() const return tag; } -std::string CenterLine::getTagAsString(void) const +std::string CenterLine::getTagAsString() const { return boost::uuids::to_string(getTag()); } @@ -1427,7 +1427,7 @@ void CenterLine::assignTag(const TechDraw::CenterLine * ce) throw Base::TypeError("CenterLine tag can not be assigned as types do not match."); } -CenterLine *CenterLine::clone(void) const +CenterLine *CenterLine::clone() const { CenterLine* cpy = this->copy(); cpy->tag = this->tag; @@ -1435,7 +1435,7 @@ CenterLine *CenterLine::clone(void) const return cpy; } -PyObject* CenterLine::getPyObject(void) +PyObject* CenterLine::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -1451,12 +1451,12 @@ void CenterLine::setShifts(double h, double v) m_vShift = v; } -double CenterLine::getHShift(void) +double CenterLine::getHShift() { return m_hShift; } -double CenterLine::getVShift(void) +double CenterLine::getVShift() { return m_vShift; } @@ -1466,7 +1466,7 @@ void CenterLine::setRotate(double r) m_rotate = r; } -double CenterLine::getRotate(void) +double CenterLine::getRotate() { return m_rotate; } @@ -1476,7 +1476,7 @@ void CenterLine::setExtend(double e) m_extendBy = e; } -double CenterLine::getExtend(void) +double CenterLine::getExtend() { return m_extendBy; } @@ -1486,7 +1486,7 @@ void CenterLine::setFlip(bool f) m_flip2Line = f; } -bool CenterLine::getFlip(void) +bool CenterLine::getFlip() { return m_flip2Line; } @@ -1538,7 +1538,7 @@ void GeomFormat::dump(const char* title) const Base::Console().Message("GF::dump - %s \n",toString().c_str()); } -std::string GeomFormat::toString(void) const +std::string GeomFormat::toString() const { std::stringstream ss; ss << m_geomIndex << ",$$$," << @@ -1547,7 +1547,7 @@ std::string GeomFormat::toString(void) const } // Persistence implementer -unsigned int GeomFormat::getMemSize (void) const +unsigned int GeomFormat::getMemSize () const { return 1; } @@ -1588,7 +1588,7 @@ boost::uuids::uuid GeomFormat::getTag() const return tag; } -std::string GeomFormat::getTagAsString(void) const +std::string GeomFormat::getTagAsString() const { return boost::uuids::to_string(getTag()); } @@ -1616,7 +1616,7 @@ void GeomFormat::assignTag(const TechDraw::GeomFormat * ce) throw Base::TypeError("GeomFormat tag can not be assigned as types do not match."); } -GeomFormat *GeomFormat::clone(void) const +GeomFormat *GeomFormat::clone() const { GeomFormat* cpy = this->copy(); cpy->tag = this->tag; @@ -1624,7 +1624,7 @@ GeomFormat *GeomFormat::clone(void) const return cpy; } -GeomFormat* GeomFormat::copy(void) const +GeomFormat* GeomFormat::copy() const { GeomFormat* newFmt = new GeomFormat(); newFmt->m_geomIndex = m_geomIndex; @@ -1635,7 +1635,7 @@ GeomFormat* GeomFormat::copy(void) const return newFmt; } -PyObject* GeomFormat::getPyObject(void) +PyObject* GeomFormat::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -1644,7 +1644,7 @@ PyObject* GeomFormat::getPyObject(void) return Py::new_reference_to(PythonObject); } -bool CosmeticVertex::restoreCosmetic(void) +bool CosmeticVertex::restoreCosmetic() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h index f0c6b4a574..40f8ab390f 100644 --- a/src/Mod/TechDraw/App/Cosmetic.h +++ b/src/Mod/TechDraw/App/Cosmetic.h @@ -75,20 +75,20 @@ public: void move(Base::Vector3d newPos); void moveRelative(Base::Vector3d movement); - std::string toString(void) const; + std::string toString() const; void dump(const char* title); Base::Vector3d scaled(double factor); - static bool restoreCosmetic(void); + static bool restoreCosmetic(); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); - virtual PyObject *getPyObject(void); - CosmeticVertex* copy(void) const; - CosmeticVertex* clone(void) const; + virtual PyObject *getPyObject(); + CosmeticVertex* copy() const; + CosmeticVertex* clone() const; Base::Vector3d permaPoint; //permanent, unscaled value int linkGeom; //connection to corresponding "geom" Vertex (fragile - index based!) @@ -99,7 +99,7 @@ public: bool visible; //base class vertex also has visible property boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; protected: //Uniqueness @@ -130,21 +130,21 @@ public: CosmeticEdge(TechDraw::BaseGeomPtr g); virtual ~CosmeticEdge(); - void initialize(void); + void initialize(); TopoDS_Edge TopoDS_EdgeFromVectors(Base::Vector3d pt1, Base::Vector3d pt2); TechDraw::BaseGeomPtr scaledGeometry(double scale); - virtual std::string toString(void) const; + virtual std::string toString() const; void dump(const char* title); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); - virtual PyObject *getPyObject(void); - CosmeticEdge* copy(void) const; - CosmeticEdge* clone(void) const; + virtual PyObject *getPyObject(); + CosmeticEdge* copy() const; + CosmeticEdge* clone() const; Base::Vector3d permaStart; //persistent unscaled start/end points in View coords Base::Vector3d permaEnd; @@ -154,7 +154,7 @@ public: LineFormat m_format; boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; protected: //Uniqueness @@ -206,15 +206,15 @@ public: TechDraw::BaseGeomPtr BaseGeomPtrFromVectors(Base::Vector3d pt1, Base::Vector3d pt2); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); - virtual PyObject *getPyObject(void); - CenterLine* copy(void) const; - CenterLine* clone(void) const; + virtual PyObject *getPyObject(); + CenterLine* copy() const; + CenterLine* clone() const; - std::string toString(void) const; + std::string toString() const; static CenterLine* CenterLineBuilder(TechDraw::DrawViewPart* partFeat, std::vector subs, @@ -254,14 +254,14 @@ public: double rotate, bool flip); void dump(const char* title); void setShifts(double h, double v); - double getHShift(void); - double getVShift(void); + double getHShift(); + double getVShift(); void setRotate(double r); - double getRotate(void); + double getRotate(); void setExtend(double e); - double getExtend(void); + double getExtend(); void setFlip(bool f); - bool getFlip(void); + bool getFlip(); Base::Vector3d m_start; Base::Vector3d m_end; @@ -283,7 +283,7 @@ public: //Uniqueness boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; protected: void initialize(); @@ -312,15 +312,15 @@ public: ~GeomFormat(); // Persistence implementer --------------------- - virtual unsigned int getMemSize(void) const; + virtual unsigned int getMemSize() const; virtual void Save(Base::Writer &/*writer*/) const; virtual void Restore(Base::XMLReader &/*reader*/); - virtual PyObject *getPyObject(void); - GeomFormat* copy(void) const; - GeomFormat* clone(void) const; + virtual PyObject *getPyObject(); + GeomFormat* copy() const; + GeomFormat* clone() const; - std::string toString(void) const; + std::string toString() const; void dump(const char* title) const; //std::string linkTag; @@ -329,7 +329,7 @@ public: //Uniqueness boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; protected: void createNewTag(); diff --git a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp index c1d1fc68ba..8890525326 100644 --- a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp @@ -48,7 +48,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string CosmeticEdgePy::representation(void) const +std::string CosmeticEdgePy::representation() const { std::stringstream ss; ss << " at " << std::hex << this; @@ -157,7 +157,7 @@ void CosmeticEdgePy::setFormat(Py::Object arg) } } -Py::Object CosmeticEdgePy::getFormat(void) const +Py::Object CosmeticEdgePy::getFormat() const { TechDraw::CosmeticEdge* ce = this->getCosmeticEdgePtr(); @@ -176,7 +176,7 @@ Py::Object CosmeticEdgePy::getFormat(void) const return Py::asObject(result); } -Py::String CosmeticEdgePy::getTag(void) const +Py::String CosmeticEdgePy::getTag() const { std::string tmp = boost::uuids::to_string(getCosmeticEdgePtr()->getTag()); return Py::String(tmp); @@ -211,7 +211,7 @@ Py::String CosmeticEdgePy::getTag(void) const // } //} -Py::Object CosmeticEdgePy::getStart(void) const +Py::Object CosmeticEdgePy::getStart() const { Base::Vector3d point = getCosmeticEdgePtr()->permaStart; point = DrawUtil::invertY(point); @@ -245,7 +245,7 @@ void CosmeticEdgePy::setStart(Py::Object arg) // delete oldGeom; } -Py::Object CosmeticEdgePy::getEnd(void) const +Py::Object CosmeticEdgePy::getEnd() const { Base::Vector3d point = getCosmeticEdgePtr()->permaEnd; point = DrawUtil::invertY(point); @@ -279,7 +279,7 @@ void CosmeticEdgePy::setEnd(Py::Object arg) // delete oldGeom; } -Py::Object CosmeticEdgePy::getRadius(void) const +Py::Object CosmeticEdgePy::getRadius() const { TechDraw::GeomType gt = getCosmeticEdgePtr()->m_geometry->geomType; if ( (gt != TechDraw::GeomType::CIRCLE) && @@ -322,7 +322,7 @@ void CosmeticEdgePy::setRadius(Py::Object arg) // delete oldGeom; } -Py::Object CosmeticEdgePy::getCenter(void) const +Py::Object CosmeticEdgePy::getCenter() const { TechDraw::GeomType gt = getCosmeticEdgePtr()->m_geometry->geomType; if ( (gt != TechDraw::GeomType::CIRCLE) && diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h index 7e11311310..cd485dabd4 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.h +++ b/src/Mod/TechDraw/App/CosmeticExtension.h @@ -82,7 +82,7 @@ public: virtual void removeGeomFormat(std::string tag); - PyObject* getExtensionPyObject(void); + PyObject* getExtensionPyObject(); protected: /* virtual void extHandleChangedPropertyName(Base::XMLReader &reader, */ diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp index de93599540..615662150d 100644 --- a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp @@ -36,7 +36,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string CosmeticExtensionPy::representation(void) const +std::string CosmeticExtensionPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp index c9cfd654e9..56864a1a3d 100644 --- a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp @@ -42,7 +42,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string CosmeticVertexPy::representation(void) const +std::string CosmeticVertexPy::representation() const { return ""; } @@ -117,13 +117,13 @@ PyObject* CosmeticVertexPy::copy(PyObject *args) return cpy; } -Py::String CosmeticVertexPy::getTag(void) const +Py::String CosmeticVertexPy::getTag() const { std::string tmp = boost::uuids::to_string(getCosmeticVertexPtr()->getTag()); return Py::String(tmp); } -Py::Object CosmeticVertexPy::getPoint(void) const +Py::Object CosmeticVertexPy::getPoint() const { Base::Vector3d point = getCosmeticVertexPtr()->permaPoint; point = DrawUtil::invertY(point); @@ -150,7 +150,7 @@ void CosmeticVertexPy::setPoint(Py::Object arg) } } -Py::Boolean CosmeticVertexPy::getShow(void) const +Py::Boolean CosmeticVertexPy::getShow() const { bool show = getCosmeticVertexPtr()->visible; return Py::Boolean(show); @@ -168,7 +168,7 @@ void CosmeticVertexPy::setShow(Py::Boolean arg) } } -Py::Object CosmeticVertexPy::getColor(void) const +Py::Object CosmeticVertexPy::getColor() const { App::Color color = getCosmeticVertexPtr()->color; PyObject* pyColor = DrawUtil::colorToPyTuple(color); @@ -192,7 +192,7 @@ void CosmeticVertexPy::setColor(Py::Object arg) } } -Py::Object CosmeticVertexPy::getSize(void) const +Py::Object CosmeticVertexPy::getSize() const { CosmeticVertex* cv = getCosmeticVertexPtr(); double size = cv->size; @@ -215,7 +215,7 @@ void CosmeticVertexPy::setSize(Py::Object arg) cv->size = size; } -Py::Object CosmeticVertexPy::getStyle(void) const +Py::Object CosmeticVertexPy::getStyle() const { CosmeticVertex* cv = getCosmeticVertexPtr(); double style = cv->style; diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.cpp b/src/Mod/TechDraw/App/DrawGeomHatch.cpp index 6e514b282f..37aa3965e5 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.cpp +++ b/src/Mod/TechDraw/App/DrawGeomHatch.cpp @@ -91,7 +91,7 @@ App::PropertyFloatConstraint::Constraints DrawGeomHatch::scaleRange = {Precision PROPERTY_SOURCE(TechDraw::DrawGeomHatch, App::DocumentObject) -DrawGeomHatch::DrawGeomHatch(void) +DrawGeomHatch::DrawGeomHatch() { static const char *vgroup = "GeomHatch"; @@ -159,7 +159,7 @@ short DrawGeomHatch::mustExecute() const } -App::DocumentObjectExecReturn *DrawGeomHatch::execute(void) +App::DocumentObjectExecReturn *DrawGeomHatch::execute() { // Base::Console().Message("DGH::execute()\n"); makeLineSets(); @@ -171,7 +171,7 @@ App::DocumentObjectExecReturn *DrawGeomHatch::execute(void) } -void DrawGeomHatch::makeLineSets(void) +void DrawGeomHatch::makeLineSets() { // Base::Console().Message("DGH::makeLineSets()\n"); if ((!PatIncluded.isEmpty()) && @@ -187,7 +187,7 @@ void DrawGeomHatch::makeLineSets(void) } } -DrawViewPart* DrawGeomHatch::getSourceView(void) const +DrawViewPart* DrawGeomHatch::getSourceView() const { App::DocumentObject* obj = Source.getValue(); DrawViewPart* result = dynamic_cast(obj); @@ -536,7 +536,7 @@ TopoDS_Face DrawGeomHatch::extractFace(DrawViewPart* source, int iface ) return result; } -PyObject *DrawGeomHatch::getPyObject(void) +PyObject *DrawGeomHatch::getPyObject() { if (PythonObject.is(Py::_None())) { PythonObject = Py::Object(new DrawGeomHatchPy(this),true); @@ -580,7 +580,7 @@ void DrawGeomHatch::setupObject() App::DocumentObject::setupObject(); } -void DrawGeomHatch::setupPatIncluded(void) +void DrawGeomHatch::setupPatIncluded() { // Base::Console().Message("DGH::setupPatIncluded()\n"); App::Document* doc = getDocument(); @@ -601,7 +601,7 @@ void DrawGeomHatch::setupPatIncluded(void) } } -void DrawGeomHatch::unsetupObject(void) +void DrawGeomHatch::unsetupObject() { // Base::Console().Message("DGH::unsetupObject() - status: %lu removing: %d \n", getStatus(), isRemoving()); App::DocumentObject* source = Source.getValue(); @@ -612,7 +612,7 @@ void DrawGeomHatch::unsetupObject(void) App::DocumentObject::unsetupObject(); } -std::string DrawGeomHatch::prefGeomHatchFile(void) +std::string DrawGeomHatch::prefGeomHatchFile() { return Preferences::patFile(); } @@ -645,7 +645,7 @@ App::Color DrawGeomHatch::prefGeomHatchColor() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawGeomHatchPython, TechDraw::DrawGeomHatch) -template<> const char* TechDraw::DrawGeomHatchPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawGeomHatchPython::getViewProviderName() const { return "TechDrawGui::ViewProviderGeomHatch"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp index fc2b268dc0..95f4580d28 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp @@ -29,7 +29,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawGeomHatchPy::representation(void) const +std::string DrawGeomHatchPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index c17da8eec6..b62a50d7cc 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -50,34 +50,34 @@ public: App::PropertyFile HatchPattern; App::PropertyFileIncluded SvgIncluded; - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual short mustExecute() const override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderHatch"; } - virtual void unsetupObject(void) override; + virtual void unsetupObject() override; //return PyObject as DrawHatchPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; - DrawViewPart* getSourceView(void) const; + DrawViewPart* getSourceView() const; bool affectsFace(int i); bool removeSub(std::string toRemove); bool removeSub(int i); - bool empty(void); + bool empty(); static bool faceIsHatched(int i,std::vector hatchObjs); - static std::string prefSvgHatch(void); - static App::Color prefSvgHatchColor(void); + static std::string prefSvgHatch(); + static App::Color prefSvgHatchColor(); - bool isSvgHatch(void) const; - bool isBitmapHatch(void) const; + bool isSvgHatch() const; + bool isBitmapHatch() const; protected: void onChanged(const App::Property* prop) override; virtual void onDocumentRestored() override; virtual void setupObject() override; - void setupFileIncluded(void); + void setupFileIncluded(); void replaceFileIncluded(std::string newSvgFile); private: diff --git a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp index 5f0d4dca95..6b18bffcef 100644 --- a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp @@ -31,7 +31,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawHatchPy::representation(void) const +std::string DrawHatchPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.cpp b/src/Mod/TechDraw/App/DrawLeaderLine.cpp index 11c8e4ee3d..96c7f1be0d 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.cpp +++ b/src/Mod/TechDraw/App/DrawLeaderLine.cpp @@ -68,7 +68,7 @@ PROPERTY_SOURCE(TechDraw::DrawLeaderLine, TechDraw::DrawView) // "NONE" // NULL}; -DrawLeaderLine::DrawLeaderLine(void) +DrawLeaderLine::DrawLeaderLine() { static const char *group = "Leader"; @@ -136,7 +136,7 @@ short DrawLeaderLine::mustExecute() const return DrawView::mustExecute(); } -App::DocumentObjectExecReturn *DrawLeaderLine::execute(void) +App::DocumentObjectExecReturn *DrawLeaderLine::execute() { // Base::Console().Message("DLL::execute()\n"); if (!keepUpdated()) { @@ -146,7 +146,7 @@ App::DocumentObjectExecReturn *DrawLeaderLine::execute(void) return DrawView::execute(); } -DrawView* DrawLeaderLine::getBaseView(void) const +DrawView* DrawLeaderLine::getBaseView() const { DrawView* result = nullptr; App::DocumentObject* baseObj = LeaderParent.getValue(); @@ -159,7 +159,7 @@ DrawView* DrawLeaderLine::getBaseView(void) const return result; } -App::DocumentObject* DrawLeaderLine::getBaseObject(void) const +App::DocumentObject* DrawLeaderLine::getBaseObject() const { App::DocumentObject* result = nullptr; DrawView* view = getBaseView(); @@ -169,7 +169,7 @@ App::DocumentObject* DrawLeaderLine::getBaseObject(void) const return result; } -bool DrawLeaderLine::keepUpdated(void) +bool DrawLeaderLine::keepUpdated() { bool result = false; DrawView* view = getBaseView(); @@ -181,7 +181,7 @@ bool DrawLeaderLine::keepUpdated(void) //need separate getParentScale()??? -double DrawLeaderLine::getBaseScale(void) const +double DrawLeaderLine::getBaseScale() const { // Base::Console().Message("DLL::getBaseScale()\n"); double result = 1.0; @@ -195,7 +195,7 @@ double DrawLeaderLine::getBaseScale(void) const return result; } -double DrawLeaderLine::getScale(void) const +double DrawLeaderLine::getScale() const { // Base::Console().Message("DLL::getScale()\n"); double result = 1.0; @@ -211,7 +211,7 @@ double DrawLeaderLine::getScale(void) const return result; } -Base::Vector3d DrawLeaderLine::getAttachPoint(void) +Base::Vector3d DrawLeaderLine::getAttachPoint() { Base::Vector3d result(X.getValue(), Y.getValue(), @@ -219,7 +219,7 @@ Base::Vector3d DrawLeaderLine::getAttachPoint(void) return result; } -void DrawLeaderLine::adjustLastSegment(void) +void DrawLeaderLine::adjustLastSegment() { // Base::Console().Message("DLL::adjustLastSegment()\n"); bool adjust = AutoHorizontal.getValue(); @@ -238,7 +238,7 @@ void DrawLeaderLine::adjustLastSegment(void) } //middle of last line segment -Base::Vector3d DrawLeaderLine::getTileOrigin(void) const +Base::Vector3d DrawLeaderLine::getTileOrigin() const { Base::Vector3d result; std::vector wp = WayPoints.getValues(); @@ -253,7 +253,7 @@ Base::Vector3d DrawLeaderLine::getTileOrigin(void) const } //start of last line segment -Base::Vector3d DrawLeaderLine::getKinkPoint(void) const +Base::Vector3d DrawLeaderLine::getKinkPoint() const { Base::Vector3d result; std::vector wp = WayPoints.getValues(); @@ -268,7 +268,7 @@ Base::Vector3d DrawLeaderLine::getKinkPoint(void) const } //end of last line segment -Base::Vector3d DrawLeaderLine::getTailPoint(void) const +Base::Vector3d DrawLeaderLine::getTailPoint() const { Base::Vector3d result; std::vector wp = WayPoints.getValues(); @@ -283,7 +283,7 @@ Base::Vector3d DrawLeaderLine::getTailPoint(void) const } -bool DrawLeaderLine::getDefAuto(void) const +bool DrawLeaderLine::getDefAuto() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/LeaderLines"); @@ -292,7 +292,7 @@ bool DrawLeaderLine::getDefAuto(void) const } -PyObject *DrawLeaderLine::getPyObject(void) +PyObject *DrawLeaderLine::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -306,7 +306,7 @@ PyObject *DrawLeaderLine::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawLeaderLinePython, TechDraw::DrawLeaderLine) -template<> const char* TechDraw::DrawLeaderLinePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawLeaderLinePython::getViewProviderName() const { return "TechDrawGui::ViewProviderLeader"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.h b/src/Mod/TechDraw/App/DrawLeaderLine.h index 30ab847d06..2204c45840 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.h +++ b/src/Mod/TechDraw/App/DrawLeaderLine.h @@ -53,26 +53,26 @@ public: App::PropertyBool AutoHorizontal; virtual short mustExecute() const override; - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderLeader"; } - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual QRectF getRect() const override { return QRectF(0,0,1,1);} - Base::Vector3d getAttachPoint(void); - DrawView* getBaseView(void) const; - virtual App::DocumentObject* getBaseObject(void) const; - bool keepUpdated(void) override; - double getScale(void) const override; - double getBaseScale(void) const; - void adjustLastSegment(void); - bool getDefAuto(void) const; + Base::Vector3d getAttachPoint(); + DrawView* getBaseView() const; + virtual App::DocumentObject* getBaseObject() const; + bool keepUpdated() override; + double getScale() const override; + double getBaseScale() const; + void adjustLastSegment(); + bool getDefAuto() const; - Base::Vector3d getTileOrigin(void) const; - Base::Vector3d getKinkPoint(void) const; - Base::Vector3d getTailPoint(void) const; + Base::Vector3d getTileOrigin() const; + Base::Vector3d getKinkPoint() const; + Base::Vector3d getTailPoint() const; protected: virtual void onChanged(const App::Property* prop) override; diff --git a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp index a47bed2c28..a7a19cf6b2 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawLeaderLinePy::representation(void) const +std::string DrawLeaderLinePy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index db1671bd1b..4a1562a990 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -39,7 +39,7 @@ class TechDrawExport DrawPage: public App::DocumentObject PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawPage); public: - DrawPage(void); + DrawPage(); virtual ~DrawPage(); App::PropertyLinkList Views; @@ -54,7 +54,7 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} virtual void handleChangedPropertyType( Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; @@ -65,11 +65,11 @@ public: boost::signals2::signal signalGuiPaint; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderPage"; } - PyObject *getPyObject(void) override; + PyObject *getPyObject() override; //App::DocumentObjectExecReturn * recompute(void); @@ -89,18 +89,18 @@ public: */ double getPageHeight() const; const char* getPageOrientation() const; - bool isUnsetting(void) { return nowUnsetting; } - void requestPaint(void); - std::vector getAllViews(void) ; + bool isUnsetting() { return nowUnsetting; } + void requestPaint(); + std::vector getAllViews() ; DrawViewPart *balloonParent; //could be many balloons on page? - int getNextBalloonIndex(void); + int getNextBalloonIndex(); - void updateAllViews(void); - static bool GlobalUpdateDrawings(void); - static bool AllowPageOverride(void); + void updateAllViews(); + static bool GlobalUpdateDrawings(); + static bool AllowPageOverride(); void forceRedraw(bool b) { m_forceRedraw = b; } - bool forceRedraw(void) { return m_forceRedraw; } + bool forceRedraw() { return m_forceRedraw; } void redrawCommand(); bool canUpdate() const; diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp index 882ef4fb05..20798c73bf 100644 --- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp @@ -21,7 +21,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawPagePy::representation(void) const +std::string DrawPagePy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp index e8ab8ce479..00728cecef 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp @@ -48,7 +48,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawParametricTemplate, TechDraw::DrawTemplate) -DrawParametricTemplate::DrawParametricTemplate(void) +DrawParametricTemplate::DrawParametricTemplate() { static const char *group = "Page"; ADD_PROPERTY_TYPE(Template ,(""),group, (App::PropertyType) App::Prop_None,"Template script"); @@ -59,7 +59,7 @@ DrawParametricTemplate::~DrawParametricTemplate() } -PyObject *DrawParametricTemplate::getPyObject(void) +PyObject *DrawParametricTemplate::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -68,7 +68,7 @@ PyObject *DrawParametricTemplate::getPyObject(void) return Py::new_reference_to(PythonObject); } -unsigned int DrawParametricTemplate::getMemSize(void) const +unsigned int DrawParametricTemplate::getMemSize() const { return 0; } @@ -94,7 +94,7 @@ void DrawParametricTemplate::onChanged(const App::Property* prop) App::DocumentObject::onChanged(prop); } -App::DocumentObjectExecReturn *DrawParametricTemplate::execute(void) +App::DocumentObjectExecReturn *DrawParametricTemplate::execute() { std::string temp = Template.getValue(); if (!temp.empty()) { @@ -139,7 +139,7 @@ int DrawParametricTemplate::clearGeometry() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawParametricTemplatePython, TechDraw::DrawParametricTemplate) -template<> const char* TechDraw::DrawParametricTemplatePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawParametricTemplatePython::getViewProviderName() const { return "TechDrawGui::ViewProviderPython"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index f82d4b00a2..d954c4266e 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -53,20 +53,20 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //@} short mustExecute() const; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderTemplate"; } // from base class - virtual PyObject *getPyObject(void); - virtual unsigned int getMemSize(void) const; + virtual PyObject *getPyObject(); + virtual unsigned int getMemSize() const; public: std::vector getGeometry() { return geom; } diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index 119343b92b..9a9cba1884 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -62,7 +62,7 @@ const char* DrawProjGroup::ProjectionTypeEnums[] = {"First Angle", PROPERTY_SOURCE(TechDraw::DrawProjGroup, TechDraw::DrawViewCollection) -DrawProjGroup::DrawProjGroup(void) : +DrawProjGroup::DrawProjGroup() : m_lockScale(false) { static const char *group = "Base"; @@ -97,7 +97,7 @@ DrawProjGroup::~DrawProjGroup() } //TODO: this duplicates code in DVP -std::vector DrawProjGroup::getAllSources(void) const +std::vector DrawProjGroup::getAllSources() const { // Base::Console().Message("DPG::getAllSources()\n"); const std::vector links = Source.getValues(); @@ -164,7 +164,7 @@ void DrawProjGroup::onChanged(const App::Property* prop) TechDraw::DrawViewCollection::onChanged(prop); } -App::DocumentObjectExecReturn *DrawProjGroup::execute(void) +App::DocumentObjectExecReturn *DrawProjGroup::execute() { // Base::Console().Message("DPG::execute() - %s\n", getNameInDocument()); if (!keepUpdated()) @@ -253,7 +253,7 @@ Base::BoundBox3d DrawProjGroup::getBoundingBox() const return bbox; } -TechDraw::DrawPage * DrawProjGroup::getPage(void) const +TechDraw::DrawPage * DrawProjGroup::getPage() const { return findParentPage(); } @@ -937,7 +937,7 @@ void DrawProjGroup::makeViewBbs(DrawProjGroupItem *viewPtrs[10], } } -void DrawProjGroup::recomputeChildren(void) +void DrawProjGroup::recomputeChildren() { // Base::Console().Message("DPG::recomputeChildren()\n"); for( const auto it : Views.getValues() ) { @@ -949,7 +949,7 @@ void DrawProjGroup::recomputeChildren(void) } } -void DrawProjGroup::autoPositionChildren(void) +void DrawProjGroup::autoPositionChildren() { for( const auto it : Views.getValues() ) { auto view( dynamic_cast(it) ); @@ -963,7 +963,7 @@ void DrawProjGroup::autoPositionChildren(void) /*! * tell children DPGIs that parent DPG has changed Scale */ -void DrawProjGroup::updateChildrenScale(void) +void DrawProjGroup::updateChildrenScale() { // Base::Console().Message("DPG::updateChildrenScale\n"); for( const auto it : Views.getValues() ) { @@ -982,7 +982,7 @@ void DrawProjGroup::updateChildrenScale(void) /*! * tell children DPGIs that parent DPG has changed Source */ -void DrawProjGroup::updateChildrenSource(void) +void DrawProjGroup::updateChildrenSource() { for( const auto it : Views.getValues() ) { auto view( dynamic_cast(it) ); @@ -1006,7 +1006,7 @@ void DrawProjGroup::updateChildrenSource(void) * tell children DPGIs that parent DPG has changed LockPosition * (really for benefit of QGIV on Gui side) */ -void DrawProjGroup::updateChildrenLock(void) +void DrawProjGroup::updateChildrenLock() { for( const auto it : Views.getValues() ) { auto view( dynamic_cast(it) ); @@ -1021,7 +1021,7 @@ void DrawProjGroup::updateChildrenLock(void) } } -void DrawProjGroup::updateViews(void) { +void DrawProjGroup::updateViews() { // this is intended to update the views in general, e.g. when the spacing changed for (const auto it : Views.getValues()) { auto view(dynamic_cast(it)); @@ -1036,7 +1036,7 @@ void DrawProjGroup::updateViews(void) { } } -void DrawProjGroup::updateChildrenEnforce(void) +void DrawProjGroup::updateChildrenEnforce() { for( const auto it : Views.getValues() ) { auto view( dynamic_cast(it) ); @@ -1051,7 +1051,7 @@ void DrawProjGroup::updateChildrenEnforce(void) } } -App::Enumeration DrawProjGroup::usedProjectionType(void) +App::Enumeration DrawProjGroup::usedProjectionType() { //TODO: Would've been nice to have an Enumeration(const PropertyEnumeration &) constructor App::Enumeration ret(ProjectionTypeEnums, ProjectionType.getValueAsString()); @@ -1064,7 +1064,7 @@ App::Enumeration DrawProjGroup::usedProjectionType(void) return ret; } -bool DrawProjGroup::hasAnchor(void) +bool DrawProjGroup::hasAnchor() { bool result = false; App::DocumentObject* docObj = Anchor.getValue(); @@ -1074,7 +1074,7 @@ bool DrawProjGroup::hasAnchor(void) return result; } -TechDraw::DrawProjGroupItem* DrawProjGroup::getAnchor(void) +TechDraw::DrawProjGroupItem* DrawProjGroup::getAnchor() { DrawProjGroupItem* result = nullptr; App::DocumentObject* docObj = Anchor.getValue(); @@ -1091,7 +1091,7 @@ void DrawProjGroup::setAnchorDirection(const Base::Vector3d dir) item->Direction.setValue(dir); } -Base::Vector3d DrawProjGroup::getAnchorDirection(void) +Base::Vector3d DrawProjGroup::getAnchorDirection() { Base::Vector3d result; App::DocumentObject* docObj = Anchor.getValue(); @@ -1236,7 +1236,7 @@ std::vector DrawProjGroup::getViewsAsDPGI() return result; } -int DrawProjGroup::getDefProjConv(void) const +int DrawProjGroup::getDefProjConv() const { return Preferences::projectionAngle(); } @@ -1260,7 +1260,7 @@ void DrawProjGroup::dumpISO(const char * title) } } -PyObject *DrawProjGroup::getPyObject(void) +PyObject *DrawProjGroup::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h index 33a64e60d5..5f77a4da18 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.h +++ b/src/Mod/TechDraw/App/DrawProjGroup.h @@ -71,7 +71,7 @@ public: Base::BoundBox3d getBoundingBox() const; double calculateAutomaticScale() const; - virtual QRectF getRect(void) const override; + virtual QRectF getRect() const override; /// Check if container has a view of a specific type bool hasProjection(const char *viewProjType) const; @@ -97,26 +97,26 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderProjGroup"; } //return PyObject as DrawProjGroupPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; /// Determines either "First Angle" or "Third Angle". - App::Enumeration usedProjectionType(void); + App::Enumeration usedProjectionType(); /// Allowed projection types - either Document, First Angle or Third Angle static const char* ProjectionTypeEnums[]; - bool hasAnchor(void); + bool hasAnchor(); void setAnchorDirection(Base::Vector3d dir); - Base::Vector3d getAnchorDirection(void); - TechDraw::DrawProjGroupItem* getAnchor(void); + Base::Vector3d getAnchorDirection(); + TechDraw::DrawProjGroupItem* getAnchor(); std::pair getDirsFromFront(DrawProjGroupItem* view); std::pair getDirsFromFront(std::string viewType); @@ -128,12 +128,12 @@ public: void dumpISO(const char * title); std::vector getViewsAsDPGI(); - void recomputeChildren(void); - void updateChildrenScale(void); - void autoPositionChildren(void); - void updateChildrenEnforce(void); + void recomputeChildren(); + void updateChildrenScale(); + void autoPositionChildren(); + void updateChildrenEnforce(); - std::vector getAllSources(void) const; + std::vector getAllSources() const; protected: @@ -166,13 +166,13 @@ protected: double &width, double &height) const; /// Returns pointer to our page, or NULL if it couldn't be located - TechDraw::DrawPage * getPage(void) const; + TechDraw::DrawPage * getPage() const; - void updateChildrenSource(void); - void updateChildrenLock(void); - void updateViews(void); + void updateChildrenSource(); + void updateChildrenLock(); + void updateViews(); int getViewIndex(const char *viewTypeCStr) const; - int getDefProjConv(void) const; + int getDefProjConv() const; Base::Vector3d dir2vec(gp_Dir d); gp_Dir vec2dir(Base::Vector3d v); diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.h b/src/Mod/TechDraw/App/DrawProjGroupItem.h index 964c5dc693..a9453be62d 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.h +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.h @@ -64,31 +64,31 @@ public: virtual void onDocumentRestored() override; virtual void unsetupObject() override; - DrawProjGroup* getPGroup(void) const; + DrawProjGroup* getPGroup() const; double getRotateAngle(); - virtual Base::Vector3d getXDirection(void) const override; + virtual Base::Vector3d getXDirection() const override; virtual Base::Vector3d getLegacyX(const Base::Vector3d& pt, const Base::Vector3d& axis, const bool flip = true) const override; - virtual App::DocumentObjectExecReturn *execute(void) override; - virtual const char* getViewProviderName(void) const override { + virtual App::DocumentObjectExecReturn *execute() override; + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderProjGroupItem"; } //return PyObject as DrawProjGroupItemPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; //this doesn't override for dvp pointer?? virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt, const Base::Vector3d& direction, const bool flip=true) const override; - virtual double getScale(void) const override; - void autoPosition(void); - bool isAnchor(void) const; + virtual double getScale() const override; + void autoPosition(); + bool isAnchor() const; //DPGI always fits on page since DPG handles scaling - virtual bool checkFit(void) const override { return true; } + virtual bool checkFit() const override { return true; } virtual bool checkFit(DrawPage*) const override { return true; } virtual int countParentPages() const override; @@ -97,8 +97,8 @@ public: protected: void onChanged(const App::Property* prop) override; - virtual bool isLocked(void) const override; - virtual bool showLock(void) const override; + virtual bool isLocked() const override; + virtual bool showLock() const override; private: static const char* TypeEnums[]; diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp index 661ed5b08b..1bb04e721e 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp @@ -10,7 +10,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawProjGroupItemPy::representation(void) const +std::string DrawProjGroupItemPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp index b61f33707c..57555c81d6 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp @@ -37,7 +37,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawProjGroupPy::representation(void) const +std::string DrawProjGroupPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp index 90a5ba7543..e5a78a7942 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp +++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp @@ -470,7 +470,7 @@ std::vector DrawProjectSplit::sortEdges(std::vector& //************************* //* edgeSortItem Methods //************************* -std::string edgeSortItem::dump(void) +std::string edgeSortItem::dump() { std::string result; std::stringstream builder; diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.h b/src/Mod/TechDraw/App/DrawProjectSplit.h index fc550a7777..4a7ec6c359 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.h +++ b/src/Mod/TechDraw/App/DrawProjectSplit.h @@ -65,7 +65,7 @@ public: static bool edgeLess(const edgeSortItem& e1, const edgeSortItem& e2); static bool edgeEqual(const edgeSortItem& e1, const edgeSortItem& e2); - std::string dump(void); + std::string dump(); }; class TechDrawExport DrawProjectSplit { diff --git a/src/Mod/TechDraw/App/DrawRichAnno.cpp b/src/Mod/TechDraw/App/DrawRichAnno.cpp index bff24be48a..eecd162d40 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.cpp +++ b/src/Mod/TechDraw/App/DrawRichAnno.cpp @@ -43,7 +43,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::DrawRichAnno, TechDraw::DrawView) -DrawRichAnno::DrawRichAnno(void) +DrawRichAnno::DrawRichAnno() { static const char *group = "Text Block"; @@ -86,7 +86,7 @@ short DrawRichAnno::mustExecute() const return DrawView::mustExecute(); } -App::DocumentObjectExecReturn *DrawRichAnno::execute(void) +App::DocumentObjectExecReturn *DrawRichAnno::execute() { // Base::Console().Message("DRA::execute() - @ (%.3f, %.3f)\n", X.getValue(), Y.getValue()); if (!keepUpdated()) { @@ -95,14 +95,14 @@ App::DocumentObjectExecReturn *DrawRichAnno::execute(void) return DrawView::execute(); } -DrawView* DrawRichAnno::getBaseView(void) const +DrawView* DrawRichAnno::getBaseView() const { // Base::Console().Message("DRA::getBaseView() - %s\n", getNameInDocument()); return dynamic_cast(AnnoParent.getValue()); } -PyObject *DrawRichAnno::getPyObject(void) +PyObject *DrawRichAnno::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -116,7 +116,7 @@ PyObject *DrawRichAnno::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawRichAnnoPython, TechDraw::DrawRichAnno) -template<> const char* TechDraw::DrawRichAnnoPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawRichAnnoPython::getViewProviderName() const { return "TechDrawGui::ViewProviderRichAnno"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h index 1562783aa1..a2fdb3aee4 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.h +++ b/src/Mod/TechDraw/App/DrawRichAnno.h @@ -46,14 +46,14 @@ public: App::PropertyFloat MaxWidth; virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderRichAnno"; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual QRectF getRect() const { return QRectF(0,0,1,1);} - DrawView* getBaseView(void) const; + DrawView* getBaseView() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp index 3897903f88..34920a8f64 100644 --- a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawRichAnnoPy::representation(void) const +std::string DrawRichAnnoPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index 3a78e202f4..ab79410fce 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -85,7 +85,7 @@ DrawSVGTemplate::~DrawSVGTemplate() { } -PyObject *DrawSVGTemplate::getPyObject(void) +PyObject *DrawSVGTemplate::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -94,7 +94,7 @@ PyObject *DrawSVGTemplate::getPyObject(void) return Py::new_reference_to(PythonObject); } -unsigned int DrawSVGTemplate::getMemSize(void) const +unsigned int DrawSVGTemplate::getMemSize() const { return 0; } @@ -132,7 +132,7 @@ void DrawSVGTemplate::onChanged(const App::Property* prop) TechDraw::DrawTemplate::onChanged(prop); } -App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void) +App::DocumentObjectExecReturn * DrawSVGTemplate::execute() { std::string templateFilename = Template.getValue(); if (templateFilename.empty()) @@ -330,7 +330,7 @@ std::map DrawSVGTemplate::getEditableTextsFromTemplate namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawSVGTemplatePython, TechDraw::DrawSVGTemplate) -template<> const char* TechDraw::DrawSVGTemplatePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawSVGTemplatePython::getViewProviderName() const { return "TechDrawGui::ViewProviderPython"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp index 15bd483952..f7885a9ea0 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp @@ -31,7 +31,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawSVGTemplatePy::representation(void) const +std::string DrawSVGTemplatePy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp index bbd17b98ce..6e28a5bd3c 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawTemplate.cpp @@ -52,7 +52,7 @@ const char* DrawTemplate::OrientationEnums[]= {"Portrait", -DrawTemplate::DrawTemplate(void) +DrawTemplate::DrawTemplate() { const char *group = "Page Properties"; @@ -74,7 +74,7 @@ DrawTemplate::~DrawTemplate() } -PyObject *DrawTemplate::getPyObject(void) +PyObject *DrawTemplate::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -83,7 +83,7 @@ PyObject *DrawTemplate::getPyObject(void) return Py::new_reference_to(PythonObject); } -unsigned int DrawTemplate::getMemSize(void) const +unsigned int DrawTemplate::getMemSize() const { return 0; } @@ -109,7 +109,7 @@ void DrawTemplate::onChanged(const App::Property* prop) App::DocumentObject::onChanged(prop); } -App::DocumentObjectExecReturn *DrawTemplate::execute(void) +App::DocumentObjectExecReturn *DrawTemplate::execute() { DrawPage *page = nullptr; std::vector parent = getInList(); @@ -143,7 +143,7 @@ DrawPage* DrawTemplate::getParentPage() const namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawTemplatePython, TechDraw::DrawTemplate) -template<> const char* TechDraw::DrawTemplatePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawTemplatePython::getViewProviderName() const { return "TechDrawGui::ViewProviderPython"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp index bdc53afe9a..219eaf5010 100644 --- a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp @@ -34,7 +34,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawTemplatePy::representation(void) const +std::string DrawTemplatePy::representation() const { return ""; } diff --git a/src/Mod/TechDraw/App/DrawTile.cpp b/src/Mod/TechDraw/App/DrawTile.cpp index 564c07e2d6..b93b663061 100644 --- a/src/Mod/TechDraw/App/DrawTile.cpp +++ b/src/Mod/TechDraw/App/DrawTile.cpp @@ -43,7 +43,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::DrawTile, App::DocumentObject) -DrawTile::DrawTile(void) +DrawTile::DrawTile() { static const char *group = "Tile"; @@ -80,7 +80,7 @@ short DrawTile::mustExecute() const return DocumentObject::mustExecute(); } -App::DocumentObjectExecReturn *DrawTile::execute(void) +App::DocumentObjectExecReturn *DrawTile::execute() { // Base::Console().Message("DT::execute()\n"); return DocumentObject::execute(); @@ -98,13 +98,13 @@ void DrawTile::handleChangedPropertyType(Base::XMLReader &reader, const char *Ty } } -DrawView* DrawTile::getParent(void) const +DrawView* DrawTile::getParent() const { // Base::Console().Message("DT::getParent() - %s\n", getNameInDocument()); return dynamic_cast(TileParent.getValue()); } -PyObject *DrawTile::getPyObject(void) +PyObject *DrawTile::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -118,7 +118,7 @@ PyObject *DrawTile::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawTilePython, TechDraw::DrawTile) -template<> const char* TechDraw::DrawTilePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawTilePython::getViewProviderName() const { return "TechDrawGui::ViewProviderTile"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawTilePyImp.cpp b/src/Mod/TechDraw/App/DrawTilePyImp.cpp index a5048328d3..04f1b7b758 100644 --- a/src/Mod/TechDraw/App/DrawTilePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawTilePyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawTilePy::representation(void) const +std::string DrawTilePy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawTileWeld.cpp b/src/Mod/TechDraw/App/DrawTileWeld.cpp index 9fe1e004b0..5badce1767 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.cpp +++ b/src/Mod/TechDraw/App/DrawTileWeld.cpp @@ -48,7 +48,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::DrawTileWeld, TechDraw::DrawTile) -DrawTileWeld::DrawTileWeld(void) +DrawTileWeld::DrawTileWeld() { static const char *group = "TileWeld"; @@ -92,7 +92,7 @@ short DrawTileWeld::mustExecute() const return DrawTile::mustExecute(); } -App::DocumentObjectExecReturn *DrawTileWeld::execute(void) +App::DocumentObjectExecReturn *DrawTileWeld::execute() { // Base::Console().Message("DTW::execute()\n"); return DrawTile::execute(); @@ -135,7 +135,7 @@ void DrawTileWeld::setupObject() DrawTile::setupObject(); } -void DrawTileWeld::setupSymbolIncluded(void) +void DrawTileWeld::setupSymbolIncluded() { // Base::Console().Message("DTW::setupSymbolIncluded()\n"); App::Document* doc = getDocument(); @@ -161,14 +161,14 @@ void DrawTileWeld::setupSymbolIncluded(void) } //standard preference getter (really a default in this case) -std::string DrawTileWeld::prefSymbol(void) +std::string DrawTileWeld::prefSymbol() { std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Symbols/Welding/"; std::string defaultFileName = defaultDir + "blankTile.svg"; return defaultFileName; } -PyObject *DrawTileWeld::getPyObject(void) +PyObject *DrawTileWeld::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -182,7 +182,7 @@ PyObject *DrawTileWeld::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawTileWeldPython, TechDraw::DrawTileWeld) -template<> const char* TechDraw::DrawTileWeldPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawTileWeldPython::getViewProviderName() const { return "TechDrawGui::ViewProviderTile"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h index 90435aafdd..cb1d5d9a6d 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.h +++ b/src/Mod/TechDraw/App/DrawTileWeld.h @@ -49,21 +49,21 @@ public: App::PropertyFileIncluded SymbolIncluded; virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); virtual void onDocumentRestored(); virtual void setupObject(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderTile"; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual QRectF getRect() const { return QRectF(0,0,1,1);} void replaceSymbolIncluded(std::string newSymbolFile); - void setupSymbolIncluded(void); + void setupSymbolIncluded(); // void replaceSymbol(std::string newSymbolFile); - std::string prefSymbol(void); + std::string prefSymbol(); protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index c71bb499a8..3b2c3c061a 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -72,7 +72,7 @@ App::PropertyFloatConstraint::Constraints DrawView::scaleRange = {Precision::Con PROPERTY_SOURCE(TechDraw::DrawView, App::DocumentObject) -DrawView::DrawView(void): +DrawView::DrawView(): autoPos(true), mouseMove(false) { @@ -96,7 +96,7 @@ DrawView::~DrawView() { } -App::DocumentObjectExecReturn *DrawView::execute(void) +App::DocumentObjectExecReturn *DrawView::execute() { // Base::Console().Message("DV::execute() - %s touched: %d\n", getNameInDocument(), isTouched()); if (!findParentPage()) { @@ -109,7 +109,7 @@ App::DocumentObjectExecReturn *DrawView::execute(void) return App::DocumentObject::execute(); } -void DrawView::checkScale(void) +void DrawView::checkScale() { TechDraw::DrawPage *page = findParentPage(); if(page) { @@ -164,18 +164,18 @@ void DrawView::onChanged(const App::Property* prop) App::DocumentObject::onChanged(prop); } -bool DrawView::isLocked(void) const +bool DrawView::isLocked() const { return LockPosition.getValue(); } -bool DrawView::showLock(void) const +bool DrawView::showLock() const { return true; } //override this for View inside a group (ex DPGI in DPG) -void DrawView::handleXYLock(void) +void DrawView::handleXYLock() { if (isLocked()) { if (!X.testStatus(App::Property::ReadOnly)) { @@ -335,7 +335,7 @@ bool DrawView::isInClip() return false; } -DrawViewClip* DrawView::getClipGroup(void) +DrawViewClip* DrawView::getClipGroup() { std::vector parent = getInList(); App::DocumentObject* obj = nullptr; @@ -351,7 +351,7 @@ DrawViewClip* DrawView::getClipGroup(void) return result; } -double DrawView::autoScale(void) const +double DrawView::autoScale() const { auto page = findParentPage(); double w = page->getPageWidth(); @@ -378,7 +378,7 @@ double DrawView::autoScale(double pw, double ph) const return sensibleScale; } -bool DrawView::checkFit(void) const +bool DrawView::checkFit() const { auto page = findParentPage(); return checkFit(page); @@ -424,7 +424,7 @@ void DrawView::setPosition(double x, double y, bool force) } } -double DrawView::getScale(void) const +double DrawView::getScale() const { auto result = Scale.getValue(); if (ScaleType.isValue("Page")) { @@ -531,7 +531,7 @@ void DrawView::handleChangedPropertyType( } } -bool DrawView::keepUpdated(void) +bool DrawView::keepUpdated() { // Base::Console().Message("DV::keepUpdated() - %s\n", getNameInDocument()); bool result = false; @@ -553,7 +553,7 @@ void DrawView::setScaleAttribute() } } -int DrawView::prefScaleType(void) +int DrawView::prefScaleType() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); @@ -561,7 +561,7 @@ int DrawView::prefScaleType(void) return result; } -double DrawView::prefScale(void) +double DrawView::prefScale() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); @@ -575,13 +575,13 @@ double DrawView::prefScale(void) return result; } -void DrawView::requestPaint(void) +void DrawView::requestPaint() { // Base::Console().Message("DV::requestPaint() - %s\n", getNameInDocument()); signalGuiPaint(this); } -PyObject *DrawView::getPyObject(void) +PyObject *DrawView::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -595,7 +595,7 @@ PyObject *DrawView::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPython, TechDraw::DrawView) -template<> const char* TechDraw::DrawViewPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewPython::getViewProviderName() const { return "TechDrawGui::ViewProviderDrawingView"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index f60534e4b1..d123f0e8c3 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -51,7 +51,7 @@ class TechDrawExport DrawView : public App::DocumentObject public: /// Constructor - DrawView(void); + DrawView(); virtual ~DrawView(); App::PropertyDistance X; @@ -66,7 +66,7 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual void onDocumentRestored() override; virtual short mustExecute() const override; //@} @@ -74,34 +74,34 @@ public: Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; bool isInClip(); - DrawViewClip* getClipGroup(void); + DrawViewClip* getClipGroup(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDrawingView"; } //return PyObject as DrawViewPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual DrawPage* findParentPage() const; virtual std::vector findAllParentPages() const; virtual int countParentPages() const; virtual QRectF getRect() const; //must be overridden by derived class - virtual double autoScale(void) const; + virtual double autoScale() const; virtual double autoScale(double w, double h) const; - virtual bool checkFit(void) const; + virtual bool checkFit() const; virtual bool checkFit(DrawPage*) const; virtual void setPosition(double x, double y, bool force = false); - virtual bool keepUpdated(void); + virtual bool keepUpdated(); boost::signals2::signal signalGuiPaint; - virtual double getScale(void) const; - void checkScale(void); - void requestPaint(void); - virtual void handleXYLock(void); - virtual bool isLocked(void) const; - virtual bool showLock(void) const; + virtual double getScale() const; + void checkScale(); + void requestPaint(); + virtual void handleXYLock(); + virtual bool isLocked() const; + virtual bool showLock() const; - std::vector getLeaders(void) const; + std::vector getLeaders() const; void setScaleAttribute(); protected: @@ -111,8 +111,8 @@ protected: bool autoPos; bool mouseMove; - int prefScaleType(void); - double prefScale(void); + int prefScaleType(); + double prefScale(); private: static const char* ScaleTypeEnums[]; diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp index 4ade865af5..8a4de555e0 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp @@ -55,7 +55,7 @@ const char* DrawViewAnnotation::TextStyleEnums[]= {"Normal", "Bold-Italic", nullptr}; -DrawViewAnnotation::DrawViewAnnotation(void) +DrawViewAnnotation::DrawViewAnnotation() { static const char *vgroup = "Annotation"; @@ -131,7 +131,7 @@ QRectF DrawViewAnnotation::getRect() const return QRectF(0,0,getScale() * w,getScale() * h); } -App::DocumentObjectExecReturn *DrawViewAnnotation::execute(void) +App::DocumentObjectExecReturn *DrawViewAnnotation::execute() { requestPaint(); return TechDraw::DrawView::execute(); @@ -142,7 +142,7 @@ App::DocumentObjectExecReturn *DrawViewAnnotation::execute(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewAnnotationPython, TechDraw::DrawViewAnnotation) -template<> const char* TechDraw::DrawViewAnnotationPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewAnnotationPython::getViewProviderName() const { return "TechDrawGui::ViewProviderAnnotation"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 976c5ead37..17be99e269 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -41,7 +41,7 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView public: /// Constructor - DrawViewAnnotation(void); + DrawViewAnnotation(); virtual ~DrawViewAnnotation(); App::PropertyStringList Text; @@ -57,11 +57,11 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderAnnotation"; } diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp index 3f97b734d4..ac242215af 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp @@ -42,7 +42,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawViewAnnotationPy::representation(void) const +std::string DrawViewAnnotationPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp index 6cfe5791de..99b5abb9ec 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.cpp +++ b/src/Mod/TechDraw/App/DrawViewArch.cpp @@ -52,7 +52,7 @@ const char* DrawViewArch::RenderModeEnums[]= {"Wireframe", "Coin mono", nullptr}; -DrawViewArch::DrawViewArch(void) +DrawViewArch::DrawViewArch() { static const char *group = "Arch view"; @@ -97,7 +97,7 @@ short DrawViewArch::mustExecute() const } -App::DocumentObjectExecReturn *DrawViewArch::execute(void) +App::DocumentObjectExecReturn *DrawViewArch::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -144,7 +144,7 @@ App::DocumentObjectExecReturn *DrawViewArch::execute(void) return DrawView::execute(); } -std::string DrawViewArch::getSVGHead(void) +std::string DrawViewArch::getSVGHead() { std::string head = std::string(""; } diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index 26cde405a3..75b733b095 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -39,7 +39,7 @@ class TechDrawExport DrawViewArch : public TechDraw::DrawViewSymbol public: /// Constructor - DrawViewArch(void); + DrawViewArch(); virtual ~DrawViewArch(); App::PropertyLink Source; @@ -56,11 +56,11 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderArch"; } @@ -70,8 +70,8 @@ public: protected: /* virtual void onChanged(const App::Property* prop) override;*/ Base::BoundBox3d bbox; - std::string getSVGHead(void); - std::string getSVGTail(void); + std::string getSVGHead(); + std::string getSVGTail(); private: static const char* RenderModeEnums[]; diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp index ba4c9e1b7e..811ec1703f 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp +++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp @@ -90,7 +90,7 @@ const char* DrawViewBalloon::balloonTypeEnums[]= {"Circular", "Line", nullptr}; -DrawViewBalloon::DrawViewBalloon(void) +DrawViewBalloon::DrawViewBalloon() { ADD_PROPERTY_TYPE(Text, (""), "", App::Prop_None, "The text to be displayed"); ADD_PROPERTY_TYPE(SourceView, (nullptr), "", (App::PropertyType)(App::Prop_None), "Source view for balloon"); @@ -212,7 +212,7 @@ short DrawViewBalloon::mustExecute() const return DrawView::mustExecute(); } -void DrawViewBalloon::handleXYLock(void) { +void DrawViewBalloon::handleXYLock() { bool on = isLocked(); if (!OriginX.testStatus(App::Property::ReadOnly)) { OriginX.setStatus(App::Property::ReadOnly, on); @@ -233,7 +233,7 @@ DrawViewPart* DrawViewBalloon::getViewPart() const return result; } -App::DocumentObjectExecReturn *DrawViewBalloon::execute(void) +App::DocumentObjectExecReturn *DrawViewBalloon::execute() { requestPaint(); return App::DocumentObject::execute(); @@ -247,7 +247,7 @@ void DrawViewBalloon::setOrigin(Base::Vector3d newOrigin) origin = QPointF(newOrigin.x, newOrigin.y); } -double DrawViewBalloon::prefKinkLength(void) const +double DrawViewBalloon::prefKinkLength() const { Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")-> @@ -255,14 +255,14 @@ double DrawViewBalloon::prefKinkLength(void) const return hGrp->GetFloat("BalloonKink", 5.0); } -int DrawViewBalloon::prefShape(void) const +int DrawViewBalloon::prefShape() const { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); return hGrp->GetInt("BalloonShape", 0); } -int DrawViewBalloon::prefEnd(void) const +int DrawViewBalloon::prefEnd() const { return Preferences::balloonArrow(); } diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h index dcc5d24c6e..b09dc0d186 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.h +++ b/src/Mod/TechDraw/App/DrawViewBalloon.h @@ -68,19 +68,19 @@ public: //virtual PyObject *getPyObject(void); - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderBalloon"; } static const char* balloonTypeEnums[]; - void handleXYLock(void) override; + void handleXYLock() override; - double prefKinkLength(void) const; - int prefShape(void) const; - int prefEnd(void) const; + double prefKinkLength() const; + int prefShape() const; + int prefEnd() const; void setOrigin(Base::Vector3d newOrigin); Base::Vector3d getOriginOffset() const; diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp index 11d785aaf5..2dd37225ee 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.cpp +++ b/src/Mod/TechDraw/App/DrawViewClip.cpp @@ -45,7 +45,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawViewClip, TechDraw::DrawView) -DrawViewClip::DrawViewClip(void) +DrawViewClip::DrawViewClip() { static const char *group = "Clip Group"; //App::PropertyType hidden = (App::PropertyType)(App::Prop_Hidden); @@ -104,7 +104,7 @@ void DrawViewClip::removeView(DrawView *view) Views.setValues(newViews); } -App::DocumentObjectExecReturn *DrawViewClip::execute(void) +App::DocumentObjectExecReturn *DrawViewClip::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -159,7 +159,7 @@ bool DrawViewClip::isViewInClip(App::DocumentObject* view) return false; } -PyObject *DrawViewClip::getPyObject(void) +PyObject *DrawViewClip::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -174,7 +174,7 @@ PyObject *DrawViewClip::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewClipPython, TechDraw::DrawViewClip) -template<> const char* TechDraw::DrawViewClipPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewClipPython::getViewProviderName() const { return "TechDrawGui::ViewProviderViewClip"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index e498de1d48..68c89c21e9 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -41,7 +41,7 @@ class TechDrawExport DrawViewClip: public TechDraw::DrawView public: /// Constructor - DrawViewClip(void); + DrawViewClip(); virtual ~DrawViewClip(); App::PropertyLength Width; @@ -56,19 +56,19 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderViewClip"; } //return PyObject as DrawViewClipPy - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); std::vector getChildViewNames(); bool isViewInClip(App::DocumentObject* view); - virtual QRectF getRect(void) const { return QRectF(0,0,Width.getValue(),Height.getValue()); } + virtual QRectF getRect() const { return QRectF(0,0,Width.getValue(),Height.getValue()); } protected: diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp index 79f7e26f52..a270f43203 100644 --- a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp @@ -36,7 +36,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawViewClipPy::representation(void) const +std::string DrawViewClipPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp index 9a93f747be..5a41db3728 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp @@ -69,7 +69,7 @@ short DrawViewCollection::mustExecute() const } } -App::DocumentObjectExecReturn *DrawViewCollection::execute(void) +App::DocumentObjectExecReturn *DrawViewCollection::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -155,7 +155,7 @@ void DrawViewCollection::onDocumentRestored() DrawView::execute(); } -void DrawViewCollection::lockChildren(void) +void DrawViewCollection::lockChildren() { // Base::Console().Message("DVC::lockChildren()\n"); for (auto& v:Views.getValues()) { diff --git a/src/Mod/TechDraw/App/DrawViewCollection.h b/src/Mod/TechDraw/App/DrawViewCollection.h index b76046d69f..8c9b8bcc53 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.h +++ b/src/Mod/TechDraw/App/DrawViewCollection.h @@ -48,21 +48,21 @@ public: int addView(DrawView *view); int removeView(DrawView *view); - void rebuildViewList(void); - bool isUnsetting(void) { return nowUnsetting; } + void rebuildViewList(); + bool isUnsetting() { return nowUnsetting; } int countChildren(); - void lockChildren(void); + void lockChildren(); virtual void onDocumentRestored(); - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); virtual void unsetupObject(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderViewCollection"; } - virtual QRectF getRect(void) const; + virtual QRectF getRect() const; protected: void onChanged(const App::Property* prop); diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp index 5fcd93a8c8..961249b84d 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.cpp +++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp @@ -190,7 +190,7 @@ void DrawViewDetail::onChanged(const App::Property* prop) DrawView::onChanged(prop); } -App::DocumentObjectExecReturn *DrawViewDetail::execute(void) +App::DocumentObjectExecReturn *DrawViewDetail::execute() { // Base::Console().Message("DVD::execute() - %s\n", Label.getValue()); if (!keepUpdated()) { @@ -522,7 +522,7 @@ TopoDS_Shape DrawViewDetail::projectEdgesOntoFace(TopoDS_Shape edgeShape, TopoDS //we don't want to paint detail highlights on top of detail views, //so tell the Gui that there are no details for this view -std::vector DrawViewDetail::getDetailRefs(void) const +std::vector DrawViewDetail::getDetailRefs() const { return std::vector(); } @@ -532,7 +532,7 @@ double DrawViewDetail::getFudgeRadius() return Radius.getValue() * m_fudge; } -bool DrawViewDetail::debugDetail(void) const +bool DrawViewDetail::debugDetail() const { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/debug"); @@ -559,7 +559,7 @@ void DrawViewDetail::getParameters() namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewDetailPython, TechDraw::DrawViewDetail) -template<> const char* TechDraw::DrawViewDetailPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewDetailPython::getViewProviderName() const { return "TechDrawGui::ViewProviderViewPart"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h index 37d84ee302..9d26ae5566 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.h +++ b/src/Mod/TechDraw/App/DrawViewDetail.h @@ -50,7 +50,7 @@ class TechDrawExport DrawViewDetail : public DrawViewPart public: /// Constructor - DrawViewDetail(void); + DrawViewDetail(); virtual ~DrawViewDetail(); App::PropertyLink BaseView; @@ -59,9 +59,9 @@ public: App::PropertyString Reference; virtual short mustExecute() const override; - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual void onChanged(const App::Property* prop) override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } virtual void unsetupObject() override; @@ -70,16 +70,16 @@ public: void detailExec(TopoDS_Shape s, DrawViewPart* baseView, DrawViewSection* sectionAlias); - double getFudgeRadius(void); + double getFudgeRadius(); TopoDS_Shape projectEdgesOntoFace(TopoDS_Shape edgeShape, TopoDS_Face projFace, gp_Dir projDir); virtual std::vector getDetailRefs() const override; protected: Base::Vector3d toR3(const gp_Ax2 fromSystem, const Base::Vector3d fromPoint); - void getParameters(void); + void getParameters(); double m_fudge; - bool debugDetail(void) const; + bool debugDetail() const; }; diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h index 0571f6dd2f..393d7e0e4b 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.h +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h @@ -48,18 +48,18 @@ public: App::PropertyInteger DirExtent; //Horizontal, Vertical, TBD App::PropertyStringList CosmeticTags; //id of cosmetic end points. - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); virtual short mustExecute() const; virtual void unsetupObject(); - virtual bool checkReferences2D(void) const; + virtual bool checkReferences2D() const; //return PyObject as DrawViewDimExtentPy - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); protected: virtual void onChanged(const App::Property* prop); - std::vector getSubNames(void); + std::vector getSubNames(); virtual pointPair getPointsTwoVerts(); private: diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp index 4603b424d4..a1e41873a2 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawViewDimExtentPy::representation(void) const +std::string DrawViewDimExtentPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index a515906108..1b6c16257d 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -103,7 +103,7 @@ static const App::PropertyQuantityConstraint::Constraints ToleranceConstraint = // constraint to force positive values static const App::PropertyQuantityConstraint::Constraints PositiveConstraint = { 0.0, DBL_MAX, 0.1 }; -DrawViewDimension::DrawViewDimension(void) +DrawViewDimension::DrawViewDimension() { ADD_PROPERTY_TYPE(References2D, (nullptr,nullptr), "", (App::Prop_None), "Projected Geometry References"); References2D.setScope(App::LinkScope::Global); @@ -166,20 +166,20 @@ DrawViewDimension::~DrawViewDimension() measurement = nullptr; } -void DrawViewDimension::resetLinear(void) +void DrawViewDimension::resetLinear() { m_linearPoints.first = Base::Vector3d(0,0,0); m_linearPoints.second = Base::Vector3d(0,0,0); } -void DrawViewDimension::resetAngular(void) +void DrawViewDimension::resetAngular() { m_anglePoints.ends.first = Base::Vector3d(0,0,0); m_anglePoints.ends.second = Base::Vector3d(0,0,0); m_anglePoints.vertex = Base::Vector3d(0,0,0); } -void DrawViewDimension::resetArc(void) +void DrawViewDimension::resetArc() { m_arcPoints.isArc = false; m_arcPoints.center = Base::Vector3d(0,0,0); @@ -381,7 +381,7 @@ short DrawViewDimension::mustExecute() const return DrawView::mustExecute(); } -App::DocumentObjectExecReturn *DrawViewDimension::execute(void) +App::DocumentObjectExecReturn *DrawViewDimension::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -740,7 +740,7 @@ App::DocumentObjectExecReturn *DrawViewDimension::execute(void) return DrawView::execute(); } -bool DrawViewDimension::isMultiValueSchema(void) const +bool DrawViewDimension::isMultiValueSchema() const { bool angularMeasure = (Type.isValue("Angle") || Type.isValue("Angle3Pt")); @@ -984,7 +984,7 @@ std::string DrawViewDimension::formatValue(qreal value, return formattedValueString; } -bool DrawViewDimension::haveTolerance(void) +bool DrawViewDimension::haveTolerance() { //if a numeric tolerance is specified AND //tolerances are NOT arbitrary @@ -1494,12 +1494,12 @@ void DrawViewDimension::saveArrowPositions(const Base::Vector2d positions[]) //return position within parent view of dimension arrow heads/dimline endpoints //note positions are in apparent coord (inverted y). -pointPair DrawViewDimension::getArrowPositions(void) +pointPair DrawViewDimension::getArrowPositions() { return m_arrowPositions; } -bool DrawViewDimension::has2DReferences(void) const +bool DrawViewDimension::has2DReferences() const { // Base::Console().Message("DVD::has2DReferences() - %s\n",getNameInDocument()); const std::vector &objects = References2D.getValues(); @@ -1517,13 +1517,13 @@ bool DrawViewDimension::has2DReferences(void) const return true; } -bool DrawViewDimension::has3DReferences(void) const +bool DrawViewDimension::has3DReferences() const { return (References3D.getSize() > 0); } //has arbitrary or nonzero tolerance -bool DrawViewDimension::hasOverUnderTolerance(void) const +bool DrawViewDimension::hasOverUnderTolerance() const { if (ArbitraryTolerances.getValue() || !DrawUtil::fpCompare(OverTolerance.getValue(), 0.0) || @@ -1618,7 +1618,7 @@ std::string DrawViewDimension::getDefaultFormatSpec(bool isToleranceFormat) cons // return result; //} -PyObject *DrawViewDimension::getPyObject(void) +PyObject *DrawViewDimension::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index f4696bef21..02498bc771 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -163,29 +163,29 @@ public: short mustExecute() const override; - virtual bool has2DReferences(void) const; - virtual bool has3DReferences(void) const; - bool hasOverUnderTolerance(void) const; + virtual bool has2DReferences() const; + virtual bool has3DReferences() const; + bool hasOverUnderTolerance() const; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDimension"; } //return PyObject as DrawViewDimensionPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; virtual std::string getFormattedToleranceValue(int partial); virtual std::pair getFormattedToleranceValues(int partial = 0); virtual std::string getFormattedDimensionValue(int partial = 0); virtual std::string formatValue(qreal value, QString qFormatSpec, int partial = 0, bool isDim = true); - virtual bool haveTolerance(void); + virtual bool haveTolerance(); virtual double getDimValue(); QStringList getPrefixSuffixSpec(QString fSpec); @@ -195,18 +195,18 @@ public: virtual int getRefType() const; //Vertex-Vertex, Edge, Edge-Edge static int getRefTypeSubElements(const std::vector &); //Vertex-Vertex, Edge, Edge-Edge void setAll3DMeasurement(); - void clear3DMeasurements(void); - virtual bool checkReferences2D(void) const; - pointPair getLinearPoints(void) {return m_linearPoints; } - arcPoints getArcPoints(void) {return m_arcPoints; } - anglePoints getAnglePoints(void) {return m_anglePoints; } + void clear3DMeasurements(); + virtual bool checkReferences2D() const; + pointPair getLinearPoints() {return m_linearPoints; } + arcPoints getArcPoints() {return m_arcPoints; } + anglePoints getAnglePoints() {return m_anglePoints; } bool leaderIntersectsArc(Base::Vector3d s, Base::Vector3d pointOnCircle); - bool isMultiValueSchema(void) const; + bool isMultiValueSchema() const; std::string getBaseLengthUnit(Base::UnitSystem system); - pointPair getArrowPositions(void); + pointPair getArrowPositions(); void saveArrowPositions(const Base::Vector2d positions[]); bool showUnits() const; @@ -235,9 +235,9 @@ protected: pointPair m_linearPoints; pointPair m_arrowPositions; - void resetLinear(void); - void resetAngular(void); - void resetArc(void); + void resetLinear(); + void resetAngular(); + void resetArc(); private: static const char* TypeEnums[]; diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp index 80aed293cd..e8851ecb5a 100644 --- a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawViewDimensionPy::representation(void) const +std::string DrawViewDimensionPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp index 41821dd33a..4a391cc32b 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.cpp +++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp @@ -47,7 +47,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawViewDraft, TechDraw::DrawViewSymbol) -DrawViewDraft::DrawViewDraft(void) +DrawViewDraft::DrawViewDraft() { static const char *group = "Draft view"; @@ -86,7 +86,7 @@ short DrawViewDraft::mustExecute() const -App::DocumentObjectExecReturn *DrawViewDraft::execute(void) +App::DocumentObjectExecReturn *DrawViewDraft::execute() { // Base::Console().Message("DVDr::execute() \n"); if (!keepUpdated()) { @@ -130,7 +130,7 @@ App::DocumentObjectExecReturn *DrawViewDraft::execute(void) return DrawView::execute(); } -std::string DrawViewDraft::getSVGHead(void) +std::string DrawViewDraft::getSVGHead() { std::string head = std::string(" const char* TechDraw::DrawViewDraftPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewDraftPython::getViewProviderName() const { return "TechDrawGui::ViewProviderDraft"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 81e98ba27e..5a3869d4a6 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -40,7 +40,7 @@ class TechDrawExport DrawViewDraft : public TechDraw::DrawViewSymbol public: /// Constructor - DrawViewDraft(void); + DrawViewDraft(); virtual ~DrawViewDraft(); App::PropertyLink Source; @@ -55,11 +55,11 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDraft"; } @@ -68,8 +68,8 @@ public: protected: /* virtual void onChanged(const App::Property* prop) override;*/ Base::BoundBox3d bbox; - std::string getSVGHead(void); - std::string getSVGTail(void); + std::string getSVGHead(); + std::string getSVGTail(); }; typedef App::FeaturePythonT DrawViewDraftPython; diff --git a/src/Mod/TechDraw/App/DrawViewImage.cpp b/src/Mod/TechDraw/App/DrawViewImage.cpp index 1ca9630058..92a314ef9a 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.cpp +++ b/src/Mod/TechDraw/App/DrawViewImage.cpp @@ -50,7 +50,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawViewImage, TechDraw::DrawView) -DrawViewImage::DrawViewImage(void) +DrawViewImage::DrawViewImage() { static const char *vgroup = "Image"; @@ -98,7 +98,7 @@ short DrawViewImage::mustExecute() const return App::DocumentObject::mustExecute(); } -App::DocumentObjectExecReturn *DrawViewImage::execute(void) +App::DocumentObjectExecReturn *DrawViewImage::execute() { requestPaint(); return DrawView::execute(); @@ -121,7 +121,7 @@ void DrawViewImage::replaceImageIncluded(std::string newFileName) } } -void DrawViewImage::setupImageIncluded(void) +void DrawViewImage::setupImageIncluded() { Base::Console().Message("DVI::setupImageIncluded()\n"); App::Document* doc = getDocument(); @@ -154,7 +154,7 @@ void DrawViewImage::setupImageIncluded(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewImagePython, TechDraw::DrawViewImage) -template<> const char* TechDraw::DrawViewImagePython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewImagePython::getViewProviderName() const { return "TechDrawGui::ViewProviderImage"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index d9aaa4919f..dbe0277cab 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewImage : public TechDraw::DrawView public: /// Constructor - DrawViewImage(void); + DrawViewImage(); virtual ~DrawViewImage(); App::PropertyFile ImageFile; @@ -53,19 +53,19 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; //@} short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderImage"; } QRectF getRect() const override; protected: - void setupImageIncluded(void); + void setupImageIncluded(); void replaceImageIncluded(std::string newFileName); void onChanged(const App::Property* prop) override; diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp index de63da657d..21b4624c76 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.cpp +++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp @@ -116,7 +116,7 @@ void DrawViewMulti::onChanged(const App::Property* prop) DrawViewPart::onChanged(prop); } -App::DocumentObjectExecReturn *DrawViewMulti::execute(void) +App::DocumentObjectExecReturn *DrawViewMulti::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -168,7 +168,7 @@ App::DocumentObjectExecReturn *DrawViewMulti::execute(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewMultiPython, TechDraw::DrawViewMulti) -template<> const char* TechDraw::DrawViewMultiPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewMultiPython::getViewProviderName() const { return "TechDrawGui::ViewProviderViewProviderViewPart"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index 3da1f4017b..1548fbfb38 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -54,7 +54,7 @@ class TechDrawExport DrawViewMulti : public DrawViewPart public: /// Constructor - DrawViewMulti(void); + DrawViewMulti(); virtual ~DrawViewMulti(); App::PropertyLinkList Sources; @@ -63,12 +63,12 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual void onChanged(const App::Property* prop) override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 13e010629c..c57a6368de 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -126,7 +126,7 @@ using namespace std; PROPERTY_SOURCE_WITH_EXTENSIONS(TechDraw::DrawViewPart, TechDraw::DrawView) -DrawViewPart::DrawViewPart(void) : +DrawViewPart::DrawViewPart() : geometryObject(nullptr) { static const char *group = "Projection"; @@ -180,7 +180,7 @@ DrawViewPart::~DrawViewPart() delete geometryObject; } -std::vector DrawViewPart::getSourceShape2d(void) const +std::vector DrawViewPart::getSourceShape2d() const { // Base::Console().Message("DVP::getSourceShape2d()\n"); std::vector result; @@ -190,7 +190,7 @@ std::vector DrawViewPart::getSourceShape2d(void) const } -TopoDS_Shape DrawViewPart::getSourceShape(void) const +TopoDS_Shape DrawViewPart::getSourceShape() const { // Base::Console().Message("DVP::getSourceShape()\n"); TopoDS_Shape result; @@ -210,7 +210,7 @@ TopoDS_Shape DrawViewPart::getSourceShape(void) const return result; } -TopoDS_Shape DrawViewPart::getSourceShapeFused(void) const +TopoDS_Shape DrawViewPart::getSourceShapeFused() const { // Base::Console().Message("DVP::getSourceShapeFused()\n"); TopoDS_Shape result; @@ -231,7 +231,7 @@ TopoDS_Shape DrawViewPart::getSourceShapeFused(void) const return result; } -std::vector DrawViewPart::getAllSources(void) const +std::vector DrawViewPart::getAllSources() const { // Base::Console().Message("DVP::getAllSources()\n"); const std::vector links = Source.getValues(); @@ -246,7 +246,7 @@ std::vector DrawViewPart::getAllSources(void) const return result; } -App::DocumentObjectExecReturn *DrawViewPart::execute(void) +App::DocumentObjectExecReturn *DrawViewPart::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -379,7 +379,7 @@ void DrawViewPart::partExec(TopoDS_Shape shape) addReferencesToGeom(); } -void DrawViewPart::addShapes2d(void) +void DrawViewPart::addShapes2d() { std::vector shapes = getSourceShape2d(); for (auto& s: shapes) { @@ -814,13 +814,13 @@ Base::BoundBox3d DrawViewPart::getBoundingBox() const return bbox; } -double DrawViewPart::getBoxX(void) const +double DrawViewPart::getBoxX() const { Base::BoundBox3d bbx = getBoundingBox(); //bbox is already scaled & centered! return (bbx.MaxX - bbx.MinX); } -double DrawViewPart::getBoxY(void) const +double DrawViewPart::getBoxY() const { Base::BoundBox3d bbx = getBoundingBox(); return (bbx.MaxY - bbx.MinY); @@ -871,7 +871,7 @@ BaseGeomPtr DrawViewPart::projectEdge(const TopoDS_Edge& e) const return result; } -bool DrawViewPart::hasGeometry(void) const +bool DrawViewPart::hasGeometry() const { bool result = false; if (!geometryObject) @@ -926,12 +926,12 @@ gp_Ax2 DrawViewPart::getViewAxis(const Base::Vector3d& pt, //TODO: make saveShape a property -Base::Vector3d DrawViewPart::getOriginalCentroid(void) const +Base::Vector3d DrawViewPart::getOriginalCentroid() const { return m_saveCentroid; } -Base::Vector3d DrawViewPart::getCurrentCentroid(void) const +Base::Vector3d DrawViewPart::getCurrentCentroid() const { TopoDS_Shape shape = getSourceShape(); gp_Ax2 cs = getProjectionCS(Base::Vector3d(0.0, 0.0, 0.0)); @@ -939,7 +939,7 @@ Base::Vector3d DrawViewPart::getCurrentCentroid(void) const return center; } -std::vector DrawViewPart::getSectionRefs(void) const +std::vector DrawViewPart::getSectionRefs() const { std::vector result; std::vector inObjs = getInList(); @@ -951,7 +951,7 @@ std::vector DrawViewPart::getSectionRefs(void) const return result; } -std::vector DrawViewPart::getDetailRefs(void) const +std::vector DrawViewPart::getDetailRefs() const { std::vector result; std::vector inObjs = getInList(); @@ -970,7 +970,7 @@ const BaseGeomPtrVector DrawViewPart::getVisibleFaceEdges() const return geometryObject->getVisibleFaceEdges(SmoothVisible.getValue(),SeamVisible.getValue()); } -bool DrawViewPart::handleFaces(void) +bool DrawViewPart::handleFaces() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); @@ -1037,7 +1037,7 @@ void DrawViewPart::unsetupObject() } //! is this an Isometric projection? -bool DrawViewPart::isIso(void) const +bool DrawViewPart::isIso() const { bool result = false; Base::Vector3d dir = Direction.getValue(); @@ -1048,7 +1048,7 @@ bool DrawViewPart::isIso(void) const return result; } -bool DrawViewPart::checkXDirection(void) const +bool DrawViewPart::checkXDirection() const { // Base::Console().Message("DVP::checkXDirection()\n"); Base::Vector3d xDir = XDirection.getValue(); @@ -1066,7 +1066,7 @@ bool DrawViewPart::checkXDirection(void) const } // -Base::Vector3d DrawViewPart::getXDirection(void) const +Base::Vector3d DrawViewPart::getXDirection() const { // Base::Console().Message("DVP::getXDirection() - %s\n", Label.getValue()); Base::Vector3d result(1.0, 0.0, 0.0); //default X @@ -1114,7 +1114,7 @@ void DrawViewPart::updateReferenceVert(std::string tag, Base::Vector3d loc2d) } } -void DrawViewPart::addReferencesToGeom(void) +void DrawViewPart::addReferencesToGeom() { // Base::Console().Message("DVP::addReferencesToGeom() - %s\n", getNameInDocument()); std::vector gVerts = getVertexGeometry(); @@ -1179,14 +1179,14 @@ void DrawViewPart::resetReferenceVerts() //* Cosmetics //******** -void DrawViewPart::clearCosmeticVertexes(void) +void DrawViewPart::clearCosmeticVertexes() { std::vector noVerts; CosmeticVertexes.setValues(noVerts); } //add the cosmetic verts to geometry vertex list -void DrawViewPart::addCosmeticVertexesToGeom(void) +void DrawViewPart::addCosmeticVertexesToGeom() { // Base::Console().Message("DVP::addCosmeticVertexesToGeom()\n"); const std::vector cVerts = CosmeticVertexes.getValues(); @@ -1212,7 +1212,7 @@ int DrawViewPart::add1CVToGV(std::string tag) } //update Vertex geometry with current CV's -void DrawViewPart::refreshCVGeoms(void) +void DrawViewPart::refreshCVGeoms() { // Base::Console().Message("DVP::refreshCVGeoms()\n"); @@ -1266,14 +1266,14 @@ int DrawViewPart::getCVIndex(std::string tag) //CosmeticEdges ------------------------------------------------------------------- //for completeness. not actually used anywhere? -void DrawViewPart::clearCosmeticEdges(void) +void DrawViewPart::clearCosmeticEdges() { std::vector noEdges; CosmeticEdges.setValues(noEdges); } //add the cosmetic edges to geometry edge list -void DrawViewPart::addCosmeticEdgesToGeom(void) +void DrawViewPart::addCosmeticEdgesToGeom() { // Base::Console().Message("CEx::addCosmeticEdgesToGeom()\n"); const std::vector cEdges = CosmeticEdges.getValues(); @@ -1303,7 +1303,7 @@ int DrawViewPart::add1CEToGE(std::string tag) } //update Edge geometry with current CE's -void DrawViewPart::refreshCEGeoms(void) +void DrawViewPart::refreshCEGeoms() { // Base::Console().Message("DVP::refreshCEGeoms()\n"); std::vector gEdges = getEdgeGeometry(); @@ -1319,7 +1319,7 @@ void DrawViewPart::refreshCEGeoms(void) // CenterLines ----------------------------------------------------------------- -void DrawViewPart::clearCenterLines(void) +void DrawViewPart::clearCenterLines() { std::vector noLines; CenterLines.setValues(noLines); @@ -1341,7 +1341,7 @@ int DrawViewPart::add1CLToGE(std::string tag) } //update Edge geometry with current CL's -void DrawViewPart::refreshCLGeoms(void) +void DrawViewPart::refreshCLGeoms() { // Base::Console().Message("DVP::refreshCLGeoms()\n"); std::vector gEdges = getEdgeGeometry(); @@ -1356,7 +1356,7 @@ void DrawViewPart::refreshCLGeoms(void) } //add the center lines to geometry Edges list -void DrawViewPart::addCenterLinesToGeom(void) +void DrawViewPart::addCenterLinesToGeom() { // Base::Console().Message("DVP::addCenterLinesToGeom()\n"); const std::vector lines = CenterLines.getValues(); @@ -1373,7 +1373,7 @@ void DrawViewPart::addCenterLinesToGeom(void) // GeomFormats ----------------------------------------------------------------- -void DrawViewPart::clearGeomFormats(void) +void DrawViewPart::clearGeomFormats() { std::vector noFormats; std::vector fmts = GeomFormats.getValues(); @@ -1429,7 +1429,7 @@ void DrawViewPart::onDocumentRestored() DrawView::onDocumentRestored(); } -PyObject *DrawViewPart::getPyObject(void) +PyObject *DrawViewPart::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -1444,7 +1444,7 @@ void DrawViewPart::handleChangedPropertyName(Base::XMLReader &reader, const char DrawView::handleChangedPropertyName(reader, TypeName, PropName); } -bool DrawViewPart::prefHardViz(void) +bool DrawViewPart::prefHardViz() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1452,7 +1452,7 @@ bool DrawViewPart::prefHardViz(void) return result; } -bool DrawViewPart::prefSeamViz(void) +bool DrawViewPart::prefSeamViz() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1460,7 +1460,7 @@ bool DrawViewPart::prefSeamViz(void) return result; } -bool DrawViewPart::prefSmoothViz(void) +bool DrawViewPart::prefSmoothViz() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1468,7 +1468,7 @@ bool DrawViewPart::prefSmoothViz(void) return result; } -bool DrawViewPart::prefIsoViz(void) +bool DrawViewPart::prefIsoViz() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1476,7 +1476,7 @@ bool DrawViewPart::prefIsoViz(void) return result; } -bool DrawViewPart::prefHardHid(void) +bool DrawViewPart::prefHardHid() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1484,7 +1484,7 @@ bool DrawViewPart::prefHardHid(void) return result; } -bool DrawViewPart::prefSeamHid(void) +bool DrawViewPart::prefSeamHid() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1492,7 +1492,7 @@ bool DrawViewPart::prefSeamHid(void) return result; } -bool DrawViewPart::prefSmoothHid(void) +bool DrawViewPart::prefSmoothHid() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1500,7 +1500,7 @@ bool DrawViewPart::prefSmoothHid(void) return result; } -bool DrawViewPart::prefIsoHid(void) +bool DrawViewPart::prefIsoHid() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1508,7 +1508,7 @@ bool DrawViewPart::prefIsoHid(void) return result; } -int DrawViewPart::prefIsoCount(void) +int DrawViewPart::prefIsoCount() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); @@ -1522,7 +1522,7 @@ int DrawViewPart::prefIsoCount(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPartPython, TechDraw::DrawViewPart) -template<> const char* TechDraw::DrawViewPartPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewPartPython::getViewProviderName() const { return "TechDrawGui::ViewProviderViewPart"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index eb474e4035..803a864d4b 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -80,7 +80,7 @@ class TechDrawExport DrawViewPart : public DrawView, public CosmeticExtension PROPERTY_HEADER_WITH_EXTENSIONS(TechDraw::DrawViewPart); public: - DrawViewPart(void); + DrawViewPart(); virtual ~DrawViewPart(); App::PropertyLinkList Source; @@ -105,14 +105,14 @@ public: virtual short mustExecute() const override; virtual void onDocumentRestored() override; - virtual App::DocumentObjectExecReturn *execute(void) override; - virtual const char* getViewProviderName(void) const override { + virtual App::DocumentObjectExecReturn *execute() override; + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; - std::vector getHatches(void) const; - std::vector getGeomHatches(void) const; + std::vector getHatches() const; + std::vector getGeomHatches() const; std::vector getDimensions() const; std::vector getBalloons() const; @@ -121,8 +121,8 @@ public: const BaseGeomPtrVector getVisibleFaceEdges() const; const std::vector getFaceGeometry() const; - bool hasGeometry(void) const; - TechDraw::GeometryObject* getGeometryObject(void) const { return geometryObject; } + bool hasGeometry() const; + TechDraw::GeometryObject* getGeometryObject() const { return geometryObject; } TechDraw::BaseGeomPtr getGeomByIndex(int idx) const; //get existing geom for edge idx in projection TechDraw::VertexPtr getProjVertexByIndex(int idx) const; //get existing geom for vertex idx in projection @@ -130,8 +130,8 @@ public: std::vector getFaceEdgesByIndex(int idx) const; //get edges for face idx in projection virtual Base::BoundBox3d getBoundingBox() const; - double getBoxX(void) const; - double getBoxY(void) const; + double getBoxX() const; + double getBoxY() const; virtual QRectF getRect() const override; virtual std::vector getSectionRefs() const; //are there ViewSections based on this ViewPart? virtual std::vector getDetailRefs() const; @@ -145,61 +145,61 @@ public: const Base::Vector3d& direction, const bool flip=true) const; virtual gp_Ax2 getProjectionCS(Base::Vector3d pt) const; - virtual Base::Vector3d getXDirection(void) const; //don't use XDirection.getValue() - virtual Base::Vector3d getOriginalCentroid(void) const; - virtual Base::Vector3d getCurrentCentroid(void) const; + virtual Base::Vector3d getXDirection() const; //don't use XDirection.getValue() + virtual Base::Vector3d getOriginalCentroid() const; + virtual Base::Vector3d getCurrentCentroid() const; virtual Base::Vector3d getLegacyX(const Base::Vector3d& pt, const Base::Vector3d& axis, const bool flip = true) const; - bool handleFaces(void); + bool handleFaces(); - bool isUnsetting(void) { return nowUnsetting; } + bool isUnsetting() { return nowUnsetting; } virtual std::vector getWireForFace(int idx) const; - virtual TopoDS_Shape getSourceShape(void) const; - virtual TopoDS_Shape getSourceShapeFused(void) const; - virtual std::vector getSourceShape2d(void) const; + virtual TopoDS_Shape getSourceShape() const; + virtual TopoDS_Shape getSourceShapeFused() const; + virtual std::vector getSourceShape2d() const; - bool isIso(void) const; + bool isIso() const; - void clearCosmeticVertexes(void); - void refreshCVGeoms(void); - void addCosmeticVertexesToGeom(void); + void clearCosmeticVertexes(); + void refreshCVGeoms(); + void addCosmeticVertexesToGeom(); int add1CVToGV(std::string tag); int getCVIndex(std::string tag); - void clearCosmeticEdges(void); - void refreshCEGeoms(void); - void addCosmeticEdgesToGeom(void); + void clearCosmeticEdges(); + void refreshCEGeoms(); + void addCosmeticEdgesToGeom(); int add1CEToGE(std::string tag); - void clearCenterLines(void); - void refreshCLGeoms(void); - void addCenterLinesToGeom(void); + void clearCenterLines(); + void refreshCLGeoms(); + void addCenterLinesToGeom(); int add1CLToGE(std::string tag); - void clearGeomFormats(void); + void clearGeomFormats(); void dumpVerts(const std::string text); void dumpCosVerts(const std::string text); void dumpCosEdges(const std::string text); std::string addReferenceVertex(Base::Vector3d v); - void addReferencesToGeom(void); + void addReferencesToGeom(); void removeReferenceVertex(std::string tag); void updateReferenceVert(std::string tag, Base::Vector3d loc2d); void removeAllReferencesFromGeom(); void resetReferenceVerts(); - std::vector getAllSources(void) const; + std::vector getAllSources() const; protected: - bool checkXDirection(void) const; + bool checkXDirection() const; TechDraw::GeometryObject *geometryObject; Base::BoundBox3d bbox; @@ -210,12 +210,12 @@ protected: virtual TechDraw::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis); //const?? virtual TechDraw::GeometryObject* makeGeometryForShape(TopoDS_Shape shape); //const?? void partExec(TopoDS_Shape shape); - virtual void addShapes2d(void); + virtual void addShapes2d(); void extractFaces(); Base::Vector3d shapeCentroid; - void getRunControl(void); + void getRunControl(); bool m_handleFaces; @@ -224,15 +224,15 @@ protected: void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName) override; - bool prefHardViz(void); - bool prefSeamViz(void); - bool prefSmoothViz(void); - bool prefIsoViz(void); - bool prefHardHid(void); - bool prefSeamHid(void); - bool prefSmoothHid(void); - bool prefIsoHid(void); - int prefIsoCount(void); + bool prefHardViz(); + bool prefSeamViz(); + bool prefSmoothViz(); + bool prefIsoViz(); + bool prefHardHid(); + bool prefSeamHid(); + bool prefSmoothHid(); + bool prefIsoHid(); + int prefIsoCount(); std::vector m_referenceVerts; diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp index 0cc1f86995..ca00161fbb 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp @@ -67,7 +67,7 @@ using namespace TechDraw; //TODO: errors to PyErrors // returns a string which represents the object e.g. when printed in python -std::string DrawViewPartPy::representation(void) const +std::string DrawViewPartPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 8975135c0b..9f127f075f 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -227,7 +227,7 @@ void DrawViewSection::onChanged(const App::Property* prop) DrawView::onChanged(prop); } -void DrawViewSection::makeLineSets(void) +void DrawViewSection::makeLineSets() { // Base::Console().Message("DVS::makeLineSets()\n"); if (!PatIncluded.isEmpty()) { @@ -282,7 +282,7 @@ void DrawViewSection::replacePatIncluded(std::string newPatFile) } } -App::DocumentObjectExecReturn *DrawViewSection::execute(void) +App::DocumentObjectExecReturn *DrawViewSection::execute() { if (!keepUpdated()) { return App::DocumentObject::StdReturn; @@ -582,7 +582,7 @@ TopoDS_Compound DrawViewSection::findSectionPlaneIntersections(const TopoDS_Shap } //calculate the ends of the section line in BaseView's coords -std::pair DrawViewSection::sectionLineEnds(void) +std::pair DrawViewSection::sectionLineEnds() { std::pair result; Base::Vector3d stdZ(0.0, 0.0, 1.0); @@ -639,7 +639,7 @@ bool DrawViewSection::isReallyInBox (const gp_Pnt p, const Bnd_Box& bb) const return !bb.IsOut(p); } -Base::Vector3d DrawViewSection::getXDirection(void) const +Base::Vector3d DrawViewSection::getXDirection() const { // Base::Console().Message("DVS::getXDirection() - %s\n", Label.getValue()); Base::Vector3d result(1.0, 0.0, 0.0); //default X @@ -737,7 +737,7 @@ gp_Ax2 DrawViewSection::getCSFromBase(const std::string sectionName) const } //returns current section cs -gp_Ax2 DrawViewSection::getSectionCS(void) const +gp_Ax2 DrawViewSection::getSectionCS() const { // Base::Console().Message("DVS::getSectionCS()\n"); Base::Vector3d vNormal = SectionNormal.getValue(); @@ -848,7 +848,7 @@ void DrawViewSection::getParameters() FuseBeforeCut.setValue(fuseFirst); } -bool DrawViewSection::debugSection(void) const +bool DrawViewSection::debugSection() const { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/debug"); @@ -857,7 +857,7 @@ bool DrawViewSection::debugSection(void) const return result; } -int DrawViewSection::prefCutSurface(void) const +int DrawViewSection::prefCutSurface() const { // Base::Console().Message("DVS::prefCutSurface()\n"); Base::ReferencehGrp = App::GetApplication().GetUserParameter() @@ -867,7 +867,7 @@ int DrawViewSection::prefCutSurface(void) const return result; } -bool DrawViewSection::showSectionEdges(void) +bool DrawViewSection::showSectionEdges() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); @@ -911,7 +911,7 @@ void DrawViewSection::setupObject() DrawViewPart::setupObject(); } -void DrawViewSection::setupSvgIncluded(void) +void DrawViewSection::setupSvgIncluded() { // Base::Console().Message("DVS::setupSvgIncluded()\n"); App::Document* doc = getDocument(); @@ -935,7 +935,7 @@ void DrawViewSection::setupSvgIncluded(void) } } -void DrawViewSection::setupPatIncluded(void) +void DrawViewSection::setupPatIncluded() { // Base::Console().Message("DVS::setupPatIncluded()\n"); App::Document* doc = getDocument(); @@ -961,7 +961,7 @@ void DrawViewSection::setupPatIncluded(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewSectionPython, TechDraw::DrawViewSection) -template<> const char* TechDraw::DrawViewSectionPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewSectionPython::getViewProviderName() const { return "TechDrawGui::ViewProviderDrawingView"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index 0ef6f93911..be27cebb48 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -61,7 +61,7 @@ class TechDrawExport DrawViewSection : public DrawViewPart PROPERTY_HEADER_WITH_OVERRIDE(Part::DrawViewSection); public: - DrawViewSection(void); + DrawViewSection(); virtual ~DrawViewSection(); App::PropertyLink BaseView; @@ -83,9 +83,9 @@ public: bool isReallyInBox (const Base::Vector3d v, const Base::BoundBox3d bb) const; bool isReallyInBox (const gp_Pnt p, const Bnd_Box& bb) const; - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; virtual void onChanged(const App::Property* prop) override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewSection"; } virtual void unsetupObject() override; @@ -102,7 +102,7 @@ public: Base::Vector3d axis, double degAngle) const; gp_Ax2 getSectionCS() const; - virtual Base::Vector3d getXDirection(void) const override; //don't use XDirection.getValue() + virtual Base::Vector3d getXDirection() const override; //don't use XDirection.getValue() TechDraw::DrawViewPart* getBaseDVP() const; TechDraw::DrawProjGroupItem* getBaseDPGI() const; @@ -110,18 +110,18 @@ public: TopoDS_Compound getSectionFaces() { return sectionFaces;} // std::vector getSectionFaceWires(void) { return sectionFaceWires; } //obs? TopoDS_Face getSectionTFace(int i); - void makeLineSets(void) ; + void makeLineSets() ; std::vector getDrawableLines(int i = 0); std::vector getDecodedSpecsFromFile(std::string fileSpec, std::string myPattern); - TopoDS_Shape getCutShape(void) {return m_cutShape;} + TopoDS_Shape getCutShape() {return m_cutShape;} static const char* SectionDirEnums[]; static const char* CutSurfaceEnums[]; - std::pair sectionLineEnds(void); + std::pair sectionLineEnds(); - bool showSectionEdges(void); + bool showSectionEdges(); protected: TopoDS_Compound sectionFaces; //tSectionFaces @@ -132,16 +132,16 @@ protected: gp_Pln getSectionPlane() const; TopoDS_Compound findSectionPlaneIntersections(const TopoDS_Shape& shape); - void getParameters(void); - bool debugSection(void) const; - int prefCutSurface(void) const; + void getParameters(); + bool debugSection() const; + int prefCutSurface() const; TopoDS_Shape m_cutShape; virtual void onDocumentRestored() override; virtual void setupObject() override; - void setupSvgIncluded(void); - void setupPatIncluded(void); + void setupSvgIncluded(); + void setupPatIncluded(); void replaceSvgIncluded(std::string newSvgFile); void replacePatIncluded(std::string newPatFile); diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index 4aa36dd71c..9efbf2b2fc 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -57,7 +57,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawViewSpreadsheet, TechDraw::DrawViewSymbol) -DrawViewSpreadsheet::DrawViewSpreadsheet(void) +DrawViewSpreadsheet::DrawViewSpreadsheet() { static const char *vgroup = "Spreadsheet"; @@ -103,7 +103,7 @@ void DrawViewSpreadsheet::onChanged(const App::Property* prop) TechDraw::DrawView::onChanged(prop); } -App::DocumentObjectExecReturn *DrawViewSpreadsheet::execute(void) +App::DocumentObjectExecReturn *DrawViewSpreadsheet::execute() { App::DocumentObject* link = Source.getValue(); std::string scellstart = CellStart.getValue(); @@ -120,7 +120,7 @@ App::DocumentObjectExecReturn *DrawViewSpreadsheet::execute(void) return TechDraw::DrawView::execute(); } -std::vector DrawViewSpreadsheet::getAvailColumns(void) +std::vector DrawViewSpreadsheet::getAvailColumns() { // build a list of available columns: A, B, C, ... AA, AB, ... ZY, ZZ. std::string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -140,19 +140,19 @@ std::vector DrawViewSpreadsheet::getAvailColumns(void) return availcolumns; } -std::string DrawViewSpreadsheet::getSVGHead(void) +std::string DrawViewSpreadsheet::getSVGHead() { return std::string("\n"); } -std::string DrawViewSpreadsheet::getSVGTail(void) +std::string DrawViewSpreadsheet::getSVGTail() { return "\n"; } -std::string DrawViewSpreadsheet::getSheetImage(void) +std::string DrawViewSpreadsheet::getSheetImage() { App::DocumentObject* link = Source.getValue(); link->recomputeFeature(); //make sure s/s is up to date @@ -385,7 +385,7 @@ int DrawViewSpreadsheet::colInList(const std::vector& list, namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewSpreadsheetPython, TechDraw::DrawViewSpreadsheet) -template<> const char* TechDraw::DrawViewSpreadsheetPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewSpreadsheetPython::getViewProviderName() const { return "TechDrawGui::ViewProviderSpreadsheet"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h index 5558905f11..5e075719fd 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h @@ -38,7 +38,7 @@ class TechDrawExport DrawViewSpreadsheet : public TechDraw::DrawViewSymbol PROPERTY_HEADER(TechDraw::DrawViewSpreadsheet); public: - DrawViewSpreadsheet(void); + DrawViewSpreadsheet(); virtual ~DrawViewSpreadsheet(); App::PropertyLink Source; App::PropertyString CellStart; @@ -49,19 +49,19 @@ public: App::PropertyFloat TextSize; - virtual App::DocumentObjectExecReturn *execute(void); + virtual App::DocumentObjectExecReturn *execute(); virtual short mustExecute() const; - std::string getSheetImage(void); + std::string getSheetImage(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderSpreadsheet"; } protected: virtual void onChanged(const App::Property* prop); - std::vector getAvailColumns(void); - std::string getSVGHead(void); - std::string getSVGTail(void); + std::vector getAvailColumns(); + std::string getSVGHead(); + std::string getSVGTail(); int colInList(const std::vector& list, const std::string& toFind); diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index 4e5a1d3cb2..4d6718fb6f 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -52,7 +52,7 @@ using namespace std; PROPERTY_SOURCE(TechDraw::DrawViewSymbol, TechDraw::DrawView) -DrawViewSymbol::DrawViewSymbol(void) +DrawViewSymbol::DrawViewSymbol() { static const char *vgroup = "Drawing view"; @@ -83,7 +83,7 @@ void DrawViewSymbol::onChanged(const App::Property* prop) TechDraw::DrawView::onChanged(prop); } -App::DocumentObjectExecReturn *DrawViewSymbol::execute(void) +App::DocumentObjectExecReturn *DrawViewSymbol::execute() { //nothing to do. DVS is just a container for properties. //the action takes place on the Gui side. @@ -205,7 +205,7 @@ bool DrawViewSymbol::loadQDomDocument(QDomDocument& symbolDocument) return rc; } -PyObject *DrawViewSymbol::getPyObject(void) +PyObject *DrawViewSymbol::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -219,7 +219,7 @@ PyObject *DrawViewSymbol::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewSymbolPython, TechDraw::DrawViewSymbol) -template<> const char* TechDraw::DrawViewSymbolPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawViewSymbolPython::getViewProviderName() const { return "TechDrawGui::ViewProviderSymbol"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index 830a7f2162..a760b24613 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -44,7 +44,7 @@ class TechDrawExport DrawViewSymbol : public TechDraw::DrawView public: /// Constructor - DrawViewSymbol(void); + DrawViewSymbol(); virtual ~DrawViewSymbol(); App::PropertyString Symbol; @@ -53,18 +53,18 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderSymbol"; } virtual QRectF getRect() const override; virtual bool checkFit(TechDraw::DrawPage* p) const override; //return PyObject as DrawViewSymbolPy - virtual PyObject *getPyObject(void) override; + virtual PyObject *getPyObject() override; protected: virtual void onChanged(const App::Property* prop) override; diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp index 6edeea4ed8..7dc95877ce 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp @@ -37,7 +37,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawViewSymbolPy::representation(void) const +std::string DrawViewSymbolPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp index 01e8bef4a4..7d1549d8f4 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp @@ -49,7 +49,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::DrawWeldSymbol, TechDraw::DrawView) -DrawWeldSymbol::DrawWeldSymbol(void) +DrawWeldSymbol::DrawWeldSymbol() { static const char *group = "Weld Symbol"; @@ -116,7 +116,7 @@ short DrawWeldSymbol::mustExecute() const return DrawView::mustExecute(); } -App::DocumentObjectExecReturn *DrawWeldSymbol::execute(void) +App::DocumentObjectExecReturn *DrawWeldSymbol::execute() { // Base::Console().Message("DWS::execute()\n"); if (!keepUpdated()) { @@ -126,7 +126,7 @@ App::DocumentObjectExecReturn *DrawWeldSymbol::execute(void) return DrawView::execute(); } -std::vector DrawWeldSymbol::getTiles(void) const +std::vector DrawWeldSymbol::getTiles() const { // Base::Console().Message("DWS::getTiles()\n"); std::vector result; @@ -161,7 +161,7 @@ bool DrawWeldSymbol::isTailRightSide() } -PyObject *DrawWeldSymbol::getPyObject(void) +PyObject *DrawWeldSymbol::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 @@ -175,7 +175,7 @@ PyObject *DrawWeldSymbol::getPyObject(void) namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawWeldSymbolPython, TechDraw::DrawWeldSymbol) -template<> const char* TechDraw::DrawWeldSymbolPython::getViewProviderName(void) const { +template<> const char* TechDraw::DrawWeldSymbolPython::getViewProviderName() const { return "TechDrawGui::ViewProviderWeld"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index 122fe01872..c106de20a6 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -49,17 +49,17 @@ public: App::PropertyString TailText; virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(void); - virtual void onSettingDocument(void); + virtual App::DocumentObjectExecReturn *execute(); + virtual void onSettingDocument(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName() const { return "TechDrawGui::ViewProviderWeld"; } - virtual PyObject *getPyObject(void); + virtual PyObject *getPyObject(); virtual QRectF getRect() const { return QRectF(0,0,1,1);} bool isTailRightSide(); - std::vector getTiles(void) const; + std::vector getTiles() const; protected: virtual void onChanged(const App::Property* prop); diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp index 4a4445d5f2..f5973f876c 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp @@ -38,7 +38,7 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python -std::string DrawWeldSymbolPy::representation(void) const +std::string DrawWeldSymbolPy::representation() const { return std::string(""); } diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp index 0657b19d15..a5fbf33fbc 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.cpp +++ b/src/Mod/TechDraw/App/EdgeWalker.cpp @@ -85,7 +85,7 @@ void edgeVisitor::end_face() graphWires.push_back(wireEdges); } -TechDraw::ewWireList edgeVisitor::getResult(void) +TechDraw::ewWireList edgeVisitor::getResult() { return graphWires; } @@ -488,7 +488,7 @@ bool WalkerEdge::isEqual(WalkerEdge w) return (i.idx < j.idx); } -std::string WalkerEdge::dump(void) +std::string WalkerEdge::dump() { std::string result; std::stringstream builder; @@ -523,7 +523,7 @@ void ewWire::push_back(WalkerEdge w) wedges.push_back(w); } -int ewWire::size(void) +int ewWire::size() { return wedges.size(); } @@ -560,7 +560,7 @@ void ewWireList::push_back(ewWire w) wires.push_back(w); } -int ewWireList::size(void) +int ewWireList::size() { return wires.size(); } @@ -569,7 +569,7 @@ int ewWireList::size(void) //* embedItem Methods //************************************* -std::string embedItem::dump(void) +std::string embedItem::dump() { std::string result; std::stringstream builder; diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h index 113abcd277..fea171eb41 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.h +++ b/src/Mod/TechDraw/App/EdgeWalker.h @@ -75,7 +75,7 @@ class TechDrawExport WalkerEdge public: static bool weCompare(WalkerEdge i, WalkerEdge j); bool isEqual(WalkerEdge w); - std::string dump(void); + std::string dump(); std::size_t v1; std::size_t v2; @@ -91,7 +91,7 @@ public: std::vector wedges; //[WE] representing 1 wire void push_back(WalkerEdge w); void clear() {wedges.clear();} - int size(void); + int size(); }; class TechDrawExport ewWireList @@ -101,7 +101,7 @@ public: std::vector wires; void push_back(ewWire e); - int size(void); + int size(); }; @@ -113,7 +113,7 @@ public: void next_edge(Edge e); void begin_face(); void end_face(); - ewWireList getResult(void); //a list of many wires + ewWireList getResult(); //a list of many wires void setGraph(graph& g); private: @@ -145,7 +145,7 @@ public: int iVertex; std::vector incidenceList; - std::string dump(void); + std::string dump(); static std::vector sortIncidenceList (std::vector &list, bool ascend); }; @@ -153,7 +153,7 @@ public: class TechDrawExport EdgeWalker { public: - EdgeWalker(void); + EdgeWalker(); virtual ~EdgeWalker(); bool loadEdges(std::vector& edges); diff --git a/src/Mod/TechDraw/App/FeatureProjection.cpp b/src/Mod/TechDraw/App/FeatureProjection.cpp index a1a19e55c3..719c2eb949 100644 --- a/src/Mod/TechDraw/App/FeatureProjection.cpp +++ b/src/Mod/TechDraw/App/FeatureProjection.cpp @@ -68,7 +68,7 @@ FeatureProjection::~FeatureProjection() { } -App::DocumentObjectExecReturn *FeatureProjection::execute(void) +App::DocumentObjectExecReturn *FeatureProjection::execute() { App::DocumentObject* link = Source.getValue(); if (!link) diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp index e1a206679d..222e096190 100644 --- a/src/Mod/TechDraw/App/Geometry.cpp +++ b/src/Mod/TechDraw/App/Geometry.cpp @@ -123,7 +123,7 @@ Wire::~Wire() geoms.clear(); } -TopoDS_Wire Wire::toOccWire(void) const +TopoDS_Wire Wire::toOccWire() const { TopoDS_Wire result; BRepBuilderAPI_MakeWire mkWire; @@ -143,7 +143,7 @@ void Wire::dump(std::string s) BRepTools::Write(toOccWire(), s.c_str()); //debug } -TopoDS_Face Face::toOccFace(void) const +TopoDS_Face Face::toOccFace() const { TopoDS_Face result; //if (!wires.empty) { @@ -219,7 +219,7 @@ BaseGeomPtr BaseGeom::copy() return result; } -std::string BaseGeom::toString(void) const +std::string BaseGeom::toString() const { std::stringstream ss; ss << geomType << "," << @@ -239,7 +239,7 @@ boost::uuids::uuid BaseGeom::getTag() const return tag; } -std::string BaseGeom::getTagAsString(void) const +std::string BaseGeom::getTagAsString() const { std::string tmp = boost::uuids::to_string(getTag()); return tmp; @@ -433,7 +433,7 @@ std::string BaseGeom::dump() return ss.str(); } -bool BaseGeom::closed(void) +bool BaseGeom::closed() { bool result = false; Base::Vector3d start(getStartPoint().x, @@ -785,7 +785,7 @@ AOE::AOE(const TopoDS_Edge &e) : Ellipse(e) } -Circle::Circle(void) +Circle::Circle() { geomType = CIRCLE; radius = 0.0; @@ -825,7 +825,7 @@ Circle::Circle(const TopoDS_Edge &e) radius = circ.Radius(); center = Base::Vector3d(p.X(), p.Y(), p.Z()); } -std::string Circle::toString(void) const +std::string Circle::toString() const { std::string baseCSV = BaseGeom::toString(); std::stringstream ss; @@ -934,7 +934,7 @@ AOC::AOC(Base::Vector3d c, double r, double sAng, double eAng) : Circle() } -AOC::AOC(void) : Circle() +AOC::AOC() : Circle() { geomType = ARCOFCIRCLE; @@ -998,7 +998,7 @@ bool AOC::intersectsArc(Base::Vector3d p1, Base::Vector3d p2) return result; } -std::string AOC::toString(void) const +std::string AOC::toString() const { std::string circleCSV = Circle::toString(); std::stringstream ss; @@ -1106,7 +1106,7 @@ Generic::Generic() geomType = GENERIC; } -std::string Generic::toString(void) const +std::string Generic::toString() const { std::string baseCSV = BaseGeom::toString(); std::stringstream ss; @@ -1157,13 +1157,13 @@ void Generic::Restore(Base::XMLReader &reader) reader.readEndElement("Points"); } -Base::Vector3d Generic::asVector(void) +Base::Vector3d Generic::asVector() { Base::Vector3d result = getEndPoint() - getStartPoint(); return result; } -double Generic::slope(void) +double Generic::slope() { double slope; Base::Vector3d v = asVector(); @@ -1704,7 +1704,7 @@ boost::uuids::uuid Vertex::getTag() const return tag; } -std::string Vertex::getTagAsString(void) const +std::string Vertex::getTagAsString() const { std::string tmp = boost::uuids::to_string(getTag()); return tmp; diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h index a06d32f562..1acdb5ad6e 100644 --- a/src/Mod/TechDraw/App/Geometry.h +++ b/src/Mod/TechDraw/App/Geometry.h @@ -106,14 +106,14 @@ class TechDrawExport BaseGeom : public std::enable_shared_from_this int ref3D; //obs? TopoDS_Edge occEdge; //projected Edge bool cosmetic; - int source(void) { return m_source; } + int source() { return m_source; } void source(int s) { m_source = s; } - int sourceIndex(void) { return m_sourceIndex; } + int sourceIndex() { return m_sourceIndex; } void sourceIndex(int si) { m_sourceIndex = si; } - std::string getCosmeticTag(void) { return cosmeticTag; } + std::string getCosmeticTag() { return cosmeticTag; } void setCosmeticTag(std::string t) { cosmeticTag = t; } - virtual std::string toString(void) const; + virtual std::string toString() const; virtual void Save(Base::Writer& w) const; virtual void Restore(Base::XMLReader& r); std::vector findEndPoints(); @@ -126,14 +126,14 @@ class TechDrawExport BaseGeom : public std::enable_shared_from_this Base::Vector3d nearPoint(const BaseGeomPtr p); static BaseGeomPtr baseFactory(TopoDS_Edge edge); static bool validateEdge(TopoDS_Edge edge); - bool closed(void); + bool closed(); BaseGeomPtr copy(); std::string dump(); std::vector intersection(TechDraw::BaseGeomPtr geom2); //Uniqueness boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; private: void intersectionLL(TechDraw::BaseGeomPtr geom1, @@ -160,13 +160,13 @@ using BaseGeomPtrVector = std::vector; //new style class TechDrawExport Circle: public BaseGeom { public: - Circle(void); + Circle(); Circle(const TopoDS_Edge &e); Circle(Base::Vector3d center, double radius); virtual ~Circle() = default; public: - virtual std::string toString(void) const override; + virtual std::string toString() const override; virtual void Save(Base::Writer& w) const override; virtual void Restore(Base::XMLReader& r) override; @@ -217,11 +217,11 @@ class TechDrawExport AOC: public Circle public: AOC(const TopoDS_Edge &e); AOC(Base::Vector3d c, double r, double s, double e); - AOC(void); + AOC(); ~AOC() = default; public: - virtual std::string toString(void) const override; + virtual std::string toString() const override; virtual void Save(Base::Writer& w) const override; virtual void Restore(Base::XMLReader& r) override; @@ -273,8 +273,8 @@ class TechDrawExport BSpline: public BaseGeom bool cw; bool isArc; - bool isLine(void); - bool isCircle(void); + bool isLine(); + bool isCircle(); TopoDS_Edge asCircle(bool& isArc); void getCircleParms(bool& isCircle, double& radius, Base::Vector3d& center, bool& isArc); bool intersectsArc(Base::Vector3d p1,Base::Vector3d p2); @@ -288,11 +288,11 @@ class TechDrawExport Generic: public BaseGeom Generic(); ~Generic() = default; - virtual std::string toString(void) const override; + virtual std::string toString() const override; virtual void Save(Base::Writer& w) const override; virtual void Restore(Base::XMLReader& r) override; - Base::Vector3d asVector(void); - double slope(void); + Base::Vector3d asVector(); + double slope(); Base::Vector3d apparentInter(GenericPtr g); std::vector points; }; @@ -306,7 +306,7 @@ class TechDrawExport Wire Wire(const TopoDS_Wire &w); ~Wire(); - TopoDS_Wire toOccWire(void) const; + TopoDS_Wire toOccWire() const; void dump(std::string s); BaseGeomPtrVector geoms; }; @@ -317,7 +317,7 @@ class TechDrawExport Face public: Face() = default; ~Face(); - TopoDS_Face toOccFace(void) const; + TopoDS_Face toOccFace() const; std::vector wires; }; using FacePtr = std::shared_ptr; @@ -342,7 +342,7 @@ class TechDrawExport Vertex bool isCenter; TopoDS_Vertex occVertex; bool isEqual(const Vertex& v, double tol); - Base::Vector3d point(void) const { return Base::Vector3d(pnt.x,pnt.y,0.0); } + Base::Vector3d point() const { return Base::Vector3d(pnt.x,pnt.y,0.0); } void point(Base::Vector3d v){ pnt = Base::Vector3d(v.x, v.y); } bool cosmetic; int cosmeticLink; //deprec. use cosmeticTag @@ -353,7 +353,7 @@ class TechDrawExport Vertex double y() {return pnt.y;} boost::uuids::uuid getTag() const; - virtual std::string getTagAsString(void) const; + virtual std::string getTagAsString() const; protected: //Uniqueness diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h index 430d82315d..b3826c32ab 100644 --- a/src/Mod/TechDraw/App/GeometryObject.h +++ b/src/Mod/TechDraw/App/GeometryObject.h @@ -127,26 +127,26 @@ public: void setIsoCount(int i) { m_isoCount = i; } void setParentName(std::string n); //for debug messages void isPerspective(bool b) { m_isPersp = b; } - bool isPerspective(void) { return m_isPersp; } + bool isPerspective() { return m_isPersp; } void usePolygonHLR(bool b) { m_usePolygonHLR = b; } - bool usePolygonHLR(void) const { return m_usePolygonHLR; } + bool usePolygonHLR() const { return m_usePolygonHLR; } void setFocus(double f) { m_focus = f; } - double getFocus(void) { return m_focus; } + double getFocus() { return m_focus; } void pruneVertexGeom(Base::Vector3d center, double radius); //dupl mirrorShape??? static TopoDS_Shape invertGeometry(const TopoDS_Shape s); - TopoDS_Shape getVisHard(void) { return visHard; } - TopoDS_Shape getVisOutline(void) { return visOutline; } - TopoDS_Shape getVisSmooth(void) { return visSmooth; } - TopoDS_Shape getVisSeam(void) { return visSeam; } - TopoDS_Shape getVisIso(void) { return visIso; } - TopoDS_Shape getHidHard(void) { return hidHard; } - TopoDS_Shape getHidOutline(void) { return hidOutline; } - TopoDS_Shape getHidSmooth(void) { return hidSmooth; } - TopoDS_Shape getHidSeam(void) { return hidSeam; } - TopoDS_Shape getHidIso(void) { return hidIso; } + TopoDS_Shape getVisHard() { return visHard; } + TopoDS_Shape getVisOutline() { return visOutline; } + TopoDS_Shape getVisSmooth() { return visSmooth; } + TopoDS_Shape getVisSeam() { return visSeam; } + TopoDS_Shape getVisIso() { return visIso; } + TopoDS_Shape getHidHard() { return hidHard; } + TopoDS_Shape getHidOutline() { return hidOutline; } + TopoDS_Shape getHidSmooth() { return hidSmooth; } + TopoDS_Shape getHidSeam() { return hidSeam; } + TopoDS_Shape getHidIso() { return hidIso; } void addVertex(TechDraw::VertexPtr v); void addEdge(TechDraw::BaseGeomPtr bg); @@ -184,7 +184,7 @@ protected: TopoDS_Shape hidIso; void addGeomFromCompound(TopoDS_Shape edgeCompound, edgeClass category, bool visible); - TechDraw::DrawViewDetail* isParentDetail(void); + TechDraw::DrawViewDetail* isParentDetail(); //similar function in Geometry? /*! diff --git a/src/Mod/TechDraw/App/HatchLine.cpp b/src/Mod/TechDraw/App/HatchLine.cpp index 00b3ed5681..caf29e433e 100644 --- a/src/Mod/TechDraw/App/HatchLine.cpp +++ b/src/Mod/TechDraw/App/HatchLine.cpp @@ -45,35 +45,35 @@ using namespace TechDraw; -double LineSet::getMinX(void) +double LineSet::getMinX() { double xMin,yMin,zMin,xMax,yMax,zMax; m_box.Get(xMin,yMin,zMin,xMax,yMax,zMax); return xMin; } -double LineSet::getMinY(void) +double LineSet::getMinY() { double xMin,yMin,zMin,xMax,yMax,zMax; m_box.Get(xMin,yMin,zMin,xMax,yMax,zMax); return yMin; } -double LineSet::getMaxX(void) +double LineSet::getMaxX() { double xMin,yMin,zMin,xMax,yMax,zMax; m_box.Get(xMin,yMin,zMin,xMax,yMax,zMax); return xMax; } -double LineSet::getMaxY(void) +double LineSet::getMaxY() { double xMin,yMin,zMin,xMax,yMax,zMax; m_box.Get(xMin,yMin,zMin,xMax,yMax,zMax); return yMax; } -bool LineSet::isDashed(void) +bool LineSet::isDashed() { bool result = m_hatchLine.isDashed(); return result; @@ -99,7 +99,7 @@ Base::Vector3d LineSet::calcApparentStart(TechDraw::BaseGeomPtr g) return result; } -Base::Vector3d LineSet::getUnitDir(void) +Base::Vector3d LineSet::getUnitDir() { Base::Vector3d result; Base::Vector3d start(m_geoms.at(0)->getStartPoint().x, @@ -133,7 +133,7 @@ Base::Vector3d LineSet::getUnitOrtho() } -Base::Vector3d LineSet::findAtomStart(void) +Base::Vector3d LineSet::findAtomStart() { Base::Vector3d result; Base::Vector3d origin = getOrigin(); @@ -239,7 +239,7 @@ PATLineSpec::~PATLineSpec() { } -void PATLineSpec::init(void) +void PATLineSpec::init() { m_angle = 0.0; m_origin = Base::Vector3d(0.0,0.0,0.0); @@ -411,7 +411,7 @@ std::vector PATLineSpec::getPatternList(std::string& parmFile) return result; } -double PATLineSpec::getSlope(void) +double PATLineSpec::getSlope() { double angle = getAngle(); @@ -425,14 +425,14 @@ double PATLineSpec::getSlope(void) return slope; } -bool PATLineSpec::isDashed(void) +bool PATLineSpec::isDashed() { bool result = !m_dashParms.empty(); return result; } //! X component of distance between lines -double PATLineSpec::getIntervalX(void) +double PATLineSpec::getIntervalX() { if (getAngle() == 0.0) { return 0.0; @@ -445,7 +445,7 @@ double PATLineSpec::getIntervalX(void) } //! Y component of distance between lines -double PATLineSpec::getIntervalY(void) +double PATLineSpec::getIntervalY() { if (getAngle() == 0.0) { return getInterval(); @@ -460,7 +460,7 @@ double PATLineSpec::getIntervalY(void) //******************************************************** -double DashSpec::length(void) +double DashSpec::length() { double result = 0.0; for (auto& c: get()) { @@ -469,7 +469,7 @@ double DashSpec::length(void) return result; } -DashSpec DashSpec::reversed(void) +DashSpec DashSpec::reversed() { std::vector p = get(); std::reverse(p.begin(),p.end()); diff --git a/src/Mod/TechDraw/App/HatchLine.h b/src/Mod/TechDraw/App/HatchLine.h index 747b639498..a645385352 100644 --- a/src/Mod/TechDraw/App/HatchLine.h +++ b/src/Mod/TechDraw/App/HatchLine.h @@ -56,12 +56,12 @@ public: ~DashSpec() {} double get(int i) {return m_parms.at(i); } - std::vector get(void) {return m_parms;} - bool empty(void) {return m_parms.empty();} - int size(void) {return m_parms.size();} - double length(void); + std::vector get() {return m_parms;} + bool empty() {return m_parms.empty();} + int size() {return m_parms.size();} + double length(); void dump(const char* title); - DashSpec reversed(void); + DashSpec reversed(); private: std::vector m_parms; @@ -77,27 +77,27 @@ public: void load(std::string& lineSpec); - double getAngle(void) {return m_angle;} - Base::Vector3d getOrigin(void) {return m_origin;} - double getInterval(void) {return m_interval;} - double getIntervalX(void); - double getIntervalY(void); - double getOffset(void) {return m_offset;} - double getSlope(void); - double getLength(void) {return m_dashParms.length(); } - DashSpec getDashParms(void) {return m_dashParms;} + double getAngle() {return m_angle;} + Base::Vector3d getOrigin() {return m_origin;} + double getInterval() {return m_interval;} + double getIntervalX(); + double getIntervalY(); + double getOffset() {return m_offset;} + double getSlope(); + double getLength() {return m_dashParms.length(); } + DashSpec getDashParms() {return m_dashParms;} static std::vector getSpecsForPattern(std::string& parmFile, std::string& parmName); static bool findPatternStart(std::ifstream& inFile, std::string& parmName); static std::vector loadPatternDef(std::ifstream& inFile); static std::vector getPatternList(std::string& parmFile); - bool isDashed(void); + bool isDashed(); void dump(const char* title); private: - void init(void); + void init(); std::vector split(std::string line); //PAT line extracted tokens double m_angle; @@ -119,34 +119,34 @@ public: void setGeoms(std::vector g) {m_geoms = g;} void setBBox(const Bnd_Box& bb) {m_box = bb;} - std::vector getEdges(void) { return m_edges; } + std::vector getEdges() { return m_edges; } TopoDS_Edge getEdge(int i) {return m_edges.at(i);} - std::vector getGeoms(void) { return m_geoms; } + std::vector getGeoms() { return m_geoms; } - PATLineSpec getPATLineSpec(void) { return m_hatchLine; } - double getOffset(void) { return m_hatchLine.getOffset(); } //delta X offset - double getAngle(void) { return m_hatchLine.getAngle(); } - Base::Vector3d getOrigin(void) { return m_hatchLine.getOrigin(); } - double getInterval(void) {return m_hatchLine.getInterval(); } //space between lines - double getIntervalX(void) { return m_hatchLine.getIntervalX(); } //interval X-component - double getIntervalY(void) { return m_hatchLine.getIntervalY(); } //interval Y-component - double getSlope(void) { return m_hatchLine.getSlope(); } - double getPatternLength(void) { return m_hatchLine.getLength(); } - Base::Vector3d getUnitDir(void); - Base::Vector3d getUnitOrtho(void); - DashSpec getDashSpec(void) { return m_hatchLine.getDashParms();} + PATLineSpec getPATLineSpec() { return m_hatchLine; } + double getOffset() { return m_hatchLine.getOffset(); } //delta X offset + double getAngle() { return m_hatchLine.getAngle(); } + Base::Vector3d getOrigin() { return m_hatchLine.getOrigin(); } + double getInterval() {return m_hatchLine.getInterval(); } //space between lines + double getIntervalX() { return m_hatchLine.getIntervalX(); } //interval X-component + double getIntervalY() { return m_hatchLine.getIntervalY(); } //interval Y-component + double getSlope() { return m_hatchLine.getSlope(); } + double getPatternLength() { return m_hatchLine.getLength(); } + Base::Vector3d getUnitDir(); + Base::Vector3d getUnitOrtho(); + DashSpec getDashSpec() { return m_hatchLine.getDashParms();} Base::Vector3d calcApparentStart(TechDraw::BaseGeomPtr g); - Base::Vector3d findAtomStart(void); - Base::Vector3d getLineOrigin(void); //point corresponding to pattern origin for this line (O + n*intervalX) + Base::Vector3d findAtomStart(); + Base::Vector3d getLineOrigin(); //point corresponding to pattern origin for this line (O + n*intervalX) Base::Vector3d getPatternStartPoint(TechDraw::BaseGeomPtr g, double &offset, double scale = 1.0); - Bnd_Box getBBox(void) {return m_box;} - double getMinX(void); - double getMaxX(void); - double getMinY(void); - double getMaxY(void); + Bnd_Box getBBox() {return m_box;} + double getMinX(); + double getMaxX(); + double getMinY(); + double getMaxY(); - bool isDashed(void); + bool isDashed(); private: std::vector m_edges; diff --git a/src/Mod/TechDraw/App/LandmarkDimension.cpp b/src/Mod/TechDraw/App/LandmarkDimension.cpp index 7dfb3ec7ca..3deabd111c 100644 --- a/src/Mod/TechDraw/App/LandmarkDimension.cpp +++ b/src/Mod/TechDraw/App/LandmarkDimension.cpp @@ -68,7 +68,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::LandmarkDimension, TechDraw::DrawViewDimension) -LandmarkDimension::LandmarkDimension(void) +LandmarkDimension::LandmarkDimension() { static const char *group = "Landmark"; //this leaves a blank entry in position 1. @@ -100,7 +100,7 @@ short LandmarkDimension::mustExecute() const return DrawViewDimension::mustExecute(); } -App::DocumentObjectExecReturn *LandmarkDimension::execute(void) +App::DocumentObjectExecReturn *LandmarkDimension::execute() { // Base::Console().Message("LD::execute() - %s\n", getNameInDocument()); if (!keepUpdated()) { @@ -172,7 +172,7 @@ Base::Vector3d LandmarkDimension::projectPoint(const Base::Vector3d& pt, DrawVie return result; } -std::vector LandmarkDimension::get2DPoints(void) const +std::vector LandmarkDimension::get2DPoints() const { // Base::Console().Message("LD::get2DPoints()\n"); std::vector result; @@ -187,7 +187,7 @@ std::vector LandmarkDimension::get2DPoints(void) const } //! References2D are only used to store ParentView -bool LandmarkDimension::has2DReferences(void) const +bool LandmarkDimension::has2DReferences() const { bool result = false; const std::vector &objects = References2D.getValues(); diff --git a/src/Mod/TechDraw/App/LandmarkDimension.h b/src/Mod/TechDraw/App/LandmarkDimension.h index b74a985208..0c73a5da14 100644 --- a/src/Mod/TechDraw/App/LandmarkDimension.h +++ b/src/Mod/TechDraw/App/LandmarkDimension.h @@ -50,22 +50,22 @@ public: App::PropertyStringList ReferenceTags; //tags of 2d vertices in DVP - virtual App::DocumentObjectExecReturn *execute(void) override; + virtual App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; virtual void unsetupObject() override; - virtual const char* getViewProviderName(void) const override { + virtual const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDimension"; } /* virtual PyObject *getPyObject(void) override;*/ virtual bool checkReferences2D() const override; - virtual bool has2DReferences(void) const override; + virtual bool has2DReferences() const override; virtual pointPair getPointsTwoVerts() override; - std::vector get2DPoints(void) const; + std::vector get2DPoints() const; virtual DrawViewPart* getViewPart() const override; virtual int getRefType() const override; - gp_Ax2 getProjAxis(void) const; + gp_Ax2 getProjAxis() const; protected: virtual void onChanged(const App::Property* prop) override; diff --git a/src/Mod/TechDraw/App/LineGroup.cpp b/src/Mod/TechDraw/App/LineGroup.cpp index 5ae3cdcbda..de30185716 100644 --- a/src/Mod/TechDraw/App/LineGroup.cpp +++ b/src/Mod/TechDraw/App/LineGroup.cpp @@ -54,7 +54,7 @@ LineGroup::~LineGroup() { } -void LineGroup::init(void) +void LineGroup::init() { m_name = "Default"; m_thin = 0.35; diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp index 0ac0fef953..5fff3df3f9 100644 --- a/src/Mod/TechDraw/App/Preferences.cpp +++ b/src/Mod/TechDraw/App/Preferences.cpp @@ -303,7 +303,7 @@ std::string Preferences::patFile() return result; } -std::string Preferences::bitmapFill(void) +std::string Preferences::bitmapFill() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Files"); diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h index 0e02796455..c940f18c42 100644 --- a/src/Mod/TechDraw/App/Preferences.h +++ b/src/Mod/TechDraw/App/Preferences.h @@ -74,7 +74,7 @@ static int mattingStyle(); static std::string svgFile(); static std::string patFile(); -static std::string bitmapFill(void); +static std::string bitmapFill(); static double GapISO(); static double GapASME(); diff --git a/src/Mod/TechDraw/App/ProjectionAlgos.cpp b/src/Mod/TechDraw/App/ProjectionAlgos.cpp index a3f1e69f70..f69f7ceac0 100644 --- a/src/Mod/TechDraw/App/ProjectionAlgos.cpp +++ b/src/Mod/TechDraw/App/ProjectionAlgos.cpp @@ -108,7 +108,7 @@ static const TopoDS_Shape& build3dCurves(const TopoDS_Shape &shape) return shape; } -void ProjectionAlgos::execute(void) +void ProjectionAlgos::execute() { Handle( HLRBRep_Algo ) brep_hlr = new HLRBRep_Algo; brep_hlr->Add(Input); diff --git a/src/Mod/TechDraw/App/ProjectionAlgos.h b/src/Mod/TechDraw/App/ProjectionAlgos.h index a8b96fba75..ee68472077 100644 --- a/src/Mod/TechDraw/App/ProjectionAlgos.h +++ b/src/Mod/TechDraw/App/ProjectionAlgos.h @@ -46,7 +46,7 @@ public: ProjectionAlgos(const TopoDS_Shape &Input,const Base::Vector3d &Dir); virtual ~ProjectionAlgos(); - void execute(void); + void execute(); enum ExtractionType { Plain = 0, diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp index adf48d8fa0..90faf9c731 100644 --- a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp +++ b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp @@ -72,7 +72,7 @@ void PropertyCenterLineList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyCenterLineList::getSize(void) const +int PropertyCenterLineList::getSize() const { return static_cast(_lValueList.size()); } @@ -96,7 +96,7 @@ void PropertyCenterLineList::setValues(const std::vector& lValue) hasSetValue(); } -PyObject *PropertyCenterLineList::getPyObject(void) +PyObject *PropertyCenterLineList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -190,7 +190,7 @@ void PropertyCenterLineList::Restore(Base::XMLReader &reader) setValues(values); } -App::Property *PropertyCenterLineList::Copy(void) const +App::Property *PropertyCenterLineList::Copy() const { PropertyCenterLineList *p = new PropertyCenterLineList(); p->setValues(_lValueList); @@ -203,7 +203,7 @@ void PropertyCenterLineList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyCenterLineList::getMemSize(void) const +unsigned int PropertyCenterLineList::getMemSize() const { int size = sizeof(PropertyCenterLineList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp index 2356fbe2ff..121cd069b2 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp +++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp @@ -72,7 +72,7 @@ void PropertyCosmeticEdgeList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyCosmeticEdgeList::getSize(void) const +int PropertyCosmeticEdgeList::getSize() const { return static_cast(_lValueList.size()); } @@ -98,7 +98,7 @@ void PropertyCosmeticEdgeList::setValues(const std::vector& lValu hasSetValue(); } -PyObject *PropertyCosmeticEdgeList::getPyObject(void) +PyObject *PropertyCosmeticEdgeList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -192,7 +192,7 @@ void PropertyCosmeticEdgeList::Restore(Base::XMLReader &reader) setValues(values); } -App::Property *PropertyCosmeticEdgeList::Copy(void) const +App::Property *PropertyCosmeticEdgeList::Copy() const { PropertyCosmeticEdgeList *p = new PropertyCosmeticEdgeList(); p->setValues(_lValueList); @@ -205,7 +205,7 @@ void PropertyCosmeticEdgeList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyCosmeticEdgeList::getMemSize(void) const +unsigned int PropertyCosmeticEdgeList::getMemSize() const { int size = sizeof(PropertyCosmeticEdgeList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp index 094dcecb71..296e52b037 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp +++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp @@ -72,7 +72,7 @@ void PropertyCosmeticVertexList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyCosmeticVertexList::getSize(void) const +int PropertyCosmeticVertexList::getSize() const { return static_cast(_lValueList.size()); } @@ -96,7 +96,7 @@ void PropertyCosmeticVertexList::setValues(const std::vector& l hasSetValue(); } -PyObject *PropertyCosmeticVertexList::getPyObject(void) +PyObject *PropertyCosmeticVertexList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -192,7 +192,7 @@ void PropertyCosmeticVertexList::Restore(Base::XMLReader &reader) setValues(values); } -App::Property *PropertyCosmeticVertexList::Copy(void) const +App::Property *PropertyCosmeticVertexList::Copy() const { PropertyCosmeticVertexList *p = new PropertyCosmeticVertexList(); p->setValues(_lValueList); @@ -205,7 +205,7 @@ void PropertyCosmeticVertexList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyCosmeticVertexList::getMemSize(void) const +unsigned int PropertyCosmeticVertexList::getMemSize() const { int size = sizeof(PropertyCosmeticVertexList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp index 6bb4e7f18a..0688a20152 100644 --- a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp +++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp @@ -74,7 +74,7 @@ void PropertyGeomFormatList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyGeomFormatList::getSize(void) const +int PropertyGeomFormatList::getSize() const { return static_cast(_lValueList.size()); } @@ -105,7 +105,7 @@ void PropertyGeomFormatList::setValues(const std::vector& lValue) hasSetValue(); } -PyObject *PropertyGeomFormatList::getPyObject(void) +PyObject *PropertyGeomFormatList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0; i < getSize(); i++) @@ -204,7 +204,7 @@ void PropertyGeomFormatList::Restore(Base::XMLReader &reader) setValues(values); } -App::Property *PropertyGeomFormatList::Copy(void) const +App::Property *PropertyGeomFormatList::Copy() const { PropertyGeomFormatList *p = new PropertyGeomFormatList(); p->setValues(_lValueList); @@ -217,7 +217,7 @@ void PropertyGeomFormatList::Paste(const Property &from) setValues(FromList._lValueList); } -unsigned int PropertyGeomFormatList::getMemSize(void) const +unsigned int PropertyGeomFormatList::getMemSize() const { int size = sizeof(PropertyGeomFormatList); for (int i = 0; i < getSize(); i++) diff --git a/src/Mod/TechDraw/App/ShapeExtractor.cpp b/src/Mod/TechDraw/App/ShapeExtractor.cpp index f2b0bd91c5..03b5d97f86 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.cpp +++ b/src/Mod/TechDraw/App/ShapeExtractor.cpp @@ -429,7 +429,7 @@ Base::Vector3d ShapeExtractor::getLocation3dFromFeat(App::DocumentObject* obj) return result; } -bool ShapeExtractor::prefAdd2d(void) +bool ShapeExtractor::prefAdd2d() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); diff --git a/src/Mod/TechDraw/App/ShapeExtractor.h b/src/Mod/TechDraw/App/ShapeExtractor.h index e2c9462ac7..7c8025bc4b 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.h +++ b/src/Mod/TechDraw/App/ShapeExtractor.h @@ -50,7 +50,7 @@ public: static bool isPointType(App::DocumentObject* obj); static bool isDraftPoint(App::DocumentObject* obj); static Base::Vector3d getLocation3dFromFeat(App::DocumentObject* obj); - static bool prefAdd2d(void); + static bool prefAdd2d(); static TopoDS_Shape stripInfiniteShapes(TopoDS_Shape inShape); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index b4e32a7904..69de80a612 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -70,12 +70,12 @@ // use a different name to CreateCommand() -void CreateTechDrawCommands(void); -void CreateTechDrawCommandsDims(void); -void CreateTechDrawCommandsDecorate(void); -void CreateTechDrawCommandsAnnotate(void); -void CreateTechDrawCommandsExtensionDims(void); -void CreateTechDrawCommandsExtensions(void); +void CreateTechDrawCommands(); +void CreateTechDrawCommandsDims(); +void CreateTechDrawCommandsDecorate(); +void CreateTechDrawCommandsAnnotate(); +void CreateTechDrawCommandsExtensionDims(); +void CreateTechDrawCommandsExtensions(); void loadTechDrawResource() { diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index df734f1e7b..1530dd2b16 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -166,7 +166,7 @@ void CmdTechDrawPageDefault::activated(int iMsg) } } -bool CmdTechDrawPageDefault::isActive(void) +bool CmdTechDrawPageDefault::isActive() { return hasActiveDocument(); } @@ -246,7 +246,7 @@ void CmdTechDrawPageTemplate::activated(int iMsg) } } -bool CmdTechDrawPageTemplate::isActive(void) +bool CmdTechDrawPageTemplate::isActive() { return hasActiveDocument(); } @@ -281,7 +281,7 @@ void CmdTechDrawRedrawPage::activated(int iMsg) page->redrawCommand(); } -bool CmdTechDrawRedrawPage::isActive(void) +bool CmdTechDrawRedrawPage::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -427,7 +427,7 @@ void CmdTechDrawView::activated(int iMsg) commitCommand(); } -bool CmdTechDrawView::isActive(void) +bool CmdTechDrawView::isActive() { return DrawGuiUtil::needPage(this); } @@ -461,7 +461,7 @@ void CmdTechDrawActiveView::activated(int iMsg) Gui::Control().showDialog(new TaskDlgActiveView(page)); } -bool CmdTechDrawActiveView::isActive(void) +bool CmdTechDrawActiveView::isActive() { return DrawGuiUtil::needPage(this); } @@ -505,7 +505,7 @@ void CmdTechDrawSectionView::activated(int iMsg) commitCommand(); } -bool CmdTechDrawSectionView::isActive(void) +bool CmdTechDrawSectionView::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -554,7 +554,7 @@ void CmdTechDrawDetailView::activated(int iMsg) Gui::Control().showDialog(new TaskDlgDetail(dvp)); } -bool CmdTechDrawDetailView::isActive(void) +bool CmdTechDrawDetailView::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -708,7 +708,7 @@ void CmdTechDrawProjectionGroup::activated(int iMsg) Gui::Control().showDialog(new TaskDlgProjGroup(multiView, true)); } -bool CmdTechDrawProjectionGroup::isActive(void) +bool CmdTechDrawProjectionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool taskInProgress = false; @@ -904,7 +904,7 @@ void CmdTechDrawBalloon::activated(int iMsg) } } -bool CmdTechDrawBalloon::isActive(void) +bool CmdTechDrawBalloon::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -946,7 +946,7 @@ void CmdTechDrawClipGroup::activated(int iMsg) commitCommand(); } -bool CmdTechDrawClipGroup::isActive(void) +bool CmdTechDrawClipGroup::isActive() { return DrawGuiUtil::needPage(this); } @@ -1021,7 +1021,7 @@ void CmdTechDrawClipGroupAdd::activated(int iMsg) commitCommand(); } -bool CmdTechDrawClipGroupAdd::isActive(void) +bool CmdTechDrawClipGroupAdd::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveClip = false; @@ -1094,7 +1094,7 @@ void CmdTechDrawClipGroupRemove::activated(int iMsg) commitCommand(); } -bool CmdTechDrawClipGroupRemove::isActive(void) +bool CmdTechDrawClipGroupRemove::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveClip = false; @@ -1159,7 +1159,7 @@ void CmdTechDrawSymbol::activated(int iMsg) } } -bool CmdTechDrawSymbol::isActive(void) +bool CmdTechDrawSymbol::isActive() { return DrawGuiUtil::needPage(this); } @@ -1217,7 +1217,7 @@ void CmdTechDrawDraftView::activated(int iMsg) } } -bool CmdTechDrawDraftView::isActive(void) +bool CmdTechDrawDraftView::isActive() { return DrawGuiUtil::needPage(this); } @@ -1282,7 +1282,7 @@ void CmdTechDrawArchView::activated(int iMsg) commitCommand(); } -bool CmdTechDrawArchView::isActive(void) +bool CmdTechDrawArchView::isActive() { return DrawGuiUtil::needPage(this); } @@ -1331,7 +1331,7 @@ void CmdTechDrawSpreadsheetView::activated(int iMsg) commitCommand(); } -bool CmdTechDrawSpreadsheetView::isActive(void) +bool CmdTechDrawSpreadsheetView::isActive() { //need a Page and a SpreadSheet::Sheet bool havePage = DrawGuiUtil::needPage(this); @@ -1387,7 +1387,7 @@ void CmdTechDrawExportPageSVG::activated(int iMsg) } } -bool CmdTechDrawExportPageSVG::isActive(void) +bool CmdTechDrawExportPageSVG::isActive() { return DrawGuiUtil::needPage(this); } @@ -1453,7 +1453,7 @@ void CmdTechDrawExportPageDXF::activated(int iMsg) } -bool CmdTechDrawExportPageDXF::isActive(void) +bool CmdTechDrawExportPageDXF::isActive() { return DrawGuiUtil::needPage(this); } @@ -1485,12 +1485,12 @@ void CmdTechDrawProjectShape::activated(int iMsg) } } -bool CmdTechDrawProjectShape::isActive(void) +bool CmdTechDrawProjectShape::isActive() { return true; } -void CreateTechDrawCommands(void) +void CreateTechDrawCommands() { Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp index 2a334f30f4..6a0f42d588 100644 --- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp +++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp @@ -148,7 +148,7 @@ void CmdTechDrawLeaderLine::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawLeaderLine::isActive(void) +bool CmdTechDrawLeaderLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -200,7 +200,7 @@ void CmdTechDrawRichTextAnnotation::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawRichTextAnnotation::isActive(void) +bool CmdTechDrawRichTextAnnotation::isActive() { bool havePage = DrawGuiUtil::needPage(this); return havePage; @@ -254,7 +254,7 @@ void CmdTechDrawCosmeticVertexGroup::activated(int iMsg) Gui::Selection().clearSelection(); } -Gui::Action * CmdTechDrawCosmeticVertexGroup::createAction(void) +Gui::Action * CmdTechDrawCosmeticVertexGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -306,7 +306,7 @@ void CmdTechDrawCosmeticVertexGroup::languageChange() arc3->setStatusTip(arc3->toolTip()); } -bool CmdTechDrawCosmeticVertexGroup::isActive(void) +bool CmdTechDrawCosmeticVertexGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -446,7 +446,7 @@ void CmdTechDrawCosmeticVertex::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawCosmeticVertex::isActive(void) +bool CmdTechDrawCosmeticVertex::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -485,7 +485,7 @@ void CmdTechDrawMidpoints::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawMidpoints::isActive(void) +bool CmdTechDrawMidpoints::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -524,7 +524,7 @@ void CmdTechDrawQuadrants::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawQuadrants::isActive(void) +bool CmdTechDrawQuadrants::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -566,7 +566,7 @@ void CmdTechDrawAnnotation::activated(int iMsg) commitCommand(); } -bool CmdTechDrawAnnotation::isActive(void) +bool CmdTechDrawAnnotation::isActive() { return DrawGuiUtil::needPage(this); } @@ -616,7 +616,7 @@ void CmdTechDrawCenterLineGroup::activated(int iMsg) }; } -Gui::Action * CmdTechDrawCenterLineGroup::createAction(void) +Gui::Action * CmdTechDrawCenterLineGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -668,7 +668,7 @@ void CmdTechDrawCenterLineGroup::languageChange() arc3->setStatusTip(arc3->toolTip()); } -bool CmdTechDrawCenterLineGroup::isActive(void) +bool CmdTechDrawCenterLineGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -706,7 +706,7 @@ void CmdTechDrawFaceCenterLine::activated(int iMsg) execCenterLine(this); } -bool CmdTechDrawFaceCenterLine::isActive(void) +bool CmdTechDrawFaceCenterLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -817,7 +817,7 @@ void CmdTechDraw2LineCenterLine::activated(int iMsg) exec2LineCenterLine(this); } -bool CmdTechDraw2LineCenterLine::isActive(void) +bool CmdTechDraw2LineCenterLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -894,7 +894,7 @@ void CmdTechDraw2PointCenterLine::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDraw2PointCenterLine::isActive(void) +bool CmdTechDraw2PointCenterLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1008,7 +1008,7 @@ void CmdTechDraw2PointCosmeticLine::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDraw2PointCosmeticLine::isActive(void) +bool CmdTechDraw2PointCosmeticLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1240,7 +1240,7 @@ void CmdTechDrawCosmeticEraser::activated(int iMsg) } } -bool CmdTechDrawCosmeticEraser::isActive(void) +bool CmdTechDrawCosmeticEraser::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1319,7 +1319,7 @@ void CmdTechDrawDecorateLine::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawDecorateLine::isActive(void) +bool CmdTechDrawDecorateLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1384,7 +1384,7 @@ void CmdTechDrawShowAll::activated(int iMsg) } } -bool CmdTechDrawShowAll::isActive(void) +bool CmdTechDrawShowAll::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1448,7 +1448,7 @@ void CmdTechDrawWeldSymbol::activated(int iMsg) Gui::Selection().clearSelection(); } -bool CmdTechDrawWeldSymbol::isActive(void) +bool CmdTechDrawWeldSymbol::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -1493,14 +1493,14 @@ void CmdTechDrawSurfaceFinishSymbols::activated(int iMsg) Gui::Control().showDialog(new TechDrawGui::TaskDlgSurfaceFinishSymbols(objFeat)); } -bool CmdTechDrawSurfaceFinishSymbols::isActive(void) +bool CmdTechDrawSurfaceFinishSymbols::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); return havePage && haveView; } -void CreateTechDrawCommandsAnnotate(void) +void CreateTechDrawCommandsAnnotate() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index c38c32bf3c..e938c61cce 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -233,7 +233,7 @@ void CmdTechDrawDimension::activated(int iMsg) // objFeat->X.setValue(x); } -bool CmdTechDrawDimension::isActive(void) +bool CmdTechDrawDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -349,7 +349,7 @@ void CmdTechDrawRadiusDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawRadiusDimension::isActive(void) +bool CmdTechDrawRadiusDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -460,7 +460,7 @@ void CmdTechDrawDiameterDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawDiameterDimension::isActive(void) +bool CmdTechDrawDiameterDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -564,7 +564,7 @@ void CmdTechDrawLengthDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawLengthDimension::isActive(void) +bool CmdTechDrawLengthDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -669,7 +669,7 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawHorizontalDimension::isActive(void) +bool CmdTechDrawHorizontalDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -773,7 +773,7 @@ void CmdTechDrawVerticalDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawVerticalDimension::isActive(void) +bool CmdTechDrawVerticalDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -861,7 +861,7 @@ void CmdTechDrawAngleDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDrawAngleDimension::isActive(void) +bool CmdTechDrawAngleDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -950,7 +950,7 @@ void CmdTechDraw3PtAngleDimension::activated(int iMsg) objFeat->X.setValue(x); } -bool CmdTechDraw3PtAngleDimension::isActive(void) +bool CmdTechDraw3PtAngleDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1026,7 +1026,7 @@ void CmdTechDrawLinkDimension::activated(int iMsg) page->getDocument()->recompute(); //still need to recompute in Gui. why? } -bool CmdTechDrawLinkDimension::isActive(void) +bool CmdTechDrawLinkDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1079,7 +1079,7 @@ void CmdTechDrawExtentGroup::activated(int iMsg) }; } -Gui::Action * CmdTechDrawExtentGroup::createAction(void) +Gui::Action * CmdTechDrawExtentGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1123,7 +1123,7 @@ void CmdTechDrawExtentGroup::languageChange() arc2->setStatusTip(arc2->toolTip()); } -bool CmdTechDrawExtentGroup::isActive(void) +bool CmdTechDrawExtentGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -1162,7 +1162,7 @@ void CmdTechDrawHorizontalExtentDimension::activated(int iMsg) execHExtent(this); } -bool CmdTechDrawHorizontalExtentDimension::isActive(void) +bool CmdTechDrawHorizontalExtentDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -1249,7 +1249,7 @@ void CmdTechDrawVerticalExtentDimension::activated(int iMsg) execVExtent(this); } -bool CmdTechDrawVerticalExtentDimension::isActive(void) +bool CmdTechDrawVerticalExtentDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, false); @@ -1390,7 +1390,7 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) dvp->X.setValue(x); } -bool CmdTechDrawLandmarkDimension::isActive(void) +bool CmdTechDrawLandmarkDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1399,7 +1399,7 @@ bool CmdTechDrawLandmarkDimension::isActive(void) //------------------------------------------------------------------------------ -void CreateTechDrawCommandsDims(void) +void CreateTechDrawCommandsDims() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index 52558dc7a5..cfa5eff799 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -167,7 +167,7 @@ void CmdTechDrawHatch::activated(int iMsg) getDocument()->recompute(); } -bool CmdTechDrawHatch::isActive(void) +bool CmdTechDrawHatch::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -236,7 +236,7 @@ void CmdTechDrawGeometricHatch::activated(int iMsg) getDocument()->recompute(); } -bool CmdTechDrawGeometricHatch::isActive(void) +bool CmdTechDrawGeometricHatch::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -290,7 +290,7 @@ void CmdTechDrawImage::activated(int iMsg) commitCommand(); } -bool CmdTechDrawImage::isActive(void) +bool CmdTechDrawImage::isActive() { return DrawGuiUtil::needPage(this); } @@ -334,7 +334,7 @@ void CmdTechDrawToggleFrame::activated(int iMsg) vpp->toggleFrameState(); } -bool CmdTechDrawToggleFrame::isActive(void) +bool CmdTechDrawToggleFrame::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this,false); @@ -342,7 +342,7 @@ bool CmdTechDrawToggleFrame::isActive(void) } -void CreateTechDrawCommandsDecorate(void) +void CreateTechDrawCommandsDecorate() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp index 4188e3b047..f19479ed9f 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp @@ -140,7 +140,7 @@ void CmdTechDrawExtensionInsertDiameter::activated(int iMsg) execInsertPrefixChar(this, "⌀"); } -bool CmdTechDrawExtensionInsertDiameter::isActive(void) +bool CmdTechDrawExtensionInsertDiameter::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -173,7 +173,7 @@ void CmdTechDrawExtensionInsertSquare::activated(int iMsg) execInsertPrefixChar(this, "□"); //□ white square U+25A1 } -bool CmdTechDrawExtensionInsertSquare::isActive(void) +bool CmdTechDrawExtensionInsertSquare::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -231,7 +231,7 @@ void CmdTechDrawExtensionRemovePrefixChar::activated(int iMsg) execRemovePrefixChar(this); } -bool CmdTechDrawExtensionRemovePrefixChar::isActive(void) +bool CmdTechDrawExtensionRemovePrefixChar::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -284,7 +284,7 @@ void CmdTechDrawExtensionInsertPrefixGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionInsertPrefixGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionInsertPrefixGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -345,7 +345,7 @@ void CmdTechDrawExtensionInsertPrefixGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionInsertPrefixGroup::isActive(void) +bool CmdTechDrawExtensionInsertPrefixGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -407,7 +407,7 @@ void CmdTechDrawExtensionIncreaseDecimal::activated(int iMsg) execIncreaseDecreaseDecimal(this, 1); } -bool CmdTechDrawExtensionIncreaseDecimal::isActive(void) +bool CmdTechDrawExtensionIncreaseDecimal::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -440,7 +440,7 @@ void CmdTechDrawExtensionDecreaseDecimal::activated(int iMsg) execIncreaseDecreaseDecimal(this, -1); } -bool CmdTechDrawExtensionDecreaseDecimal::isActive(void) +bool CmdTechDrawExtensionDecreaseDecimal::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -490,7 +490,7 @@ void CmdTechDrawExtensionIncreaseDecreaseGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionIncreaseDecreaseGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionIncreaseDecreaseGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -540,7 +540,7 @@ void CmdTechDrawExtensionIncreaseDecreaseGroup::languageChange() arc2->setStatusTip(arc2->text()); } -bool CmdTechDrawExtensionIncreaseDecreaseGroup::isActive(void) +bool CmdTechDrawExtensionIncreaseDecreaseGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -601,7 +601,7 @@ void CmdTechDrawExtensionPosHorizChainDimension::activated(int iMsg) execPosHorizChainDimension(this); } -bool CmdTechDrawExtensionPosHorizChainDimension::isActive(void) +bool CmdTechDrawExtensionPosHorizChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -663,7 +663,7 @@ void CmdTechDrawExtensionPosVertChainDimension::activated(int iMsg) execPosVertChainDimension(this); } -bool CmdTechDrawExtensionPosVertChainDimension::isActive(void) +bool CmdTechDrawExtensionPosVertChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -731,7 +731,7 @@ void CmdTechDrawExtensionPosObliqueChainDimension::activated(int iMsg) ///Base::Console().Message("TechDraw_ExtensionPosObliqueChainDimension started\n"); } -bool CmdTechDrawExtensionPosObliqueChainDimension::isActive(void) +bool CmdTechDrawExtensionPosObliqueChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -785,7 +785,7 @@ void CmdTechDrawExtensionPosChainDimensionGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionPosChainDimensionGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionPosChainDimensionGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -849,7 +849,7 @@ void CmdTechDrawExtensionPosChainDimensionGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionPosChainDimensionGroup::isActive(void) +bool CmdTechDrawExtensionPosChainDimensionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -915,7 +915,7 @@ void CmdTechDrawExtensionCascadeHorizDimension::activated(int iMsg) execCascadeHorizDimension(this); } -bool CmdTechDrawExtensionCascadeHorizDimension::isActive(void) +bool CmdTechDrawExtensionCascadeHorizDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -982,7 +982,7 @@ void CmdTechDrawExtensionCascadeVertDimension::activated(int iMsg) execCascadeVertDimension(this); } -bool CmdTechDrawExtensionCascadeVertDimension::isActive(void) +bool CmdTechDrawExtensionCascadeVertDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1058,7 +1058,7 @@ void CmdTechDrawExtensionCascadeObliqueDimension::activated(int iMsg) ///Base::Console().Message("TechDraw_ExtensionPosObliqueChainDimension started\n"); } -bool CmdTechDrawExtensionCascadeObliqueDimension::isActive(void) +bool CmdTechDrawExtensionCascadeObliqueDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1113,7 +1113,7 @@ void CmdTechDrawExtensionCascadeDimensionGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionCascadeDimensionGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionCascadeDimensionGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1180,7 +1180,7 @@ void CmdTechDrawExtensionCascadeDimensionGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionCascadeDimensionGroup::isActive(void) +bool CmdTechDrawExtensionCascadeDimensionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1244,7 +1244,7 @@ void CmdTechDrawExtensionCreateHorizChainDimension::activated(int iMsg) //execSortieren(this); } -bool CmdTechDrawExtensionCreateHorizChainDimension::isActive(void) +bool CmdTechDrawExtensionCreateHorizChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1308,7 +1308,7 @@ void CmdTechDrawExtensionCreateVertChainDimension::activated(int iMsg) execCreateVertChainDimension(this); } -bool CmdTechDrawExtensionCreateVertChainDimension::isActive(void) +bool CmdTechDrawExtensionCreateVertChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1399,7 +1399,7 @@ void CmdTechDrawExtensionCreateObliqueChainDimension::activated(int iMsg) execCreateObliqueChainDimension(this); } -bool CmdTechDrawExtensionCreateObliqueChainDimension::isActive(void) +bool CmdTechDrawExtensionCreateObliqueChainDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1452,7 +1452,7 @@ void CmdTechDrawExtensionCreateChainDimensionGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionCreateChainDimensionGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionCreateChainDimensionGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1514,7 +1514,7 @@ void CmdTechDrawExtensionCreateChainDimensionGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionCreateChainDimensionGroup::isActive(void) +bool CmdTechDrawExtensionCreateChainDimensionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1585,7 +1585,7 @@ void CmdTechDrawExtensionCreateHorizCoordDimension::activated(int iMsg) execCreateHorizCoordDimension(this); } -bool CmdTechDrawExtensionCreateHorizCoordDimension::isActive(void) +bool CmdTechDrawExtensionCreateHorizCoordDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1657,7 +1657,7 @@ void CmdTechDrawExtensionCreateVertCoordDimension::activated(int iMsg) execCreateVertCoordDimension(this); } -bool CmdTechDrawExtensionCreateVertCoordDimension::isActive(void) +bool CmdTechDrawExtensionCreateVertCoordDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1755,7 +1755,7 @@ void CmdTechDrawExtensionCreateObliqueCoordDimension::activated(int iMsg) execCreateObliqueCoordDimension(this); } -bool CmdTechDrawExtensionCreateObliqueCoordDimension::isActive(void) +bool CmdTechDrawExtensionCreateObliqueCoordDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1810,7 +1810,7 @@ void CmdTechDrawExtensionCreateCoordDimensionGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionCreateCoordDimensionGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionCreateCoordDimensionGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1878,7 +1878,7 @@ void CmdTechDrawExtensionCreateCoordDimensionGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionCreateCoordDimensionGroup::isActive(void) +bool CmdTechDrawExtensionCreateCoordDimensionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1945,7 +1945,7 @@ void CmdTechDrawExtensionCreateHorizChamferDimension::activated(int iMsg) execCreateHorizChamferDimension(this); } -bool CmdTechDrawExtensionCreateHorizChamferDimension::isActive(void) +bool CmdTechDrawExtensionCreateHorizChamferDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -2012,7 +2012,7 @@ void CmdTechDrawExtensionCreateVertChamferDimension::activated(int iMsg) execCreateVertChamferDimension(this); } -bool CmdTechDrawExtensionCreateVertChamferDimension::isActive(void) +bool CmdTechDrawExtensionCreateVertChamferDimension::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -2062,7 +2062,7 @@ void CmdTechDrawExtensionChamferDimensionGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionChamferDimensionGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionChamferDimensionGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -2112,7 +2112,7 @@ void CmdTechDrawExtensionChamferDimensionGroup::languageChange() arc2->setStatusTip(arc2->text()); } -bool CmdTechDrawExtensionChamferDimensionGroup::isActive(void) +bool CmdTechDrawExtensionChamferDimensionGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -2188,7 +2188,7 @@ void CmdTechDrawExtensionCreateLengthArc::activated(int iMsg) { Gui::Command::commitCommand(); } -bool CmdTechDrawExtensionCreateLengthArc::isActive(void) +bool CmdTechDrawExtensionCreateLengthArc::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -2227,7 +2227,7 @@ void CmdTechDrawExtensionCustomizeFormat::activated(int iMsg) Gui::Control().showDialog(new TaskDlgCustomizeFormat(object)); } -bool CmdTechDrawExtensionCustomizeFormat::isActive(void) +bool CmdTechDrawExtensionCustomizeFormat::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -2352,7 +2352,7 @@ namespace TechDrawGui { } //------------------------------------------------------------------------------ -void CreateTechDrawCommandsExtensionDims(void) +void CreateTechDrawCommandsExtensionDims() { Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp index 6d59947a2e..cd77031b9e 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp @@ -181,7 +181,7 @@ void CmdTechDrawExtensionHoleCircle::activated(int iMsg) //Base::Console().Message("HoleCircle started\n"); } -bool CmdTechDrawExtensionHoleCircle::isActive(void) +bool CmdTechDrawExtensionHoleCircle::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -254,7 +254,7 @@ void CmdTechDrawExtensionCircleCenterLines::activated(int iMsg) execCircleCenterLines(this); } -bool CmdTechDrawExtensionCircleCenterLines::isActive(void) +bool CmdTechDrawExtensionCircleCenterLines::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -303,7 +303,7 @@ void CmdTechDrawExtensionCircleCenterLinesGroup::activated(int iMsg) { }; } -Gui::Action* CmdTechDrawExtensionCircleCenterLinesGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionCircleCenterLinesGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -355,7 +355,7 @@ void CmdTechDrawExtensionCircleCenterLinesGroup::languageChange() arc2->setStatusTip(arc2->text()); } -bool CmdTechDrawExtensionCircleCenterLinesGroup::isActive(void) +bool CmdTechDrawExtensionCircleCenterLinesGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -406,7 +406,7 @@ void CmdTechDrawExtensionThreadHoleSide::activated(int iMsg) execThreadHoleSide(this); } -bool CmdTechDrawExtensionThreadHoleSide::isActive(void) +bool CmdTechDrawExtensionThreadHoleSide::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -457,7 +457,7 @@ void CmdTechDrawExtensionThreadBoltSide::activated(int iMsg) execThreadBoltSide(this); } -bool CmdTechDrawExtensionThreadBoltSide::isActive(void) +bool CmdTechDrawExtensionThreadBoltSide::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -508,7 +508,7 @@ void CmdTechDrawExtensionThreadHoleBottom::activated(int iMsg) execThreadHoleBottom(this); } -bool CmdTechDrawExtensionThreadHoleBottom::isActive(void) +bool CmdTechDrawExtensionThreadHoleBottom::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -559,7 +559,7 @@ void CmdTechDrawExtensionThreadBoltBottom::activated(int iMsg) execThreadBoltBottom(this); } -bool CmdTechDrawExtensionThreadBoltBottom::isActive(void) +bool CmdTechDrawExtensionThreadBoltBottom::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -616,7 +616,7 @@ void CmdTechDrawExtensionThreadsGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionThreadsGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionThreadsGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -692,7 +692,7 @@ void CmdTechDrawExtensionThreadsGroup::languageChange() arc4->setStatusTip(arc4->text()); } -bool CmdTechDrawExtensionThreadsGroup::isActive(void) +bool CmdTechDrawExtensionThreadsGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -726,7 +726,7 @@ void CmdTechDrawExtensionSelectLineAttributes::activated(int iMsg) Gui::Control().showDialog(new TaskDlgSelectLineAttributes(&_getActiveLineAttributes())); } -bool CmdTechDrawExtensionSelectLineAttributes::isActive(void) +bool CmdTechDrawExtensionSelectLineAttributes::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -785,7 +785,7 @@ void CmdTechDrawExtensionChangeLineAttributes::activated(int iMsg) { Gui::Command::commitCommand(); } -bool CmdTechDrawExtensionChangeLineAttributes::isActive(void) +bool CmdTechDrawExtensionChangeLineAttributes::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -849,7 +849,7 @@ void CmdTechDrawExtensionVertexAtIntersection::activated(int iMsg) Gui::Command::commitCommand(); } -bool CmdTechDrawExtensionVertexAtIntersection::isActive(void) +bool CmdTechDrawExtensionVertexAtIntersection::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -912,7 +912,7 @@ void CmdTechDrawExtensionDrawCosmArc::activated(int iMsg) execDrawCosmArc(this); } -bool CmdTechDrawExtensionDrawCosmArc::isActive(void) +bool CmdTechDrawExtensionDrawCosmArc::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -972,7 +972,7 @@ void CmdTechDrawExtensionDrawCosmCircle::activated(int iMsg) execDrawCosmCircle(this); } -bool CmdTechDrawExtensionDrawCosmCircle::isActive(void) +bool CmdTechDrawExtensionDrawCosmCircle::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1036,7 +1036,7 @@ void CmdTechDrawExtensionDrawCosmCircle3Points::activated(int iMsg) execDrawCosmCircle3Points(this); } -bool CmdTechDrawExtensionDrawCosmCircle3Points::isActive(void) +bool CmdTechDrawExtensionDrawCosmCircle3Points::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1091,7 +1091,7 @@ void CmdTechDrawExtensionDrawCirclesGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionDrawCirclesGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionDrawCirclesGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1158,7 +1158,7 @@ void CmdTechDrawExtensionDrawCirclesGroup::languageChange() arc3->setStatusTip(arc3->text()); } -bool CmdTechDrawExtensionDrawCirclesGroup::isActive(void) +bool CmdTechDrawExtensionDrawCirclesGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1234,7 +1234,7 @@ void CmdTechDrawExtensionLineParallel::activated(int iMsg) execLineParallelPerpendicular(this, true); } -bool CmdTechDrawExtensionLineParallel::isActive(void) +bool CmdTechDrawExtensionLineParallel::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1268,7 +1268,7 @@ void CmdTechDrawExtensionLinePerpendicular::activated(int iMsg) execLineParallelPerpendicular(this, false); } -bool CmdTechDrawExtensionLinePerpendicular::isActive(void) +bool CmdTechDrawExtensionLinePerpendicular::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1319,7 +1319,7 @@ void CmdTechDrawExtensionLinePPGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtensionLinePPGroup::createAction(void) +Gui::Action* CmdTechDrawExtensionLinePPGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1371,7 +1371,7 @@ void CmdTechDrawExtensionLinePPGroup::languageChange() arc2->setStatusTip(arc2->text()); } -bool CmdTechDrawExtensionLinePPGroup::isActive(void) +bool CmdTechDrawExtensionLinePPGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1414,7 +1414,7 @@ void CmdTechDrawExtensionLockUnlockView::activated(int iMsg) { Gui::Command::commitCommand(); } -bool CmdTechDrawExtensionLockUnlockView::isActive(void) +bool CmdTechDrawExtensionLockUnlockView::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1481,7 +1481,7 @@ void CmdTechDrawExtensionPositionSectionView::activated(int iMsg) { } } -bool CmdTechDrawExtensionPositionSectionView::isActive(void) +bool CmdTechDrawExtensionPositionSectionView::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1587,7 +1587,7 @@ void CmdTechDrawExtensionExtendLine::activated(int iMsg) ///Base::Console().Message("ExtendLine started\n"); } -bool CmdTechDrawExtensionExtendLine::isActive(void) +bool CmdTechDrawExtensionExtendLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1622,7 +1622,7 @@ void CmdTechDrawExtensionShortenLine::activated(int iMsg) ///Base::Console().Message("ShortenLine started\n"); } -bool CmdTechDrawExtensionShortenLine::isActive(void) +bool CmdTechDrawExtensionShortenLine::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -1673,7 +1673,7 @@ void CmdTechDrawExtendShortenLineGroup::activated(int iMsg) }; } -Gui::Action* CmdTechDrawExtendShortenLineGroup::createAction(void) +Gui::Action* CmdTechDrawExtendShortenLineGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1725,7 +1725,7 @@ void CmdTechDrawExtendShortenLineGroup::languageChange() arc2->setStatusTip(arc2->text()); } -bool CmdTechDrawExtendShortenLineGroup::isActive(void) +bool CmdTechDrawExtendShortenLineGroup::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this, true); @@ -1858,7 +1858,7 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg) Gui::Command::updateActive(); } -bool CmdTechDrawExtensionAreaAnnotation::isActive(void) +bool CmdTechDrawExtensionAreaAnnotation::isActive() { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -2051,7 +2051,7 @@ namespace TechDrawGui { } //------------------------------------------------------------------------------ -void CreateTechDrawCommandsExtensions(void) +void CreateTechDrawCommandsExtensions() { Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp index 6f9a5e6265..3f354e1f0f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp @@ -133,7 +133,7 @@ void DlgPrefsTechDrawAnnotationImp::changeEvent(QEvent *e) } } -int DlgPrefsTechDrawAnnotationImp::prefBalloonArrow(void) const +int DlgPrefsTechDrawAnnotationImp::prefBalloonArrow() const { return Preferences::balloonArrow(); } diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index c27b1c64eb..ced04cd34f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -47,7 +47,7 @@ protected: void loadSettings(); void changeEvent(QEvent *e); - int prefBalloonArrow(void) const; + int prefBalloonArrow() const; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp index 6c2ea69ca2..afe5ad09d2 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp @@ -119,7 +119,7 @@ void DlgPrefsTechDrawDimensionsImp::changeEvent(QEvent *e) } } -int DlgPrefsTechDrawDimensionsImp::prefArrowStyle(void) const +int DlgPrefsTechDrawDimensionsImp::prefArrowStyle() const { return PreferencesGui::dimArrowStyle(); } diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h index 1f72827feb..a230fe1681 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h @@ -44,7 +44,7 @@ protected: void loadSettings(); void changeEvent(QEvent *e); - int prefArrowStyle(void) const; + int prefArrowStyle() const; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 7be18f100d..8cb80a3b86 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -180,7 +180,7 @@ MDIViewPage::~MDIViewPage() connectDeletedObject.disconnect(); } -void MDIViewPage::addChildrenToPage(void) +void MDIViewPage::addChildrenToPage() { // A fresh page is added and we iterate through its collected children and add these to Canvas View -MLP // if docobj is a featureviewcollection (ex orthogroup), add its child views. if there are ever children that have children, @@ -213,7 +213,7 @@ void MDIViewPage::addChildrenToPage(void) viewAll(); } -void MDIViewPage::matchSceneRectToTemplate(void) +void MDIViewPage::matchSceneRectToTemplate() { App::DocumentObject *obj = m_vpPage->getDrawPage()->Template.getValue(); auto pageTemplate( dynamic_cast(obj) ); @@ -225,7 +225,7 @@ void MDIViewPage::matchSceneRectToTemplate(void) } } -void MDIViewPage::setDimensionGroups(void) +void MDIViewPage::setDimensionGroups() { const std::vector &allItems = m_scene->getViews(); std::vector::const_iterator itInspect; @@ -242,7 +242,7 @@ void MDIViewPage::setDimensionGroups(void) } } -void MDIViewPage::setBalloonGroups(void) +void MDIViewPage::setBalloonGroups() { const std::vector &allItems = m_scene->getViews(); std::vector::const_iterator itInspect; @@ -259,7 +259,7 @@ void MDIViewPage::setBalloonGroups(void) } } -void MDIViewPage::setLeaderGroups(void) +void MDIViewPage::setLeaderGroups() { // Base::Console().Message("MDIVP::setLeaderGroups()\n"); const std::vector &allItems = m_scene->getViews(); @@ -331,7 +331,7 @@ QPointF MDIViewPage::getTemplateCenter(TechDraw::DrawTemplate *obj) return result; } -void MDIViewPage::centerOnPage(void) +void MDIViewPage::centerOnPage() { App::DocumentObject *obj = m_vpPage->getDrawPage()->Template.getValue(); auto pageTemplate( dynamic_cast(obj) ); @@ -855,12 +855,12 @@ void MDIViewPage::contextMenuEvent(QContextMenuEvent *event) menu.exec(event->globalPos()); } -void MDIViewPage::toggleFrame(void) +void MDIViewPage::toggleFrame() { m_vpPage->toggleFrameState(); } -void MDIViewPage::toggleKeepUpdated(void) +void MDIViewPage::toggleKeepUpdated() { bool state = m_vpPage->getDrawPage()->KeepUpdated.getValue(); m_vpPage->getDrawPage()->KeepUpdated.setValue(!state); @@ -1149,7 +1149,7 @@ void MDIViewPage::sceneSelectionChanged() } //Note: Qt says: "no guarantee of selection order"!!! -void MDIViewPage::setTreeToSceneSelect(void) +void MDIViewPage::setTreeToSceneSelect() { bool saveBlock = blockSelection(true); // block selectionChanged signal from Tree/Observer blockSceneSelection(true); diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 3c5910b622..8b02c62b35 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -63,7 +63,7 @@ public: MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = nullptr); virtual ~MDIViewPage(); - void addChildrenToPage(void); + void addChildrenToPage(); /// Observer message from the Tree Selection mechanism @@ -78,7 +78,7 @@ public: void attachTemplate(TechDraw::DrawTemplate *obj); void updateTemplate(bool force = false); void fixOrphans(bool force = false); - void matchSceneRectToTemplate(void); + void matchSceneRectToTemplate(); bool onMsg(const char* pMsg,const char** ppReturn); bool onHasMsg(const char* pMsg) const; @@ -98,14 +98,14 @@ public: PyObject* getPyObject(); TechDraw::DrawPage * getPage() { return m_vpPage->getDrawPage(); } - QGVPage* getQGVPage(void) {return m_view;} - QGSPage* getQGSPage(void) {return m_scene;} + QGVPage* getQGVPage() {return m_view;} + QGSPage* getQGSPage() {return m_scene;} ViewProviderPage* getViewProviderPage() {return m_vpPage;} QPointF getTemplateCenter(TechDraw::DrawTemplate *obj); - void centerOnPage(void); + void centerOnPage(); - void redrawAllViews(void); + void redrawAllViews(); void redraw1View(TechDraw::DrawView* dv); void setTabText(std::string t); @@ -117,11 +117,11 @@ public: public Q_SLOTS: void viewAll(); - void saveSVG(void); - void saveDXF(void); - void savePDF(void); - void toggleFrame(void); - void toggleKeepUpdated(void); + void saveSVG(); + void saveDXF(); + void savePDF(); + void toggleFrame(); + void toggleKeepUpdated(); // void testAction(void); void sceneSelectionChanged(); void onTimer(); @@ -136,9 +136,9 @@ protected: void closeEvent(QCloseEvent*); - void setDimensionGroups(void); - void setBalloonGroups(void); - void setLeaderGroups(void); + void setDimensionGroups(); + void setBalloonGroups(); + void setLeaderGroups(); void showStatusMsg(const char* s1, const char* s2, const char* s3) const; void onDeleteObject(const App::DocumentObject& obj); @@ -147,8 +147,8 @@ protected: Connection connectDeletedObject; bool compareSelections(std::vector treeSel,QList sceneSel); - void setTreeToSceneSelect(void); - void sceneSelectionManager(void); + void setTreeToSceneSelect(); + void sceneSelectionManager(); private: diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.h b/src/Mod/TechDraw/Gui/QGCustomClip.h index ba64ee74db..fc50a8bf2b 100644 --- a/src/Mod/TechDraw/Gui/QGCustomClip.h +++ b/src/Mod/TechDraw/Gui/QGCustomClip.h @@ -42,7 +42,7 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomClip : public QGraphicsItemGroup { public: - explicit QGCustomClip(void); + explicit QGCustomClip(); ~QGCustomClip() {} enum {Type = QGraphicsItem::UserType + 132}; diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.cpp b/src/Mod/TechDraw/Gui/QGCustomImage.cpp index 663ec24abe..356a1ad262 100644 --- a/src/Mod/TechDraw/Gui/QGCustomImage.cpp +++ b/src/Mod/TechDraw/Gui/QGCustomImage.cpp @@ -83,7 +83,7 @@ bool QGCustomImage::load(QPixmap map) return(success); } -QSize QGCustomImage::imageSize(void) +QSize QGCustomImage::imageSize() { QSize result = m_px.size() * scale(); return result; diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h index d1616858e1..70ed8a0d37 100644 --- a/src/Mod/TechDraw/Gui/QGCustomImage.h +++ b/src/Mod/TechDraw/Gui/QGCustomImage.h @@ -44,7 +44,7 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomImage : public QGraphicsPixmapItem { public: - explicit QGCustomImage(void); + explicit QGCustomImage(); ~QGCustomImage(); enum {Type = QGraphicsItem::UserType + 201}; @@ -57,7 +57,7 @@ public: virtual void centerAt(double cX, double cY); virtual bool load(QString fileSpec); virtual bool load(QPixmap map); - virtual QSize imageSize(void); + virtual QSize imageSize(); protected: QPixmap m_px; diff --git a/src/Mod/TechDraw/Gui/QGCustomText.cpp b/src/Mod/TechDraw/Gui/QGCustomText.cpp index 44de673dd3..e3426437be 100644 --- a/src/Mod/TechDraw/Gui/QGCustomText.cpp +++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp @@ -112,12 +112,12 @@ void QGCustomText::justifyRightAt(double cX, double cY, bool vCenter) setPos(newX,newY); } -double QGCustomText::getHeight(void) +double QGCustomText::getHeight() { return boundingRect().height(); } -double QGCustomText::getWidth(void) +double QGCustomText::getWidth() { return boundingRect().width(); } diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp index 00f2e51bad..1882342709 100644 --- a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp +++ b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp @@ -39,7 +39,7 @@ using namespace TechDrawGui; -QGDisplayArea::QGDisplayArea(void) +QGDisplayArea::QGDisplayArea() { setHandlesChildEvents(false); setCacheMode(QGraphicsItem::NoCache); diff --git a/src/Mod/TechDraw/Gui/QGEPath.cpp b/src/Mod/TechDraw/Gui/QGEPath.cpp index 04cf91d1cc..b8955c574b 100644 --- a/src/Mod/TechDraw/Gui/QGEPath.cpp +++ b/src/Mod/TechDraw/Gui/QGEPath.cpp @@ -332,7 +332,7 @@ void QGEPath::onDoubleClick(QPointF pos, int markerIndex) onEndEdit(); } -void QGEPath::onEndEdit(void) +void QGEPath::onEndEdit() { // Base::Console().Message("QGEPath::onEndEdit()\n"); if (m_ghost) { @@ -344,7 +344,7 @@ void QGEPath::onEndEdit(void) clearMarkers(); } -std::vector QGEPath::getDeltasFromLeader(void) +std::vector QGEPath::getDeltasFromLeader() { std::vector qDeltas; if (!m_parentLeader) { @@ -371,7 +371,7 @@ std::vector QGEPath::getDeltasFromLeader(void) } //announce points editing is finished -void QGEPath::updateParent(void) +void QGEPath::updateParent() { // Base::Console().Message("QGEPath::updateParent() - inEdit: %d pts: %d\n",inEdit(), m_ghostPoints.size()); // dumpGhostPoints("QGEP::updateParent"); @@ -382,7 +382,7 @@ void QGEPath::updateParent(void) } //the ghost is the red line drawn when creating or editing the Leader points -void QGEPath::drawGhost(void) +void QGEPath::drawGhost() { // Base::Console().Message("QGEPath::drawGhost()\n"); if (!m_ghost->scene()) { @@ -421,7 +421,7 @@ QPainterPath QGEPath::shape() const return outline; } - double QGEPath::getEdgeFuzz(void) const + double QGEPath::getEdgeFuzz() const { return PreferencesGui::edgeFuzz(); } diff --git a/src/Mod/TechDraw/Gui/QGICMark.cpp b/src/Mod/TechDraw/Gui/QGICMark.cpp index f061791920..bf560fb50b 100644 --- a/src/Mod/TechDraw/Gui/QGICMark.cpp +++ b/src/Mod/TechDraw/Gui/QGICMark.cpp @@ -46,7 +46,7 @@ QGICMark::QGICMark(int index) : QGIVertex(index) m_width = 0.75; draw(); } -void QGICMark::draw(void) +void QGICMark::draw() { QPainterPath cmPath; cmPath.moveTo(0.0,m_size); @@ -103,7 +103,7 @@ QPainterPath QGICMark::shape() const return outline; } - double QGICMark::getMarkFuzz(void) const + double QGICMark::getMarkFuzz() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.cpp b/src/Mod/TechDraw/Gui/QGIDimLines.cpp index 6d8a09a8bb..16c45e1798 100644 --- a/src/Mod/TechDraw/Gui/QGIDimLines.cpp +++ b/src/Mod/TechDraw/Gui/QGIDimLines.cpp @@ -66,7 +66,7 @@ QPainterPath QGIDimLines::shape() const return outline; } -double QGIDimLines::getEdgeFuzz(void) const +double QGIDimLines::getEdgeFuzz() const { return PreferencesGui::edgeFuzz(); } diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp index 380e4b762a..03b2ffb09c 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.cpp +++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp @@ -100,7 +100,7 @@ Qt::PenStyle QGIEdge::getHiddenStyle() return hidStyle; } - double QGIEdge::getEdgeFuzz(void) const + double QGIEdge::getEdgeFuzz() const { return PreferencesGui::edgeFuzz(); } diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index ae03951a39..38e900daed 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -247,7 +247,7 @@ void QGIFace::setOutline(const QPainterPath & path) m_outline = path; } -void QGIFace::clearLineSets(void) +void QGIFace::clearLineSets() { m_dashSpecs.clear(); clearFillItems(); @@ -356,7 +356,7 @@ QGraphicsPathItem* QGIFace::geomToStubbyLine(TechDraw::BaseGeomPtr base, double return fillItem; } -QPen QGIFace::setGeomPen(void) +QPen QGIFace::setGeomPen() { QPen result; result.setWidthF(Rez::guiX(m_geomWeight)); @@ -488,7 +488,7 @@ double QGIFace::dashRemain(const std::vector dv, const double offset) //! get zoom level (scale) from QGraphicsView // not used currently -double QGIFace::getXForm(void) +double QGIFace::getXForm() { //try to keep the pattern the same when View scales double result = 1.0; @@ -504,7 +504,7 @@ double QGIFace::getXForm(void) return result; } -void QGIFace::clearFillItems(void) +void QGIFace::clearFillItems() { for (auto& f: m_fillItems) { f->setParentItem(nullptr); @@ -704,7 +704,7 @@ void QGIFace::setLineWeight(double w) { m_geomWeight = w; } -void QGIFace::getParameters(void) +void QGIFace::getParameters() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/PAT"); diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index e5da739e35..7c0c5b2f94 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -81,7 +81,7 @@ public: //shared fill parms void isHatched(bool s) {m_isHatched = s; } - bool isHatched(void) {return m_isHatched;} + bool isHatched() {return m_isHatched;} void setFillMode(fillMode m); //general hatch parms & methods @@ -91,9 +91,9 @@ public: //svg fill parms & methods void setHatchFile(std::string fileSpec); void loadSvgHatch(std::string fileSpec); - void buildSvgHatch(void); + void buildSvgHatch(); void hideSvg(bool b); - void clearSvg(void); + void clearSvg(); //tiled pixmap fill from svg void buildPixHatch(); @@ -102,9 +102,9 @@ public: void setGeomHatchWeight(double w) { m_geomWeight = w; } void setLineWeight(double w); - void clearLineSets(void); + void clearLineSets(); void addLineSet(TechDraw::LineSet& ls); - void clearFillItems(void); + void clearFillItems(); void lineSetToFillItems(TechDraw::LineSet& ls); QGraphicsPathItem* geomToLine(TechDraw::BaseGeomPtr base, TechDraw::LineSet& ls); @@ -118,8 +118,8 @@ public: protected: void makeMark(double x, double y); - double getXForm(void); - void getParameters(void); + double getXForm(); + void getParameters(); std::vector offsetDash(const std::vector dv, const double offset); QPainterPath dashedPPath(const std::vector dv, const Base::Vector3d start, const Base::Vector3d end); @@ -138,7 +138,7 @@ protected: bool m_isHatched; QGIFace::fillMode m_mode; - QPen setGeomPen(void); + QPen setGeomPen(); std::vector decodeDashSpec(TechDraw::DashSpec d); std::vector m_fillItems; std::vector m_lineSets; diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp index 81d00d374c..6cceed4ca5 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp @@ -243,7 +243,7 @@ void QGILeaderLine::setPrettySel() { } -void QGILeaderLine::closeEdit(void) +void QGILeaderLine::closeEdit() { // Base::Console().Message("QGIL::closeEdit()\n"); if (m_editPath) { @@ -293,7 +293,7 @@ void QGILeaderLine::onLineEditFinished(QPointF tipDisplace, std::vector draw(); } -void QGILeaderLine::startPathEdit(void) +void QGILeaderLine::startPathEdit() { saveState(); auto featLeader( dynamic_cast(getViewObject()) ); @@ -307,7 +307,7 @@ void QGILeaderLine::startPathEdit(void) m_editPath->startPathEdit(getWayPointsFromFeature()); } -void QGILeaderLine::saveState(void) +void QGILeaderLine::saveState() { // Base::Console().Message("QGILL::saveState()\n"); auto featLeader = getFeature(); @@ -318,7 +318,7 @@ void QGILeaderLine::saveState(void) } } -void QGILeaderLine::restoreState(void) +void QGILeaderLine::restoreState() { // Base::Console().Message("QGILL::restoreState()\n"); auto featLeader = getFeature(); @@ -458,7 +458,7 @@ QPainterPath QGILeaderLine::makeLeaderPath(std::vector qPoints) return result; } -QPointF QGILeaderLine::getAttachFromFeature(void) +QPointF QGILeaderLine::getAttachFromFeature() { // Base::Console().Message("QGILL::getAttachFromFeature()\n"); QPointF result; @@ -473,7 +473,7 @@ QPointF QGILeaderLine::getAttachFromFeature(void) return result; } -std::vector QGILeaderLine::getWayPointsFromFeature(void) +std::vector QGILeaderLine::getWayPointsFromFeature() { std::vector qPoints; @@ -554,7 +554,7 @@ void QGILeaderLine::drawBorder() //****************************************************************************** -void QGILeaderLine::abandonEdit(void) +void QGILeaderLine::abandonEdit() { // Base::Console().Message("QGIL::abandonEdit()\n"); m_editPath->clearMarkers(); @@ -562,7 +562,7 @@ void QGILeaderLine::abandonEdit(void) restoreState(); } -double QGILeaderLine::getLineWidth(void) +double QGILeaderLine::getLineWidth() { auto vp = static_cast(getViewProvider(getViewObject())); if (!vp) @@ -570,14 +570,14 @@ double QGILeaderLine::getLineWidth(void) return Rez::guiX(vp->LineWidth.getValue()); } -TechDraw::DrawLeaderLine* QGILeaderLine::getFeature(void) +TechDraw::DrawLeaderLine* QGILeaderLine::getFeature() { TechDraw::DrawLeaderLine* result = static_cast(getViewObject()); return result; } -double QGILeaderLine::getEdgeFuzz(void) const +double QGILeaderLine::getEdgeFuzz() const { return PreferencesGui::edgeFuzz(); } diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h index 38145307ca..a1a9facb76 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.h +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h @@ -64,21 +64,21 @@ public: const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; - virtual QPainterPath shape(void) const override; + virtual QPainterPath shape() const override; virtual void drawBorder() override; virtual void updateView(bool update = false) override; - virtual TechDraw::DrawLeaderLine* getFeature(void); + virtual TechDraw::DrawLeaderLine* getFeature(); - void startPathEdit(void); + void startPathEdit(); void setArrows(std::vector pathPoints); - void abandonEdit(void); - void closeEdit(void); + void abandonEdit(); + void closeEdit(); - double getLineWidth(void); - double getEdgeFuzz(void) const; + double getLineWidth(); + double getEdgeFuzz() const; virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override; //void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override; @@ -97,20 +97,20 @@ public Q_SLOTS: virtual void onSourceChange(TechDraw::DrawView* newParent) override; Q_SIGNALS: - void editComplete(void); //tell caller that edit session is finished + void editComplete(); //tell caller that edit session is finished protected: virtual void draw() override; QPainterPath makeLeaderPath(std::vector qPoints); - std::vector getWayPointsFromFeature(void); - QPointF getAttachFromFeature(void); + std::vector getWayPointsFromFeature(); + QPointF getAttachFromFeature(); virtual QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; std::vector m_pathPoints; - void saveState(void); - void restoreState(void); + void saveState(); + void restoreState(); protected: QColor getNormalColor() override; diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h index aa15599f16..2d26a38488 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.h +++ b/src/Mod/TechDraw/Gui/QGIMatting.h @@ -42,7 +42,7 @@ class QGCustomRect; class TechDrawGuiExport QGIMatting : public QGraphicsItemGroup { public: - explicit QGIMatting(void); + explicit QGIMatting(); ~QGIMatting() {} enum {Type = QGraphicsItem::UserType + 205}; @@ -54,14 +54,14 @@ public: virtual void setSize(double w, double h) {m_height = h; m_width = w;} //virtual void setHoleStyle(int hs) {m_holeStyle = hs;} virtual void setRadius(double r) {m_radius = r;} - virtual void draw(void); + virtual void draw(); protected: double m_height; double m_width; //int m_holeStyle; //round or rect double m_radius; - int getHoleStyle(void); + int getHoleStyle(); QGraphicsPathItem* m_mat; QGraphicsPathItem* m_border; diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp index 57a91c4fcb..8ddf659458 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp @@ -58,7 +58,7 @@ QGIProjGroup::QGIProjGroup() // setFrameState(false); } -TechDraw::DrawProjGroup * QGIProjGroup::getDrawView(void) const +TechDraw::DrawProjGroup * QGIProjGroup::getDrawView() const { App::DocumentObject *obj = getViewObject(); return dynamic_cast(obj); @@ -202,7 +202,7 @@ void QGIProjGroup::updateView(bool update) } //QGIPG does not rotate. Only individual views rotate -void QGIProjGroup::rotateView(void) +void QGIProjGroup::rotateView() { Base::Console().Warning("QGIPG: Projection Groups do not rotate. Change ignored\n"); } diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h index 262845b4a7..3992f87433 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.h +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h @@ -50,9 +50,9 @@ public: void alignTo(QGIProjGroup *, const QString &alignment); virtual void updateView(bool update = false) override; - virtual void rotateView(void) override; + virtual void rotateView() override; - virtual void drawBorder(void) override; + virtual void drawBorder() override; protected: virtual bool sceneEventFilter(QGraphicsItem* watched, QEvent *event) override; @@ -65,7 +65,7 @@ protected: private: /// Convenience function - TechDraw::DrawProjGroup * getDrawView(void) const; + TechDraw::DrawProjGroup * getDrawView() const; QGraphicsItem* m_origin; QPoint mousePos; diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp index 9287289cdb..4d237e9c06 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp @@ -290,7 +290,7 @@ void QGIRichAnno::setLineSpacing(int lineSpacing) //} -TechDraw::DrawRichAnno* QGIRichAnno::getFeature(void) +TechDraw::DrawRichAnno* QGIRichAnno::getFeature() { TechDraw::DrawRichAnno* result = static_cast(getViewObject()); @@ -338,12 +338,12 @@ QPen QGIRichAnno::rectPen() const return pen; } -QFont QGIRichAnno::prefFont(void) +QFont QGIRichAnno::prefFont() { return PreferencesGui::labelFontQFont(); } -double QGIRichAnno::prefPointSize(void) +double QGIRichAnno::prefPointSize() { // Base::Console().Message("QGIRA::prefPointSize()\n"); double fontSize = Preferences::dimFontSizeMM(); diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp index c06906dd83..0fca824de6 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp @@ -145,7 +145,7 @@ void QGISVGTemplate::updateView(bool update) draw(); } -void QGISVGTemplate::createClickHandles(void) +void QGISVGTemplate::createClickHandles() { TechDraw::DrawSVGTemplate *svgTemplate = getSVGTemplate(); QString templateFilename(QString::fromUtf8(svgTemplate->PageResult.getValue())); diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp index 717d71ee96..69c72e94f0 100644 --- a/src/Mod/TechDraw/Gui/QGITile.cpp +++ b/src/Mod/TechDraw/Gui/QGITile.cpp @@ -98,7 +98,7 @@ QGITile::QGITile(TechDraw::DrawTileWeld* dtw) : m_colCurrent = m_colNormal; } -QGITile::~QGITile(void) +QGITile::~QGITile() { } @@ -109,7 +109,7 @@ QVariant QGITile::itemChange(GraphicsItemChange change, const QVariant &value) return QGIDecoration::itemChange(change, value); } -void QGITile::draw(void) +void QGITile::draw() { // Base::Console().Message("QGIT::draw()\n"); @@ -150,7 +150,7 @@ void QGITile::draw(void) } } -void QGITile::makeSymbol(void) +void QGITile::makeSymbol() { // Base::Console().Message("QGIT::makeSymbol()\n"); // m_effect->setColor(m_colCurrent); @@ -169,7 +169,7 @@ void QGITile::makeSymbol(void) m_qgSvg->centerAt(0.0, 0.0); //(0,0) is based on symbol size } -void QGITile::makeText(void) +void QGITile::makeText() { // Base::Console().Message("QGIT::makeText()\n"); prepareGeometryChange(); @@ -323,18 +323,18 @@ void QGITile::setPrettySel() { draw(); } -bool QGITile::isTailRight(void) +bool QGITile::isTailRight() { return m_tailRight; } -bool QGITile::getAltWeld(void) +bool QGITile::getAltWeld() { return m_altWeld; } //TODO: this is Pen, not Brush. sb Brush to colour background -QColor QGITile::getTileColor(void) const +QColor QGITile::getTileColor() const { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); @@ -342,7 +342,7 @@ QColor QGITile::getTileColor(void) const return fcColor.asValue(); } -double QGITile::getSymbolWidth(void) const +double QGITile::getSymbolWidth() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); @@ -356,7 +356,7 @@ double QGITile::getSymbolWidth(void) const return w; } -double QGITile::getSymbolHeight(void) const +double QGITile::getSymbolHeight() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); @@ -369,7 +369,7 @@ double QGITile::getSymbolHeight(void) const } //make symbols larger or smaller than standard -double QGITile::getSymbolFactor(void) const +double QGITile::getSymbolFactor() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); @@ -378,14 +378,14 @@ double QGITile::getSymbolFactor(void) const return s; } -double QGITile::prefFontSize(void) const +double QGITile::prefFontSize() const { // Base::Reference hGrp = App::GetApplication().GetUserParameter(). // GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); return Preferences::dimFontSizeMM(); } -QString QGITile::prefTextFont(void) const +QString QGITile::prefTextFont() const { return Preferences::labelFontQString(); } diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 16fbf684d9..da05e0a1f0 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -152,7 +152,7 @@ void QGIView::isVisible(bool state) } } -bool QGIView::isVisible(void) +bool QGIView::isVisible() { bool result = false; auto feat = getViewObject(); @@ -321,7 +321,7 @@ double QGIView::getYInClip(double y) return -y; } -QGIViewClip* QGIView::getClipGroup(void) +QGIViewClip* QGIView::getClipGroup() { if (!getViewObject()->isInClip()) { Base::Console().Log( "Logic Error - getClipGroup called for child " @@ -362,7 +362,7 @@ void QGIView::updateView(bool update) } //QGIVP derived classes do not need a rotate view method as rotation is handled on App side. -void QGIView::rotateView(void) +void QGIView::rotateView() { //NOTE: QPainterPaths have to be rotated individually. This transform handles Rotation for everything else. //Scale is handled in GeometryObject for DVP & descendents @@ -642,7 +642,7 @@ QGSPage* QGIView::getGraphicsScene(TechDraw::DrawView* dv) return graphicsScene; } -MDIViewPage* QGIView::getMDIViewPage(void) const +MDIViewPage* QGIView::getMDIViewPage() const { QGSPage* qgsp = static_cast(scene()); return MDIViewPage::getFromScene(qgsp); @@ -657,7 +657,7 @@ void QGIView::removeChild(QGIView* child) } } -bool QGIView::getFrameState(void) +bool QGIView::getFrameState() { // Base::Console().Message("QGIV::getFrameState() - %s\n",getViewName()); bool result = true; diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index cf52f19cde..acaa4b2c2d 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -88,20 +88,20 @@ public: const std::string getViewNameAsString() const; void setViewFeature(TechDraw::DrawView *obj); TechDraw::DrawView * getViewObject() const; - double getScale(void); + double getScale(); - virtual bool getFrameState(void); + virtual bool getFrameState(); virtual void toggleCache(bool state); virtual void updateView(bool update = false); - virtual void drawBorder(void); + virtual void drawBorder(); virtual void isVisible(bool state); - virtual bool isVisible(void); + virtual bool isVisible(); virtual void setGroupSelection(bool b); - virtual void draw(void); - virtual void drawCaption(void); - virtual void rotateView(void); + virtual void draw(); + virtual void drawCaption(); + virtual void rotateView(); void makeMark(double x, double y, QColor c = Qt::red); void makeMark(Base::Vector3d v, QColor c = Qt::red); void makeMark(QPointF p, QColor c = Qt::red); @@ -115,17 +115,17 @@ public: void isInnerView(bool state) { m_innerView = state; } double getYInClip(double y); /** @} */ - QGIViewClip* getClipGroup(void); + QGIViewClip* getClipGroup(); void alignTo(QGraphicsItem*, const QString &alignment); void setLocked(bool b) { m_locked = b; } - virtual QColor getNormalColor(void); //preference - virtual QColor getPreColor(void); //preference - virtual QColor getSelectColor(void); //preference - virtual QColor getCurrentColor(void) { return m_colCurrent; } - virtual QColor getSettingColor(void) { return m_colSetting; } + virtual QColor getNormalColor(); //preference + virtual QColor getPreColor(); //preference + virtual QColor getSelectColor(); //preference + virtual QColor getCurrentColor() { return m_colCurrent; } + virtual QColor getSettingColor() { return m_colSetting; } virtual void setSettingColor(QColor c) { m_colSetting = c; } static Gui::ViewProvider* getViewProvider(App::DocumentObject* obj); @@ -135,12 +135,12 @@ public: static int calculateFontPixelWidth(const QFont &font); static const double DefaultFontSizeInMM; - static QString getPrefFont(void); - static double getPrefFontSize(void); - static double getDimFontSize(void); + static QString getPrefFont(); + static double getPrefFontSize(); + static double getDimFontSize(); - MDIViewPage* getMDIViewPage(void) const; + MDIViewPage* getMDIViewPage() const; virtual void removeChild(QGIView* child); virtual void addArbitraryItem(QGraphicsItem* qgi); @@ -162,14 +162,14 @@ protected: // Preselection events: void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual QRectF customChildrenBoundingRect(void) const; + virtual QRectF customChildrenBoundingRect() const; void dumpRect(const char* text, QRectF r); /* QString getPrefFont(void);*/ /* double getPrefFontSize(void);*/ /* double getDimFontSize(void);*/ - Base::Reference getParmGroupCol(void); + Base::Reference getParmGroupCol(); TechDraw::DrawView *viewObj; std::string viewName; diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index ec116b5b74..fe9a0637cb 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -176,7 +176,7 @@ void QGIViewAnnotation::drawAnnotation() m_textItem->centerAt(0.,0.); } -void QGIViewAnnotation::rotateView(void) +void QGIViewAnnotation::rotateView() { QRectF r = m_textItem->boundingRect(); m_textItem->setTransformOriginPoint(r.center()); diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index 0552d99125..683389883b 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -50,7 +50,7 @@ public: void setViewAnnoFeature(TechDraw::DrawViewAnnotation *obj); virtual void draw() override; - virtual void rotateView(void) override; + virtual void rotateView() override; protected: void drawAnnotation(); diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h index ca378e492e..4f9887b11b 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h @@ -75,18 +75,18 @@ public: double Y() const { return posY; } //minus posY? void setFont(QFont f); - QFont getFont(void) { return m_labelText->font(); } + QFont getFont() { return m_labelText->font(); } void setDimString(QString t); void setDimString(QString t, qreal maxWidth); - void setPrettySel(void); - void setPrettyPre(void); - void setPrettyNormal(void); + void setPrettySel(); + void setPrettyPre(); + void setPrettyNormal(); void setColor(QColor c); bool verticalSep; std::vector seps; - QGCustomText* getDimText(void) { return m_labelText; } + QGCustomText* getDimText() { return m_labelText; } void setDimText(QGCustomText* newText) { m_labelText = newText; } bool hasHover; @@ -140,24 +140,24 @@ public: const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - QString getLabelText(void); + QString getLabelText(); void placeBalloon(QPointF pos); TechDraw::DrawViewBalloon *dvBalloon; - void setPrettyPre(void); - void setPrettySel(void); - void setPrettyNormal(void); + void setPrettyPre(); + void setPrettySel(); + void setPrettyNormal(); virtual void setGroupSelection(bool b) override; - virtual QGIBalloonLabel* getBalloonLabel(void) { return balloonLabel; } + virtual QGIBalloonLabel* getBalloonLabel() { return balloonLabel; } - virtual QColor getNormalColor(void) override; + virtual QColor getNormalColor() override; int prefDefaultArrow() const; bool prefOrthoPyramid() const; public Q_SLOTS: void balloonLabelDragged(bool ctrl); - void balloonLabelDragFinished(void); + void balloonLabelDragFinished(); void select(bool state); void hover(bool state); void updateBalloon(bool obtuse = false); @@ -171,9 +171,9 @@ protected: void drawBalloon(bool dragged = false); virtual QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; - virtual void setSvgPens(void); - virtual void setPens(void); - QString getPrecision(void); + virtual void setSvgPens(); + virtual void setPens(); + QString getPrecision(); protected: bool hasHover; diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index 0f7a85f8c1..688d90bd86 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -43,8 +43,8 @@ public: virtual void updateView(bool update = false) override; virtual void draw() override; - QGCustomRect* getFrame(void) {return m_frame;} - QGCustomClip* getClipArea(void) {return m_cliparea;} + QGCustomRect* getFrame() {return m_frame;} + QGCustomClip* getClipArea() {return m_cliparea;} protected: void drawClip(); diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 8b211d6d92..046265675f 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -396,7 +396,7 @@ void QGIDatumLabel::setUnitString(QString t) } -int QGIDatumLabel::getPrecision(void) +int QGIDatumLabel::getPrecision() { int precision; bool global = false; @@ -412,7 +412,7 @@ int QGIDatumLabel::getPrecision(void) return precision; } -double QGIDatumLabel::getTolAdjust(void) +double QGIDatumLabel::getTolAdjust() { double adjust; Base::Reference hGrp = App::GetApplication().GetUserParameter() @@ -422,7 +422,7 @@ double QGIDatumLabel::getTolAdjust(void) } -void QGIDatumLabel::setPrettySel(void) +void QGIDatumLabel::setPrettySel() { // Base::Console().Message("QGIDL::setPrettySel()\n"); m_dimText->setPrettySel(); @@ -432,7 +432,7 @@ void QGIDatumLabel::setPrettySel(void) Q_EMIT setPretty(SEL); } -void QGIDatumLabel::setPrettyPre(void) +void QGIDatumLabel::setPrettyPre() { // Base::Console().Message("QGIDL::setPrettyPre()\n"); m_dimText->setPrettyPre(); @@ -442,7 +442,7 @@ void QGIDatumLabel::setPrettyPre(void) Q_EMIT setPretty(PRE); } -void QGIDatumLabel::setPrettyNormal(void) +void QGIDatumLabel::setPrettyNormal() { // Base::Console().Message("QGIDL::setPrettyNormal()\n"); m_dimText->setPrettyNormal(); @@ -691,7 +691,7 @@ void QGIViewDimension::datumLabelDragFinished() } //this is for formatting and finding centers, not display -QString QGIViewDimension::getLabelText(void) +QString QGIViewDimension::getLabelText() { QString result; QString first = datumLabel->getDimText()->toPlainText(); @@ -1201,7 +1201,7 @@ bool QGIViewDimension::constructDimensionArc(const Base::Vector2d &arcCenter, do return flipArrows; } -void QGIViewDimension::resetArrows(void) const +void QGIViewDimension::resetArrows() const { aHead1->setDirMode(true); aHead1->setRotation(0.0); @@ -2452,28 +2452,28 @@ void QGIViewDimension::onPrettyChanged(int state) } } -void QGIViewDimension::setPrettyPre(void) +void QGIViewDimension::setPrettyPre() { aHead1->setPrettyPre(); aHead2->setPrettyPre(); dimLines->setPrettyPre(); } -void QGIViewDimension::setPrettySel(void) +void QGIViewDimension::setPrettySel() { aHead1->setPrettySel(); aHead2->setPrettySel(); dimLines->setPrettySel(); } -void QGIViewDimension::setPrettyNormal(void) +void QGIViewDimension::setPrettyNormal() { aHead1->setPrettyNormal(); aHead2->setPrettyNormal(); dimLines->setPrettyNormal(); } -void QGIViewDimension::drawBorder(void) +void QGIViewDimension::drawBorder() { //Dimensions have no border! // Base::Console().Message("TRACE - QGIViewDimension::drawBorder - doing nothing!\n"); @@ -2546,7 +2546,7 @@ void QGIViewDimension::paint ( QPainter * painter, const QStyleOptionGraphicsIte setPens(); } -void QGIViewDimension::setSvgPens(void) +void QGIViewDimension::setSvgPens() { double svgLineFactor = 3.0; //magic number. should be a setting somewhere. dimLines->setWidth(m_lineWidth/svgLineFactor); @@ -2554,7 +2554,7 @@ void QGIViewDimension::setSvgPens(void) aHead2->setWidth(aHead2->getWidth()/svgLineFactor); } -void QGIViewDimension::setPens(void) +void QGIViewDimension::setPens() { dimLines->setWidth(m_lineWidth); aHead1->setWidth(m_lineWidth); diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index b7eae9b80e..43d9607cf0 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -77,34 +77,34 @@ public: double Y() const { return posY; } //minus posY? void setFont(QFont f); - QFont getFont(void) { return m_dimText->font(); } + QFont getFont() { return m_dimText->font(); } void setDimString(QString t); void setDimString(QString t, qreal maxWidth); void setUnitString(QString t); void setToleranceString(); - void setPrettySel(void); - void setPrettyPre(void); - void setPrettyNormal(void); + void setPrettySel(); + void setPrettyPre(); + void setPrettyNormal(); void setColor(QColor c); bool verticalSep; std::vector seps; - QGCustomText* getDimText(void) { return m_dimText; } + QGCustomText* getDimText() { return m_dimText; } void setDimText(QGCustomText* newText) { m_dimText = newText; } - QGCustomText* getTolTextOver(void) { return m_tolTextOver; } + QGCustomText* getTolTextOver() { return m_tolTextOver; } void setTolTextOver(QGCustomText* newTol) { m_tolTextOver = newTol; } - QGCustomText* getTolTextUnder(void) { return m_tolTextUnder; } + QGCustomText* getTolTextUnder() { return m_tolTextUnder; } void setTolTextUnder(QGCustomText* newTol) { m_tolTextOver = newTol; } - double getTolAdjust(void); + double getTolAdjust(); /* bool hasHover;*/ QGIViewDimension* parent; - bool isFramed(void) { return m_isFramed; } + bool isFramed() { return m_isFramed; } void setFramed(bool framed) { m_isFramed = framed; } - double getLineWidth(void) { return m_lineWidth; } + double getLineWidth() { return m_lineWidth; } void setLineWidth(double lineWidth) { m_lineWidth = lineWidth; } Q_SIGNALS: @@ -127,7 +127,7 @@ protected: QGCustomText* m_tolTextOver; QGCustomText* m_tolTextUnder; QGCustomText* m_unitText; - int getPrecision(void); + int getPrecision(); QColor m_colNormal; bool m_ctrl; @@ -162,21 +162,21 @@ public: TechDraw::DrawViewDimension *dvDimension; virtual void drawBorder() override; virtual void updateView(bool update = false) override; - virtual QColor prefNormalColor(void); - QString getLabelText(void); - void setPrettyPre(void); - void setPrettySel(void); - void setPrettyNormal(void); + virtual QColor prefNormalColor(); + QString getLabelText(); + void setPrettyPre(); + void setPrettySel(); + void setPrettyNormal(); virtual void setGroupSelection(bool b) override; - virtual QGIDatumLabel* getDatumLabel(void) { return datumLabel; } + virtual QGIDatumLabel* getDatumLabel() { return datumLabel; } - void setNormalColorAll(void); + void setNormalColorAll(); public Q_SLOTS: void onPrettyChanged(int state); void datumLabelDragged(bool ctrl); - void datumLabelDragFinished(void); + void datumLabelDragFinished(); void select(bool state); void hover(bool state); void updateDim(); @@ -222,7 +222,7 @@ protected: void draw() override; - void resetArrows(void) const; + void resetArrows() const; void drawArrows(int count, const Base::Vector2d positions[], double angles[], bool flipped) const; void drawSingleLine(QPainterPath &painterPath, const Base::Vector2d &lineOrigin, double lineAngle, @@ -259,11 +259,11 @@ protected: virtual QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; - virtual void setSvgPens(void); - virtual void setPens(void); + virtual void setSvgPens(); + virtual void setPens(); Base::Vector3d findIsoDir(Base::Vector3d ortho) const; Base::Vector3d findIsoExt(Base::Vector3d isoDir) const; - QString getPrecision(void); + QString getPrecision(); bool hasHover; QGIDatumLabel* datumLabel; //dimension text diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.cpp b/src/Mod/TechDraw/Gui/QGIViewImage.cpp index 4cccd45c5b..7ce2fe87cc 100644 --- a/src/Mod/TechDraw/Gui/QGIViewImage.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewImage.cpp @@ -154,7 +154,7 @@ void QGIViewImage::drawImage() } } -void QGIViewImage::rotateView(void) +void QGIViewImage::rotateView() { QRectF r = m_cliparea->boundingRect(); m_cliparea->setTransformOriginPoint(r.center()); diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.h b/src/Mod/TechDraw/Gui/QGIViewImage.h index 6899d84b69..22befc9e3c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewImage.h +++ b/src/Mod/TechDraw/Gui/QGIViewImage.h @@ -47,7 +47,7 @@ public: void setViewImageFeature(TechDraw::DrawViewImage *obj); virtual void draw() override; - virtual void rotateView(void) override; + virtual void rotateView() override; protected: virtual void drawImage(); diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index 624ec7acf1..647a64282a 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -802,7 +802,7 @@ void QGIViewPart::removeDecorations() } } -void QGIViewPart::drawAllSectionLines(void) +void QGIViewPart::drawAllSectionLines() { TechDraw::DrawViewPart *viewPart = static_cast(getViewObject()); if (!viewPart) @@ -1213,11 +1213,11 @@ void QGIViewPart::paint ( QPainter * painter, const QStyleOptionGraphicsItem * o } //QGIViewPart derived classes do not need a rotate view method as rotation is handled on App side. -void QGIViewPart::rotateView(void) +void QGIViewPart::rotateView() { } -bool QGIViewPart::prefFaceEdges(void) +bool QGIViewPart::prefFaceEdges() { bool result = false; Base::Reference hGrp = App::GetApplication().GetUserParameter() @@ -1226,7 +1226,7 @@ bool QGIViewPart::prefFaceEdges(void) return result; } -bool QGIViewPart::prefPrintCenters(void) +bool QGIViewPart::prefPrintCenters() { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index a2f4e00eca..f497395037 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -64,15 +64,15 @@ public: virtual void updateView(bool update = false) override; void tidy(); virtual QRectF boundingRect() const override; - virtual void drawAllSectionLines(void); + virtual void drawAllSectionLines(); virtual void drawSectionLine(TechDraw::DrawViewSection* s, bool b); virtual void drawCenterLines(bool b); virtual void drawHighlight(TechDraw::DrawViewDetail* viewDetail, bool b); - virtual void drawMatting(void); + virtual void drawMatting(); bool showSection; virtual void draw() override; - virtual void rotateView(void) override; + virtual void rotateView() override; static QPainterPath geomToPainterPath(TechDraw::BaseGeomPtr baseGeom, double rotation = 0.0); @@ -92,7 +92,7 @@ public: double x, double y, double curx, double cury); void setExporting(bool b) { m_isExporting = b; } - bool getExporting(void) { return m_isExporting; } + bool getExporting() { return m_isExporting; } protected: QPainterPath drawPainterPath(TechDraw::BaseGeomPtr baseGeom) const; @@ -104,10 +104,10 @@ protected: TechDraw::DrawHatch* faceIsHatched(int i,std::vector hatchObjs) const; TechDraw::DrawGeomHatch* faceIsGeomHatched(int i,std::vector geomObjs) const; void dumpPath(const char* text,QPainterPath path); - void removePrimitives(void); - void removeDecorations(void); - bool prefFaceEdges(void); - bool prefPrintCenters(void); + void removePrimitives(); + void removeDecorations(); + bool prefFaceEdges(); + bool prefPrintCenters(); bool formatGeomFromCosmetic(std::string cTag, QGIEdge* item); bool formatGeomFromCenterLine(std::string cTag, QGIEdge* item); diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp index 8d415cb5cd..0d2dab6a57 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp @@ -155,7 +155,7 @@ void QGIViewSymbol::symbolToSvg(QByteArray qba) m_svgItem->centerAt(0.,0.); } -void QGIViewSymbol::rotateView(void) +void QGIViewSymbol::rotateView() { QRectF r = m_displayArea->boundingRect(); m_displayArea->setTransformOriginPoint(r.center()); diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index 98b4455631..a5fc09d545 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -51,7 +51,7 @@ public: void setViewSymbolFeature(TechDraw::DrawViewSymbol *obj); virtual void draw() override; - virtual void rotateView(void) override; + virtual void rotateView() override; protected: diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp index 61aeae6bf2..ce1d059123 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp @@ -231,7 +231,7 @@ void QGIWeldSymbol::drawTile(TechDraw::DrawTileWeld* tileFeat) tile->draw(); } -void QGIWeldSymbol::drawAllAround(void) +void QGIWeldSymbol::drawAllAround() { // Base::Console().Message("QGIWS::drawAllAround()\n"); QPointF allAroundPos = getKinkPoint(); @@ -255,7 +255,7 @@ void QGIWeldSymbol::drawAllAround(void) m_allAround->setZValue(ZVALUE::DIMENSION); } -void QGIWeldSymbol::drawTailText(void) +void QGIWeldSymbol::drawTailText() { // Base::Console().Message("QGIWS::drawTailText()\n"); QPointF textPos = getTailPoint(); @@ -335,7 +335,7 @@ void QGIWeldSymbol::drawFieldFlag() m_fieldFlag->setPath(path); } -void QGIWeldSymbol::getTileFeats(void) +void QGIWeldSymbol::getTileFeats() { std::vector tiles = getFeature()->getTiles(); m_arrowFeat = nullptr; @@ -359,7 +359,7 @@ void QGIWeldSymbol::getTileFeats(void) } } -void QGIWeldSymbol::removeQGITiles(void) +void QGIWeldSymbol::removeQGITiles() { std::vector tiles = getQGITiles(); for (auto t: tiles) { @@ -375,7 +375,7 @@ void QGIWeldSymbol::removeQGITiles(void) } } -std::vector QGIWeldSymbol::getQGITiles(void) const +std::vector QGIWeldSymbol::getQGITiles() const { std::vector result; QList children = childItems(); @@ -470,21 +470,21 @@ void QGIWeldSymbol::setPrettySel() m_tailText->setPrettySel(); } -QPointF QGIWeldSymbol::getTileOrigin(void) +QPointF QGIWeldSymbol::getTileOrigin() { Base::Vector3d org = m_leadFeat->getTileOrigin(); QPointF result(org.x, org.y); return result; } -QPointF QGIWeldSymbol::getKinkPoint(void) +QPointF QGIWeldSymbol::getKinkPoint() { Base::Vector3d org = m_leadFeat->getKinkPoint(); QPointF result(org.x, org.y); return result; } -QPointF QGIWeldSymbol::getTailPoint(void) +QPointF QGIWeldSymbol::getTailPoint() { Base::Vector3d org = m_leadFeat->getTailPoint(); QPointF result(org.x, org.y); @@ -498,7 +498,7 @@ void QGIWeldSymbol::setFeature(TechDraw::DrawWeldSymbol* feat) m_weldFeatName = feat->getNameInDocument(); } -TechDraw::DrawWeldSymbol* QGIWeldSymbol::getFeature(void) +TechDraw::DrawWeldSymbol* QGIWeldSymbol::getFeature() { return m_weldFeat; } @@ -515,7 +515,7 @@ double QGIWeldSymbol::prefArrowSize() return PreferencesGui::dimArrowSize(); } -double QGIWeldSymbol::prefFontSize(void) const +double QGIWeldSymbol::prefFontSize() const { return Preferences::labelFontSizeMM(); } diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h index 30d43db873..9c93a40cab 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h @@ -68,24 +68,24 @@ public: const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; - virtual QPainterPath shape(void) const override; - double getEdgeFuzz(void) const; + virtual QPainterPath shape() const override; + double getEdgeFuzz() const; virtual void drawBorder() override; virtual void updateView(bool update = false) override; - virtual TechDraw::DrawWeldSymbol* getFeature(void); + virtual TechDraw::DrawWeldSymbol* getFeature(); virtual void setFeature(TechDraw::DrawWeldSymbol* feat); - QPointF getTileOrigin(void); - QPointF getKinkPoint(void); - QPointF getTailPoint(void); + QPointF getTileOrigin(); + QPointF getKinkPoint(); + QPointF getTailPoint(); virtual void setPrettyNormal(); virtual void setPrettySel(); virtual void setPrettyPre(); - void getTileFeats(void); + void getTileFeats(); protected: virtual QVariant itemChange( GraphicsItemChange change, @@ -95,17 +95,17 @@ protected: virtual void draw() override; void drawTile(TechDraw::DrawTileWeld* tileFeat); - void drawAllAround(void); - void drawTailText(void); + void drawAllAround(); + void drawTailText(); void drawFieldFlag(); protected: - void removeQGITiles(void); - std::vector getQGITiles(void) const; + void removeQGITiles(); + std::vector getQGITiles() const; virtual QColor prefNormalColor(); double prefArrowSize(); - double prefFontSize(void) const; + double prefFontSize() const; TechDraw::DrawWeldSymbol* m_weldFeat; TechDraw::DrawLeaderLine* m_leadFeat; diff --git a/src/Mod/TechDraw/Gui/QGMText.cpp b/src/Mod/TechDraw/Gui/QGMText.cpp index 54ed8536ff..a9ae9c20bb 100644 --- a/src/Mod/TechDraw/Gui/QGMText.cpp +++ b/src/Mod/TechDraw/Gui/QGMText.cpp @@ -93,19 +93,19 @@ void QGMText::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) QGCustomText::hoverLeaveEvent(event); } -void QGMText::setPrettySel(void) +void QGMText::setPrettySel() { m_prettyState = "Sel"; QGCustomText::setPrettySel(); } -void QGMText::setPrettyPre(void) +void QGMText::setPrettyPre() { m_prettyState = "Pre"; QGCustomText::setPrettyPre(); } -void QGMText::setPrettyNormal(void) +void QGMText::setPrettyNormal() { m_prettyState = "Normal"; QGCustomText::setPrettyNormal(); diff --git a/src/Mod/TechDraw/Gui/QGSPage.cpp b/src/Mod/TechDraw/Gui/QGSPage.cpp index d3756c22fa..26d732af96 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.cpp +++ b/src/Mod/TechDraw/Gui/QGSPage.cpp @@ -649,7 +649,7 @@ void QGSPage::removeTemplate() } } -void QGSPage::refreshViews(void) +void QGSPage::refreshViews() { // Base::Console().Message("QGVP::refreshViews()\n"); QList list = items(); diff --git a/src/Mod/TechDraw/Gui/QGSPage.h b/src/Mod/TechDraw/Gui/QGSPage.h index d0174996b0..23f41c5604 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.h +++ b/src/Mod/TechDraw/Gui/QGSPage.h @@ -113,7 +113,7 @@ public: TechDraw::DrawPage * getDrawPage(); void setExporting(bool enable); - virtual void refreshViews(void); + virtual void refreshViews(); /// Renders the page to SVG with filename. void saveSvg(QString filename); diff --git a/src/Mod/TechDraw/Gui/QGTracker.cpp b/src/Mod/TechDraw/Gui/QGTracker.cpp index 9ca74313a0..1c5705d133 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.cpp +++ b/src/Mod/TechDraw/Gui/QGTracker.cpp @@ -340,7 +340,7 @@ QRectF QGTracker::boundingRect() const return scene()->sceneRect(); } -QPainterPath QGTracker::shape(void) const +QPainterPath QGTracker::shape() const { QPainterPath result; result.addRect(boundingRect()); @@ -465,7 +465,7 @@ void QGTracker::setPoint(std::vector pts) setPrettyNormal(); } -std::vector QGTracker::convertPoints(void) +std::vector QGTracker::convertPoints() { std::vector result; for (auto& p: m_points) { @@ -475,7 +475,7 @@ std::vector QGTracker::convertPoints(void) return result; } -void QGTracker::terminateDrawing(void) +void QGTracker::terminateDrawing() { // Base::Console().Message("QGTracker::terminateDrawing()\n"); m_track->hide(); diff --git a/src/Mod/TechDraw/Gui/QGTracker.h b/src/Mod/TechDraw/Gui/QGTracker.h index 1295564278..44f2bafc2a 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.h +++ b/src/Mod/TechDraw/Gui/QGTracker.h @@ -70,10 +70,10 @@ public: void setSquareFromPoints(std::vector pts); void setCircleFromPoints(std::vector pts); void setPoint(std::vector pts); - std::vector convertPoints(void); - void terminateDrawing(void); + std::vector convertPoints(); + void terminateDrawing(); void sleep(bool b); - TrackerMode getTrackerMode(void) { return m_trackerMode; } + TrackerMode getTrackerMode() { return m_trackerMode; } void setTrackerMode(TrackerMode m) { m_trackerMode = m; } QPointF snapToAngle(QPointF pt); diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp index 21470a1fc2..d3606b933f 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp +++ b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp @@ -366,7 +366,7 @@ void QGVNavStyle::startClick(Qt::MouseButton b) m_clickButton = b; } -void QGVNavStyle::stopClick(void) +void QGVNavStyle::stopClick() { m_clickPending = false; m_clickButton = Qt::MouseButton::NoButton; diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.h b/src/Mod/TechDraw/Gui/QGVNavStyle.h index a64c43e829..63f6d73c5a 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyle.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h @@ -90,7 +90,7 @@ public: virtual void stopPan(); virtual void startClick(Qt::MouseButton b); - virtual void stopClick(void); + virtual void stopClick(); virtual void placeBalloon(QPoint p); diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index da7a986a02..3e13ae313d 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -339,7 +339,7 @@ void QGVPage::setNavigationStyle(std::string navParm) } } -void QGVPage::startBalloonPlacing(void) +void QGVPage::startBalloonPlacing() { balloonPlacing = true; #if QT_VERSION >= QT_VERSION_CHECK(5,15,0) @@ -349,7 +349,7 @@ void QGVPage::startBalloonPlacing(void) #endif } -void QGVPage::cancelBalloonPlacing(void) +void QGVPage::cancelBalloonPlacing() { balloonPlacing = false; balloonCursor->hide(); diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index bd96c3d12b..8f129bd886 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -84,8 +84,8 @@ public: QGSPage* getScene() {return m_scene; } - void startBalloonPlacing(void); - void cancelBalloonPlacing(void); + void startBalloonPlacing(); + void cancelBalloonPlacing(); TechDraw::DrawPage * getDrawPage(); @@ -93,7 +93,7 @@ public: void makeGrid(int width, int height, double step); void showGrid(bool state) {m_showGrid = state;} - void updateViewport(void) {viewport()->repaint();} + void updateViewport() {viewport()->repaint();} bool isBalloonPlacing() {return balloonPlacing; } void setBalloonPlacing(bool s) {balloonPlacing = s;} diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp index 81830c3890..f9ac4b84aa 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp +++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp @@ -112,7 +112,7 @@ void TaskActiveView::blockButtons(bool b) } //****************************************************************************** -TechDraw::DrawViewSymbol* TaskActiveView::createActiveView(void) +TechDraw::DrawViewSymbol* TaskActiveView::createActiveView() { // Base::Console().Message("TAV::createActiveView()\n"); diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h index ce98255493..7c4d24d3b6 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.h +++ b/src/Mod/TechDraw/Gui/TaskActiveView.h @@ -103,7 +103,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h index 15c029fb42..e4af5f3348 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.h +++ b/src/Mod/TechDraw/Gui/TaskBalloon.h @@ -83,7 +83,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 14184ad8eb..8b547e3535 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -311,7 +311,7 @@ void TaskCenterLine::onStyleChanged() } //****************************************************************************** -void TaskCenterLine::createCenterLine(void) +void TaskCenterLine::createCenterLine() { Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create CenterLine")); @@ -361,7 +361,7 @@ void TaskCenterLine::createCenterLine(void) m_cl = cl; } -void TaskCenterLine::updateOrientation(void) +void TaskCenterLine::updateOrientation() { // When the orientation was changed, it can be that the centerline becomes invalid // this can lead to a crash, see e.g. @@ -447,7 +447,7 @@ QColor TaskCenterLine::getCenterColor() return PreferencesGui::centerQColor(); } -double TaskCenterLine::getExtendBy(void) +double TaskCenterLine::getExtendBy() { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h index d32695479b..946704bb24 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.h +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h @@ -76,7 +76,7 @@ public: virtual bool accept(); virtual bool reject(); virtual void setCreateMode(bool b) { m_createMode = b; } - virtual bool getCreateMode(void) { return m_createMode; } + virtual bool getCreateMode() { return m_createMode; } void updateTask(); void saveButtons(QPushButton* btnOK, QPushButton* btnCancel); @@ -86,11 +86,11 @@ protected Q_SLOTS: protected: void changeEvent(QEvent *e); - void setUiConnect(void); - void setUiPrimary(void); - void setUiEdit(void); - void createCenterLine(void); - void updateOrientation(void); + void setUiConnect(); + void setUiPrimary(); + void setUiEdit(); + void createCenterLine(); + void updateOrientation(); double getCenterWidth(); QColor getCenterColor(); @@ -153,7 +153,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp index 11aa67edbe..ebf5fccfd2 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp @@ -145,7 +145,7 @@ void TaskCosVertex::setUiPrimary() ui->dsbY->setUnit(Base::Unit::Length); } -void TaskCosVertex::updateUi(void) +void TaskCosVertex::updateUi() { double x = m_savePoint.x(); double y = - m_savePoint.y(); @@ -201,7 +201,7 @@ void TaskCosVertex::onTrackerClicked(bool b) enableTaskButtons(false); } -void TaskCosVertex::startTracker(void) +void TaskCosVertex::startTracker() { // Base::Console().Message("TCV::startTracker()\n"); if (m_trackerMode == QGTracker::TrackerMode::None) { @@ -272,7 +272,7 @@ void TaskCosVertex::onTrackerFinished(std::vector pts, QGIView* qgParen } -void TaskCosVertex::removeTracker(void) +void TaskCosVertex::removeTracker() { // Base::Console().Message("TCV::removeTracker()\n"); if (m_tracker && m_tracker->scene()) { @@ -290,7 +290,7 @@ void TaskCosVertex::setEditCursor(QCursor c) } } -void TaskCosVertex::abandonEditSession(void) +void TaskCosVertex::abandonEditSession() { QString msg = tr("In progress edit abandoned. Start over."); getMainWindow()->statusBar()->show(); diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index 9c8b126ad0..b968072bdd 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -80,15 +80,15 @@ public: protected: void changeEvent(QEvent *e); - void startTracker(void); - void removeTracker(void); - void abandonEditSession(void); + void startTracker(); + void removeTracker(); + void abandonEditSession(); void addCosVertex(QPointF qPos); void blockButtons(bool b); - void setUiPrimary(void); - void updateUi(void); + void setUiPrimary(); + void updateUi(); void setEditCursor(QCursor c); QGIView* findParentQGIV(); @@ -139,7 +139,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h index f188523459..aefde187e4 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h @@ -72,11 +72,11 @@ protected Q_SLOTS: protected: void changeEvent(QEvent *e); - void setUiPrimary(void); - void setUiEdit(void); + void setUiPrimary(); + void setUiEdit(); - void createCosmeticLine(void); - void updateCosmeticLine(void); + void createCosmeticLine(); + void updateCosmeticLine(); private: std::unique_ptr ui; @@ -116,7 +116,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h index 96ba6e3479..f176ec212d 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h @@ -79,7 +79,7 @@ protected Q_SLOTS: protected: void changeEvent(QEvent *e); - void setUiEdit(void); + void setUiEdit(); private: App::DocumentObject* selectedObject; @@ -107,7 +107,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h index 2cc1d43d84..91522942ac 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.h +++ b/src/Mod/TechDraw/Gui/TaskDetail.h @@ -84,7 +84,7 @@ public: protected: void changeEvent(QEvent *e); - void startDragger(void); + void startDragger(); void createDetail(); void updateDetail(); @@ -92,7 +92,7 @@ protected: void editByHighlight(); void blockButtons(bool b); - void setUiFromFeat(void); + void setUiFromFeat(); void updateUi(QPointF p); void enableInputFields(bool b); @@ -157,7 +157,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskDimension.h b/src/Mod/TechDraw/Gui/TaskDimension.h index 77028ed10a..70cdafc4b9 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.h +++ b/src/Mod/TechDraw/Gui/TaskDimension.h @@ -93,7 +93,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp index 53c63c2961..9249478558 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp @@ -97,7 +97,7 @@ void TaskGeomHatch::initUi() connect(ui->ccColor, SIGNAL(changed()), this, SLOT(onColorChanged())); } -void TaskGeomHatch::onFileChanged(void) +void TaskGeomHatch::onFileChanged() { m_file = ui->fcFile->fileName().toUtf8().constData(); std::vector names = PATLineSpec::getPatternList(m_file); diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h index dee2997ae5..228769da6a 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h @@ -58,7 +58,7 @@ public: bool getCreateMode() { return m_createMode; } protected Q_SLOTS: - void onFileChanged(void); + void onFileChanged(); protected: void changeEvent(QEvent *e); @@ -114,7 +114,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void setCreateMode(bool b); diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp index 4b410f8580..c5fe6a6f88 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp @@ -134,7 +134,7 @@ void TaskHatch::restoreHatchState() } } -void TaskHatch::onFileChanged(void) +void TaskHatch::onFileChanged() { m_file = Base::Tools::toStdString(ui->fcFile->fileName()); apply(); diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h index 716aed3434..1679488c42 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.h +++ b/src/Mod/TechDraw/Gui/TaskHatch.h @@ -57,7 +57,7 @@ public: virtual bool reject(); protected Q_SLOTS: - void onFileChanged(void); + void onFileChanged(); void onScaleChanged(); void onColorChanged(); @@ -65,8 +65,8 @@ protected: void changeEvent(QEvent *e); void apply(bool forceUpdate = false); - void createHatch(void); - void updateHatch(void); + void createHatch(); + void updateHatch(); void setUiPrimary(); void setUiEdit(); @@ -112,7 +112,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index 8d7c6f8e60..3d69cd6d9e 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -441,7 +441,7 @@ void TaskLeaderLine::createLeaderFeature(std::vector converted) } } -void TaskLeaderLine::updateLeaderFeature(void) +void TaskLeaderLine::updateLeaderFeature() { // Base::Console().Message("TTL::updateLeaderFeature()\n"); Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit Leader")); @@ -462,7 +462,7 @@ void TaskLeaderLine::updateLeaderFeature(void) m_lineFeat->requestPaint(); } -void TaskLeaderLine::commonFeatureUpdate(void) +void TaskLeaderLine::commonFeatureUpdate() { int start = ui->cboxStartSym->currentIndex(); int end = ui->cboxEndSym->currentIndex(); @@ -470,7 +470,7 @@ void TaskLeaderLine::commonFeatureUpdate(void) m_lineFeat->EndSymbol.setValue(end); } -void TaskLeaderLine::removeFeature(void) +void TaskLeaderLine::removeFeature() { // Base::Console().Message("TTL::removeFeature()\n"); if (!m_lineFeat) @@ -600,7 +600,7 @@ void TaskLeaderLine::onTrackerClicked(bool b) } } -void TaskLeaderLine::startTracker(void) +void TaskLeaderLine::startTracker() { // Base::Console().Message("TTL::startTracker()\n"); if (!m_haveMdi) { @@ -660,7 +660,7 @@ void TaskLeaderLine::onTrackerFinished(std::vector pts, QGIView* qgPare setEditCursor(Qt::ArrowCursor); } -void TaskLeaderLine::removeTracker(void) +void TaskLeaderLine::removeTracker() { // Base::Console().Message("TTL::removeTracker()\n"); if (!m_haveMdi) { @@ -727,7 +727,7 @@ void TaskLeaderLine::trackerPointsFromQPoints(std::vector pts) //****************************************************************************** //void TaskLeaderLine::onPointEditComplete(std::vector pts, QGIView* parent) -void TaskLeaderLine::onPointEditComplete(void) +void TaskLeaderLine::onPointEditComplete() { // Base::Console().Message("TTL::onPointEditComplete()\n"); m_inProgressLock = false; @@ -739,7 +739,7 @@ void TaskLeaderLine::onPointEditComplete(void) enableTaskButtons(true); } -void TaskLeaderLine::abandonEditSession(void) +void TaskLeaderLine::abandonEditSession() { // Base::Console().Message("TTL::abandonEditSession()\n"); if (m_qgLine) { @@ -781,7 +781,7 @@ double TaskLeaderLine::prefWeight() const return TechDraw::LineGroup::getDefaultWidth("Thin"); } -App::Color TaskLeaderLine::prefLineColor(void) +App::Color TaskLeaderLine::prefLineColor() { return PreferencesGui::leaderColor(); } diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index bf14926b38..7a9197d7c9 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -77,7 +77,7 @@ public: virtual bool accept(); virtual bool reject(); virtual void setCreateMode(bool b) { m_createMode = b; } - virtual bool getCreateMode(void) { return m_createMode; } + virtual bool getCreateMode() { return m_createMode; } void updateTask(); void saveButtons(QPushButton* btnOK, QPushButton* btnCancel); @@ -86,23 +86,23 @@ public: protected Q_SLOTS: - void onPointEditComplete(void); + void onPointEditComplete(); protected: void trackerPointsFromQPoints(std::vector pts); void changeEvent(QEvent *e); - void startTracker(void); - void removeTracker(void); - void abandonEditSession(void); + void startTracker(); + void removeTracker(); + void abandonEditSession(); void createLeaderFeature(std::vector converted); void updateLeaderFeature(); - void commonFeatureUpdate(void); - void removeFeature(void); + void commonFeatureUpdate(); + void removeFeature(); void blockButtons(bool b); - void setUiPrimary(void); - void setUiEdit(void); + void setUiPrimary(); + void setUiEdit(); void enableTextUi(bool b); void enableVPUi(bool b); void setEditCursor(QCursor c); @@ -110,10 +110,10 @@ protected: QGIView* findParentQGIV(); int getPrefArrowStyle(); double prefWeight() const; - App::Color prefLineColor(void); + App::Color prefLineColor(); - void saveState(void); - void restoreState(void); + void saveState(); + void restoreState(); private Q_SLOTS: void onStartSymbolChanged(); @@ -184,7 +184,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp index b070c522a4..cdad561925 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp @@ -104,7 +104,7 @@ void TaskLineDecor::initUi() ui->cb_Visible->setCurrentIndex(m_visible); } -void TaskLineDecor::getDefaults(void) +void TaskLineDecor::getDefaults() { // Base::Console().Message("TLD::getDefaults()\n"); m_style = LineFormat::getDefEdgeStyle(); @@ -154,35 +154,35 @@ void TaskLineDecor::getDefaults(void) } } -void TaskLineDecor::onStyleChanged(void) +void TaskLineDecor::onStyleChanged() { m_style = ui->cb_Style->currentIndex() + 1; applyDecorations(); m_partFeat->requestPaint(); } -void TaskLineDecor::onColorChanged(void) +void TaskLineDecor::onColorChanged() { m_color.setValue(ui->cc_Color->color()); applyDecorations(); m_partFeat->requestPaint(); } -void TaskLineDecor::onWeightChanged(void) +void TaskLineDecor::onWeightChanged() { m_weight = ui->dsb_Weight->value().getValue(); applyDecorations(); m_partFeat->requestPaint(); } -void TaskLineDecor::onVisibleChanged(void) +void TaskLineDecor::onVisibleChanged() { m_visible = ui->cb_Visible->currentIndex(); applyDecorations(); m_partFeat->requestPaint(); } -void TaskLineDecor::applyDecorations(void) +void TaskLineDecor::applyDecorations() { // Base::Console().Message("TLD::applyDecorations()\n"); for (auto& e: m_edges) { @@ -291,7 +291,7 @@ void TaskRestoreLines::initUi() ui->l_Center->setText(QString::number(countInvisibleCenters())); } -void TaskRestoreLines::onAllPressed(void) +void TaskRestoreLines::onAllPressed() { // Base::Console().Message("TRL::onAllPressed()\n"); onGeometryPressed(); @@ -299,7 +299,7 @@ void TaskRestoreLines::onAllPressed(void) onCenterPressed(); } -void TaskRestoreLines::onGeometryPressed(void) +void TaskRestoreLines::onGeometryPressed() { // Base::Console().Message("TRL::onGeometryPressed()\n"); restoreInvisibleGeoms(); @@ -307,7 +307,7 @@ void TaskRestoreLines::onGeometryPressed(void) ui->l_All->setText(QString::number(countInvisibleLines())); } -void TaskRestoreLines::onCosmeticPressed(void) +void TaskRestoreLines::onCosmeticPressed() { // Base::Console().Message("TRL::onCosmeticPressed()\n"); restoreInvisibleCosmetics(); @@ -315,7 +315,7 @@ void TaskRestoreLines::onCosmeticPressed(void) ui->l_All->setText(QString::number(countInvisibleLines())); } -void TaskRestoreLines::onCenterPressed(void) +void TaskRestoreLines::onCenterPressed() { // Base::Console().Message("TRL::onCenterPressed()\n"); restoreInvisibleCenters(); @@ -323,7 +323,7 @@ void TaskRestoreLines::onCenterPressed(void) ui->l_All->setText(QString::number(countInvisibleLines())); } -int TaskRestoreLines::countInvisibleLines(void) +int TaskRestoreLines::countInvisibleLines() { int result = 0; result += countInvisibleGeoms(); @@ -332,7 +332,7 @@ int TaskRestoreLines::countInvisibleLines(void) return result; } -int TaskRestoreLines::countInvisibleGeoms(void) +int TaskRestoreLines::countInvisibleGeoms() { int iGeoms = 0; const std::vector geoms = m_partFeat->GeomFormats.getValues(); @@ -344,7 +344,7 @@ int TaskRestoreLines::countInvisibleGeoms(void) return iGeoms; } -int TaskRestoreLines::countInvisibleCosmetics(void) +int TaskRestoreLines::countInvisibleCosmetics() { int iCosmos = 0; const std::vector cosmos = m_partFeat->CosmeticEdges.getValues(); @@ -356,7 +356,7 @@ int TaskRestoreLines::countInvisibleCosmetics(void) return iCosmos++; } -int TaskRestoreLines::countInvisibleCenters(void) +int TaskRestoreLines::countInvisibleCenters() { int iCenter = 0; const std::vector centers = m_partFeat->CenterLines.getValues(); @@ -368,14 +368,14 @@ int TaskRestoreLines::countInvisibleCenters(void) return iCenter++; } -void TaskRestoreLines::restoreInvisibleLines(void) +void TaskRestoreLines::restoreInvisibleLines() { restoreInvisibleGeoms(); restoreInvisibleCosmetics(); restoreInvisibleCenters(); } -void TaskRestoreLines::restoreInvisibleGeoms(void) +void TaskRestoreLines::restoreInvisibleGeoms() { const std::vector geoms = m_partFeat->GeomFormats.getValues(); for (auto& g : geoms) { @@ -387,7 +387,7 @@ void TaskRestoreLines::restoreInvisibleGeoms(void) m_parent->apply(false); //don't undo the work we just did } -void TaskRestoreLines::restoreInvisibleCosmetics(void) +void TaskRestoreLines::restoreInvisibleCosmetics() { const std::vector cosmos = m_partFeat->CosmeticEdges.getValues(); for (auto& c : cosmos) { @@ -399,7 +399,7 @@ void TaskRestoreLines::restoreInvisibleCosmetics(void) m_parent->apply(false); //don't undo the work we just did } -void TaskRestoreLines::restoreInvisibleCenters(void) +void TaskRestoreLines::restoreInvisibleCenters() { const std::vector centers = m_partFeat->CenterLines.getValues(); for (auto& c : centers) { diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h index 76661ff2e7..759850985e 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.h +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h @@ -50,20 +50,20 @@ public: public: virtual bool accept(); virtual bool reject(); - bool apply(void) { return m_apply; } + bool apply() { return m_apply; } void apply(bool b) { m_apply = b; } protected Q_SLOTS: - void onStyleChanged(void); - void onColorChanged(void); - void onWeightChanged(void); - void onVisibleChanged(void); + void onStyleChanged(); + void onColorChanged(); + void onWeightChanged(); + void onVisibleChanged(); protected: void changeEvent(QEvent *e); - void initUi(void); - void applyDecorations(void); - void getDefaults(void); + void initUi(); + void applyDecorations(); + void getDefaults(); private: std::unique_ptr ui; @@ -90,22 +90,22 @@ public: virtual bool reject(); protected Q_SLOTS: - void onAllPressed(void); - void onGeometryPressed(void); - void onCosmeticPressed(void); - void onCenterPressed(void); + void onAllPressed(); + void onGeometryPressed(); + void onCosmeticPressed(); + void onCenterPressed(); protected: void changeEvent(QEvent *e); - void initUi(void); - int countInvisibleLines(void); - int countInvisibleGeoms(void); - int countInvisibleCosmetics(void); - int countInvisibleCenters(void); - void restoreInvisibleLines(void); - void restoreInvisibleGeoms(void); - void restoreInvisibleCosmetics(void); - void restoreInvisibleCenters(void); + void initUi(); + int countInvisibleLines(); + int countInvisibleGeoms(); + int countInvisibleCosmetics(); + int countInvisibleCenters(); + void restoreInvisibleLines(); + void restoreInvisibleGeoms(); + void restoreInvisibleCosmetics(); + void restoreInvisibleCenters(); private: std::unique_ptr ui; @@ -134,7 +134,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } protected: diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h index a329acc079..1bab95ad74 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.h +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h @@ -88,7 +88,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index c2c3522368..3e86aa8596 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -212,7 +212,7 @@ void TaskProjGroup::viewToggled(bool toggle) wc.restoreCursor(); } -void TaskProjGroup::rotateButtonClicked(void) +void TaskProjGroup::rotateButtonClicked() { if ( multiView && ui ) { const QObject *clicked = sender(); @@ -295,7 +295,7 @@ void TaskProjGroup::AutoDistributeClicked(bool b) multiView->recomputeFeature(); } -void TaskProjGroup::spacingChanged(void) +void TaskProjGroup::spacingChanged() { if (blockUpdate) { return; diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index 3f8633a05c..32ba06ec06 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -69,7 +69,7 @@ protected Q_SLOTS: void viewToggled(bool toggle); /// Requests appropriate rotation of our DrawProjGroup - void rotateButtonClicked(void); + void rotateButtonClicked(); // void onResetClicked(void); /* void projectionTypeChanged(int index);*/ @@ -77,7 +77,7 @@ protected Q_SLOTS: void scaleTypeChanged(int index); void AutoDistributeClicked(bool b); /// Updates item spacing - void spacingChanged(void); + void spacingChanged(); void scaleManuallyChanged(int i); protected: @@ -89,7 +89,7 @@ protected: * between checkboxes and viewToggled() */ void setupViewCheckboxes(bool addConnections = false); - void setUiPrimary(void); + void setUiPrimary(); void saveGroupState(); void restoreGroupState(); @@ -149,7 +149,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void setCreateMode(bool b); diff --git a/src/Mod/TechDraw/Gui/TaskProjection.h b/src/Mod/TechDraw/Gui/TaskProjection.h index 57553aec93..5aabad3038 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.h +++ b/src/Mod/TechDraw/Gui/TaskProjection.h @@ -51,7 +51,7 @@ public: bool accept(); bool reject(); - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return true; } private: diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index 8f16e8a958..a752a19fe7 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -310,7 +310,7 @@ void TaskRichAnno::onSaveAndExit(QString qs) m_rte = nullptr; } -void TaskRichAnno::onEditorExit(void) +void TaskRichAnno::onEditorExit() { m_textDialog->reject(); m_textDialog = nullptr; @@ -322,7 +322,7 @@ double TaskRichAnno::prefWeight() const return TechDraw::LineGroup::getDefaultWidth("Graphic"); } -App::Color TaskRichAnno::prefLineColor(void) +App::Color TaskRichAnno::prefLineColor() { return PreferencesGui::leaderColor(); } @@ -408,7 +408,7 @@ void TaskRichAnno::updateAnnoFeature() m_annoFeat->requestPaint(); } -void TaskRichAnno::commonFeatureUpdate(void) +void TaskRichAnno::commonFeatureUpdate() { // Base::Console().Message("TRA::commonFeatureUpdate()\n"); m_annoFeat->setPosition(Rez::appX(m_attachPoint.x),Rez::appX(- m_attachPoint.y), true); @@ -417,7 +417,7 @@ void TaskRichAnno::commonFeatureUpdate(void) m_annoFeat->ShowFrame.setValue(ui->cbShowFrame->isChecked()); } -void TaskRichAnno::removeFeature(void) +void TaskRichAnno::removeFeature() { // Base::Console().Message("TRA::removeFeature()\n"); if (!m_annoFeat) diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h index 2936ff0ab5..b3f68ffdeb 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.h +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h @@ -68,7 +68,7 @@ public: virtual bool accept(); virtual bool reject(); virtual void setCreateMode(bool b) { m_createMode = b; } - virtual bool getCreateMode(void) { return m_createMode; } + virtual bool getCreateMode() { return m_createMode; } void updateTask(); void saveButtons(QPushButton* btnOK, QPushButton* btnCancel); @@ -77,25 +77,25 @@ public: protected Q_SLOTS: void onSaveAndExit(QString); - void onEditorExit(void); + void onEditorExit(); protected: void changeEvent(QEvent *e); - void createAnnoFeature(void); - void updateAnnoFeature(void); - void commonFeatureUpdate(void); - void removeFeature(void); + void createAnnoFeature(); + void updateAnnoFeature(); + void commonFeatureUpdate(); + void removeFeature(); QPointF calcTextStartPos(double scale); void blockButtons(bool b); - void setUiPrimary(void); - void setUiEdit(void); + void setUiPrimary(); + void setUiEdit(); void enableTextUi(bool b); void enableVPUi(bool b); double prefWeight() const; - App::Color prefLineColor(void); + App::Color prefLineColor(); private: std::unique_ptr ui; @@ -150,7 +150,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index 3b13607977..2ae0a1588c 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -351,7 +351,7 @@ void TaskSectionView::enableAll(bool b) } //****************************************************************************** -bool TaskSectionView::apply(void) +bool TaskSectionView::apply() { // Base::Console().Message("TSV::apply() - m_dirName: %s\n", m_dirName.c_str()); if (m_dirName.empty()) { @@ -390,7 +390,7 @@ void TaskSectionView::applyQuick(std::string dir) m_base->requestPaint(); } -void TaskSectionView::applyAligned(void) +void TaskSectionView::applyAligned() { Base::Console().Message("TSV::applyAligned() - not implemented yet\n"); // Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Apply Aligned")); @@ -401,7 +401,7 @@ void TaskSectionView::applyAligned(void) //********************************************************************* //pointer to created view is not returned, but stored in m_section -void TaskSectionView::createSectionView(void) +void TaskSectionView::createSectionView() { // Base::Console().Message("TSV::createSectionView()\n"); if (!isBaseValid()) { @@ -448,7 +448,7 @@ void TaskSectionView::createSectionView(void) return; } -void TaskSectionView::updateSectionView(void) +void TaskSectionView::updateSectionView() { // Base::Console().Message("TSV::updateSectionView() - m_sectionName: %s\n", m_sectionName.c_str()); if (!isSectionValid()) { @@ -498,7 +498,7 @@ void TaskSectionView::failNoObject(std::string objectName) m_abort = true; } -bool TaskSectionView::isBaseValid(void) +bool TaskSectionView::isBaseValid() { if (!m_base) return false; @@ -510,7 +510,7 @@ bool TaskSectionView::isBaseValid(void) return true; } -bool TaskSectionView::isSectionValid(void) +bool TaskSectionView::isSectionValid() { if (!m_section) return false; diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h index 03f013c60a..da0b386799 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.h +++ b/src/Mod/TechDraw/Gui/TaskSectionView.h @@ -68,12 +68,12 @@ protected: void saveSectionState(); void restoreSectionState(); - bool apply(void); + bool apply(); void applyQuick(std::string dir); - void applyAligned(void); + void applyAligned(); - void createSectionView(void); - void updateSectionView(void); + void createSectionView(); + void updateSectionView(); void setUiPrimary(); void setUiEdit(); @@ -82,8 +82,8 @@ protected: void enableAll(bool b); void failNoObject(std::string objName); - bool isBaseValid(void); - bool isSectionValid(void); + bool isBaseValid(); + bool isSectionValid(); private: std::unique_ptr ui; @@ -144,9 +144,9 @@ public: void update(); - virtual bool isAllowedAlterSelection(void) const + virtual bool isAllowedAlterSelection() const { return false; } - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } protected: diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp index 8d4a01aa5e..6a354d84d2 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp @@ -97,7 +97,7 @@ enum class EdgeColor { // managing global line attributes //=========================================================================== -lineAttributes::lineAttributes(void) +lineAttributes::lineAttributes() { style = int(EdgeStyle::dotted); width = int(EdgeWidth::middle); @@ -114,7 +114,7 @@ void lineAttributes::setWidth(int newWidth) width = newWidth; } -float lineAttributes::getWidthValue(void) +float lineAttributes::getWidthValue() { switch(EdgeWidth(width)) { case EdgeWidth::small: @@ -136,7 +136,7 @@ void lineAttributes::setColor(int newColor) color = newColor; } -App::Color lineAttributes::getColorValue(void) +App::Color lineAttributes::getColorValue() { switch (EdgeColor(color)) { case EdgeColor::black: @@ -164,7 +164,7 @@ App::Color lineAttributes::getColorValue(void) // managing global dimension attributes //=========================================================================== -dimAttributes::dimAttributes(void) +dimAttributes::dimAttributes() { cascadeSpacing = 7.0; lineStretch = 2.0; diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h index 54e23c5f6d..bc5ceddb38 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h @@ -33,11 +33,11 @@ class dimAttributes { public: - dimAttributes(void); + dimAttributes(); void setCascadeSpacing(double); - double getCascadeSpacing(void) {return cascadeSpacing;} + double getCascadeSpacing() {return cascadeSpacing;} void setLineStretch(double); - double getLineStretch(void) {return lineStretch;} + double getLineStretch() {return lineStretch;} }; // class dimAttributes @@ -74,15 +74,15 @@ class lineAttributes { public: - lineAttributes(void); + lineAttributes(); void setStyle(int); - int getStyle(void) const {return style;} + int getStyle() const {return style;} void setWidth(int); - int getWidth(void) const {return width;} - float getWidthValue(void); + int getWidth() const {return width;} + float getWidthValue(); void setColor(int); - int getColor(void) const {return color;} - App::Color getColorValue(void); + int getColor() const {return color;} + App::Color getColorValue(); }; // class lineAttributes @@ -106,7 +106,7 @@ protected Q_SLOTS: protected: void changeEvent(QEvent *e); - void setUiEdit(void); + void setUiEdit(); private: lineAttributes* activeAttributes; @@ -132,7 +132,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp index 7b9489dbe7..b3fd43adcb 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp @@ -64,7 +64,7 @@ void SvgString::addText(int xText, int yText, std::string text) svgStream << "' style='font-size:18px'>" << text << "\n"; } -std::string SvgString::finish(void) +std::string SvgString::finish() { svgStream << "\n"; return svgStream.str(); @@ -112,7 +112,7 @@ QPixmap TaskSurfaceFinishSymbols::baseSymbol(symbolType type) return QPixmap::fromImage(img); } -std::string TaskSurfaceFinishSymbols::completeSymbol(void) +std::string TaskSurfaceFinishSymbols::completeSymbol() // return string showing the complete symbol { SvgString symbol(150,64); diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h index 7750b2ed11..11a40fac62 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h @@ -66,7 +66,7 @@ public: void addLine(int x1, int y1, int x2, int y2); void addCircle(int xCenter, int yCenter, int radius); void addText(int xText, int yText, std::string text); - std::string finish(void); + std::string finish(); }; // SvgString @@ -95,7 +95,7 @@ protected Q_SLOTS: protected: void changeEvent(QEvent *e); - void setUiEdit(void); + void setUiEdit(); private: enum symbolType {anyMethod=0, removeProhibit, removeRequired, @@ -132,7 +132,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp index 63216829ef..142f3c9399 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp @@ -429,7 +429,7 @@ void TaskWeldingSymbol::onSymbolSelected(QString symbolPath, } } -void TaskWeldingSymbol::collectArrowData(void) +void TaskWeldingSymbol::collectArrowData() { // Base::Console().Message("TWS::collectArrowData()\n"); m_arrowOut.toBeSaved = true; @@ -443,7 +443,7 @@ void TaskWeldingSymbol::collectArrowData(void) m_arrowOut.tileName = ""; } -void TaskWeldingSymbol::collectOtherData(void) +void TaskWeldingSymbol::collectOtherData() { // Base::Console().Message("TWS::collectOtherData()\n"); m_otherOut.toBeSaved = true; @@ -457,7 +457,7 @@ void TaskWeldingSymbol::collectOtherData(void) m_otherOut.tileName = ""; } -void TaskWeldingSymbol::getTileFeats(void) +void TaskWeldingSymbol::getTileFeats() { // Base::Console().Message("TWS::getTileFeats()\n"); std::vector tiles = m_weldFeat->getTiles(); @@ -485,7 +485,7 @@ void TaskWeldingSymbol::getTileFeats(void) } //****************************************************************************** -TechDraw::DrawWeldSymbol* TaskWeldingSymbol::createWeldingSymbol(void) +TechDraw::DrawWeldSymbol* TaskWeldingSymbol::createWeldingSymbol() { // Base::Console().Message("TWS::createWeldingSymbol()\n"); @@ -530,7 +530,7 @@ TechDraw::DrawWeldSymbol* TaskWeldingSymbol::createWeldingSymbol(void) return newSym; } -void TaskWeldingSymbol::updateWeldingSymbol(void) +void TaskWeldingSymbol::updateWeldingSymbol() { // Base::Console().Message("TWS::updateWeldingSymbol()\n"); std::string symbolName = m_weldFeat->getNameInDocument(); @@ -556,7 +556,7 @@ void TaskWeldingSymbol::updateWeldingSymbol(void) symbolName.c_str(), tailText.c_str()); } -void TaskWeldingSymbol::updateTiles(void) +void TaskWeldingSymbol::updateTiles() { // Base::Console().Message("TWS::updateTiles()\n"); getTileFeats(); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index 8e5f4c0f8b..f332d537eb 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -73,7 +73,7 @@ public: std::string symbolPath; std::string symbolString; std::string tileName; - void init(void) { + void init() { toBeSaved = false; arrowSide = true; row = 0; @@ -188,7 +188,7 @@ public: virtual bool reject(); /// is called by the framework if the user presses the help button virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument(void) const + virtual bool isAllowedAlterDocument() const { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h index 642f72a14a..7872e6dae4 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h @@ -42,7 +42,7 @@ public: /// destructor virtual ~ViewProviderAnnotation(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void updateData(const App::Property*); virtual TechDraw::DrawViewAnnotation* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp index 798d1569ff..a8a8f64e3d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp @@ -70,7 +70,7 @@ ViewProviderBalloon::~ViewProviderBalloon() { } -bool ViewProviderBalloon::doubleClicked(void) +bool ViewProviderBalloon::doubleClicked() { startDefaultEditMode(); return true; diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h index 1f2137057e..5aa29bdb1a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h @@ -50,12 +50,12 @@ public: App::PropertyBool LineVisible; App::PropertyColor Color; - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual void setupContextMenu(QMenu*, QObject*, const char*); virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual bool canDelete(App::DocumentObject* obj) const; virtual TechDraw::DrawViewBalloon* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 962d781d88..57b7e98977 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -102,7 +102,7 @@ void ViewProviderDimension::attach(App::DocumentObject *pcFeat) } } -bool ViewProviderDimension::doubleClicked(void) +bool ViewProviderDimension::doubleClicked() { startDefaultEditMode(); return true; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index 4ead2daf62..7100888ff7 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -68,12 +68,12 @@ public: App::PropertyFloat GapFactorASME; virtual void attach(App::DocumentObject *); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual void setupContextMenu(QMenu*, QObject*, const char*); virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual TechDraw::DrawViewDimension* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 625f585f79..0c91dc4b6a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -108,7 +108,7 @@ void ViewProviderDrawingView::onChanged(const App::Property *prop) Gui::ViewProviderDocumentObject::onChanged(prop); } -void ViewProviderDrawingView::show(void) +void ViewProviderDrawingView::show() { TechDraw::DrawView* obj = getViewObject(); if (!obj || obj->isRestoring()) @@ -124,7 +124,7 @@ void ViewProviderDrawingView::show(void) ViewProviderDocumentObject::show(); } -void ViewProviderDrawingView::hide(void) +void ViewProviderDrawingView::hide() { TechDraw::DrawView* obj = getViewObject(); if (!obj || obj->isRestoring()) @@ -149,7 +149,7 @@ void ViewProviderDrawingView::hide(void) } } -QGIView* ViewProviderDrawingView::getQView(void) +QGIView* ViewProviderDrawingView::getQView() { QGIView *qView = nullptr; if (m_docReady){ @@ -173,7 +173,7 @@ QGIView* ViewProviderDrawingView::getQView(void) return qView; } -bool ViewProviderDrawingView::isShow(void) const +bool ViewProviderDrawingView::isShow() const { return Visibility.getValue(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index 08dbcfcddd..7212654012 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -53,17 +53,17 @@ public: App::PropertyBool KeepLabel; virtual void attach(App::DocumentObject *) override; - virtual bool useNewSelectionModel(void) const override {return false;} + virtual bool useNewSelectionModel() const override {return false;} /// Hide the object in the view - virtual void hide(void) override; + virtual void hide() override; /// Show the object in the view - virtual void show(void) override; - virtual bool isShow(void) const override; + virtual void show() override; + virtual bool isShow() const override; virtual void onChanged(const App::Property *prop) override; virtual void updateData(const App::Property*) override; - QGIView* getQView(void); + QGIView* getQView(); MDIViewPage* getMDIViewPage() const; virtual Gui::MDIView *getMDIView() const override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp index 5bcaad002d..a1da58b78e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp @@ -92,7 +92,7 @@ bool ViewProviderGeomHatch::setEdit(int ModNum) return true; } -bool ViewProviderGeomHatch::doubleClicked(void) +bool ViewProviderGeomHatch::doubleClicked() { setEdit(0); return true; @@ -121,7 +121,7 @@ void ViewProviderGeomHatch::updateData(const App::Property* prop) Gui::ViewProviderDocumentObject::updateData(prop); } -void ViewProviderGeomHatch::updateGraphic(void) +void ViewProviderGeomHatch::updateGraphic() { TechDraw::DrawGeomHatch* dc = getViewObject(); if (!dc) { @@ -147,7 +147,7 @@ void ViewProviderGeomHatch::updateGraphic(void) qgiv->updateView(true); } -void ViewProviderGeomHatch::getParameters(void) +void ViewProviderGeomHatch::getParameters() { double weight = TechDraw::LineGroup::getDefaultWidth("Graphic"); WeightPattern.setValue(weight); diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index fafa7ac543..19c1bced86 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -86,7 +86,7 @@ bool ViewProviderHatch::setEdit(int ModNum) return true; } -bool ViewProviderHatch::doubleClicked(void) +bool ViewProviderHatch::doubleClicked() { setEdit(0); return true; diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h index 2bb67086a4..7690dd1b53 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h @@ -49,10 +49,10 @@ public: App::PropertyColor HatchColor; App::PropertyFloatConstraint HatchScale; - virtual bool useNewSelectionModel(void) const override {return false;} + virtual bool useNewSelectionModel() const override {return false;} virtual void onChanged(const App::Property* prop) override; virtual bool setEdit(int ModNum) override; - virtual bool doubleClicked(void) override; + virtual bool doubleClicked() override; virtual bool canDelete(App::DocumentObject* obj) const override; TechDraw::DrawHatch* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.h b/src/Mod/TechDraw/Gui/ViewProviderImage.h index 0c1e218cfc..5dfc8bcb2c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderImage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderImage.h @@ -43,7 +43,7 @@ public: App::PropertyBool Crop; //crop to feature width x height - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} /// returns a list of all possible modes virtual void updateData(const App::Property*); virtual void onChanged(const App::Property *prop); diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 86440796d5..2c9e8c4640 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -92,7 +92,7 @@ bool ViewProviderLeader::setEdit(int ModNum) return true; } -bool ViewProviderLeader::doubleClicked(void) +bool ViewProviderLeader::doubleClicked() { // Base::Console().Message("VPL::doubleClicked()\n"); setEdit(ViewProvider::Default); @@ -129,7 +129,7 @@ void ViewProviderLeader::onChanged(const App::Property* p) ViewProviderDrawingView::onChanged(p); } -std::vector ViewProviderLeader::claimChildren(void) const +std::vector ViewProviderLeader::claimChildren() const { // Collect any child Document Objects and put them in the right place in the Feature tree // valid children of a ViewLeader are: @@ -163,12 +163,12 @@ TechDraw::DrawLeaderLine* ViewProviderLeader::getFeature() const return dynamic_cast(pcObject); } -double ViewProviderLeader::getDefLineWeight(void) +double ViewProviderLeader::getDefLineWeight() { return TechDraw::LineGroup::getDefaultWidth("Thin"); } -App::Color ViewProviderLeader::getDefLineColor(void) +App::Color ViewProviderLeader::getDefLineColor() { return PreferencesGui::leaderColor(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h index 5da3628f6a..cf6dc33034 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h @@ -53,25 +53,25 @@ public: App::PropertyColor Color; /* virtual void setDisplayMode(const char* ModeName);*/ - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} /* virtual std::vector getDisplayModes(void) const;*/ virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual bool onDelete(const std::vector &); virtual bool canDelete(App::DocumentObject* obj) const; static const char* LineStyleEnums[]; - std::vector claimChildren(void) const; + std::vector claimChildren() const; virtual TechDraw::DrawLeaderLine* getViewObject() const; TechDraw::DrawLeaderLine* getFeature() const; protected: - double getDefLineWeight(void); - App::Color getDefLineColor(void); + double getDefLineWeight(); + App::Color getDefLineColor(); virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); private: diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 6ebd43d3a3..b543179b4b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -121,7 +121,7 @@ void ViewProviderPage::setDisplayMode(const char* ModeName) ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderPage::getDisplayModes(void) const +std::vector ViewProviderPage::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); @@ -129,20 +129,20 @@ std::vector ViewProviderPage::getDisplayModes(void) const return StrList; } -void ViewProviderPage::show(void) +void ViewProviderPage::show() { Visibility.setValue(true); showMDIViewPage(); } -void ViewProviderPage::hide(void) +void ViewProviderPage::hide() { Visibility.setValue(false); removeMDIView(); ViewProviderDocumentObject::hide(); } -void ViewProviderPage::removeMDIView(void) +void ViewProviderPage::removeMDIView() { if (m_mdiView.isNull()) { return; @@ -270,7 +270,7 @@ bool ViewProviderPage::setEdit(int ModNum) } } -bool ViewProviderPage::doubleClicked(void) +bool ViewProviderPage::doubleClicked() { show(); Gui::getMainWindow()->setActiveWindow(m_mdiView); @@ -308,7 +308,7 @@ bool ViewProviderPage::showMDIViewPage() return true; } -std::vector ViewProviderPage::claimChildren(void) const +std::vector ViewProviderPage::claimChildren() const { std::vector temp; @@ -407,12 +407,12 @@ void ViewProviderPage::finishRestoring() Gui::ViewProviderDocumentObject::finishRestoring(); } -bool ViewProviderPage::isShow(void) const +bool ViewProviderPage::isShow() const { return Visibility.getValue(); } -bool ViewProviderPage::getFrameState(void) +bool ViewProviderPage::getFrameState() { return ShowFrames.getValue(); } @@ -422,7 +422,7 @@ void ViewProviderPage::setFrameState(bool state) ShowFrames.setValue(state); } -void ViewProviderPage::toggleFrameState(void) +void ViewProviderPage::toggleFrameState() { // Base::Console().Message("VPP::toggleFrameState()\n"); if (m_graphicsScene) { @@ -496,7 +496,7 @@ Gui::MDIView *ViewProviderPage::getMDIView() const return m_mdiView.data(); } -void ViewProviderPage::setGrid(void) +void ViewProviderPage::setGrid() { TechDraw::DrawPage* dp = getDrawPage(); if (!dp) { diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index 5c6e4cef7d..e12978901d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -59,27 +59,27 @@ public: virtual void attach(App::DocumentObject *) override; virtual void setDisplayMode(const char* ModeName) override; - virtual bool useNewSelectionModel(void) const override {return false;} + virtual bool useNewSelectionModel() const override {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const override; + virtual std::vector getDisplayModes() const override; /// Hides the view provider - virtual void hide(void) override; + virtual void hide() override; /// Shows the view provider - virtual void show(void) override; - virtual bool isShow(void) const override; + virtual void show() override; + virtual bool isShow() const override; /// Claim all the views for the page - std::vector claimChildren(void) const override; + std::vector claimChildren() const override; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked(void) override; + virtual bool doubleClicked() override; void setupContextMenu(QMenu*, QObject*, const char*) override; virtual bool onDelete(const std::vector &) override; virtual void onChanged(const App::Property *prop) override; virtual void updateData(const App::Property* prop) override; virtual void startRestoring() override; virtual void finishRestoring() override; - bool isRestoring(void) {return !m_docReady;} + bool isRestoring() {return !m_docReady;} TechDraw::DrawPage* getDrawPage() const; void onGuiRepaint(const TechDraw::DrawPage* dp); @@ -89,20 +89,20 @@ public: void unsetEdit(int ModNum) override; MDIViewPage* getMDIViewPage() const; bool showMDIViewPage(); - void removeMDIView(void); + void removeMDIView(); virtual Gui::MDIView *getMDIView() const override; - bool getFrameState(void); + bool getFrameState(); void setFrameState(bool state); - void toggleFrameState(void); + void toggleFrameState(); void setTemplateMarkers(bool state); QGVPage *getGraphicsView() { return m_graphicsView; } QGSPage* getGraphicsScene() { return m_graphicsScene; } void setGraphicsView(QGVPage* gv); void setGraphicsScene(QGSPage* gs); virtual bool canDelete(App::DocumentObject* obj) const override; - void setGrid(void); + void setGrid(); protected: bool setEdit(int ModNum) override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 2b7e89ee24..31b23ab2d9 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -59,7 +59,7 @@ ViewProviderProjGroup::~ViewProviderProjGroup() { } -std::vector ViewProviderProjGroup::getDisplayModes(void) const +std::vector ViewProviderProjGroup::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderDrawingView::getDisplayModes(); @@ -99,7 +99,7 @@ bool ViewProviderProjGroup::setEdit(int ModNum) return true; } -bool ViewProviderProjGroup::doubleClicked(void) +bool ViewProviderProjGroup::doubleClicked() { setEdit(0); return true; @@ -189,7 +189,7 @@ bool ViewProviderProjGroup::canDelete(App::DocumentObject *obj) const return true; } -std::vector ViewProviderProjGroup::claimChildren(void) const +std::vector ViewProviderProjGroup::claimChildren() const { // Collect any child fields std::vector temp; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h index fe1bcaf181..dda9178676 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h @@ -39,15 +39,15 @@ public: ViewProviderProjGroup(); /// constructor ~ViewProviderProjGroup(); /// destructor - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; /// Claim all the views for the page - std::vector claimChildren(void) const; + std::vector claimChildren() const; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked(void); + virtual bool doubleClicked(); void setupContextMenu(QMenu*, QObject*, const char*); TechDraw::DrawProjGroup* getObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index 76f69e13ff..ee0ff441d5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -51,7 +51,7 @@ ViewProviderProjGroupItem::~ViewProviderProjGroupItem() { } -std::vector ViewProviderProjGroupItem::getDisplayModes(void) const +std::vector ViewProviderProjGroupItem::getDisplayModes() const { // get the modes of the father std::vector StrList = ViewProviderViewPart::getDisplayModes(); @@ -118,7 +118,7 @@ void ViewProviderProjGroupItem::unsetEdit(int ModNum) Gui::Control().closeDialog(); } -bool ViewProviderProjGroupItem::doubleClicked(void) +bool ViewProviderProjGroupItem::doubleClicked() { return true; } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h index 671d80ca74..44ad890a97 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h @@ -40,12 +40,12 @@ public: ViewProviderProjGroupItem(); ~ViewProviderProjGroupItem(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; + virtual std::vector getDisplayModes() const; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked(void); + virtual bool doubleClicked(); void setupContextMenu(QMenu*, QObject*, const char*); virtual void updateData(const App::Property*); diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp index 82711121d7..e1999e9e81 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp @@ -86,7 +86,7 @@ bool ViewProviderRichAnno::setEdit(int ModNum) return true; } -bool ViewProviderRichAnno::doubleClicked(void) +bool ViewProviderRichAnno::doubleClicked() { // Base::Console().Message("VPRA::doubleClicked()\n"); setEdit(ViewProvider::Default); @@ -135,12 +135,12 @@ TechDraw::DrawRichAnno* ViewProviderRichAnno::getFeature() const return dynamic_cast(pcObject); } -App::Color ViewProviderRichAnno::getDefLineColor(void) +App::Color ViewProviderRichAnno::getDefLineColor() { return PreferencesGui::leaderColor(); } -std::string ViewProviderRichAnno::getDefFont(void) +std::string ViewProviderRichAnno::getDefFont() { return Preferences::labelFont(); } @@ -150,7 +150,7 @@ double ViewProviderRichAnno::getDefFontSize() return Preferences::dimFontSizeMM(); } -double ViewProviderRichAnno::getDefLineWeight(void) +double ViewProviderRichAnno::getDefLineWeight() { return TechDraw::LineGroup::getDefaultWidth("Graphics"); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h index 78ab284a82..ac4f8654ca 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h @@ -50,11 +50,11 @@ public: App::PropertyEnumeration LineStyle; App::PropertyColor LineColor; - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual bool canDelete(App::DocumentObject* obj) const; static const char* LineStyleEnums[]; @@ -63,10 +63,10 @@ public: TechDraw::DrawRichAnno* getFeature() const; protected: - App::Color getDefLineColor(void); - std::string getDefFont(void); - double getDefFontSize(void); - double getDefLineWeight(void); + App::Color getDefLineColor(); + std::string getDefFont(); + double getDefFontSize(); + double getDefLineWeight(); virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); private: diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h index d4204296b0..1b87a66b60 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h @@ -41,7 +41,7 @@ public: /// destructor virtual ~ViewProviderSpreadsheet(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual TechDraw::DrawViewSpreadsheet* getViewObject() const; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h index 6f46936ec6..b390814c43 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h @@ -43,7 +43,7 @@ public: /// destructor virtual ~ViewProviderSymbol(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void updateData(const App::Property*); virtual TechDraw::DrawViewSymbol* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index 681ce6e40f..3b489988ab 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -102,7 +102,7 @@ void ViewProviderTemplate::onChanged(const App::Property *prop) Gui::ViewProviderDocumentObject::onChanged(prop); } -void ViewProviderTemplate::show(void) +void ViewProviderTemplate::show() { QGITemplate* qTemplate = getQTemplate(); if (qTemplate) { @@ -112,7 +112,7 @@ void ViewProviderTemplate::show(void) ViewProviderDocumentObject::show(); } -void ViewProviderTemplate::hide(void) +void ViewProviderTemplate::hide() { QGITemplate* qTemplate = getQTemplate(); if (qTemplate) { @@ -122,12 +122,12 @@ void ViewProviderTemplate::hide(void) ViewProviderDocumentObject::hide(); } -bool ViewProviderTemplate::isShow(void) const +bool ViewProviderTemplate::isShow() const { return Visibility.getValue(); } -QGITemplate* ViewProviderTemplate::getQTemplate(void) +QGITemplate* ViewProviderTemplate::getQTemplate() { TechDraw::DrawTemplate* dt = getTemplate(); if (dt) { @@ -186,7 +186,7 @@ bool ViewProviderTemplate::onDelete(const std::vector &) return false; } -MDIViewPage* ViewProviderTemplate::getMDIViewPage(void) const +MDIViewPage* ViewProviderTemplate::getMDIViewPage() const { auto t = getTemplate(); auto page = t->getParentPage(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.h b/src/Mod/TechDraw/Gui/ViewProviderTile.h index 93c0355628..afa4c3cd00 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.h @@ -38,7 +38,7 @@ public: /// destructor virtual ~ViewProviderTile(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual bool canDelete(App::DocumentObject *obj) const; /* virtual TechDraw::DrawTile* getViewObject() const;*/ diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp index d0d1a5bae7..30369092d5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp @@ -50,7 +50,7 @@ ViewProviderViewClip::~ViewProviderViewClip() { } -std::vector ViewProviderViewClip::claimChildren(void) const +std::vector ViewProviderViewClip::claimChildren() const { // Collect any child views // for Clip, valid children are any View in Views @@ -58,7 +58,7 @@ std::vector ViewProviderViewClip::claimChildren(void) cons return views; } -void ViewProviderViewClip::show(void) +void ViewProviderViewClip::show() { //TODO: not sure that clip members need to be touched when hiding clip group App::DocumentObject* obj = getObject(); @@ -73,7 +73,7 @@ void ViewProviderViewClip::show(void) } -void ViewProviderViewClip::hide(void) +void ViewProviderViewClip::hide() { //TODO: not sure that clip members need to be touched when hiding clip group App::DocumentObject* obj = getObject(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h index 82856c399e..ef217c2fc1 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h @@ -41,16 +41,16 @@ public: /// destructor virtual ~ViewProviderViewClip(); - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual TechDraw::DrawViewClip* getViewObject() const; TechDraw::DrawViewClip* getObject() const; /// Hide the object in the view - virtual void hide(void); + virtual void hide(); /// Show the object in the view - virtual void show(void); - std::vector claimChildren(void) const; + virtual void show(); + std::vector claimChildren() const; virtual bool canDelete(App::DocumentObject* obj) const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index c63f10e274..085aa4eda2 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -167,7 +167,7 @@ void ViewProviderViewPart::attach(App::DocumentObject *pcFeat) ViewProviderDrawingView::attach(pcFeat); } -std::vector ViewProviderViewPart::claimChildren(void) const +std::vector ViewProviderViewPart::claimChildren() const { // Collect any child Document Objects and put them in the right place in the Feature tree // valid children of a ViewPart are: @@ -246,7 +246,7 @@ bool ViewProviderViewPart::setEdit(int ModNum) return true; } -bool ViewProviderViewPart::doubleClicked(void) +bool ViewProviderViewPart::doubleClicked() { setEdit(ViewProvider::Default); return true; @@ -344,12 +344,12 @@ bool ViewProviderViewPart::canDelete(App::DocumentObject *obj) const return true; } -App::Color ViewProviderViewPart::prefSectionColor(void) +App::Color ViewProviderViewPart::prefSectionColor() { return PreferencesGui::sectionLineColor(); } -App::Color ViewProviderViewPart::prefHighlightColor(void) +App::Color ViewProviderViewPart::prefHighlightColor() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); @@ -358,7 +358,7 @@ App::Color ViewProviderViewPart::prefHighlightColor(void) return fcColor; } -int ViewProviderViewPart::prefHighlightStyle(void) +int ViewProviderViewPart::prefHighlightStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp index d75bbc6aef..5ec73fc945 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp @@ -104,7 +104,7 @@ void ViewProviderViewSection::updateData(const App::Property* prop) ViewProviderViewPart::updateData(prop); } -void ViewProviderViewSection::updateGraphic(void) +void ViewProviderViewSection::updateGraphic() { // redraw QGIVP QGIView* qgiv = getQView(); @@ -127,14 +127,14 @@ bool ViewProviderViewSection::setEdit(int ModNum) return true; } -bool ViewProviderViewSection::doubleClicked(void) +bool ViewProviderViewSection::doubleClicked() { setEdit(ViewProvider::Default); return true; } -void ViewProviderViewSection::getParameters(void) +void ViewProviderViewSection::getParameters() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h index b842462dbc..d106c45d89 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h @@ -51,10 +51,10 @@ public: virtual void updateData(const App::Property*); virtual void onChanged(const App::Property *prop); virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); - void updateGraphic(void); - void getParameters(void); + void updateGraphic(); + void getParameters(); virtual bool canDelete(App::DocumentObject* obj) const; virtual TechDraw::DrawViewSection* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp index c2b4af1e26..5ee07c3494 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp @@ -73,7 +73,7 @@ void ViewProviderWeld::onChanged(const App::Property* p) ViewProviderDrawingView::onChanged(p); } -std::vector ViewProviderWeld::claimChildren(void) const +std::vector ViewProviderWeld::claimChildren() const { // Collect any child Document Objects and put them in the right place in the Feature tree // valid children of a DrawWeldSymbol are: @@ -107,24 +107,24 @@ bool ViewProviderWeld::setEdit(int ModNum) return true; } -bool ViewProviderWeld::doubleClicked(void) +bool ViewProviderWeld::doubleClicked() { // Base::Console().Message("VPW::doubleClicked()\n"); setEdit(ViewProvider::Default); return true; } -std::string ViewProviderWeld::prefFontName(void) +std::string ViewProviderWeld::prefFontName() { return Preferences::labelFont(); } -double ViewProviderWeld::prefFontSize(void) +double ViewProviderWeld::prefFontSize() { return Preferences::labelFontSizeMM(); } -double ViewProviderWeld::prefTileTextAdjust(void) +double ViewProviderWeld::prefTileTextAdjust() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")-> diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.h b/src/Mod/TechDraw/Gui/ViewProviderWeld.h index 4489ec3b27..b88388331a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.h +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.h @@ -46,18 +46,18 @@ public: App::PropertyLength FontSize; App::PropertyLength TileFontSize; - virtual bool useNewSelectionModel(void) const {return false;} + virtual bool useNewSelectionModel() const {return false;} virtual void onChanged(const App::Property* p); - virtual std::vector claimChildren(void) const; + virtual std::vector claimChildren() const; virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + virtual bool doubleClicked(); virtual TechDraw::DrawWeldSymbol* getViewObject() const; virtual TechDraw::DrawWeldSymbol* getFeature() const; - std::string prefFontName(void); - double prefFontSize(void); - double prefTileTextAdjust(void); + std::string prefFontName(); + double prefFontSize(); + double prefTileTextAdjust(); virtual bool onDelete(const std::vector &); virtual bool canDelete(App::DocumentObject* obj) const; diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 5fd356ae84..7fbf74a483 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -38,7 +38,7 @@ // use a different name to CreateCommand() -void CreateWebCommands(void); +void CreateWebCommands(); void loadWebResource() { diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 0ff4eca383..803717279c 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -734,7 +734,7 @@ void BrowserView::setHtml(const QString& HtmlCode,const QUrl & BaseUrl) #endif } -void BrowserView::stop(void) +void BrowserView::stop() { view->stop(); } @@ -867,12 +867,12 @@ bool BrowserView::onHasMsg(const char* pMsg) const } /** Checking on close state. */ -bool BrowserView::canClose(void) +bool BrowserView::canClose() { return true; } -PyObject* BrowserView::getPyObject(void) +PyObject* BrowserView::getPyObject() { static bool init = false; if (!init) { diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index 42b8107775..c95ee775f1 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -90,18 +90,18 @@ public: void load(const char* URL); void load(const QUrl & url); void setHtml(const QString& HtmlCode,const QUrl & BaseUrl); - void stop(void); + void stop(); QUrl url() const; void OnChange(Base::Subject &rCaller,const char* rcReason); - const char *getName(void) const {return "BrowserView";} - virtual PyObject *getPyObject(void); + const char *getName() const {return "BrowserView";} + virtual PyObject *getPyObject(); bool onMsg(const char* pMsg,const char** ppReturn); bool onHasMsg(const char* pMsg) const; - bool canClose (void); + bool canClose (); #ifdef QTWEBENGINE public Q_SLOTS: diff --git a/src/Mod/Web/Gui/Command.cpp b/src/Mod/Web/Gui/Command.cpp index 2272b6d93b..88f87cb18f 100644 --- a/src/Mod/Web/Gui/Command.cpp +++ b/src/Mod/Web/Gui/Command.cpp @@ -83,7 +83,7 @@ void CmdWebBrowserBack::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('Back')"); } -bool CmdWebBrowserBack::isActive(void) +bool CmdWebBrowserBack::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Back"); } @@ -112,7 +112,7 @@ void CmdWebBrowserNext::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('Next')"); } -bool CmdWebBrowserNext::isActive(void) +bool CmdWebBrowserNext::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Next"); } @@ -141,7 +141,7 @@ void CmdWebBrowserRefresh::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('Refresh')"); } -bool CmdWebBrowserRefresh::isActive(void) +bool CmdWebBrowserRefresh::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Refresh"); } @@ -170,7 +170,7 @@ void CmdWebBrowserStop::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('Stop')"); } -bool CmdWebBrowserStop::isActive(void) +bool CmdWebBrowserStop::isActive() { return getGuiApplication()->sendHasMsgToActiveView("Stop"); } @@ -199,7 +199,7 @@ void CmdWebBrowserZoomIn::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('ZoomIn')"); } -bool CmdWebBrowserZoomIn::isActive(void) +bool CmdWebBrowserZoomIn::isActive() { return getGuiApplication()->sendHasMsgToActiveView("ZoomIn"); } @@ -228,7 +228,7 @@ void CmdWebBrowserZoomOut::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('ZoomOut')"); } -bool CmdWebBrowserZoomOut::isActive(void) +bool CmdWebBrowserZoomOut::isActive() { return getGuiApplication()->sendHasMsgToActiveView("ZoomOut"); } @@ -257,14 +257,14 @@ void CmdWebBrowserSetURL::activated(int iMsg) doCommand(Command::Gui,"Gui.SendMsgToActiveView('SetURL')"); } -bool CmdWebBrowserSetURL::isActive(void) +bool CmdWebBrowserSetURL::isActive() { return getGuiApplication()->sendHasMsgToActiveView("SetURL"); } -void CreateWebCommands(void) +void CreateWebCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();