From 71dc5ead2fceae093ab5f1dd5d80d427c5311442 Mon Sep 17 00:00:00 2001 From: berniev Date: Tue, 9 Aug 2022 11:53:46 +1000 Subject: [PATCH] Mod: Use override etc 2 --- src/Mod/Draft/App/AppDraftUtilsPy.cpp | 2 +- src/Mod/Fem/App/AppFemPy.cpp | 4 +- src/Mod/Fem/App/FemAnalysis.h | 8 +- src/Mod/Fem/App/FemConstraint.h | 10 +- src/Mod/Fem/App/FemConstraintBearing.h | 6 +- src/Mod/Fem/App/FemConstraintContact.h | 6 +- src/Mod/Fem/App/FemConstraintDisplacement.h | 6 +- src/Mod/Fem/App/FemConstraintFixed.h | 6 +- src/Mod/Fem/App/FemConstraintFluidBoundary.h | 6 +- src/Mod/Fem/App/FemConstraintForce.h | 6 +- src/Mod/Fem/App/FemConstraintGear.h | 6 +- src/Mod/Fem/App/FemConstraintHeatflux.h | 6 +- .../Fem/App/FemConstraintInitialTemperature.h | 6 +- src/Mod/Fem/App/FemConstraintPlaneRotation.h | 6 +- src/Mod/Fem/App/FemConstraintPressure.h | 6 +- src/Mod/Fem/App/FemConstraintPulley.h | 6 +- src/Mod/Fem/App/FemConstraintSpring.h | 6 +- src/Mod/Fem/App/FemConstraintTemperature.h | 6 +- src/Mod/Fem/App/FemConstraintTransform.h | 6 +- src/Mod/Fem/App/FemMesh.cpp | 58 +-- src/Mod/Fem/App/FemMesh.h | 26 +- src/Mod/Fem/App/FemMeshObject.h | 12 +- src/Mod/Fem/App/FemMeshProperty.h | 32 +- src/Mod/Fem/App/FemMeshShapeNetgenObject.h | 6 +- src/Mod/Fem/App/FemMeshShapeObject.h | 6 +- src/Mod/Fem/App/FemPostFilter.h | 66 +-- src/Mod/Fem/App/FemPostFunction.h | 26 +- src/Mod/Fem/App/FemPostObject.h | 2 +- src/Mod/Fem/App/FemPostPipeline.h | 12 +- src/Mod/Fem/App/FemResultObject.h | 10 +- src/Mod/Fem/App/FemSetElementsObject.h | 10 +- src/Mod/Fem/App/FemSetFacesObject.h | 10 +- src/Mod/Fem/App/FemSetGeometryObject.h | 10 +- src/Mod/Fem/App/FemSetNodesObject.h | 10 +- src/Mod/Fem/App/FemSetObject.h | 8 +- src/Mod/Fem/App/FemSolverObject.h | 10 +- src/Mod/Fem/App/HypothesisPy.h | 72 +-- src/Mod/Fem/App/PropertyPostDataObject.h | 22 +- src/Mod/Fem/Gui/ActiveAnalysisObserver.h | 6 +- src/Mod/Fem/Gui/AppFemGuiPy.cpp | 4 +- src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h | 8 +- .../Fem/Gui/DlgSettingsFemExportAbaqusImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h | 8 +- src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h | 8 +- src/Mod/Fem/Gui/FemSelectionGate.h | 2 +- src/Mod/Fem/Gui/PropertyFemMeshItem.h | 14 +- src/Mod/Fem/Gui/TaskAnalysisInfo.h | 2 +- src/Mod/Fem/Gui/TaskCreateNodeSet.h | 4 +- src/Mod/Fem/Gui/TaskDlgAnalysis.h | 12 +- src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h | 12 +- src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h | 14 +- src/Mod/Fem/Gui/TaskDriver.h | 2 +- src/Mod/Fem/Gui/TaskFemConstraint.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintBearing.h | 12 +- src/Mod/Fem/Gui/TaskFemConstraintContact.h | 12 +- .../Fem/Gui/TaskFemConstraintDisplacement.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintFixed.h | 18 +- .../Fem/Gui/TaskFemConstraintFluidBoundary.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintForce.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintGear.h | 6 +- src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h | 18 +- .../Gui/TaskFemConstraintInitialTemperature.h | 10 +- src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h | 4 +- .../Fem/Gui/TaskFemConstraintPlaneRotation.h | 14 +- src/Mod/Fem/Gui/TaskFemConstraintPressure.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintPulley.h | 6 +- src/Mod/Fem/Gui/TaskFemConstraintSpring.h | 18 +- .../Fem/Gui/TaskFemConstraintTemperature.h | 18 +- src/Mod/Fem/Gui/TaskFemConstraintTransform.h | 14 +- src/Mod/Fem/Gui/TaskObjectName.h | 2 +- src/Mod/Fem/Gui/TaskPostBoxes.h | 64 +-- src/Mod/Fem/Gui/TaskTetParameter.h | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 38 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.h | 20 +- .../Gui/ViewProviderFemConstraintBearing.h | 6 +- .../Gui/ViewProviderFemConstraintContact.h | 6 +- .../ViewProviderFemConstraintDisplacement.h | 6 +- .../Fem/Gui/ViewProviderFemConstraintFixed.h | 6 +- .../ViewProviderFemConstraintFluidBoundary.h | 6 +- .../Fem/Gui/ViewProviderFemConstraintForce.h | 6 +- .../Fem/Gui/ViewProviderFemConstraintGear.h | 6 +- .../Gui/ViewProviderFemConstraintHeatflux.h | 6 +- ...wProviderFemConstraintInitialTemperature.h | 6 +- .../Gui/ViewProviderFemConstraintOnBoundary.h | 2 +- .../ViewProviderFemConstraintPlaneRotation.h | 6 +- .../Gui/ViewProviderFemConstraintPressure.h | 6 +- .../Fem/Gui/ViewProviderFemConstraintPulley.h | 6 +- .../Fem/Gui/ViewProviderFemConstraintSpring.h | 6 +- .../ViewProviderFemConstraintTemperature.h | 6 +- .../Gui/ViewProviderFemConstraintTransform.h | 6 +- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 26 +- src/Mod/Fem/Gui/ViewProviderFemMeshShape.h | 2 +- .../Fem/Gui/ViewProviderFemMeshShapeNetgen.h | 8 +- src/Mod/Fem/Gui/ViewProviderFemPostFilter.h | 24 +- src/Mod/Fem/Gui/ViewProviderFemPostFunction.h | 68 +-- src/Mod/Fem/Gui/ViewProviderFemPostObject.h | 30 +- src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h | 12 +- src/Mod/Fem/Gui/ViewProviderResult.h | 4 +- src/Mod/Fem/Gui/ViewProviderSetElements.h | 6 +- src/Mod/Fem/Gui/ViewProviderSetFaces.h | 6 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.h | 6 +- src/Mod/Fem/Gui/ViewProviderSetNodes.h | 6 +- src/Mod/Fem/Gui/ViewProviderSolver.h | 10 +- src/Mod/Fem/Gui/Workbench.h | 8 +- src/Mod/Image/App/AppImage.cpp | 2 +- src/Mod/Image/App/ImagePlane.h | 4 +- src/Mod/Image/Gui/AppImageGuiPy.cpp | 2 +- src/Mod/Image/Gui/ImageOrientationDialog.h | 4 +- src/Mod/Image/Gui/ViewProviderImagePlane.h | 10 +- src/Mod/Image/Gui/Workbench.h | 6 +- src/Mod/Import/App/AppImportPy.cpp | 4 +- src/Mod/Import/App/ExportOCAF.h | 2 +- src/Mod/Import/App/ImportOCAF.h | 2 +- src/Mod/Import/App/ImportOCAF2.h | 2 +- src/Mod/Import/App/dxf/ImpExpDxf.h | 20 +- src/Mod/Import/Gui/AppImportGuiPy.cpp | 12 +- src/Mod/Import/Gui/Workbench.h | 6 +- src/Mod/Inspection/App/AppInspection.cpp | 2 +- src/Mod/Inspection/App/InspectionFeature.cpp | 14 +- src/Mod/Inspection/App/InspectionFeature.h | 66 +-- src/Mod/Inspection/Gui/AppInspectionGui.cpp | 2 +- .../Inspection/Gui/ViewProviderInspection.cpp | 4 +- .../Inspection/Gui/ViewProviderInspection.h | 26 +- src/Mod/Inspection/Gui/VisualInspection.cpp | 2 +- src/Mod/Inspection/Gui/VisualInspection.h | 4 +- src/Mod/Inspection/Gui/Workbench.h | 6 +- src/Mod/Measure/App/AppMeasure.cpp | 2 +- src/Mod/Measure/App/Measurement.h | 4 +- src/Mod/Mesh/App/AppMeshPy.cpp | 4 +- src/Mod/Mesh/App/Core/Algorithm.h | 8 +- src/Mod/Mesh/App/Core/Approximation.h | 24 +- src/Mod/Mesh/App/Core/Curvature.cpp | 2 +- src/Mod/Mesh/App/Core/CylinderFit.h | 4 +- src/Mod/Mesh/App/Core/Degeneration.h | 124 ++--- src/Mod/Mesh/App/Core/Evaluation.h | 58 +-- src/Mod/Mesh/App/Core/Grid.h | 20 +- src/Mod/Mesh/App/Core/Segmentation.h | 98 ++-- src/Mod/Mesh/App/Core/SetOperations.h | 4 +- src/Mod/Mesh/App/Core/Smoothing.h | 18 +- src/Mod/Mesh/App/Core/SphereFit.h | 4 +- src/Mod/Mesh/App/Core/Triangulation.h | 30 +- src/Mod/Mesh/App/Core/Visitor.h | 6 +- src/Mod/Mesh/App/Exporter.h | 4 +- src/Mod/Mesh/App/FeatureMeshCurvature.h | 6 +- src/Mod/Mesh/App/FeatureMeshDefects.h | 46 +- src/Mod/Mesh/App/FeatureMeshExport.h | 6 +- src/Mod/Mesh/App/FeatureMeshImport.h | 4 +- src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h | 4 +- src/Mod/Mesh/App/FeatureMeshSetOperations.h | 4 +- src/Mod/Mesh/App/FeatureMeshSolid.h | 36 +- src/Mod/Mesh/App/FeatureMeshTransform.h | 4 +- .../Mesh/App/FeatureMeshTransformDemolding.h | 4 +- src/Mod/Mesh/App/Mesh.h | 42 +- src/Mod/Mesh/App/MeshFeature.h | 12 +- src/Mod/Mesh/App/MeshProperties.h | 80 +-- src/Mod/Mesh/Gui/AppMeshGui.cpp | 2 +- src/Mod/Mesh/Gui/DlgDecimating.h | 10 +- src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h | 18 +- src/Mod/Mesh/Gui/DlgEvaluateSettings.h | 2 +- src/Mod/Mesh/Gui/DlgRegularSolidImp.h | 4 +- src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h | 8 +- src/Mod/Mesh/Gui/DlgSettingsMeshView.h | 8 +- src/Mod/Mesh/Gui/DlgSmoothing.h | 12 +- src/Mod/Mesh/Gui/MeshEditor.h | 14 +- src/Mod/Mesh/Gui/PropertyEditorMesh.h | 14 +- src/Mod/Mesh/Gui/RemeshGmsh.h | 18 +- src/Mod/Mesh/Gui/RemoveComponents.h | 20 +- src/Mod/Mesh/Gui/Segmentation.h | 10 +- src/Mod/Mesh/Gui/SegmentationBestFit.cpp | 12 +- src/Mod/Mesh/Gui/SegmentationBestFit.h | 16 +- src/Mod/Mesh/Gui/Selection.h | 4 +- src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h | 12 +- src/Mod/Mesh/Gui/SoFCMeshObject.cpp | 8 +- src/Mod/Mesh/Gui/SoFCMeshObject.h | 72 +-- src/Mod/Mesh/Gui/SoPolygon.h | 10 +- src/Mod/Mesh/Gui/ViewProvider.h | 64 +-- src/Mod/Mesh/Gui/ViewProviderCurvature.h | 28 +- src/Mod/Mesh/Gui/ViewProviderDefects.h | 60 +-- src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h | 12 +- src/Mod/Mesh/Gui/ViewProviderTransform.h | 12 +- .../Mesh/Gui/ViewProviderTransformDemolding.h | 10 +- src/Mod/Mesh/Gui/Workbench.cpp | 4 +- src/Mod/Mesh/Gui/Workbench.h | 14 +- src/Mod/MeshPart/App/AppMeshPartPy.cpp | 4 +- src/Mod/MeshPart/App/CurveProjector.h | 12 +- src/Mod/MeshPart/App/Mesher.h | 4 +- src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 2 +- src/Mod/MeshPart/Gui/CrossSections.cpp | 8 +- src/Mod/MeshPart/Gui/CrossSections.h | 16 +- src/Mod/MeshPart/Gui/CurveOnMesh.h | 6 +- src/Mod/MeshPart/Gui/TaskCurveOnMesh.h | 10 +- src/Mod/MeshPart/Gui/Tessellation.h | 22 +- src/Mod/MeshPart/Gui/Workbench.h | 6 +- src/Mod/Part/App/AppPartPy.cpp | 22 +- src/Mod/Part/App/AttachExtension.h | 14 +- src/Mod/Part/App/Attacher.h | 20 +- .../Part/App/BRepOffsetAPI_MakeOffsetFix.h | 14 +- src/Mod/Part/App/BodyBase.h | 8 +- src/Mod/Part/App/CustomFeature.h | 8 +- src/Mod/Part/App/DatumFeature.h | 6 +- src/Mod/Part/App/FaceMaker.h | 10 +- src/Mod/Part/App/FaceMakerBullseye.h | 6 +- src/Mod/Part/App/FaceMakerCheese.h | 6 +- src/Mod/Part/App/FeatureChamfer.h | 4 +- src/Mod/Part/App/FeatureCompound.h | 10 +- src/Mod/Part/App/FeatureExtrusion.h | 10 +- src/Mod/Part/App/FeatureFillet.h | 4 +- src/Mod/Part/App/FeatureGeometrySet.h | 4 +- src/Mod/Part/App/FeatureMirroring.h | 10 +- src/Mod/Part/App/FeatureOffset.h | 16 +- src/Mod/Part/App/FeaturePartBoolean.h | 6 +- src/Mod/Part/App/FeaturePartBox.h | 10 +- src/Mod/Part/App/FeaturePartCircle.h | 14 +- src/Mod/Part/App/FeaturePartCommon.h | 8 +- src/Mod/Part/App/FeaturePartCurveNet.h | 6 +- src/Mod/Part/App/FeaturePartCut.h | 2 +- src/Mod/Part/App/FeaturePartFuse.h | 8 +- src/Mod/Part/App/FeaturePartImportBrep.h | 6 +- src/Mod/Part/App/FeaturePartImportIges.h | 6 +- src/Mod/Part/App/FeaturePartImportStep.h | 6 +- src/Mod/Part/App/FeaturePartPolygon.h | 6 +- src/Mod/Part/App/FeaturePartSection.h | 4 +- src/Mod/Part/App/FeaturePartSpline.h | 2 +- src/Mod/Part/App/FeatureRevolution.h | 2 +- src/Mod/Part/App/Geometry.h | 464 +++++++++--------- src/Mod/Part/App/Geometry2d.h | 244 ++++----- src/Mod/Part/App/GeometryDefaultExtension.h | 12 +- src/Mod/Part/App/GeometryExtension.h | 6 +- src/Mod/Part/App/GeometryMigrationExtension.h | 8 +- src/Mod/Part/App/Part2DObject.h | 2 +- src/Mod/Part/App/PartFeature.h | 22 +- src/Mod/Part/App/PartFeatureReference.h | 8 +- src/Mod/Part/App/PartFeatures.h | 40 +- src/Mod/Part/App/PrimitiveFeature.h | 112 ++--- src/Mod/Part/App/PrismExtension.h | 8 +- src/Mod/Part/App/PropertyGeometryList.h | 20 +- src/Mod/Part/App/PropertyTopoShape.h | 80 +-- src/Mod/Part/App/TopoShape.h | 54 +- src/Mod/Part/App/modelRefine.h | 26 +- src/Mod/Part/Gui/AppPartGui.cpp | 2 +- src/Mod/Part/Gui/BoxSelection.cpp | 4 +- src/Mod/Part/Gui/CrossSections.cpp | 8 +- src/Mod/Part/Gui/CrossSections.h | 16 +- src/Mod/Part/Gui/DlgBooleanOperation.cpp | 2 +- src/Mod/Part/Gui/DlgBooleanOperation.h | 14 +- src/Mod/Part/Gui/DlgExtrusion.cpp | 2 +- src/Mod/Part/Gui/DlgExtrusion.h | 14 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 2 +- src/Mod/Part/Gui/DlgFilletEdges.h | 56 +-- src/Mod/Part/Gui/DlgPartBoxImp.h | 2 +- src/Mod/Part/Gui/DlgPartCylinderImp.h | 2 +- src/Mod/Part/Gui/DlgPartImportIgesImp.h | 2 +- src/Mod/Part/Gui/DlgPartImportStepImp.h | 2 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 4 +- src/Mod/Part/Gui/DlgPrimitives.h | 22 +- src/Mod/Part/Gui/DlgProjectionOnSurface.cpp | 8 +- src/Mod/Part/Gui/DlgProjectionOnSurface.h | 18 +- src/Mod/Part/Gui/DlgRevolution.cpp | 2 +- src/Mod/Part/Gui/DlgRevolution.h | 16 +- src/Mod/Part/Gui/DlgSettings3DViewPartImp.h | 8 +- src/Mod/Part/Gui/DlgSettingsGeneral.h | 24 +- src/Mod/Part/Gui/DlgSettingsMeasure.h | 8 +- src/Mod/Part/Gui/DlgSettingsObjectColor.h | 8 +- src/Mod/Part/Gui/Mirroring.h | 14 +- src/Mod/Part/Gui/PropertyEnumAttacherItem.h | 6 +- src/Mod/Part/Gui/SectionCutting.h | 4 +- src/Mod/Part/Gui/ShapeFromMesh.h | 4 +- src/Mod/Part/Gui/SoBrepEdgeSet.h | 14 +- src/Mod/Part/Gui/SoBrepFaceSet.h | 16 +- src/Mod/Part/Gui/SoBrepPointSet.h | 10 +- src/Mod/Part/Gui/SoFCShapeObject.h | 8 +- src/Mod/Part/Gui/TaskAttacher.h | 16 +- src/Mod/Part/Gui/TaskCheckGeometry.h | 40 +- src/Mod/Part/Gui/TaskDimension.h | 34 +- src/Mod/Part/Gui/TaskFaceColors.cpp | 2 +- src/Mod/Part/Gui/TaskFaceColors.h | 18 +- src/Mod/Part/Gui/TaskLoft.h | 16 +- src/Mod/Part/Gui/TaskOffset.h | 16 +- src/Mod/Part/Gui/TaskShapeBuilder.cpp | 2 +- src/Mod/Part/Gui/TaskShapeBuilder.h | 18 +- src/Mod/Part/Gui/TaskSweep.cpp | 2 +- src/Mod/Part/Gui/TaskSweep.h | 16 +- src/Mod/Part/Gui/TaskThickness.cpp | 2 +- src/Mod/Part/Gui/TaskThickness.h | 16 +- src/Mod/Part/Gui/ViewProvider.h | 8 +- src/Mod/Part/Gui/ViewProvider2DObject.h | 22 +- .../Part/Gui/ViewProviderAttachExtension.h | 8 +- src/Mod/Part/Gui/ViewProviderBoolean.h | 54 +- src/Mod/Part/Gui/ViewProviderBox.h | 4 +- .../Part/Gui/ViewProviderCircleParametric.h | 4 +- src/Mod/Part/Gui/ViewProviderCompound.h | 20 +- src/Mod/Part/Gui/ViewProviderConeParametric.h | 4 +- src/Mod/Part/Gui/ViewProviderCurveNet.h | 14 +- .../Part/Gui/ViewProviderCylinderParametric.h | 4 +- .../Part/Gui/ViewProviderEllipseParametric.h | 4 +- src/Mod/Part/Gui/ViewProviderExt.h | 30 +- src/Mod/Part/Gui/ViewProviderExtrusion.h | 4 +- .../Part/Gui/ViewProviderHelixParametric.h | 12 +- src/Mod/Part/Gui/ViewProviderImport.h | 6 +- src/Mod/Part/Gui/ViewProviderLineParametric.h | 4 +- src/Mod/Part/Gui/ViewProviderMirror.h | 86 ++-- .../Part/Gui/ViewProviderPlaneParametric.h | 20 +- .../Part/Gui/ViewProviderPointParametric.h | 4 +- src/Mod/Part/Gui/ViewProviderPrimitive.h | 8 +- src/Mod/Part/Gui/ViewProviderPrism.h | 8 +- src/Mod/Part/Gui/ViewProviderPython.h | 6 +- src/Mod/Part/Gui/ViewProviderRegularPolygon.h | 4 +- src/Mod/Part/Gui/ViewProviderRuledSurface.h | 10 +- .../Part/Gui/ViewProviderSphereParametric.h | 8 +- src/Mod/Part/Gui/ViewProviderSpline.h | 12 +- .../Part/Gui/ViewProviderTorusParametric.h | 4 +- src/Mod/Part/Gui/Workbench.h | 8 +- src/Mod/PartDesign/App/AppPartDesignPy.cpp | 2 +- src/Mod/PartDesign/App/Body.h | 22 +- src/Mod/PartDesign/App/DatumCS.h | 4 +- src/Mod/PartDesign/App/DatumLine.h | 6 +- src/Mod/PartDesign/App/DatumPlane.h | 8 +- src/Mod/PartDesign/App/DatumPoint.h | 6 +- src/Mod/PartDesign/App/Feature.h | 6 +- src/Mod/PartDesign/App/FeatureAddSub.h | 6 +- src/Mod/PartDesign/App/FeatureBase.h | 12 +- src/Mod/PartDesign/App/FeatureBoolean.h | 2 +- src/Mod/PartDesign/App/FeatureChamfer.h | 2 +- src/Mod/PartDesign/App/FeatureDraft.h | 8 +- src/Mod/PartDesign/App/FeatureDressUp.h | 8 +- src/Mod/PartDesign/App/FeatureExtrude.h | 2 +- src/Mod/PartDesign/App/FeatureFillet.h | 10 +- src/Mod/PartDesign/App/FeatureGroove.h | 6 +- src/Mod/PartDesign/App/FeatureHelix.h | 10 +- src/Mod/PartDesign/App/FeatureHole.h | 10 +- src/Mod/PartDesign/App/FeatureLinearPattern.h | 8 +- src/Mod/PartDesign/App/FeatureLoft.h | 8 +- .../PartDesign/App/FeatureMultiTransform.h | 8 +- src/Mod/PartDesign/App/FeaturePad.h | 4 +- src/Mod/PartDesign/App/FeaturePipe.h | 8 +- src/Mod/PartDesign/App/FeaturePocket.h | 4 +- src/Mod/PartDesign/App/FeaturePolarPattern.h | 8 +- src/Mod/PartDesign/App/FeaturePrimitive.h | 40 +- src/Mod/PartDesign/App/FeatureRevolution.h | 6 +- src/Mod/PartDesign/App/FeatureScaled.h | 6 +- src/Mod/PartDesign/App/FeatureSketchBased.h | 14 +- src/Mod/PartDesign/App/FeatureThickness.h | 6 +- src/Mod/PartDesign/App/FeatureTransformed.h | 10 +- src/Mod/PartDesign/App/ShapeBinder.h | 30 +- src/Mod/PartDesign/Gui/AppPartDesignGui.cpp | 2 +- src/Mod/PartDesign/Gui/DlgActiveBody.h | 2 +- .../PartDesign/Gui/TaskBooleanParameters.h | 20 +- .../PartDesign/Gui/TaskChamferParameters.h | 18 +- src/Mod/PartDesign/Gui/TaskDatumParameters.h | 8 +- src/Mod/PartDesign/Gui/TaskDraftParameters.h | 16 +- .../PartDesign/Gui/TaskDressUpParameters.h | 8 +- .../PartDesign/Gui/TaskExtrudeParameters.h | 4 +- .../PartDesign/Gui/TaskFeatureParameters.h | 10 +- src/Mod/PartDesign/Gui/TaskFeaturePick.h | 24 +- src/Mod/PartDesign/Gui/TaskFilletParameters.h | 18 +- src/Mod/PartDesign/Gui/TaskHelixParameters.h | 4 +- src/Mod/PartDesign/Gui/TaskHoleParameters.h | 6 +- .../Gui/TaskLinearPatternParameters.h | 18 +- src/Mod/PartDesign/Gui/TaskLoftParameters.h | 10 +- .../PartDesign/Gui/TaskMirroredParameters.h | 20 +- .../Gui/TaskMultiTransformParameters.h | 24 +- src/Mod/PartDesign/Gui/TaskPadParameters.h | 4 +- src/Mod/PartDesign/Gui/TaskPipeParameters.h | 16 +- src/Mod/PartDesign/Gui/TaskPocketParameters.h | 4 +- .../Gui/TaskPolarPatternParameters.h | 18 +- .../PartDesign/Gui/TaskPrimitiveParameters.h | 12 +- .../PartDesign/Gui/TaskRevolutionParameters.h | 4 +- src/Mod/PartDesign/Gui/TaskScaledParameters.h | 16 +- src/Mod/PartDesign/Gui/TaskShapeBinder.h | 12 +- .../Gui/TaskSketchBasedParameters.h | 10 +- .../PartDesign/Gui/TaskThicknessParameters.h | 16 +- .../PartDesign/Gui/TaskTransformedMessages.h | 2 +- .../Gui/TaskTransformedParameters.h | 14 +- src/Mod/PartDesign/Gui/ViewProvider.h | 16 +- src/Mod/PartDesign/Gui/ViewProviderAddSub.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderBase.h | 10 +- src/Mod/PartDesign/Gui/ViewProviderBody.h | 26 +- src/Mod/PartDesign/Gui/ViewProviderBoolean.h | 10 +- src/Mod/PartDesign/Gui/ViewProviderChamfer.h | 4 +- src/Mod/PartDesign/Gui/ViewProviderDatum.h | 24 +- src/Mod/PartDesign/Gui/ViewProviderDatumCS.h | 14 +- .../PartDesign/Gui/ViewProviderDatumLine.h | 8 +- .../PartDesign/Gui/ViewProviderDatumPlane.h | 8 +- .../PartDesign/Gui/ViewProviderDatumPoint.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderDraft.h | 4 +- src/Mod/PartDesign/Gui/ViewProviderDressUp.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderFillet.h | 4 +- src/Mod/PartDesign/Gui/ViewProviderGroove.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderHelix.h | 16 +- src/Mod/PartDesign/Gui/ViewProviderHole.h | 10 +- .../Gui/ViewProviderLinearPattern.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderLoft.h | 16 +- src/Mod/PartDesign/Gui/ViewProviderMirrored.h | 2 +- .../Gui/ViewProviderMultiTransform.h | 8 +- src/Mod/PartDesign/Gui/ViewProviderPad.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderPipe.h | 16 +- src/Mod/PartDesign/Gui/ViewProviderPocket.h | 6 +- .../PartDesign/Gui/ViewProviderPolarPattern.h | 2 +- .../PartDesign/Gui/ViewProviderPrimitive.h | 14 +- .../PartDesign/Gui/ViewProviderRevolution.h | 6 +- src/Mod/PartDesign/Gui/ViewProviderScaled.h | 2 +- .../PartDesign/Gui/ViewProviderShapeBinder.h | 16 +- .../PartDesign/Gui/ViewProviderSketchBased.h | 6 +- .../PartDesign/Gui/ViewProviderThickness.h | 4 +- .../PartDesign/Gui/ViewProviderTransformed.h | 10 +- src/Mod/PartDesign/Gui/Workbench.h | 14 +- src/Mod/Path/App/AppPathPy.cpp | 4 +- src/Mod/Path/App/Area.h | 2 +- src/Mod/Path/App/FeatureArea.h | 14 +- src/Mod/Path/App/Path.cpp | 12 +- src/Mod/Path/Gui/AppPathGuiPy.cpp | 2 +- src/Mod/Path/Gui/DlgProcessorChooser.h | 4 +- src/Mod/Path/Gui/DlgSettingsPathColor.h | 8 +- src/Mod/Path/Gui/TaskDlgPathCompound.h | 4 +- src/Mod/Path/Gui/ViewProviderPath.cpp | 16 +- .../PathSimulator/App/AppPathSimulator.cpp | 2 +- src/Mod/Points/App/AppPointsPy.cpp | 2 +- src/Mod/Points/App/Points.h | 30 +- src/Mod/Points/App/PointsAlgos.cpp | 24 +- src/Mod/Points/App/PointsAlgos.h | 28 +- src/Mod/Points/App/PointsFeature.h | 16 +- src/Mod/Points/App/Properties.h | 74 +-- src/Mod/Points/App/PropertyPointKernel.h | 30 +- src/Mod/Points/App/Structured.h | 6 +- src/Mod/Points/Gui/AppPointsGui.cpp | 2 +- src/Mod/Points/Gui/DlgPointsReadImp.h | 2 +- src/Mod/Points/Gui/ViewProvider.h | 34 +- src/Mod/Points/Gui/Workbench.h | 8 +- src/Mod/Raytracing/App/AppRaytracingPy.cpp | 2 +- src/Mod/Raytracing/App/LuxFeature.h | 6 +- src/Mod/Raytracing/App/LuxProject.h | 8 +- src/Mod/Raytracing/App/RayFeature.h | 6 +- src/Mod/Raytracing/App/RayProject.h | 8 +- src/Mod/Raytracing/App/RaySegment.h | 6 +- src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp | 2 +- src/Mod/Raytracing/Gui/DlgSettingsRayImp.h | 8 +- src/Mod/Raytracing/Gui/ViewProvider.h | 20 +- src/Mod/Raytracing/Gui/Workbench.h | 6 +- .../App/AppReverseEngineering.cpp | 2 +- .../ReverseEngineering/App/ApproxSurface.h | 22 +- .../Gui/AppReverseEngineeringGui.cpp | 2 +- .../Gui/FitBSplineSurface.h | 12 +- src/Mod/ReverseEngineering/Gui/Poisson.h | 12 +- src/Mod/ReverseEngineering/Gui/Segmentation.h | 10 +- .../Gui/SegmentationManual.h | 16 +- src/Mod/ReverseEngineering/Gui/Workbench.h | 8 +- src/Mod/Robot/App/AppRobot.cpp | 2 +- src/Mod/Robot/App/Robot6Axis.h | 8 +- src/Mod/Robot/App/RobotObject.h | 16 +- src/Mod/Robot/App/kdl_cp/joint.hpp | 2 +- .../kdl_cp/rotational_interpolation_sa.hpp | 16 +- src/Mod/Robot/Gui/AppRobotGui.cpp | 2 +- src/Mod/Robot/Gui/TaskDlgEdge2Trac.h | 14 +- src/Mod/Robot/Gui/TaskDlgSimulate.h | 14 +- src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h | 14 +- src/Mod/Robot/Gui/TaskEdge2TracParameter.h | 2 +- src/Mod/Robot/Gui/TaskRobot6Axis.h | 2 +- src/Mod/Robot/Gui/TaskRobotControl.h | 2 +- src/Mod/Robot/Gui/TaskRobotMessages.h | 2 +- src/Mod/Robot/Gui/TaskTrajectory.h | 2 +- .../Gui/TaskTrajectoryDressUpParameter.h | 2 +- src/Mod/Robot/Gui/TaskWatcher.h | 4 +- src/Mod/Robot/Gui/TrajectorySimulate.h | 2 +- src/Mod/Sketcher/App/AppSketcherPy.cpp | 2 +- src/Mod/Sketcher/App/Constraint.h | 10 +- .../Sketcher/App/ExternalGeometryExtension.h | 24 +- src/Mod/Sketcher/App/ExternalGeometryFacade.h | 30 +- src/Mod/Sketcher/App/GeometryFacade.h | 20 +- src/Mod/Sketcher/App/PropertyConstraintList.h | 30 +- src/Mod/Sketcher/App/Sketch.h | 8 +- .../Sketcher/App/SketchGeometryExtension.h | 28 +- src/Mod/Sketcher/App/SketchObject.h | 26 +- src/Mod/Sketcher/App/SketchObjectSF.h | 4 +- .../Sketcher/App/SolverGeometryExtension.h | 10 +- src/Mod/Sketcher/App/planegcs/Constraints.h | 210 ++++---- src/Mod/Sketcher/App/planegcs/Geo.h | 100 ++-- src/Mod/Sketcher/Gui/AppSketcherGui.cpp | 2 +- src/Mod/Sketcher/Gui/Command.cpp | 2 +- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 190 +++---- .../Sketcher/Gui/CommandSketcherBSpline.cpp | 2 +- src/Mod/Sketcher/Gui/CommandSketcherTools.cpp | 50 +- .../Gui/ConstraintMultiFilterDialog.h | 2 +- .../Sketcher/Gui/ConstraintSettingsDialog.h | 6 +- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 16 +- .../Gui/DrawSketchHandlerArcOfEllipse.h | 8 +- .../Gui/DrawSketchHandlerArcOfHyperbola.h | 8 +- .../Gui/DrawSketchHandlerArcOfParabola.h | 8 +- .../Sketcher/Gui/DrawSketchHandlerBSpline.h | 12 +- .../Gui/DrawSketchHandlerCarbonCopy.h | 14 +- .../Sketcher/Gui/DrawSketchHandlerCircle.h | 16 +- .../Sketcher/Gui/DrawSketchHandlerEllipse.h | 10 +- .../Sketcher/Gui/DrawSketchHandlerExtend.h | 10 +- .../Sketcher/Gui/DrawSketchHandlerExternal.h | 14 +- .../Sketcher/Gui/DrawSketchHandlerFillet.h | 8 +- src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 8 +- .../Sketcher/Gui/DrawSketchHandlerLineSet.h | 12 +- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 8 +- .../Sketcher/Gui/DrawSketchHandlerPolygon.h | 8 +- .../Sketcher/Gui/DrawSketchHandlerRectangle.h | 16 +- src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h | 8 +- .../Sketcher/Gui/DrawSketchHandlerSplitting.h | 10 +- .../Sketcher/Gui/DrawSketchHandlerTrimming.h | 10 +- src/Mod/Sketcher/Gui/EditDatumDialog.h | 2 +- src/Mod/Sketcher/Gui/EditModeCoinManager.h | 2 +- .../Sketcher/Gui/PropertyConstraintListItem.h | 20 +- src/Mod/Sketcher/Gui/ShortcutListener.h | 4 +- src/Mod/Sketcher/Gui/SketchMirrorDialog.h | 4 +- .../Sketcher/Gui/SketchOrientationDialog.h | 4 +- .../Gui/SketchRectangularArrayDialog.h | 4 +- .../Gui/SketcherRegularPolygonDialog.h | 4 +- src/Mod/Sketcher/Gui/SketcherSettings.h | 24 +- src/Mod/Sketcher/Gui/SoDatumLabel.h | 10 +- src/Mod/Sketcher/Gui/SoZoomTranslation.h | 16 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.h | 14 +- .../Sketcher/Gui/TaskSketcherConstraints.cpp | 8 +- .../Sketcher/Gui/TaskSketcherConstraints.h | 10 +- .../Sketcher/Gui/TaskSketcherCreateCommands.h | 6 +- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 2 +- src/Mod/Sketcher/Gui/TaskSketcherElements.h | 14 +- src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 10 +- src/Mod/Sketcher/Gui/TaskSketcherMessages.h | 2 +- .../Sketcher/Gui/TaskSketcherSolverAdvanced.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherValidation.h | 8 +- src/Mod/Sketcher/Gui/ViewProviderPython.h | 6 +- src/Mod/Sketcher/Gui/ViewProviderSketch.h | 36 +- .../Gui/ViewProviderSketchGeometryExtension.h | 8 +- src/Mod/Sketcher/Gui/Workbench.h | 8 +- src/Mod/Spreadsheet/App/AppSpreadsheet.cpp | 2 +- .../Spreadsheet/App/PropertyColumnWidths.h | 10 +- src/Mod/Spreadsheet/App/PropertyRowHeights.h | 10 +- src/Mod/Spreadsheet/App/PropertySheet.h | 50 +- src/Mod/Spreadsheet/App/Sheet.h | 30 +- src/Mod/Spreadsheet/App/SheetObserver.h | 8 +- src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp | 2 +- src/Mod/Spreadsheet/Gui/DlgBindSheet.h | 4 +- src/Mod/Spreadsheet/Gui/DlgSettingsImp.h | 8 +- src/Mod/Spreadsheet/Gui/DlgSheetConf.h | 4 +- src/Mod/Spreadsheet/Gui/LineEdit.h | 4 +- src/Mod/Spreadsheet/Gui/PropertiesDialog.h | 2 +- src/Mod/Spreadsheet/Gui/SheetModel.h | 14 +- src/Mod/Spreadsheet/Gui/SheetTableView.h | 20 +- src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h | 10 +- src/Mod/Spreadsheet/Gui/SpreadsheetView.h | 26 +- .../Spreadsheet/Gui/ViewProviderSpreadsheet.h | 14 +- src/Mod/Spreadsheet/Gui/Workbench.h | 10 +- src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 36 +- src/Mod/Spreadsheet/Gui/qtcolorpicker.h | 4 +- src/Mod/Start/App/AppStart.cpp | 2 +- src/Mod/Start/Gui/AppStartGui.cpp | 2 +- src/Mod/Start/Gui/DlgStartPreferencesImp.h | 8 +- src/Mod/Start/Gui/Workbench.h | 14 +- src/Mod/Surface/App/AppSurface.cpp | 2 +- src/Mod/Surface/App/FeatureCut.h | 4 +- src/Mod/Surface/App/FeatureExtend.h | 6 +- src/Mod/Surface/App/FeatureFilling.h | 6 +- src/Mod/Surface/App/FeatureGeomFillSurface.h | 8 +- src/Mod/Surface/App/FeatureSections.h | 2 +- src/Mod/Surface/App/FeatureSewing.h | 4 +- src/Mod/Surface/Gui/AppSurfaceGui.cpp | 2 +- src/Mod/Surface/Gui/TaskFilling.cpp | 4 +- src/Mod/Surface/Gui/TaskFilling.h | 32 +- src/Mod/Surface/Gui/TaskFillingEdge.cpp | 4 +- src/Mod/Surface/Gui/TaskFillingEdge.h | 12 +- src/Mod/Surface/Gui/TaskFillingVertex.cpp | 4 +- src/Mod/Surface/Gui/TaskFillingVertex.h | 12 +- src/Mod/Surface/Gui/TaskGeomFillSurface.cpp | 2 +- src/Mod/Surface/Gui/TaskGeomFillSurface.h | 30 +- src/Mod/Surface/Gui/TaskSections.cpp | 4 +- src/Mod/Surface/Gui/TaskSections.h | 30 +- src/Mod/Surface/Gui/ViewProviderExtend.h | 2 +- src/Mod/Surface/Gui/Workbench.h | 6 +- src/Mod/TechDraw/App/AppTechDrawPy.cpp | 4 +- src/Mod/TechDraw/App/Cosmetic.h | 48 +- src/Mod/TechDraw/App/CosmeticExtension.h | 4 +- src/Mod/TechDraw/App/DrawHatch.h | 16 +- src/Mod/TechDraw/App/DrawLeaderLine.h | 14 +- src/Mod/TechDraw/App/DrawPage.h | 12 +- src/Mod/TechDraw/App/DrawProjGroup.h | 12 +- src/Mod/TechDraw/App/DrawProjGroupItem.h | 34 +- src/Mod/TechDraw/App/DrawRichAnno.h | 14 +- src/Mod/TechDraw/App/DrawTile.h | 14 +- src/Mod/TechDraw/App/DrawTileWeld.h | 16 +- src/Mod/TechDraw/App/DrawView.h | 16 +- src/Mod/TechDraw/App/DrawViewAnnotation.h | 12 +- src/Mod/TechDraw/App/DrawViewArch.h | 8 +- src/Mod/TechDraw/App/DrawViewBalloon.h | 10 +- src/Mod/TechDraw/App/DrawViewClip.h | 14 +- src/Mod/TechDraw/App/DrawViewCollection.h | 16 +- src/Mod/TechDraw/App/DrawViewDetail.h | 14 +- src/Mod/TechDraw/App/DrawViewDimExtent.h | 16 +- src/Mod/TechDraw/App/DrawViewDimension.h | 18 +- src/Mod/TechDraw/App/DrawViewDraft.h | 8 +- src/Mod/TechDraw/App/DrawViewImage.h | 2 +- src/Mod/TechDraw/App/DrawViewMulti.h | 10 +- src/Mod/TechDraw/App/DrawViewPart.h | 18 +- src/Mod/TechDraw/App/DrawViewSection.h | 18 +- src/Mod/TechDraw/App/DrawViewSpreadsheet.h | 10 +- src/Mod/TechDraw/App/DrawViewSymbol.h | 14 +- src/Mod/TechDraw/App/DrawWeldSymbol.h | 16 +- src/Mod/TechDraw/App/Geometry.h | 32 +- src/Mod/TechDraw/App/LandmarkDimension.h | 22 +- src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp | 4 +- .../Gui/DlgPrefsTechDrawAdvancedImp.h | 8 +- .../Gui/DlgPrefsTechDrawAnnotationImp.h | 8 +- .../TechDraw/Gui/DlgPrefsTechDrawColorsImp.h | 8 +- .../Gui/DlgPrefsTechDrawDimensionsImp.h | 8 +- .../TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h | 8 +- src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h | 8 +- .../TechDraw/Gui/DlgPrefsTechDrawScaleImp.h | 8 +- src/Mod/TechDraw/Gui/DlgTemplateField.h | 8 +- src/Mod/TechDraw/Gui/MDIViewPage.h | 30 +- src/Mod/TechDraw/Gui/QGCustomClip.h | 8 +- src/Mod/TechDraw/Gui/QGCustomImage.h | 4 +- src/Mod/TechDraw/Gui/QGIFace.h | 10 +- src/Mod/TechDraw/Gui/QGILeaderLine.h | 26 +- src/Mod/TechDraw/Gui/QGIMatting.h | 8 +- src/Mod/TechDraw/Gui/QGIProjGroup.h | 18 +- src/Mod/TechDraw/Gui/QGIView.h | 6 +- src/Mod/TechDraw/Gui/QGIViewAnnotation.h | 10 +- src/Mod/TechDraw/Gui/QGIViewBalloon.h | 40 +- src/Mod/TechDraw/Gui/QGIViewClip.h | 8 +- src/Mod/TechDraw/Gui/QGIViewCollection.h | 8 +- src/Mod/TechDraw/Gui/QGIViewDimension.h | 40 +- src/Mod/TechDraw/Gui/QGIViewImage.h | 8 +- src/Mod/TechDraw/Gui/QGIViewPart.h | 14 +- src/Mod/TechDraw/Gui/QGIViewSection.h | 6 +- src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h | 2 +- src/Mod/TechDraw/Gui/QGIViewSymbol.h | 8 +- src/Mod/TechDraw/Gui/QGIWeldSymbol.h | 20 +- src/Mod/TechDraw/Gui/QGSPage.h | 2 +- src/Mod/TechDraw/Gui/QGTracker.h | 24 +- src/Mod/TechDraw/Gui/QGVNavStyle.h | 2 +- src/Mod/TechDraw/Gui/QGVNavStyleBlender.h | 12 +- src/Mod/TechDraw/Gui/QGVNavStyleCAD.h | 12 +- src/Mod/TechDraw/Gui/QGVNavStyleGesture.h | 10 +- src/Mod/TechDraw/Gui/QGVNavStyleInventor.h | 8 +- src/Mod/TechDraw/Gui/QGVNavStyleMaya.h | 12 +- src/Mod/TechDraw/Gui/QGVNavStyleOCC.h | 12 +- src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h | 12 +- src/Mod/TechDraw/Gui/QGVNavStyleRevit.h | 10 +- src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h | 8 +- src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h | 10 +- src/Mod/TechDraw/Gui/QGVPage.h | 2 +- src/Mod/TechDraw/Gui/TaskActiveView.h | 16 +- src/Mod/TechDraw/Gui/TaskBalloon.h | 16 +- src/Mod/TechDraw/Gui/TaskCenterLine.h | 20 +- src/Mod/TechDraw/Gui/TaskCosVertex.h | 20 +- src/Mod/TechDraw/Gui/TaskCosmeticLine.h | 18 +- src/Mod/TechDraw/Gui/TaskCustomizeFormat.h | 18 +- src/Mod/TechDraw/Gui/TaskDetail.h | 20 +- src/Mod/TechDraw/Gui/TaskDimension.h | 16 +- src/Mod/TechDraw/Gui/TaskGeomHatch.h | 18 +- src/Mod/TechDraw/Gui/TaskHatch.h | 18 +- src/Mod/TechDraw/Gui/TaskLeaderLine.h | 20 +- src/Mod/TechDraw/Gui/TaskLineDecor.h | 22 +- src/Mod/TechDraw/Gui/TaskLinkDim.h | 18 +- src/Mod/TechDraw/Gui/TaskProjGroup.h | 22 +- src/Mod/TechDraw/Gui/TaskProjection.h | 14 +- src/Mod/TechDraw/Gui/TaskRichAnno.h | 20 +- src/Mod/TechDraw/Gui/TaskSectionView.h | 20 +- .../TechDraw/Gui/TaskSelectLineAttributes.h | 18 +- .../TechDraw/Gui/TaskSurfaceFinishSymbols.h | 18 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.h | 16 +- src/Mod/TechDraw/Gui/ViewProviderAnnotation.h | 8 +- src/Mod/TechDraw/Gui/ViewProviderBalloon.h | 20 +- src/Mod/TechDraw/Gui/ViewProviderDimension.h | 22 +- .../TechDraw/Gui/ViewProviderDrawingView.h | 22 +- src/Mod/TechDraw/Gui/ViewProviderHatch.h | 14 +- src/Mod/TechDraw/Gui/ViewProviderImage.h | 10 +- src/Mod/TechDraw/Gui/ViewProviderLeader.h | 22 +- src/Mod/TechDraw/Gui/ViewProviderPage.h | 32 +- src/Mod/TechDraw/Gui/ViewProviderProjGroup.h | 20 +- .../TechDraw/Gui/ViewProviderProjGroupItem.h | 22 +- src/Mod/TechDraw/Gui/ViewProviderRichAnno.h | 18 +- .../TechDraw/Gui/ViewProviderSpreadsheet.h | 6 +- src/Mod/TechDraw/Gui/ViewProviderSymbol.h | 12 +- src/Mod/TechDraw/Gui/ViewProviderTile.h | 6 +- src/Mod/TechDraw/Gui/ViewProviderViewClip.h | 14 +- src/Mod/TechDraw/Gui/ViewProviderViewPart.h | 22 +- .../TechDraw/Gui/ViewProviderViewSection.h | 14 +- src/Mod/TechDraw/Gui/ViewProviderWeld.h | 18 +- src/Mod/Test/Gui/AppTestGui.cpp | 8 +- src/Mod/Test/Gui/UnitTestImp.h | 4 +- src/Mod/Test/Gui/UnitTestPy.h | 8 +- src/Mod/Web/App/AppWeb.cpp | 2 +- src/Mod/Web/App/Server.h | 10 +- src/Mod/Web/Gui/AppWebGui.cpp | 2 +- src/Mod/Web/Gui/BrowserView.cpp | 8 +- src/Mod/Web/Gui/BrowserView.h | 24 +- src/Mod/Web/Gui/CookieJar.h | 4 +- src/Mod/Web/Gui/Workbench.h | 12 +- 697 files changed, 4956 insertions(+), 4956 deletions(-) diff --git a/src/Mod/Draft/App/AppDraftUtilsPy.cpp b/src/Mod/Draft/App/AppDraftUtilsPy.cpp index e22b58aa21..aa81190e31 100644 --- a/src/Mod/Draft/App/AppDraftUtilsPy.cpp +++ b/src/Mod/Draft/App/AppDraftUtilsPy.cpp @@ -46,7 +46,7 @@ public: initialize("The DraftUtils module contains utility functions for the Draft module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object readDXF(const Py::Tuple& /*args*/) diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp index 241a63d2f9..937d99fb30 100644 --- a/src/Mod/Fem/App/AppFemPy.cpp +++ b/src/Mod/Fem/App/AppFemPy.cpp @@ -75,10 +75,10 @@ public: initialize("This module is the Fem module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h index d4461f5c32..87a0a97bd8 100644 --- a/src/Mod/Fem/App/FemAnalysis.h +++ b/src/Mod/Fem/App/FemAnalysis.h @@ -58,7 +58,7 @@ public: * unique id because PropertyUUID doesn't initialize itself. */ FemAnalysis(); - virtual ~FemAnalysis(); + ~FemAnalysis() override; /** * A unique identifier for each Analysis object. Useful when doing @@ -68,7 +68,7 @@ public: */ App::PropertyUUID Uid; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemAnalysis"; } @@ -82,8 +82,8 @@ protected: * property of DocumentObjectGroup. This methods translates old files * still using the "Member" property. */ - virtual void handleChangedPropertyName( - Base::XMLReader &reader, const char * TypeName, const char *PropName); + void handleChangedPropertyName( + Base::XMLReader &reader, const char * TypeName, const char *PropName) override; }; class FemExport DocumentObject : public App::DocumentObject diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h index bcbc58444b..7531ee3dec 100644 --- a/src/Mod/Fem/App/FemConstraint.h +++ b/src/Mod/Fem/App/FemConstraint.h @@ -61,7 +61,7 @@ class FemExport Constraint : public App::DocumentObject { public: Constraint(); - virtual ~Constraint(); + ~Constraint() override; /** * @brief List of objects the constraints applies to. @@ -113,7 +113,7 @@ public: * cleared right after the @ref execute call by the recompute mechanism. * See Document::recompute() and DocumentObject::purgeTouched(). */ - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /** * @brief Calculates scale factor based on length of edge. @@ -154,7 +154,7 @@ public: */ int calcDrawScaleFactor() const; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraint"; } @@ -163,7 +163,7 @@ protected: /** * @brief Updates NormalDirection if References change. */ - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; /** * @brief Triggers @ref onChanged to update View Provider. @@ -172,7 +172,7 @@ protected: * This should not be necessary and is properly a bug in the View Provider * of FemConstraint. */ - virtual void onDocumentRestored(); + void onDocumentRestored() override; /** * @brief Returns data based on References relevant for rendering widgets. diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h index 0cfcc9241f..2a3bf71d8e 100644 --- a/src/Mod/Fem/App/FemConstraintBearing.h +++ b/src/Mod/Fem/App/FemConstraintBearing.h @@ -55,15 +55,15 @@ public: App::PropertyVector Axis; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintBearing"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } //namespace Fem diff --git a/src/Mod/Fem/App/FemConstraintContact.h b/src/Mod/Fem/App/FemConstraintContact.h index 59415cd7ad..fb6a775345 100644 --- a/src/Mod/Fem/App/FemConstraintContact.h +++ b/src/Mod/Fem/App/FemConstraintContact.h @@ -57,13 +57,13 @@ public: /* */ /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.h b/src/Mod/Fem/App/FemConstraintDisplacement.h index 2c147137dd..ec9b147e13 100644 --- a/src/Mod/Fem/App/FemConstraintDisplacement.h +++ b/src/Mod/Fem/App/FemConstraintDisplacement.h @@ -66,13 +66,13 @@ public: //App::PropertyBool element; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h index 2e397dd7f7..48bcd3308d 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.h +++ b/src/Mod/Fem/App/FemConstraintFixed.h @@ -46,15 +46,15 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintFixed"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } //namespace Fem diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.h b/src/Mod/Fem/App/FemConstraintFluidBoundary.h index 563706ab1b..50946ef3a3 100644 --- a/src/Mod/Fem/App/FemConstraintFluidBoundary.h +++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.h @@ -64,15 +64,15 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintFluidBoundary"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: Base::Vector3d naturalDirectionVector; diff --git a/src/Mod/Fem/App/FemConstraintForce.h b/src/Mod/Fem/App/FemConstraintForce.h index ea3d9959b5..bf4ce385c0 100644 --- a/src/Mod/Fem/App/FemConstraintForce.h +++ b/src/Mod/Fem/App/FemConstraintForce.h @@ -50,15 +50,15 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintForce"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: Base::Vector3d naturalDirectionVector; diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h index 32ab618d7a..684f87f20d 100644 --- a/src/Mod/Fem/App/FemConstraintGear.h +++ b/src/Mod/Fem/App/FemConstraintGear.h @@ -51,15 +51,15 @@ public: App::PropertyVector DirectionVector; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintGear"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: Base::Vector3d naturalDirectionVector; diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.h b/src/Mod/Fem/App/FemConstraintHeatflux.h index a2c4567405..ff8bce1032 100644 --- a/src/Mod/Fem/App/FemConstraintHeatflux.h +++ b/src/Mod/Fem/App/FemConstraintHeatflux.h @@ -48,13 +48,13 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.h b/src/Mod/Fem/App/FemConstraintInitialTemperature.h index 13dbdaaef6..c0a43c4c82 100644 --- a/src/Mod/Fem/App/FemConstraintInitialTemperature.h +++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.h @@ -49,13 +49,13 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.h b/src/Mod/Fem/App/FemConstraintPlaneRotation.h index fc244cd196..7e9fffb422 100644 --- a/src/Mod/Fem/App/FemConstraintPlaneRotation.h +++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.h @@ -44,13 +44,13 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintPressure.h b/src/Mod/Fem/App/FemConstraintPressure.h index 97175afcc8..3fbd271def 100644 --- a/src/Mod/Fem/App/FemConstraintPressure.h +++ b/src/Mod/Fem/App/FemConstraintPressure.h @@ -42,13 +42,13 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h index deb962ec39..d9a6c4e914 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.h +++ b/src/Mod/Fem/App/FemConstraintPulley.h @@ -55,15 +55,15 @@ public: App::PropertyFloat BeltForce2; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemConstraintPulley"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintSpring.h b/src/Mod/Fem/App/FemConstraintSpring.h index 550a90fe65..80433316ec 100644 --- a/src/Mod/Fem/App/FemConstraintSpring.h +++ b/src/Mod/Fem/App/FemConstraintSpring.h @@ -42,13 +42,13 @@ public: App::PropertyVectorList Normals; /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } diff --git a/src/Mod/Fem/App/FemConstraintTemperature.h b/src/Mod/Fem/App/FemConstraintTemperature.h index 6ed3f54a86..d443451cf6 100644 --- a/src/Mod/Fem/App/FemConstraintTemperature.h +++ b/src/Mod/Fem/App/FemConstraintTemperature.h @@ -51,13 +51,13 @@ public: /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemConstraintTransform.h b/src/Mod/Fem/App/FemConstraintTransform.h index b44aff7a6f..e0a8814133 100644 --- a/src/Mod/Fem/App/FemConstraintTransform.h +++ b/src/Mod/Fem/App/FemConstraintTransform.h @@ -52,13 +52,13 @@ public: /* */ /// recalculate the object - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const; + const char* getViewProviderName() const override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 6761f001b9..9c6058ea5a 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1169,7 +1169,7 @@ protected: typedef std::shared_ptr NastranElementPtr; class GRIDElement : public NastranElement { - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddNodeWithID(node.x, node.y, node.z, element_id); } @@ -1178,7 +1178,7 @@ protected: }; class GRIDFreeFieldElement : public GRIDElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { char_separator sep(","); tokenizer > tokens(str, sep); std::vector token_results; @@ -1194,7 +1194,7 @@ class GRIDFreeFieldElement : public GRIDElement { }; class GRIDLongFieldElement : public GRIDElement { - void read(const std::string& str1, const std::string& str2) { + void read(const std::string& str1, const std::string& str2) override { element_id = atoi(str1.substr(8,24).c_str()); node.x = atof(str1.substr(40,56).c_str()); node.y = atof(str1.substr(56,72).c_str()); @@ -1203,13 +1203,13 @@ class GRIDLongFieldElement : public GRIDElement { }; class GRIDSmallFieldElement : public GRIDElement { - void read(const std::string&, const std::string&) { + void read(const std::string&, const std::string&) override { } }; class CTRIA3Element : public NastranElement { public: - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { const SMDS_MeshNode* n0 = meshds->FindNode(elements[0]); const SMDS_MeshNode* n1 = meshds->FindNode(elements[1]); const SMDS_MeshNode* n2 = meshds->FindNode(elements[2]); @@ -1232,7 +1232,7 @@ public: class CTRIA3FreeFieldElement : public CTRIA3Element { public: - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { char_separator sep(","); tokenizer > tokens(str, sep); std::vector token_results; @@ -1249,7 +1249,7 @@ public: class CTRIA3LongFieldElement : public CTRIA3Element { public: - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24,32).c_str())); elements.push_back(atoi(str.substr(32,40).c_str())); @@ -1259,13 +1259,13 @@ public: class CTRIA3SmallFieldElement : public CTRIA3Element { public: - void read(const std::string&, const std::string&) { + void read(const std::string&, const std::string&) override { } }; class CTETRAElement : public NastranElement { public: - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { const SMDS_MeshNode* n0 = meshds->FindNode(elements[1]); const SMDS_MeshNode* n1 = meshds->FindNode(elements[0]); const SMDS_MeshNode* n2 = meshds->FindNode(elements[2]); @@ -1302,7 +1302,7 @@ public: class CTETRAFreeFieldElement : public CTETRAElement { public: - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { char_separator sep(","); tokenizer > tokens(str, sep); std::vector token_results; @@ -1326,7 +1326,7 @@ public: class CTETRALongFieldElement : public CTETRAElement { public: - void read(const std::string& str1, const std::string& str2) { + void read(const std::string& str1, const std::string& str2) override { int id = atoi(str1.substr(8,16).c_str()); int offset = 0; @@ -1355,14 +1355,14 @@ public: class CTETRASmallFieldElement : public CTETRAElement { public: - void read(const std::string&, const std::string&) { + void read(const std::string&, const std::string&) override { } }; // NASTRAN-95 class GRIDNastran95Element : public GRIDElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8, 16).c_str()); node.x = atof(str.substr(24, 32).c_str()); node.y = atof(str.substr(32, 40).c_str()); @@ -1371,12 +1371,12 @@ class GRIDNastran95Element : public GRIDElement { }; class CBARElement : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24,32).c_str())); elements.push_back(atoi(str.substr(32,40).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddEdgeWithID( elements[0], elements[1], @@ -1386,13 +1386,13 @@ class CBARElement : public NastranElement { }; class CTRMEMElement : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24,32).c_str())); elements.push_back(atoi(str.substr(32,40).c_str())); elements.push_back(atoi(str.substr(40,48).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddFaceWithID( elements[0], elements[1], @@ -1403,13 +1403,13 @@ class CTRMEMElement : public NastranElement { }; class CTRIA1Element : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24, 32).c_str())); elements.push_back(atoi(str.substr(32, 40).c_str())); elements.push_back(atoi(str.substr(40, 48).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddFaceWithID( elements[0], elements[1], @@ -1420,14 +1420,14 @@ class CTRIA1Element : public NastranElement { }; class CQUAD1Element : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24, 32).c_str())); elements.push_back(atoi(str.substr(32, 40).c_str())); elements.push_back(atoi(str.substr(40, 48).c_str())); elements.push_back(atoi(str.substr(48, 56).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddFaceWithID( elements[0], elements[1], @@ -1439,14 +1439,14 @@ class CQUAD1Element : public NastranElement { }; class CTETRANastran95Element : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24, 32).c_str())); elements.push_back(atoi(str.substr(32, 40).c_str())); elements.push_back(atoi(str.substr(40, 48).c_str())); elements.push_back(atoi(str.substr(48, 56).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddFaceWithID( elements[0], elements[1], @@ -1458,7 +1458,7 @@ class CTETRANastran95Element : public NastranElement { }; class CWEDGEElement : public NastranElement { - void read(const std::string& str, const std::string&) { + void read(const std::string& str, const std::string&) override { element_id = atoi(str.substr(8,16).c_str()); elements.push_back(atoi(str.substr(24,32).c_str())); elements.push_back(atoi(str.substr(32,40).c_str())); @@ -1467,7 +1467,7 @@ class CWEDGEElement : public NastranElement { elements.push_back(atoi(str.substr(56,64).c_str())); elements.push_back(atoi(str.substr(64,72).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddVolumeWithID( elements[0], elements[1], @@ -1481,7 +1481,7 @@ class CWEDGEElement : public NastranElement { }; class CHEXA1Element : public NastranElement { - void read(const std::string& str1, const std::string& str2) { + void read(const std::string& str1, const std::string& str2) override { element_id = atoi(str1.substr(8,16).c_str()); elements.push_back(atoi(str1.substr(24,32).c_str())); elements.push_back(atoi(str1.substr(32,40).c_str())); @@ -1493,7 +1493,7 @@ class CHEXA1Element : public NastranElement { elements.push_back(atoi(str2.substr(8,16).c_str())); elements.push_back(atoi(str2.substr(16,24).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddVolumeWithID( elements[0], elements[1], @@ -1509,7 +1509,7 @@ class CHEXA1Element : public NastranElement { }; class CHEXA2Element : public NastranElement { - void read(const std::string& str1, const std::string& str2) { + void read(const std::string& str1, const std::string& str2) override { element_id = atoi(str1.substr(8,16).c_str()); elements.push_back(atoi(str1.substr(24,32).c_str())); elements.push_back(atoi(str1.substr(32,40).c_str())); @@ -1521,7 +1521,7 @@ class CHEXA2Element : public NastranElement { elements.push_back(atoi(str2.substr(8,16).c_str())); elements.push_back(atoi(str2.substr(16,24).c_str())); } - void addToMesh(SMESHDS_Mesh* meshds) { + void addToMesh(SMESHDS_Mesh* meshds) override { meshds->AddVolumeWithID( elements[0], elements[1], diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index b6f3387c90..1278b91a23 100644 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -56,7 +56,7 @@ class FemExport FemMesh : public Data::ComplexGeoData public: FemMesh(); FemMesh(const FemMesh&); - ~FemMesh(); + ~FemMesh() override; FemMesh &operator=(const FemMesh&); const SMESH_Mesh* getSMesh() const; @@ -67,11 +67,11 @@ public: void compute(); // from base class - virtual unsigned int getMemSize () const; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + unsigned int getMemSize () const override; + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; /** @name Subelement management */ //@{ @@ -79,10 +79,10 @@ public: * List of different subelement types * it is NOT a list of the subelements itself */ - virtual std::vector getElementTypes() const; - virtual unsigned long countSubElements(const char* Type) const; + std::vector getElementTypes() const override; + unsigned long countSubElements(const char* Type) const override; /// get the subelement by type and number - virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; + Data::Segment* getSubElement(const char* Type, unsigned long) const override; //@} /** @name search and retrieval */ @@ -116,11 +116,11 @@ public: /** @name Placement control */ //@{ /// set the transformation - void setTransform(const Base::Matrix4D& rclTrf); + void setTransform(const Base::Matrix4D& rclTrf) override; /// get the transformation - Base::Matrix4D getTransform() const; + Base::Matrix4D getTransform() const override; /// Bound box from the shape - Base::BoundBox3d getBoundBox()const; + Base::BoundBox3d getBoundBox()const override; /// get the volume (when there are volume elements) Base::Quantity getVolume()const; //@} @@ -128,7 +128,7 @@ public: /** @name Modification */ //@{ /// Applies a transformation on the real geometric data type - void transformGeometry(const Base::Matrix4D &rclMat); + void transformGeometry(const Base::Matrix4D &rclMat) override; //@} /** @name Group management */ diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h index aa2eef5cb6..0badd20d95 100644 --- a/src/Mod/Fem/App/FemMeshObject.h +++ b/src/Mod/Fem/App/FemMeshObject.h @@ -40,23 +40,23 @@ class FemExport FemMeshObject : public App::GeoFeature public: /// Constructor FemMeshObject(); - virtual ~FemMeshObject(); + ~FemMeshObject() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemMesh"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; PropertyFemMesh FemMesh; protected: /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; }; typedef App::FeaturePythonT FemMeshObjectPython; diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h index 57cc500d19..e4c9faea8f 100644 --- a/src/Mod/Fem/App/FemMeshProperty.h +++ b/src/Mod/Fem/App/FemMeshProperty.h @@ -41,7 +41,7 @@ class FemExport PropertyFemMesh : public App::PropertyComplexGeoData public: PropertyFemMesh(); - ~PropertyFemMesh(); + ~PropertyFemMesh() override; /** @name Getter/setter */ //@{ @@ -52,38 +52,38 @@ public: void setValue(){} /// get the FemMesh shape const FemMesh &getValue() const; - const Data::ComplexGeoData* getComplexData() const; + const Data::ComplexGeoData* getComplexData() const override; //@} /** @name Getting basic geometric entities */ //@{ /** Returns the bounding box around the underlying mesh kernel */ - Base::BoundBox3d getBoundingBox() const; + Base::BoundBox3d getBoundingBox() const override; /// Set the placement of the geometry - void setTransform(const Base::Matrix4D& rclTrf); + void setTransform(const Base::Matrix4D& rclTrf) override; /// Get the placement of the geometry - Base::Matrix4D getTransform() const; - void transformGeometry(const Base::Matrix4D &rclMat); + Base::Matrix4D getTransform() const override; + void transformGeometry(const Base::Matrix4D &rclMat) override; //@} /** @name Python interface */ //@{ - PyObject* getPyObject(); - void setPyObject(PyObject *value); + PyObject* getPyObject() override; + void setPyObject(PyObject *value) override; //@} /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - App::Property *Copy() const; - void Paste(const App::Property &from); - unsigned int getMemSize () const; - const char* getEditorName() const { return "FemGui::PropertyFemMeshItem"; } + App::Property *Copy() const override; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; + const char* getEditorName() const override { return "FemGui::PropertyFemMeshItem"; } //@} private: diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h index fcfbe32b33..7bc6d3a6b6 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h @@ -36,7 +36,7 @@ class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject public: /// Constructor FemMeshShapeNetgenObject(); - virtual ~FemMeshShapeNetgenObject(); + ~FemMeshShapeNetgenObject() override; App::PropertyFloat MaxSize; App::PropertyBool SecondOrder; @@ -47,10 +47,10 @@ public: App::PropertyBool Optimize; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemMeshShapeNetgen"; } - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //virtual short mustExecute(void) const; //virtual PyObject *getPyObject(void); diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h index 99db629481..3aed3f0a66 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.h +++ b/src/Mod/Fem/App/FemMeshShapeObject.h @@ -37,13 +37,13 @@ class FemExport FemMeshShapeObject : public FemMeshObject public: /// Constructor FemMeshShapeObject(); - virtual ~FemMeshShapeObject(); + ~FemMeshShapeObject() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemMeshShape"; } - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //virtual short mustExecute(void) const; //virtual PyObject *getPyObject(void); diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h index c0686e6cfb..96d970ce07 100644 --- a/src/Mod/Fem/App/FemPostFilter.h +++ b/src/Mod/Fem/App/FemPostFilter.h @@ -47,11 +47,11 @@ class FemExport FemPostFilter : public Fem::FemPostObject public: /// Constructor FemPostFilter(); - virtual ~FemPostFilter(); + ~FemPostFilter() override; App::PropertyLink Input; - virtual App::DocumentObjectExecReturn* execute(); + App::DocumentObjectExecReturn* execute() override; protected: vtkDataObject* getInputData(); @@ -78,20 +78,20 @@ class FemExport FemPostClipFilter : public FemPostFilter { public: FemPostClipFilter(); - virtual ~FemPostClipFilter(); + ~FemPostClipFilter() override; App::PropertyLink Function; App::PropertyBool InsideOut; App::PropertyBool CutCells; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostClip"; } - virtual short int mustExecute() const; - virtual App::DocumentObjectExecReturn* execute(); + short int mustExecute() const override; + App::DocumentObjectExecReturn* execute() override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: vtkSmartPointer m_clipper; @@ -104,7 +104,7 @@ class FemExport FemPostDataAlongLineFilter : public FemPostFilter { public: FemPostDataAlongLineFilter(); - virtual ~FemPostDataAlongLineFilter(); + ~FemPostDataAlongLineFilter() override; App::PropertyVectorDistance Point1; App::PropertyVectorDistance Point2; @@ -113,16 +113,16 @@ public: App::PropertyFloatList YAxisData; App::PropertyString PlotData; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostDataAlongLine"; } - virtual short int mustExecute() const; + short int mustExecute() const override; void GetAxisData(); protected: - virtual App::DocumentObjectExecReturn* execute(); - virtual void onChanged(const App::Property* prop); - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property* prop) override; + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; private: @@ -137,7 +137,7 @@ class FemExport FemPostDataAtPointFilter : public FemPostFilter { public: FemPostDataAtPointFilter(); - virtual ~FemPostDataAtPointFilter(); + ~FemPostDataAtPointFilter() override; App::PropertyVectorDistance Center; App::PropertyDistance Radius; @@ -145,14 +145,14 @@ public: App::PropertyFloatList PointData; App::PropertyString Unit; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostDataAtPoint"; } - virtual short int mustExecute() const; + short int mustExecute() const override; protected: - virtual App::DocumentObjectExecReturn* execute(); - virtual void onChanged(const App::Property* prop); + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property* prop) override; void GetPointData(); private: @@ -168,20 +168,20 @@ class FemExport FemPostScalarClipFilter : public FemPostFilter { public: FemPostScalarClipFilter(); - virtual ~FemPostScalarClipFilter(); + ~FemPostScalarClipFilter() override; App::PropertyBool InsideOut; App::PropertyFloatConstraint Value; App::PropertyEnumeration Scalars; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostScalarClip"; } - virtual short int mustExecute() const; + short int mustExecute() const override; protected: - virtual App::DocumentObjectExecReturn* execute(); - virtual void onChanged(const App::Property* prop); + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property* prop) override; void setConstraintForField(); private: @@ -196,19 +196,19 @@ class FemExport FemPostWarpVectorFilter : public FemPostFilter { public: FemPostWarpVectorFilter(); - virtual ~FemPostWarpVectorFilter(); + ~FemPostWarpVectorFilter() override; App::PropertyFloat Factor; App::PropertyEnumeration Vector; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostWarpVector"; } - virtual short int mustExecute() const; + short int mustExecute() const override; protected: - virtual App::DocumentObjectExecReturn* execute(); - virtual void onChanged(const App::Property* prop); + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property* prop) override; private: vtkSmartPointer m_warp; @@ -221,18 +221,18 @@ class FemExport FemPostCutFilter : public FemPostFilter { public: FemPostCutFilter(); - virtual ~FemPostCutFilter(); + ~FemPostCutFilter() override; App::PropertyLink Function; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostCut"; } - virtual short int mustExecute() const; - virtual App::DocumentObjectExecReturn* execute(); + short int mustExecute() const override; + App::DocumentObjectExecReturn* execute() override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: vtkSmartPointer m_cutter; diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h index 461de671d3..41d16d3927 100644 --- a/src/Mod/Fem/App/FemPostFunction.h +++ b/src/Mod/Fem/App/FemPostFunction.h @@ -44,13 +44,13 @@ class FemExport FemPostFunction : public App::DocumentObject public: /// Constructor FemPostFunction(); - virtual ~FemPostFunction(); + ~FemPostFunction() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostFunction"; } - virtual App::DocumentObjectExecReturn* execute(); + App::DocumentObjectExecReturn* execute() override; //bound box handling void setBoundingBox(vtkBoundingBox b) {m_boundingBox = b;}; @@ -69,16 +69,16 @@ class FemExport FemPostFunctionProvider : public App::DocumentObject { public: FemPostFunctionProvider(); - virtual ~FemPostFunctionProvider(); + ~FemPostFunctionProvider() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostFunctionProvider"; } App::PropertyLinkList Functions; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; @@ -91,19 +91,19 @@ class FemExport FemPostPlaneFunction : public FemPostFunction public: FemPostPlaneFunction(); - virtual ~FemPostPlaneFunction(); + ~FemPostPlaneFunction() override; App::PropertyVector Normal; App::PropertyVectorDistance Origin; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostPlaneFunction"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; /// get called after a document has been fully restored - virtual void onDocumentRestored(); + void onDocumentRestored() override; vtkSmartPointer m_plane; }; @@ -117,17 +117,17 @@ class FemExport FemPostSphereFunction : public FemPostFunction public: FemPostSphereFunction(); - virtual ~FemPostSphereFunction(); + ~FemPostSphereFunction() override; App::PropertyDistance Radius; App::PropertyVectorDistance Center; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostSphereFunction"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; vtkSmartPointer m_sphere; }; diff --git a/src/Mod/Fem/App/FemPostObject.h b/src/Mod/Fem/App/FemPostObject.h index edbacf7479..895af13da6 100644 --- a/src/Mod/Fem/App/FemPostObject.h +++ b/src/Mod/Fem/App/FemPostObject.h @@ -40,7 +40,7 @@ class FemExport FemPostObject : public App::GeoFeature public: /// Constructor FemPostObject(); - virtual ~FemPostObject(); + ~FemPostObject() override; Fem::PropertyPostDataObject Data; diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h index 388242ee9a..5d0529a54c 100644 --- a/src/Mod/Fem/App/FemPostPipeline.h +++ b/src/Mod/Fem/App/FemPostPipeline.h @@ -41,17 +41,17 @@ class FemExport FemPostPipeline : public Fem::FemPostFilter public: /// Constructor FemPostPipeline(); - virtual ~FemPostPipeline(); + ~FemPostPipeline() override; App::PropertyLinkList Filter; App::PropertyLink Functions; App::PropertyEnumeration Mode; - short mustExecute() const; - virtual App::DocumentObjectExecReturn* execute(); - PyObject* getPyObject(); + short mustExecute() const override; + App::DocumentObjectExecReturn* execute() override; + PyObject* getPyObject() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderFemPostPipeline"; } @@ -69,7 +69,7 @@ public: bool holdsPostObject(FemPostObject *obj); protected: - virtual void onChanged(const App::Property *prop); + void onChanged(const App::Property *prop) override; private: static const char* ModeEnums[]; diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index eefe455b20..769cda780d 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -39,7 +39,7 @@ class FemExport FemResultObject : public App::DocumentObject public: /// Constructor FemResultObject(); - virtual ~FemResultObject(); + ~FemResultObject() override; App::PropertyIntegerList NodeNumbers; /// Link to the corresponding mesh @@ -51,14 +51,14 @@ public: /// Displacement vectors of analysis /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderResult"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; typedef App::FeaturePythonT FemResultObjectPython; diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h index 62a260314b..2cc968e756 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.h +++ b/src/Mod/Fem/App/FemSetElementsObject.h @@ -37,17 +37,17 @@ class FemExport FemSetElementsObject : public FemSetObject public: /// Constructor FemSetElementsObject(); - virtual ~FemSetElementsObject(); + ~FemSetElementsObject() override; // returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderSetElements"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h index af4f9b64df..e2bc4a7c12 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.h +++ b/src/Mod/Fem/App/FemSetFacesObject.h @@ -37,17 +37,17 @@ class FemExport FemSetFacesObject : public FemSetObject public: /// Constructor FemSetFacesObject(); - virtual ~FemSetFacesObject(); + ~FemSetFacesObject() override; // returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderSetFaces"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; } //namespace Fem diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h index 762a6018c2..03f2d871e0 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.h +++ b/src/Mod/Fem/App/FemSetGeometryObject.h @@ -37,17 +37,17 @@ class FemExport FemSetGeometryObject : public FemSetObject public: /// Constructor FemSetGeometryObject(); - virtual ~FemSetGeometryObject(); + ~FemSetGeometryObject() override; // returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderSetGeometry"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h index 57bdc2ef4b..aeb8fee888 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.h +++ b/src/Mod/Fem/App/FemSetNodesObject.h @@ -38,19 +38,19 @@ class FemExport FemSetNodesObject : public FemSetObject public: /// Constructor FemSetNodesObject(); - virtual ~FemSetNodesObject(); + ~FemSetNodesObject() override; App::PropertyIntegerSet Nodes; // returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderSetNodes"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h index c1d0c75bc4..cd54e166e0 100644 --- a/src/Mod/Fem/App/FemSetObject.h +++ b/src/Mod/Fem/App/FemSetObject.h @@ -38,7 +38,7 @@ class FemExport FemSetObject : public App::DocumentObject public: /// Constructor FemSetObject(); - virtual ~FemSetObject(); + ~FemSetObject() override; App::PropertyLink FemMesh; @@ -46,11 +46,11 @@ public: //virtual const char* getViewProviderName(void) const { // return "FemGui::ViewProviderFemSet"; //} - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h index dfd58135e3..d858ec73be 100644 --- a/src/Mod/Fem/App/FemSolverObject.h +++ b/src/Mod/Fem/App/FemSolverObject.h @@ -38,19 +38,19 @@ class FemExport FemSolverObject : public App::DocumentObject public: /// Constructor FemSolverObject(); - virtual ~FemSolverObject(); + ~FemSolverObject() override; // Attributes are implemented in the FemSolverObjectPython /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "FemGui::ViewProviderSolver"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; }; diff --git a/src/Mod/Fem/App/HypothesisPy.h b/src/Mod/Fem/App/HypothesisPy.h index e66d01cc14..34044de5f2 100755 --- a/src/Mod/Fem/App/HypothesisPy.h +++ b/src/Mod/Fem/App/HypothesisPy.h @@ -37,7 +37,7 @@ class HypothesisPy : public Py::PythonExtension public: typedef Py::PythonExtension HypothesisPyBase; HypothesisPy(std::shared_ptr); - virtual ~HypothesisPy(); + ~HypothesisPy() override; std::shared_ptr getHypothesis() const { return hyp; } @@ -55,10 +55,10 @@ public: static void init_type(PyObject*); // announce properties and methods SMESH_HypothesisPy(SMESH_Hypothesis*); - virtual ~SMESH_HypothesisPy(); + ~SMESH_HypothesisPy() override; - Py::Object getattr(const char *name); - Py::Object repr(); + Py::Object getattr(const char *name) override; + Py::Object repr() override; Py::Object getLibName(const Py::Tuple& args); Py::Object setLibName(const Py::Tuple& args); #if SMESH_VERSION_MAJOR < 7 @@ -387,7 +387,7 @@ class StdMeshers_Arithmetic1DPy : public SMESH_HypothesisPy @@ -418,7 +418,7 @@ class StdMeshers_MaxLengthPy : public SMESH_HypothesisPy public: static void init_type(PyObject*); StdMeshers_MaxLengthPy(int hypId, int studyId, SMESH_Gen* gen); - ~StdMeshers_MaxLengthPy(); + ~StdMeshers_MaxLengthPy() override; Py::Object setLength(const Py::Tuple& args); Py::Object getLength(const Py::Tuple& args); @@ -434,7 +434,7 @@ class StdMeshers_LocalLengthPy : public SMESH_HypothesisPy @@ -466,7 +466,7 @@ class StdMeshers_Quadrangle_2DPy : public SMESH_HypothesisPy @@ -474,7 +474,7 @@ class StdMeshers_Regular_1DPy : public SMESH_HypothesisPy @@ -482,7 +482,7 @@ class StdMeshers_UseExisting_1DPy : public SMESH_HypothesisPy @@ -490,7 +490,7 @@ class StdMeshers_UseExisting_2DPy : public SMESH_HypothesisPy @@ -498,7 +498,7 @@ class StdMeshers_CompositeSegment_1DPy : public SMESH_HypothesisPy @@ -506,7 +506,7 @@ class StdMeshers_Deflection1DPy : public SMESH_HypothesisPy public: static void init_type(PyObject*); StdMeshers_Hexa_3DPy(int hypId, int studyId, SMESH_Gen* gen); - ~StdMeshers_Hexa_3DPy(); + ~StdMeshers_Hexa_3DPy() override; }; #if SMESH_VERSION_MAJOR < 7 // ----------------------------------------------- class StdMeshers_TrianglePreferencePy : public SMESH_HypothesisPy @@ -533,7 +533,7 @@ class StdMeshers_StartEndLengthPy : public SMESH_HypothesisPy @@ -561,7 +561,7 @@ class StdMeshers_RadialPrism_3DPy : public SMESH_HypothesisPy @@ -569,7 +569,7 @@ class StdMeshers_QuadraticMeshPy : public SMESH_HypothesisPy @@ -577,7 +577,7 @@ class StdMeshers_ProjectionSource3DPy : public SMESH_HypothesisPy @@ -641,7 +641,7 @@ class StdMeshers_Projection_2DPy : public SMESH_HypothesisPy @@ -649,7 +649,7 @@ class StdMeshers_Projection_1DPy : public SMESH_HypothesisPy @@ -657,7 +657,7 @@ class StdMeshers_Prism_3DPy : public SMESH_HypothesisPy public: static void init_type(PyObject*); StdMeshers_Prism_3DPy(int hypId, int studyId, SMESH_Gen* gen); - ~StdMeshers_Prism_3DPy(); + ~StdMeshers_Prism_3DPy() override; }; class StdMeshers_NumberOfSegmentsPy : public SMESH_HypothesisPy @@ -665,7 +665,7 @@ class StdMeshers_NumberOfSegmentsPy : public SMESH_HypothesisPy @@ -693,7 +693,7 @@ class StdMeshers_MaxElementVolumePy : public SMESH_HypothesisPy & paths) const; + void getPaths(std::vector & paths) const override; private: static void scaleDataObject(vtkDataObject*, double s); diff --git a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h index 2387b1563f..86d0824fa8 100644 --- a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h +++ b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h @@ -48,10 +48,10 @@ public: private: ActiveAnalysisObserver(); - ~ActiveAnalysisObserver(); + ~ActiveAnalysisObserver() override; - void slotDeletedDocument(const App::Document& Doc); - void slotDeletedObject(const App::DocumentObject& Obj); + void slotDeletedDocument(const App::Document& Doc) override; + void slotDeletedObject(const App::DocumentObject& Obj) override; private: static ActiveAnalysisObserver* inst; diff --git a/src/Mod/Fem/Gui/AppFemGuiPy.cpp b/src/Mod/Fem/Gui/AppFemGuiPy.cpp index bed5bebb03..2f0601f7ff 100755 --- a/src/Mod/Fem/Gui/AppFemGuiPy.cpp +++ b/src/Mod/Fem/Gui/AppFemGuiPy.cpp @@ -58,10 +58,10 @@ public: initialize("This module is the FemGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void* method_def, const Py::Tuple& args) + Py::Object invoke_method_varargs(void* method_def, const Py::Tuple& args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h index 4b5d012f30..59f6c98480 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h @@ -38,15 +38,15 @@ class DlgSettingsFemCcxImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemCcxImp( QWidget* parent = nullptr ); - ~DlgSettingsFemCcxImp(); + ~DlgSettingsFemCcxImp() override; protected Q_SLOTS: void onfileNameChanged(QString FileName); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h index 68ec6a043a..b7e8a963bc 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h @@ -37,7 +37,7 @@ class DlgSettingsFemElmerImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemElmerImp( QWidget* parent = nullptr ); - ~DlgSettingsFemElmerImp(); + ~DlgSettingsFemElmerImp() override; protected Q_SLOTS: void onfileNameChanged(QString FileName); @@ -45,9 +45,9 @@ protected Q_SLOTS: void onCoresValueChanged(int cores); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h index 3b8f2a971f..3935af137d 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h @@ -37,12 +37,12 @@ class DlgSettingsFemExportAbaqusImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemExportAbaqusImp( QWidget* parent = nullptr ); - ~DlgSettingsFemExportAbaqusImp(); + ~DlgSettingsFemExportAbaqusImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: Ui_DlgSettingsFemExportAbaqus* ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h index c0fdb0b3cd..71d3ea9eaf 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h @@ -37,12 +37,12 @@ class DlgSettingsFemGeneralImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemGeneralImp( QWidget* parent = nullptr ); - ~DlgSettingsFemGeneralImp(); + ~DlgSettingsFemGeneralImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h index 9144e3015d..5747c1c459 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h @@ -37,15 +37,15 @@ class DlgSettingsFemGmshImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemGmshImp( QWidget* parent = nullptr ); - ~DlgSettingsFemGmshImp(); + ~DlgSettingsFemGmshImp() override; protected Q_SLOTS: void onfileNameChanged(QString FileName); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h index 7dd612966f..12d9f38648 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h @@ -37,12 +37,12 @@ class DlgSettingsFemInOutVtkImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemInOutVtkImp( QWidget* parent = nullptr ); - ~DlgSettingsFemInOutVtkImp(); + ~DlgSettingsFemInOutVtkImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: Ui_DlgSettingsFemInOutVtk* ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h index 39e78a9484..8f440a7458 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h @@ -38,12 +38,12 @@ class DlgSettingsFemMaterialImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemMaterialImp( QWidget* parent = nullptr ); - ~DlgSettingsFemMaterialImp(); + ~DlgSettingsFemMaterialImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h index 605d240054..7ddb0580c1 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h @@ -38,15 +38,15 @@ class DlgSettingsFemMystranImp : public Gui::Dialog::PreferencePage public: DlgSettingsFemMystranImp( QWidget* parent = nullptr ); - ~DlgSettingsFemMystranImp(); + ~DlgSettingsFemMystranImp() override; protected Q_SLOTS: void onfileNameChanged(QString FileName); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h index a520492bb8..12e959e8d5 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h @@ -38,15 +38,15 @@ class DlgSettingsFemZ88Imp : public Gui::Dialog::PreferencePage public: DlgSettingsFemZ88Imp( QWidget* parent = nullptr ); - ~DlgSettingsFemZ88Imp(); + ~DlgSettingsFemZ88Imp() override; protected Q_SLOTS: void onfileNameChanged(QString FileName); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Fem/Gui/FemSelectionGate.h b/src/Mod/Fem/Gui/FemSelectionGate.h index 238a4aab30..4f74719283 100644 --- a/src/Mod/Fem/Gui/FemSelectionGate.h +++ b/src/Mod/Fem/Gui/FemSelectionGate.h @@ -45,7 +45,7 @@ class FemSelectionGate : public Gui::SelectionFilterGate ElemType Type; /// get called by the frame-work - bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName); + bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/PropertyFemMeshItem.h b/src/Mod/Fem/Gui/PropertyFemMeshItem.h index 3131317b31..2609c634bf 100644 --- a/src/Mod/Fem/Gui/PropertyFemMeshItem.h +++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.h @@ -43,9 +43,9 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem Q_PROPERTY(int Groups READ countGroups CONSTANT) PROPERTYITEM_HEADER - virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; - virtual void setEditorData(QWidget *editor, const QVariant& data) const; - virtual QVariant editorData(QWidget *editor) const; + QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override; + void setEditorData(QWidget *editor, const QVariant& data) const override; + QVariant editorData(QWidget *editor) const override; int countNodes() const; int countEdges() const; @@ -56,13 +56,13 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem int countGroups() const; protected: - virtual QVariant toolTip(const App::Property*) const; - virtual QVariant value(const App::Property*) const; - virtual void setValue(const QVariant&); + QVariant toolTip(const App::Property*) const override; + QVariant value(const App::Property*) const override; + void setValue(const QVariant&) override; protected: PropertyFemMeshItem(); - void initialize(); + void initialize() override; private: Gui::PropertyEditor::PropertyIntegerItem* m_n; diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.h b/src/Mod/Fem/Gui/TaskAnalysisInfo.h index 24f30e9f83..9381008fd9 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.h +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.h @@ -57,7 +57,7 @@ class TaskAnalysisInfo : public Gui::TaskView::TaskBox public: TaskAnalysisInfo(Fem::FemAnalysis *pcObject,QWidget *parent = nullptr); - ~TaskAnalysisInfo(); + ~TaskAnalysisInfo() override; private Q_SLOTS: void SwitchMethod(int Value); diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.h b/src/Mod/Fem/Gui/TaskCreateNodeSet.h index d3f87159e7..a893126825 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.h @@ -53,7 +53,7 @@ class TaskCreateNodeSet : public Gui::TaskView::TaskBox, public Gui::SelectionOb public: TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *parent = nullptr); - ~TaskCreateNodeSet(); + ~TaskCreateNodeSet() override; std::set tempSet; ViewProviderFemMesh * MeshViewProvider; @@ -69,7 +69,7 @@ protected: void DefineNodes(const Base::Polygon2d &polygon,const Gui::ViewVolumeProjection &proj,bool); protected: - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; enum selectionModes { none, PickElement} selectionMode; private: diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.h b/src/Mod/Fem/Gui/TaskDlgAnalysis.h index 6ed0da18cf..4c6e58c09d 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.h +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.h @@ -42,20 +42,20 @@ class TaskDlgAnalysis : public Gui::TaskView::TaskDialog public: TaskDlgAnalysis(Fem::FemAnalysis *); - ~TaskDlgAnalysis(); + ~TaskDlgAnalysis() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { 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 33b928a505..cc2b0ebfd5 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h @@ -44,20 +44,20 @@ class TaskDlgCreateNodeSet : public Gui::TaskView::TaskDialog public: TaskDlgCreateNodeSet(Fem::FemSetNodesObject *); - ~TaskDlgCreateNodeSet(); + ~TaskDlgCreateNodeSet() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h index 04f0f38d52..aef9694630 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h @@ -43,22 +43,22 @@ class TaskDlgMeshShapeNetgen : public Gui::TaskView::TaskDialog public: TaskDlgMeshShapeNetgen(FemGui::ViewProviderFemMeshShapeNetgen *); - ~TaskDlgMeshShapeNetgen(); + ~TaskDlgMeshShapeNetgen() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or rject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; } protected: diff --git a/src/Mod/Fem/Gui/TaskDriver.h b/src/Mod/Fem/Gui/TaskDriver.h index 46c3eae1f1..bddab2197d 100644 --- a/src/Mod/Fem/Gui/TaskDriver.h +++ b/src/Mod/Fem/Gui/TaskDriver.h @@ -55,7 +55,7 @@ class TaskDriver : public Gui::TaskView::TaskBox public: TaskDriver(Fem::FemAnalysis *pcObject,QWidget *parent = nullptr); - ~TaskDriver(); + ~TaskDriver() override; private Q_SLOTS: diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.h b/src/Mod/Fem/Gui/TaskFemConstraint.h index 9589770736..ff1019769b 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.h +++ b/src/Mod/Fem/Gui/TaskFemConstraint.h @@ -45,7 +45,7 @@ class TaskFemConstraint : public Gui::TaskView::TaskBox, public Gui::SelectionOb public: TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr,const char* pixmapname = ""); - virtual ~TaskFemConstraint() {} + ~TaskFemConstraint() override {} virtual const std::string getReferences() const {return std::string();} const std::string getReferences(const std::vector& items) const; @@ -60,13 +60,13 @@ protected Q_SLOTS: void onButtonWizCancel(); protected: - virtual void changeEvent(QEvent *e) { TaskBox::changeEvent(e); } + void changeEvent(QEvent *e) override { TaskBox::changeEvent(e); } const QString makeRefText(const std::string& objName, const std::string& subName) const; const QString makeRefText(const App::DocumentObject* obj, const std::string& subName) const; - virtual void keyPressEvent(QKeyEvent * ke); + void keyPressEvent(QKeyEvent * ke) override; void createDeleteAction(QListWidget* parentList); bool KeyEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges&) {} + void onSelectionChanged(const Gui::SelectionChanges&) override {} protected: QWidget* proxy; @@ -89,20 +89,20 @@ class TaskDlgFemConstraint : public Gui::TaskView::TaskDialog public: /// is called the TaskView when the dialog is opened - void open(); + void open() override; /* /// is called by the framework if an button is clicked which has no accept or reject role virtual void clicked(int) {} /// is called by the framework if the dialog is accepted (Ok) */ - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); - virtual bool isAllowedAlterDocument() const + bool reject() override; + bool isAllowedAlterDocument() const override { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } ViewProviderFemConstraint* getConstraintView() const diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h index 534fd64e37..047cccb3c8 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.h @@ -49,10 +49,10 @@ class TaskFemConstraintBearing : public TaskFemConstraint public: TaskFemConstraintBearing(ViewProviderFemConstraint *ConstraintView, QWidget *parent = nullptr, const char* pixmapname = "FEM_ConstraintBearing"); - virtual ~TaskFemConstraintBearing(); + ~TaskFemConstraintBearing() override; double getDistance() const; - virtual const std::string getReferences() const; + const std::string getReferences() const override; const std::string getLocationName() const; const std::string getLocationObject() const; bool getAxial() const; @@ -64,9 +64,9 @@ private Q_SLOTS: void onCheckAxial(bool); protected: - bool event(QEvent *e); - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; protected: Ui_TaskFemConstraintBearing* ui; @@ -83,7 +83,7 @@ public: TaskDlgFemConstraintBearing(ViewProviderFemConstraintBearing *ConstraintView); /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.h b/src/Mod/Fem/Gui/TaskFemConstraintContact.h index b471022c1f..ccdfbae266 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.h @@ -41,8 +41,8 @@ class TaskFemConstraintContact : public TaskFemConstraint public: TaskFemConstraintContact(ViewProviderFemConstraintContact *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintContact(); - const std::string getReferences() const; + ~TaskFemConstraintContact() override; + const std::string getReferences() const override; double get_Slope()const; double get_Friction()const; @@ -55,7 +55,7 @@ private Q_SLOTS: void removeFromSelectionMaster(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: //void onSelectionChanged(const Gui::SelectionChanges& msg); @@ -70,9 +70,9 @@ class TaskDlgFemConstraintContact : public TaskDlgFemConstraint public: TaskDlgFemConstraintContact(ViewProviderFemConstraintContact *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h index 8789046bfe..7719b6bb86 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h @@ -50,8 +50,8 @@ class TaskFemConstraintDisplacement : public TaskFemConstraintOnBoundary public: TaskFemConstraintDisplacement(ViewProviderFemConstraintDisplacement *ConstraintView, QWidget *parent = nullptr); - ~TaskFemConstraintDisplacement(); - const std::string getReferences() const; + ~TaskFemConstraintDisplacement() override; + const std::string getReferences() const override; double get_spinxDisplacement()const; double get_spinyDisplacement()const; double get_spinzDisplacement()const; @@ -92,12 +92,12 @@ private Q_SLOTS: void rotfixz(int); void rotfreez(int); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -112,9 +112,9 @@ class TaskDlgFemConstraintDisplacement : public TaskDlgFemConstraint public: TaskDlgFemConstraintDisplacement(ViewProviderFemConstraintDisplacement *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h index db95624cb4..4ab0783c42 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.h @@ -39,17 +39,17 @@ class TaskFemConstraintFixed : public TaskFemConstraintOnBoundary public: TaskFemConstraintFixed(ViewProviderFemConstraintFixed *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintFixed(); - const std::string getReferences() const; + ~TaskFemConstraintFixed() override; + const std::string getReferences() const override; private Q_SLOTS: void onReferenceDeleted(); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -64,9 +64,9 @@ class TaskDlgFemConstraintFixed : public TaskDlgFemConstraint public: TaskDlgFemConstraintFixed(ViewProviderFemConstraintFixed *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h index 315db94e45..34fe7fdc87 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h @@ -50,7 +50,7 @@ class TaskFemConstraintFluidBoundary : public TaskFemConstraintOnBoundary public: TaskFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView,QWidget *parent = nullptr); - virtual ~TaskFemConstraintFluidBoundary(); + ~TaskFemConstraintFluidBoundary() override; const Fem::FemSolverObject* getFemSolver() const; @@ -69,7 +69,7 @@ public: double getHeatFluxValue() const; double getHTCoeffValue() const; - const std::string getReferences() const; + const std::string getReferences() const override; const std::string getDirectionName() const; const std::string getDirectionObject() const; bool getReverse() const; @@ -83,12 +83,12 @@ private Q_SLOTS: void onReferenceDeleted(); void onButtonDirection(const bool pressed = true); void onCheckReverse(bool); // consider removing this slot as the UI is hidden - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - virtual void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -115,9 +115,9 @@ public: TaskDlgFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView); /// is called by the framework if the dialog is accepted (Ok) - virtual void open(); - virtual bool accept(); - virtual bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.h b/src/Mod/Fem/Gui/TaskFemConstraintForce.h index 217ebf6f6b..2fcede17e6 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintForce.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.h @@ -49,9 +49,9 @@ class TaskFemConstraintForce : public TaskFemConstraintOnBoundary public: TaskFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView,QWidget *parent = nullptr); - virtual ~TaskFemConstraintForce(); + ~TaskFemConstraintForce() override; double getForce() const; - const std::string getReferences() const; + const std::string getReferences() const override; const std::string getDirectionName() const; const std::string getDirectionObject() const; bool getReverse() const; @@ -61,12 +61,12 @@ private Q_SLOTS: void onForceChanged(double); void onButtonDirection(const bool pressed = false); void onCheckReverse(bool); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - virtual void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -86,9 +86,9 @@ public: TaskDlgFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView); /// is called by the framework if the dialog is accepted (Ok) - virtual void open(); - virtual bool accept(); - virtual bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintGear.h b/src/Mod/Fem/Gui/TaskFemConstraintGear.h index 7839efbfea..2784a73bfb 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintGear.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintGear.h @@ -52,8 +52,8 @@ private Q_SLOTS: void onCheckReversed(bool); protected: - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; }; /// simulation dialog for the TaskView @@ -66,7 +66,7 @@ public: TaskDlgFemConstraintGear(ViewProviderFemConstraintGear *ConstraintView); /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h index f8b3010276..f1d522f491 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h @@ -41,12 +41,12 @@ class TaskFemConstraintHeatflux : public TaskFemConstraintOnBoundary public: TaskFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView,QWidget *parent = nullptr); - virtual ~TaskFemConstraintHeatflux(); + ~TaskFemConstraintHeatflux() override; double getAmbientTemp() const; /*double getFaceTemp(void) const;*/ double getFilmCoef() const; std::string get_constraint_type() const; - virtual const std::string getReferences() const; + const std::string getReferences() const override; private Q_SLOTS: void onReferenceDeleted(); @@ -56,12 +56,12 @@ private Q_SLOTS: void onHeatFluxChanged(double val); void Conv(); void Flux(); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - virtual void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -75,9 +75,9 @@ class TaskDlgFemConstraintHeatflux : public TaskDlgFemConstraint public: TaskDlgFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView); - virtual void open(); - virtual bool accept(); - virtual bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h index 48be1de492..8522dd332d 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h @@ -41,11 +41,11 @@ class TaskFemConstraintInitialTemperature : public TaskFemConstraint public: TaskFemConstraintInitialTemperature(ViewProviderFemConstraintInitialTemperature *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintInitialTemperature(); + ~TaskFemConstraintInitialTemperature() override; double get_temperature()const; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: //void onSelectionChanged(const Gui::SelectionChanges& msg); @@ -60,9 +60,9 @@ class TaskDlgFemConstraintInitialTemperature : public TaskDlgFemConstraint public: TaskDlgFemConstraintInitialTemperature(ViewProviderFemConstraintInitialTemperature *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h index 882f7934b7..10e59b50e8 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h @@ -49,7 +49,7 @@ class TaskFemConstraintOnBoundary : public TaskFemConstraint public: TaskFemConstraintOnBoundary(ViewProviderFemConstraint *ConstraintView, QWidget *parent = nullptr, const char* pixmapname = ""); - ~TaskFemConstraintOnBoundary(); + ~TaskFemConstraintOnBoundary() override; protected Q_SLOTS: void onButtonToggled(QAbstractButton *button, bool checked); @@ -58,7 +58,7 @@ protected Q_SLOTS: protected: enum class SelectionChangeModes {none, refAdd, refRemove}; - virtual void onSelectionChanged(const Gui::SelectionChanges&) override; + void onSelectionChanged(const Gui::SelectionChanges&) override; virtual void clearButtons(const SelectionChangeModes notThis) = 0; protected: diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h index dc5cf39fac..733025e056 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h @@ -41,8 +41,8 @@ class TaskFemConstraintPlaneRotation : public TaskFemConstraint public: TaskFemConstraintPlaneRotation(ViewProviderFemConstraintPlaneRotation *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintPlaneRotation(); - const std::string getReferences() const; + ~TaskFemConstraintPlaneRotation() override; + const std::string getReferences() const override; private Q_SLOTS: void onReferenceDeleted(); @@ -50,8 +50,8 @@ private Q_SLOTS: void removeFromSelection(); protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; private: void updateUI(); @@ -65,9 +65,9 @@ class TaskDlgFemConstraintPlaneRotation : public TaskDlgFemConstraint public: TaskDlgFemConstraintPlaneRotation(ViewProviderFemConstraintPlaneRotation *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h index 6a183b0fee..35bc5ebd11 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.h @@ -41,20 +41,20 @@ class TaskFemConstraintPressure : public TaskFemConstraintOnBoundary public: TaskFemConstraintPressure(ViewProviderFemConstraintPressure *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintPressure(); - const std::string getReferences() const; + ~TaskFemConstraintPressure() override; + const std::string getReferences() const override; double get_Pressure()const; bool get_Reverse()const; private Q_SLOTS: void onReferenceDeleted(); void onCheckReverse(bool); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -69,9 +69,9 @@ class TaskDlgFemConstraintPressure : public TaskDlgFemConstraint public: TaskDlgFemConstraintPressure(ViewProviderFemConstraintPressure *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h index c1a0b4d631..d99cb7b01e 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPulley.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintPulley.h @@ -49,7 +49,7 @@ private Q_SLOTS: void onCheckIsDriven(bool); protected: - virtual void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; }; /// simulation dialog for the TaskView @@ -61,8 +61,8 @@ public: TaskDlgFemConstraintPulley(ViewProviderFemConstraintPulley *ConstraintView); /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); - void open(); + bool accept() override; + void open() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h index 2df80ca804..7d2dfa2dd3 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.h @@ -39,19 +39,19 @@ class TaskFemConstraintSpring : public TaskFemConstraintOnBoundary public: TaskFemConstraintSpring(ViewProviderFemConstraintSpring *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintSpring(); - const std::string getReferences() const; + ~TaskFemConstraintSpring() override; + const std::string getReferences() const override; double get_normalStiffness()const; double get_tangentialStiffness()const; private Q_SLOTS: void onReferenceDeleted(); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -66,9 +66,9 @@ class TaskDlgFemConstraintSpring : public TaskDlgFemConstraint public: TaskDlgFemConstraintSpring(ViewProviderFemConstraintSpring *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h index a86fd7fc19..9d1659db30 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.h @@ -44,8 +44,8 @@ class TaskFemConstraintTemperature : public TaskFemConstraintOnBoundary public: TaskFemConstraintTemperature(ViewProviderFemConstraintTemperature *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintTemperature(); - const std::string getReferences() const; + ~TaskFemConstraintTemperature() override; + const std::string getReferences() const override; double get_temperature()const; double get_cflux() const; std::string get_constraint_type() const; @@ -55,12 +55,12 @@ private Q_SLOTS: void onTempCfluxChanged(double val); void Temp(); void Flux(); - void addToSelection(); - void removeFromSelection(); + void addToSelection() override; + void removeFromSelection() override; protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; void clearButtons(const SelectionChangeModes notThis) override; private: @@ -75,9 +75,9 @@ class TaskDlgFemConstraintTemperature : public TaskDlgFemConstraint public: TaskDlgFemConstraintTemperature(ViewProviderFemConstraintTemperature *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h index 54bb7eb617..d0f1d2e874 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h @@ -42,8 +42,8 @@ class TaskFemConstraintTransform : public TaskFemConstraint public: TaskFemConstraintTransform(ViewProviderFemConstraintTransform *ConstraintView,QWidget *parent = nullptr); - ~TaskFemConstraintTransform(); - const std::string getReferences() const; + ~TaskFemConstraintTransform() override; + const std::string getReferences() const override; double get_X_rot()const; double get_Y_rot()const; double get_Z_rot()const; @@ -61,8 +61,8 @@ private Q_SLOTS: void z_Changed(int z); protected: - bool event(QEvent *e); - void changeEvent(QEvent *e); + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; const QString makeText(const App::DocumentObject* obj) const; private: @@ -76,9 +76,9 @@ class TaskDlgFemConstraintTransform : public TaskDlgFemConstraint public: TaskDlgFemConstraintTransform(ViewProviderFemConstraintTransform *ConstraintView); - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/TaskObjectName.h b/src/Mod/Fem/Gui/TaskObjectName.h index e5a1c6850f..d9ed16fc86 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.h +++ b/src/Mod/Fem/Gui/TaskObjectName.h @@ -49,7 +49,7 @@ class TaskObjectName : public Gui::TaskView::TaskBox public: TaskObjectName(App::DocumentObject *pcObject,QWidget *parent = nullptr); - ~TaskObjectName(); + ~TaskObjectName() override; std::string name; diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h index f8e441b2cd..04cc2dd7b2 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.h +++ b/src/Mod/Fem/Gui/TaskPostBoxes.h @@ -60,7 +60,7 @@ class PointMarker : public QObject public: PointMarker(Gui::View3DInventorViewer* view, std::string ObjName); - ~PointMarker(); + ~PointMarker() override; void addPoint(const SbVec3f&); int countPoints() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void PointsChanged(double x1, double y1, double z1, double x2, double y2, double z2); protected: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; private: Gui::View3DInventorViewer *view; @@ -85,7 +85,7 @@ class FemGuiExport ViewProviderPointMarker : public Gui::ViewProviderDocumentObj public: ViewProviderPointMarker(); - virtual ~ViewProviderPointMarker(); + ~ViewProviderPointMarker() override; protected: SoCoordinate3 * pCoords; @@ -100,7 +100,7 @@ class DataMarker : public QObject public: DataMarker(Gui::View3DInventorViewer* view, std::string ObjName); - ~DataMarker(); + ~DataMarker() override; void addPoint(const SbVec3f&); int countPoints() const; @@ -109,7 +109,7 @@ Q_SIGNALS: void PointsChanged(double x, double y, double z); protected: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; private: Gui::View3DInventorViewer *view; @@ -125,7 +125,7 @@ class FemGuiExport ViewProviderDataMarker : public Gui::ViewProviderDocumentObje public: ViewProviderDataMarker(); - virtual ~ViewProviderDataMarker(); + ~ViewProviderDataMarker() override; protected: SoCoordinate3 * pCoords; @@ -139,7 +139,7 @@ class TaskPostBox : public Gui::TaskView::TaskBox { public: TaskPostBox(Gui::ViewProviderDocumentObject* view, const QPixmap &icon, const QString &title, QWidget *parent = nullptr); - ~TaskPostBox(); + ~TaskPostBox() override; virtual void applyPythonCode() = 0; virtual bool isGuiTaskOnly() {return false;} //return true if only gui properties are manipulated @@ -180,7 +180,7 @@ class TaskDlgPost : public Gui::TaskView::TaskDialog public: TaskDlgPost(Gui::ViewProviderDocumentObject *view); - ~TaskDlgPost(); + ~TaskDlgPost() override; void connectSlots(); void appendBox(TaskPostBox* box); @@ -190,20 +190,20 @@ public: public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return false; } - virtual void modifyStandardButtons(QDialogButtonBox*); + void modifyStandardButtons(QDialogButtonBox*) override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const; + QDialogButtonBox::StandardButtons getStandardButtons() const override; protected: void recompute(); @@ -220,10 +220,10 @@ class TaskPostDisplay : public TaskPostBox public: TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget *parent = nullptr); - ~TaskPostDisplay(); + ~TaskPostDisplay() override; - virtual void applyPythonCode(); - virtual bool isGuiTaskOnly() {return true;} + void applyPythonCode() override; + bool isGuiTaskOnly() override {return true;} private Q_SLOTS: void on_Representation_activated(int i); @@ -244,9 +244,9 @@ class TaskPostFunction : public TaskPostBox { public: TaskPostFunction(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr); - virtual ~TaskPostFunction(); + ~TaskPostFunction() override; - virtual void applyPythonCode(); + void applyPythonCode() override; }; @@ -256,9 +256,9 @@ class TaskPostClip : public TaskPostBox { public: TaskPostClip(Gui::ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent = nullptr); - virtual ~TaskPostClip(); + ~TaskPostClip() override; - virtual void applyPythonCode(); + void applyPythonCode() override; private Q_SLOTS: void on_CreateButton_triggered(QAction*); @@ -285,9 +285,9 @@ class TaskPostDataAlongLine: public TaskPostBox { public: TaskPostDataAlongLine(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr); - virtual ~TaskPostDataAlongLine(); + ~TaskPostDataAlongLine() override; - virtual void applyPythonCode(); + void applyPythonCode() override; static void pointCallback(void * ud, SoEventCallback * n); private Q_SLOTS: @@ -316,9 +316,9 @@ class TaskPostDataAtPoint: public TaskPostBox { public: TaskPostDataAtPoint(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr); - virtual ~TaskPostDataAtPoint(); + ~TaskPostDataAtPoint() override; - virtual void applyPythonCode(); + void applyPythonCode() override; static void pointCallback(void * ud, SoEventCallback * n); private Q_SLOTS: @@ -345,9 +345,9 @@ class TaskPostScalarClip : public TaskPostBox { public: TaskPostScalarClip(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr); - virtual ~TaskPostScalarClip(); + ~TaskPostScalarClip() override; - virtual void applyPythonCode(); + void applyPythonCode() override; private Q_SLOTS: void on_Slider_valueChanged(int v); @@ -367,9 +367,9 @@ class TaskPostWarpVector : public TaskPostBox { public: TaskPostWarpVector(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr); - virtual ~TaskPostWarpVector(); + ~TaskPostWarpVector() override; - virtual void applyPythonCode(); + void applyPythonCode() override; private Q_SLOTS: void on_Slider_valueChanged(int v); @@ -390,9 +390,9 @@ class TaskPostCut : public TaskPostBox { public: TaskPostCut(Gui::ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent = nullptr); - virtual ~TaskPostCut(); + ~TaskPostCut() override; - virtual void applyPythonCode(); + void applyPythonCode() override; private Q_SLOTS: void on_CreateButton_triggered(QAction*); diff --git a/src/Mod/Fem/Gui/TaskTetParameter.h b/src/Mod/Fem/Gui/TaskTetParameter.h index 17a37c1ad0..e610802f5b 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.h +++ b/src/Mod/Fem/Gui/TaskTetParameter.h @@ -56,7 +56,7 @@ class TaskTetParameter : public Gui::TaskView::TaskBox public: TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent = nullptr); - ~TaskTetParameter(); + ~TaskTetParameter() override; void setInfo(); bool touched; diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 30e0759f47..b5bca05ede 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -56,53 +56,53 @@ public: ViewProviderFemAnalysis(); /// destructor. - virtual ~ViewProviderFemAnalysis(); + ~ViewProviderFemAnalysis() override; - virtual void attach(App::DocumentObject*); - virtual bool doubleClicked(); + void attach(App::DocumentObject*) override; + bool doubleClicked() override; - virtual std::vector claimChildren()const; + std::vector claimChildren()const override; // handling when object is deleted - virtual bool onDelete(const std::vector&); + bool onDelete(const std::vector&) override; /// Asks the view provider if the given object can be deleted. - virtual bool canDelete(App::DocumentObject* obj) const; + bool canDelete(App::DocumentObject* obj) const override; //virtual std::vector claimChildren3D(void)const; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; /// A list of all possible display modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; // shows solid in the tree - virtual bool isShow() const { + bool isShow() const override { return Visibility.getValue(); } /// Hide the object in the view - virtual void hide(); + void hide() override; /// Show the object in the view - virtual void show(); + void show() override; void highlightView(Gui::ViewProviderDocumentObject*); /** @name Drag and drop */ //@{ /// Returns true if the view provider generally supports dragging objects - bool canDragObjects() const; + bool canDragObjects() const override; /// Check whether the object can be removed from the view provider by drag and drop - bool canDragObject(App::DocumentObject*) const; + bool canDragObject(App::DocumentObject*) const override; /// Starts to drag the object - void dragObject(App::DocumentObject*); + void dragObject(App::DocumentObject*) override; /// Returns true if the view provider generally accepts dropping of objects - bool canDropObjects() const; + bool canDropObjects() const override; /// Check whether the object can be dropped to the view provider by drag and drop - bool canDropObject(App::DocumentObject*) const; + bool canDropObject(App::DocumentObject*) const override; /// If the dropped object type is accepted the object will be added as child - void dropObject(App::DocumentObject*); + void dropObject(App::DocumentObject*) override; //@} protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; private: ViewProviderFemHighlighter extension; diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index 8674efe673..6cc75be547 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -49,7 +49,7 @@ class FemGuiExport ViewProviderFemConstraint : public Gui::ViewProviderGeometryO public: /// Constructor ViewProviderFemConstraint(); - virtual ~ViewProviderFemConstraint(); + ~ViewProviderFemConstraint() override; // Display properties App::PropertyColor TextColor; @@ -59,13 +59,13 @@ public: App::PropertyFloat DistFactor; App::PropertyBool Mirror; - void attach(App::DocumentObject *); - virtual void updateData(const App::Property* prop) { Gui::ViewProviderGeometryObject::updateData(prop); } - std::vector getDisplayModes() const; - void setDisplayMode(const char* ModeName); + void attach(App::DocumentObject *) override; + void updateData(const App::Property* prop) override { Gui::ViewProviderGeometryObject::updateData(prop); } + std::vector getDisplayModes() const override; + void setDisplayMode(const char* ModeName) override; - std::vector claimChildren()const; - void setupContextMenu(QMenu*, QObject*, const char*); + std::vector claimChildren()const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; /// Highlight the references that have been selected virtual void highlightReferences(const bool /* on */) {} @@ -74,9 +74,9 @@ public: static std::string gethideMeshShowPartStr(const std::string showConstr); protected: - void onChanged(const App::Property* prop); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + void onChanged(const App::Property* prop) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; static void createPlacement(SoSeparator* sep, const SbVec3f &base, const SbRotation &r); static void updatePlacement(const SoSeparator* sep, const int idx, const SbVec3f &base, const SbRotation &r); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h index c958bdb2b9..76b4164752 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintBearing : public FemGui::ViewProvide public: /// Constructor ViewProviderFemConstraintBearing(); - virtual ~ViewProviderFemConstraintBearing(); + ~ViewProviderFemConstraintBearing() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h index d404e3f6f6..32dcd152b4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintContact : public FemGui::ViewProvide public: ViewProviderFemConstraintContact(); - virtual ~ViewProviderFemConstraintContact(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintContact() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h index 8641b151f0..184bf71476 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewPr public: ViewProviderFemConstraintDisplacement(); - virtual ~ViewProviderFemConstraintDisplacement(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintDisplacement() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h index 19be407be5..67c4611bf6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderF public: /// Constructor ViewProviderFemConstraintFixed(); - virtual ~ViewProviderFemConstraintFixed(); + ~ViewProviderFemConstraintFixed() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h index 718b30779e..ae26437a12 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewP public: /// Constructor ViewProviderFemConstraintFluidBoundary(); - virtual ~ViewProviderFemConstraintFluidBoundary(); + ~ViewProviderFemConstraintFluidBoundary() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; //virtual void onChanged(const App::Property*); //no further property for viewProvider protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h index 50ece3c06a..6b4b56bd4e 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderF public: /// Constructor ViewProviderFemConstraintForce(); - virtual ~ViewProviderFemConstraintForce(); + ~ViewProviderFemConstraintForce() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; private: /// Direction of the force diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h index ce1e8d4c30..a5bf86ddb0 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintGear : public FemGui::ViewProviderFe public: /// Constructor ViewProviderFemConstraintGear(); - virtual ~ViewProviderFemConstraintGear(); + ~ViewProviderFemConstraintGear() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h index 3e01aee490..a830599f1a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProvid public: ViewProviderFemConstraintHeatflux(); - virtual ~ViewProviderFemConstraintHeatflux(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintHeatflux() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h index c5904505c5..b979caecf1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintInitialTemperature : public FemGui:: public: ViewProviderFemConstraintInitialTemperature(); - virtual ~ViewProviderFemConstraintInitialTemperature(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintInitialTemperature() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h index 31bf1d4e09..73bad828a4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h @@ -36,7 +36,7 @@ class FemGuiExport ViewProviderFemConstraintOnBoundary : public FemGui::ViewProv public: ViewProviderFemConstraintOnBoundary(); - virtual ~ViewProviderFemConstraintOnBoundary(); + ~ViewProviderFemConstraintOnBoundary() override; void highlightReferences(const bool on) override; diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h index 3ede68a48a..427c71c4b9 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintPlaneRotation : public FemGui::ViewP public: ViewProviderFemConstraintPlaneRotation(); - virtual ~ViewProviderFemConstraintPlaneRotation(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintPlaneRotation() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h index 642f361f89..db19936b87 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h @@ -34,11 +34,11 @@ class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProvid public: ViewProviderFemConstraintPressure(); - virtual ~ViewProviderFemConstraintPressure(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintPressure() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h index dd8cfbdab1..12e81e1e26 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h @@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintPulley : public FemGui::ViewProvider public: /// Constructor ViewProviderFemConstraintPulley(); - virtual ~ViewProviderFemConstraintPulley(); + ~ViewProviderFemConstraintPulley() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h index 6a79ed41f3..a1887f6e33 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h @@ -34,11 +34,11 @@ class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProvider public: ViewProviderFemConstraintSpring(); - virtual ~ViewProviderFemConstraintSpring(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintSpring() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h index b6c2640054..3c8c55e597 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h @@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewPro public: ViewProviderFemConstraintTemperature(); - virtual ~ViewProviderFemConstraintTemperature(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintTemperature() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h index 4fa00e1ccb..948d33cf0a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h @@ -37,11 +37,11 @@ class FemGuiExport ViewProviderFemConstraintTransform : public FemGui::ViewProvi public: ViewProviderFemConstraintTransform(); - virtual ~ViewProviderFemConstraintTransform(); - virtual void updateData(const App::Property*); + ~ViewProviderFemConstraintTransform() override; + void updateData(const App::Property*) override; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; } diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index 01ec9a5725..728835054d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -42,8 +42,8 @@ class ViewProviderFEMMeshBuilder : public Gui::ViewProviderBuilder { public: ViewProviderFEMMeshBuilder(){} - virtual ~ViewProviderFEMMeshBuilder(){} - virtual void buildNodes(const App::Property*, std::vector&) const; + ~ViewProviderFEMMeshBuilder() override{} + void buildNodes(const App::Property*, std::vector&) const override; void createMesh(const App::Property*, SoCoordinate3*, SoIndexedFaceSet*, @@ -65,7 +65,7 @@ public: ViewProviderFemMesh(); /// destructor. - virtual ~ViewProviderFemMesh(); + ~ViewProviderFemMesh() override; // Display properties App::PropertyColor PointColor; @@ -75,10 +75,10 @@ public: App::PropertyBool ShowInner; App::PropertyInteger MaxFacesShowInner; - void attach(App::DocumentObject *pcObject); - void setDisplayMode(const char* ModeName); - std::vector getDisplayModes() const; - void updateData(const App::Property*); + void attach(App::DocumentObject *pcObject) override; + void setDisplayMode(const char* ModeName) override; + std::vector getDisplayModes() const override; + void updateData(const App::Property*) override; /** @name Selection handling * This group of methods do the selection handling. @@ -87,12 +87,12 @@ public: */ //@{ /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel() const {return true;} + bool useNewSelectionModel() const override {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; + std::string getElement(const SoDetail*) const override; + SoDetail* getDetail(const char*) const override; /// return the highlight lines for a given element or the whole shape - virtual std::vector getSelectionShape(const char* Element) const; + std::vector getSelectionShape(const char* Element) const override; //@} // interface methods @@ -128,7 +128,7 @@ public: const std::vector &getVisibleElementFaces()const{return vFaceElementIdx;} - PyObject *getPyObject(); + PyObject *getPyObject() override; private: static App::PropertyFloatConstraint::Constraints floatRange; @@ -137,7 +137,7 @@ private: protected: /// get called by the container whenever a property has been changed - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; void setColorByNodeIdHelper(const std::vector &); void setDisplacementByNodeIdHelper(const std::vector& DispVector,long startId); diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h index 2e4bd68f5e..7dc58409d4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h @@ -38,7 +38,7 @@ public: ViewProviderFemMeshShape(); /// destructor. - virtual ~ViewProviderFemMeshShape(); + ~ViewProviderFemMeshShape() override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h index 015a5286ec..93661072c1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h @@ -37,13 +37,13 @@ public: ViewProviderFemMeshShapeNetgen(); /// destructor. - virtual ~ViewProviderFemMeshShapeNetgen(); + ~ViewProviderFemMeshShapeNetgen() override; - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); - virtual bool setEdit(int ModNum); + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; + bool setEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h index d06180e4fc..10b818d3aa 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h @@ -36,10 +36,10 @@ class FemGuiExport ViewProviderFemPostClip : public ViewProviderFemPostObject { public: /// constructor. ViewProviderFemPostClip(); - ~ViewProviderFemPostClip(); + ~ViewProviderFemPostClip() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPostObject { @@ -49,10 +49,10 @@ class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPost public: /// constructor. ViewProviderFemPostDataAlongLine(); - ~ViewProviderFemPostDataAlongLine(); + ~ViewProviderFemPostDataAlongLine() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; class FemGuiExport ViewProviderFemPostDataAtPoint: public ViewProviderFemPostObject { @@ -64,10 +64,10 @@ public: ViewProviderFemPostDataAtPoint(); void show() override; void onSelectionChanged(const Gui::SelectionChanges &) override; - ~ViewProviderFemPostDataAtPoint(); + ~ViewProviderFemPostDataAtPoint() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObject { @@ -76,10 +76,10 @@ class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObj public: /// constructor. ViewProviderFemPostScalarClip(); - ~ViewProviderFemPostScalarClip(); + ~ViewProviderFemPostScalarClip() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObject { @@ -89,10 +89,10 @@ class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObj public: /// constructor. ViewProviderFemPostWarpVector(); - ~ViewProviderFemPostWarpVector(); + ~ViewProviderFemPostWarpVector() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject { @@ -102,10 +102,10 @@ class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject { public: /// constructor. ViewProviderFemPostCut(); - ~ViewProviderFemPostCut(); + ~ViewProviderFemPostCut() override; protected: - virtual void setupTaskDialog(TaskDlgPost* dlg); + void setupTaskDialog(TaskDlgPost* dlg) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index f75d11cbe1..a9a8d65e4b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -50,7 +50,7 @@ class FemGuiExport FunctionWidget : public QWidget { Q_OBJECT public: FunctionWidget() : m_block(false), m_view(nullptr), m_object(nullptr) {} - virtual ~FunctionWidget() {} + ~FunctionWidget() override {} virtual void applyPythonCode() = 0; virtual void setViewProvider(ViewProviderFemPostFunction* view); @@ -78,22 +78,22 @@ class FemGuiExport ViewProviderFemPostFunctionProvider : public Gui::ViewProvide public: ViewProviderFemPostFunctionProvider(); - virtual ~ViewProviderFemPostFunctionProvider(); + ~ViewProviderFemPostFunctionProvider() override; App::PropertyFloat SizeX; App::PropertyFloat SizeY; App::PropertyFloat SizeZ; // handling when object is deleted - virtual bool onDelete(const std::vector&); + bool onDelete(const std::vector&) override; /// asks view provider if the given object can be deleted - virtual bool canDelete(App::DocumentObject* obj) const; + bool canDelete(App::DocumentObject* obj) const override; protected: - 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*); + std::vector< App::DocumentObject* > claimChildren() const override; + std::vector< App::DocumentObject* > claimChildren3D() const override; + void onChanged(const App::Property* prop) override; + void updateData(const App::Property*) override; void updateSize(); }; @@ -105,24 +105,24 @@ class FemGuiExport ViewProviderFemPostFunction : public Gui::ViewProviderDocumen public: /// constructor. ViewProviderFemPostFunction(); - ~ViewProviderFemPostFunction(); + ~ViewProviderFemPostFunction() override; App::PropertyFloat AutoScaleFactorX; App::PropertyFloat AutoScaleFactorY; App::PropertyFloat AutoScaleFactorZ; - void attach(App::DocumentObject *pcObject); - bool doubleClicked(); - std::vector getDisplayModes() const; + void attach(App::DocumentObject *pcObject) override; + bool doubleClicked() override; + std::vector getDisplayModes() const override; //creates the widget used in the task dalogs, either for the function itself or for //the filter using it virtual FunctionWidget* createControlWidget() {return nullptr;} protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); - virtual void onChanged(const App::Property* prop); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + void onChanged(const App::Property* prop) override; void setAutoScale(bool value) {m_autoscale = value;} bool autoScale() {return m_autoscale;} @@ -157,11 +157,11 @@ class FemGuiExport PlaneWidget : public FunctionWidget { Q_OBJECT public: PlaneWidget(); - virtual ~PlaneWidget(); + ~PlaneWidget() override; - virtual void applyPythonCode(); - virtual void onChange(const App::Property& p); - virtual void setViewProvider(ViewProviderFemPostFunction* view); + void applyPythonCode() override; + void onChange(const App::Property& p) override; + void setViewProvider(ViewProviderFemPostFunction* view) override; private Q_SLOTS: void originChanged(double); @@ -177,17 +177,17 @@ class FemGuiExport ViewProviderFemPostPlaneFunction : public ViewProviderFemPost public: ViewProviderFemPostPlaneFunction(); - virtual ~ViewProviderFemPostPlaneFunction(); + ~ViewProviderFemPostPlaneFunction() override; App::PropertyFloatConstraint Scale; - virtual SoTransformManip* setupManipulator(); - virtual FunctionWidget* createControlWidget(); + SoTransformManip* setupManipulator() override; + FunctionWidget* createControlWidget() override; protected: - virtual void draggerUpdate(SoDragger* mat); - virtual void updateData(const App::Property*); - virtual void onChanged(const App::Property*); + void draggerUpdate(SoDragger* mat) override; + void updateData(const App::Property*) override; + void onChanged(const App::Property*) override; private: bool m_detectscale; @@ -200,11 +200,11 @@ class FemGuiExport SphereWidget : public FunctionWidget { Q_OBJECT public: SphereWidget(); - virtual ~SphereWidget(); + ~SphereWidget() override; - virtual void applyPythonCode(); - virtual void onChange(const App::Property& p); - virtual void setViewProvider(ViewProviderFemPostFunction* view); + void applyPythonCode() override; + void onChange(const App::Property& p) override; + void setViewProvider(ViewProviderFemPostFunction* view) override; private Q_SLOTS: void centerChanged(double); @@ -220,14 +220,14 @@ class FemGuiExport ViewProviderFemPostSphereFunction : public ViewProviderFemPos public: ViewProviderFemPostSphereFunction(); - virtual ~ViewProviderFemPostSphereFunction(); + ~ViewProviderFemPostSphereFunction() override; - virtual SoTransformManip* setupManipulator(); - virtual FunctionWidget* createControlWidget(); + SoTransformManip* setupManipulator() override; + FunctionWidget* createControlWidget() override; protected: - virtual void draggerUpdate(SoDragger* mat); - virtual void updateData(const App::Property*); + void draggerUpdate(SoDragger* mat) override; + void updateData(const App::Property*) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h index d2246c9c50..5a99e14a48 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h @@ -73,36 +73,36 @@ public: ViewProviderFemPostObject(); /// destructor. - ~ViewProviderFemPostObject(); + ~ViewProviderFemPostObject() override; App::PropertyEnumeration Field; App::PropertyEnumeration VectorMode; App::PropertyPercent Transparency; - void attach(App::DocumentObject *pcObject); - void setDisplayMode(const char* ModeName); - std::vector getDisplayModes() const; - void updateData(const App::Property*); - void onChanged(const App::Property* prop); + void attach(App::DocumentObject *pcObject) override; + void setDisplayMode(const char* ModeName) override; + std::vector getDisplayModes() const override; + void updateData(const App::Property*) override; + void onChanged(const App::Property* prop) override; //edit handling - virtual bool doubleClicked(); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool doubleClicked() override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; - virtual void hide(); - virtual void show(); + void hide() override; + void show() override; - virtual SoSeparator* getFrontRoot() const; + SoSeparator* getFrontRoot() const override; // observer for the color bar - virtual void OnChange(Base::Subject< int >& rCaller, int rcReason); + void OnChange(Base::Subject< int >& rCaller, int rcReason) override; // update color bar void updateMaterial(); // handling when object is deleted - virtual bool onDelete(const std::vector&); - virtual bool canDelete(App::DocumentObject* obj) const; + bool onDelete(const std::vector&) override; + bool canDelete(App::DocumentObject* obj) const override; virtual void onSelectionChanged(const Gui::SelectionChanges &sel); /** @name Selection handling diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h index 5722e6ee80..0007af7810 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h @@ -38,16 +38,16 @@ class FemGuiExport ViewProviderFemPostPipeline : public ViewProviderFemPostObjec public: /// constructor. ViewProviderFemPostPipeline(); - ~ViewProviderFemPostPipeline(); + ~ViewProviderFemPostPipeline() override; - 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); + std::vector< App::DocumentObject* > claimChildren() const override; + std::vector< App::DocumentObject* > claimChildren3D() const override; + void updateData(const App::Property* prop) override; + void onSelectionChanged(const Gui::SelectionChanges &sel) override; void updateColorBars(); void transformField(char *FieldName, double FieldFactor); void scaleField(vtkDataSet *dset, vtkDataArray *pdata, double FieldFactor); - PyObject *getPyObject(); + PyObject *getPyObject() override; private: Py::Object PythonObject; diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index bae158cd67..0dddd42fb4 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -40,10 +40,10 @@ public: ViewProviderResult(); /// destructor - virtual ~ViewProviderResult(); + ~ViewProviderResult() override; // shows solid in the tree - virtual bool isShow() const + bool isShow() const override { return true; } }; diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h index d8328f4cde..a0e3ea4aba 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h @@ -34,11 +34,11 @@ class ViewProviderSetElements : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetElements); public: - virtual bool doubleClicked(); + bool doubleClicked() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h index 664e99e736..855030d8e4 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h @@ -34,11 +34,11 @@ class ViewProviderSetFaces : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetFaces); public: - virtual bool doubleClicked(); + bool doubleClicked() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h index d76b6f9991..f58ce73540 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h @@ -34,11 +34,11 @@ class ViewProviderSetGeometry : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(RobotGui::ViewProviderSetGeometry); public: - virtual bool doubleClicked(); + bool doubleClicked() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h index 531b6694d7..0f5bf3d159 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h @@ -34,11 +34,11 @@ class ViewProviderSetNodes : public Gui::ViewProviderGeometryObject PROPERTY_HEADER(FemGui::ViewProviderSetNodes); public: - virtual bool doubleClicked(); + bool doubleClicked() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h index 0b82d9d202..19bdca8f4f 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.h +++ b/src/Mod/Fem/Gui/ViewProviderSolver.h @@ -50,18 +50,18 @@ public: ViewProviderSolver(); /// destructor - ~ViewProviderSolver(); + ~ViewProviderSolver() override; // shows solid in the tree - virtual bool isShow() const { + bool isShow() const override { return Visibility.getValue(); } /// A list of all possible display modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; // handling when object is deleted - virtual bool onDelete(const std::vector&); - virtual bool canDelete(App::DocumentObject* obj) const; + bool onDelete(const std::vector&) override; + bool canDelete(App::DocumentObject* obj) const override; }; typedef Gui::ViewProviderPythonFeatureT ViewProviderSolverPython; diff --git a/src/Mod/Fem/Gui/Workbench.h b/src/Mod/Fem/Gui/Workbench.h index e26748f50f..d26caf0f69 100755 --- a/src/Mod/Fem/Gui/Workbench.h +++ b/src/Mod/Fem/Gui/Workbench.h @@ -38,12 +38,12 @@ class FemGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); - void setupContextMenu(const char* recipient, Gui::MenuItem*) const; + ~Workbench() override; + void setupContextMenu(const char* recipient, Gui::MenuItem*) const override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::MenuItem* setupMenuBar() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::MenuItem* setupMenuBar() const override; }; } // namespace FemGui diff --git a/src/Mod/Image/App/AppImage.cpp b/src/Mod/Image/App/AppImage.cpp index 9bb298e64c..54d9f4eec2 100644 --- a/src/Mod/Image/App/AppImage.cpp +++ b/src/Mod/Image/App/AppImage.cpp @@ -27,7 +27,7 @@ public: initialize("This module is the Image module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Image/App/ImagePlane.h b/src/Mod/Image/App/ImagePlane.h index 8fa1b97bcd..702f59a6f3 100644 --- a/src/Mod/Image/App/ImagePlane.h +++ b/src/Mod/Image/App/ImagePlane.h @@ -38,14 +38,14 @@ class ImageExport ImagePlane : public App::GeoFeature public: /// Constructor ImagePlane(); - virtual ~ImagePlane(); + ~ImagePlane() override; App::PropertyFileIncluded ImageFile; App::PropertyLength XSize; App::PropertyLength YSize; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "ImageGui::ViewProviderImagePlane"; } }; diff --git a/src/Mod/Image/Gui/AppImageGuiPy.cpp b/src/Mod/Image/Gui/AppImageGuiPy.cpp index 389b3f4966..692a8299ff 100644 --- a/src/Mod/Image/Gui/AppImageGuiPy.cpp +++ b/src/Mod/Image/Gui/AppImageGuiPy.cpp @@ -53,7 +53,7 @@ public: initialize("This module is the ImageGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object open(const Py::Tuple& args) diff --git a/src/Mod/Image/Gui/ImageOrientationDialog.h b/src/Mod/Image/Gui/ImageOrientationDialog.h index b295e470fd..f9a884a730 100644 --- a/src/Mod/Image/Gui/ImageOrientationDialog.h +++ b/src/Mod/Image/Gui/ImageOrientationDialog.h @@ -35,12 +35,12 @@ class ImageOrientationDialog : public QDialog public: ImageOrientationDialog(); - ~ImageOrientationDialog(); + ~ImageOrientationDialog() override; Base::Placement Pos; int DirType; - void accept(); + void accept() override; protected Q_SLOTS: void onPreview(); diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.h b/src/Mod/Image/Gui/ViewProviderImagePlane.h index deb86e0c72..427ad5217f 100644 --- a/src/Mod/Image/Gui/ViewProviderImagePlane.h +++ b/src/Mod/Image/Gui/ViewProviderImagePlane.h @@ -44,12 +44,12 @@ public: ViewProviderImagePlane(); /// destructor. - ~ViewProviderImagePlane(); + ~ViewProviderImagePlane() override; - void attach(App::DocumentObject *pcObject); - void setDisplayMode(const char* ModeName); - std::vector getDisplayModes() const; - void updateData(const App::Property*); + void attach(App::DocumentObject *pcObject) override; + void setDisplayMode(const char* ModeName) override; + std::vector getDisplayModes() const override; + void updateData(const App::Property*) override; private: bool loadSvg(const char*, float x, float y, QImage& img); diff --git a/src/Mod/Image/Gui/Workbench.h b/src/Mod/Image/Gui/Workbench.h index 5d2cb3d83e..c48abc8a53 100644 --- a/src/Mod/Image/Gui/Workbench.h +++ b/src/Mod/Image/Gui/Workbench.h @@ -37,11 +37,11 @@ class ImageGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace ImageGui diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp index 5539622830..8fb770fb67 100644 --- a/src/Mod/Import/App/AppImportPy.cpp +++ b/src/Mod/Import/App/AppImportPy.cpp @@ -93,7 +93,7 @@ public: std::map > partColors; private: - virtual void applyFaceColors(Part::Feature* part, const std::vector& colors) override { + void applyFaceColors(Part::Feature* part, const std::vector& colors) override { partColors[part] = colors; } }; @@ -127,7 +127,7 @@ public: initialize("This module is the Import module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object importer(const Py::Tuple& args, const Py::Dict &kwds) diff --git a/src/Mod/Import/App/ExportOCAF.h b/src/Mod/Import/App/ExportOCAF.h index 9491316d72..8a70aa73ea 100644 --- a/src/Mod/Import/App/ExportOCAF.h +++ b/src/Mod/Import/App/ExportOCAF.h @@ -106,7 +106,7 @@ public: } private: - virtual void findColors(Part::Feature*, std::vector&) const; + void findColors(Part::Feature*, std::vector&) const override; private: std::map > partColors; diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h index 0ae795cc31..b433db69f6 100644 --- a/src/Mod/Import/App/ImportOCAF.h +++ b/src/Mod/Import/App/ImportOCAF.h @@ -89,7 +89,7 @@ public: } private: - void applyColors(Part::Feature* part, const std::vector& colors); + void applyColors(Part::Feature* part, const std::vector& colors) override; private: std::map > partColors; diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h index b967df5f02..43aa1420ad 100644 --- a/src/Mod/Import/App/ImportOCAF2.h +++ b/src/Mod/Import/App/ImportOCAF2.h @@ -133,7 +133,7 @@ private: {} private: - void applyColors(Part::Feature* part, const std::vector& colors) { + void applyColors(Part::Feature* part, const std::vector& colors) override { myParent.applyFaceColors(part, colors); } diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.h b/src/Mod/Import/App/dxf/ImpExpDxf.h index baa645783f..3824b7ea30 100644 --- a/src/Mod/Import/App/dxf/ImpExpDxf.h +++ b/src/Mod/Import/App/dxf/ImpExpDxf.h @@ -38,16 +38,16 @@ namespace Import ImpExpDxfRead(std::string filepath, App::Document *pcDoc); // CDxfRead's virtual functions - void OnReadLine(const double* s, const double* e, bool hidden); - void OnReadPoint(const double* s); - void OnReadText(const double* point, const double height, const char* text); - void OnReadArc(const double* s, const double* e, const double* c, bool dir, bool hidden); - void OnReadCircle(const double* s, const double* c, bool dir, bool hidden); - void OnReadEllipse(const double* c, double major_radius, double minor_radius, double rotation, double start_angle, double end_angle, bool dir); - void OnReadSpline(struct SplineData& sd); - void OnReadInsert(const double* point, const double* scale, const char* name, double rotation); - void OnReadDimension(const double* s, const double* e, const double* point, double rotation); - void AddGraphics() const; + void OnReadLine(const double* s, const double* e, bool hidden) override; + void OnReadPoint(const double* s) override; + void OnReadText(const double* point, const double height, const char* text) override; + void OnReadArc(const double* s, const double* e, const double* c, bool dir, bool hidden) override; + void OnReadCircle(const double* s, const double* c, bool dir, bool hidden) override; + void OnReadEllipse(const double* c, double major_radius, double minor_radius, double rotation, double start_angle, double end_angle, bool dir) override; + void OnReadSpline(struct SplineData& sd) override; + void OnReadInsert(const double* point, const double* scale, const char* name, double rotation) override; + void OnReadDimension(const double* s, const double* e, const double* point, double rotation) override; + void AddGraphics() const override; // FreeCAD-specific functions void AddObject(Part::TopoShape *shape); //Called by OnRead functions to add Part objects diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp index 6be5298d9a..edd2e2b896 100644 --- a/src/Mod/Import/Gui/AppImportGuiPy.cpp +++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp @@ -292,7 +292,7 @@ public: } private: - virtual void applyFaceColors(Part::Feature* part, const std::vector& colors) override { + void applyFaceColors(Part::Feature* part, const std::vector& colors) override { auto vp = dynamic_cast(Gui::Application::Instance->getViewProvider(part)); if (!vp) return; @@ -311,7 +311,7 @@ private: vp->DiffuseColor.setValues(colors); } } - virtual void applyEdgeColors(Part::Feature* part, const std::vector& colors) override { + void applyEdgeColors(Part::Feature* part, const std::vector& colors) override { auto vp = dynamic_cast(Gui::Application::Instance->getViewProvider(part)); if (!vp) return; @@ -321,7 +321,7 @@ private: else vp->LineColorArray.setValues(colors); } - virtual void applyLinkColor(App::DocumentObject *obj, int index, App::Color color) override { + void applyLinkColor(App::DocumentObject *obj, int index, App::Color color) override { auto vp = dynamic_cast(Gui::Application::Instance->getViewProvider(obj)); if(!vp) return; @@ -339,7 +339,7 @@ private: mat.diffuseColor = color; vp->MaterialList.set1Value(index,mat); } - virtual void applyElementColors(App::DocumentObject *obj, + void applyElementColors(App::DocumentObject *obj, const std::map &colors) override { auto vp = Gui::Application::Instance->getViewProvider(obj); @@ -357,7 +357,7 @@ public: : ExportOCAF(h, explicitPlacement) { } - virtual void findColors(Part::Feature* part, std::vector& colors) const + void findColors(Part::Feature* part, std::vector& colors) const override { Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(part); if (vp && vp->isDerivedFrom(PartGui::ViewProviderPartExt::getClassTypeId())) { @@ -388,7 +388,7 @@ public: initialize("This module is the ImportGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object insert(const Py::Tuple& args, const Py::Dict &kwds) diff --git a/src/Mod/Import/Gui/Workbench.h b/src/Mod/Import/Gui/Workbench.h index cd659cc21e..6bda8cfd7e 100644 --- a/src/Mod/Import/Gui/Workbench.h +++ b/src/Mod/Import/Gui/Workbench.h @@ -37,11 +37,11 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace ImportGui diff --git a/src/Mod/Inspection/App/AppInspection.cpp b/src/Mod/Inspection/App/AppInspection.cpp index cc3ececdd4..aef3ea4cc5 100644 --- a/src/Mod/Inspection/App/AppInspection.cpp +++ b/src/Mod/Inspection/App/AppInspection.cpp @@ -37,7 +37,7 @@ public: initialize("This module is the Inspection module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 2fe469fcc8..af329f6ea6 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -141,7 +141,7 @@ namespace Inspection { std::max((unsigned long)(clBBMesh.LengthZ() / fGridLen), 1)); } - void Validate (const MeshCore::MeshKernel&) + void Validate (const MeshCore::MeshKernel&) override { // do nothing } @@ -151,24 +151,24 @@ namespace Inspection { // do nothing } - bool Verify() const + bool Verify() const override { // do nothing return true; } protected: - void CalculateGridLength (unsigned long /*ulCtGrid*/, unsigned long /*ulMaxGrids*/) + void CalculateGridLength (unsigned long /*ulCtGrid*/, unsigned long /*ulMaxGrids*/) override { // do nothing } - void CalculateGridLength (int /*iCtGridPerAxis*/) + void CalculateGridLength (int /*iCtGridPerAxis*/) override { // do nothing } - unsigned long HasElements (void) const + unsigned long HasElements (void) const override { return _pclMesh->CountFacets(); } @@ -210,7 +210,7 @@ namespace Inspection { _aulGrid[ulX1][ulY1][ulZ1].insert(ulFacetIndex); } - void InitGrid (void) + void InitGrid (void) override { unsigned long i, j; @@ -238,7 +238,7 @@ namespace Inspection { } } - void RebuildGrid (void) + void RebuildGrid (void) override { _ulCtElements = _pclMesh->CountFacets(); InitGrid(); diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index 832982d98e..fac05ed614 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -60,9 +60,9 @@ class InspectionExport InspectActualMesh : public InspectActualGeometry { public: InspectActualMesh(const Mesh::MeshObject& rMesh); - ~InspectActualMesh(); - virtual unsigned long countPoints() const; - virtual Base::Vector3f getPoint(unsigned long) const; + ~InspectActualMesh() override; + unsigned long countPoints() const override; + Base::Vector3f getPoint(unsigned long) const override; private: const MeshCore::MeshKernel& _mesh; @@ -74,8 +74,8 @@ class InspectionExport InspectActualPoints : public InspectActualGeometry { public: InspectActualPoints(const Points::PointKernel&); - virtual unsigned long countPoints() const; - virtual Base::Vector3f getPoint(unsigned long) const; + unsigned long countPoints() const override; + Base::Vector3f getPoint(unsigned long) const override; private: const Points::PointKernel& _rKernel; @@ -85,8 +85,8 @@ class InspectionExport InspectActualShape : public InspectActualGeometry { public: InspectActualShape(const Part::TopoShape&); - virtual unsigned long countPoints() const; - virtual Base::Vector3f getPoint(unsigned long) const; + unsigned long countPoints() const override; + Base::Vector3f getPoint(unsigned long) const override; private: const Part::TopoShape& _rShape; @@ -106,8 +106,8 @@ class InspectionExport InspectNominalMesh : public InspectNominalGeometry { public: InspectNominalMesh(const Mesh::MeshObject& rMesh, float offset); - ~InspectNominalMesh(); - virtual float getDistance(const Base::Vector3f&) const; + ~InspectNominalMesh() override; + float getDistance(const Base::Vector3f&) const override; private: const MeshCore::MeshKernel& _mesh; @@ -121,8 +121,8 @@ class InspectionExport InspectNominalFastMesh : public InspectNominalGeometry { public: InspectNominalFastMesh(const Mesh::MeshObject& rMesh, float offset); - ~InspectNominalFastMesh(); - virtual float getDistance(const Base::Vector3f&) const; + ~InspectNominalFastMesh() override; + float getDistance(const Base::Vector3f&) const override; protected: const MeshCore::MeshKernel& _mesh; @@ -137,8 +137,8 @@ class InspectionExport InspectNominalPoints : public InspectNominalGeometry { public: InspectNominalPoints(const Points::PointKernel&, float offset); - ~InspectNominalPoints(); - virtual float getDistance(const Base::Vector3f&) const; + ~InspectNominalPoints() override; + float getDistance(const Base::Vector3f&) const override; private: const Points::PointKernel& _rKernel; @@ -149,8 +149,8 @@ class InspectionExport InspectNominalShape : public InspectNominalGeometry { public: InspectNominalShape(const TopoDS_Shape&, float offset); - ~InspectNominalShape(); - virtual float getDistance(const Base::Vector3f&) const; + ~InspectNominalShape() override; + float getDistance(const Base::Vector3f&) const override; private: BRepExtrema_DistShapeShape* distss; @@ -174,10 +174,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyDistanceList(); + ~PropertyDistanceList() override; - virtual void setSize(int newSize); - virtual int getSize() const; + void setSize(int newSize) override; + int getSize() const override; /** Sets the property */ @@ -191,18 +191,18 @@ public: const std::vector &getValues() const{return _lValueList;} - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual Property *Copy() const; - virtual void Paste(const Property &from); - virtual unsigned int getMemSize () const; + Property *Copy() const override; + void Paste(const Property &from) override; + unsigned int getMemSize () const override; private: std::vector _lValueList; @@ -220,7 +220,7 @@ class InspectionExport Feature : public App::DocumentObject public: /// Constructor Feature(); - virtual ~Feature(); + ~Feature() override; /** @name Properties */ //@{ @@ -233,13 +233,13 @@ public: /** @name Actions */ //@{ - short mustExecute() const; + short mustExecute() const override; /// recalculate the Feature - App::DocumentObjectExecReturn* execute(); + App::DocumentObjectExecReturn* execute() override; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName() const + const char* getViewProviderName() const override { return "InspectionGui::ViewProviderInspection"; } }; @@ -250,10 +250,10 @@ class InspectionExport Group : public App::DocumentObjectGroup public: /// Constructor Group(); - virtual ~Group(); + ~Group() override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const + const char* getViewProviderName() const override { return "InspectionGui::ViewProviderInspectionGroup"; } }; diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp index 7052a0e6eb..405d4c788a 100644 --- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp +++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp @@ -44,7 +44,7 @@ public: initialize("This module is the InspectionGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index bf29465729..9d043dea1e 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -395,8 +395,8 @@ class ViewProviderProxyObject : public QObject { public: ViewProviderProxyObject(QWidget* w) : QObject(nullptr), widget(w) {} - ~ViewProviderProxyObject() {} - void customEvent(QEvent *) + ~ViewProviderProxyObject() override {} + void customEvent(QEvent *) override { if (!widget.isNull()) { QList flags = widget->findChildren(); diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h index 076320ace5..d70e6142ef 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.h +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h @@ -53,32 +53,32 @@ class ViewProviderInspection : public Gui::ViewProviderDocumentObject, public: ViewProviderInspection(); - virtual ~ViewProviderInspection(); + ~ViewProviderInspection() override; App::PropertyBool OutsideGrayed; App::PropertyFloatConstraint PointSize; - void attach(App::DocumentObject *pcFeat); + void attach(App::DocumentObject *pcFeat) override; /// Sets the viewing mode - void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// Returns a list of all possible modes - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Update colorbar after recomputation of distances. - void updateData(const App::Property*); + void updateData(const App::Property*) override; /// 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; + void OnChange(Base::Subject &rCaller,int rcReason) override; + QIcon getIcon() const override; /// Returns a color bar - SoSeparator* getFrontRoot() const; + SoSeparator* getFrontRoot() const override; /// Hide the object in the view - virtual void hide(); + void hide() override; /// Show the object in the view - virtual void show(); + void show() override; static void inspectCallback(void * ud, SoEventCallback * n); protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; void setDistances(); QString inspectDistance(const SoPickedPoint* pp) const; @@ -106,8 +106,8 @@ public: /// constructor ViewProviderInspectionGroup(); /// destructor - virtual ~ViewProviderInspectionGroup(); - QIcon getIcon() const; + ~ViewProviderInspectionGroup() override; + QIcon getIcon() const override; }; } // namespace InspectionGui diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp index 604b40ec43..8bf09004af 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.cpp +++ b/src/Mod/Inspection/Gui/VisualInspection.cpp @@ -54,7 +54,7 @@ public: { } - ~SingleSelectionItem () + ~SingleSelectionItem () override { } diff --git a/src/Mod/Inspection/Gui/VisualInspection.h b/src/Mod/Inspection/Gui/VisualInspection.h index d13f56035b..4cdbbaaf22 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.h +++ b/src/Mod/Inspection/Gui/VisualInspection.h @@ -37,9 +37,9 @@ class VisualInspection : public QDialog public: VisualInspection(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~ VisualInspection(); + ~ VisualInspection() override; - void accept(); + void accept() override; protected Q_SLOTS: void onActivateItem(QTreeWidgetItem*); diff --git a/src/Mod/Inspection/Gui/Workbench.h b/src/Mod/Inspection/Gui/Workbench.h index e545fc2270..f2a6e48b19 100644 --- a/src/Mod/Inspection/Gui/Workbench.h +++ b/src/Mod/Inspection/Gui/Workbench.h @@ -34,11 +34,11 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; }; } // namespace InspectionGui diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index ea53a54bd9..acab353ae4 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -38,7 +38,7 @@ public: initialize("This module is the Measure module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h index 6c85553da3..b9d1a389ce 100644 --- a/src/Mod/Measure/App/Measurement.h +++ b/src/Mod/Measure/App/Measurement.h @@ -54,7 +54,7 @@ public: public: Measurement(); - ~Measurement(); + ~Measurement() override; void clear(); bool has3DReferences(); @@ -66,7 +66,7 @@ public: MeasureType getType(); // from base class - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; virtual unsigned int getMemSize() const; public: diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp index 5066b4212d..749c1d4223 100644 --- a/src/Mod/Mesh/App/AppMeshPy.cpp +++ b/src/Mod/Mesh/App/AppMeshPy.cpp @@ -138,10 +138,10 @@ public: "\n"); } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/Mesh/App/Core/Algorithm.h b/src/Mod/Mesh/App/Core/Algorithm.h index 730bcb6015..49f2f6d4c5 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.h +++ b/src/Mod/Mesh/App/Core/Algorithm.h @@ -354,8 +354,8 @@ class MeshExport PointCollector : public MeshCollector { public: PointCollector(std::vector& ind) : indices(ind){} - virtual ~PointCollector(){} - virtual void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) + ~PointCollector() override{} + void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override { PointIndex ulP1, ulP2, ulP3; kernel.GetFacetPoints(index, ulP1, ulP2, ulP3); @@ -372,8 +372,8 @@ class MeshExport FacetCollector : public MeshCollector { public: FacetCollector(std::vector& ind) : indices(ind){} - virtual ~FacetCollector(){} - void Append(const MeshCore::MeshKernel&, FacetIndex index) + ~FacetCollector() override{} + void Append(const MeshCore::MeshKernel&, FacetIndex index) override { indices.push_back(index); } diff --git a/src/Mod/Mesh/App/Core/Approximation.h b/src/Mod/Mesh/App/Core/Approximation.h index 524fca7d25..acec6224d5 100644 --- a/src/Mod/Mesh/App/Core/Approximation.h +++ b/src/Mod/Mesh/App/Core/Approximation.h @@ -194,7 +194,7 @@ public: /** * Destruction */ - virtual ~PlaneFit(); + ~PlaneFit() override; Base::Vector3f GetBase() const; Base::Vector3f GetDirU() const; Base::Vector3f GetDirV() const; @@ -207,7 +207,7 @@ public: * Fit a plane into the given points. We must have at least three non-collinear points * to succeed. If the fit fails FLOAT_MAX is returned. */ - float Fit(); + float Fit() override; /** * Returns the distance from the point \a rcPoint to the fitted plane. If Fit() has not been * called FLOAT_MAX is returned. @@ -274,7 +274,7 @@ public: /** * Destruction */ - virtual ~QuadraticFit(){} + ~QuadraticFit() override{} /** * Get the quadric coefficients * @param ulIndex Number of coefficient (0..9) @@ -291,7 +291,7 @@ public: * Invocation of fitting algorithm * @return float Quality of fit. */ - float Fit(); + float Fit() override; void CalcZValues(double x, double y, double &dZ1, double &dZ2) const; /** @@ -349,12 +349,12 @@ public: /** * Destruction */ - virtual ~SurfaceFit(){} + ~SurfaceFit() override{} bool GetCurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfCurv1, Base::Vector3f &rkDir0, Base::Vector3f &rkDir1, double &dDistance); bool GetCurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfcurv1); - float Fit(); + float Fit() override; double Value(double x, double y) const; void GetCoefficients(double& a,double& b,double& c,double& d,double& e,double& f) const; /** @@ -393,7 +393,7 @@ public: /** * Destruction */ - virtual ~CylinderFit(); + ~CylinderFit() override; float GetRadius() const; Base::Vector3f GetBase() const; void SetInitialValues(const Base::Vector3f&, const Base::Vector3f&); @@ -409,7 +409,7 @@ public: /** * Fit a cylinder into the given points. If the fit fails FLOAT_MAX is returned. */ - float Fit(); + float Fit() override; /** * Returns the distance from the point \a rcPoint to the fitted cylinder. If Fit() has not been * called FLOAT_MAX is returned. @@ -452,13 +452,13 @@ public: /** * Destruction */ - virtual ~SphereFit(); + ~SphereFit() override; float GetRadius() const; Base::Vector3f GetCenter() const; /** * Fit a sphere into the given points. If the fit fails FLOAT_MAX is returned. */ - float Fit(); + float Fit() override; /** * Returns the distance from the point \a rcPoint to the fitted sphere. If Fit() has not been * called FLOAT_MAX is returned. @@ -662,8 +662,8 @@ public: /** * Destruction */ - virtual ~PolynomialFit(); - float Fit(); + ~PolynomialFit() override; + float Fit() override; float Value(float x, float y) const; protected: diff --git a/src/Mod/Mesh/App/Core/Curvature.cpp b/src/Mod/Mesh/App/Core/Curvature.cpp index 846268ffc4..af487e59da 100644 --- a/src/Mod/Mesh/App/Core/Curvature.cpp +++ b/src/Mod/Mesh/App/Core/Curvature.cpp @@ -344,7 +344,7 @@ class FitPointCollector : public MeshCollector { public: FitPointCollector(std::set& ind) : indices(ind){} - virtual void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) + void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override { PointIndex ulP1, ulP2, ulP3; kernel.GetFacetPoints(index, ulP1, ulP2, ulP3); diff --git a/src/Mod/Mesh/App/Core/CylinderFit.h b/src/Mod/Mesh/App/Core/CylinderFit.h index 6837ea509e..ac69574289 100644 --- a/src/Mod/Mesh/App/Core/CylinderFit.h +++ b/src/Mod/Mesh/App/Core/CylinderFit.h @@ -52,7 +52,7 @@ public: /** * Destruction */ - virtual ~CylinderFit(); + ~CylinderFit() override; /** * Set approximations before calling Fit() @@ -87,7 +87,7 @@ public: /** * Fit a cylinder into the given points. If the fit fails FLOAT_MAX is returned. */ - float Fit(); + float Fit() override; /** * Returns the distance from the point \a rcPoint to the fitted cylinder. If Fit() has not been * called FLOAT_MAX is returned. diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h index 80e6bf8fb6..5c6eb3fc24 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.h +++ b/src/Mod/Mesh/App/Core/Degeneration.h @@ -54,11 +54,11 @@ public: /** * Destruction. */ - ~MeshEvalInvalids () { } + ~MeshEvalInvalids () override { } /** * Searches for as 'Invalid' marked points or facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all invalid facets or facets whose points are invalid. */ @@ -80,11 +80,11 @@ public: /** * Destruction. */ - ~MeshFixInvalids () { } + ~MeshFixInvalids () override { } /** * Remove invalid elements. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -105,11 +105,11 @@ public: /** * Destruction. */ - ~MeshEvalDuplicatePoints () { } + ~MeshEvalDuplicatePoints () override { } /** * Merges points to one if the distance between them is less than the global \a MeshDefinitions::_fMinPointDistanceD1. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all duplicated points. */ @@ -131,11 +131,11 @@ public: /** * Destruction. */ - ~MeshFixDuplicatePoints () { } + ~MeshFixDuplicatePoints () override { } /** * Merges duplicated points. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -153,11 +153,11 @@ public: /** * Destruction. */ - ~MeshEvalNaNPoints () { } + ~MeshEvalNaNPoints () override { } /** * Returns false if a point with NaN coordinate is found. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all NaN points. */ @@ -179,11 +179,11 @@ public: /** * Destruction. */ - ~MeshFixNaNPoints () { } + ~MeshFixNaNPoints () override { } /** * Merges duplicated points. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -203,11 +203,11 @@ public: /** * Destruction. */ - ~MeshEvalDuplicateFacets () { } + ~MeshEvalDuplicateFacets () override { } /** * Searches for duplicated facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all duplicated facets. */ @@ -229,11 +229,11 @@ public: /** * Destruction. */ - ~MeshFixDuplicateFacets () { } + ~MeshFixDuplicateFacets () override { } /** * Removes duplicated facets. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -250,11 +250,11 @@ public: /** * Destruction. */ - ~MeshEvalInternalFacets () { } + ~MeshEvalInternalFacets () override { } /** * Identify internal facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Return the indices. */ @@ -285,11 +285,11 @@ public: /** * Destruction. */ - ~MeshEvalDegeneratedFacets () { } + ~MeshEvalDegeneratedFacets () override { } /** * Searches degenerated facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the number of facets with an edge smaller than \a fMinEdgeLength. */ @@ -319,11 +319,11 @@ public: /** * Destruction. */ - ~MeshFixDegeneratedFacets () { } + ~MeshFixDegeneratedFacets () override { } /** * Removes degenerated facets. */ - bool Fixup (); + bool Fixup () override; private: float fEpsilon; @@ -350,12 +350,12 @@ public: /** * Destruction. */ - ~MeshRemoveNeedles () { } + ~MeshRemoveNeedles () override { } /** * Removes all facets with an edge smaller than \a fMinEdgeLength without leaving holes or gaps * in the mesh. */ - bool Fixup (); + bool Fixup () override; private: float fMinEdgeLength; @@ -382,10 +382,10 @@ public: /** * Destruction. */ - ~MeshFixCaps () { } + ~MeshFixCaps () override { } /** */ - bool Fixup (); + bool Fixup () override; private: float fMaxAngle; @@ -409,11 +409,11 @@ public: /** * Destruction. */ - ~MeshEvalDeformedFacets () { } + ~MeshEvalDeformedFacets () override { } /** * Searches deformed facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of deformed facets. */ @@ -443,11 +443,11 @@ public: /** * Destruction. */ - ~MeshFixDeformedFacets () { } + ~MeshFixDeformedFacets () override { } /** * Removes deformed facets. */ - bool Fixup (); + bool Fixup () override; private: float fMinAngle; /**< If an angle of a facet is lower than fMinAngle it's considered as deformed. */ @@ -475,11 +475,11 @@ public: /** * Destruction. */ - ~MeshFixMergeFacets () { } + ~MeshFixMergeFacets () override { } /** * Removes deformed facets. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -490,9 +490,9 @@ class MeshExport MeshEvalDentsOnSurface : public MeshEvaluation { public: MeshEvalDentsOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { } - ~MeshEvalDentsOnSurface() {} + ~MeshEvalDentsOnSurface() override {} - bool Evaluate(); + bool Evaluate() override; std::vector GetIndices() const; private: @@ -503,9 +503,9 @@ class MeshExport MeshFixDentsOnSurface : public MeshValidation { public: MeshFixDentsOnSurface (MeshKernel &rclM) : MeshValidation( rclM ) { } - ~MeshFixDentsOnSurface() {} + ~MeshFixDentsOnSurface() override {} - bool Fixup(); + bool Fixup() override; }; /** @@ -517,9 +517,9 @@ class MeshExport MeshEvalFoldsOnSurface : public MeshEvaluation { public: MeshEvalFoldsOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { } - ~MeshEvalFoldsOnSurface() {} + ~MeshEvalFoldsOnSurface() override {} - bool Evaluate(); + bool Evaluate() override; std::vector GetIndices() const; private: @@ -536,9 +536,9 @@ class MeshExport MeshEvalFoldsOnBoundary : public MeshEvaluation { public: MeshEvalFoldsOnBoundary (const MeshKernel &rclM) : MeshEvaluation( rclM ) { } - ~MeshEvalFoldsOnBoundary() {} + ~MeshEvalFoldsOnBoundary() override {} - bool Evaluate(); + bool Evaluate() override; std::vector GetIndices() const; private: @@ -549,9 +549,9 @@ class MeshExport MeshFixFoldsOnBoundary : public MeshValidation { public: MeshFixFoldsOnBoundary (MeshKernel &rclM) : MeshValidation( rclM ) { } - ~MeshFixFoldsOnBoundary() {} + ~MeshFixFoldsOnBoundary() override {} - bool Fixup(); + bool Fixup() override; }; /** @@ -562,9 +562,9 @@ class MeshExport MeshEvalFoldOversOnSurface : public MeshEvaluation { public: MeshEvalFoldOversOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { } - ~MeshEvalFoldOversOnSurface() {} + ~MeshEvalFoldOversOnSurface() override {} - bool Evaluate(); + bool Evaluate() override; std::vector GetIndices() const { return this->indices; } @@ -582,8 +582,8 @@ class MeshExport MeshEvalBorderFacet : public MeshEvaluation public: MeshEvalBorderFacet (const MeshKernel &rclB, std::vector& f) : MeshEvaluation(rclB), _facets(f) {} - virtual ~MeshEvalBorderFacet () {} - bool Evaluate(); + ~MeshEvalBorderFacet () override {} + bool Evaluate() override; protected: std::vector& _facets; @@ -610,11 +610,11 @@ public: /** * Destruction. */ - ~MeshEvalRangeFacet () { } + ~MeshEvalRangeFacet () override { } /** * Searches for facets that has neighbour facet indices out of range. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all facets with invalid neighbour indices. */ @@ -636,11 +636,11 @@ public: /** * Destruction. */ - ~MeshFixRangeFacet () { } + ~MeshFixRangeFacet () override { } /** * Fixes facets with neighbour indices out of range. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -658,11 +658,11 @@ public: /** * Destruction. */ - ~MeshEvalRangePoint () { } + ~MeshEvalRangePoint () override { } /** * Searches for facets that has point indices out of range. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all facets with invalid point indices. */ @@ -684,11 +684,11 @@ public: /** * Destruction. */ - ~MeshFixRangePoint () { } + ~MeshFixRangePoint () override { } /** * Fixes facets with point indices out of range. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -707,11 +707,11 @@ public: /** * Destruction. */ - ~MeshEvalCorruptedFacets () { } + ~MeshEvalCorruptedFacets () override { } /** * Searches for corrupted facets. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all corrupt facets. */ @@ -734,11 +734,11 @@ public: /** * Destruction. */ - ~MeshFixCorruptedFacets () { } + ~MeshFixCorruptedFacets () override { } /** * Removes corrupted facets. */ - bool Fixup (); + bool Fixup () override; }; /** @@ -756,11 +756,11 @@ public: /** * Destruction. */ - ~MeshEvalPointOnEdge () { } + ~MeshEvalPointOnEdge () override { } /** * Searches for points that lie on edge of triangle. */ - bool Evaluate (); + bool Evaluate () override; /** * Returns the indices of all points on edge. */ @@ -790,11 +790,11 @@ public: /** * Destruction. */ - ~MeshFixPointOnEdge () { } + ~MeshFixPointOnEdge () override { } /** * Removes points that lie on edges of triangles. */ - bool Fixup (); + bool Fixup () override; private: void MarkBoundaries(const std::vector& facetsIndices); diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h index cc9b34e5d7..553eb13ea7 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.h +++ b/src/Mod/Mesh/App/Core/Evaluation.h @@ -95,7 +95,7 @@ public: MeshOrientationVisitor(); /** Returns false after the first inconsistence is found, true otherwise. */ - bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long ); + bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long ) override; bool HasNonUnifomOrientedFacets() const; private: @@ -114,7 +114,7 @@ public: std::vector& aulComplement); /** Returns always true and collects the indices with wrong orientation. */ - bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long); + bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long) override; private: std::vector& _aulIndices; @@ -129,7 +129,7 @@ class MeshExport MeshSameOrientationCollector : public MeshOrientationVisitor public: MeshSameOrientationCollector(std::vector& aulIndices); /** Returns always true and collects the indices with wrong orientation. */ - bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long); + bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long) override; private: std::vector& _aulIndices; @@ -143,8 +143,8 @@ class MeshExport MeshEvalOrientation : public MeshEvaluation { public: MeshEvalOrientation (const MeshKernel& rclM); - ~MeshEvalOrientation(); - bool Evaluate (); + ~MeshEvalOrientation() override; + bool Evaluate () override; std::vector GetIndices() const; private: @@ -159,8 +159,8 @@ class MeshExport MeshFixOrientation : public MeshValidation { public: MeshFixOrientation (MeshKernel& rclM); - ~MeshFixOrientation(); - bool Fixup(); + ~MeshFixOrientation() override; + bool Fixup() override; }; // ---------------------------------------------------- @@ -173,8 +173,8 @@ class MeshExport MeshEvalSolid : public MeshEvaluation { public: MeshEvalSolid (const MeshKernel& rclM); - ~MeshEvalSolid(); - bool Evaluate (); + ~MeshEvalSolid() override; + bool Evaluate () override; }; // ---------------------------------------------------- @@ -189,8 +189,8 @@ class MeshExport MeshEvalTopology : public MeshEvaluation { public: MeshEvalTopology (const MeshKernel &rclB) : MeshEvaluation(rclB) {} - virtual ~MeshEvalTopology () {} - virtual bool Evaluate (); + ~MeshEvalTopology () override {} + bool Evaluate () override; void GetFacetManifolds (std::vector &raclFacetIndList) const; unsigned long CountManifolds() const; @@ -211,8 +211,8 @@ class MeshExport MeshFixTopology : public MeshValidation public: MeshFixTopology (MeshKernel &rclB, const std::list >& mf) : MeshValidation(rclB), nonManifoldList(mf) {} - virtual ~MeshFixTopology () {} - bool Fixup(); + ~MeshFixTopology () override {} + bool Fixup() override; const std::vector& GetDeletedFaces() const { return deletedFaces; } @@ -233,8 +233,8 @@ class MeshExport MeshEvalPointManifolds : public MeshEvaluation { public: MeshEvalPointManifolds (const MeshKernel &rclB) : MeshEvaluation(rclB) {} - virtual ~MeshEvalPointManifolds () {} - virtual bool Evaluate (); + ~MeshEvalPointManifolds () override {} + bool Evaluate () override; void GetFacetIndices (std::vector &facets) const; const std::list >& GetFacetIndices () const { return facetsOfNonManifoldPoints; } @@ -259,8 +259,8 @@ class MeshExport MeshEvalSingleFacet : public MeshEvalTopology { public: MeshEvalSingleFacet (const MeshKernel &rclB) : MeshEvalTopology(rclB) {} - virtual ~MeshEvalSingleFacet () {} - bool Evaluate (); + ~MeshEvalSingleFacet () override {} + bool Evaluate () override; }; /** @@ -272,8 +272,8 @@ class MeshExport MeshFixSingleFacet : public MeshValidation public: MeshFixSingleFacet (MeshKernel &rclB, const std::vector >& mf) : MeshValidation(rclB), _raclManifoldList(mf) {} - virtual ~MeshFixSingleFacet () {} - bool Fixup(); + ~MeshFixSingleFacet () override {} + bool Fixup() override; protected: const std::vector >& _raclManifoldList; @@ -289,9 +289,9 @@ class MeshExport MeshEvalSelfIntersection : public MeshEvaluation { public: MeshEvalSelfIntersection (const MeshKernel &rclB) : MeshEvaluation(rclB) {} - virtual ~MeshEvalSelfIntersection () {} + ~MeshEvalSelfIntersection () override {} /// Evaluate the mesh and return if true if there are self intersections - bool Evaluate (); + bool Evaluate () override; /// collect all intersection lines void GetIntersections(const std::vector >&, std::vector >&) const; @@ -308,9 +308,9 @@ class MeshExport MeshFixSelfIntersection : public MeshValidation public: MeshFixSelfIntersection (MeshKernel &rclB, const std::vector >& si) : MeshValidation(rclB), selfIntersectons(si) {} - virtual ~MeshFixSelfIntersection () {} + ~MeshFixSelfIntersection () override {} std::vector GetFacets() const; - bool Fixup(); + bool Fixup() override; private: const std::vector >& selfIntersectons; @@ -327,8 +327,8 @@ class MeshExport MeshEvalNeighbourhood : public MeshEvaluation { public: MeshEvalNeighbourhood (const MeshKernel &rclB) : MeshEvaluation(rclB) {} - ~MeshEvalNeighbourhood () {} - bool Evaluate (); + ~MeshEvalNeighbourhood () override {} + bool Evaluate () override; std::vector GetIndices() const; }; @@ -340,8 +340,8 @@ class MeshExport MeshFixNeighbourhood : public MeshValidation { public: MeshFixNeighbourhood (MeshKernel &rclB) : MeshValidation(rclB) {} - ~MeshFixNeighbourhood () {} - bool Fixup(); + ~MeshFixNeighbourhood () override {} + bool Fixup() override; }; // ---------------------------------------------------- @@ -358,7 +358,7 @@ class MeshExport MeshEigensystem : public MeshEvaluation { public: MeshEigensystem (const MeshKernel &rclB); - virtual ~MeshEigensystem () {} + ~MeshEigensystem () override {} /** Returns the transformation matrix. */ Base::Matrix4D Transform() const; @@ -367,7 +367,7 @@ public: */ Base::Vector3f GetBoundings() const; - bool Evaluate(); + bool Evaluate() override; /** * Calculates the local coordinate system defined by \a u, \a v, \a w * and \a c. diff --git a/src/Mod/Mesh/App/Core/Grid.h b/src/Mod/Mesh/App/Core/Grid.h index e368184bbb..dd738afb2f 100644 --- a/src/Mod/Mesh/App/Core/Grid.h +++ b/src/Mod/Mesh/App/Core/Grid.h @@ -194,7 +194,7 @@ public: /// Construction MeshFacetGrid (const MeshKernel &rclM, float fGridLen); /// Destruction - virtual ~MeshFacetGrid () { } + ~MeshFacetGrid () override { } //@} /** @name Search */ @@ -213,11 +213,11 @@ public: //@} /** Validates the grid structure and rebuilds it if needed. */ - virtual void Validate (const MeshKernel &rclM); + void Validate (const MeshKernel &rclM) override; /** Validates the grid structure and rebuilds it if needed. */ virtual void Validate (); /** Verifies the grid structure and returns false if inconsistencies are found. */ - virtual bool Verify() const; + bool Verify() const override; protected: /** Returns the grid numbers to the given point \a rclPoint. */ @@ -229,10 +229,10 @@ protected: * the facet. */ inline void AddFacet (const MeshGeomFacet &rclFacet, ElementIndex ulFacetIndex, float fEpsilon = 0.0f); /** Returns the number of stored elements. */ - unsigned long HasElements () const + unsigned long HasElements () const override { return _pclMesh->CountFacets(); } /** Rebuilds the grid structure. */ - virtual void RebuildGrid (); + void RebuildGrid () override; }; /** @@ -255,17 +255,17 @@ public: /// Construction MeshPointGrid (const MeshKernel &rclM, unsigned long ulX, unsigned long ulY, unsigned long ulZ); /// Destruction - virtual ~MeshPointGrid () {} + ~MeshPointGrid () override {} //@} /** Finds all points that lie in the same grid as the point \a rclPoint. */ unsigned long FindElements(const Base::Vector3f &rclPoint, std::set& aulElements) const; /** Validates the grid structure and rebuilds it if needed. */ - virtual void Validate (const MeshKernel &rclM); + void Validate (const MeshKernel &rclM) override; /** Validates the grid structure and rebuilds it if needed. */ virtual void Validate (); /** Verifies the grid structure and returns false if inconsistencies are found. */ - virtual bool Verify() const; + bool Verify() const override; protected: /** Adds a new point element to the grid structure. \a rclPt is the geometric point and \a ulPtIndex @@ -274,10 +274,10 @@ protected: /** Returns the grid numbers to the given point \a rclPoint. */ void Pos(const Base::Vector3f &rclPoint, unsigned long &rulX, unsigned long &rulY, unsigned long &rulZ) const; /** Returns the number of stored elements. */ - unsigned long HasElements () const + unsigned long HasElements () const override { return _pclMesh->CountPoints(); } /** Rebuilds the grid structure. */ - virtual void RebuildGrid (); + void RebuildGrid () override; }; /** diff --git a/src/Mod/Mesh/App/Core/Segmentation.h b/src/Mod/Mesh/App/Core/Segmentation.h index f17593a35d..543e10c4c2 100644 --- a/src/Mod/Mesh/App/Core/Segmentation.h +++ b/src/Mod/Mesh/App/Core/Segmentation.h @@ -75,11 +75,11 @@ class MeshExport MeshDistancePlanarSegment : public MeshDistanceSurfaceSegment { public: MeshDistancePlanarSegment(const MeshKernel& mesh, unsigned long minFacets, float tol); - virtual ~MeshDistancePlanarSegment(); - bool TestFacet (const MeshFacet& rclFacet) const; - const char* GetType() const { return "Plane"; } - void Initialize(FacetIndex); - void AddFacet(const MeshFacet& rclFacet); + ~MeshDistancePlanarSegment() override; + bool TestFacet (const MeshFacet& rclFacet) const override; + const char* GetType() const override { return "Plane"; } + void Initialize(FacetIndex) override; + void AddFacet(const MeshFacet& rclFacet) override; protected: Base::Vector3f basepoint; @@ -107,15 +107,15 @@ class MeshExport PlaneSurfaceFit : public AbstractSurfaceFit public: PlaneSurfaceFit(); PlaneSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& n); - ~PlaneSurfaceFit(); - const char* GetType() const { return "Plane"; } - void Initialize(const MeshGeomFacet&); - bool TestTriangle(const MeshGeomFacet&) const; - void AddTriangle(const MeshGeomFacet&); - bool Done() const; - float Fit(); - float GetDistanceToSurface(const Base::Vector3f&) const; - std::vector Parameters() const; + ~PlaneSurfaceFit() override; + const char* GetType() const override { return "Plane"; } + void Initialize(const MeshGeomFacet&) override; + bool TestTriangle(const MeshGeomFacet&) const override; + void AddTriangle(const MeshGeomFacet&) override; + bool Done() const override; + float Fit() override; + float GetDistanceToSurface(const Base::Vector3f&) const override; + std::vector Parameters() const override; private: Base::Vector3f basepoint; @@ -128,15 +128,15 @@ class MeshExport CylinderSurfaceFit : public AbstractSurfaceFit public: CylinderSurfaceFit(); CylinderSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& a, float r); - ~CylinderSurfaceFit(); - const char* GetType() const { return "Cylinder"; } - void Initialize(const MeshGeomFacet&); - bool TestTriangle(const MeshGeomFacet&) const; - void AddTriangle(const MeshGeomFacet&); - bool Done() const; - float Fit(); - float GetDistanceToSurface(const Base::Vector3f&) const; - std::vector Parameters() const; + ~CylinderSurfaceFit() override; + const char* GetType() const override { return "Cylinder"; } + void Initialize(const MeshGeomFacet&) override; + bool TestTriangle(const MeshGeomFacet&) const override; + void AddTriangle(const MeshGeomFacet&) override; + bool Done() const override; + float Fit() override; + float GetDistanceToSurface(const Base::Vector3f&) const override; + std::vector Parameters() const override; private: Base::Vector3f basepoint; @@ -150,15 +150,15 @@ class MeshExport SphereSurfaceFit : public AbstractSurfaceFit public: SphereSurfaceFit(); SphereSurfaceFit(const Base::Vector3f& c, float r); - ~SphereSurfaceFit(); - const char* GetType() const { return "Sphere"; } - void Initialize(const MeshGeomFacet&); - bool TestTriangle(const MeshGeomFacet&) const; - void AddTriangle(const MeshGeomFacet&); - bool Done() const; - float Fit(); - float GetDistanceToSurface(const Base::Vector3f&) const; - std::vector Parameters() const; + ~SphereSurfaceFit() override; + const char* GetType() const override { return "Sphere"; } + void Initialize(const MeshGeomFacet&) override; + bool TestTriangle(const MeshGeomFacet&) const override; + void AddTriangle(const MeshGeomFacet&) override; + bool Done() const override; + float Fit() override; + float GetDistanceToSurface(const Base::Vector3f&) const override; + std::vector Parameters() const override; private: Base::Vector3f center; @@ -171,12 +171,12 @@ class MeshExport MeshDistanceGenericSurfaceFitSegment : public MeshDistanceSurfa public: MeshDistanceGenericSurfaceFitSegment(AbstractSurfaceFit*, const MeshKernel& mesh, unsigned long minFacets, float tol); - virtual ~MeshDistanceGenericSurfaceFitSegment(); - bool TestFacet (const MeshFacet& rclFacet) const; - const char* GetType() const { return fitter->GetType(); } - void Initialize(FacetIndex); - bool TestInitialFacet(FacetIndex) const; - void AddFacet(const MeshFacet& rclFacet); + ~MeshDistanceGenericSurfaceFitSegment() override; + bool TestFacet (const MeshFacet& rclFacet) const override; + const char* GetType() const override { return fitter->GetType(); } + void Initialize(FacetIndex) override; + bool TestInitialFacet(FacetIndex) const override; + void AddFacet(const MeshFacet& rclFacet) override; std::vector Parameters() const; protected: @@ -200,8 +200,8 @@ class MeshExport MeshCurvaturePlanarSegment : public MeshCurvatureSurfaceSegment public: MeshCurvaturePlanarSegment(const std::vector& ci, unsigned long minFacets, float tol) : MeshCurvatureSurfaceSegment(ci, minFacets), tolerance(tol) {} - virtual bool TestFacet (const MeshFacet &rclFacet) const; - virtual const char* GetType() const { return "Plane"; } + bool TestFacet (const MeshFacet &rclFacet) const override; + const char* GetType() const override { return "Plane"; } private: float tolerance; @@ -213,8 +213,8 @@ public: MeshCurvatureCylindricalSegment(const std::vector& ci, unsigned long minFacets, float tolMin, float tolMax, float curv) : MeshCurvatureSurfaceSegment(ci, minFacets), toleranceMin(tolMin), toleranceMax(tolMax) { curvature = curv;} - virtual bool TestFacet (const MeshFacet &rclFacet) const; - virtual const char* GetType() const { return "Cylinder"; } + bool TestFacet (const MeshFacet &rclFacet) const override; + const char* GetType() const override { return "Cylinder"; } private: float curvature; @@ -227,8 +227,8 @@ class MeshExport MeshCurvatureSphericalSegment : public MeshCurvatureSurfaceSegm public: MeshCurvatureSphericalSegment(const std::vector& ci, unsigned long minFacets, float tol, float curv) : MeshCurvatureSurfaceSegment(ci, minFacets), tolerance(tol) { curvature = curv;} - virtual bool TestFacet (const MeshFacet &rclFacet) const; - virtual const char* GetType() const { return "Sphere"; } + bool TestFacet (const MeshFacet &rclFacet) const override; + const char* GetType() const override { return "Sphere"; } private: float curvature; @@ -242,8 +242,8 @@ public: float tolMin, float tolMax, float c1, float c2) : MeshCurvatureSurfaceSegment(ci, minFacets), c1(c1), c2(c2), toleranceMin(tolMin), toleranceMax(tolMax) {} - virtual bool TestFacet (const MeshFacet &rclFacet) const; - virtual const char* GetType() const { return "Freeform"; } + bool TestFacet (const MeshFacet &rclFacet) const override; + const char* GetType() const override { return "Freeform"; } private: float c1, c2; @@ -255,11 +255,11 @@ class MeshExport MeshSurfaceVisitor : public MeshFacetVisitor { public: MeshSurfaceVisitor (MeshSurfaceSegment& segm, std::vector &indices); - virtual ~MeshSurfaceVisitor (); + ~MeshSurfaceVisitor () override; bool AllowVisit (const MeshFacet& face, const MeshFacet&, - FacetIndex, unsigned long, unsigned short neighbourIndex); + FacetIndex, unsigned long, unsigned short neighbourIndex) override; bool Visit (const MeshFacet & face, const MeshFacet &, - FacetIndex ulFInd, unsigned long); + FacetIndex ulFInd, unsigned long) override; protected: std::vector &indices; diff --git a/src/Mod/Mesh/App/Core/SetOperations.h b/src/Mod/Mesh/App/Core/SetOperations.h index d2943bf994..155a6f2177 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.h +++ b/src/Mod/Mesh/App/Core/SetOperations.h @@ -155,8 +155,8 @@ private: Base::Builder3D& _builder; CollectFacetVisitor (const MeshKernel& mesh, std::vector& facets, std::map& edges, int side, float mult, Base::Builder3D& builder); - bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel); - bool AllowVisit (const MeshFacet& rclFacet, const MeshFacet& rclFrom, FacetIndex ulFInd, unsigned long ulLevel, unsigned short neighbourIndex); + bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel) override; + bool AllowVisit (const MeshFacet& rclFacet, const MeshFacet& rclFrom, FacetIndex ulFInd, unsigned long ulLevel, unsigned short neighbourIndex) override; }; /** all points from cut */ diff --git a/src/Mod/Mesh/App/Core/Smoothing.h b/src/Mod/Mesh/App/Core/Smoothing.h index ed39aa0126..1a6fcae5a1 100644 --- a/src/Mod/Mesh/App/Core/Smoothing.h +++ b/src/Mod/Mesh/App/Core/Smoothing.h @@ -69,12 +69,12 @@ class MeshExport PlaneFitSmoothing : public AbstractSmoothing { public: PlaneFitSmoothing(MeshKernel&); - virtual ~PlaneFitSmoothing(); + ~PlaneFitSmoothing() override; void SetMaximum(float max) { maximum = max; } - void Smooth(unsigned int); - void SmoothPoints(unsigned int, const std::vector&); + void Smooth(unsigned int) override; + void SmoothPoints(unsigned int, const std::vector&) override; private: float maximum; @@ -84,9 +84,9 @@ class MeshExport LaplaceSmoothing : public AbstractSmoothing { public: LaplaceSmoothing(MeshKernel&); - virtual ~LaplaceSmoothing(); - void Smooth(unsigned int); - void SmoothPoints(unsigned int, const std::vector&); + ~LaplaceSmoothing() override; + void Smooth(unsigned int) override; + void SmoothPoints(unsigned int, const std::vector&) override; void SetLambda(double l) { lambda = l;} protected: @@ -104,9 +104,9 @@ class MeshExport TaubinSmoothing : public LaplaceSmoothing { public: TaubinSmoothing(MeshKernel&); - virtual ~TaubinSmoothing(); - void Smooth(unsigned int); - void SmoothPoints(unsigned int, const std::vector&); + ~TaubinSmoothing() override; + void Smooth(unsigned int) override; + void SmoothPoints(unsigned int, const std::vector&) override; void SetMicro(double m) { micro = m;} protected: diff --git a/src/Mod/Mesh/App/Core/SphereFit.h b/src/Mod/Mesh/App/Core/SphereFit.h index 1b475f36a0..2064849f7e 100644 --- a/src/Mod/Mesh/App/Core/SphereFit.h +++ b/src/Mod/Mesh/App/Core/SphereFit.h @@ -45,7 +45,7 @@ public: /** * Destruction */ - virtual ~SphereFit(); + ~SphereFit() override; /** * Set approximations before calling Fit() @@ -75,7 +75,7 @@ public: /** * Fit a sphere onto the given points. If the fit fails FLOAT_MAX is returned. */ - float Fit(); + float Fit() override; /** * Returns the distance from the point \a rcPoint to the fitted sphere. If Fit() has not been * called FLOAT_MAX is returned. diff --git a/src/Mod/Mesh/App/Core/Triangulation.h b/src/Mod/Mesh/App/Core/Triangulation.h index 805a835823..3ac1bb168a 100644 --- a/src/Mod/Mesh/App/Core/Triangulation.h +++ b/src/Mod/Mesh/App/Core/Triangulation.h @@ -47,12 +47,12 @@ public: class MeshExport TriangulationVerifierV2 : public TriangulationVerifier { public: - virtual bool Accept(const Base::Vector3f& n, + bool Accept(const Base::Vector3f& n, const Base::Vector3f& p1, const Base::Vector3f& p2, - const Base::Vector3f& p3) const; - virtual bool MustFlip(const Base::Vector3f& n1, - const Base::Vector3f& n2) const; + const Base::Vector3f& p3) const override; + bool MustFlip(const Base::Vector3f& n1, + const Base::Vector3f& n2) const override; }; class MeshExport AbstractPolygonTriangulator @@ -149,10 +149,10 @@ class MeshExport EarClippingTriangulator : public AbstractPolygonTriangulator { public: EarClippingTriangulator(); - ~EarClippingTriangulator(); + ~EarClippingTriangulator() override; protected: - bool Triangulate(); + bool Triangulate() override; private: /** @@ -191,42 +191,42 @@ class MeshExport QuasiDelaunayTriangulator : public EarClippingTriangulator { public: QuasiDelaunayTriangulator(); - ~QuasiDelaunayTriangulator(); + ~QuasiDelaunayTriangulator() override; protected: - bool Triangulate(); + bool Triangulate() override; }; class MeshExport DelaunayTriangulator : public AbstractPolygonTriangulator { public: DelaunayTriangulator(); - ~DelaunayTriangulator(); + ~DelaunayTriangulator() override; protected: - bool Triangulate(); + bool Triangulate() override; }; class MeshExport FlatTriangulator : public AbstractPolygonTriangulator { public: FlatTriangulator(); - ~FlatTriangulator(); + ~FlatTriangulator() override; - void PostProcessing(const std::vector&); + void PostProcessing(const std::vector&) override; protected: - bool Triangulate(); + bool Triangulate() override; }; class MeshExport ConstraintDelaunayTriangulator : public AbstractPolygonTriangulator { public: ConstraintDelaunayTriangulator(float area); - ~ConstraintDelaunayTriangulator(); + ~ConstraintDelaunayTriangulator() override; protected: - bool Triangulate(); + bool Triangulate() override; private: float fMaxArea; diff --git a/src/Mod/Mesh/App/Core/Visitor.h b/src/Mod/Mesh/App/Core/Visitor.h index ea06184496..4e7d7b51e9 100644 --- a/src/Mod/Mesh/App/Core/Visitor.h +++ b/src/Mod/Mesh/App/Core/Visitor.h @@ -80,7 +80,7 @@ class MeshExport MeshSearchNeighbourFacetsVisitor : public MeshFacetVisitor { public: MeshSearchNeighbourFacetsVisitor (const MeshKernel &rclMesh, float fRadius, FacetIndex ulStartFacetIdx); - virtual ~MeshSearchNeighbourFacetsVisitor () {} + ~MeshSearchNeighbourFacetsVisitor () override {} /** Checks the facet if it lies inside the search radius. */ inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel); /** Resets the VISIT flag of already visited facets. */ @@ -124,7 +124,7 @@ class MeshExport MeshTopFacetVisitor : public MeshFacetVisitor { public: MeshTopFacetVisitor (std::vector &raulNB) : _raulNeighbours(raulNB) {} - virtual ~MeshTopFacetVisitor () {} + ~MeshTopFacetVisitor () override {} /** Collects the facet indices. */ virtual bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long) @@ -152,7 +152,7 @@ public: FacetIndex index, float deviation, std::vector &indices); - virtual ~MeshPlaneVisitor (); + ~MeshPlaneVisitor () override; bool AllowVisit (const MeshFacet& face, const MeshFacet&, FacetIndex, unsigned long, unsigned short neighbourIndex); bool Visit (const MeshFacet & face, const MeshFacet &, diff --git a/src/Mod/Mesh/App/Exporter.h b/src/Mod/Mesh/App/Exporter.h index 9ed7f7243c..96e8000f61 100644 --- a/src/Mod/Mesh/App/Exporter.h +++ b/src/Mod/Mesh/App/Exporter.h @@ -77,7 +77,7 @@ class MergeExporter : public Exporter { public: MergeExporter(std::string fileName, MeshCore::MeshIO::Format fmt); - ~MergeExporter(); + ~MergeExporter() override; bool addMesh(const char *name, const MeshObject & mesh) override; @@ -103,7 +103,7 @@ class AmfExporter : public Exporter bool compress = true); /// Writes AMF footer - ~AmfExporter(); + ~AmfExporter() override; bool addMesh(const char *name, const MeshObject & mesh) override; diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.h b/src/Mod/Mesh/App/FeatureMeshCurvature.h index bef9907d63..17a7b2a7e0 100644 --- a/src/Mod/Mesh/App/FeatureMeshCurvature.h +++ b/src/Mod/Mesh/App/FeatureMeshCurvature.h @@ -51,10 +51,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "MeshGui::ViewProviderMeshCurvature"; } //@} diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.h b/src/Mod/Mesh/App/FeatureMeshDefects.h index 0c336127c9..572985c236 100644 --- a/src/Mod/Mesh/App/FeatureMeshDefects.h +++ b/src/Mod/Mesh/App/FeatureMeshDefects.h @@ -42,7 +42,7 @@ class MeshExport FixDefects : public Mesh::Feature public: /// Constructor FixDefects(); - virtual ~FixDefects(); + ~FixDefects() override; /** @name Properties */ //@{ @@ -53,8 +53,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider @@ -72,12 +72,12 @@ class MeshExport HarmonizeNormals : public Mesh::FixDefects public: /// Constructor HarmonizeNormals(); - virtual ~HarmonizeNormals(); + ~HarmonizeNormals() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -92,12 +92,12 @@ class MeshExport FlipNormals : public Mesh::FixDefects public: /// Constructor FlipNormals(); - virtual ~FlipNormals(); + ~FlipNormals() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -112,12 +112,12 @@ class MeshExport FixNonManifolds : public Mesh::FixDefects public: /// Constructor FixNonManifolds(); - virtual ~FixNonManifolds(); + ~FixNonManifolds() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -132,12 +132,12 @@ class MeshExport FixDuplicatedFaces : public Mesh::FixDefects public: /// Constructor FixDuplicatedFaces(); - virtual ~FixDuplicatedFaces(); + ~FixDuplicatedFaces() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -152,12 +152,12 @@ class MeshExport FixDuplicatedPoints : public Mesh::FixDefects public: /// Constructor FixDuplicatedPoints(); - virtual ~FixDuplicatedPoints(); + ~FixDuplicatedPoints() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -172,12 +172,12 @@ class MeshExport FixDegenerations : public Mesh::FixDefects public: /// Constructor FixDegenerations(); - virtual ~FixDegenerations(); + ~FixDegenerations() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -192,7 +192,7 @@ class MeshExport FixDeformations : public Mesh::FixDefects public: /// Constructor FixDeformations(); - virtual ~FixDeformations(); + ~FixDeformations() override; /** @name Properties */ //@{ @@ -201,7 +201,7 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -216,12 +216,12 @@ class MeshExport FixIndices : public Mesh::FixDefects public: /// Constructor FixIndices(); - virtual ~FixIndices(); + ~FixIndices() override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -236,14 +236,14 @@ class MeshExport FillHoles : public Mesh::FixDefects public: /// Constructor FillHoles(); - virtual ~FillHoles(); + ~FillHoles() override; App::PropertyInteger FillupHolesOfLength; App::PropertyFloat MaxArea; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; @@ -258,13 +258,13 @@ class MeshExport RemoveComponents : public Mesh::FixDefects public: /// Constructor RemoveComponents(); - virtual ~RemoveComponents(); + ~RemoveComponents() override; App::PropertyInteger RemoveCompOfSize; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshExport.h b/src/Mod/Mesh/App/FeatureMeshExport.h index d18211d38b..0b0f6f8be5 100644 --- a/src/Mod/Mesh/App/FeatureMeshExport.h +++ b/src/Mod/Mesh/App/FeatureMeshExport.h @@ -48,15 +48,15 @@ public: App::PropertyLink Source; App::PropertyString FileName; App::PropertyString Format; - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "MeshGui::ViewProviderExport"; } /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshImport.h b/src/Mod/Mesh/App/FeatureMeshImport.h index 4632ac4167..f79b9dbffa 100644 --- a/src/Mod/Mesh/App/FeatureMeshImport.h +++ b/src/Mod/Mesh/App/FeatureMeshImport.h @@ -49,8 +49,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h index 29295b9f8e..747b558ce4 100644 --- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h +++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h @@ -56,8 +56,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.h b/src/Mod/Mesh/App/FeatureMeshSetOperations.h index 2e0baa8042..edc0694b73 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.h +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.h @@ -54,8 +54,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.h b/src/Mod/Mesh/App/FeatureMeshSolid.h index d1ed0b3847..3f6c7e975e 100644 --- a/src/Mod/Mesh/App/FeatureMeshSolid.h +++ b/src/Mod/Mesh/App/FeatureMeshSolid.h @@ -48,9 +48,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; @@ -70,9 +70,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; @@ -94,9 +94,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; @@ -119,9 +119,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; @@ -141,9 +141,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; @@ -163,9 +163,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; //@} }; diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.h b/src/Mod/Mesh/App/FeatureMeshTransform.h index b619244f24..531ed7b345 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransform.h +++ b/src/Mod/Mesh/App/FeatureMeshTransform.h @@ -52,9 +52,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "MeshGui::ViewProviderMeshTransform"; } //@} diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h index c56f83e1ef..d6392802b7 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h +++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h @@ -51,9 +51,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "MeshGui::ViewProviderMeshTransformDemolding"; } //@} diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h index f875760f07..64195d24fb 100644 --- a/src/Mod/Mesh/App/Mesh.h +++ b/src/Mod/Mesh/App/Mesh.h @@ -66,7 +66,7 @@ class MeshExport MeshSegment : public Data::Segment TYPESYSTEM_HEADER(); public: - virtual std::string getName() const { + std::string getName() const override { return "MeshSegment"; } @@ -101,7 +101,7 @@ public: explicit MeshObject(const MeshCore::MeshKernel& Kernel); explicit MeshObject(const MeshCore::MeshKernel& Kernel, const Base::Matrix4D &Mtrx); MeshObject(const MeshObject&); - virtual ~MeshObject(); + ~MeshObject() override; void operator = (const MeshObject&); @@ -111,21 +111,21 @@ public: * List of different subelement types * its NOT a list of the subelements itself */ - virtual std::vector getElementTypes() const; - virtual unsigned long countSubElements(const char* Type) const; + std::vector getElementTypes() const override; + unsigned long countSubElements(const char* Type) const override; /// get the subelement by type and number - virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; + Data::Segment* getSubElement(const char* Type, unsigned long) const override; /** Get faces from segment */ - virtual void getFacesFromSubElement( + void getFacesFromSubElement( const Data::Segment*, std::vector &Points, std::vector &PointNormals, - std::vector &faces) const; + std::vector &faces) const override; //@} - void setTransform(const Base::Matrix4D& rclTrf); - Base::Matrix4D getTransform() const; - void transformGeometry(const Base::Matrix4D &rclMat); + void setTransform(const Base::Matrix4D& rclTrf) override; + Base::Matrix4D getTransform() const override; + void transformGeometry(const Base::Matrix4D &rclMat) override; /** * Swaps the content of \a Kernel and the internal mesh kernel. @@ -148,11 +148,11 @@ public: double getSurface() const; double getVolume() const; /** Get points from object with given accuracy */ - virtual void getPoints(std::vector &Points, + void getPoints(std::vector &Points, std::vector &Normals, - float Accuracy, uint16_t flags=0) const; - virtual void getFaces(std::vector &Points,std::vector &Topo, - float Accuracy, uint16_t flags=0) const; + float Accuracy, uint16_t flags=0) const override; + void getFaces(std::vector &Points,std::vector &Topo, + float Accuracy, uint16_t flags=0) const override; std::vector getPointsFromFacets(const std::vector& facets) const; bool nearestFacetOnRay(const TRay& ray, double maxAngle, TFaceSection& output) const; std::vector foraminate(const TRay& ray, double maxAngle) const; @@ -164,17 +164,17 @@ public: const MeshCore::MeshKernel& getKernel() const { return _kernel; } - virtual Base::BoundBox3d getBoundBox() const; - virtual bool getCenterOfGravity(Base::Vector3d& center) const; + Base::BoundBox3d getBoundBox() const override; + bool getCenterOfGravity(Base::Vector3d& center) const override; /** @name I/O */ //@{ // Implemented from Persistence - unsigned int getMemSize () const; - void Save (Base::Writer &writer) const; - void SaveDocFile (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); - void RestoreDocFile(Base::Reader &reader); + unsigned int getMemSize () const override; + void Save (Base::Writer &writer) const override; + void SaveDocFile (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; + void RestoreDocFile(Base::Reader &reader) override; void save(const char* file,MeshCore::MeshIO::Format f=MeshCore::MeshIO::Undefined, const MeshCore::Material* mat = nullptr, const char* objectname = nullptr) const; diff --git a/src/Mod/Mesh/App/MeshFeature.h b/src/Mod/Mesh/App/MeshFeature.h index d9b2438dcd..8d76f82602 100644 --- a/src/Mod/Mesh/App/MeshFeature.h +++ b/src/Mod/Mesh/App/MeshFeature.h @@ -58,7 +58,7 @@ class MeshExport Feature : public App::GeoFeature public: /// Constructor Feature(); - virtual ~Feature(); + ~Feature() override; /** @name Properties */ //@{ @@ -69,20 +69,20 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); - virtual void onChanged(const App::Property* prop); + App::DocumentObjectExecReturn *execute() override; + void onChanged(const App::Property* prop) override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "MeshGui::ViewProviderMeshFaceSet"; } - virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const { + const App::PropertyComplexGeoData* getPropertyOfGeometry() const override { return &Mesh; } /// handles the MeshPy object - virtual PyObject* getPyObject(); + PyObject* getPyObject() override; }; typedef App::FeatureCustomT FeatureCustom; diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h index ea007cf8ca..b780af48d4 100644 --- a/src/Mod/Mesh/App/MeshProperties.h +++ b/src/Mod/Mesh/App/MeshProperties.h @@ -56,10 +56,10 @@ class MeshExport PropertyNormalList: public App::PropertyLists public: PropertyNormalList(); - ~PropertyNormalList(); + ~PropertyNormalList() override; - virtual void setSize(int newSize); - virtual int getSize() const; + void setSize(int newSize) override; + int getSize() const override; void setValue(const Base::Vector3f&); void setValue(float x, float y, float z); @@ -78,19 +78,19 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual App::Property *Copy() const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize () const; + unsigned int getMemSize () const override; void transformGeometry(const Base::Matrix4D &rclMat); @@ -123,10 +123,10 @@ public: public: PropertyCurvatureList(); - ~PropertyCurvatureList(); + ~PropertyCurvatureList() override; - void setSize(int newSize){_lValueList.resize(newSize);} - int getSize() const {return _lValueList.size();} + void setSize(int newSize) override{_lValueList.resize(newSize);} + int getSize() const override {return _lValueList.size();} std::vector getCurvature( int tMode) const; void setValue(const CurvatureInfo&); void setValues(const std::vector&); @@ -143,22 +143,22 @@ public: } void transformGeometry(const Base::Matrix4D &rclMat); - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; /** @name Python interface */ //@{ - PyObject* getPyObject(); - void setPyObject(PyObject *value); + PyObject* getPyObject() override; + void setPyObject(PyObject *value) override; //@} - App::Property *Copy() const; - void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize () const{return _lValueList.size() * sizeof(CurvatureInfo);} + unsigned int getMemSize () const override{return _lValueList.size() * sizeof(CurvatureInfo);} private: std::vector _lValueList; @@ -173,7 +173,7 @@ class MeshExport PropertyMeshKernel : public App::PropertyComplexGeoData public: PropertyMeshKernel(); - ~PropertyMeshKernel(); + ~PropertyMeshKernel() override; /** @name Getter/setter */ //@{ @@ -199,14 +199,14 @@ public: */ const MeshObject &getValue() const; const MeshObject *getValuePtr() const; - virtual unsigned int getMemSize () const; + unsigned int getMemSize () const override; //@} /** @name Getting basic geometric entities */ //@{ - const Data::ComplexGeoData* getComplexData() const; + const Data::ComplexGeoData* getComplexData() const override; /** Returns the bounding box around the underlying mesh kernel */ - Base::BoundBox3d getBoundingBox() const; + Base::BoundBox3d getBoundingBox() const override; //@} /** @name Modification */ @@ -214,10 +214,10 @@ public: MeshObject* startEditing(); void finishEditing(); /// Transform the real mesh data - void transformGeometry(const Base::Matrix4D &rclMat); + void transformGeometry(const Base::Matrix4D &rclMat) override; void setPointIndices( const std::vector >& ); - void setTransform(const Base::Matrix4D& rclTrf); - Base::Matrix4D getTransform() const; + void setTransform(const Base::Matrix4D& rclTrf) override; + Base::Matrix4D getTransform() const override; //@} /** @name Python interface */ @@ -226,29 +226,29 @@ public: * create a copy. However, the Python wrapper is marked as \a immutable so * that the mesh object cannot be modified from outside. */ - PyObject* getPyObject(); + PyObject* getPyObject() override; /** This method copies the content, hence creates an new mesh object * to copy the data. The passed argument can be an instance of the Python * wrapper for the mesh object or simply a list of triangles, i.e. a list * of lists of three floats. */ - void setPyObject(PyObject *value); + void setPyObject(PyObject *value) override; //@} - const char* getEditorName() const { + const char* getEditorName() const override { return "MeshGui::PropertyMeshKernelItem"; } /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - App::Property *Copy() const; - void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; //@} private: diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp index 9f8ab0a3be..ccacd9eb86 100644 --- a/src/Mod/Mesh/Gui/AppMeshGui.cpp +++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp @@ -84,7 +84,7 @@ public: initialize("This module is the MeshGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object convertToSTL(const Py::Tuple& args) diff --git a/src/Mod/Mesh/Gui/DlgDecimating.h b/src/Mod/Mesh/Gui/DlgDecimating.h index cddcef6e3b..e0420cb4f7 100644 --- a/src/Mod/Mesh/Gui/DlgDecimating.h +++ b/src/Mod/Mesh/Gui/DlgDecimating.h @@ -37,7 +37,7 @@ class DlgDecimating : public QWidget public: DlgDecimating(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgDecimating(); + ~DlgDecimating() override; void setNumberOfTriangles(int); double tolerance() const; double reduction() const; @@ -61,14 +61,14 @@ class TaskDecimating : public Gui::TaskView::TaskDialog public: TaskDecimating(); - ~TaskDecimating(); + ~TaskDecimating() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return true; } private: diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h index b25547a1d9..dfe656bc71 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h @@ -71,19 +71,19 @@ class DlgEvaluateMeshImp : public QDialog, public App::DocumentObserver public: DlgEvaluateMeshImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgEvaluateMeshImp(); + ~DlgEvaluateMeshImp() override; void setMesh(Mesh::Feature*); private: /** Checks if the given document is about to be closed */ - void slotDeletedDocument(const App::Document& Doc); + void slotDeletedDocument(const App::Document& Doc) override; /** Checks if a new object was added. */ - void slotCreatedObject(const App::DocumentObject& Obj); + void slotCreatedObject(const App::DocumentObject& Obj) override; /** Checks if the given object is about to be removed. */ - void slotDeletedObject(const App::DocumentObject& Obj); + void slotDeletedObject(const App::DocumentObject& Obj) override; /** The property of an observed object has changed */ - void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); + void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; protected Q_SLOTS: void on_checkOrientationButton_clicked(); @@ -132,7 +132,7 @@ protected: void addViewProvider(const char* vp, const std::vector& indices); void removeViewProvider(const char* vp); void removeViewProviders(); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -149,15 +149,15 @@ class DockEvaluateMeshImp : public DlgEvaluateMeshImp protected: DockEvaluateMeshImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); - ~DockEvaluateMeshImp(); - void closeEvent(QCloseEvent* e); + ~DockEvaluateMeshImp() override; + void closeEvent(QCloseEvent* e) override; public: static DockEvaluateMeshImp* instance(); static void destruct(); static bool hasInstance(); - QSize sizeHint () const; + QSize sizeHint () const override; private: QScrollArea* scrollArea; diff --git a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h index 639c1c5447..84edaca231 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h @@ -39,7 +39,7 @@ class DlgEvaluateSettings : public QDialog public: DlgEvaluateSettings(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgEvaluateSettings(); + ~DlgEvaluateSettings() override; void setNonmanifoldPointsChecked(bool); bool isNonmanifoldPointsChecked() const; diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h index b5afea5685..0b3c996f1a 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h +++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h @@ -35,13 +35,13 @@ class DlgRegularSolidImp : public QDialog public: DlgRegularSolidImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgRegularSolidImp(); + ~DlgRegularSolidImp() override; public Q_SLOTS: void on_createSolidButton_clicked(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h index b27e0077bc..455b486e1f 100644 --- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h +++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h @@ -42,12 +42,12 @@ class DlgSettingsImportExport : public Gui::Dialog::PreferencePage public: DlgSettingsImportExport(QWidget* parent = nullptr); - ~DlgSettingsImportExport(); + ~DlgSettingsImportExport() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: Ui_DlgSettingsImportExport* ui; diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h index 2e567094a2..c8f5fd7cdd 100644 --- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h +++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h @@ -43,12 +43,12 @@ class DlgSettingsMeshView : public Gui::Dialog::PreferencePage public: DlgSettingsMeshView(QWidget* parent = nullptr); - ~DlgSettingsMeshView(); + ~DlgSettingsMeshView() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h index 06eb1d37c0..9cca46b606 100644 --- a/src/Mod/Mesh/Gui/DlgSmoothing.h +++ b/src/Mod/Mesh/Gui/DlgSmoothing.h @@ -50,7 +50,7 @@ public: }; DlgSmoothing(QWidget* parent = nullptr); - ~DlgSmoothing(); + ~DlgSmoothing() override; int iterations() const; double lambdaStep() const; double microStep() const; @@ -78,7 +78,7 @@ class MeshGuiExport SmoothingDialog : public QDialog public: SmoothingDialog(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~SmoothingDialog(); + ~SmoothingDialog() override; int iterations() const { return widget->iterations(); } @@ -104,14 +104,14 @@ class TaskSmoothing : public Gui::TaskView::TaskDialog public: TaskSmoothing(); - ~TaskSmoothing(); + ~TaskSmoothing() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return true; } private: diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h index 225c40ab9a..942be9b073 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.h +++ b/src/Mod/Mesh/Gui/MeshEditor.h @@ -52,13 +52,13 @@ class MeshGuiExport ViewProviderFace : public Gui::ViewProviderDocumentObject public: ViewProviderFace(); - virtual ~ViewProviderFace(); + ~ViewProviderFace() override; // Build up the initial Inventor node - void attach(App::DocumentObject* obj); - void setDisplayMode(const char* ModeName); - const char* getDefaultDisplayMode() const; - std::vector getDisplayModes() const; + void attach(App::DocumentObject* obj) override; + void setDisplayMode(const char* ModeName) override; + const char* getDefaultDisplayMode() const override; + std::vector getDisplayModes() const override; SoPickedPoint* getPickedPoint(const SbVec2s& pos, const Gui::View3DInventorViewer* viewer) const; ViewProviderMesh* mesh; @@ -80,7 +80,7 @@ class MeshGuiExport MeshFaceAddition : public QObject public: MeshFaceAddition(Gui::View3DInventor* parent); - ~MeshFaceAddition(); + ~MeshFaceAddition() override; void startEditing(ViewProviderMesh*); @@ -127,7 +127,7 @@ class MeshGuiExport MeshFillHole : public QObject public: MeshFillHole(MeshHoleFiller& hf, Gui::View3DInventor* parent); - virtual ~MeshFillHole(); + ~MeshFillHole() override; void startEditing(ViewProviderMesh*); diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.h b/src/Mod/Mesh/Gui/PropertyEditorMesh.h index c56f5540b8..2887de68ea 100644 --- a/src/Mod/Mesh/Gui/PropertyEditorMesh.h +++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.h @@ -42,22 +42,22 @@ class MeshGuiExport PropertyMeshKernelItem : public Gui::PropertyEditor::Propert Q_PROPERTY(int Faces READ countFaces CONSTANT) PROPERTYITEM_HEADER - virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; - virtual void setEditorData(QWidget *editor, const QVariant& data) const; - virtual QVariant editorData(QWidget *editor) const; + QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override; + void setEditorData(QWidget *editor, const QVariant& data) const override; + QVariant editorData(QWidget *editor) const override; int countPoints() const; int countEdges() const; int countFaces() const; protected: - virtual QVariant toolTip(const App::Property*) const; - virtual QVariant value(const App::Property*) const; - virtual void setValue(const QVariant&); + QVariant toolTip(const App::Property*) const override; + QVariant value(const App::Property*) const override; + void setValue(const QVariant&) override; protected: PropertyMeshKernelItem(); - void initialize(); + void initialize() override; private: Gui::PropertyEditor::PropertyIntegerItem* m_p; diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h index c485c14df2..98d1cf4c23 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.h +++ b/src/Mod/Mesh/Gui/RemeshGmsh.h @@ -53,12 +53,12 @@ class MeshGuiExport GmshWidget : public QWidget public: GmshWidget(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~GmshWidget(); + ~GmshWidget() override; void accept(); void reject(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; int meshingAlgorithm() const; double getAngle() const; double getMaxSize() const; @@ -91,11 +91,11 @@ class MeshGuiExport RemeshGmsh : public GmshWidget public: RemeshGmsh(Mesh::Feature* mesh, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~RemeshGmsh(); + ~RemeshGmsh() override; protected: - virtual bool writeProject(QString& inpFile, QString& outFile); - virtual bool loadOutput(); + bool writeProject(QString& inpFile, QString& outFile) override; + bool loadOutput() override; private: class Private; @@ -111,14 +111,14 @@ class TaskRemeshGmsh : public Gui::TaskView::TaskDialog public: TaskRemeshGmsh(Mesh::Feature* mesh); - ~TaskRemeshGmsh(); + ~TaskRemeshGmsh() override; public: - void clicked(int); + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Apply | QDialogButtonBox::Close; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return true; } private: diff --git a/src/Mod/Mesh/Gui/RemoveComponents.h b/src/Mod/Mesh/Gui/RemoveComponents.h index 113caac297..ee683ef5d3 100644 --- a/src/Mod/Mesh/Gui/RemoveComponents.h +++ b/src/Mod/Mesh/Gui/RemoveComponents.h @@ -43,7 +43,7 @@ class MeshGuiExport RemoveComponents : public QWidget public: RemoveComponents(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~RemoveComponents(); + ~RemoveComponents() override; void reject(); void deleteSelection(); void invertSelection(); @@ -63,7 +63,7 @@ public Q_SLOTS: void on_cbDeselectComp_toggled(bool); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: Ui_RemoveComponents* ui; @@ -79,8 +79,8 @@ class MeshGuiExport RemoveComponentsDialog : public QDialog public: RemoveComponentsDialog(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~RemoveComponentsDialog(); - void reject(); + ~RemoveComponentsDialog() override; + void reject() override; private Q_SLOTS: void clicked(QAbstractButton* btn); @@ -98,17 +98,17 @@ class TaskRemoveComponents : public Gui::TaskView::TaskDialog public: TaskRemoveComponents(); - ~TaskRemoveComponents(); + ~TaskRemoveComponents() override; public: - bool accept(); - void clicked(int); + bool accept() override; + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Close; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return true; } - virtual void modifyStandardButtons(QDialogButtonBox*); + void modifyStandardButtons(QDialogButtonBox*) override; private: RemoveComponents* widget; diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h index 8e4a8f0c45..04e8113fad 100644 --- a/src/Mod/Mesh/Gui/Segmentation.h +++ b/src/Mod/Mesh/Gui/Segmentation.h @@ -41,11 +41,11 @@ class MeshGuiExport Segmentation : public QWidget { public: Segmentation(Mesh::Feature* mesh, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~Segmentation(); + ~Segmentation() override; void accept(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: Ui_Segmentation* ui; @@ -59,12 +59,12 @@ class TaskSegmentation : public Gui::TaskView::TaskDialog { public: TaskSegmentation(Mesh::Feature* mesh); - ~TaskSegmentation(); + ~TaskSegmentation() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp index 324cbd7743..11299a564b 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp @@ -51,8 +51,8 @@ class PlaneFitParameter : public FitParameter { public: PlaneFitParameter() {} - virtual ~PlaneFitParameter() {} - virtual std::vector getParameter(FitParameter::Points pts) const { + ~PlaneFitParameter() override {} + std::vector getParameter(FitParameter::Points pts) const override { std::vector values; MeshCore::PlaneFit fit; fit.AddPoints(pts.points); @@ -74,8 +74,8 @@ class CylinderFitParameter : public FitParameter { public: CylinderFitParameter() {} - virtual ~CylinderFitParameter() {} - virtual std::vector getParameter(FitParameter::Points pts) const { + ~CylinderFitParameter() override {} + std::vector getParameter(FitParameter::Points pts) const override { std::vector values; MeshCore::CylinderFit fit; fit.AddPoints(pts.points); @@ -129,8 +129,8 @@ class SphereFitParameter : public FitParameter { public: SphereFitParameter() {} - virtual ~SphereFitParameter() {} - virtual std::vector getParameter(FitParameter::Points pts) const { + ~SphereFitParameter() override {} + std::vector getParameter(FitParameter::Points pts) const override { std::vector values; MeshCore::SphereFit fit; fit.AddPoints(pts.points); diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.h b/src/Mod/Mesh/Gui/SegmentationBestFit.h index 471dc12b74..604679ea6d 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.h +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.h @@ -58,9 +58,9 @@ public: ParametersDialog(std::vector&, FitParameter*, ParameterList, Mesh::Feature* mesh, QWidget* parent=nullptr); - ~ParametersDialog(); - void accept(); - void reject(); + ~ParametersDialog() override; + void accept() override; + void reject() override; private Q_SLOTS: void on_region_clicked(); @@ -83,11 +83,11 @@ class MeshGuiExport SegmentationBestFit : public QWidget public: SegmentationBestFit(Mesh::Feature* mesh, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~SegmentationBestFit(); + ~SegmentationBestFit() override; void accept(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private Q_SLOTS: void on_planeParameters_clicked(); @@ -110,12 +110,12 @@ class TaskSegmentationBestFit : public Gui::TaskView::TaskDialog { public: TaskSegmentationBestFit(Mesh::Feature* mesh); - ~TaskSegmentationBestFit(); + ~TaskSegmentationBestFit() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Mesh/Gui/Selection.h b/src/Mod/Mesh/Gui/Selection.h index 060bddc3e0..2fda69cd41 100644 --- a/src/Mod/Mesh/Gui/Selection.h +++ b/src/Mod/Mesh/Gui/Selection.h @@ -41,10 +41,10 @@ class Selection : public QWidget public: Selection(QWidget* parent = nullptr); - ~Selection(); + ~Selection() override; void setObjects(const std::vector&); std::vector getObjects() const; - bool eventFilter(QObject*, QEvent*); + bool eventFilter(QObject*, QEvent*) override; private Q_SLOTS: void on_addSelection_clicked(); diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h index cbd54ef8b4..2164a865c7 100644 --- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h +++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h @@ -80,9 +80,9 @@ public: SoEngineOutput trigger; private: - virtual ~SoFCMaterialEngine(); - virtual void evaluate(); - virtual void inputChanged(SoField *); + ~SoFCMaterialEngine() override; + void evaluate() override; + void inputChanged(SoField *) override; }; /** @@ -108,8 +108,8 @@ public: protected: // Force using the reference count mechanism. - virtual ~SoFCIndexedFaceSet() {} - virtual void GLRender(SoGLRenderAction *action); + ~SoFCIndexedFaceSet() override {} + void GLRender(SoGLRenderAction *action) override; void drawFaces(SoGLRenderAction *action); void drawCoords(const SoGLCoordinateElement * const vertexlist, const int32_t *vertexindices, @@ -122,7 +122,7 @@ protected: const SoTextureCoordinateBundle * const texcoords, const int32_t *texindices); - void doAction(SoAction * action); + void doAction(SoAction * action) override; private: void startSelection(SoAction * action); diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp index 073fbb2479..ec1020fa0b 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp @@ -75,7 +75,7 @@ public: { } protected: - int overflow(int c = EOF) + int overflow(int c = EOF) override { if (c != EOF) { char z = static_cast(c); @@ -83,7 +83,7 @@ protected: } return c; } - std::streamsize xsputn (const char* s, std::streamsize num) + std::streamsize xsputn (const char* s, std::streamsize num) override { out->write(s); return num; @@ -114,7 +114,7 @@ public: buffer+pbSize); } protected: - int underflow() + int underflow() override { if (gptr() < egptr()) { return *gptr(); @@ -164,7 +164,7 @@ public: { this->rdbuf(&buf); } - ~SoInputStream() + ~SoInputStream() override { } diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.h b/src/Mod/Mesh/Gui/SoFCMeshObject.h index 791cc1ed98..a6e64594ab 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.h +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.h @@ -64,14 +64,14 @@ class MeshGuiExport SoFCMeshObjectElement : public SoReplacedElement { public: static void initClass(); - virtual void init(SoState * state); + void init(SoState * state) override; static void set(SoState * const state, SoNode * const node, const Mesh::MeshObject * const mesh); static const Mesh::MeshObject * get(SoState * const state); static const SoFCMeshObjectElement * getInstance(SoState * state); - virtual void print(FILE * file) const; + void print(FILE * file) const override; protected: - virtual ~SoFCMeshObjectElement(); + ~SoFCMeshObjectElement() override; const Mesh::MeshObject *mesh; }; @@ -85,15 +85,15 @@ class MeshGuiExport SoFCMeshPickNode : public SoNode { public: static void initClass(); SoFCMeshPickNode(); - void notify(SoNotList *); + void notify(SoNotList *) override; SoSFMeshObject mesh; - virtual void rayPick(SoRayPickAction * action); - virtual void pick(SoPickAction * action); + void rayPick(SoRayPickAction * action) override; + void pick(SoPickAction * action) override; protected: - virtual ~SoFCMeshPickNode(); + ~SoFCMeshPickNode() override; private: MeshCore::MeshFacetGrid* meshGrid; @@ -109,14 +109,14 @@ class MeshGuiExport SoFCMeshGridNode : public SoNode { public: static void initClass(); SoFCMeshGridNode(); - void GLRender(SoGLRenderAction * action); + void GLRender(SoGLRenderAction * action) override; SoSFVec3f minGrid; SoSFVec3f maxGrid; SoSFVec3s lenGrid; protected: - virtual ~SoFCMeshGridNode(); + ~SoFCMeshGridNode() override; }; // ------------------------------------------------------- @@ -132,15 +132,15 @@ public: SoSFMeshObject mesh; - virtual void doAction(SoAction * action); - virtual void GLRender(SoGLRenderAction * action); - virtual void callback(SoCallbackAction * action); - virtual void getBoundingBox(SoGetBoundingBoxAction * action); - virtual void pick(SoPickAction * action); - virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); + void doAction(SoAction * action) override; + void GLRender(SoGLRenderAction * action) override; + void callback(SoCallbackAction * action) override; + void getBoundingBox(SoGetBoundingBoxAction * action) override; + void pick(SoPickAction * action) override; + void getPrimitiveCount(SoGetPrimitiveCountAction * action) override; protected: - virtual ~SoFCMeshObjectNode(); + ~SoFCMeshObjectNode() override; }; /** @@ -175,17 +175,17 @@ public: unsigned int renderTriangleLimit; protected: - virtual void doAction(SoAction * action); - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er); - virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); - virtual void rayPick (SoRayPickAction *action); - virtual void generatePrimitives(SoAction *action); - virtual SoDetail * createTriangleDetail(SoRayPickAction * action, + void doAction(SoAction * action) override; + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) override; + void getPrimitiveCount(SoGetPrimitiveCountAction * action) override; + void rayPick (SoRayPickAction *action) override; + void generatePrimitives(SoAction *action) override; + SoDetail * createTriangleDetail(SoRayPickAction * action, const SoPrimitiveVertex * v1, const SoPrimitiveVertex * v2, const SoPrimitiveVertex * v3, - SoPickedPoint * pp); + SoPickedPoint * pp) override; private: enum Binding { @@ -197,8 +197,8 @@ private: private: // Force using the reference count mechanism. - virtual ~SoFCMeshObjectShape(); - virtual void notify(SoNotList * list); + ~SoFCMeshObjectShape() override; + void notify(SoNotList * list) override; Binding findMaterialBinding(SoState * const state) const; // Draw faces void drawFaces(const Mesh::MeshObject *, SoMaterialBundle* mb, Binding bind, @@ -237,10 +237,10 @@ public: unsigned int renderTriangleLimit; protected: - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er); - virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); - virtual void generatePrimitives(SoAction *action); + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) override; + void getPrimitiveCount(SoGetPrimitiveCountAction * action) override; + void generatePrimitives(SoAction *action) override; private: enum Binding { @@ -252,7 +252,7 @@ private: private: // Force using the reference count mechanism. - virtual ~SoFCMeshSegmentShape() {}; + ~SoFCMeshSegmentShape() override {}; Binding findMaterialBinding(SoState * const state) const; // Draw faces void drawFaces(const Mesh::MeshObject *, SoMaterialBundle* mb, Binding bind, @@ -270,13 +270,13 @@ public: SoFCMeshObjectBoundary(); protected: - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er); - virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); - virtual void generatePrimitives(SoAction *action); + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) override; + void getPrimitiveCount(SoGetPrimitiveCountAction * action) override; + void generatePrimitives(SoAction *action) override; private: // Force using the reference count mechanism. - virtual ~SoFCMeshObjectBoundary() {}; + ~SoFCMeshObjectBoundary() override {}; void drawLines(const Mesh::MeshObject *) const ; }; diff --git a/src/Mod/Mesh/Gui/SoPolygon.h b/src/Mod/Mesh/Gui/SoPolygon.h index 265d17242a..ecde6b3919 100644 --- a/src/Mod/Mesh/Gui/SoPolygon.h +++ b/src/Mod/Mesh/Gui/SoPolygon.h @@ -51,11 +51,11 @@ public: SoSFBool render; protected: - virtual ~SoPolygon() {} - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er); - virtual void rayPick (SoRayPickAction *action); - virtual void generatePrimitives(SoAction *action); + ~SoPolygon() override {} + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) override; + void rayPick (SoRayPickAction *action) override; + void generatePrimitives(SoAction *action) override; private: void drawPolygon(const SbVec3f *,int32_t) const; diff --git a/src/Mod/Mesh/Gui/ViewProvider.h b/src/Mod/Mesh/Gui/ViewProvider.h index 934122e5a4..c80ec75995 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.h +++ b/src/Mod/Mesh/Gui/ViewProvider.h @@ -79,8 +79,8 @@ class MeshGuiExport ViewProviderMeshBuilder : public Gui::ViewProviderBuilder { public: ViewProviderMeshBuilder(){} - ~ViewProviderMeshBuilder(){} - virtual void buildNodes(const App::Property*, std::vector&) const; + ~ViewProviderMeshBuilder() override{} + void buildNodes(const App::Property*, std::vector&) const override; void createMesh(const App::Property*, SoCoordinate3*, SoIndexedFaceSet*) const; }; @@ -94,12 +94,12 @@ class MeshGuiExport ViewProviderExport : public Gui::ViewProviderDocumentObject public: ViewProviderExport(); - virtual ~ViewProviderExport(); + ~ViewProviderExport() override; - virtual QIcon getIcon() const; - SoSeparator* getRoot() const {return nullptr;} - std::vector getDisplayModes() const; - const char* getDefaultDisplayMode() const; + QIcon getIcon() const override; + SoSeparator* getRoot() const override {return nullptr;} + std::vector getDisplayModes() const override; + const char* getDefaultDisplayMode() const override; }; /** @@ -113,7 +113,7 @@ class MeshGuiExport ViewProviderMesh : public Gui::ViewProviderGeometryObject public: ViewProviderMesh(); - virtual ~ViewProviderMesh(); + ~ViewProviderMesh() override; // Display properties App::PropertyPercent LineTransparency; @@ -125,24 +125,24 @@ public: App::PropertyEnumeration Lighting; App::PropertyColor LineColor; - virtual void attach(App::DocumentObject *); - virtual void updateData(const App::Property*); - virtual bool useNewSelectionModel() const {return false;} + void attach(App::DocumentObject *) override; + void updateData(const App::Property*) override; + bool useNewSelectionModel() const override {return false;} Gui::SoFCSelection* getHighlightNode() const { return pcHighlight; } - virtual QIcon getIcon() const; + QIcon getIcon() const override; /// Sets the correct display mode - virtual void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; bool exportToVrml(const char* filename, const MeshCore::Material&, bool binary=false) const; void exportMesh(const char* filename, const char* fmt=nullptr) const; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; /// Get the python wrapper for that ViewProvider - PyObject* getPyObject(); + PyObject* getPyObject() override; /** @name Editing */ //@{ - bool doubleClicked(){ return false; } + bool doubleClicked() override{ return false; } bool isFacetSelected(Mesh::FacetIndex facet); void selectComponent(Mesh::FacetIndex facet); void deselectComponent(Mesh::FacetIndex facet); @@ -173,11 +173,11 @@ public: protected: /// Sets the edit mode - bool setEdit(int ModNum); + bool setEdit(int ModNum) override; /// Unsets the edit mode - void unsetEdit(int ModNum); + void unsetEdit(int ModNum) override; /// get called by the container whenever a property has been changed - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; virtual void showOpenEdges(bool); void setOpenEdgeColorFrom(const App::Color& col); virtual void splitMesh(const MeshCore::MeshKernel& toolMesh, const Base::Vector3f& normal, SbBool inner); @@ -256,16 +256,16 @@ class MeshGuiExport ViewProviderIndexedFaceSet : public ViewProviderMesh public: ViewProviderIndexedFaceSet(); - virtual ~ViewProviderIndexedFaceSet(); + ~ViewProviderIndexedFaceSet() override; - virtual void attach(App::DocumentObject *); + void attach(App::DocumentObject *) override; /// Update the Mesh representation - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - void showOpenEdges(bool); - SoShape* getShapeNode() const; - SoNode* getCoordNode() const; + void showOpenEdges(bool) override; + SoShape* getShapeNode() const override; + SoNode* getCoordNode() const override; private: SoCoordinate3 * pcMeshCoord; @@ -283,15 +283,15 @@ class MeshGuiExport ViewProviderMeshObject : public ViewProviderMesh public: ViewProviderMeshObject(); - virtual ~ViewProviderMeshObject(); + ~ViewProviderMeshObject() override; - void attach(App::DocumentObject *pcFeat); - virtual void updateData(const App::Property*); + void attach(App::DocumentObject *pcFeat) override; + void updateData(const App::Property*) override; protected: - SoShape* getShapeNode() const; - SoNode* getCoordNode() const; - void showOpenEdges(bool); + SoShape* getShapeNode() const override; + SoNode* getCoordNode() const override; + void showOpenEdges(bool) override; private: SoFCMeshObjectNode * pcMeshNode; diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.h b/src/Mod/Mesh/Gui/ViewProviderCurvature.h index 04fc759d1c..6b3f780449 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h @@ -64,37 +64,37 @@ class MeshGuiExport ViewProviderMeshCurvature : public Gui::ViewProviderDocument public: ViewProviderMeshCurvature(); - virtual ~ViewProviderMeshCurvature(); + ~ViewProviderMeshCurvature() override; App::PropertyMaterial TextureMaterial; /// Extracts the mesh data from the feature \a pcFeature and creates an Inventor node \a SoNode with these data. - void attach(App::DocumentObject* pcFeature); - virtual bool useNewSelectionModel() const {return false;} + void attach(App::DocumentObject* pcFeature) override; + bool useNewSelectionModel() const override {return false;} /// Sets the viewing mode - void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// get the default display mode - virtual const char* getDefaultDisplayMode() const; + const char* getDefaultDisplayMode() const override; /// Returns a list of all possible modes - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Updates the mesh feature representation - void updateData(const App::Property*); + void updateData(const App::Property*) override; /// Returns a pixmap for the associated feature type - QIcon getIcon() const; + QIcon getIcon() const override; /// Once the color bar settinhs has been changed this method gets called to update the feature's representation - void OnChange(Base::Subject &rCaller,int rcReason); + void OnChange(Base::Subject &rCaller,int rcReason) override; /// Returns a color bar - SoSeparator* getFrontRoot() const; + SoSeparator* getFrontRoot() const override; /// Hide the object in the view - virtual void hide(); + void hide() override; /// Show the object in the view - virtual void show(); + void show() override; public: static void curvatureInfoCallback(void * ud, SoEventCallback * n); protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; void setVertexCurvatureMode(int mode); std::string curvatureInfo(bool detail, int index1, int index2, int index3) const; void touchShapeNode(); @@ -102,7 +102,7 @@ protected: private: void init(const Mesh::PropertyCurvatureList *prop); - void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); + void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; protected: SoMaterial * pcColorMat; diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.h b/src/Mod/Mesh/Gui/ViewProviderDefects.h index 223585558f..ba8f16cdf9 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.h +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.h @@ -42,19 +42,19 @@ class MeshGuiExport ViewProviderMeshDefects : public Gui::ViewProviderDocumentOb public: ViewProviderMeshDefects(); - virtual ~ViewProviderMeshDefects(); + ~ViewProviderMeshDefects() override; // Display properties App::PropertyFloat LineWidth; // Build up the initial Inventor node - virtual void attach(App::DocumentObject* pcFeature) = 0; + void attach(App::DocumentObject* pcFeature) override = 0; /// Fill up the Inventor node with data virtual void showDefects(const std::vector&) = 0; protected: /// get called by the container whenever a property has been changed - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; SoCoordinate3 * pcCoords; SoDrawStyle * pcDrawStyle; @@ -69,10 +69,10 @@ class MeshGuiExport ViewProviderMeshOrientation : public ViewProviderMeshDefects public: ViewProviderMeshOrientation(); - virtual ~ViewProviderMeshOrientation(); + ~ViewProviderMeshOrientation() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoFaceSet* pcFaces; @@ -87,10 +87,10 @@ class MeshGuiExport ViewProviderMeshNonManifolds : public ViewProviderMeshDefect public: ViewProviderMeshNonManifolds(); - virtual ~ViewProviderMeshNonManifolds(); + ~ViewProviderMeshNonManifolds() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoLineSet* pcLines; @@ -105,10 +105,10 @@ class MeshGuiExport ViewProviderMeshNonManifoldPoints : public ViewProviderMeshD public: ViewProviderMeshNonManifoldPoints(); - virtual ~ViewProviderMeshNonManifoldPoints(); + ~ViewProviderMeshNonManifoldPoints() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoPointSet* pcPoints; @@ -123,10 +123,10 @@ class MeshGuiExport ViewProviderMeshDuplicatedFaces : public ViewProviderMeshDef public: ViewProviderMeshDuplicatedFaces(); - virtual ~ViewProviderMeshDuplicatedFaces(); + ~ViewProviderMeshDuplicatedFaces() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoFaceSet* pcFaces; @@ -141,10 +141,10 @@ class MeshGuiExport ViewProviderMeshDegenerations : public ViewProviderMeshDefec public: ViewProviderMeshDegenerations(); - virtual ~ViewProviderMeshDegenerations(); + ~ViewProviderMeshDegenerations() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoLineSet* pcLines; @@ -156,10 +156,10 @@ class MeshGuiExport ViewProviderMeshDuplicatedPoints : public ViewProviderMeshDe public: ViewProviderMeshDuplicatedPoints(); - virtual ~ViewProviderMeshDuplicatedPoints(); + ~ViewProviderMeshDuplicatedPoints() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoPointSet* pcPoints; @@ -171,10 +171,10 @@ class MeshGuiExport ViewProviderMeshIndices : public ViewProviderMeshDefects public: ViewProviderMeshIndices(); - virtual ~ViewProviderMeshIndices(); + ~ViewProviderMeshIndices() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoFaceSet* pcFaces; @@ -189,10 +189,10 @@ class MeshGuiExport ViewProviderMeshSelfIntersections : public ViewProviderMeshD public: ViewProviderMeshSelfIntersections(); - virtual ~ViewProviderMeshSelfIntersections(); + ~ViewProviderMeshSelfIntersections() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoLineSet* pcLines; @@ -204,10 +204,10 @@ class MeshGuiExport ViewProviderMeshFolds : public ViewProviderMeshDefects public: ViewProviderMeshFolds(); - virtual ~ViewProviderMeshFolds(); + ~ViewProviderMeshFolds() override; - void attach(App::DocumentObject* pcFeature); - void showDefects(const std::vector&); + void attach(App::DocumentObject* pcFeature) override; + void showDefects(const std::vector&) override; protected: SoFaceSet* pcFaces; diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h index dd07001703..676a860b91 100644 --- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h +++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h @@ -52,15 +52,15 @@ class MeshGuiExport ViewProviderMeshFaceSet : public ViewProviderMesh public: ViewProviderMeshFaceSet(); - virtual ~ViewProviderMeshFaceSet(); + ~ViewProviderMeshFaceSet() override; - void attach(App::DocumentObject *pcFeat); - virtual void updateData(const App::Property*); + void attach(App::DocumentObject *pcFeat) override; + void updateData(const App::Property*) override; protected: - void showOpenEdges(bool); - SoShape* getShapeNode() const; - SoNode* getCoordNode() const; + void showOpenEdges(bool) override; + SoShape* getShapeNode() const override; + SoNode* getCoordNode() const override; private: bool directRendering; diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.h b/src/Mod/Mesh/Gui/ViewProviderTransform.h index 13a6f0ddf6..56237a4bfd 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransform.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransform.h @@ -51,23 +51,23 @@ class ViewProviderMeshTransform : public ViewProviderMesh public: ViewProviderMeshTransform(); - virtual ~ViewProviderMeshTransform(); + ~ViewProviderMeshTransform() override; /** * Extracts the mesh data from the feature \a pcFeature and creates * an Inventor node \a SoNode with these data. */ - virtual void attach(App::DocumentObject *); + void attach(App::DocumentObject *) override; /// set the viewing mode - virtual void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// get the default display mode - virtual const char* getDefaultDisplayMode() const; + const char* getDefaultDisplayMode() const override; /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Update the Mesh representation - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h index f18be3b769..7b429d6818 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h @@ -56,21 +56,21 @@ class ViewProviderMeshTransformDemolding : public ViewProviderMesh public: ViewProviderMeshTransformDemolding(); - virtual ~ViewProviderMeshTransformDemolding(); + ~ViewProviderMeshTransformDemolding() override; /** * Extracts the mesh data from the feature \a pcFeature and creates * an Inventor node \a SoNode with these data. */ - virtual void attach(App::DocumentObject *); + void attach(App::DocumentObject *) override; /// set the viewing mode - virtual void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// get the default display mode - virtual const char* getDefaultDisplayMode() const; + const char* getDefaultDisplayMode() const override; /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: void calcMaterialIndex(const SbRotation &rot); diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp index 1f2e19bc80..63ccdc29ae 100644 --- a/src/Mod/Mesh/Gui/Workbench.cpp +++ b/src/Mod/Mesh/Gui/Workbench.cpp @@ -107,11 +107,11 @@ public: taskbox->groupLayout()->addWidget(box); Content.push_back(taskbox); } - bool shouldShow(void) + bool shouldShow(void) override { return true; } - void onSelectionChanged(const Gui::SelectionChanges&) + void onSelectionChanged(const Gui::SelectionChanges&) override { Base::BoundBox3d bbox; unsigned long countPoints=0, countFacets=0; diff --git a/src/Mod/Mesh/Gui/Workbench.h b/src/Mod/Mesh/Gui/Workbench.h index ce10c46dc3..144cf3aca7 100644 --- a/src/Mod/Mesh/Gui/Workbench.h +++ b/src/Mod/Mesh/Gui/Workbench.h @@ -40,16 +40,16 @@ class MeshGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; - void activated(); - void deactivated(); - void setupContextMenu(const char* recipient, Gui::MenuItem*) const; + void activated() override; + void deactivated() override; + void setupContextMenu(const char* recipient, Gui::MenuItem*) const override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace MeshGui diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index f216c22dd7..4fa7c6edf6 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -144,10 +144,10 @@ public: initialize("This module is the MeshPart module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index 58a710a3ed..82ac976421 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -91,7 +91,7 @@ class MeshPartExport CurveProjectorShape: public CurveProjector { public: CurveProjectorShape(const TopoDS_Shape &aShape, const MeshKernel &pMesh); - virtual ~CurveProjectorShape() {} + ~CurveProjectorShape() override {} void projectCurve(const TopoDS_Edge& aEdge, std::vector &vSplitEdges); @@ -101,7 +101,7 @@ public: protected: - virtual void Do(); + void Do() override; }; @@ -112,7 +112,7 @@ class MeshPartExport CurveProjectorSimple: public CurveProjector { public: CurveProjectorSimple(const TopoDS_Shape &aShape, const MeshKernel &pMesh); - virtual ~CurveProjectorSimple() {} + ~CurveProjectorSimple() override {} /// helper to discredicice a Edge... void GetSampledCurves( const TopoDS_Edge& aEdge, std::vector& rclPoints, unsigned long ulNbOfPoints = 30); @@ -127,7 +127,7 @@ public: protected: - virtual void Do(); + void Do() override; }; /** Project by projecting a sampled curve to the mesh @@ -141,7 +141,7 @@ public: }; CurveProjectorWithToolMesh(const TopoDS_Shape &aShape, const MeshKernel &pMesh,MeshKernel &rToolMesh); - virtual ~CurveProjectorWithToolMesh() {} + ~CurveProjectorWithToolMesh() override {} void makeToolMesh(const TopoDS_Edge& aEdge,std::vector &cVAry ); @@ -150,7 +150,7 @@ public: MeshKernel &ToolMesh; protected: - virtual void Do(); + void Do() override; }; /** diff --git a/src/Mod/MeshPart/App/Mesher.h b/src/Mod/MeshPart/App/Mesher.h index cc515e2b6c..a889a9f265 100644 --- a/src/Mod/MeshPart/App/Mesher.h +++ b/src/Mod/MeshPart/App/Mesher.h @@ -170,8 +170,8 @@ public: MeshingOutput(); protected: - int overflow(int c = EOF); - int sync(); + int overflow(int c = EOF) override; + int sync() override; private: std::string buffer; diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 3e1ed2a55b..3d1af7f5bc 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -52,7 +52,7 @@ public: initialize("This module is the MeshPartGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index d05495878b..4e1e7ca24a 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -83,19 +83,19 @@ public: this->pcRoot->addChild(coords); this->pcRoot->addChild(planes); } - ~ViewProviderCrossSections() + ~ViewProviderCrossSections() override { coords->unref(); planes->unref(); } - void updateData(const App::Property*) + void updateData(const App::Property*) override { } - const char* getDefaultDisplayMode() const + const char* getDefaultDisplayMode() const override { return ""; } - std::vector getDisplayModes(void) const + std::vector getDisplayModes(void) const override { return std::vector(); } diff --git a/src/Mod/MeshPart/Gui/CrossSections.h b/src/Mod/MeshPart/Gui/CrossSections.h index 97a4fa5f34..3edf7254b0 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.h +++ b/src/Mod/MeshPart/Gui/CrossSections.h @@ -45,13 +45,13 @@ class CrossSections : public QDialog public: CrossSections(const Base::BoundBox3d& bb, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~CrossSections(); - void accept(); + ~CrossSections() override; + void accept() override; void apply(); protected: - void changeEvent(QEvent *e); - void keyPressEvent(QKeyEvent*); + void changeEvent(QEvent *e) override; + void keyPressEvent(QKeyEvent*) override; private Q_SLOTS: void on_xyPlane_clicked(); @@ -83,13 +83,13 @@ class TaskCrossSections : public Gui::TaskView::TaskDialog public: TaskCrossSections(const Base::BoundBox3d& bb); - ~TaskCrossSections(); + ~TaskCrossSections() override; public: - bool accept(); - void clicked(int id); + bool accept() override; + void clicked(int id) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.h b/src/Mod/MeshPart/Gui/CurveOnMesh.h index 7886ab524a..c6b00da44b 100644 --- a/src/Mod/MeshPart/Gui/CurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/CurveOnMesh.h @@ -49,12 +49,12 @@ class ViewProviderCurveOnMesh : public Gui::ViewProviderDocumentObject public: ViewProviderCurveOnMesh(); - virtual ~ViewProviderCurveOnMesh(); + ~ViewProviderCurveOnMesh() override; void addVertex(const SbVec3f&); void clearVertex(); void setPoints(const std::vector&); void clearPoints(); - void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; private: SoCoordinate3 * pcCoords; @@ -69,7 +69,7 @@ class CurveOnMeshHandler : public QObject public: CurveOnMeshHandler(QObject* parent = nullptr); - ~CurveOnMeshHandler(); + ~CurveOnMeshHandler() override; void enableApproximation(bool); void setParameters(int maxDegree, GeomAbs_Shape cont, double tol3d, double angle); void enableCallback(Gui::View3DInventor* viewer); diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h index dc54612c3f..7587e37c90 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h @@ -43,12 +43,12 @@ class CurveOnMeshWidget : public QWidget public: CurveOnMeshWidget(Gui::View3DInventor* view, QWidget* parent=nullptr); - ~CurveOnMeshWidget(); + ~CurveOnMeshWidget() override; void reject(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setup(); private Q_SLOTS: @@ -66,12 +66,12 @@ class TaskCurveOnMesh : public Gui::TaskView::TaskDialog public: TaskCurveOnMesh(Gui::View3DInventor* view); - ~TaskCurveOnMesh(); + ~TaskCurveOnMesh() override; public: - bool reject(); + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Close; } private: diff --git a/src/Mod/MeshPart/Gui/Tessellation.h b/src/Mod/MeshPart/Gui/Tessellation.h index 82fb69c119..5da6e128a2 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.h +++ b/src/Mod/MeshPart/Gui/Tessellation.h @@ -48,7 +48,7 @@ class Mesh2ShapeGmsh : public MeshGui::GmshWidget public: Mesh2ShapeGmsh(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~Mesh2ShapeGmsh(); + ~Mesh2ShapeGmsh() override; void process(App::Document* doc, const std::list&); @@ -56,8 +56,8 @@ Q_SIGNALS: void processed(); protected: - virtual bool writeProject(QString& inpFile, QString& outFile); - virtual bool loadOutput(); + bool writeProject(QString& inpFile, QString& outFile) override; + bool loadOutput() override; private: class Private; @@ -78,11 +78,11 @@ class Tessellation : public QWidget public: Tessellation(QWidget* parent = nullptr); - ~Tessellation(); + ~Tessellation() override; bool accept(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void process(int method, App::Document* doc, const std::list&); void saveParameters(int method); void setFaceColors(int method, App::Document* doc, App::DocumentObject* obj); @@ -112,15 +112,15 @@ class TaskTessellation : public Gui::TaskView::TaskDialog public: TaskTessellation(); - ~TaskTessellation(); + ~TaskTessellation() override; public: - virtual void open(); - virtual void clicked(int); - virtual bool accept(); - virtual bool reject(); + void open() override; + void clicked(int) override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/MeshPart/Gui/Workbench.h b/src/Mod/MeshPart/Gui/Workbench.h index d25e095740..96e87a25f5 100644 --- a/src/Mod/MeshPart/Gui/Workbench.h +++ b/src/Mod/MeshPart/Gui/Workbench.h @@ -37,11 +37,11 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace MeshPartGui diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 13bdabd539..1b7804e58c 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -246,7 +246,7 @@ public: initialize("This is a module working with the BRepFeat package."); // register with Python } - virtual ~BRepFeatModule() {} + ~BRepFeatModule() override {} }; class BRepOffsetAPIModule : public Py::ExtensionModule @@ -257,7 +257,7 @@ public: initialize("This is a module working with the BRepOffsetAPI package."); // register with Python } - virtual ~BRepOffsetAPIModule() {} + ~BRepOffsetAPIModule() override {} }; class Geom2dModule : public Py::ExtensionModule @@ -268,7 +268,7 @@ public: initialize("This is a module working with 2d geometries."); // register with Python } - virtual ~Geom2dModule() {} + ~Geom2dModule() override {} }; class GeomPlateModule : public Py::ExtensionModule @@ -279,7 +279,7 @@ public: initialize("This is a module working with the GeomPlate framework."); // register with Python } - virtual ~GeomPlateModule() {} + ~GeomPlateModule() override {} }; class HLRBRepModule : public Py::ExtensionModule @@ -290,7 +290,7 @@ public: initialize("This is a module working with the HLRBRep framework."); // register with Python } - virtual ~HLRBRepModule() {} + ~HLRBRepModule() override {} }; class ShapeFixModule : public Py::ExtensionModule @@ -319,7 +319,7 @@ public: initialize("This is a module working with the ShapeFix framework."); // register with Python } - virtual ~ShapeFixModule() {} + ~ShapeFixModule() override {} private: Py::Object sameParameter(const Py::Tuple& args) @@ -389,7 +389,7 @@ public: initialize("This is a module working with the ShapeUpgrade framework."); // register with Python } - virtual ~ShapeUpgradeModule() {} + ~ShapeUpgradeModule() override {} }; class ChFi2dModule : public Py::ExtensionModule @@ -400,7 +400,7 @@ public: initialize("This is a module working with the ChFi2d framework."); // register with Python } - virtual ~ChFi2dModule() {} + ~ChFi2dModule() override {} }; class Module : public Py::ExtensionModule @@ -643,10 +643,10 @@ public: PyModule_AddObject(m_module, "ChFi2d", chFi2d.module().ptr()); } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_keyword( void *method_def, + Py::Object invoke_method_keyword( void *method_def, const Py::Tuple &args, const Py::Dict &keywords ) override { try { @@ -680,7 +680,7 @@ private: } } - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h index f1814b783a..c6da213cc3 100644 --- a/src/Mod/Part/App/AttachExtension.h +++ b/src/Mod/Part/App/AttachExtension.h @@ -49,7 +49,7 @@ public: AttachEngineException(const char * sMessage); AttachEngineException(const std::string& sMessage); /// Destruction - virtual ~AttachEngineException() throw() {} + ~AttachEngineException() throw() override {} }; /** @@ -62,7 +62,7 @@ class PartExport AttachExtension : public App::DocumentObjectExtension EXTENSION_PROPERTY_HEADER(Part::AttachableObject); public: AttachExtension(); - virtual ~AttachExtension(); + ~AttachExtension() override; /** * @brief setAttacher sets the AttachEngine object. The class takes the @@ -110,13 +110,13 @@ public: virtual bool isTouched_Mapping() {return true; /*support.isTouched isn't true when linked objects are changed... why?..*/} - virtual short int extensionMustExecute(); - virtual App::DocumentObjectExecReturn *extensionExecute(); - virtual PyObject* getExtensionPyObject(); - virtual void onExtendedDocumentRestored(); + short int extensionMustExecute() override; + App::DocumentObjectExecReturn *extensionExecute() override; + PyObject* getExtensionPyObject() override; + void onExtendedDocumentRestored() override; protected: - virtual void extensionOnChanged(const App::Property* /*prop*/); + void extensionOnChanged(const App::Property* /*prop*/) override; virtual void extHandleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName); App::PropertyPlacement& getPlacement() const; diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h index d3dd80ac65..283a85a9e4 100644 --- a/src/Mod/Part/App/Attacher.h +++ b/src/Mod/Part/App/Attacher.h @@ -286,7 +286,7 @@ public: //methods */ void EnableAllSupportedModes(); - virtual ~AttachEngine(){}; + ~AttachEngine() override{}; public://helper functions that may be useful outside of the class /** @@ -420,8 +420,8 @@ class PartExport AttachEngine3D : public AttachEngine TYPESYSTEM_HEADER(); public: AttachEngine3D(); - virtual AttachEngine3D* copy() const; - virtual Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const; + AttachEngine3D* copy() const override; + Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const override; private: double calculateFoldAngle(gp_Vec axA, gp_Vec axB, gp_Vec edA, gp_Vec edB) const; }; @@ -432,8 +432,8 @@ class PartExport AttachEnginePlane : public AttachEngine TYPESYSTEM_HEADER(); public: AttachEnginePlane(); - virtual AttachEnginePlane* copy() const; - virtual Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const; + AttachEnginePlane* copy() const override; + Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const override; }; //attacher specialized for datum lines @@ -442,8 +442,8 @@ class PartExport AttachEngineLine : public AttachEngine TYPESYSTEM_HEADER(); public: AttachEngineLine(); - virtual AttachEngineLine* copy() const; - virtual Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const; + AttachEngineLine* copy() const override; + Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const override; }; //attacher specialized for datum points @@ -452,8 +452,8 @@ class PartExport AttachEnginePoint : public AttachEngine TYPESYSTEM_HEADER(); public: AttachEnginePoint(); - virtual AttachEnginePoint* copy() const; - virtual Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const; + AttachEnginePoint* copy() const override; + Base::Placement calculateAttachedPlacement(const Base::Placement& origPlacement) const override; private: gp_Pnt getProximityPoint(eMapMode mode, const TopoDS_Shape& s1, const TopoDS_Shape& s2) const; @@ -466,7 +466,7 @@ class ExceptionCancel : public Base::Exception public: ExceptionCancel(){} ExceptionCancel(char* msg){this->setMessage(msg);} - virtual ~ExceptionCancel() throw() {} + ~ExceptionCancel() throw() override {} }; } // namespace Attacher diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h index 2f6af6f189..12595e0090 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h +++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h @@ -44,7 +44,7 @@ class PartExport BRepOffsetAPI_MakeOffsetFix : public BRepBuilderAPI_MakeShape public: BRepOffsetAPI_MakeOffsetFix(); BRepOffsetAPI_MakeOffsetFix(const GeomAbs_JoinType Join, const Standard_Boolean IsOpenResult); - virtual ~BRepOffsetAPI_MakeOffsetFix(); + ~BRepOffsetAPI_MakeOffsetFix() override; //! Initializes the algorithm to construct parallels to the wire Spine. void AddWire (const TopoDS_Wire& Spine); @@ -56,7 +56,7 @@ public: void Perform (const Standard_Real Offset, const Standard_Real Alt = 0.0); //! Builds the resulting shape (redefined from MakeShape). - void Build(); + void Build() override; //! Initializes the algorithm to construct parallels to the spine Spine. //! Join defines the type of parallel generated by the @@ -71,22 +71,22 @@ public: //! Initialize the evaluation of Offsetting. void Init(const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean IsOpenResult = Standard_False); - virtual Standard_Boolean IsDone() const; + Standard_Boolean IsDone() const override; //! Returns a shape built by the shape construction algorithm. //! Raises exception StdFail_NotDone if the shape was not built. - virtual const TopoDS_Shape& Shape(); + const TopoDS_Shape& Shape() override; //! returns a list of the created shapes //! from the shape . - virtual const TopTools_ListOfShape& Generated (const TopoDS_Shape& S); + const TopTools_ListOfShape& Generated (const TopoDS_Shape& S) override; //! Returns the list of shapes modified from the shape //! . - virtual const TopTools_ListOfShape& Modified (const TopoDS_Shape& S); + const TopTools_ListOfShape& Modified (const TopoDS_Shape& S) override; //! Returns true if the shape S has been deleted. - virtual Standard_Boolean IsDeleted (const TopoDS_Shape& S); + Standard_Boolean IsDeleted (const TopoDS_Shape& S) override; //! Replaces the given curve type with a B-Spline. Input shape //! must be a wire or a compound of wires diff --git a/src/Mod/Part/App/BodyBase.h b/src/Mod/Part/App/BodyBase.h index 829a4a8b1d..0ac0c9c056 100644 --- a/src/Mod/Part/App/BodyBase.h +++ b/src/Mod/Part/App/BodyBase.h @@ -78,14 +78,14 @@ public: * TODO introduce a findBodiesOf() if needed (2015-08-04, Fat-Zer) */ static BodyBase* findBodyOf(const App::DocumentObject* f); - virtual PyObject* getPyObject() override; + PyObject* getPyObject() override; protected: /// If BaseFeature is getting changed and Tip points to it reset the Tip - virtual void onBeforeChange (const App::Property* prop) override; + void onBeforeChange (const App::Property* prop) override; /// If BaseFeature is set and Tip is null set the Tip to it - virtual void onChanged (const App::Property* prop) override; - virtual void handleChangedPropertyName(Base::XMLReader &reader, + void onChanged (const App::Property* prop) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; diff --git a/src/Mod/Part/App/CustomFeature.h b/src/Mod/Part/App/CustomFeature.h index 6e26bb8a0a..e88b013231 100644 --- a/src/Mod/Part/App/CustomFeature.h +++ b/src/Mod/Part/App/CustomFeature.h @@ -39,17 +39,17 @@ class PartExport CustomFeature : public Part::Feature public: /// Constructor CustomFeature(); - virtual ~CustomFeature(); + ~CustomFeature() override; /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(); - virtual short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderCustom"; } }; diff --git a/src/Mod/Part/App/DatumFeature.h b/src/Mod/Part/App/DatumFeature.h index e11da948e4..ef9b1f7fa4 100644 --- a/src/Mod/Part/App/DatumFeature.h +++ b/src/Mod/Part/App/DatumFeature.h @@ -39,11 +39,11 @@ class PartExport Datum : public Part::Feature, public Part::AttachExtension public: Datum(); - virtual ~Datum(); + ~Datum() override; //short mustExecute(); /// returns the type name of the view provider - virtual const char* getViewProviderName(void) const override = 0; + const char* getViewProviderName(void) const override = 0; /// Return a shape including Placement representing the datum feature virtual TopoDS_Shape getShape() const; @@ -51,7 +51,7 @@ public: /// Returns a point of the feature it counts as it's base virtual Base::Vector3d getBasePoint () const; - virtual App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj, + App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj, Base::Matrix4D *mat, bool transform, int depth) const override; protected: void onDocumentRestored() override; diff --git a/src/Mod/Part/App/FaceMaker.h b/src/Mod/Part/App/FaceMaker.h index b9cd2be7f5..68d1bea0fd 100644 --- a/src/Mod/Part/App/FaceMaker.h +++ b/src/Mod/Part/App/FaceMaker.h @@ -50,7 +50,7 @@ class PartExport FaceMaker: public BRepBuilderAPI_MakeShape, public Base::BaseCl public: FaceMaker() {} - virtual ~FaceMaker() {} + ~FaceMaker() override {} virtual void addWire(const TopoDS_Wire& w); /** @@ -75,7 +75,7 @@ public: */ virtual const TopoDS_Face& Face(); - virtual void Build(); + void Build() override; //fails to compile, huh! //virtual const TopTools_ListOfShape& Generated(const TopoDS_Shape &S) override {throwNotImplemented();} @@ -136,10 +136,10 @@ class PartExport FaceMakerSimple : public FaceMakerPublic { TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - virtual std::string getUserFriendlyName() const override; - virtual std::string getBriefExplanation() const override; + std::string getUserFriendlyName() const override; + std::string getBriefExplanation() const override; protected: - virtual void Build_Essence() override; + void Build_Essence() override; }; diff --git a/src/Mod/Part/App/FaceMakerBullseye.h b/src/Mod/Part/App/FaceMakerBullseye.h index 003f0b4905..ac84bde6e7 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.h +++ b/src/Mod/Part/App/FaceMakerBullseye.h @@ -55,11 +55,11 @@ public: */ void setPlane(const gp_Pln& plane); - virtual std::string getUserFriendlyName() const override; - virtual std::string getBriefExplanation() const override; + std::string getUserFriendlyName() const override; + std::string getBriefExplanation() const override; protected: - virtual void Build_Essence() override; + void Build_Essence() override; protected: gp_Pln myPlane; //externally supplied plane (if any) diff --git a/src/Mod/Part/App/FaceMakerCheese.h b/src/Mod/Part/App/FaceMakerCheese.h index 36430bcb09..db191889a4 100644 --- a/src/Mod/Part/App/FaceMakerCheese.h +++ b/src/Mod/Part/App/FaceMakerCheese.h @@ -42,8 +42,8 @@ class PartExport FaceMakerCheese: public FaceMakerPublic { TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - virtual std::string getUserFriendlyName() const override; - virtual std::string getBriefExplanation() const override; + std::string getUserFriendlyName() const override; + std::string getBriefExplanation() const override; public: //in Extrusion, they used to be private. but they are also used by PartDesign, so made public. /** @@ -63,7 +63,7 @@ private: static TopoDS_Shape makeFace(std::list&); // for internal use only protected: - virtual void Build_Essence() override; + void Build_Essence() override; }; diff --git a/src/Mod/Part/App/FeatureChamfer.h b/src/Mod/Part/App/FeatureChamfer.h index 2b548f2f71..0883eed4d4 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(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderChamfer"; } //@} diff --git a/src/Mod/Part/App/FeatureCompound.h b/src/Mod/Part/App/FeatureCompound.h index c6774b4c7e..b865ffbd37 100644 --- a/src/Mod/Part/App/FeatureCompound.h +++ b/src/Mod/Part/App/FeatureCompound.h @@ -36,17 +36,17 @@ class Compound : public Part::Feature public: Compound(); - virtual ~Compound(); + ~Compound() override; App::PropertyLinkList Links; /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// recalculate the feature - App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderCompound"; } //@} @@ -57,7 +57,7 @@ class Compound2 : public Compound { PROPERTY_HEADER_WITH_OVERRIDE(Part::Compound2); public: Compound2(); - virtual void onDocumentRestored() override; + void onDocumentRestored() override; }; } //namespace Part diff --git a/src/Mod/Part/App/FeatureExtrusion.h b/src/Mod/Part/App/FeatureExtrusion.h index d9c346e1be..4a6667b70b 100644 --- a/src/Mod/Part/App/FeatureExtrusion.h +++ b/src/Mod/Part/App/FeatureExtrusion.h @@ -121,7 +121,7 @@ public: //mode enumerations static const char* eDirModeStrings[]; protected: - virtual void setupObject() override; + void setupObject() override; }; /** @@ -133,12 +133,12 @@ class FaceMakerExtrusion: public FaceMakerCheese { TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: - virtual std::string getUserFriendlyName() const override; - virtual std::string getBriefExplanation() const override; + std::string getUserFriendlyName() const override; + std::string getBriefExplanation() const override; - virtual void Build() override; + void Build() override; protected: - virtual void Build_Essence() override {} + void Build_Essence() override {} }; } //namespace Part diff --git a/src/Mod/Part/App/FeatureFillet.h b/src/Mod/Part/App/FeatureFillet.h index 75b3afb03b..a676859b69 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(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderFillet"; } //@} diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h index 79341c0003..5631db416f 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.h +++ b/src/Mod/Part/App/FeatureGeometrySet.h @@ -42,9 +42,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(void) override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartGui::ViewProviderGeometrySet"; } //@} diff --git a/src/Mod/Part/App/FeatureMirroring.h b/src/Mod/Part/App/FeatureMirroring.h index 1951a70213..0c95d3bd36 100644 --- a/src/Mod/Part/App/FeatureMirroring.h +++ b/src/Mod/Part/App/FeatureMirroring.h @@ -45,18 +45,18 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderMirror"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; - void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; }; diff --git a/src/Mod/Part/App/FeatureOffset.h b/src/Mod/Part/App/FeatureOffset.h index 9db788df88..ee3f6769a2 100644 --- a/src/Mod/Part/App/FeatureOffset.h +++ b/src/Mod/Part/App/FeatureOffset.h @@ -37,7 +37,7 @@ class PartExport Offset : public Part::Feature public: Offset(); - ~Offset(); + ~Offset() override; App::PropertyLink Source; App::PropertyFloat Value; @@ -50,9 +50,9 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute() override; - virtual short mustExecute() const override; - virtual const char* getViewProviderName() const override { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderOffset"; } //@} @@ -67,14 +67,14 @@ class PartExport Offset2D : public Offset PROPERTY_HEADER_WITH_OVERRIDE(Part::Offset2D); public: Offset2D(); - ~Offset2D(); + ~Offset2D() override; /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute() override; - virtual short mustExecute() const override; - virtual const char* getViewProviderName() const override { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderOffset2D"; } //@} diff --git a/src/Mod/Part/App/FeaturePartBoolean.h b/src/Mod/Part/App/FeaturePartBoolean.h index d03b4f1d5c..51377cd45f 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderBoolean"; } diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h index 0f7ac58c79..c453bfeff2 100644 --- a/src/Mod/Part/App/FeaturePartBox.h +++ b/src/Mod/Part/App/FeaturePartBox.h @@ -44,16 +44,16 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderBox"; } protected: - void Restore(Base::XMLReader &reader); + void Restore(Base::XMLReader &reader) override; /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; //@} }; diff --git a/src/Mod/Part/App/FeaturePartCircle.h b/src/Mod/Part/App/FeaturePartCircle.h index a383a79f83..17b28279e6 100644 --- a/src/Mod/Part/App/FeaturePartCircle.h +++ b/src/Mod/Part/App/FeaturePartCircle.h @@ -36,7 +36,7 @@ class PartExport Circle : public Part::Primitive public: Circle(); - virtual ~Circle(); + ~Circle() override; App::PropertyLength Radius; App::PropertyAngle Angle1; @@ -45,17 +45,17 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void onChanged(const App::Property*); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void onChanged(const App::Property*) override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderCircleParametric"; } protected: - void Restore(Base::XMLReader &reader); - void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName); + void Restore(Base::XMLReader &reader) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; private: static App::PropertyQuantityConstraint::Constraints angleRange; diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h index 6e73664935..3a524e0a49 100644 --- a/src/Mod/Part/App/FeaturePartCommon.h +++ b/src/Mod/Part/App/FeaturePartCommon.h @@ -40,7 +40,7 @@ public: //@{ /// recalculate the Feature protected: - BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const; + BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const override; //@} }; @@ -58,11 +58,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderMultiCommon"; } diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index 7d1036f5bc..85e856de6c 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderCurveNet"; } //@} diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h index 42891fba88..8dcb3ae1e6 100644 --- a/src/Mod/Part/App/FeaturePartCut.h +++ b/src/Mod/Part/App/FeaturePartCut.h @@ -40,7 +40,7 @@ public: //@{ /// recalculate the Feature protected: - BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const; + BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const override; //@} }; diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h index 0b764464cd..0cb1445030 100644 --- a/src/Mod/Part/App/FeaturePartFuse.h +++ b/src/Mod/Part/App/FeaturePartFuse.h @@ -40,7 +40,7 @@ public: //@{ /// recalculate the Feature protected: - BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const; + BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const override; //@} }; @@ -58,11 +58,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderMultiFuse"; } diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index bad67b669e..84b9de3fb4 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 5593b8dbb5..2e1f01d72b 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -41,10 +41,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); - short mustExecute() const; + App::DocumentObjectExecReturn *execute(void) override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index caa45d342f..0219142040 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h index db75b9d4c7..1ec861e9db 100644 --- a/src/Mod/Part/App/FeaturePartPolygon.h +++ b/src/Mod/Part/App/FeaturePartPolygon.h @@ -37,7 +37,7 @@ class Polygon : public Part::Feature public: Polygon(); - virtual ~Polygon(); + ~Polygon() override; App::PropertyVectorList Nodes; App::PropertyBool Close; @@ -45,8 +45,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} }; diff --git a/src/Mod/Part/App/FeaturePartSection.h b/src/Mod/Part/App/FeaturePartSection.h index 8f3d37a7d5..9cd127868d 100644 --- a/src/Mod/Part/App/FeaturePartSection.h +++ b/src/Mod/Part/App/FeaturePartSection.h @@ -43,9 +43,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - short mustExecute() const; + short mustExecute() const override; protected: - BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const; + BRepAlgoAPI_BooleanOperation* makeOperation(const TopoDS_Shape&, const TopoDS_Shape&) const override; //@} }; diff --git a/src/Mod/Part/App/FeaturePartSpline.h b/src/Mod/Part/App/FeaturePartSpline.h index 27e7ea88f5..93fd2f9340 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() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderSpline"; } }; diff --git a/src/Mod/Part/App/FeatureRevolution.h b/src/Mod/Part/App/FeatureRevolution.h index 0ec697bc90..27da2fb1e8 100644 --- a/src/Mod/Part/App/FeatureRevolution.h +++ b/src/Mod/Part/App/FeatureRevolution.h @@ -83,7 +83,7 @@ private: static App::PropertyFloatConstraint::Constraints angleRangeU; protected: - virtual void setupObject() override; + void setupObject() override; }; } //namespace Part diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index 9366764693..3fab537972 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -75,14 +75,14 @@ class PartExport Geometry: public Base::Persistence { TYPESYSTEM_HEADER(); public: - virtual ~Geometry(); + ~Geometry() override; virtual TopoDS_Shape toShape() const = 0; virtual const Handle(Geom_Geometry)& handle() const = 0; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; /// 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. @@ -143,18 +143,18 @@ public: GeomPoint(); GeomPoint(const Handle(Geom_CartesianPoint)&); GeomPoint(const Base::Vector3d&); - virtual ~GeomPoint(); - virtual Geometry *copy() const; - virtual TopoDS_Shape toShape() const; + ~GeomPoint() override; + Geometry *copy() const override; + TopoDS_Shape toShape() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; void setHandle(const Handle(Geom_CartesianPoint)&); Base::Vector3d getPoint()const; @@ -170,9 +170,9 @@ class PartExport GeomCurve : public Geometry TYPESYSTEM_HEADER(); public: GeomCurve(); - virtual ~GeomCurve(); + ~GeomCurve() override; - TopoDS_Shape toShape() const; + TopoDS_Shape toShape() const override; /*! * \brief toBSpline Converts the curve to a B-spline * \param This is the start parameter of the curve @@ -218,7 +218,7 @@ class PartExport GeomBoundedCurve : public GeomCurve TYPESYSTEM_HEADER(); public: GeomBoundedCurve(); - virtual ~GeomBoundedCurve(); + ~GeomBoundedCurve() override; // Geometry helper virtual Base::Vector3d getStartPoint() const; @@ -232,20 +232,20 @@ public: GeomBezierCurve(); GeomBezierCurve(const Handle(Geom_BezierCurve)&); GeomBezierCurve(const std::vector&, const std::vector&); - virtual ~GeomBezierCurve(); - virtual Geometry *copy() const; + ~GeomBezierCurve() override; + Geometry *copy() const override; std::vector getPoles() const; std::vector getWeights() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize () const; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize () const override; + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_BezierCurve)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_BezierCurve) myCurve; @@ -262,8 +262,8 @@ public: const std::vector& knots, const std::vector& multiplicities, int degree, bool periodic=false, bool checkrational = true); - virtual ~GeomBSplineCurve(); - virtual Geometry *copy() const; + ~GeomBSplineCurve() override; + Geometry *copy() const override; /*! * Interpolate a spline passing through the given points without tangency. @@ -319,14 +319,14 @@ public: void Trim(double u, double v); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_BSplineCurve)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: // If during assignment of weights (during the for loop iteratively setting the poles) all weights @@ -350,8 +350,8 @@ protected: GeomConic(); public: - virtual ~GeomConic(); - virtual Geometry *copy() const = 0; + ~GeomConic() override; + Geometry *copy() const override = 0; /*! * \deprecated use getLocation @@ -371,10 +371,10 @@ public: Base::Vector3d getAxisDirection() const; - virtual unsigned int getMemSize() const = 0; - virtual PyObject *getPyObject() = 0; + unsigned int getMemSize() const override = 0; + PyObject *getPyObject() override = 0; - const Handle(Geom_Geometry)& handle() const = 0; + const Handle(Geom_Geometry)& handle() const override = 0; }; class PartExport GeomTrimmedCurve : public GeomBoundedCurve @@ -383,18 +383,18 @@ class PartExport GeomTrimmedCurve : public GeomBoundedCurve public: GeomTrimmedCurve(); GeomTrimmedCurve(const Handle(Geom_TrimmedCurve)&); - virtual ~GeomTrimmedCurve(); - virtual Geometry *copy() const; + ~GeomTrimmedCurve() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_TrimmedCurve)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; bool intersectBasisCurves( const GeomTrimmedCurve * c, std::vector>& points, @@ -417,14 +417,14 @@ protected: GeomArcOfConic(); public: - virtual ~GeomArcOfConic(); - virtual Geometry *copy() const = 0; + ~GeomArcOfConic() override; + Geometry *copy() const override = 0; Base::Vector3d getStartPoint(bool emulateCCWXY) const; Base::Vector3d getEndPoint(bool emulateCCWXY) const; - inline virtual Base::Vector3d getStartPoint() const {return getStartPoint(false);} - inline virtual Base::Vector3d getEndPoint() const {return getEndPoint(false);} + inline Base::Vector3d getStartPoint() const override {return getStartPoint(false);} + inline Base::Vector3d getEndPoint() const override {return getEndPoint(false);} /*! * \deprecated use getLocation * \brief getCenter @@ -443,8 +443,8 @@ public: virtual void getRange(double& u, double& v, bool emulateCCWXY) const = 0; virtual void setRange(double u, double v, bool emulateCCWXY) = 0; - inline virtual void getRange(double& u, double& v) const { getRange(u,v,false);} - inline virtual void setRange(double u, double v) { setRange(u,v,false);} + inline void getRange(double& u, double& v) const override { getRange(u,v,false);} + inline void setRange(double u, double v) override { setRange(u,v,false);} bool isReversed() const; double getAngleXU() const; @@ -453,10 +453,10 @@ public: Base::Vector3d getXAxisDir() const; void setXAxisDir(const Base::Vector3d& newdir); - virtual unsigned int getMemSize() const = 0; - virtual PyObject *getPyObject() = 0; + unsigned int getMemSize() const override = 0; + PyObject *getPyObject() override = 0; - const Handle(Geom_Geometry)& handle() const = 0; + const Handle(Geom_Geometry)& handle() const override = 0; }; class PartExport GeomCircle : public GeomConic @@ -465,21 +465,21 @@ class PartExport GeomCircle : public GeomConic public: GeomCircle(); GeomCircle(const Handle(Geom_Circle)&); - virtual ~GeomCircle(); - virtual Geometry *copy() const; + ~GeomCircle() override; + Geometry *copy() const override; double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; void setHandle(const Handle(Geom_Circle)&); @@ -493,26 +493,26 @@ class PartExport GeomArcOfCircle : public GeomArcOfConic public: GeomArcOfCircle(); GeomArcOfCircle(const Handle(Geom_Circle)&); - virtual ~GeomArcOfCircle(); - virtual Geometry *copy() const; + ~GeomArcOfCircle() override; + Geometry *copy() const override; 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); + void getRange(double& u, double& v, bool emulateCCWXY) const override; + void setRange(double u, double v, bool emulateCCWXY) override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Circle)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; }; @@ -522,8 +522,8 @@ class PartExport GeomEllipse : public GeomConic public: GeomEllipse(); GeomEllipse(const Handle(Geom_Ellipse)&); - virtual ~GeomEllipse(); - virtual Geometry *copy() const; + ~GeomEllipse() override; + Geometry *copy() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -534,15 +534,15 @@ public: Base::Vector3d getMinorAxisDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; void setHandle(const Handle(Geom_Ellipse) &e); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_Ellipse) myCurve; @@ -554,8 +554,8 @@ class PartExport GeomArcOfEllipse : public GeomArcOfConic public: GeomArcOfEllipse(); GeomArcOfEllipse(const Handle(Geom_Ellipse)&); - virtual ~GeomArcOfEllipse(); - virtual Geometry *copy() const; + ~GeomArcOfEllipse() override; + Geometry *copy() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -564,20 +564,20 @@ public: Base::Vector3d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector3d newdir); - virtual void getRange(double& u, double& v, bool emulateCCWXY) const; - virtual void setRange(double u, double v, bool emulateCCWXY); + void getRange(double& u, double& v, bool emulateCCWXY) const override; + void setRange(double u, double v, bool emulateCCWXY) override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Ellipse)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; }; @@ -587,8 +587,8 @@ class PartExport GeomHyperbola : public GeomConic public: GeomHyperbola(); GeomHyperbola(const Handle(Geom_Hyperbola)&); - virtual ~GeomHyperbola(); - virtual Geometry *copy() const; + ~GeomHyperbola() override; + Geometry *copy() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -596,14 +596,14 @@ public: void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; void setHandle(const Handle(Geom_Hyperbola)&); private: @@ -616,8 +616,8 @@ class PartExport GeomArcOfHyperbola : public GeomArcOfConic public: GeomArcOfHyperbola(); GeomArcOfHyperbola(const Handle(Geom_Hyperbola)&); - virtual ~GeomArcOfHyperbola(); - virtual Geometry *copy() const; + ~GeomArcOfHyperbola() override; + Geometry *copy() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -626,20 +626,20 @@ public: Base::Vector3d getMajorAxisDir() const; void setMajorAxisDir(Base::Vector3d newdir); - virtual void getRange(double& u, double& v, bool emulateCCWXY) const; - virtual void setRange(double u, double v, bool emulateCCWXY); + void getRange(double& u, double& v, bool emulateCCWXY) const override; + void setRange(double u, double v, bool emulateCCWXY) override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Hyperbola)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; }; class PartExport GeomParabola : public GeomConic @@ -648,21 +648,21 @@ class PartExport GeomParabola : public GeomConic public: GeomParabola(); GeomParabola(const Handle(Geom_Parabola)&); - virtual ~GeomParabola(); - virtual Geometry *copy() const; + ~GeomParabola() override; + Geometry *copy() const override; double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; void setHandle(const Handle(Geom_Parabola)&); private: @@ -675,28 +675,28 @@ class PartExport GeomArcOfParabola : public GeomArcOfConic public: GeomArcOfParabola(); GeomArcOfParabola(const Handle(Geom_Parabola)&); - virtual ~GeomArcOfParabola(); - virtual Geometry *copy() const; + ~GeomArcOfParabola() override; + Geometry *copy() const override; double getFocal() const; void setFocal(double length); Base::Vector3d getFocus() const; - virtual void getRange(double& u, double& v, bool emulateCCWXY) const; - virtual void setRange(double u, double v, bool emulateCCWXY); + void getRange(double& u, double& v, bool emulateCCWXY) const override; + void setRange(double u, double v, bool emulateCCWXY) override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); - virtual GeomBSplineCurve* toNurbs(double first, double last) const; + PyObject *getPyObject() override; + GeomBSplineCurve* toNurbs(double first, double last) const override; void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Parabola)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; }; class PartExport GeomLine : public GeomCurve @@ -706,21 +706,21 @@ public: GeomLine(); GeomLine(const Handle(Geom_Line)&); GeomLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir); - virtual ~GeomLine(); - virtual Geometry *copy() const; + ~GeomLine() override; + Geometry *copy() const override; void setLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir); Base::Vector3d getPos() const; Base::Vector3d getDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; void setHandle(const Handle(Geom_Line)&); private: @@ -733,25 +733,25 @@ class PartExport GeomLineSegment : public GeomTrimmedCurve public: GeomLineSegment(); GeomLineSegment(const Handle(Geom_Line)& l); - virtual ~GeomLineSegment(); - virtual Geometry *copy() const; + ~GeomLineSegment() override; + Geometry *copy() const override; - Base::Vector3d getStartPoint() const; - Base::Vector3d getEndPoint() const; + Base::Vector3d getStartPoint() const override; + Base::Vector3d getEndPoint() const override; void setPoints(const Base::Vector3d& p1, const Base::Vector3d& p2); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_TrimmedCurve)&); void setHandle(const Handle(Geom_Line)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; }; @@ -763,18 +763,18 @@ public: GeomOffsetCurve(const Handle(Geom_Curve)&, double, const gp_Dir&); GeomOffsetCurve(const Handle(Geom_Curve)&, double, Base::Vector3d&); GeomOffsetCurve(const Handle(Geom_OffsetCurve)&); - virtual ~GeomOffsetCurve(); - virtual Geometry *copy() const; + ~GeomOffsetCurve() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_OffsetCurve)& c); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_OffsetCurve) myCurve; @@ -792,9 +792,9 @@ public: }; GeomSurface(); - virtual ~GeomSurface(); + ~GeomSurface() override; - TopoDS_Shape toShape() const; + TopoDS_Shape toShape() const override; bool tangentU(double u, double v, gp_Dir& dirU) const; bool tangentV(double u, double v, gp_Dir& dirV) const; bool normal(double u, double v, gp_Dir& dir) const; @@ -818,18 +818,18 @@ class PartExport GeomBezierSurface : public GeomSurface public: GeomBezierSurface(); GeomBezierSurface(const Handle(Geom_BezierSurface)&); - virtual ~GeomBezierSurface(); - virtual Geometry *copy() const; + ~GeomBezierSurface() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_BezierSurface)& b); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_BezierSurface) mySurface; @@ -841,19 +841,19 @@ class PartExport GeomBSplineSurface : public GeomSurface public: GeomBSplineSurface(); GeomBSplineSurface(const Handle(Geom_BSplineSurface)&); - virtual ~GeomBSplineSurface(); - virtual Geometry *copy() const; + ~GeomBSplineSurface() override; + Geometry *copy() const override; void setBounds(double u0, double u1, double v0, double v1); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_BSplineSurface)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_BSplineSurface) mySurface; @@ -865,18 +865,18 @@ class PartExport GeomCylinder : public GeomSurface public: GeomCylinder(); GeomCylinder(const Handle(Geom_CylindricalSurface)&); - virtual ~GeomCylinder(); - virtual Geometry *copy() const; + ~GeomCylinder() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_CylindricalSurface)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_CylindricalSurface) mySurface; @@ -888,21 +888,21 @@ class PartExport GeomCone : public GeomSurface public: GeomCone(); GeomCone(const Handle(Geom_ConicalSurface)&); - virtual ~GeomCone(); - virtual Geometry *copy() const; + ~GeomCone() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_ConicalSurface)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; // Overloaded for Geom_ConicalSurface because of an OCC bug - virtual gp_Vec getDN(double u, double v, int Nu, int Nv) const; + gp_Vec getDN(double u, double v, int Nu, int Nv) const override; private: Handle(Geom_ConicalSurface) mySurface; @@ -914,18 +914,18 @@ class PartExport GeomSphere : public GeomSurface public: GeomSphere(); GeomSphere(const Handle(Geom_SphericalSurface)&); - virtual ~GeomSphere(); - virtual Geometry *copy() const; + ~GeomSphere() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_SphericalSurface)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_SphericalSurface) mySurface; @@ -937,18 +937,18 @@ class PartExport GeomToroid : public GeomSurface public: GeomToroid(); GeomToroid(const Handle(Geom_ToroidalSurface)&); - virtual ~GeomToroid(); - virtual Geometry *copy() const; + ~GeomToroid() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_ToroidalSurface)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_ToroidalSurface) mySurface; @@ -960,18 +960,18 @@ class PartExport GeomPlane : public GeomSurface public: GeomPlane(); GeomPlane(const Handle(Geom_Plane)&); - virtual ~GeomPlane(); - virtual Geometry *copy() const; + ~GeomPlane() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_Plane)&); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_Plane) mySurface; @@ -984,18 +984,18 @@ public: GeomOffsetSurface(); GeomOffsetSurface(const Handle(Geom_Surface)&, double); GeomOffsetSurface(const Handle(Geom_OffsetSurface)&); - virtual ~GeomOffsetSurface(); - virtual Geometry *copy() const; + ~GeomOffsetSurface() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_OffsetSurface)& s); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_OffsetSurface) mySurface; @@ -1009,18 +1009,18 @@ public: GeomPlateSurface(const Handle(Geom_Surface)&, const Plate_Plate&); GeomPlateSurface(const GeomPlate_BuildPlateSurface&); GeomPlateSurface(const Handle(GeomPlate_Surface)&); - virtual ~GeomPlateSurface(); - virtual Geometry *copy() const; + ~GeomPlateSurface() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(GeomPlate_Surface)& s); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(GeomPlate_Surface) mySurface; @@ -1032,18 +1032,18 @@ class PartExport GeomTrimmedSurface : public GeomSurface public: GeomTrimmedSurface(); GeomTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)&); - virtual ~GeomTrimmedSurface(); - virtual Geometry *copy() const; + ~GeomTrimmedSurface() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_RectangularTrimmedSurface)& s); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_RectangularTrimmedSurface) mySurface; @@ -1056,18 +1056,18 @@ public: GeomSurfaceOfRevolution(); GeomSurfaceOfRevolution(const Handle(Geom_Curve)&, const gp_Ax1&); GeomSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)&); - virtual ~GeomSurfaceOfRevolution(); - virtual Geometry *copy() const; + ~GeomSurfaceOfRevolution() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_SurfaceOfRevolution)& c); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_SurfaceOfRevolution) mySurface; @@ -1080,18 +1080,18 @@ public: GeomSurfaceOfExtrusion(); GeomSurfaceOfExtrusion(const Handle(Geom_Curve)&, const gp_Dir&); GeomSurfaceOfExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)&); - virtual ~GeomSurfaceOfExtrusion(); - virtual Geometry *copy() const; + ~GeomSurfaceOfExtrusion() override; + Geometry *copy() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom_SurfaceOfLinearExtrusion)& c); - const Handle(Geom_Geometry)& handle() const; + const Handle(Geom_Geometry)& handle() const override; private: Handle(Geom_SurfaceOfLinearExtrusion) mySurface; diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h index cf19232004..c3734ccdce 100644 --- a/src/Mod/Part/App/Geometry2d.h +++ b/src/Mod/Part/App/Geometry2d.h @@ -52,14 +52,14 @@ class PartExport Geometry2d : public Base::Persistence { TYPESYSTEM_HEADER(); public: - virtual ~Geometry2d(); + ~Geometry2d() override; virtual TopoDS_Shape toShape() const = 0; virtual const Handle(Geom2d_Geometry)& handle() const = 0; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; /// returns a cloned object virtual Geometry2d *clone() const = 0; @@ -78,18 +78,18 @@ public: Geom2dPoint(); Geom2dPoint(const Handle(Geom2d_CartesianPoint)&); Geom2dPoint(const Base::Vector2d&); - virtual ~Geom2dPoint(); - virtual Geometry2d *clone() const; - virtual TopoDS_Shape toShape() const; + ~Geom2dPoint() override; + Geometry2d *clone() const override; + TopoDS_Shape toShape() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; Base::Vector2d getPoint()const; void setPoint(const Base::Vector2d&); @@ -103,9 +103,9 @@ class PartExport Geom2dCurve : public Geometry2d TYPESYSTEM_HEADER(); public: Geom2dCurve(); - virtual ~Geom2dCurve(); + ~Geom2dCurve() override; - virtual TopoDS_Shape toShape() const; + TopoDS_Shape toShape() const override; bool tangent(double u, gp_Dir2d&) const; Base::Vector2d pointAtParameter(double u) const; Base::Vector2d firstDerivativeAtParameter(double u) const; @@ -121,18 +121,18 @@ class PartExport Geom2dBezierCurve : public Geom2dCurve public: Geom2dBezierCurve(); Geom2dBezierCurve(const Handle(Geom2d_BezierCurve)&); - virtual ~Geom2dBezierCurve(); - virtual Geometry2d *clone() const; + ~Geom2dBezierCurve() override; + Geometry2d *clone() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize () const; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize () const override; + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_BezierCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_BezierCurve) myCurve; @@ -144,8 +144,8 @@ class PartExport Geom2dBSplineCurve : public Geom2dCurve public: Geom2dBSplineCurve(); Geom2dBSplineCurve(const Handle(Geom2d_BSplineCurve)&); - virtual ~Geom2dBSplineCurve(); - virtual Geometry2d *clone() const; + ~Geom2dBSplineCurve() override; + Geometry2d *clone() const override; /*! * Set the poles and tangents for the cubic Hermite spline @@ -174,14 +174,14 @@ public: std::list toBiArcs(double tolerance) const; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_BSplineCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: void createArcs(double tolerance, std::list& new_spans, @@ -201,17 +201,17 @@ protected: Geom2dConic(); public: - virtual ~Geom2dConic(); - virtual Geometry2d *clone() const = 0; + ~Geom2dConic() override; + Geometry2d *clone() const override = 0; Base::Vector2d getLocation() const; void setLocation(const Base::Vector2d& Center); bool isReversed() const; - virtual unsigned int getMemSize() const = 0; - virtual PyObject *getPyObject() = 0; + unsigned int getMemSize() const override = 0; + PyObject *getPyObject() override = 0; - const Handle(Geom2d_Geometry)& handle() const = 0; + const Handle(Geom2d_Geometry)& handle() const override = 0; protected: void SaveAxis(Base::Writer& writer, const gp_Ax22d&) const; @@ -225,8 +225,8 @@ protected: Geom2dArcOfConic(); public: - virtual ~Geom2dArcOfConic(); - virtual Geometry2d *clone() const = 0; + ~Geom2dArcOfConic() override; + Geometry2d *clone() const override = 0; Base::Vector2d getLocation() const; void setLocation(const Base::Vector2d& Center); @@ -238,10 +238,10 @@ public: void getRange(double& u, double& v) const; void setRange(double u, double v); - virtual unsigned int getMemSize() const = 0; - virtual PyObject *getPyObject() = 0; + unsigned int getMemSize() const override = 0; + PyObject *getPyObject() override = 0; - const Handle(Geom2d_Geometry)& handle() const = 0; + const Handle(Geom2d_Geometry)& handle() const override = 0; protected: void SaveAxis(Base::Writer& writer, const gp_Ax22d&, double u, double v) const; @@ -254,20 +254,20 @@ class PartExport Geom2dCircle : public Geom2dConic public: Geom2dCircle(); Geom2dCircle(const Handle(Geom2d_Circle)&); - virtual ~Geom2dCircle(); - virtual Geometry2d *clone() const; + ~Geom2dCircle() override; + Geometry2d *clone() const override; double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; static Base::Vector2d getCircleCenter (const Base::Vector2d &p1, const Base::Vector2d &p2, const Base::Vector2d &p3); @@ -281,21 +281,21 @@ class PartExport Geom2dArcOfCircle : public Geom2dArcOfConic public: Geom2dArcOfCircle(); Geom2dArcOfCircle(const Handle(Geom2d_Circle)&); - virtual ~Geom2dArcOfCircle(); - virtual Geometry2d *clone() const; + ~Geom2dArcOfCircle() override; + Geometry2d *clone() const override; double getRadius() const; void setRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; @@ -307,8 +307,8 @@ class PartExport Geom2dEllipse : public Geom2dConic public: Geom2dEllipse(); Geom2dEllipse(const Handle(Geom2d_Ellipse)&); - virtual ~Geom2dEllipse(); - virtual Geometry2d *clone() const; + ~Geom2dEllipse() override; + Geometry2d *clone() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -318,14 +318,14 @@ public: void setMajorAxisDir(Base::Vector2d newdir); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_Ellipse) &e); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_Ellipse) myCurve; @@ -337,8 +337,8 @@ class PartExport Geom2dArcOfEllipse : public Geom2dArcOfConic public: Geom2dArcOfEllipse(); Geom2dArcOfEllipse(const Handle(Geom2d_Ellipse)&); - virtual ~Geom2dArcOfEllipse(); - virtual Geometry2d *clone() const; + ~Geom2dArcOfEllipse() override; + Geometry2d *clone() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -348,14 +348,14 @@ public: void setMajorAxisDir(Base::Vector2d newdir); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; @@ -367,8 +367,8 @@ class PartExport Geom2dHyperbola : public Geom2dConic public: Geom2dHyperbola(); Geom2dHyperbola(const Handle(Geom2d_Hyperbola)&); - virtual ~Geom2dHyperbola(); - virtual Geometry2d *clone() const; + ~Geom2dHyperbola() override; + Geometry2d *clone() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -376,13 +376,13 @@ public: void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_Hyperbola) myCurve; @@ -394,8 +394,8 @@ class PartExport Geom2dArcOfHyperbola : public Geom2dArcOfConic public: Geom2dArcOfHyperbola(); Geom2dArcOfHyperbola(const Handle(Geom2d_Hyperbola)&); - virtual ~Geom2dArcOfHyperbola(); - virtual Geometry2d *clone() const; + ~Geom2dArcOfHyperbola() override; + Geometry2d *clone() const override; double getMajorRadius() const; void setMajorRadius(double Radius); @@ -403,14 +403,14 @@ public: void setMinorRadius(double Radius); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; @@ -422,20 +422,20 @@ class PartExport Geom2dParabola : public Geom2dConic public: Geom2dParabola(); Geom2dParabola(const Handle(Geom2d_Parabola)&); - virtual ~Geom2dParabola(); - virtual Geometry2d *clone() const; + ~Geom2dParabola() override; + Geometry2d *clone() const override; double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_Parabola) myCurve; @@ -447,21 +447,21 @@ class PartExport Geom2dArcOfParabola : public Geom2dArcOfConic public: Geom2dArcOfParabola(); Geom2dArcOfParabola(const Handle(Geom2d_Parabola)&); - virtual ~Geom2dArcOfParabola(); - virtual Geometry2d *clone() const; + ~Geom2dArcOfParabola() override; + Geometry2d *clone() const override; double getFocal() const; void setFocal(double length); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; @@ -474,21 +474,21 @@ public: Geom2dLine(); Geom2dLine(const Handle(Geom2d_Line)&); Geom2dLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir); - virtual ~Geom2dLine(); - virtual Geometry2d *clone() const; + ~Geom2dLine() override; + Geometry2d *clone() const override; void setLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir); Base::Vector2d getPos() const; Base::Vector2d getDir() const; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_Line) myCurve; @@ -499,8 +499,8 @@ class PartExport Geom2dLineSegment : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dLineSegment(); - virtual ~Geom2dLineSegment(); - virtual Geometry2d *clone() const; + ~Geom2dLineSegment() override; + Geometry2d *clone() const override; Base::Vector2d getStartPoint() const; Base::Vector2d getEndPoint() const; @@ -509,14 +509,14 @@ public: const Base::Vector2d& p2); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; @@ -529,18 +529,18 @@ public: Geom2dOffsetCurve(); Geom2dOffsetCurve(const Handle(Geom2d_Curve)&, double); Geom2dOffsetCurve(const Handle(Geom2d_OffsetCurve)&); - virtual ~Geom2dOffsetCurve(); - virtual Geometry2d *clone() const; + ~Geom2dOffsetCurve() override; + Geometry2d *clone() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_OffsetCurve)& c); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_OffsetCurve) myCurve; @@ -552,18 +552,18 @@ class PartExport Geom2dTrimmedCurve : public Geom2dCurve public: Geom2dTrimmedCurve(); Geom2dTrimmedCurve(const Handle(Geom2d_TrimmedCurve)&); - virtual ~Geom2dTrimmedCurve(); - virtual Geometry2d *clone() const; + ~Geom2dTrimmedCurve() override; + Geometry2d *clone() const override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // Base implementer ---------------------------- - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; void setHandle(const Handle(Geom2d_TrimmedCurve)&); - const Handle(Geom2d_Geometry)& handle() const; + const Handle(Geom2d_Geometry)& handle() const override; private: Handle(Geom2d_TrimmedCurve) myCurve; diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h index 9d84f747de..80d7b41d5e 100644 --- a/src/Mod/Part/App/GeometryDefaultExtension.h +++ b/src/Mod/Part/App/GeometryDefaultExtension.h @@ -36,19 +36,19 @@ namespace Part { public: inline GeometryDefaultExtension(); GeometryDefaultExtension(const T& val, std::string name = std::string()); - virtual ~GeometryDefaultExtension() override = default; + ~GeometryDefaultExtension() override = default; inline void setValue(const T& val) {value = val;}; inline const T &getValue() const {return value;}; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; - virtual void restoreAttributes(Base::XMLReader &reader) override; - virtual void saveAttributes(Base::Writer &writer) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; + void restoreAttributes(Base::XMLReader &reader) override; + void saveAttributes(Base::Writer &writer) const override; private: GeometryDefaultExtension(const GeometryDefaultExtension&) = default; diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h index fc1e1a54f3..59ed679489 100644 --- a/src/Mod/Part/App/GeometryExtension.h +++ b/src/Mod/Part/App/GeometryExtension.h @@ -38,11 +38,11 @@ class PartExport GeometryExtension: public Base::BaseClass { TYPESYSTEM_HEADER(); public: - virtual ~GeometryExtension() = default; + ~GeometryExtension() override = default; virtual std::unique_ptr copy() const = 0; - virtual PyObject *getPyObject() = 0; + PyObject *getPyObject() override = 0; PyObject* copyPyObject() const; inline void setName(const std::string& str) {name = str;} @@ -69,7 +69,7 @@ class PartExport GeometryPersistenceExtension : public Part::GeometryExtension { TYPESYSTEM_HEADER(); public: - virtual ~GeometryPersistenceExtension() = default; + ~GeometryPersistenceExtension() override = default; // Own Persistence implementer - Not Base::Persistence - managed by Part::Geometry void Save(Base::Writer &/*writer*/) const; diff --git a/src/Mod/Part/App/GeometryMigrationExtension.h b/src/Mod/Part/App/GeometryMigrationExtension.h index 9a2a49641f..9195c632a9 100644 --- a/src/Mod/Part/App/GeometryMigrationExtension.h +++ b/src/Mod/Part/App/GeometryMigrationExtension.h @@ -53,11 +53,11 @@ public: }; GeometryMigrationExtension(); - virtual ~GeometryMigrationExtension() override = default; + ~GeometryMigrationExtension() override = default; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; virtual bool getConstruction() const {return ConstructionState;} @@ -67,7 +67,7 @@ public: virtual void setMigrationType(int flag, bool v=true) { GeometryMigrationFlags.set((size_t)(flag), v); }; protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; private: GeometryMigrationExtension(const GeometryMigrationExtension&) = default; diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h index 157953e6c0..add761e15e 100644 --- a/src/Mod/Part/App/Part2DObject.h +++ b/src/Mod/Part/App/Part2DObject.h @@ -55,7 +55,7 @@ class PartExport Part2DObject : public Part::Feature, public Part::AttachExtensi public: Part2DObject(); - virtual void transformPlacement(const Base::Placement &transform) override; + void transformPlacement(const Base::Placement &transform) override; /// returns the number of construction lines (to be used as axes) virtual int getAxisCount() const; diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h index 41e84f4009..f16a2d64d1 100644 --- a/src/Mod/Part/App/PartFeature.h +++ b/src/Mod/Part/App/PartFeature.h @@ -49,24 +49,24 @@ class PartExport Feature : public App::GeoFeature public: /// Constructor Feature(); - virtual ~Feature(); + ~Feature() override; PropertyPartShape Shape; /** @name methods override feature */ //@{ - virtual short mustExecute() const override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override; - virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const override; + const char* getViewProviderName() const override; + const App::PropertyComplexGeoData* getPropertyOfGeometry() const override; - virtual PyObject* getPyObject() override; + PyObject* getPyObject() override; TopLoc_Location getLocation() const; - virtual DocumentObject *getSubObject(const char *subname, PyObject **pyObj, + DocumentObject *getSubObject(const char *subname, PyObject **pyObj, Base::Matrix4D *mat, bool transform, int depth) const override; /** Convenience function to extract shape from fully qualified subname @@ -109,10 +109,10 @@ public: protected: /// recompute only this object - virtual App::DocumentObjectExecReturn *recompute() override; + App::DocumentObjectExecReturn *recompute() override; /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute() override; - virtual void onChanged(const App::Property* prop) override; + App::DocumentObjectExecReturn *execute() override; + void onChanged(const App::Property* prop) override; /** * Build a history of changes * MakeShape: The operation that created the changes, e.g. BRepAlgoAPI_Common @@ -135,7 +135,7 @@ public: App::PropertyLink Base; PropertyFilletEdges Edges; - short mustExecute() const; + short mustExecute() const override; }; typedef App::FeaturePythonT FeaturePython; @@ -148,7 +148,7 @@ class PartExport FeatureExt : public Feature PROPERTY_HEADER(Part::FeatureExt); public: - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderPartExt"; } }; diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h index 1520819fc0..1a733cf870 100644 --- a/src/Mod/Part/App/PartFeatureReference.h +++ b/src/Mod/Part/App/PartFeatureReference.h @@ -42,19 +42,19 @@ class PartExport FeatureReference : public App::GeoFeature public: /// Constructor FeatureReference(); - virtual ~FeatureReference(); + ~FeatureReference() override; App::PropertyLink Reference; /** @name methods override feature */ //@{ /// recalculate the feature - virtual App::DocumentObjectExecReturn *execute(); - virtual short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderPartReference"; } protected: diff --git a/src/Mod/Part/App/PartFeatures.h b/src/Mod/Part/App/PartFeatures.h index fc6d89040b..8990978fff 100644 --- a/src/Mod/Part/App/PartFeatures.h +++ b/src/Mod/Part/App/PartFeatures.h @@ -46,15 +46,15 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - const char* getViewProviderName() const { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderRuledSurface"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; private: App::DocumentObjectExecReturn* getShape(const App::PropertyLinkSub& link, TopoDS_Shape&) const; @@ -79,15 +79,15 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - const char* getViewProviderName() const { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderLoft"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; private: static App::PropertyIntegerConstraint::Constraints Degrees; @@ -109,15 +109,15 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - const char* getViewProviderName() const { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderSweep"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; private: static const char* TransitionEnums[]; @@ -140,15 +140,15 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - const char* getViewProviderName() const { + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderThickness"; } //@} protected: - void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property *prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property *prop) override; private: static const char* ModeEnums[]; @@ -167,8 +167,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - const char* getViewProviderName() const { + App::DocumentObjectExecReturn *execute() override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderRefine"; } //@} @@ -186,8 +186,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn* execute(); - const char* getViewProviderName() const { + App::DocumentObjectExecReturn* execute() override; + const char* getViewProviderName() const override { return "PartGui::ViewProviderReverse"; } //@} diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h index c7618311b5..8ab3502e5e 100644 --- a/src/Mod/Part/App/PrimitiveFeature.h +++ b/src/Mod/Part/App/PrimitiveFeature.h @@ -36,7 +36,7 @@ class PartExport Primitive : public Part::Feature, public Part::AttachExtension public: Primitive(); - virtual ~Primitive(); + ~Primitive() override; /** @name methods override feature */ //@{ @@ -49,8 +49,8 @@ public: protected: void Restore(Base::XMLReader &reader) override; void onChanged (const App::Property* prop) override; - virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; }; class PartExport Vertex : public Part::Primitive @@ -59,7 +59,7 @@ class PartExport Vertex : public Part::Primitive public: Vertex(); - virtual ~Vertex(); + ~Vertex() override; App::PropertyDistance X; App::PropertyDistance Y; @@ -68,11 +68,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void onChanged(const App::Property*); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void onChanged(const App::Property*) override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderPointParametric"; } //@} @@ -84,7 +84,7 @@ class PartExport Line : public Part::Primitive public: Line(); - virtual ~Line(); + ~Line() override; App::PropertyDistance X1; App::PropertyDistance Y1; @@ -96,11 +96,11 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void onChanged(const App::Property*); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void onChanged(const App::Property*) override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderLineParametric"; } //@} @@ -119,10 +119,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderPlaneParametric"; } //@} @@ -143,10 +143,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderSphereParametric"; } //@} @@ -169,10 +169,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderEllipsoid"; } }; @@ -192,10 +192,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderCylinderParametric"; } //@} @@ -216,10 +216,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderPrism"; } //@} @@ -240,10 +240,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderRegularPolygon"; } //@} @@ -266,10 +266,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderConeParametric"; } //@} @@ -291,10 +291,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderTorusParametric"; } //@} @@ -318,16 +318,16 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderHelixParametric"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; private: static const char* LocalCSEnums[]; @@ -349,16 +349,16 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderSpiralParametric"; } //@} protected: - void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; }; class PartExport Wedge : public Primitive @@ -382,16 +382,16 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderWedge"; } //@} protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; class PartExport Ellipse : public Part::Primitive @@ -400,7 +400,7 @@ class PartExport Ellipse : public Part::Primitive public: Ellipse(); - virtual ~Ellipse(); + ~Ellipse() override; App::PropertyLength MajorRadius; App::PropertyLength MinorRadius; @@ -410,18 +410,18 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; - void onChanged(const App::Property*); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void onChanged(const App::Property*) override; /// returns the type name of the ViewProvider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartGui::ViewProviderEllipseParametric"; } //@} protected: - void Restore(Base::XMLReader &reader); - void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName); + void Restore(Base::XMLReader &reader) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; private: static App::PropertyQuantityConstraint::Constraints angleRange; diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h index f0ccf5593c..2b6e22062a 100644 --- a/src/Mod/Part/App/PrismExtension.h +++ b/src/Mod/Part/App/PrismExtension.h @@ -38,7 +38,7 @@ class PartExport PrismExtension : public App::DocumentObjectExtension EXTENSION_PROPERTY_HEADER(Part::PrismExtension); public: PrismExtension(); - virtual ~PrismExtension(); + ~PrismExtension() override; App::PropertyAngle FirstAngle; @@ -46,11 +46,11 @@ public: TopoDS_Shape makePrism(double height, const TopoDS_Face& face) const; - virtual short int extensionMustExecute(); - virtual App::DocumentObjectExecReturn *extensionExecute(); + short int extensionMustExecute() override; + App::DocumentObjectExecReturn *extensionExecute() override; protected: - virtual void extensionOnChanged(const App::Property* /*prop*/); + void extensionOnChanged(const App::Property* /*prop*/) override; }; } // namespace Part diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h index 43991a2188..b0331c3e40 100644 --- a/src/Mod/Part/App/PropertyGeometryList.h +++ b/src/Mod/Part/App/PropertyGeometryList.h @@ -53,10 +53,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyGeometryList(); + ~PropertyGeometryList() override; - virtual void setSize(int newSize); - virtual int getSize() const; + void setSize(int newSize) override; + int getSize() const override; /** Sets the property */ @@ -75,16 +75,16 @@ public: void set1Value(int idx, std::unique_ptr &&); - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual App::Property *Copy() const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize() const; + unsigned int getMemSize() const override; private: std::vector _lValueList; diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h index 323c7c6640..54abb9f21b 100644 --- a/src/Mod/Part/App/PropertyTopoShape.h +++ b/src/Mod/Part/App/PropertyTopoShape.h @@ -44,7 +44,7 @@ class PartExport PropertyPartShape : public App::PropertyComplexGeoData public: PropertyPartShape(); - ~PropertyPartShape(); + ~PropertyPartShape() override; /** @name Getter/setter */ //@{ @@ -55,46 +55,46 @@ public: /// get the part shape const TopoDS_Shape& getValue() const; const TopoShape& getShape() const; - const Data::ComplexGeoData* getComplexData() const; + const Data::ComplexGeoData* getComplexData() const override; //@} /** @name Modification */ //@{ /// Set the placement of the geometry - void setTransform(const Base::Matrix4D& rclTrf); + void setTransform(const Base::Matrix4D& rclTrf) override; /// Get the placement of the geometry - Base::Matrix4D getTransform() const; + Base::Matrix4D getTransform() const override; /// Transform the real shape data - void transformGeometry(const Base::Matrix4D &rclMat); + void transformGeometry(const Base::Matrix4D &rclMat) override; //@} /** @name Getting basic geometric entities */ //@{ /** Returns the bounding box around the underlying mesh kernel */ - Base::BoundBox3d getBoundingBox() const; + Base::BoundBox3d getBoundingBox() const override; //@} /** @name Python interface */ //@{ - PyObject* getPyObject(); - void setPyObject(PyObject *value); + PyObject* getPyObject() override; + void setPyObject(PyObject *value) override; //@} /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - App::Property *Copy() const; - void Paste(const App::Property &from); - unsigned int getMemSize () const; + App::Property *Copy() const override; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; //@} /// Get valid paths for this property; used by auto completer - virtual void getPaths(std::vector & paths) const; + void getPaths(std::vector & paths) const override; private: void saveToFile(Base::Writer &writer) const; @@ -123,12 +123,12 @@ class PartExport PropertyShapeHistory : public App::PropertyLists public: PropertyShapeHistory(); - ~PropertyShapeHistory(); + ~PropertyShapeHistory() override; - virtual void setSize(int newSize) { + void setSize(int newSize) override { _lValueList.resize(newSize); } - virtual int getSize() const { + int getSize() const override { return _lValueList.size(); } @@ -142,19 +142,19 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual Property *Copy() const; - virtual void Paste(const Property &from); + Property *Copy() const override; + void Paste(const Property &from) override; - virtual unsigned int getMemSize () const { + unsigned int getMemSize () const override { return _lValueList.size() * sizeof(ShapeHistory); } @@ -176,12 +176,12 @@ class PartExport PropertyFilletEdges : public App::PropertyLists public: PropertyFilletEdges(); - ~PropertyFilletEdges(); + ~PropertyFilletEdges() override; - virtual void setSize(int newSize) { + void setSize(int newSize) override { _lValueList.resize(newSize); } - virtual int getSize() const { + int getSize() const override { return _lValueList.size(); } @@ -195,19 +195,19 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual Property *Copy() const; - virtual void Paste(const Property &from); + Property *Copy() const override; + void Paste(const Property &from) override; - virtual unsigned int getMemSize () const { + unsigned int getMemSize () const override { return _lValueList.size() * sizeof(FilletElement); } diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 454fc76fae..7110a30e10 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -57,7 +57,7 @@ public: NullShapeException(const char * sMessage); NullShapeException(const std::string& sMessage); /// Destruction - virtual ~NullShapeException() throw() {} + ~NullShapeException() throw() override {} }; /* A special sub-class to indicate boolean failures @@ -70,7 +70,7 @@ public: BooleanException(const char * sMessage); BooleanException(const std::string& sMessage); /// Destruction - virtual ~BooleanException() throw() {} + ~BooleanException() throw() override {} }; class PartExport ShapeSegment : public Data::Segment @@ -80,7 +80,7 @@ class PartExport ShapeSegment : public Data::Segment public: ShapeSegment(const TopoDS_Shape &ShapeIn):Shape(ShapeIn){} ShapeSegment(){} - virtual std::string getName() const; + std::string getName() const override; TopoDS_Shape Shape; }; @@ -97,7 +97,7 @@ public: TopoShape(); TopoShape(const TopoDS_Shape&); TopoShape(const TopoShape&); - ~TopoShape(); + ~TopoShape() override; inline void setShape(const TopoDS_Shape& shape) { this->_Shape = shape; @@ -112,16 +112,16 @@ public: /** @name Placement control */ //@{ /// set the transformation of the CasCade Shape - void setTransform(const Base::Matrix4D& rclTrf); + void setTransform(const Base::Matrix4D& rclTrf) override; /// set the transformation of the CasCade Shape void setShapePlacement(const Base::Placement& rclTrf); /// get the transformation of the CasCade Shape Base::Placement getShapePlacement() const; /// get the transformation of the CasCade Shape - Base::Matrix4D getTransform() const; + Base::Matrix4D getTransform() const override; /// Bound box from the CasCade shape - Base::BoundBox3d getBoundBox()const; - virtual bool getCenterOfGravity(Base::Vector3d& center) const; + Base::BoundBox3d getBoundBox()const override; + bool getCenterOfGravity(Base::Vector3d& center) const override; static void convertTogpTrsf(const Base::Matrix4D& mtrx, gp_Trsf& trsf); static void convertToMatrix(const gp_Trsf& trsf, Base::Matrix4D& mtrx); static Base::Matrix4D convert(const gp_Trsf& trsf); @@ -134,21 +134,21 @@ public: * List of different subelement types * it is NOT a list of the subelements itself */ - virtual std::vector getElementTypes() const; - virtual unsigned long countSubElements(const char* Type) const; + std::vector getElementTypes() const override; + unsigned long countSubElements(const char* Type) const override; /// get the subelement by type and number - virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; + Data::Segment* getSubElement(const char* Type, unsigned long) const override; /** Get lines from segment */ - virtual void getLinesFromSubElement( + void getLinesFromSubElement( const Data::Segment*, std::vector &Points, - std::vector &lines) const; + std::vector &lines) const override; /** Get faces from segment */ - virtual void getFacesFromSubElement( + void getFacesFromSubElement( const Data::Segment*, std::vector &Points, std::vector &PointNormals, - std::vector &faces) const; + std::vector &faces) const override; //@} /// get the Topo"sub"Shape with the given name TopoDS_Shape getSubShape(const char* Type, bool silent=false) const; @@ -161,17 +161,17 @@ public: bool hasSubShape(TopAbs_ShapeEnum type) const; /// get the Topo"sub"Shape with the given name PyObject * getPySubShape(const char* Type, bool silent=false) const; - PyObject * getPyObject(); - void setPyObject(PyObject*); + PyObject * getPyObject() override; + void setPyObject(PyObject*) override; /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); - unsigned int getMemSize () const; + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; + unsigned int getMemSize () const override; //@} /** @name Input/Output */ @@ -282,7 +282,7 @@ public: /** @name Manipulation*/ //@{ - void transformGeometry(const Base::Matrix4D &rclMat); + void transformGeometry(const Base::Matrix4D &rclMat) override; TopoDS_Shape transformGShape(const Base::Matrix4D&, bool copy = false) const; bool transformShape(const Base::Matrix4D&, bool copy, bool checkScale=false); TopoDS_Shape mirror(const gp_Ax2&) const; @@ -300,11 +300,11 @@ public: /** @name Getting basic geometric entities */ //@{ /** Get points from object with given accuracy */ - virtual void getPoints(std::vector &Points, + void getPoints(std::vector &Points, std::vector &Normals, - float Accuracy, uint16_t flags=0) const; - virtual void getFaces(std::vector &Points,std::vector &faces, - float Accuracy, uint16_t flags=0) const; + float Accuracy, uint16_t flags=0) const override; + void getFaces(std::vector &Points,std::vector &faces, + float Accuracy, uint16_t flags=0) const override; void setFaces(const std::vector &Points, const std::vector &faces, double tolerance=1.0e-06); void getDomains(std::vector&) const; diff --git a/src/Mod/Part/App/modelRefine.h b/src/Mod/Part/App/modelRefine.h index 4186d1c1db..c622cd79d8 100644 --- a/src/Mod/Part/App/modelRefine.h +++ b/src/Mod/Part/App/modelRefine.h @@ -75,9 +75,9 @@ namespace ModelRefine private: FaceTypedPlane(); public: - virtual bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const; - virtual GeomAbs_SurfaceType getType() const; - virtual TopoDS_Face buildFace(const FaceVectorType &faces) const; + bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const override; + GeomAbs_SurfaceType getType() const override; + TopoDS_Face buildFace(const FaceVectorType &faces) const override; friend FaceTypedPlane& getPlaneObject(); }; FaceTypedPlane& getPlaneObject(); @@ -87,13 +87,13 @@ namespace ModelRefine private: FaceTypedCylinder(); public: - virtual bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const; - virtual GeomAbs_SurfaceType getType() const; - virtual TopoDS_Face buildFace(const FaceVectorType &faces) const; + bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const override; + GeomAbs_SurfaceType getType() const override; + TopoDS_Face buildFace(const FaceVectorType &faces) const override; friend FaceTypedCylinder& getCylinderObject(); protected: - virtual void boundarySplit(const FaceVectorType &facesIn, std::vector &boundariesOut) const; + void boundarySplit(const FaceVectorType &facesIn, std::vector &boundariesOut) const override; }; FaceTypedCylinder& getCylinderObject(); @@ -102,9 +102,9 @@ namespace ModelRefine private: FaceTypedBSpline(); public: - virtual bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const; - virtual GeomAbs_SurfaceType getType() const; - virtual TopoDS_Face buildFace(const FaceVectorType &faces) const; + bool isEqual(const TopoDS_Face &faceOne, const TopoDS_Face &faceTwo) const override; + GeomAbs_SurfaceType getType() const override; + TopoDS_Face buildFace(const FaceVectorType &faces) const override; friend FaceTypedBSpline& getBSplineObject(); }; FaceTypedBSpline& getBSplineObject(); @@ -198,9 +198,9 @@ class PartExport BRepBuilderAPI_RefineModel : public BRepBuilderAPI_MakeShape { public: BRepBuilderAPI_RefineModel(const TopoDS_Shape&); - void Build(); - const TopTools_ListOfShape& Modified(const TopoDS_Shape& S); - Standard_Boolean IsDeleted(const TopoDS_Shape& S); + void Build() override; + const TopTools_ListOfShape& Modified(const TopoDS_Shape& S) override; + Standard_Boolean IsDeleted(const TopoDS_Shape& S) override; private: void LogModifications(const ModelRefine::FaceUniter& uniter); diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 9d9577dee9..3b1614f905 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -85,7 +85,7 @@ public: initialize("This module is the PartGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Part/Gui/BoxSelection.cpp b/src/Mod/Part/Gui/BoxSelection.cpp index e64ae32b71..77bf3ef8e9 100644 --- a/src/Mod/Part/Gui/BoxSelection.cpp +++ b/src/Mod/Part/Gui/BoxSelection.cpp @@ -58,10 +58,10 @@ public: : Gui::SelectionFilterGate() { } - ~FaceSelectionGate() + ~FaceSelectionGate() override { } - bool allow(App::Document*, App::DocumentObject*, const char*sSubName) + bool allow(App::Document*, App::DocumentObject*, const char*sSubName) override { if (!sSubName || sSubName[0] == '\0') return false; diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index 9ba8898f5f..1a7e9196b2 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -79,19 +79,19 @@ public: this->pcRoot->addChild(coords); this->pcRoot->addChild(planes); } - ~ViewProviderCrossSections() + ~ViewProviderCrossSections() override { coords->unref(); planes->unref(); } - void updateData(const App::Property*) + void updateData(const App::Property*) override { } - const char* getDefaultDisplayMode() const + const char* getDefaultDisplayMode() const override { return ""; } - std::vector getDisplayModes(void) const + std::vector getDisplayModes(void) const override { return std::vector(); } diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h index 552a60ffdc..4aa5d618f5 100644 --- a/src/Mod/Part/Gui/CrossSections.h +++ b/src/Mod/Part/Gui/CrossSections.h @@ -47,13 +47,13 @@ class CrossSections : public QDialog public: CrossSections(const Base::BoundBox3d& bb, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~CrossSections(); - void accept(); + ~CrossSections() override; + void accept() override; void apply(); protected: - void changeEvent(QEvent *e); - void keyPressEvent(QKeyEvent*); + void changeEvent(QEvent *e) override; + void keyPressEvent(QKeyEvent*) override; private Q_SLOTS: void on_xyPlane_clicked(); @@ -85,13 +85,13 @@ class TaskCrossSections : public Gui::TaskView::TaskDialog public: TaskCrossSections(const Base::BoundBox3d& bb); - ~TaskCrossSections(); + ~TaskCrossSections() override; public: - bool accept(); - void clicked(int id); + bool accept() override; + void clicked(int id) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp index 11f144e1aa..c10abe960f 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp +++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp @@ -56,7 +56,7 @@ namespace PartGui { : QTreeWidgetItem(type) { } - void setData (int column, int role, const QVariant & value) + void setData (int column, int role, const QVariant & value) override { QTreeWidgetItem::setData(column, role, value); if (role == Qt::CheckStateRole && value.toBool()) { diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index 04fa92afbb..2840fdea9b 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -43,7 +43,7 @@ class DlgBooleanOperation : public QWidget public: DlgBooleanOperation(QWidget* parent = nullptr); - ~DlgBooleanOperation(); + ~DlgBooleanOperation() override; void accept(); private: @@ -54,7 +54,7 @@ private: bool hasSolids(const App::DocumentObject*) const; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; public Q_SLOTS: void on_swapButton_clicked(); @@ -75,16 +75,16 @@ class TaskBooleanOperation : public Gui::TaskView::TaskDialog public: TaskBooleanOperation(); - ~TaskBooleanOperation(); + ~TaskBooleanOperation() override; public: - void clicked(int); + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Apply | QDialogButtonBox::Close; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return true; } - virtual bool needsFullSpace() const + bool needsFullSpace() const override { return true; } private: diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index 6f00057502..890a264394 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -67,7 +67,7 @@ public: { canSelect = false; } - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { this->canSelect = false; diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h index 86426a67f0..3df7d2c71d 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.h +++ b/src/Mod/Part/Gui/DlgExtrusion.h @@ -40,7 +40,7 @@ class DlgExtrusion : public QDialog, public Gui::SelectionObserver public: DlgExtrusion(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgExtrusion(); + ~DlgExtrusion() override; void accept(); void apply(); void reject(); @@ -81,7 +81,7 @@ private Q_SLOTS: private: ///updates enabling of controls void on_DirMode_changed(); - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; ///returns link to any of selected source shapes. Throws if nothing is selected for extrusion. App::DocumentObject& getShapeToExtrude() const; ///if dirMode is not custom, it tries to compute the actual extrusion direction. Also, it does some auto-magic manipulation of length value. @@ -103,14 +103,14 @@ class TaskExtrusion : public Gui::TaskView::TaskDialog public: TaskExtrusion(); - ~TaskExtrusion(); + ~TaskExtrusion() override; public: - bool accept(); - bool reject(); - void clicked(int); + bool accept() override; + bool reject() override; + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Close; } private: diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 2e2b3c0dc1..64c3f0bc9c 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -182,7 +182,7 @@ namespace PartGui { { allowEdge = false; } - bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) override { if (pObj != this->object) return false; diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h index ed54db0bb1..240edd9060 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.h +++ b/src/Mod/Part/Gui/DlgFilletEdges.h @@ -50,14 +50,14 @@ public: FilletRadiusDelegate(QObject *parent = nullptr); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, const QModelIndex &index) const; + const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; class FilletRadiusModel : public QStandardItemModel @@ -67,10 +67,10 @@ class FilletRadiusModel : public QStandardItemModel public: FilletRadiusModel(QObject * parent = nullptr); - Qt::ItemFlags flags (const QModelIndex & index) const; + Qt::ItemFlags flags (const QModelIndex & index) const override; bool setData (const QModelIndex & index, const QVariant & value, - int role = Qt::EditRole); - QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const; + int role = Qt::EditRole) override; + QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override; void updateCheckStates(); Q_SIGNALS: @@ -85,17 +85,17 @@ public: enum FilletType { FILLET, CHAMFER }; DlgFilletEdges(FilletType type, Part::FilletBase*, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgFilletEdges(); + ~DlgFilletEdges() override; bool accept(); protected: void findShapes(); void setupFillet(const std::vector&); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; virtual const char* getFilletType() const; private: - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void onDeleteObject(const App::DocumentObject&); void onDeleteDocument(const App::Document&); void onSelectEdge(const QString& subelement, int type); @@ -125,8 +125,8 @@ class FilletEdgesDialog : public QDialog public: FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::FilletBase* fillet, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~FilletEdgesDialog(); - void accept(); + ~FilletEdgesDialog() override; + void accept() override; private: DlgFilletEdges* widget; @@ -138,10 +138,10 @@ class DlgChamferEdges : public DlgFilletEdges public: DlgChamferEdges(Part::FilletBase*, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgChamferEdges(); + ~DlgChamferEdges() override; protected: - virtual const char* getFilletType() const; + const char* getFilletType() const override; }; class TaskFilletEdges : public Gui::TaskView::TaskDialog @@ -150,17 +150,17 @@ class TaskFilletEdges : public Gui::TaskView::TaskDialog public: TaskFilletEdges(Part::Fillet*); - ~TaskFilletEdges(); + ~TaskFilletEdges() override; public: - virtual void open(); - virtual void clicked(int); - virtual bool accept(); - virtual bool reject(); + void open() override; + void clicked(int) override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } - virtual bool needsFullSpace() const + bool needsFullSpace() const override { return true; } private: @@ -174,17 +174,17 @@ class TaskChamferEdges : public Gui::TaskView::TaskDialog public: TaskChamferEdges(Part::Chamfer*); - ~TaskChamferEdges(); + ~TaskChamferEdges() override; public: - virtual void open(); - virtual void clicked(int); - virtual bool accept(); - virtual bool reject(); + void open() override; + void clicked(int) override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } - virtual bool needsFullSpace() const + bool needsFullSpace() const override { return true; } private: diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.h b/src/Mod/Part/Gui/DlgPartBoxImp.h index 5180e3867b..c2ebf6de86 100644 --- a/src/Mod/Part/Gui/DlgPartBoxImp.h +++ b/src/Mod/Part/Gui/DlgPartBoxImp.h @@ -35,7 +35,7 @@ class DlgPartBoxImp : public Gui::LocationDialogUiImp public: DlgPartBoxImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgPartBoxImp(); + ~DlgPartBoxImp() override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.h b/src/Mod/Part/Gui/DlgPartCylinderImp.h index 09ebbe6ec8..6d590418a9 100644 --- a/src/Mod/Part/Gui/DlgPartCylinderImp.h +++ b/src/Mod/Part/Gui/DlgPartCylinderImp.h @@ -35,7 +35,7 @@ class DlgPartCylinderImp : public Gui::LocationDialogUiImp public: DlgPartCylinderImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgPartCylinderImp(); + ~DlgPartCylinderImp() override; double getRadius() const; double getLength() const; diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.h b/src/Mod/Part/Gui/DlgPartImportIgesImp.h index f514abe35f..a98a9afdde 100644 --- a/src/Mod/Part/Gui/DlgPartImportIgesImp.h +++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.h @@ -34,7 +34,7 @@ class DlgPartImportIgesImp : public QDialog public: DlgPartImportIgesImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); - ~DlgPartImportIgesImp(); + ~DlgPartImportIgesImp() override; public Q_SLOTS: virtual void OnApply(); diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.h b/src/Mod/Part/Gui/DlgPartImportStepImp.h index 86539f6066..a1b59c5247 100644 --- a/src/Mod/Part/Gui/DlgPartImportStepImp.h +++ b/src/Mod/Part/Gui/DlgPartImportStepImp.h @@ -35,7 +35,7 @@ class DlgPartImportStepImp : public QDialog public: DlgPartImportStepImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); - ~DlgPartImportStepImp(); + ~DlgPartImportStepImp() override; public Q_SLOTS: virtual void OnApply(); diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index 113cf3b2e4..0b1c9cacd9 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -164,13 +164,13 @@ public: CircleFromThreePoints() : Picker() { } - bool pickedPoint(const SoPickedPoint * point) + bool pickedPoint(const SoPickedPoint * point) override { SbVec3f pnt = point->getPoint(); points.emplace_back(pnt[0],pnt[1],pnt[2]); return points.size() == 3; } - QString command(App::Document* doc) const + QString command(App::Document* doc) const override { GC_MakeArcOfCircle arc(points[0], points[1], points[2]); if (!arc.IsDone()) diff --git a/src/Mod/Part/Gui/DlgPrimitives.h b/src/Mod/Part/Gui/DlgPrimitives.h index cf5d46b973..0d561825ff 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.h +++ b/src/Mod/Part/Gui/DlgPrimitives.h @@ -68,7 +68,7 @@ class DlgPrimitives : public QWidget public: DlgPrimitives(QWidget* parent = nullptr, Part::Primitive* feature = nullptr); - ~DlgPrimitives(); + ~DlgPrimitives() override; void createPrimitive(const QString&); void accept(const QString&); void reject(); @@ -143,7 +143,7 @@ class Location : public QWidget public: Location(QWidget* parent = nullptr, Part::Feature* feature = nullptr); - ~Location(); + ~Location() override; QString toPlacement() const; private Q_SLOTS: @@ -164,13 +164,13 @@ class TaskPrimitives : public Gui::TaskView::TaskDialog public: TaskPrimitives(); - ~TaskPrimitives(); + ~TaskPrimitives() override; public: - bool accept(); - bool reject(); - QDialogButtonBox::StandardButtons getStandardButtons() const; - void modifyStandardButtons(QDialogButtonBox*); + bool accept() override; + bool reject() override; + QDialogButtonBox::StandardButtons getStandardButtons() const override; + void modifyStandardButtons(QDialogButtonBox*) override; private: DlgPrimitives* widget; @@ -183,12 +183,12 @@ class TaskPrimitivesEdit : public Gui::TaskView::TaskDialog public: TaskPrimitivesEdit(Part::Primitive* feature); - ~TaskPrimitivesEdit(); + ~TaskPrimitivesEdit() override; public: - bool accept(); - bool reject(); - QDialogButtonBox::StandardButtons getStandardButtons() const; + bool accept() override; + bool reject() override; + QDialogButtonBox::StandardButtons getStandardButtons() const override; private: DlgPrimitives* widget; diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index 0b2ebce66d..f366bf2482 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -81,9 +81,9 @@ public: { canSelect = false; } - ~EdgeSelection() {} + ~EdgeSelection() override {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* iPObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* iPObj, const char* sSubName) override { Part::Feature* aPart = dynamic_cast(iPObj); if (!aPart) @@ -115,9 +115,9 @@ public: { canSelect = false; } - ~FaceSelection() {} + ~FaceSelection() override {} - bool allow(App::Document* /*pDoc*/, App::DocumentObject* iPObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* iPObj, const char* sSubName) override { Part::Feature* aPart = dynamic_cast(iPObj); if (!aPart) diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.h b/src/Mod/Part/Gui/DlgProjectionOnSurface.h index a62f39ae29..ce6c8e6fbf 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.h +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.h @@ -53,7 +53,7 @@ class DlgProjectionOnSurface : public QWidget, public: explicit DlgProjectionOnSurface(QWidget *parent = nullptr); - ~DlgProjectionOnSurface(); + ~DlgProjectionOnSurface() override; void apply(); void reject(); @@ -97,7 +97,7 @@ private: }; //from Gui::SelectionObserver - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void get_camera_direction(); @@ -120,9 +120,9 @@ private: private: /** Checks if the given document is about to be closed */ - virtual void slotDeletedDocument(const App::Document& Doc); + void slotDeletedDocument(const App::Document& Doc) override; /** Checks if the given object is about to be removed. */ - virtual void slotDeletedObject(const App::DocumentObject& Obj); + void slotDeletedObject(const App::DocumentObject& Obj) override; private: Ui::DlgProjectionOnSurface *ui; @@ -152,14 +152,14 @@ class TaskProjectionOnSurface : public Gui::TaskView::TaskDialog public: TaskProjectionOnSurface(); - ~TaskProjectionOnSurface(); + ~TaskProjectionOnSurface() override; public: - bool accept(); - bool reject(); - void clicked(int); + bool accept() override; + bool reject() override; + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index bc8e6ded11..1eef30a5ee 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -72,7 +72,7 @@ public: { canSelect = false; } - bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) override { this->canSelect = false; diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h index 52e6d19ba5..f88ba36823 100644 --- a/src/Mod/Part/Gui/DlgRevolution.h +++ b/src/Mod/Part/Gui/DlgRevolution.h @@ -37,8 +37,8 @@ class DlgRevolution : public QDialog, public Gui::SelectionObserver public: DlgRevolution(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgRevolution(); - void accept(); + ~DlgRevolution() override; + void accept() override; Base::Vector3d getDirection() const; Base::Vector3d getPosition() const; @@ -55,8 +55,8 @@ public: bool validate(); protected: - void changeEvent(QEvent *e); - void keyPressEvent(QKeyEvent*); + void changeEvent(QEvent *e) override; + void keyPressEvent(QKeyEvent*) override; private Q_SLOTS: void on_selectLine_clicked(); @@ -67,7 +67,7 @@ private Q_SLOTS: private: void findShapes(); - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; ///returns link to any of selected source shapes. Throws if nothing is selected for extrusion. App::DocumentObject& getShapeToRevolve() const; @@ -87,12 +87,12 @@ class TaskRevolution : public Gui::TaskView::TaskDialog public: TaskRevolution(); - ~TaskRevolution(); + ~TaskRevolution() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h index 6cc1237b7d..746ca55c96 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h @@ -40,12 +40,12 @@ class DlgSettings3DViewPart : public Gui::Dialog::PreferencePage public: DlgSettings3DViewPart(QWidget* parent = nullptr); - ~DlgSettings3DViewPart(); + ~DlgSettings3DViewPart() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private Q_SLOTS: void on_maxDeviation_valueChanged(double); diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.h b/src/Mod/Part/Gui/DlgSettingsGeneral.h index c04efccb5c..ef741aa931 100644 --- a/src/Mod/Part/Gui/DlgSettingsGeneral.h +++ b/src/Mod/Part/Gui/DlgSettingsGeneral.h @@ -37,12 +37,12 @@ class DlgSettingsGeneral : public Gui::Dialog::PreferencePage public: DlgSettingsGeneral(QWidget* parent = nullptr); - ~DlgSettingsGeneral(); + ~DlgSettingsGeneral() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; @@ -55,12 +55,12 @@ class DlgImportExportIges : public Gui::Dialog::PreferencePage public: DlgImportExportIges(QWidget* parent = nullptr); - ~DlgImportExportIges(); + ~DlgImportExportIges() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; @@ -74,12 +74,12 @@ class DlgImportExportStep : public Gui::Dialog::PreferencePage public: DlgImportExportStep(QWidget* parent = nullptr); - ~DlgImportExportStep(); + ~DlgImportExportStep() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Part/Gui/DlgSettingsMeasure.h b/src/Mod/Part/Gui/DlgSettingsMeasure.h index ddbf155f82..3a764ff4a6 100644 --- a/src/Mod/Part/Gui/DlgSettingsMeasure.h +++ b/src/Mod/Part/Gui/DlgSettingsMeasure.h @@ -40,13 +40,13 @@ class DlgSettingsMeasure : public Gui::Dialog::PreferencePage public: DlgSettingsMeasure(QWidget* parent = nullptr); - ~DlgSettingsMeasure(); + ~DlgSettingsMeasure() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.h b/src/Mod/Part/Gui/DlgSettingsObjectColor.h index 2b2c2a5868..505f0b34e4 100644 --- a/src/Mod/Part/Gui/DlgSettingsObjectColor.h +++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.h @@ -41,13 +41,13 @@ class DlgSettingsObjectColor : public Gui::Dialog::PreferencePage public: DlgSettingsObjectColor(QWidget* parent = nullptr); - ~DlgSettingsObjectColor(); + ~DlgSettingsObjectColor() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Part/Gui/Mirroring.h b/src/Mod/Part/Gui/Mirroring.h index 656202e9b0..c4191b811b 100644 --- a/src/Mod/Part/Gui/Mirroring.h +++ b/src/Mod/Part/Gui/Mirroring.h @@ -41,11 +41,11 @@ class Mirroring : public QWidget public: Mirroring(QWidget* parent = nullptr); - ~Mirroring(); + ~Mirroring() override; bool accept(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: void findShapes(); @@ -61,16 +61,16 @@ class TaskMirroring : public Gui::TaskView::TaskDialog public: TaskMirroring(); - ~TaskMirroring(); + ~TaskMirroring() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return false; } - virtual bool needsFullSpace() const + bool needsFullSpace() const override { return false; } private: diff --git a/src/Mod/Part/Gui/PropertyEnumAttacherItem.h b/src/Mod/Part/Gui/PropertyEnumAttacherItem.h index 5d62d5aa02..65715b8806 100644 --- a/src/Mod/Part/Gui/PropertyEnumAttacherItem.h +++ b/src/Mod/Part/Gui/PropertyEnumAttacherItem.h @@ -40,9 +40,9 @@ class PartGuiExport PropertyEnumAttacherItem: public Gui::PropertyEditor::Proper public: PROPERTYITEM_HEADER - virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; - virtual void setEditorData(QWidget* editor, const QVariant& data) const; - virtual QVariant editorData(QWidget* editor) const; + QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override; + void setEditorData(QWidget* editor, const QVariant& data) const override; + QVariant editorData(QWidget* editor) const override; protected Q_SLOTS: void openTask(); diff --git a/src/Mod/Part/Gui/SectionCutting.h b/src/Mod/Part/Gui/SectionCutting.h index ff2a65ca97..dd5ff71dc1 100644 --- a/src/Mod/Part/Gui/SectionCutting.h +++ b/src/Mod/Part/Gui/SectionCutting.h @@ -37,7 +37,7 @@ class SectionCut : public QDialog public: static SectionCut* makeDockWidget(QWidget* parent = nullptr); SectionCut(QWidget* parent = nullptr); - ~SectionCut(); + ~SectionCut() override; protected Q_SLOTS: void onGroupBoxXtoggled(); @@ -61,7 +61,7 @@ protected Q_SLOTS: void onTransparencyChanged(int); public: - void reject(); + void reject() override; private: Ui_SectionCut* ui; diff --git a/src/Mod/Part/Gui/ShapeFromMesh.h b/src/Mod/Part/Gui/ShapeFromMesh.h index eca9455e79..3ac98c6e80 100644 --- a/src/Mod/Part/Gui/ShapeFromMesh.h +++ b/src/Mod/Part/Gui/ShapeFromMesh.h @@ -35,9 +35,9 @@ class ShapeFromMesh : public QDialog public: ShapeFromMesh(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~ShapeFromMesh(); + ~ShapeFromMesh() override; - virtual void accept(); + void accept() override; private: void perform(); diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.h b/src/Mod/Part/Gui/SoBrepEdgeSet.h index aad298b186..b2ac29606a 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.h +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h @@ -52,17 +52,17 @@ public: SoBrepEdgeSet(); protected: - virtual ~SoBrepEdgeSet() {}; - virtual void GLRender(SoGLRenderAction *action); - virtual void GLRenderBelowPath(SoGLRenderAction * action); - virtual void doAction(SoAction* action); - virtual SoDetail * createLineSegmentDetail( + ~SoBrepEdgeSet() override {}; + void GLRender(SoGLRenderAction *action) override; + void GLRenderBelowPath(SoGLRenderAction * action) override; + void doAction(SoAction* action) override; + SoDetail * createLineSegmentDetail( SoRayPickAction *action, const SoPrimitiveVertex *v1, const SoPrimitiveVertex *v2, - SoPickedPoint *pp); + SoPickedPoint *pp) override; - virtual void getBoundingBox(SoGetBoundingBoxAction * action); + void getBoundingBox(SoGetBoundingBoxAction * action) override; private: struct SelContext; diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.h b/src/Mod/Part/Gui/SoBrepFaceSet.h index 8e89c4c81f..c9fafcac2a 100644 --- a/src/Mod/Part/Gui/SoBrepFaceSet.h +++ b/src/Mod/Part/Gui/SoBrepFaceSet.h @@ -88,18 +88,18 @@ public: SoMFInt32 partIndex; protected: - virtual ~SoBrepFaceSet(); - virtual void GLRender(SoGLRenderAction *action); - virtual void GLRenderBelowPath(SoGLRenderAction * action); - virtual void doAction(SoAction* action); - virtual SoDetail * createTriangleDetail( + ~SoBrepFaceSet() override; + void GLRender(SoGLRenderAction *action) override; + void GLRenderBelowPath(SoGLRenderAction * action) override; + void doAction(SoAction* action) override; + SoDetail * createTriangleDetail( SoRayPickAction * action, const SoPrimitiveVertex * v1, const SoPrimitiveVertex * v2, const SoPrimitiveVertex * v3, - SoPickedPoint * pp); - virtual void generatePrimitives(SoAction * action); - virtual void getBoundingBox(SoGetBoundingBoxAction * action); + SoPickedPoint * pp) override; + void generatePrimitives(SoAction * action) override; + void getBoundingBox(SoGetBoundingBoxAction * action) override; private: enum Binding { diff --git a/src/Mod/Part/Gui/SoBrepPointSet.h b/src/Mod/Part/Gui/SoBrepPointSet.h index 84c256ab20..69bb7484f2 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.h +++ b/src/Mod/Part/Gui/SoBrepPointSet.h @@ -52,12 +52,12 @@ public: SoBrepPointSet(); protected: - virtual ~SoBrepPointSet() {}; - virtual void GLRender(SoGLRenderAction *action); - virtual void GLRenderBelowPath(SoGLRenderAction * action); - virtual void doAction(SoAction* action); + ~SoBrepPointSet() override {}; + void GLRender(SoGLRenderAction *action) override; + void GLRenderBelowPath(SoGLRenderAction * action) override; + void doAction(SoAction* action) override; - virtual void getBoundingBox(SoGetBoundingBoxAction * action); + void getBoundingBox(SoGetBoundingBoxAction * action) override; private: typedef Gui::SoFCSelectionContext SelContext; diff --git a/src/Mod/Part/Gui/SoFCShapeObject.h b/src/Mod/Part/Gui/SoFCShapeObject.h index aaa4679c0b..b931156021 100644 --- a/src/Mod/Part/Gui/SoFCShapeObject.h +++ b/src/Mod/Part/Gui/SoFCShapeObject.h @@ -49,10 +49,10 @@ public: SoSFColor lineColor; protected: - virtual ~SoFCControlPoints() {}; - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er); - virtual void generatePrimitives(SoAction *action); + ~SoFCControlPoints() override {}; + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) override; + void generatePrimitives(SoAction *action) override; private: void drawControlPoints(const SbVec3f *,int32_t) const; diff --git a/src/Mod/Part/Gui/TaskAttacher.h b/src/Mod/Part/Gui/TaskAttacher.h index a92f708777..988e952b2e 100644 --- a/src/Mod/Part/Gui/TaskAttacher.h +++ b/src/Mod/Part/Gui/TaskAttacher.h @@ -59,7 +59,7 @@ public: TaskAttacher(Gui::ViewProviderDocumentObject *ViewProvider, QWidget *parent = nullptr, QString picture = QString(), QString text = QString::fromLatin1("Attachment"), VisibilityFunction func = 0); - ~TaskAttacher(); + ~TaskAttacher() override; bool getFlip(void) const; @@ -152,7 +152,7 @@ class PartGuiExport TaskDlgAttacher : public Gui::TaskView::TaskDialog public: TaskDlgAttacher(Gui::ViewProviderDocumentObject *ViewProvider, bool createBox = true); - ~TaskDlgAttacher(); + ~TaskDlgAttacher() override; Gui::ViewProviderDocumentObject* getViewProvider() const { return ViewProvider; } @@ -160,19 +160,19 @@ public: public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument(void) const override { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + QDialogButtonBox::StandardButtons getStandardButtons(void) const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 0bfcfa053a..f509da6cc5 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -82,13 +82,13 @@ class ResultModel : public QAbstractItemModel Q_OBJECT public: ResultModel(QObject *parent = nullptr); - ~ResultModel(); - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &child) const; - virtual int rowCount(const QModelIndex &parent) const; - virtual int columnCount(const QModelIndex &parent) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + ~ResultModel() override; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; // virtual Qt::ItemFlags flags (const QModelIndex &index) const; void setResults(ResultEntry *resultsIn); @@ -103,7 +103,7 @@ class TaskCheckGeometryResults : public QWidget Q_OBJECT public: TaskCheckGeometryResults(QWidget *parent = nullptr); - ~TaskCheckGeometryResults(); + ~TaskCheckGeometryResults() override; QString getShapeContentString(); void goCheck(); @@ -143,13 +143,13 @@ class TaskCheckGeometryDialog : public Gui::TaskView::TaskDialog Q_OBJECT public: TaskCheckGeometryDialog(); - ~TaskCheckGeometryDialog(); + ~TaskCheckGeometryDialog() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override {return QDialogButtonBox::Ok | QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override {return false;} - virtual bool needsFullSpace() const {return true;} + bool needsFullSpace() const override {return true;} private Q_SLOTS: void on_runBOPCheckBox_toggled(bool isOn); @@ -190,9 +190,9 @@ private: QCheckBox *mergeVertexModeCheckBox; QCheckBox *mergeEdgeModeCheckBox; QCheckBox *curveOnSurfaceModeCheckBox; - bool accept(); - bool reject(); - virtual void modifyStandardButtons(QDialogButtonBox*); + bool accept() override; + bool reject() override; + void modifyStandardButtons(QDialogButtonBox*) override; QPushButton *okBtn; QPushButton *settingsBtn; QPushButton *resultsBtn; @@ -202,16 +202,16 @@ class BOPProgressIndicator : public Message_ProgressIndicator { public: BOPProgressIndicator (const QString &title, QWidget* parent); - virtual ~BOPProgressIndicator (); + ~BOPProgressIndicator () override; #if OCC_VERSION_HEX < 0x070500 virtual Standard_Boolean Show (const Standard_Boolean theForce = Standard_True); #else - virtual void Show (const Message_ProgressScope& theScope, - const Standard_Boolean isForce); - virtual void Reset(); + void Show (const Message_ProgressScope& theScope, + const Standard_Boolean isForce) override; + void Reset() override; #endif - virtual Standard_Boolean UserBreak(); + Standard_Boolean UserBreak() override; private: int steps; diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h index 11c1f68d9d..557695a2b6 100644 --- a/src/Mod/Part/Gui/TaskDimension.h +++ b/src/Mod/Part/Gui/TaskDimension.h @@ -125,7 +125,7 @@ class DimensionLinear : public SoSeparatorKit public: DimensionLinear(); static void initClass(); - virtual SbBool affectsState() const; + SbBool affectsState() const override; void setupDimension(); SoSFVec3f point1; @@ -138,7 +138,7 @@ protected: SoSFVec3f origin; private: - virtual ~DimensionLinear(); + ~DimensionLinear() override; }; /*kit for anglular dimensions*/ @@ -155,7 +155,7 @@ class DimensionAngular : public SoSeparatorKit public: DimensionAngular(); static void initClass(); - virtual SbBool affectsState() const; + SbBool affectsState() const override; SoSFFloat radius;//radians. SoSFFloat angle;//radians. @@ -164,7 +164,7 @@ public: SoSFMatrix matrix; void setupDimension(); private: - virtual ~DimensionAngular(); + ~DimensionAngular() override; }; /*used for generating points for arc display*/ @@ -182,9 +182,9 @@ public: SoEngineOutput points; SoEngineOutput pointCount; protected: - virtual void evaluate(); + void evaluate() override; private: - virtual ~ArcEngine(){} + ~ArcEngine() override{} void defaultValues(); //some non error values if something goes wrong. }; @@ -194,7 +194,7 @@ class SteppedSelection : public QWidget Q_OBJECT public: SteppedSelection(const uint &buttonCountIn, QWidget *parent = nullptr); - ~SteppedSelection(); + ~SteppedSelection() override; QPushButton* getButton(const uint &index); void setIconDone(const uint &index); @@ -247,14 +247,14 @@ class TaskMeasureLinear : public Gui::TaskView::TaskDialog, public Gui::Selectio Q_OBJECT public: TaskMeasureLinear(); - ~TaskMeasureLinear(); + ~TaskMeasureLinear() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override {return QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument() const {return false;} - virtual bool needsFullSpace() const {return false;} + bool isAllowedAlterDocument() const override {return false;} + bool needsFullSpace() const override {return false;} protected: - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; protected Q_SLOTS: void selection1Slot(bool checked); @@ -326,14 +326,14 @@ class TaskMeasureAngular : public Gui::TaskView::TaskDialog, public Gui::Selecti Q_OBJECT public: TaskMeasureAngular(); - ~TaskMeasureAngular(); + ~TaskMeasureAngular() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override {return QDialogButtonBox::Close;} - virtual bool isAllowedAlterDocument() const {return false;} - virtual bool needsFullSpace() const {return false;} + bool isAllowedAlterDocument() const override {return false;} + bool needsFullSpace() const override {return false;} protected: - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; protected Q_SLOTS: void selection1Slot(bool checked); diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 38df9f65ef..56177fb3d7 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -74,7 +74,7 @@ namespace PartGui { : Gui::SelectionFilterGate(), object(obj) { } - bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override { if (pObj != this->object) return false; diff --git a/src/Mod/Part/Gui/TaskFaceColors.h b/src/Mod/Part/Gui/TaskFaceColors.h index 6afd8f751c..44842cef39 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.h +++ b/src/Mod/Part/Gui/TaskFaceColors.h @@ -41,7 +41,7 @@ class FaceColors : public QWidget, public Gui::SelectionObserver public: FaceColors(ViewProviderPartExt* vp, QWidget* parent = nullptr); - ~FaceColors(); + ~FaceColors() override; void open(); bool accept(); @@ -53,8 +53,8 @@ private Q_SLOTS: void on_boxSelection_toggled(bool checked); protected: - void onSelectionChanged(const Gui::SelectionChanges& msg); - void changeEvent(QEvent *e); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void changeEvent(QEvent *e) override; void slotUndoDocument(const Gui::Document& Doc); void slotDeleteDocument(const Gui::Document&); void slotDeleteObject(const Gui::ViewProvider&); @@ -71,15 +71,15 @@ class TaskFaceColors : public Gui::TaskView::TaskDialog public: TaskFaceColors(ViewProviderPartExt* vp); - ~TaskFaceColors(); + ~TaskFaceColors() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/TaskLoft.h b/src/Mod/Part/Gui/TaskLoft.h index 8f117f6689..d7e9f03564 100644 --- a/src/Mod/Part/Gui/TaskLoft.h +++ b/src/Mod/Part/Gui/TaskLoft.h @@ -37,7 +37,7 @@ class LoftWidget : public QWidget public: LoftWidget(QWidget* parent = nullptr); - ~LoftWidget(); + ~LoftWidget() override; bool accept(); bool reject(); @@ -46,7 +46,7 @@ private Q_SLOTS: void onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*); private: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void findShapes(); private: @@ -60,15 +60,15 @@ class TaskLoft : public Gui::TaskView::TaskDialog public: TaskLoft(); - ~TaskLoft(); + ~TaskLoft() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/TaskOffset.h b/src/Mod/Part/Gui/TaskOffset.h index 8833e36e53..a6cac4b12a 100644 --- a/src/Mod/Part/Gui/TaskOffset.h +++ b/src/Mod/Part/Gui/TaskOffset.h @@ -36,7 +36,7 @@ class OffsetWidget : public QWidget public: OffsetWidget(Part::Offset*, QWidget* parent = nullptr); - ~OffsetWidget(); + ~OffsetWidget() override; bool accept(); bool reject(); @@ -52,7 +52,7 @@ private Q_SLOTS: void on_updateView_toggled(bool); private: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -65,16 +65,16 @@ class TaskOffset : public Gui::TaskView::TaskDialog public: TaskOffset(Part::Offset*); - ~TaskOffset(); + ~TaskOffset() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; Part::Offset* getObject() const; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index c43a8d4ca8..628762dc53 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -70,7 +70,7 @@ namespace PartGui { { this->mode = mode; } - bool allow(App::Document*, App::DocumentObject* obj, const char*sSubName) + bool allow(App::Document*, App::DocumentObject* obj, const char*sSubName) override { if (!obj || !obj->isDerivedFrom(Part::Feature::getClassTypeId())) return false; diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h index 2129553f41..350d172427 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.h +++ b/src/Mod/Part/Gui/TaskShapeBuilder.h @@ -37,7 +37,7 @@ class ShapeBuilderWidget : public QWidget, public: ShapeBuilderWidget(QWidget* parent = nullptr); - ~ShapeBuilderWidget(); + ~ShapeBuilderWidget() override; bool accept(); bool reject(); @@ -48,7 +48,7 @@ private Q_SLOTS: void switchMode(int); private: - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: void createEdgeFromVertex(); @@ -57,7 +57,7 @@ private: void createFaceFromEdge(); void createShellFromFace(); void createSolidFromShell(); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -70,15 +70,15 @@ class TaskShapeBuilder : public Gui::TaskView::TaskDialog public: TaskShapeBuilder(); - ~TaskShapeBuilder(); + ~TaskShapeBuilder() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Close; } private: diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp index 9d4b3053d0..4ab3a2334f 100644 --- a/src/Mod/Part/Gui/TaskSweep.cpp +++ b/src/Mod/Part/Gui/TaskSweep.cpp @@ -82,7 +82,7 @@ public: : Gui::SelectionFilterGate(nullPointer()) { } - bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) override { if (!sSubName || sSubName[0] == '\0') { // If selecting again the same edge the passed sub-element is empty. If the whole diff --git a/src/Mod/Part/Gui/TaskSweep.h b/src/Mod/Part/Gui/TaskSweep.h index 323003c8b9..b36ce0e083 100644 --- a/src/Mod/Part/Gui/TaskSweep.h +++ b/src/Mod/Part/Gui/TaskSweep.h @@ -41,7 +41,7 @@ class SweepWidget : public QWidget public: SweepWidget(QWidget* parent = nullptr); - ~SweepWidget(); + ~SweepWidget() override; bool accept(); bool reject(); @@ -51,7 +51,7 @@ private Q_SLOTS: void on_buttonPath_toggled(bool); private: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void findShapes(); bool isPathValid(const Gui::SelectionObject& sel) const; @@ -66,15 +66,15 @@ class TaskSweep : public Gui::TaskView::TaskDialog public: TaskSweep(); - ~TaskSweep(); + ~TaskSweep() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help; } private: diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp index 5c6f7146ff..c63221095b 100644 --- a/src/Mod/Part/Gui/TaskThickness.cpp +++ b/src/Mod/Part/Gui/TaskThickness.cpp @@ -74,7 +74,7 @@ public: : Gui::SelectionFilterGate(nullPointer()), object(obj) { } - bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) + bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName) override { if (pObj != this->object) return false; diff --git a/src/Mod/Part/Gui/TaskThickness.h b/src/Mod/Part/Gui/TaskThickness.h index 8d27492ba2..f3efe92505 100644 --- a/src/Mod/Part/Gui/TaskThickness.h +++ b/src/Mod/Part/Gui/TaskThickness.h @@ -36,7 +36,7 @@ class ThicknessWidget : public QWidget public: ThicknessWidget(Part::Thickness*, QWidget* parent = nullptr); - ~ThicknessWidget(); + ~ThicknessWidget() override; bool accept(); bool reject(); @@ -52,7 +52,7 @@ private Q_SLOTS: void on_updateView_toggled(bool); private: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -65,16 +65,16 @@ class TaskThickness : public Gui::TaskView::TaskDialog public: TaskThickness(Part::Thickness*); - ~TaskThickness(); + ~TaskThickness() override; public: - void open(); - bool accept(); - bool reject(); - void clicked(int); + void open() override; + bool accept() override; + bool reject() override; + void clicked(int) override; Part::Thickness* getObject() const; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Part/Gui/ViewProvider.h b/src/Mod/Part/Gui/ViewProvider.h index 7246e32ce7..64c9045320 100644 --- a/src/Mod/Part/Gui/ViewProvider.h +++ b/src/Mod/Part/Gui/ViewProvider.h @@ -37,8 +37,8 @@ class ViewProviderShapeBuilder : public Gui::ViewProviderBuilder { public: ViewProviderShapeBuilder(){} - ~ViewProviderShapeBuilder(){} - virtual void buildNodes(const App::Property*, std::vector&) const; + ~ViewProviderShapeBuilder() override{} + void buildNodes(const App::Property*, std::vector&) const override; void createShape(const App::Property*, SoSeparator*) const; }; @@ -50,8 +50,8 @@ public: /// constructor ViewProviderPart(); /// destructor - virtual ~ViewProviderPart(); - virtual bool doubleClicked(void); + ~ViewProviderPart() override; + bool doubleClicked(void) override; protected: void applyColor(const Part::ShapeHistory& hist, diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index 08726c5f6a..db8050807e 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -45,9 +45,9 @@ public: /// constructor ViewProvider2DObject(); /// destructor - virtual ~ViewProvider2DObject(); - virtual std::vector getDisplayModes() const; - virtual const char* getDefaultDisplayMode() const; + ~ViewProvider2DObject() override; + std::vector getDisplayModes() const override; + const char* getDefaultDisplayMode() const override; }; class PartGuiExport ViewProvider2DObjectGrid : public ViewProvider2DObject @@ -58,7 +58,7 @@ public: /// constructor ViewProvider2DObjectGrid(); /// destructor - virtual ~ViewProvider2DObjectGrid(); + ~ViewProvider2DObjectGrid() override; /// Property to switch the grid on and off App::PropertyBool ShowGrid; @@ -70,19 +70,19 @@ public: App::PropertyBool GridAutoSize; App::PropertyInteger maxNumberOfLines; - virtual void attach(App::DocumentObject *); - virtual void updateData(const App::Property*); + void attach(App::DocumentObject *) override; + void updateData(const App::Property*) override; /// creates the grid SoSeparator* createGrid(); protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; /// get called by the container whenever a property has been changed - virtual void onChanged(const App::Property* prop); - virtual void Restore(Base::XMLReader &reader); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + void onChanged(const App::Property* prop) override; + void Restore(Base::XMLReader &reader) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; SoSeparator *GridRoot; diff --git a/src/Mod/Part/Gui/ViewProviderAttachExtension.h b/src/Mod/Part/Gui/ViewProviderAttachExtension.h index ffae2778cf..e3869cab61 100644 --- a/src/Mod/Part/Gui/ViewProviderAttachExtension.h +++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.h @@ -37,12 +37,12 @@ class PartGuiExport ViewProviderAttachExtension : public Gui::ViewProviderExtens public: /// Constructor ViewProviderAttachExtension(); - virtual ~ViewProviderAttachExtension() = default; + ~ViewProviderAttachExtension() override = default; - virtual QIcon extensionMergeColorfullOverlayIcons (const QIcon & orig) const override; + QIcon extensionMergeColorfullOverlayIcons (const QIcon & orig) const override; - virtual void extensionUpdateData(const App::Property*) override; - virtual void extensionSetupContextMenu(QMenu*, QObject*, const char*) override; + void extensionUpdateData(const App::Property*) override; + void extensionSetupContextMenu(QMenu*, QObject*, const char*) override; private: void showAttachmentEditor(); diff --git a/src/Mod/Part/Gui/ViewProviderBoolean.h b/src/Mod/Part/Gui/ViewProviderBoolean.h index 21d88adfb7..ecaf74c479 100644 --- a/src/Mod/Part/Gui/ViewProviderBoolean.h +++ b/src/Mod/Part/Gui/ViewProviderBoolean.h @@ -37,13 +37,13 @@ public: /// constructor ViewProviderBoolean(); /// destructor - virtual ~ViewProviderBoolean(); + ~ViewProviderBoolean() override; /// grouping handling - std::vector claimChildren() const; - QIcon getIcon() const; - void updateData(const App::Property*); - bool onDelete(const std::vector &); + std::vector claimChildren() const override; + QIcon getIcon() const override; + void updateData(const App::Property*) override; + bool onDelete(const std::vector &) override; }; /// ViewProvider for the MultiFuse feature @@ -55,21 +55,21 @@ public: /// constructor ViewProviderMultiFuse(); /// destructor - virtual ~ViewProviderMultiFuse(); + ~ViewProviderMultiFuse() override; /// grouping handling - std::vector claimChildren() const; - QIcon getIcon() const; - void updateData(const App::Property*); - bool onDelete(const std::vector &); + std::vector claimChildren() const override; + QIcon getIcon() const override; + void updateData(const App::Property*) override; + bool onDelete(const std::vector &) override; /// drag and drop - bool canDragObjects() const; - bool canDragObject(App::DocumentObject*) const; - void dragObject(App::DocumentObject*); - bool canDropObjects() const; - bool canDropObject(App::DocumentObject*) const; - void dropObject(App::DocumentObject*); + bool canDragObjects() const override; + bool canDragObject(App::DocumentObject*) const override; + void dragObject(App::DocumentObject*) override; + bool canDropObjects() const override; + bool canDropObject(App::DocumentObject*) const override; + void dropObject(App::DocumentObject*) override; }; /// ViewProvider for the MultiFuse feature @@ -81,21 +81,21 @@ public: /// constructor ViewProviderMultiCommon(); /// destructor - virtual ~ViewProviderMultiCommon(); + ~ViewProviderMultiCommon() override; /// grouping handling - std::vector claimChildren() const; - QIcon getIcon() const; - void updateData(const App::Property*); - bool onDelete(const std::vector &); + std::vector claimChildren() const override; + QIcon getIcon() const override; + void updateData(const App::Property*) override; + bool onDelete(const std::vector &) override; /// drag and drop - bool canDragObjects() const; - bool canDragObject(App::DocumentObject*) const; - void dragObject(App::DocumentObject*); - bool canDropObjects() const; - bool canDropObject(App::DocumentObject*) const; - void dropObject(App::DocumentObject*); + bool canDragObjects() const override; + bool canDragObject(App::DocumentObject*) const override; + void dragObject(App::DocumentObject*) override; + bool canDropObjects() const override; + bool canDropObject(App::DocumentObject*) const override; + void dropObject(App::DocumentObject*) override; }; diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h index 32b5846773..2b4c0cae91 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.h +++ b/src/Mod/Part/Gui/ViewProviderBox.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderBox(); /// destructor - virtual ~ViewProviderBox(); + ~ViewProviderBox() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h index da4eb5388b..72a86e910d 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderCircleParametric(); /// destructor - virtual ~ViewProviderCircleParametric(); + ~ViewProviderCircleParametric() override; - std::vector getDisplayModes(void) const; + std::vector getDisplayModes(void) const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCompound.h b/src/Mod/Part/Gui/ViewProviderCompound.h index e72b9b278b..bb5193545e 100644 --- a/src/Mod/Part/Gui/ViewProviderCompound.h +++ b/src/Mod/Part/Gui/ViewProviderCompound.h @@ -37,20 +37,20 @@ public: /// constructor ViewProviderCompound(); /// destructor - virtual ~ViewProviderCompound(); - std::vector claimChildren() const; - bool onDelete(const std::vector &); + ~ViewProviderCompound() override; + std::vector claimChildren() const override; + bool onDelete(const std::vector &) override; /// drag and drop - bool canDragObjects() const; - bool canDragObject(App::DocumentObject*) const; - void dragObject(App::DocumentObject*); - bool canDropObjects() const; - bool canDropObject(App::DocumentObject*) const; - void dropObject(App::DocumentObject*); + bool canDragObjects() const override; + bool canDragObject(App::DocumentObject*) const override; + void dragObject(App::DocumentObject*) override; + bool canDropObjects() const override; + bool canDropObject(App::DocumentObject*) const override; + void dropObject(App::DocumentObject*) override; protected: - void updateData(const App::Property*); + void updateData(const App::Property*) override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h index fb20406278..6ac21d771e 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.h +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderConeParametric(); /// destructor - virtual ~ViewProviderConeParametric(); + ~ViewProviderConeParametric() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h index cf19d526d8..feeafad483 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.h +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h @@ -49,21 +49,21 @@ public: /// constructor ViewProviderCurveNet(); /// destructor - virtual ~ViewProviderCurveNet(); + ~ViewProviderCurveNet() override; - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); + void attach(App::DocumentObject *) override; + void setDisplayMode(const char* ModeName) override; /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Update the Part representation - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; virtual bool handleEvent(const SoEvent * const ev,Gui::View3DInventorViewer &Viewer); protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; struct Node { Gui::SoFCSelection *pcHighlight; diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h index 9a0725773c..d3fa062da8 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderCylinderParametric(); /// destructor - virtual ~ViewProviderCylinderParametric(); + ~ViewProviderCylinderParametric() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h index b91ad4fdda..4aae4455fa 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderEllipseParametric(); /// destructor - virtual ~ViewProviderEllipseParametric(); + ~ViewProviderEllipseParametric() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h index 89997439b9..d7a63cb2b0 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.h +++ b/src/Mod/Part/Gui/ViewProviderExt.h @@ -68,7 +68,7 @@ public: /// constructor ViewProviderPartExt(); /// destructor - virtual ~ViewProviderPartExt(); + ~ViewProviderPartExt() override; // Display properties App::PropertyFloatConstraint Deviation; @@ -89,16 +89,16 @@ public: // Faces (Gui::ViewProviderGeometryObject::ShapeColor and Gui::ViewProviderGeometryObject::ShapeMaterial apply) App::PropertyColorList DiffuseColor; - virtual void attach(App::DocumentObject *) override; - virtual void setDisplayMode(const char* ModeName) override; + void attach(App::DocumentObject *) override; + void setDisplayMode(const char* ModeName) override; /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const override; + std::vector getDisplayModes(void) const override; /// Update the view representation void reload(); /// If no other task is pending it opens a dialog to allow to change face colors bool changeFaceColors(); - virtual void updateData(const App::Property*) override; + void updateData(const App::Property*) override; /** @name Selection handling * This group of methods do the selection handling. @@ -107,13 +107,13 @@ public: */ //@{ /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const override {return true;} + bool useNewSelectionModel(void) const override {return true;} /// return a hit element to the selection path or 0 - virtual std::string getElement(const SoDetail*) const override; - virtual SoDetail* getDetail(const char*) const override; - virtual std::vector getModelPoints(const SoPickedPoint *) const override; + std::string getElement(const SoDetail*) const override; + SoDetail* getDetail(const char*) const override; + std::vector getModelPoints(const SoPickedPoint *) const override; /// return the highlight lines for a given element or the whole shape - virtual std::vector getSelectionShape(const char* Element) const override; + std::vector getSelectionShape(const char* Element) const override; //@} /** @name Highlight handling @@ -132,15 +132,15 @@ public: /** @name Color management methods */ //@{ - virtual std::map getElementColors(const char *element=nullptr) const override; + std::map getElementColors(const char *element=nullptr) const override; //@} - virtual bool isUpdateForced() const override { + bool isUpdateForced() const override { return forceUpdateCount>0; } - virtual void forceUpdate(bool enable = true) override; + void forceUpdate(bool enable = true) override; - virtual bool allowOverride(const App::DocumentObject &) const override; + bool allowOverride(const App::DocumentObject &) const override; /** @name Edit methods */ //@{ @@ -153,7 +153,7 @@ protected: protected: /// get called by the container whenever a property has been changed - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; bool loadParameter(); void updateVisual(); diff --git a/src/Mod/Part/Gui/ViewProviderExtrusion.h b/src/Mod/Part/Gui/ViewProviderExtrusion.h index 6012c25cf0..83af6e4b4a 100644 --- a/src/Mod/Part/Gui/ViewProviderExtrusion.h +++ b/src/Mod/Part/Gui/ViewProviderExtrusion.h @@ -37,10 +37,10 @@ public: /// constructor ViewProviderExtrusion(); /// destructor - virtual ~ViewProviderExtrusion(); + ~ViewProviderExtrusion() override; /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren(void)const override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.h b/src/Mod/Part/Gui/ViewProviderHelixParametric.h index a7b26b069a..7f6f06a07a 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.h +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.h @@ -38,9 +38,9 @@ public: /// constructor ViewProviderHelixParametric(); /// destructor - virtual ~ViewProviderHelixParametric(); - std::vector getDisplayModes(void) const; - void setupContextMenu(QMenu*, QObject*, const char*); + ~ViewProviderHelixParametric() override; + std::vector getDisplayModes(void) const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; private: ViewProviderSplineExtension extension; @@ -54,9 +54,9 @@ public: /// constructor ViewProviderSpiralParametric(); /// destructor - virtual ~ViewProviderSpiralParametric(); - std::vector getDisplayModes(void) const; - void setupContextMenu(QMenu*, QObject*, const char*); + ~ViewProviderSpiralParametric() override; + std::vector getDisplayModes(void) const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; private: ViewProviderSplineExtension extension; diff --git a/src/Mod/Part/Gui/ViewProviderImport.h b/src/Mod/Part/Gui/ViewProviderImport.h index 0a05801a81..2b01c74df2 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.h +++ b/src/Mod/Part/Gui/ViewProviderImport.h @@ -44,11 +44,11 @@ public: /// constructor ViewProviderImport(); /// destructor - virtual ~ViewProviderImport(); + ~ViewProviderImport() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h index aa4ea4d244..ef87863b1a 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.h +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderLineParametric(); /// destructor - virtual ~ViewProviderLineParametric(); + ~ViewProviderLineParametric() override; - std::vector getDisplayModes(void) const; + std::vector getDisplayModes(void) const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderMirror.h b/src/Mod/Part/Gui/ViewProviderMirror.h index c965617bb9..4f747fcf01 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.h +++ b/src/Mod/Part/Gui/ViewProviderMirror.h @@ -35,16 +35,16 @@ class PartGuiExport ViewProviderMirror : public ViewProviderPart public: ViewProviderMirror(); - virtual ~ViewProviderMirror(); + ~ViewProviderMirror() override; /** @name Edit methods */ //@{ - void setupContextMenu(QMenu*, QObject*, const char*); - std::vector claimChildren() const; - bool onDelete(const std::vector &); + void setupContextMenu(QMenu*, QObject*, const char*) override; + std::vector claimChildren() const override; + bool onDelete(const std::vector &) override; protected: - bool setEdit(int ModNum); - void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; //@} private: @@ -62,17 +62,17 @@ class PartGuiExport ViewProviderFillet : public ViewProviderPart public: ViewProviderFillet(); - virtual ~ViewProviderFillet(); + ~ViewProviderFillet() override; /** @name Edit methods */ //@{ - void setupContextMenu(QMenu*, QObject*, const char*); - std::vector claimChildren() const; - bool onDelete(const std::vector &); + void setupContextMenu(QMenu*, QObject*, const char*) override; + std::vector claimChildren() const override; + bool onDelete(const std::vector &) override; protected: - void updateData(const App::Property*); - bool setEdit(int ModNum); - void unsetEdit(int ModNum); + void updateData(const App::Property*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; //@} }; @@ -84,17 +84,17 @@ public: /// constructor ViewProviderChamfer(); /// destructor - virtual ~ViewProviderChamfer(); + ~ViewProviderChamfer() override; /** @name Edit methods */ //@{ - void setupContextMenu(QMenu*, QObject*, const char*); - std::vector claimChildren() const; - bool onDelete(const std::vector &); + void setupContextMenu(QMenu*, QObject*, const char*) override; + std::vector claimChildren() const override; + bool onDelete(const std::vector &) override; protected: - void updateData(const App::Property*); - bool setEdit(int ModNum); - void unsetEdit(int ModNum); + void updateData(const App::Property*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; //@} }; @@ -106,11 +106,11 @@ public: /// constructor ViewProviderRevolution(); /// destructor - virtual ~ViewProviderRevolution(); + ~ViewProviderRevolution() override; /// grouping handling - std::vector claimChildren()const; - bool onDelete(const std::vector &); + std::vector claimChildren()const override; + bool onDelete(const std::vector &) override; }; class ViewProviderLoft : public ViewProviderPart @@ -121,11 +121,11 @@ public: /// constructor ViewProviderLoft(); /// destructor - virtual ~ViewProviderLoft(); + ~ViewProviderLoft() override; /// grouping handling - std::vector claimChildren()const; - bool onDelete(const std::vector &); + std::vector claimChildren()const override; + bool onDelete(const std::vector &) override; }; class ViewProviderSweep : public ViewProviderPart @@ -136,11 +136,11 @@ public: /// constructor ViewProviderSweep(); /// destructor - virtual ~ViewProviderSweep(); + ~ViewProviderSweep() override; /// grouping handling - std::vector claimChildren()const; - bool onDelete(const std::vector &); + std::vector claimChildren()const override; + bool onDelete(const std::vector &) override; }; class ViewProviderOffset : public ViewProviderPart @@ -151,16 +151,16 @@ public: /// constructor ViewProviderOffset(); /// destructor - virtual ~ViewProviderOffset(); + ~ViewProviderOffset() override; /// grouping handling - std::vector claimChildren()const; - void setupContextMenu(QMenu*, QObject*, const char*); - bool onDelete(const std::vector &); + std::vector claimChildren()const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool onDelete(const std::vector &) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; class ViewProviderOffset2D : public ViewProviderOffset @@ -181,16 +181,16 @@ public: /// constructor ViewProviderThickness(); /// destructor - virtual ~ViewProviderThickness(); + ~ViewProviderThickness() override; /// grouping handling - std::vector claimChildren()const; - void setupContextMenu(QMenu*, QObject*, const char*); - bool onDelete(const std::vector &); + std::vector claimChildren()const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool onDelete(const std::vector &) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; class ViewProviderRefine : public ViewProviderPart @@ -201,7 +201,7 @@ public: /// constructor ViewProviderRefine(); /// destructor - virtual ~ViewProviderRefine(); + ~ViewProviderRefine() override; }; class ViewProviderReverse : public ViewProviderPart @@ -212,7 +212,7 @@ public: /// constructor ViewProviderReverse(); /// destructor - virtual ~ViewProviderReverse(); + ~ViewProviderReverse() override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h index 09f6716fa5..80ad3bbd08 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderPlaneParametric(); /// destructor - virtual ~ViewProviderPlaneParametric(); + ~ViewProviderPlaneParametric() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: @@ -58,15 +58,15 @@ class PartGuiExport ViewProviderFace : public ViewProviderPlaneParametric public: ViewProviderFace(); - virtual ~ViewProviderFace(); + ~ViewProviderFace() override; - virtual std::vector claimChildren() const; - virtual bool canDragObjects() const; - virtual bool canDragObject(App::DocumentObject*) const; - virtual void dragObject(App::DocumentObject*); - virtual bool canDropObjects() const; - virtual bool canDropObject(App::DocumentObject*) const; - virtual void dropObject(App::DocumentObject*); + std::vector claimChildren() const override; + bool canDragObjects() const override; + bool canDragObject(App::DocumentObject*) const override; + void dragObject(App::DocumentObject*) override; + bool canDropObjects() const override; + bool canDropObject(App::DocumentObject*) const override; + void dropObject(App::DocumentObject*) override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h index ffd4ca1a8c..ac660fbe8f 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderPointParametric(); /// destructor - virtual ~ViewProviderPointParametric(); + ~ViewProviderPointParametric() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderPrimitive.h b/src/Mod/Part/Gui/ViewProviderPrimitive.h index 4c88f5daf2..58e3fcfa67 100644 --- a/src/Mod/Part/Gui/ViewProviderPrimitive.h +++ b/src/Mod/Part/Gui/ViewProviderPrimitive.h @@ -38,13 +38,13 @@ public: /// constructor ViewProviderPrimitive(); /// destructor - virtual ~ViewProviderPrimitive(); + ~ViewProviderPrimitive() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: - bool setEdit(int ModNum); - void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; private: ViewProviderAttachExtension extension; diff --git a/src/Mod/Part/Gui/ViewProviderPrism.h b/src/Mod/Part/Gui/ViewProviderPrism.h index 9540d4c8fc..c220bcf706 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.h +++ b/src/Mod/Part/Gui/ViewProviderPrism.h @@ -38,9 +38,9 @@ public: /// constructor ViewProviderPrism(); /// destructor - virtual ~ViewProviderPrism(); + ~ViewProviderPrism() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: @@ -54,9 +54,9 @@ public: /// constructor ViewProviderWedge(); /// destructor - virtual ~ViewProviderWedge(); + ~ViewProviderWedge() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderPython.h b/src/Mod/Part/Gui/ViewProviderPython.h index 24c705753e..a1e4c45dff 100644 --- a/src/Mod/Part/Gui/ViewProviderPython.h +++ b/src/Mod/Part/Gui/ViewProviderPython.h @@ -37,11 +37,11 @@ public: /// constructor ViewProviderCustom(); /// destructor - virtual ~ViewProviderCustom(); - virtual void updateData(const App::Property*); + ~ViewProviderCustom() override; + void updateData(const App::Property*) override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; std::map propView; }; diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h index 0e25562f3a..c7e90cfaa1 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h @@ -38,9 +38,9 @@ public: /// constructor ViewProviderRegularPolygon(); /// destructor - virtual ~ViewProviderRegularPolygon(); + ~ViewProviderRegularPolygon() override; - std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h index 447749c031..a676b1712d 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h @@ -37,12 +37,12 @@ public: /// constructor ViewProviderRuledSurface(); /// destructor - virtual ~ViewProviderRuledSurface(); + ~ViewProviderRuledSurface() override; - std::vector getDisplayModes(void) const; - std::vector claimChildren() const; - void updateData(const App::Property*); - bool onDelete(const std::vector &); + std::vector getDisplayModes(void) const override; + std::vector claimChildren() const override; + void updateData(const App::Property*) override; + bool onDelete(const std::vector &) override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.h b/src/Mod/Part/Gui/ViewProviderSphereParametric.h index d677739b48..e2001f5cbb 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.h +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.h @@ -36,9 +36,9 @@ public: /// constructor ViewProviderSphereParametric(); /// destructor - virtual ~ViewProviderSphereParametric(); + ~ViewProviderSphereParametric() override; - std::vector getDisplayModes(void) const; + std::vector getDisplayModes(void) const override; protected: @@ -52,8 +52,8 @@ public: /// constructor ViewProviderEllipsoid(); /// destructor - virtual ~ViewProviderEllipsoid(); - std::vector getDisplayModes(void) const; + ~ViewProviderEllipsoid() override; + std::vector getDisplayModes(void) const override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderSpline.h b/src/Mod/Part/Gui/ViewProviderSpline.h index 1157782a70..859b9e9f0a 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.h +++ b/src/Mod/Part/Gui/ViewProviderSpline.h @@ -36,15 +36,15 @@ class PartGuiExport ViewProviderSplineExtension : public Gui::ViewProviderExtens public: /// Constructor ViewProviderSplineExtension(); - virtual ~ViewProviderSplineExtension() = default; + ~ViewProviderSplineExtension() override = default; App::PropertyBool ControlPoints; - virtual void extensionUpdateData(const App::Property*) override; - virtual void extensionSetupContextMenu(QMenu*, QObject*, const char*) override; + void extensionUpdateData(const App::Property*) override; + void extensionSetupContextMenu(QMenu*, QObject*, const char*) override; protected: - virtual void extensionOnChanged(const App::Property* p) override; + void extensionOnChanged(const App::Property* p) override; void toggleControlPoints(bool); void showControlPoints(bool, const App::Property* prop); void showControlPointsOfEdge(const TopoDS_Edge&); @@ -61,9 +61,9 @@ public: /// constructor ViewProviderSpline(); /// destructor - virtual ~ViewProviderSpline(); + ~ViewProviderSpline() override; - QIcon getIcon() const; + QIcon getIcon() const override; private: ViewProviderSplineExtension extension; diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h index a36f8a5f55..325826cc32 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h @@ -44,9 +44,9 @@ public: /// constructor ViewProviderTorusParametric(); /// destructor - virtual ~ViewProviderTorusParametric(); + ~ViewProviderTorusParametric() override; - std::vector getDisplayModes(void) const; + std::vector getDisplayModes(void) const override; protected: diff --git a/src/Mod/Part/Gui/Workbench.h b/src/Mod/Part/Gui/Workbench.h index 50dbeb1b99..8564b8e596 100644 --- a/src/Mod/Part/Gui/Workbench.h +++ b/src/Mod/Part/Gui/Workbench.h @@ -38,12 +38,12 @@ class PartGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace PartGui diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp index e448dd58fe..9dfdc81f17 100644 --- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp +++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp @@ -40,7 +40,7 @@ public: initialize("This module is the PartDesign module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object makeFilletArc(const Py::Tuple& args) diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index 4df617b81d..6964159fe0 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -63,8 +63,8 @@ public: * Add the feature into the body at the current insert point. * The insertion poin is the before next solid after the Tip feature */ - virtual std::vector addObject(App::DocumentObject*) override; - virtual std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override; + std::vector addObject(App::DocumentObject*) override; + std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override; /** * Insert the feature into the body after the given feature. @@ -82,7 +82,7 @@ public: void setBaseProperty(App::DocumentObject* feature); /// Remove the feature from the body - virtual std::vector removeObject(DocumentObject* obj) override; + std::vector removeObject(DocumentObject* obj) override; /** * Checks if the given document object lays after the current insert point @@ -105,7 +105,7 @@ public: * all features derived from PartDesign::Feature and Part::Datum and sketches */ static bool isAllowed(const App::DocumentObject *obj); - virtual bool allowObject(DocumentObject *obj) override { + bool allowObject(DocumentObject *obj) override { return isAllowed(obj); } @@ -117,8 +117,8 @@ public: PyObject *getPyObject() override; - virtual std::vector getSubObjects(int reason=0) const override; - virtual App::DocumentObject *getSubObject(const char *subname, + std::vector getSubObjects(int reason=0) const override; + App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override; void setShowTip(bool enable) { @@ -141,17 +141,17 @@ public: bool isSolid(); protected: - virtual void onSettingDocument() override; + void onSettingDocument() override; /// Adjusts the first solid's feature's base on BaseFeature getting set - virtual void onChanged (const App::Property* prop) override; + void onChanged (const App::Property* prop) override; /// Creates the corresponding Origin object - virtual void setupObject () override; + void setupObject () override; /// Removes all planes and axis if they are still linked to the document - virtual void unsetupObject () override; + void unsetupObject () override; - virtual void onDocumentRestored() override; + void onDocumentRestored() override; private: boost::signals2::scoped_connection connection; diff --git a/src/Mod/PartDesign/App/DatumCS.h b/src/Mod/PartDesign/App/DatumCS.h index a062f60424..f21bb43837 100644 --- a/src/Mod/PartDesign/App/DatumCS.h +++ b/src/Mod/PartDesign/App/DatumCS.h @@ -36,7 +36,7 @@ class PartDesignExport CoordinateSystem : public Part::Datum public: CoordinateSystem(); - virtual ~CoordinateSystem(); + ~CoordinateSystem() override; const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumCoordinateSystem"; @@ -46,7 +46,7 @@ public: Base::Vector3d getYAxis(); Base::Vector3d getZAxis(); - virtual App::DocumentObject *getSubObject(const char *subname, + App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override; }; diff --git a/src/Mod/PartDesign/App/DatumLine.h b/src/Mod/PartDesign/App/DatumLine.h index b4afc0a0cf..3b14d1403c 100644 --- a/src/Mod/PartDesign/App/DatumLine.h +++ b/src/Mod/PartDesign/App/DatumLine.h @@ -38,13 +38,13 @@ class PartDesignExport Line : public Part::Datum public: Line(); - virtual ~Line(); + ~Line() override; App::PropertyEnumeration ResizeMode; App::PropertyLength Length; - virtual void onChanged(const App::Property *prop); + void onChanged(const App::Property *prop) override; - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumLine"; } diff --git a/src/Mod/PartDesign/App/DatumPlane.h b/src/Mod/PartDesign/App/DatumPlane.h index 4c2672b8f6..a3847179ea 100644 --- a/src/Mod/PartDesign/App/DatumPlane.h +++ b/src/Mod/PartDesign/App/DatumPlane.h @@ -38,21 +38,21 @@ class PartDesignExport Plane : public Part::Datum public: Plane(); - virtual ~Plane(); + ~Plane() override; App::PropertyEnumeration ResizeMode; App::PropertyLength Length; App::PropertyLength Width; - virtual void onChanged(const App::Property *prop); - const char* getViewProviderName() const { + void onChanged(const App::Property *prop) override; + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumPlane"; } Base::Vector3d getNormal(); protected: - virtual void Restore(Base::XMLReader& reader); + void Restore(Base::XMLReader& reader) override; private: static const char* ResizeModeEnums[]; diff --git a/src/Mod/PartDesign/App/DatumPoint.h b/src/Mod/PartDesign/App/DatumPoint.h index 09c3da681a..5f72f04c46 100644 --- a/src/Mod/PartDesign/App/DatumPoint.h +++ b/src/Mod/PartDesign/App/DatumPoint.h @@ -37,7 +37,7 @@ class PartDesignExport Point : public Part::Datum public: Point(); - virtual ~Point(); + ~Point() override; const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDatumPoint"; @@ -48,8 +48,8 @@ public: typedef Part::Datum Superclass; protected: - virtual void onChanged(const App::Property* prop) override; - virtual void onDocumentRestored() override; + void onChanged(const App::Property* prop) override; + void onDocumentRestored() override; private: void makeShape(); diff --git a/src/Mod/PartDesign/App/Feature.h b/src/Mod/PartDesign/App/Feature.h index 78fb580ba7..b3d5448d46 100644 --- a/src/Mod/PartDesign/App/Feature.h +++ b/src/Mod/PartDesign/App/Feature.h @@ -55,7 +55,7 @@ public: App::PropertyLink BaseFeature; App::PropertyLinkHidden _Body; - short mustExecute() const; + short mustExecute() const override; /// Check whether the given feature is a datum feature static bool isDatum(const App::DocumentObject* feature); @@ -75,9 +75,9 @@ public: /// Returns the BaseFeature property's TopoShape (if any) Part::TopoShape getBaseTopoShape(bool silent=false) const; - virtual PyObject* getPyObject(); + PyObject* getPyObject() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProvider"; } diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h index f7fea78e3b..5d0fbc4691 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.h +++ b/src/Mod/PartDesign/App/FeatureAddSub.h @@ -44,7 +44,7 @@ public: Type getAddSubType(); - virtual short mustExecute() const override; + short mustExecute() const override; virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape); @@ -65,7 +65,7 @@ class FeatureAdditivePython : public FeatureAddSubPython public: FeatureAdditivePython(); - ~FeatureAdditivePython(); + ~FeatureAdditivePython() override; }; class FeatureSubtractivePython : public FeatureAddSubPython @@ -74,7 +74,7 @@ class FeatureSubtractivePython : public FeatureAddSubPython public: FeatureSubtractivePython(); - ~FeatureSubtractivePython(); + ~FeatureSubtractivePython() override; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeatureBase.h b/src/Mod/PartDesign/App/FeatureBase.h index d27d3c154f..376a845396 100644 --- a/src/Mod/PartDesign/App/FeatureBase.h +++ b/src/Mod/PartDesign/App/FeatureBase.h @@ -37,17 +37,17 @@ class PartDesignExport FeatureBase : public PartDesign::Feature public: FeatureBase(); - virtual short int mustExecute() const; + short int mustExecute() const override; - virtual Part::Feature* getBaseObject(bool silent=false) const; + Part::Feature* getBaseObject(bool silent=false) const override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderBase"; } - virtual void onChanged(const App::Property* prop); - virtual App::DocumentObjectExecReturn* execute(); - virtual void onDocumentRestored(); + void onChanged(const App::Property* prop) override; + App::DocumentObjectExecReturn* execute() override; + void onDocumentRestored() override; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeatureBoolean.h b/src/Mod/PartDesign/App/FeatureBoolean.h index e85d33e818..b3ad810340 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.h +++ b/src/Mod/PartDesign/App/FeatureBoolean.h @@ -57,7 +57,7 @@ public: const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderBoolean"; } - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; //@} protected: diff --git a/src/Mod/PartDesign/App/FeatureChamfer.h b/src/Mod/PartDesign/App/FeatureChamfer.h index bc17953588..2a6aada3ed 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.h +++ b/src/Mod/PartDesign/App/FeatureChamfer.h @@ -56,7 +56,7 @@ public: } //@} - virtual void onChanged(const App::Property* /*prop*/) override; + void onChanged(const App::Property* /*prop*/) override; void updateProperties(); diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h index 8375075feb..84a6250461 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.h +++ b/src/Mod/PartDesign/App/FeatureDraft.h @@ -48,16 +48,16 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderDraft"; } //@} private: - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; static const App::PropertyAngle::Constraints floatAngle; }; diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h index 7f48fed51a..05d17f6428 100644 --- a/src/Mod/PartDesign/App/FeatureDressUp.h +++ b/src/Mod/PartDesign/App/FeatureDressUp.h @@ -44,7 +44,7 @@ public: App::PropertyLinkSub Base; App::PropertyBool SupportTransform; - short mustExecute() const; + short mustExecute() const override; /// updates the Placement property from the Placement of the BaseFeature void positionByBaseFeature(); /** @@ -54,17 +54,17 @@ public: * silently return a nullptr, otherwise throw Base::Exception. * Default is false. */ - virtual Part::Feature* getBaseObject(bool silent=false) const; + Part::Feature* getBaseObject(bool silent=false) const override; /// extracts all edges from the subshapes (including face edges) and furthermore adds /// all C0 continuous edges to the vector void getContinuousEdges(Part::TopoShape, std::vector< std::string >&); // add argument to return the selected face that edges were derived from void getContinuousEdges(Part::TopoShape, std::vector< std::string >&, std::vector< std::string >&); - virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape); + void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape) override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeatureExtrude.h b/src/Mod/PartDesign/App/FeatureExtrude.h index 97d9bc76c0..1b361a111c 100644 --- a/src/Mod/PartDesign/App/FeatureExtrude.h +++ b/src/Mod/PartDesign/App/FeatureExtrude.h @@ -59,7 +59,7 @@ public: /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; //@} protected: diff --git a/src/Mod/PartDesign/App/FeatureFillet.h b/src/Mod/PartDesign/App/FeatureFillet.h index e7a252de34..b39c72530e 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.h +++ b/src/Mod/PartDesign/App/FeatureFillet.h @@ -44,17 +44,17 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void); - short mustExecute() const; + App::DocumentObjectExecReturn *execute(void) override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderFillet"; } //@} protected: - void Restore(Base::XMLReader &reader); - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + void Restore(Base::XMLReader &reader) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; }; } //namespace Part diff --git a/src/Mod/PartDesign/App/FeatureGroove.h b/src/Mod/PartDesign/App/FeatureGroove.h index f25fb8793f..7264f21429 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.h +++ b/src/Mod/PartDesign/App/FeatureGroove.h @@ -55,10 +55,10 @@ 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderGroove"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureHelix.h b/src/Mod/PartDesign/App/FeatureHelix.h index 435f0fd7dc..eddddf3475 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.h +++ b/src/Mod/PartDesign/App/FeatureHelix.h @@ -64,10 +64,10 @@ public: /** @name methods override feature */ //@{ - App::DocumentObjectExecReturn* execute(); - short mustExecute() const; + App::DocumentObjectExecReturn* execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderHelix"; } //@} @@ -89,9 +89,9 @@ protected: Base::Vector3d getProfileCenterPoint(); // handle changed property types for backward compatibility - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; static const App::PropertyFloatConstraint::Constraints floatTurns; static const App::PropertyAngle::Constraints floatAngle; diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h index 023981a8a3..f90a7b6ab6 100644 --- a/src/Mod/PartDesign/App/FeatureHole.h +++ b/src/Mod/PartDesign/App/FeatureHole.h @@ -77,14 +77,14 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderHole"; } //@} - short mustExecute() const; + short mustExecute() const override; typedef struct { const char * designation; @@ -104,12 +104,12 @@ public: } UTSClearanceDefinition; static const UTSClearanceDefinition UTSHoleDiameters[22]; - virtual void Restore(Base::XMLReader & reader); + void Restore(Base::XMLReader & reader) override; virtual void updateProps(); protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; static const App::PropertyAngle::Constraints floatAngle; private: diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h index 2e516e162f..ba785ae522 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.h +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h @@ -44,10 +44,10 @@ public: /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderLinearPattern"; } //@} @@ -61,10 +61,10 @@ public: * transformation direction will be parallel to the given edge, which must be linear * If Reversed is true, the direction of transformation will be opposite */ - const std::list getTransformations(const std::vector ); + const std::list getTransformations(const std::vector ) override; protected: - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; static const App::PropertyIntegerConstraint::Constraints intOccurrences; }; diff --git a/src/Mod/PartDesign/App/FeatureLoft.h b/src/Mod/PartDesign/App/FeatureLoft.h index 4c212a54f5..99d4fdc6a7 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.h +++ b/src/Mod/PartDesign/App/FeatureLoft.h @@ -42,17 +42,17 @@ public: /** @name methods override feature */ //@{ - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderLoft"; } //@} protected: // handle changed property - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; private: //static const char* TypeEnums[]; diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.h b/src/Mod/PartDesign/App/FeatureMultiTransform.h index 8a4f120da6..b4012d6b18 100644 --- a/src/Mod/PartDesign/App/FeatureMultiTransform.h +++ b/src/Mod/PartDesign/App/FeatureMultiTransform.h @@ -41,10 +41,10 @@ public: /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderMultiTransform"; } //@} @@ -56,10 +56,10 @@ public: * by the Transformations property. Subfeatures can be Mirrored, LinearPattern, PolarPattern and * Scaled. */ - const std::list getTransformations(const std::vector originals); + const std::list getTransformations(const std::vector originals) override; protected: - virtual void positionBySupport(); + void positionBySupport() override; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeaturePad.h b/src/Mod/PartDesign/App/FeaturePad.h index 381571e4f5..4de1d88f3e 100644 --- a/src/Mod/PartDesign/App/FeaturePad.h +++ b/src/Mod/PartDesign/App/FeaturePad.h @@ -51,9 +51,9 @@ 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(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPad"; } //@} diff --git a/src/Mod/PartDesign/App/FeaturePipe.h b/src/Mod/PartDesign/App/FeaturePipe.h index c825fc36a7..2ba8b282a6 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPipe"; } @@ -61,7 +61,7 @@ protected: void buildPipePath(const Part::TopoShape& input, const std::vector& edges, TopoDS_Shape& result); void setupAlgorithm(BRepOffsetAPI_MakePipeShell& mkPipeShell, TopoDS_Shape& auxshape); /// handle changed property - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; private: static const char* TypeEnums[]; diff --git a/src/Mod/PartDesign/App/FeaturePocket.h b/src/Mod/PartDesign/App/FeaturePocket.h index 9af109c0dc..078b465591 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.h +++ b/src/Mod/PartDesign/App/FeaturePocket.h @@ -48,9 +48,9 @@ public: * If Midplane is true, then the extrusion will extend for half of the length on both sides of the sketch plane * The created material will be cut out of the sketch support */ - App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPocket"; } //@} diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.h b/src/Mod/PartDesign/App/FeaturePolarPattern.h index f6980a5f6d..152d0a2de7 100644 --- a/src/Mod/PartDesign/App/FeaturePolarPattern.h +++ b/src/Mod/PartDesign/App/FeaturePolarPattern.h @@ -46,10 +46,10 @@ public: /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPolarPattern"; } //@} @@ -64,10 +64,10 @@ public: * the given edge, which must be linear. * If Reversed is true, the direction of rotation will be opposite. */ - const std::list getTransformations(const std::vector); + const std::list getTransformations(const std::vector) override; protected: - virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override; static const App::PropertyIntegerConstraint::Constraints intOccurrences; static const App::PropertyAngle::Constraints floatAngle; }; diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h index 9011912a3a..661e96ca9c 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.h +++ b/src/Mod/PartDesign/App/FeaturePrimitive.h @@ -49,15 +49,15 @@ public: FeaturePrimitive(); - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderPrimitive"; } Type getPrimitiveType() {return primitiveType;} - virtual void onChanged(const App::Property* prop) override; - virtual PyObject* getPyObject() override; + void onChanged(const App::Property* prop) override; + PyObject* getPyObject() override; /// Do nothing, just to suppress warning, must be redefined in derived classes - virtual App::DocumentObjectExecReturn* execute() override { + App::DocumentObjectExecReturn* execute() override { return PartDesign::FeatureAddSub::execute(); } protected: @@ -80,8 +80,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: @@ -119,8 +119,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; }; class PartDesignExport AdditiveCylinder : public Cylinder { @@ -156,8 +156,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: @@ -195,8 +195,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: @@ -237,8 +237,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: @@ -278,8 +278,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: @@ -316,8 +316,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; }; class PartDesignExport AdditivePrism : public Prism { @@ -359,8 +359,8 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; protected: diff --git a/src/Mod/PartDesign/App/FeatureRevolution.h b/src/Mod/PartDesign/App/FeatureRevolution.h index e37812b521..9b8a2794ac 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.h +++ b/src/Mod/PartDesign/App/FeatureRevolution.h @@ -55,10 +55,10 @@ 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderRevolution"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureScaled.h b/src/Mod/PartDesign/App/FeatureScaled.h index 29d26823de..789c16fa05 100644 --- a/src/Mod/PartDesign/App/FeatureScaled.h +++ b/src/Mod/PartDesign/App/FeatureScaled.h @@ -43,10 +43,10 @@ public: /** @name methods override feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderScaled"; } //@} @@ -60,7 +60,7 @@ public: */ // Note: We can't just use the Originals property because this will fail if the Scaled feature // is being used inside a MultiTransform feature - const std::list getTransformations(const std::vector originals); + const std::list getTransformations(const std::vector originals) override; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h index 802bd7434f..6dfe62cf67 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.h +++ b/src/Mod/PartDesign/App/FeatureSketchBased.h @@ -60,9 +60,9 @@ public: App::PropertyBool AllowMultiFace; - short mustExecute() const; + short mustExecute() const override; - void setupObject(); + void setupObject() override; /** calculates and updates the Placement property based on the features * this one is made from: either from Base, if there is one, or from sketch, @@ -73,7 +73,7 @@ public: /** applies a transform on the Placement of the Sketch or its * support if it has one */ - virtual void transformPlacement(const Base::Placement &transform); + void transformPlacement(const Base::Placement &transform) override; /** * Verifies the linked Profile and returns it if it is a valid 2D object @@ -112,11 +112,11 @@ public: /// retrieves the number of axes in the linked sketch (defined as construction lines) int getSketchAxisCount() const; - virtual Part::Feature* getBaseObject(bool silent=false) const; + Part::Feature* getBaseObject(bool silent=false) const override; //backwards compatibility: profile property was renamed and has different type now - virtual void Restore(Base::XMLReader& reader); - virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName); + void Restore(Base::XMLReader& reader) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; // calculate the through all length double getThroughAllLength() const; @@ -159,7 +159,7 @@ protected: void getAxis(const App::DocumentObject* pcReferenceAxis, const std::vector& subReferenceAxis, Base::Vector3d& base, Base::Vector3d& dir, ForbiddenAxis checkAxis) const; - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: bool isParallelPlane(const TopoDS_Shape&, const TopoDS_Shape&) const; bool isEqualGeometry(const TopoDS_Shape&, const TopoDS_Shape&) const; diff --git a/src/Mod/PartDesign/App/FeatureThickness.h b/src/Mod/PartDesign/App/FeatureThickness.h index 4a54b57fb6..9b123806fa 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderThickness"; } //@} diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h index 45107dad11..a494878ba9 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.h +++ b/src/Mod/PartDesign/App/FeatureTransformed.h @@ -58,7 +58,7 @@ public: * silently return a nullptr, otherwise throw Base::Exception. * Default is false. */ - virtual Part::Feature* getBaseObject(bool silent=false) const; + Part::Feature* getBaseObject(bool silent=false) const override; /// Return the sketch of the first original App::DocumentObject* getSketchObject() const; @@ -78,8 +78,8 @@ public: * If Originals is empty, execute() returns immediately without doing anything as * the actual processing will happen in the MultiTransform feature */ - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; //@} /** returns the compound of the shapes that were rejected during the last execute @@ -88,8 +88,8 @@ public: TopoDS_Shape rejected; protected: - void Restore(Base::XMLReader &reader); - void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); + void Restore(Base::XMLReader &reader) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; virtual void positionBySupport(); TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const; void divideTools(const std::vector &toolsIn, std::vector &individualsOut, diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index 815efa31b9..03f9e6aca2 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -47,7 +47,7 @@ class PartDesignExport ShapeBinder : public Part::Feature public: ShapeBinder(); - virtual ~ShapeBinder(); + ~ShapeBinder() override; App::PropertyLinkSubListGlobal Support; App::PropertyBool TraceSupport; @@ -62,14 +62,14 @@ public: 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() const override; - virtual App::DocumentObjectExecReturn* execute() override; - virtual void onChanged(const App::Property* prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; + short int mustExecute() const override; + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property* prop) override; private: void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); - virtual void onSettingDocument() override; + void onSettingDocument() override; typedef boost::signals2::connection Connection; Connection connectDocumentChangedObject; @@ -81,7 +81,7 @@ public: typedef Part::Feature inherited; SubShapeBinder(); - ~SubShapeBinder(); + ~SubShapeBinder() override; const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderSubShapeBinder"; @@ -113,24 +113,24 @@ public: }; void update(UpdateOption options = UpdateNone); - virtual int canLoadPartial() const override { + int canLoadPartial() const override { return PartialLoad.getValue()?1:0; } - virtual bool canLinkProperties() const override {return false;} + bool canLinkProperties() const override {return false;} - virtual App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr, + App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr, Base::Matrix4D *mat=nullptr, bool transform=true, int depth=0) const override; protected: - virtual App::DocumentObjectExecReturn* execute() override; - virtual void onChanged(const App::Property *prop) override; + App::DocumentObjectExecReturn* execute() override; + void onChanged(const App::Property *prop) override; - virtual void handleChangedPropertyType( + void handleChangedPropertyType( Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; - virtual void onDocumentRestored() override; - virtual void setupObject() override; + void onDocumentRestored() override; + void setupObject() override; void setupCopyOnChange(); void checkCopyOnChange(const App::Property &prop); diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index 469aa842f5..97257d74e8 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -84,7 +84,7 @@ public: initialize("This module is the PartDesignGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.h b/src/Mod/PartDesign/Gui/DlgActiveBody.h index d0ccf61139..111aa29c3e 100644 --- a/src/Mod/PartDesign/Gui/DlgActiveBody.h +++ b/src/Mod/PartDesign/Gui/DlgActiveBody.h @@ -46,7 +46,7 @@ class PartDesignGuiExport DlgActiveBody : public QDialog public: DlgActiveBody(QWidget* parent, App::Document*& doc, const QString& infoText=QString()); - ~DlgActiveBody(); + ~DlgActiveBody() override; void accept() override; PartDesign::Body* getActiveBody() const { return activeBody; } diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h index f43125c098..dc70a39d7f 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.h +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.h @@ -49,7 +49,7 @@ class TaskBooleanParameters : public Gui::TaskView::TaskBox, public Gui::Selecti public: TaskBooleanParameters(ViewProviderBoolean *BooleanView, QWidget *parent=nullptr); - ~TaskBooleanParameters(); + ~TaskBooleanParameters() override; const std::vector getBodies() const; int getType() const; @@ -64,8 +64,8 @@ protected: void exitSelectionMode(); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: QWidget* proxy; @@ -84,7 +84,7 @@ class TaskDlgBooleanParameters : public Gui::TaskView::TaskDialog public: TaskDlgBooleanParameters(ViewProviderBoolean *BooleanView); - ~TaskDlgBooleanParameters(); + ~TaskDlgBooleanParameters() override; ViewProviderBoolean* getBooleanView() const { return BooleanView; } @@ -92,19 +92,19 @@ public: public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.h b/src/Mod/PartDesign/Gui/TaskChamferParameters.h index d767c29291..0ce309603a 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.h +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.h @@ -40,9 +40,9 @@ class TaskChamferParameters : public TaskDressUpParameters public: TaskChamferParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); - ~TaskChamferParameters(); + ~TaskChamferParameters() override; - virtual void apply(); + void apply() override; private Q_SLOTS: void onTypeChanged(int); @@ -50,15 +50,15 @@ private Q_SLOTS: void onSize2Changed(double); void onAngleChanged(double); void onFlipDirection(bool); - void onRefDeleted(void); + void onRefDeleted(void) override; void onAddAllEdges(void); void onCheckBoxUseAllEdgesToggled(bool checked); protected: - virtual void clearButtons(const selectionModes notThis); - bool event(QEvent *e); - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void clearButtons(const selectionModes notThis) override; + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; int getType(void) const; double getSize(void) const; @@ -79,11 +79,11 @@ class TaskDlgChamferParameters : public TaskDlgDressUpParameters public: TaskDlgChamferParameters(ViewProviderChamfer *DressUpView); - ~TaskDlgChamferParameters(); + ~TaskDlgChamferParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.h b/src/Mod/PartDesign/Gui/TaskDatumParameters.h index 8c4ed9ff19..b91842c062 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.h @@ -51,7 +51,7 @@ class TaskDatumParameters : public PartGui::TaskAttacher public: TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *parent = nullptr); - ~TaskDatumParameters(); + ~TaskDatumParameters() override; }; /// simulation dialog for the TaskView @@ -61,10 +61,10 @@ class TaskDlgDatumParameters : public PartGui::TaskDlgAttacher public: TaskDlgDatumParameters(ViewProviderDatum *DatumView); - ~TaskDlgDatumParameters(); + ~TaskDlgDatumParameters() override; - virtual bool accept(); - virtual bool reject(); + bool accept() override; + bool reject() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.h b/src/Mod/PartDesign/Gui/TaskDraftParameters.h index 63227fc17c..52cfb610d6 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.h @@ -38,7 +38,7 @@ class TaskDraftParameters : public TaskDressUpParameters public: TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); - ~TaskDraftParameters(); + ~TaskDraftParameters() override; double getAngle() const; bool getReversed() const; @@ -51,13 +51,13 @@ private Q_SLOTS: void onReversedChanged(bool reversed); void onButtonPlane(const bool checked); void onButtonLine(const bool checked); - void onRefDeleted(); + void onRefDeleted() override; protected: - virtual void clearButtons(const selectionModes notThis); - bool event(QEvent *e); - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void clearButtons(const selectionModes notThis) override; + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: std::unique_ptr ui; @@ -70,11 +70,11 @@ class TaskDlgDraftParameters : public TaskDlgDressUpParameters public: TaskDlgDraftParameters(ViewProviderDraft *DraftView); - ~TaskDlgDraftParameters(); + ~TaskDlgDraftParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h index 6686b9ede5..431f1f48b3 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h @@ -46,7 +46,7 @@ class TaskDressUpParameters : public Gui::TaskView::TaskBox, public Gui::Selecti public: TaskDressUpParameters(ViewProviderDressUp *DressUpView, bool selectEdges, bool selectFaces, QWidget* parent = nullptr); - virtual ~TaskDressUpParameters(); + ~TaskDressUpParameters() override; const std::vector getReferences(void) const; Part::Feature *getBase(void) const; @@ -106,15 +106,15 @@ class TaskDlgDressUpParameters : public TaskDlgFeatureParameters public: TaskDlgDressUpParameters(ViewProviderDressUp *DressUpView); - virtual ~TaskDlgDressUpParameters(); + ~TaskDlgDressUpParameters() override; ViewProviderDressUp* getDressUpView() const { return static_cast(vp); } public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); - virtual bool reject(); + bool accept() override; + bool reject() override; protected: TaskDressUpParameters *parameter; diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h index 50b1d99375..80baa86212 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h @@ -54,9 +54,9 @@ class TaskExtrudeParameters : public TaskSketchBasedParameters public: TaskExtrudeParameters(ViewProviderSketchBased *SketchBasedView, QWidget *parent, const std::string& pixmapname, const QString& parname); - ~TaskExtrudeParameters(); + ~TaskExtrudeParameters() override; - virtual void saveHistory() override; + void saveHistory() override; void fillDirectionCombo(); void addAxisToCombo(App::DocumentObject* linkObj, std::string linkSubname, QString itemText, diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h index f285f28f23..b7d903e6ee 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.h @@ -41,7 +41,7 @@ class TaskFeatureParameters : public Gui::TaskView::TaskBox, public: TaskFeatureParameters(PartDesignGui::ViewProvider* vp, QWidget *parent, const std::string& pixmapname, const QString& parname); - virtual ~TaskFeatureParameters() {} + ~TaskFeatureParameters() override {} /// save field history virtual void saveHistory() {} @@ -56,7 +56,7 @@ protected Q_SLOTS: private: /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; protected: PartDesignGui::ViewProvider *vp; @@ -71,13 +71,13 @@ class TaskDlgFeatureParameters : public Gui::TaskView::TaskDialog public: TaskDlgFeatureParameters(PartDesignGui::ViewProvider *vp); - virtual ~TaskDlgFeatureParameters(); + ~TaskDlgFeatureParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// Returns the view provider dialog is runed for PartDesignGui::ViewProvider *viewProvider() const { return vp; } diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h index afb24c0b55..4f3e991c22 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h @@ -61,7 +61,7 @@ public: bool singleFeatureSelect, QWidget *parent = nullptr); - ~TaskFeaturePick(); + ~TaskFeaturePick() override; std::vector getFeatures(); std::vector buildFeatures(); @@ -72,17 +72,17 @@ public: protected Q_SLOTS: void onUpdate(bool); - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void onItemSelectionChanged(); void onDoubleClick(QListWidgetItem *item); protected: /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on document deletion */ - virtual void slotDeleteDocument(const Gui::Document& Doc); + void slotDeleteDocument(const Gui::Document& Doc) override; private: std::unique_ptr ui; @@ -111,25 +111,25 @@ public: std::function)> workfunc, bool singleFeatureSelect, std::function abortfunc = 0); - ~TaskDlgFeaturePick(); + ~TaskDlgFeaturePick() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument(void) const override { return false; } void showExternal(bool val); /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + QDialogButtonBox::StandardButtons getStandardButtons(void) const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.h b/src/Mod/PartDesign/Gui/TaskFilletParameters.h index 7927f77818..3121e0becc 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.h +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.h @@ -37,22 +37,22 @@ class TaskFilletParameters : public TaskDressUpParameters public: TaskFilletParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); - ~TaskFilletParameters(); + ~TaskFilletParameters() override; - virtual void apply(); + void apply() override; private Q_SLOTS: void onLengthChanged(double); - void onRefDeleted(); + void onRefDeleted() override; void onAddAllEdges(); void onCheckBoxUseAllEdgesToggled(bool checked); protected: double getLength() const; - virtual void clearButtons(const selectionModes notThis); - bool event(QEvent *e); - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void clearButtons(const selectionModes notThis) override; + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: std::unique_ptr ui; @@ -65,11 +65,11 @@ class TaskDlgFilletParameters : public TaskDlgDressUpParameters public: TaskDlgFilletParameters(ViewProviderFillet *DressUpView); - ~TaskDlgFilletParameters(); + ~TaskDlgFilletParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.h b/src/Mod/PartDesign/Gui/TaskHelixParameters.h index eb11753823..09695b9f21 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.h @@ -46,9 +46,9 @@ class TaskHelixParameters : public TaskSketchBasedParameters public: TaskHelixParameters(ViewProviderHelix* HelixView, QWidget* parent = nullptr); - ~TaskHelixParameters(); + ~TaskHelixParameters() override; - virtual void apply() override; + void apply() override; static bool showPreview(PartDesign::Helix*); diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.h b/src/Mod/PartDesign/Gui/TaskHoleParameters.h index 2c48239c17..40e4221135 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.h @@ -51,7 +51,7 @@ class TaskHoleParameters : public TaskSketchBasedParameters public: TaskHoleParameters(ViewProviderHole *HoleView, QWidget *parent = nullptr); - ~TaskHoleParameters(); + ~TaskHoleParameters() override; void apply() override; @@ -114,7 +114,7 @@ private: public: Observer(TaskHoleParameters * _owner, PartDesign::Hole * _hole); private: - virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); + void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; TaskHoleParameters * owner; PartDesign::Hole * hole; }; @@ -144,7 +144,7 @@ class TaskDlgHoleParameters : public TaskDlgSketchBasedParameters public: TaskDlgHoleParameters(ViewProviderHole *HoleView); - ~TaskDlgHoleParameters(); + ~TaskDlgHoleParameters() override; ViewProviderHole* getHoleView() const { return static_cast(vp); } diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index a85e98f801..2b134205ff 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -51,9 +51,9 @@ public: TaskLinearPatternParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr); /// Constructor for task with parent task (MultiTransform mode) TaskLinearPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout); - virtual ~TaskLinearPatternParameters(); + ~TaskLinearPatternParameters() override; - virtual void apply(); + void apply() override; private Q_SLOTS: void onUpdateViewTimer(); @@ -62,14 +62,14 @@ private Q_SLOTS: void onLength(const double l); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(); + void onFeatureDeleted() override; protected: - virtual void addObject(App::DocumentObject*); - virtual void removeObject(App::DocumentObject*); - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - virtual void clearButtons(); + void addObject(App::DocumentObject*) override; + void removeObject(App::DocumentObject*) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void clearButtons() override; void getDirection(App::DocumentObject*& obj, std::vector& sub) const; bool getReverse() const; double getLength() const; @@ -96,7 +96,7 @@ class TaskDlgLinearPatternParameters : public TaskDlgTransformedParameters public: TaskDlgLinearPatternParameters(ViewProviderLinearPattern *LinearPatternView); - virtual ~TaskDlgLinearPatternParameters() {} + ~TaskDlgLinearPatternParameters() override {} }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.h b/src/Mod/PartDesign/Gui/TaskLoftParameters.h index c945eddbdd..85c302ec17 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.h @@ -47,7 +47,7 @@ class TaskLoftParameters : public TaskSketchBasedParameters public: TaskLoftParameters(ViewProviderLoft *LoftView, bool newObj=false, QWidget *parent = nullptr); - ~TaskLoftParameters(); + ~TaskLoftParameters() override; private Q_SLOTS: void onProfileButton(bool); @@ -61,10 +61,10 @@ private Q_SLOTS: protected: enum selectionModes { none, refAdd, refRemove, refProfile }; - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void updateUI(); bool referenceSelected(const Gui::SelectionChanges& msg) const; void removeFromListWidget(QListWidget*w, QString name); @@ -85,13 +85,13 @@ class TaskDlgLoftParameters : public TaskDlgSketchBasedParameters public: TaskDlgLoftParameters(ViewProviderLoft *LoftView,bool newObj=false); - ~TaskDlgLoftParameters(); + ~TaskDlgLoftParameters() override; ViewProviderLoft* getLoftView() const { return static_cast(vp); } /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; protected: TaskLoftParameters *parameter; diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 86472ba61d..1288b80245 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -51,23 +51,23 @@ public: /// Constructor for task with parent task (MultiTransform mode) TaskMirroredParameters(TaskMultiTransformParameters *parentTask, QLayout *layout); - virtual ~TaskMirroredParameters(); + ~TaskMirroredParameters() override; void getMirrorPlane(App::DocumentObject*& obj, std::vector& sub) const; - virtual void apply(); + void apply() override; private Q_SLOTS: void onPlaneChanged(int num); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(); + void onFeatureDeleted() override; protected: - virtual void addObject(App::DocumentObject*); - virtual void removeObject(App::DocumentObject*); - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - virtual void clearButtons(); + void addObject(App::DocumentObject*) override; + void removeObject(App::DocumentObject*) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void clearButtons() override; private: void setupUI(); @@ -86,11 +86,11 @@ class TaskDlgMirroredParameters : public TaskDlgTransformedParameters public: TaskDlgMirroredParameters(ViewProviderMirrored *MirroredView); - virtual ~TaskDlgMirroredParameters() {} + ~TaskDlgMirroredParameters() override {} public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 3d89c15b38..e45bbc2cec 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -52,7 +52,7 @@ class TaskMultiTransformParameters : public TaskTransformedParameters public: TaskMultiTransformParameters(ViewProviderTransformed *TransformedView,QWidget *parent = nullptr); - virtual ~TaskMultiTransformParameters(); + ~TaskMultiTransformParameters() override; const std::vector getTransformFeatures() const; @@ -61,7 +61,7 @@ public: return subFeature; } - virtual void apply(); + void apply() override; private Q_SLOTS: void onTransformDelete(); @@ -74,20 +74,20 @@ private Q_SLOTS: void onMoveUp(); void onMoveDown(); /// User finished editing a subFeature - virtual void onSubTaskButtonOK(); + void onSubTaskButtonOK() override; // 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 onFeatureDeleted() override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; protected: - virtual void addObject(App::DocumentObject*); - virtual void removeObject(App::DocumentObject*); - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - virtual void clearButtons(); + void addObject(App::DocumentObject*) override; + void removeObject(App::DocumentObject*) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void clearButtons() override; private: void updateUI(); @@ -111,11 +111,11 @@ class TaskDlgMultiTransformParameters : public TaskDlgTransformedParameters public: TaskDlgMultiTransformParameters(ViewProviderMultiTransform *MultiTransformView); - virtual ~TaskDlgMultiTransformParameters() {} + ~TaskDlgMultiTransformParameters() override {} public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) // virtual bool reject(); }; diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.h b/src/Mod/PartDesign/Gui/TaskPadParameters.h index e3be1b9096..7eb724ac84 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.h @@ -44,9 +44,9 @@ class TaskPadParameters : public TaskExtrudeParameters public: TaskPadParameters(ViewProviderPad *PadView, QWidget *parent = nullptr, bool newObj=false); - ~TaskPadParameters(); + ~TaskPadParameters() override; - virtual void apply() override; + void apply() override; private: void onModeChanged(int index) override; diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.h b/src/Mod/PartDesign/Gui/TaskPipeParameters.h index ea77e0ceda..b3da8a8feb 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.h @@ -80,7 +80,7 @@ class TaskPipeParameters : public TaskSketchBasedParameters public: TaskPipeParameters(ViewProviderPipe *PipeView, bool newObj=false, QWidget *parent = nullptr); - ~TaskPipeParameters(); + ~TaskPipeParameters() override; bool accept(); @@ -95,7 +95,7 @@ protected: bool referenceSelected(const Gui::SelectionChanges& msg) const; private: - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void updateUI(); void clearButtons(); void exitSelectionMode(); @@ -121,7 +121,7 @@ class TaskPipeOrientation : public TaskSketchBasedParameters public: TaskPipeOrientation(ViewProviderPipe *PipeView, bool newObj=false, QWidget *parent = nullptr); - virtual ~TaskPipeOrientation(); + ~TaskPipeOrientation() override; private Q_SLOTS: @@ -137,7 +137,7 @@ protected: bool referenceSelected(const Gui::SelectionChanges& msg) const; private: - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void clearButtons(); void exitSelectionMode(); @@ -155,7 +155,7 @@ class TaskPipeScaling : public TaskSketchBasedParameters public: TaskPipeScaling(ViewProviderPipe *PipeView,bool newObj=false,QWidget *parent = nullptr); - virtual ~TaskPipeScaling(); + ~TaskPipeScaling() override; private Q_SLOTS: void onScalingChanged(int); @@ -168,7 +168,7 @@ protected: bool referenceSelected(const Gui::SelectionChanges& msg) const; private: - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void clearButtons(); void exitSelectionMode(); @@ -186,11 +186,11 @@ class TaskDlgPipeParameters : public TaskDlgSketchBasedParameters public: TaskDlgPipeParameters(ViewProviderPipe *PipeView,bool newObj=false); - ~TaskDlgPipeParameters(); + ~TaskDlgPipeParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) protected Q_SLOTS: diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.h b/src/Mod/PartDesign/Gui/TaskPocketParameters.h index 6eb918cca6..d9772456dd 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.h @@ -44,9 +44,9 @@ class TaskPocketParameters : public TaskExtrudeParameters public: TaskPocketParameters(ViewProviderPocket *PocketView, QWidget *parent = nullptr, bool newObj=false); - ~TaskPocketParameters(); + ~TaskPocketParameters() override; - virtual void apply() override; + void apply() override; private: void onModeChanged(int index) override; diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index a8a3830ad4..d9d23c9c26 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -51,9 +51,9 @@ public: TaskPolarPatternParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr); /// Constructor for task with parent task (MultiTransform mode) TaskPolarPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout); - virtual ~TaskPolarPatternParameters(); + ~TaskPolarPatternParameters() override; - void apply(); + void apply() override; private Q_SLOTS: void onUpdateViewTimer(); @@ -62,14 +62,14 @@ private Q_SLOTS: void onAngle(const double a); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(); + void onFeatureDeleted() override; protected: - virtual void addObject(App::DocumentObject*); - virtual void removeObject(App::DocumentObject*); - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - virtual void clearButtons(); + void addObject(App::DocumentObject*) override; + void removeObject(App::DocumentObject*) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void clearButtons() override; void getAxis(App::DocumentObject*& obj, std::vector& sub) const; const std::string getStdAxis() const; const std::string getAxis() const; @@ -98,7 +98,7 @@ class TaskDlgPolarPatternParameters : public TaskDlgTransformedParameters public: TaskDlgPolarPatternParameters(ViewProviderPolarPattern *PolarPatternView); - virtual ~TaskDlgPolarPatternParameters() {} + ~TaskDlgPolarPatternParameters() override {} }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h index 37a6249906..41aec572e3 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h @@ -49,7 +49,7 @@ class TaskBoxPrimitives : public Gui::TaskView::TaskBox, public: TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent = nullptr); - ~TaskBoxPrimitives(); + ~TaskBoxPrimitives() override; bool setPrimitive(App::DocumentObject *); @@ -99,7 +99,7 @@ public Q_SLOTS: private: /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; private: QWidget* proxy; @@ -113,13 +113,13 @@ class TaskPrimitiveParameters : public Gui::TaskView::TaskDialog public: TaskPrimitiveParameters(ViewProviderPrimitive *PrimitiveView); - ~TaskPrimitiveParameters(); + ~TaskPrimitiveParameters() override; protected: - virtual QDialogButtonBox::StandardButtons getStandardButtons() const; + QDialogButtonBox::StandardButtons getStandardButtons() const override; - virtual bool accept(); - virtual bool reject(); + bool accept() override; + bool reject() override; private: TaskBoxPrimitives* primitive; diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h index dab3439c03..723fc7b064 100644 --- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h +++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h @@ -47,9 +47,9 @@ class TaskRevolutionParameters : public TaskSketchBasedParameters public: TaskRevolutionParameters(ViewProvider* RevolutionView,QWidget *parent = nullptr); - ~TaskRevolutionParameters(); + ~TaskRevolutionParameters() override; - virtual void apply() override; + void apply() override; /** * @brief fillAxisCombo fills the combo and selects the item according to diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index fc694aa3dc..9ffd5bdcfc 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -50,20 +50,20 @@ public: TaskScaledParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr); /// Constructor for task with parent task (MultiTransform mode) TaskScaledParameters(TaskMultiTransformParameters *parentTask, QLayout *layout); - virtual ~TaskScaledParameters(); + ~TaskScaledParameters() override; - virtual void apply(); + void apply() override; private Q_SLOTS: void onFactor(const double f); void onOccurrences(const uint n); virtual void onUpdateView(bool); - virtual void onFeatureDeleted(); + void onFeatureDeleted() override; protected: - virtual void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); - virtual void clearButtons(); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void clearButtons() override; double getFactor() const; unsigned getOccurrences() const; @@ -83,11 +83,11 @@ class TaskDlgScaledParameters : public TaskDlgTransformedParameters public: TaskDlgScaledParameters(ViewProviderScaled *ScaledView); - virtual ~TaskDlgScaledParameters() {} + ~TaskDlgScaledParameters() override {} public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.h b/src/Mod/PartDesign/Gui/TaskShapeBinder.h index 3590e59a91..6366184e77 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.h +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.h @@ -52,13 +52,13 @@ class TaskShapeBinder : public Gui::TaskView::TaskBox, Gui::SelectionObserver public: TaskShapeBinder(ViewProviderShapeBinder *view,bool newObj=false,QWidget *parent = nullptr); - ~TaskShapeBinder(); + ~TaskShapeBinder() override; void accept(); protected: enum selectionModes { none, refAdd, refRemove, refObjAdd }; - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; selectionModes selectionMode = none; void removeFromListWidget(QListWidget *w, QString name); @@ -67,7 +67,7 @@ protected: private: void setupButtonGroup(); void setupContextMenu(); - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void onButtonToggled(QAbstractButton *button, bool checked); void updateUI(); void supportChanged(const QString&); @@ -92,13 +92,13 @@ class TaskDlgShapeBinder : public Gui::TaskView::TaskDialog public: TaskDlgShapeBinder(ViewProviderShapeBinder *view,bool newObj=false); - ~TaskDlgShapeBinder(); + ~TaskDlgShapeBinder() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; protected: TaskShapeBinder *parameter; diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h index 6e7f34daa5..71777ce540 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h @@ -47,10 +47,10 @@ class TaskSketchBasedParameters : public PartDesignGui::TaskFeatureParameters, public: TaskSketchBasedParameters(PartDesignGui::ViewProvider* vp, QWidget *parent, const std::string& pixmapname, const QString& parname); - ~TaskSketchBasedParameters(); + ~TaskSketchBasedParameters() override; protected: - void onSelectionChanged(const Gui::SelectionChanges& msg)=0; + void onSelectionChanged(const Gui::SelectionChanges& msg) override =0; const QString onAddSelection(const Gui::SelectionChanges& msg); virtual void startReferenceSelection(App::DocumentObject* profile, App::DocumentObject* base); virtual void finishReferenceSelection(App::DocumentObject* profile, App::DocumentObject* base); @@ -80,13 +80,13 @@ class TaskDlgSketchBasedParameters : public PartDesignGui::TaskDlgFeatureParamet public: TaskDlgSketchBasedParameters(PartDesignGui::ViewProvider *vp); - ~TaskDlgSketchBasedParameters(); + ~TaskDlgSketchBasedParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h index 5d7f212de2..9f881aba15 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h @@ -37,7 +37,7 @@ class TaskThicknessParameters : public TaskDressUpParameters public: TaskThicknessParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); - ~TaskThicknessParameters(); + ~TaskThicknessParameters() override; double getValue(void) const; bool getReversed(void) const; @@ -51,13 +51,13 @@ private Q_SLOTS: void onJoinTypeChanged(int join); void onReversedChanged(bool reversed); void onIntersectionChanged(bool intersection); - void onRefDeleted(void); + void onRefDeleted(void) override; protected: - virtual void clearButtons(const selectionModes notThis); - bool event(QEvent *e); - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void clearButtons(const selectionModes notThis) override; + bool event(QEvent *e) override; + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: std::unique_ptr ui; @@ -70,11 +70,11 @@ class TaskDlgThicknessParameters : public TaskDlgDressUpParameters public: TaskDlgThicknessParameters(ViewProviderThickness *ThicknessView); - ~TaskDlgThicknessParameters(); + ~TaskDlgThicknessParameters() override; public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; }; } //namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index 44996230f7..048785487f 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -43,7 +43,7 @@ class TaskTransformedMessages : public Gui::TaskView::TaskBox public: TaskTransformedMessages(ViewProviderTransformed *transformedView); - ~TaskTransformedMessages(); + ~TaskTransformedMessages() override; void slotDiagnosis(QString msg); diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index f50b135e53..b2ba04dff5 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -126,7 +126,7 @@ public: TaskTransformedParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr); /// Constructor for task with parent task (MultiTransform mode) TaskTransformedParameters(TaskMultiTransformParameters *parentTask); - virtual ~TaskTransformedParameters(); + ~TaskTransformedParameters() override; /// Returns the originals property of associated top feeature object const std::vector & getOriginals(void) const; @@ -208,9 +208,9 @@ protected: virtual void addObject(App::DocumentObject*); virtual void removeObject(App::DocumentObject*); /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); - virtual void changeEvent(QEvent *e) = 0; - virtual void onSelectionChanged(const Gui::SelectionChanges& msg) = 0; + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; + void changeEvent(QEvent *e) override = 0; + void onSelectionChanged(const Gui::SelectionChanges& msg) override = 0; virtual void clearButtons()=0; static void removeItemFromListWidget(QListWidget* widget, const QString& itemstr); @@ -241,16 +241,16 @@ class TaskDlgTransformedParameters : public PartDesignGui::TaskDlgFeatureParamet public: TaskDlgTransformedParameters(ViewProviderTransformed *TransformedView); - virtual ~TaskDlgTransformedParameters() {} + ~TaskDlgTransformedParameters() override {} ViewProviderTransformed* getTransformedView() const { return static_cast(vp); } public: /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; protected: TaskTransformedParameters *parameter; TaskTransformedMessages *message; diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h index 1506f5eef2..aee7a80bc0 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.h +++ b/src/Mod/PartDesign/Gui/ViewProvider.h @@ -46,9 +46,9 @@ public: /// constructor ViewProvider(); /// destructor - virtual ~ViewProvider(); + ~ViewProvider() override; - virtual bool doubleClicked(void) override; + bool doubleClicked(void) override; void updateData(const App::Property*) override; void onChanged(const App::Property* prop) override; @@ -68,16 +68,16 @@ public: //Returns the ViewProvider of the body the feature belongs to, or NULL, if not in a body ViewProviderBody* getBodyViewProvider(); - virtual PyObject* getPyObject(void) override; + PyObject* getPyObject(void) override; - virtual QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override; + QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override; protected: - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; - virtual bool setEdit(int ModNum) override; - virtual void unsetEdit(int ModNum) override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; - virtual bool onDelete(const std::vector &) override; + bool onDelete(const std::vector &) override; /** * Returns a newly create dialog for the part to be placed in the task view diff --git a/src/Mod/PartDesign/Gui/ViewProviderAddSub.h b/src/Mod/PartDesign/Gui/ViewProviderAddSub.h index 4555113479..541479cd9d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderAddSub.h +++ b/src/Mod/PartDesign/Gui/ViewProviderAddSub.h @@ -37,10 +37,10 @@ public: /// constructor ViewProviderAddSub(); /// destructor - virtual ~ViewProviderAddSub(); + ~ViewProviderAddSub() override; - virtual void attach(App::DocumentObject*); - virtual void updateData(const App::Property*); + void attach(App::DocumentObject*) override; + void updateData(const App::Property*) override; protected: void updateAddSubShapeIndicator(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.h b/src/Mod/PartDesign/Gui/ViewProviderBase.h index 4fc55ff710..d18f6d1a4e 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBase.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBase.h @@ -36,14 +36,14 @@ public: /// constructor ViewProviderBase(); /// destructor - virtual ~ViewProviderBase(); + ~ViewProviderBase() override; - virtual bool doubleClicked(); - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); + bool doubleClicked() override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index 3650857d2f..f677ea894c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -50,25 +50,25 @@ public: /// constructor ViewProviderBody(); /// destructor - virtual ~ViewProviderBody(); + ~ViewProviderBody() override; App::PropertyEnumeration DisplayModeBody; - virtual void attach(App::DocumentObject *) override; + void attach(App::DocumentObject *) override; - virtual bool doubleClicked(void) override; - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; + bool doubleClicked(void) override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; - virtual std::vector< std::string > getDisplayModes(void) const override; - virtual void setDisplayMode(const char* ModeName) override; - virtual void setOverrideMode(const std::string& mode) override; + std::vector< std::string > getDisplayModes(void) const override; + void setDisplayMode(const char* ModeName) override; + void setOverrideMode(const std::string& mode) override; - virtual bool onDelete(const std::vector &) override; + bool onDelete(const std::vector &) override; /// Update the children's highlighting when triggered - virtual void updateData(const App::Property* prop) override; + void updateData(const App::Property* prop) override; ///unify children visuals - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; /// Update the sizes of origin and datums void updateOriginDatumSize (); @@ -80,11 +80,11 @@ public: SbBox3f getBoundBox (); /** Check whether objects can be added to the view provider by drag and drop */ - virtual bool canDropObjects() const override; + bool canDropObjects() const override; /** Check whether the object can be dropped to the view provider by drag and drop */ - virtual bool canDropObject(App::DocumentObject*) const override; + bool canDropObject(App::DocumentObject*) const override; /** Add an object to the view provider by drag and drop */ - virtual void dropObject(App::DocumentObject*) override; + void dropObject(App::DocumentObject*) override; protected: void slotChangedObjectApp ( const App::DocumentObject& obj, const App::Property& prop ); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h index 37ab9516f8..854f22d677 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h @@ -40,19 +40,19 @@ public: /// constructor ViewProviderBoolean(); /// destructor - virtual ~ViewProviderBoolean(); + ~ViewProviderBoolean() override; App::PropertyEnumeration Display; /// grouping handling void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &) override; - virtual void attach(App::DocumentObject*) override; - virtual void onChanged(const App::Property* prop) override; + bool onDelete(const std::vector &) override; + void attach(App::DocumentObject*) override; + void onChanged(const App::Property* prop) override; protected: - virtual bool setEdit(int ModNum) override; + bool setEdit(int ModNum) override; static const char* DisplayEnum[]; diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h index 680f2ea7a3..0918fcccd9 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h @@ -41,11 +41,11 @@ public: menuName = tr("Chamfer parameters");} /// return "Chamfer" - virtual const std::string & featureName() const; + const std::string & featureName() const override; protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.h b/src/Mod/PartDesign/Gui/ViewProviderDatum.h index 8fe61fb1b0..76af19a279 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.h @@ -42,29 +42,29 @@ class PartDesignGuiExport ViewProviderDatum : public Gui::ViewProviderGeometryOb { Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderDatum) PROPERTY_HEADER_WITH_EXTENSIONS(PartDesignGui::ViewProviderDatum); - + public: /// constructor ViewProviderDatum(); /// destructor - virtual ~ViewProviderDatum(); + ~ViewProviderDatum() override; /// grouping handling void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual void attach(App::DocumentObject *) override; - virtual bool onDelete(const std::vector &) override; - virtual bool doubleClicked(void) override; + void attach(App::DocumentObject *) override; + bool onDelete(const std::vector &) override; + bool doubleClicked(void) override; std::vector getDisplayModes(void) const override; void setDisplayMode(const char* ModeName) override; /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const override { return true; } + bool useNewSelectionModel(void) const override { return true; } /// indicates if the ViewProvider can be selected - virtual bool isSelectable(void) const override; + bool isSelectable(void) const override; /// return a hit element to the selection path or 0 - virtual std::string getElement(const SoDetail *) const override; - virtual SoDetail* getDetail(const char*) const override; + std::string getElement(const SoDetail *) const override; + SoDetail* getDetail(const char*) const override; /** * Enable/Disable the selectability of the datum @@ -91,7 +91,7 @@ public: /// The datum type (Plane, Line or Point) // TODO remove this attribute (2015-09-08, Fat-Zer) QString datumType; - QString datumText; + QString datumText; QString datumMenuText; /** @@ -114,8 +114,8 @@ public: static double marginFactor () { return 0.1; }; protected: - virtual bool setEdit(int ModNum) override; - virtual void unsetEdit(int ModNum) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; /** * Guesses the context this datum belongs to and returns appropriate bounding box of all diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h index 8e8a385e2a..9690e0ec55 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h @@ -47,16 +47,16 @@ public: /// Constructor ViewProviderDatumCoordinateSystem(); - virtual ~ViewProviderDatumCoordinateSystem(); + ~ViewProviderDatumCoordinateSystem() override; - virtual void attach ( App::DocumentObject *obj ); - virtual void updateData(const App::Property*); - virtual void onChanged(const App::Property*); + void attach ( App::DocumentObject *obj ) override; + void updateData(const App::Property*) override; + void onChanged(const App::Property*) override; - virtual void setExtents (Base::BoundBox3d bbox); + void setExtents (Base::BoundBox3d bbox) override; - virtual SoDetail* getDetail(const char* subelement) const; - virtual std::string getElement(const SoDetail* detail) const; + SoDetail* getDetail(const char* subelement) const override; + std::string getElement(const SoDetail* detail) const override; private: void setupLabels(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h index fde0c63ae0..9f26c4b541 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h @@ -38,12 +38,12 @@ class PartDesignGuiExport ViewProviderDatumLine : public PartDesignGui::ViewProv public: /// Constructor ViewProviderDatumLine(); - virtual ~ViewProviderDatumLine(); + ~ViewProviderDatumLine() override; - virtual void attach ( App::DocumentObject *obj ); - virtual void updateData(const App::Property*); + void attach ( App::DocumentObject *obj ) override; + void updateData(const App::Property*) override; - void setExtents (Base::BoundBox3d bbox); + void setExtents (Base::BoundBox3d bbox) override; void setExtents(double l); private: diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h index 3aa3ff28fc..88210ed9b7 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h @@ -36,12 +36,12 @@ class PartDesignGuiExport ViewProviderDatumPlane : public PartDesignGui::ViewPro public: /// Constructor ViewProviderDatumPlane(); - virtual ~ViewProviderDatumPlane(); + ~ViewProviderDatumPlane() override; - virtual void attach ( App::DocumentObject *obj ); - virtual void updateData(const App::Property*); + void attach ( App::DocumentObject *obj ) override; + void updateData(const App::Property*) override; - void setExtents (Base::BoundBox3d bbox); + void setExtents (Base::BoundBox3d bbox) override; void setExtents(double l, double w); private: diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h index 1df7d03981..162755ec81 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h @@ -36,14 +36,14 @@ class PartDesignGuiExport ViewProviderDatumPoint : public PartDesignGui::ViewPro public: /// Constructor ViewProviderDatumPoint(); - virtual ~ViewProviderDatumPoint(); + ~ViewProviderDatumPoint() override; - virtual void attach ( App::DocumentObject *obj ); + void attach ( App::DocumentObject *obj ) override; // Note: don't overload setExtents () here because point doesn't really depends on it protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h index 472feab588..bf3a84b146 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h @@ -42,11 +42,11 @@ public: menuName = tr("Draft parameters"); } /// return "Draft" - virtual const std::string & featureName() const; + const std::string & featureName() const override; protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h index 3c5c404c9d..7434d4d05d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h @@ -41,11 +41,11 @@ public: ViewProviderDressUp() {} /// destructor - virtual ~ViewProviderDressUp() + ~ViewProviderDressUp() override {} /// grouping handling - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; /// Highlight the references that have been selected void highlightReferences(const bool on); @@ -58,7 +58,7 @@ public: QString menuName; protected: - virtual bool setEdit(int ModNum); + bool setEdit(int ModNum) override; private: std::vector originalFaceColors; diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h index 25d380520c..7ac9e610b8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h @@ -41,11 +41,11 @@ public: menuName = tr("Fillet parameters"); } /// return "Fillet" - virtual const std::string & featureName() const; + const std::string & featureName() const override; protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.h b/src/Mod/PartDesign/Gui/ViewProviderGroove.h index 307d52a59c..feb15e8fc7 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderGroove.h +++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.h @@ -37,16 +37,16 @@ public: /// constructor ViewProviderGroove(); /// destructor - virtual ~ViewProviderGroove(); + ~ViewProviderGroove() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /** * Returns a newly created TaskDlgRevolutionParameters * NOTE: as for now groove and revolution share the dialog implementation */ - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.h b/src/Mod/PartDesign/Gui/ViewProviderHelix.h index 83dd7d6d55..1aca557bb7 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.h @@ -37,22 +37,22 @@ public: /// constructor ViewProviderHelix(); /// destructor - virtual ~ViewProviderHelix(); + ~ViewProviderHelix() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren(void)const override; - virtual bool onDelete(const std::vector &); + bool onDelete(const std::vector &) override; protected: - virtual QIcon getIcon(void) const; + QIcon getIcon(void) const override; /// Returns a newly created TaskDlgHelixParameters - virtual TaskDlgFeatureParameters *getEditDialog(); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + TaskDlgFeatureParameters *getEditDialog() override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.h b/src/Mod/PartDesign/Gui/ViewProviderHole.h index d5ab7db82a..23d84df167 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.h @@ -37,14 +37,14 @@ public: /// constructor ViewProviderHole(); /// destructor - virtual ~ViewProviderHole(); + ~ViewProviderHole() override; /// grouping handling - std::vector claimChildren()const; - void setupContextMenu(QMenu *menu, QObject *receiver, const char *member); - bool onDelete(const std::vector &s); + std::vector claimChildren()const override; + void setupContextMenu(QMenu *menu, QObject *receiver, const char *member) override; + bool onDelete(const std::vector &s) override; protected: - bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h index 9380a0bdf6..89f1babbed 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h @@ -40,7 +40,7 @@ public: protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.h b/src/Mod/PartDesign/Gui/ViewProviderLoft.h index 7c4dd1ec33..25a0210ecb 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.h @@ -42,22 +42,22 @@ public: /// constructor ViewProviderLoft(); /// destructor - virtual ~ViewProviderLoft(); + ~ViewProviderLoft() override; /// grouping handling - std::vector claimChildren(void)const; - void setupContextMenu(QMenu*, QObject*, const char*); + std::vector claimChildren(void)const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &); + bool onDelete(const std::vector &) override; void highlightProfile(bool on); void highlightSection(bool on); void highlightReferences(Reference mode, bool on); protected: - virtual QIcon getIcon(void) const; - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); - virtual TaskDlgFeatureParameters* getEditDialog(); + QIcon getIcon(void) const override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + TaskDlgFeatureParameters* getEditDialog() override; private: void highlightReferences(Part::Feature*, const std::vector&, bool); diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h index 9460852feb..f854bedcd5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h @@ -41,7 +41,7 @@ public: protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h index c547b99d82..27767ec4b0 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h @@ -39,14 +39,14 @@ public: sPixmap = "PartDesign_MultiTransform.svg"; } - std::vector claimChildren() const; - void setupContextMenu(QMenu*, QObject*, const char*); + std::vector claimChildren() const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &); + bool onDelete(const std::vector &) override; protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.h b/src/Mod/PartDesign/Gui/ViewProviderPad.h index f4465015d1..a772e20cc1 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.h @@ -36,13 +36,13 @@ public: /// constructor ViewProviderPad(); /// destructor - virtual ~ViewProviderPad(); + ~ViewProviderPad() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly created TaskDlgPadParameters - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h index 38ff14c8ac..b6351b3d8f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h @@ -43,22 +43,22 @@ public: /// constructor ViewProviderPipe(); /// destructor - virtual ~ViewProviderPipe(); + ~ViewProviderPipe() override; /// grouping handling - std::vector claimChildren()const; - void setupContextMenu(QMenu*, QObject*, const char*); + std::vector claimChildren()const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &); + bool onDelete(const std::vector &) override; void highlightReferences(Reference mode, bool on); protected: - virtual QIcon getIcon() const; - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + QIcon getIcon() const override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; /// Returns a newly created TaskDlgPipeParameters - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; private: void highlightReferences(Part::Feature*, const std::vector&, bool); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.h b/src/Mod/PartDesign/Gui/ViewProviderPocket.h index 9b22c2cc03..abf3eab605 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPocket.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.h @@ -37,13 +37,13 @@ public: /// constructor ViewProviderPocket(); /// destructor - virtual ~ViewProviderPocket(); + ~ViewProviderPocket() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly created TaskDlgPocketParameters - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h index dd8bb9b5b0..c339f3e827 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h @@ -41,7 +41,7 @@ public: protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h index 37a1975cd2..b5dcc8d983 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h @@ -36,16 +36,16 @@ public: /// constructor ViewProviderPrimitive(); /// destructor - virtual ~ViewProviderPrimitive(); + ~ViewProviderPrimitive() override; - virtual void attach(App::DocumentObject*); - virtual void updateData(const App::Property*); + void attach(App::DocumentObject*) override; + void updateData(const App::Property*) override; protected: - virtual QIcon getIcon(void) const; - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + QIcon getIcon(void) const override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; void updateAddSubShapeIndicator(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h index dcafe4115c..999f8d5293 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h @@ -37,13 +37,13 @@ public: /// constructor ViewProviderRevolution(); /// destructor - virtual ~ViewProviderRevolution(); + ~ViewProviderRevolution() override; - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly created TaskDlgRevolutionParameters - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h index da3fcf53ff..cad5f1182d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h @@ -41,7 +41,7 @@ public: protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 5c83b5da7b..a4492b4de8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -36,14 +36,14 @@ class PartDesignGuiExport ViewProviderShapeBinder : public PartGui::ViewProvider public: /// Constructor ViewProviderShapeBinder(); - virtual ~ViewProviderShapeBinder(); + ~ViewProviderShapeBinder() override; void setupContextMenu(QMenu*, QObject*, const char*) override; void highlightReferences(bool on); protected: - virtual bool setEdit(int ModNum) override; - virtual void unsetEdit(int ModNum) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; private: std::vector originalLineColors; @@ -69,11 +69,11 @@ public: const std::vector &) override; std::vector claimChildren() const override; - virtual bool doubleClicked() override; - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; - virtual bool setEdit(int ModNum) override; - virtual void attach(App::DocumentObject *obj) override; - virtual void onChanged(const App::Property *prop) override; + bool doubleClicked() override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; + bool setEdit(int ModNum) override; + void attach(App::DocumentObject *obj) override; + void onChanged(const App::Property *prop) override; private: enum { diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h index c6df4d3ae8..fadf9ea374 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h +++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h @@ -38,12 +38,12 @@ public: /// constructor ViewProviderSketchBased(); /// destructor - virtual ~ViewProviderSketchBased(); + ~ViewProviderSketchBased() override; /// grouping handling - std::vector claimChildren()const; + std::vector claimChildren()const override; - virtual bool onDelete(const std::vector &); + bool onDelete(const std::vector &) override; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h index 6ce2e9f00d..3e629ab22b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h @@ -41,11 +41,11 @@ public: menuName = tr("Thickness parameters"); } /// return "Thickness" - virtual const std::string & featureName() const; + const std::string & featureName() const override; protected: /// Returns a newly create dialog for the part to be placed in the task view - virtual TaskDlgFeatureParameters *getEditDialog(); + TaskDlgFeatureParameters *getEditDialog() override; }; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index 9c262e54df..6afa144049 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -39,12 +39,12 @@ public: ViewProviderTransformed() : featureName("undefined"), pcRejectedRoot(nullptr) {} /// destructor - virtual ~ViewProviderTransformed() + ~ViewProviderTransformed() override {} void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &) override; + bool onDelete(const std::vector &) override; /// signals if the transformation contains errors boost::signals2::signal signalDiagnosis; @@ -54,11 +54,11 @@ public: // Name of menu dialog QString menuName; - virtual Gui::ViewProvider *startEditing(int ModNum=0) override; + Gui::ViewProvider *startEditing(int ModNum=0) override; protected: - virtual bool setEdit(int ModNum) override; - virtual void unsetEdit(int ModNum) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; bool checkDlgOpen(TaskDlgTransformedParameters* transformedDlg); diff --git a/src/Mod/PartDesign/Gui/Workbench.h b/src/Mod/PartDesign/Gui/Workbench.h index 97975ea020..f09e012dd8 100644 --- a/src/Mod/PartDesign/Gui/Workbench.h +++ b/src/Mod/PartDesign/Gui/Workbench.h @@ -46,20 +46,20 @@ class PartDesignGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; /** Run some actions when the workbench gets activated. */ - virtual void activated(); + void activated() override; /** Run some actions when the workbench gets deactivated. */ - virtual void deactivated(); + void deactivated() override; /// Add custom entries to the context menu - virtual void setupContextMenu(const char* recipient, Gui::MenuItem*) const; + void setupContextMenu(const char* recipient, Gui::MenuItem*) const override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; private: /// Refresh the Body's highlighting when a document becomes active diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp index 37e0fe5e0f..675f796afe 100644 --- a/src/Mod/Path/App/AppPathPy.cpp +++ b/src/Mod/Path/App/AppPathPy.cpp @@ -97,7 +97,7 @@ namespace Path { { initialize("Working with Voronoi diagrams and data structures"); } - virtual ~VoronoiModule() {} + ~VoronoiModule() override {} }; class Module : public Py::ExtensionModule @@ -144,7 +144,7 @@ namespace Path { PyModule_AddObject(m_module, "Voronoi", voronoi.module().ptr()); } - virtual ~Module() {} + ~Module() override {} private: diff --git a/src/Mod/Path/App/Area.h b/src/Mod/Path/App/Area.h index 12da5df313..564a3b1b56 100644 --- a/src/Mod/Path/App/Area.h +++ b/src/Mod/Path/App/Area.h @@ -173,7 +173,7 @@ public: Area(const AreaParams* params = nullptr); Area(const Area& other, bool deep_copy = true); - virtual ~Area(); + ~Area() override; bool isBuilt() const; diff --git a/src/Mod/Path/App/FeatureArea.h b/src/Mod/Path/App/FeatureArea.h index 7febfa77c2..6bef2544fb 100644 --- a/src/Mod/Path/App/FeatureArea.h +++ b/src/Mod/Path/App/FeatureArea.h @@ -41,18 +41,18 @@ class PathExport FeatureArea : public Part::Feature public: /// Constructor FeatureArea(); - virtual ~FeatureArea(); + ~FeatureArea() override; Area &getArea(); const std::vector &getShapes(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PathGui::ViewProviderArea"; } - virtual App::DocumentObjectExecReturn *execute(); - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + PyObject *getPyObject() override; App::PropertyLinkList Sources; Part::PropertyPartShape WorkPlane; @@ -82,10 +82,10 @@ public: std::list getShapes(); - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PathGui::ViewProviderAreaView"; } - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; App::PropertyLink Source; App::PropertyInteger SectionIndex; diff --git a/src/Mod/Path/App/Path.cpp b/src/Mod/Path/App/Path.cpp index 426d376616..0d026c51c2 100644 --- a/src/Mod/Path/App/Path.cpp +++ b/src/Mod/Path/App/Path.cpp @@ -220,21 +220,21 @@ public: BoundBoxSegmentVisitor() { } - virtual void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) + void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) override { (void)id; processPt(last); processPts(pts); processPt(next); } - virtual void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) + void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) override { (void)id; processPt(last); processPts(pts); processPt(next); } - virtual void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, const Base::Vector3d ¢er) + void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, const Base::Vector3d ¢er) override { (void)id; (void)center; @@ -242,8 +242,8 @@ public: processPts(pts); processPt(next); } - virtual void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, - const std::deque &p, const std::deque &q) + void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, + const std::deque &p, const std::deque &q) override { (void)id; (void)q; // always within the bounds of p @@ -252,7 +252,7 @@ public: processPts(p); processPt(next); } - virtual void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) + void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) override { (void)id; processPt(last); diff --git a/src/Mod/Path/Gui/AppPathGuiPy.cpp b/src/Mod/Path/Gui/AppPathGuiPy.cpp index b9f8c4a8cf..54ee0e7bb5 100644 --- a/src/Mod/Path/Gui/AppPathGuiPy.cpp +++ b/src/Mod/Path/Gui/AppPathGuiPy.cpp @@ -63,7 +63,7 @@ public: initialize("This module is the PathGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object open(const Py::Tuple& args) diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.h b/src/Mod/Path/Gui/DlgProcessorChooser.h index 7ba234350c..1c190facbf 100644 --- a/src/Mod/Path/Gui/DlgProcessorChooser.h +++ b/src/Mod/Path/Gui/DlgProcessorChooser.h @@ -37,12 +37,12 @@ class DlgProcessorChooser : public QDialog public: DlgProcessorChooser(std::vector &scriptnames, bool withArguments = false); - ~DlgProcessorChooser(); + ~DlgProcessorChooser() override; std::string getProcessor(); std::string getArguments(); - void accept(); + void accept() override; protected Q_SLOTS: diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.h b/src/Mod/Path/Gui/DlgSettingsPathColor.h index 81484e3b5d..262f2b51a5 100644 --- a/src/Mod/Path/Gui/DlgSettingsPathColor.h +++ b/src/Mod/Path/Gui/DlgSettingsPathColor.h @@ -36,13 +36,13 @@ class DlgSettingsPathColor : public Gui::Dialog::PreferencePage public: DlgSettingsPathColor(QWidget* parent = nullptr); - ~DlgSettingsPathColor(); + ~DlgSettingsPathColor() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/Path/Gui/TaskDlgPathCompound.h index b62683a8fc..8cbebd20ba 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.h +++ b/src/Mod/Path/Gui/TaskDlgPathCompound.h @@ -42,12 +42,12 @@ class TaskWidgetPathCompound : public Gui::TaskView::TaskBox public: TaskWidgetPathCompound(ViewProviderPathCompound *CompoundView, QWidget *parent=nullptr); - ~TaskWidgetPathCompound(); + ~TaskWidgetPathCompound() override; std::vector getList() const; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: QWidget* proxy; diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index 2b63d14682..0d8a10e6d4 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -90,7 +90,7 @@ public: } } - void onSelectionChanged(const Gui::SelectionChanges& msg) { + void onSelectionChanged(const Gui::SelectionChanges& msg) override { if(msg.Type == Gui::SelectionChanges::RmvPreselect) { setArrow(); return; @@ -492,33 +492,33 @@ public: command2Edge.resize(tp.getSize(),-1); } - virtual void setup(const Base::Vector3d &last) + void setup(const Base::Vector3d &last) override { points.push_back(last); markers.push_back(last); } - virtual void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) + void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) override { (void)last; gx(id, &next, pts, 0); } - virtual void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) + void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts) override { (void)last; gx(id, &next, pts, 1); } - virtual void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, const Base::Vector3d ¢er) + void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, const Base::Vector3d ¢er) override { (void)last; gx(id, &next, pts, 1); markers.push_back(center); } - virtual void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, - const std::deque &p, const std::deque &q) + void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque &pts, + const std::deque &p, const std::deque &q) override { (void)last; @@ -547,7 +547,7 @@ public: pushCommand(id); } - virtual void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) + void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) override { #if 0 Base::Vector3d p1(next.x,next.y,last.z); diff --git a/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp b/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp index 9079e8aef0..1d19fb21a2 100644 --- a/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp +++ b/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp @@ -46,7 +46,7 @@ public: initialize("This module is the PathSimulator module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Points/App/AppPointsPy.cpp b/src/Mod/Points/App/AppPointsPy.cpp index 22fa85c128..aba6213f94 100644 --- a/src/Mod/Points/App/AppPointsPy.cpp +++ b/src/Mod/Points/App/AppPointsPy.cpp @@ -64,7 +64,7 @@ public: initialize("This module is the Points module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: std::tuple readE57Settings() const diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h index eaa0ae5eaa..fe729a37c3 100644 --- a/src/Mod/Points/App/Points.h +++ b/src/Mod/Points/App/Points.h @@ -61,7 +61,7 @@ public: resize(size); } PointKernel(const PointKernel&); - virtual ~PointKernel() + ~PointKernel() override { } @@ -73,14 +73,14 @@ public: * List of different subelement types * its NOT a list of the subelements itself */ - virtual std::vector getElementTypes() const; - virtual unsigned long countSubElements(const char* Type) const; + std::vector getElementTypes() const override; + unsigned long countSubElements(const char* Type) const override; /// get the subelement by type and number - virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; + Data::Segment* getSubElement(const char* Type, unsigned long) const override; //@} - inline void setTransform(const Base::Matrix4D& rclTrf){_Mtrx = rclTrf;} - inline Base::Matrix4D getTransform() const{return _Mtrx;} + inline void setTransform(const Base::Matrix4D& rclTrf) override{_Mtrx = rclTrf;} + inline Base::Matrix4D getTransform() const override{return _Mtrx;} std::vector& getBasicPoints() { return this->_Points; } const std::vector& getBasicPoints() const @@ -90,20 +90,20 @@ public: void swap(std::vector& pts) { this->_Points.swap(pts); } - virtual void getPoints(std::vector &Points, + void getPoints(std::vector &Points, std::vector &Normals, - float Accuracy, uint16_t flags=0) const; - virtual void transformGeometry(const Base::Matrix4D &rclMat); - virtual Base::BoundBox3d getBoundBox()const; + float Accuracy, uint16_t flags=0) const override; + void transformGeometry(const Base::Matrix4D &rclMat) override; + Base::BoundBox3d getBoundBox()const override; /** @name I/O */ //@{ // Implemented from Persistence - unsigned int getMemSize () const; - void Save (Base::Writer &writer) const; - void SaveDocFile (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); - void RestoreDocFile(Base::Reader &reader); + unsigned int getMemSize () const override; + void Save (Base::Writer &writer) const override; + void SaveDocFile (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; + void RestoreDocFile(Base::Reader &reader) override; void save(const char* file) const; void save(std::ostream&) const; void load(const char* file); diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp index 20594a9f32..785550b74f 100644 --- a/src/Mod/Points/App/PointsAlgos.cpp +++ b/src/Mod/Points/App/PointsAlgos.cpp @@ -228,7 +228,7 @@ private: template class ConverterT : public Converter { public: - virtual std::string toString(double f) const { + std::string toString(double f) const override { T c = static_cast(f); std::ostringstream oss; oss.precision(7); @@ -236,12 +236,12 @@ public: oss << c; return oss.str(); } - virtual double toDouble(Base::InputStream& str) const { + double toDouble(Base::InputStream& str) const override { T c; str >> c; return static_cast(c); } - virtual int getSizeOf() const { + int getSizeOf() const override { return sizeof(T); } }; @@ -256,35 +256,35 @@ public: _end = data.size(); _cur = 0; } - ~DataStreambuf() { + ~DataStreambuf() override { } protected: - virtual int_type uflow() { + int_type uflow() override { if (_cur == _end) return traits_type::eof(); return static_cast(_buffer[_cur++]) & 0x000000ff; } - virtual int_type underflow() { + int_type underflow() override { if (_cur == _end) return traits_type::eof(); return static_cast(_buffer[_cur]) & 0x000000ff; } - virtual int_type pbackfail(int_type ch) { + int_type pbackfail(int_type ch) override { if (_cur == _beg || (ch != traits_type::eof() && ch != _buffer[_cur-1])) return traits_type::eof(); return static_cast(_buffer[--_cur]) & 0x000000ff; } - virtual std::streamsize showmanyc() { + std::streamsize showmanyc() override { return _end - _cur; } - virtual pos_type seekoff(std::streambuf::off_type off, + pos_type seekoff(std::streambuf::off_type off, std::ios_base::seekdir way, std::ios_base::openmode = - std::ios::in | std::ios::out) { + std::ios::in | std::ios::out) override { int p_pos=-1; if (way == std::ios_base::beg) p_pos = _beg; @@ -303,9 +303,9 @@ protected: return ((p_pos+off) - _beg); } - virtual pos_type seekpos(std::streambuf::pos_type pos, + pos_type seekpos(std::streambuf::pos_type pos, std::ios_base::openmode which = - std::ios::in | std::ios::out) { + std::ios::in | std::ios::out) override { (void)which; return seekoff(pos, std::ios_base::beg); } diff --git a/src/Mod/Points/App/PointsAlgos.h b/src/Mod/Points/App/PointsAlgos.h index 4ade5608a3..cde6cfa53a 100644 --- a/src/Mod/Points/App/PointsAlgos.h +++ b/src/Mod/Points/App/PointsAlgos.h @@ -76,16 +76,16 @@ class AscReader : public Reader { public: AscReader(); - ~AscReader(); - void read(const std::string& filename); + ~AscReader() override; + void read(const std::string& filename) override; }; class PlyReader : public Reader { public: PlyReader(); - ~PlyReader(); - void read(const std::string& filename); + ~PlyReader() override; + void read(const std::string& filename) override; private: std::size_t readHeader(std::istream&, std::string& format, std::size_t& offset, @@ -102,8 +102,8 @@ class PcdReader : public Reader { public: PcdReader(); - ~PcdReader(); - void read(const std::string& filename); + ~PcdReader() override; + void read(const std::string& filename) override; private: std::size_t readHeader(std::istream&, std::string& format, std::vector& fields, @@ -119,8 +119,8 @@ class E57Reader : public Reader { public: E57Reader(const bool& Color, const bool& State, const float& Distance); - ~E57Reader(); - void read(const std::string& filename); + ~E57Reader() override; + void read(const std::string& filename) override; protected: bool useColor, checkState; float minDistance; @@ -153,24 +153,24 @@ class AscWriter : public Writer { public: AscWriter(const PointKernel&); - ~AscWriter(); - void write(const std::string& filename); + ~AscWriter() override; + void write(const std::string& filename) override; }; class PlyWriter : public Writer { public: PlyWriter(const PointKernel&); - ~PlyWriter(); - void write(const std::string& filename); + ~PlyWriter() override; + void write(const std::string& filename) override; }; class PcdWriter : public Writer { public: PcdWriter(const PointKernel&); - ~PcdWriter(); - void write(const std::string& filename); + ~PcdWriter() override; + void write(const std::string& filename) override; }; } // namespace Points diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h index c171334ac4..dc2c3c0f8b 100644 --- a/src/Mod/Points/App/PointsFeature.h +++ b/src/Mod/Points/App/PointsFeature.h @@ -56,25 +56,25 @@ class PointsExport Feature : public App::GeoFeature public: /// Constructor Feature(); - virtual ~Feature(); + ~Feature() override; /** @name methods override Feature */ //@{ - void Restore(Base::XMLReader &reader); - void RestoreDocFile(Base::Reader &reader); - short mustExecute() const; + void Restore(Base::XMLReader &reader) override; + void RestoreDocFile(Base::Reader &reader) override; + short mustExecute() const override; /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PointsGui::ViewProviderScattered"; } - virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const { + const App::PropertyComplexGeoData* getPropertyOfGeometry() const override { return &Points; } protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; //@} public: diff --git a/src/Mod/Points/App/Properties.h b/src/Mod/Points/App/Properties.h index dc5c4a2ddf..4909011799 100644 --- a/src/Mod/Points/App/Properties.h +++ b/src/Mod/Points/App/Properties.h @@ -50,7 +50,7 @@ public: PropertyGreyValue() { } - virtual ~PropertyGreyValue() + ~PropertyGreyValue() override { } }; @@ -61,10 +61,10 @@ class PointsExport PropertyGreyValueList: public App::PropertyLists public: PropertyGreyValueList(); - virtual ~PropertyGreyValueList(); + ~PropertyGreyValueList() override; - virtual void setSize(int newSize); - virtual int getSize() const; + void setSize(int newSize) override; + int getSize() const override; /** Sets the property */ @@ -84,18 +84,18 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual App::Property *Copy() const; - virtual void Paste(const App::Property &from); - virtual unsigned int getMemSize () const; + App::Property *Copy() const override; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; /** @name Modify */ //@{ @@ -112,10 +112,10 @@ class PointsExport PropertyNormalList: public App::PropertyLists public: PropertyNormalList(); - ~PropertyNormalList(); + ~PropertyNormalList() override; - virtual void setSize(int newSize); - virtual int getSize() const; + void setSize(int newSize) override; + int getSize() const override; void setValue(const Base::Vector3f&); void setValue(float x, float y, float z); @@ -134,19 +134,19 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save (Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual void SaveDocFile (Base::Writer &writer) const; - virtual void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; - virtual App::Property *Copy() const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize () const; + unsigned int getMemSize () const override; /** @name Modify */ //@{ @@ -182,12 +182,12 @@ public: public: PropertyCurvatureList(); - ~PropertyCurvatureList(); + ~PropertyCurvatureList() override; - void setSize(int newSize) { + void setSize(int newSize) override { _lValueList.resize(newSize); } - int getSize() const { + int getSize() const override { return _lValueList.size(); } void setValue(const CurvatureInfo&); @@ -205,25 +205,25 @@ public: return _lValueList; } - virtual PyObject *getPyObject(); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; //@} /** @name Undo/Redo */ //@{ /// returns a new copy of the property (mainly for Undo/Redo and transactions) - App::Property *Copy() const; + App::Property *Copy() const override; /// paste the value from the property (mainly for Undo/Redo and transactions) - void Paste(const App::Property &from); - unsigned int getMemSize () const; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; //@} /** @name Modify */ diff --git a/src/Mod/Points/App/PropertyPointKernel.h b/src/Mod/Points/App/PropertyPointKernel.h index 23b01a837b..89ff5c076a 100644 --- a/src/Mod/Points/App/PropertyPointKernel.h +++ b/src/Mod/Points/App/PropertyPointKernel.h @@ -37,7 +37,7 @@ class PointsExport PropertyPointKernel : public App::PropertyComplexGeoData public: PropertyPointKernel(); - ~PropertyPointKernel(); + ~PropertyPointKernel() override; /** @name Getter/setter */ //@{ @@ -45,38 +45,38 @@ public: void setValue( const PointKernel& m); /// get the points (only const possible!) const PointKernel &getValue() const; - const Data::ComplexGeoData* getComplexData() const; - void setTransform(const Base::Matrix4D& rclTrf); - Base::Matrix4D getTransform() const; + const Data::ComplexGeoData* getComplexData() const override; + void setTransform(const Base::Matrix4D& rclTrf) override; + Base::Matrix4D getTransform() const override; //@} /** @name Getting basic geometric entities */ //@{ /** Returns the bounding box around the underlying mesh kernel */ - Base::BoundBox3d getBoundingBox() const; + Base::BoundBox3d getBoundingBox() const override; //@} /** @name Python interface */ //@{ - PyObject* getPyObject(); - void setPyObject(PyObject *value); + PyObject* getPyObject() override; + void setPyObject(PyObject *value) override; //@} /** @name Undo/Redo */ //@{ /// returns a new copy of the property (mainly for Undo/Redo and transactions) - App::Property *Copy() const; + App::Property *Copy() const override; /// paste the value from the property (mainly for Undo/Redo and transactions) - void Paste(const App::Property &from); - unsigned int getMemSize () const; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; //@} /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); - void SaveDocFile (Base::Writer &writer) const; - void RestoreDocFile(Base::Reader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; + void SaveDocFile (Base::Writer &writer) const override; + void RestoreDocFile(Base::Reader &reader) override; //@} /** @name Modification */ @@ -84,7 +84,7 @@ public: PointKernel* startEditing(); void finishEditing(); /// Transform the real 3d point kernel - void transformGeometry(const Base::Matrix4D &rclMat); + void transformGeometry(const Base::Matrix4D &rclMat) override; void removeIndices( const std::vector& ); //@} diff --git a/src/Mod/Points/App/Structured.h b/src/Mod/Points/App/Structured.h index 9acf72c20a..6a00418d9c 100644 --- a/src/Mod/Points/App/Structured.h +++ b/src/Mod/Points/App/Structured.h @@ -41,7 +41,7 @@ class PointsExport Structured : public Feature public: /// Constructor Structured(); - virtual ~Structured(); + ~Structured() override; App::PropertyInteger Width; /**< The width of the structured cloud. */ App::PropertyInteger Height; /**< The height of the structured cloud. */ @@ -49,9 +49,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "PointsGui::ViewProviderStructured"; } //@} diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp index d55bdaa2ac..ca8c32f89c 100644 --- a/src/Mod/Points/Gui/AppPointsGui.cpp +++ b/src/Mod/Points/Gui/AppPointsGui.cpp @@ -57,7 +57,7 @@ public: initialize("This module is the PointsGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h index 6d7b17f88c..4a3f737d3e 100644 --- a/src/Mod/Points/Gui/DlgPointsReadImp.h +++ b/src/Mod/Points/Gui/DlgPointsReadImp.h @@ -39,7 +39,7 @@ class DlgPointsReadImp : public QDialog public: DlgPointsReadImp(const char *FileName, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); - ~DlgPointsReadImp(); + ~DlgPointsReadImp() override; private: std::unique_ptr ui; diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h index c4bc4d05ec..f114d3639c 100644 --- a/src/Mod/Points/Gui/ViewProvider.h +++ b/src/Mod/Points/Gui/ViewProvider.h @@ -60,8 +60,8 @@ class ViewProviderPointsBuilder : public Gui::ViewProviderBuilder { public: ViewProviderPointsBuilder(){} - ~ViewProviderPointsBuilder(){} - virtual void buildNodes(const App::Property*, std::vector&) const; + ~ViewProviderPointsBuilder() override{} + void buildNodes(const App::Property*, std::vector&) const override; void createPoints(const App::Property*, SoCoordinate3*, SoPointSet*) const; void createPoints(const App::Property*, SoCoordinate3*, SoIndexedPointSet*) const; }; @@ -77,26 +77,26 @@ class PointsGuiExport ViewProviderPoints : public Gui::ViewProviderGeometryObjec public: ViewProviderPoints(); - virtual ~ViewProviderPoints(); + ~ViewProviderPoints() override; App::PropertyFloatConstraint PointSize; /// set the viewing mode - virtual void setDisplayMode(const char* ModeName); + void setDisplayMode(const char* ModeName) override; /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; - virtual QIcon getIcon() const; + std::vector getDisplayModes() const override; + QIcon getIcon() const override; /// Sets the edit mnode - bool setEdit(int ModNum); + bool setEdit(int ModNum) override; /// Unsets the edit mode - void unsetEdit(int ModNum); + void unsetEdit(int ModNum) override; public: static void clipPointsCallback(void * ud, SoEventCallback * n); protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; void setVertexColorMode(App::PropertyColorList*); void setVertexGreyvalueMode(Points::PropertyGreyValueList*); void setVertexNormalMode(Points::PropertyNormalList*); @@ -124,18 +124,18 @@ class PointsGuiExport ViewProviderScattered : public ViewProviderPoints public: ViewProviderScattered(); - virtual ~ViewProviderScattered(); + ~ViewProviderScattered() override; /** * Extracts the point data from the feature \a pcFeature and creates * an Inventor node \a SoNode with these data. */ - virtual void attach(App::DocumentObject *); + void attach(App::DocumentObject *) override; /// Update the point representation - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual void cut(const std::vector& picked, Gui::View3DInventorViewer &Viewer); + void cut(const std::vector& picked, Gui::View3DInventorViewer &Viewer) override; protected: SoPointSet * pcPoints; @@ -152,18 +152,18 @@ class PointsGuiExport ViewProviderStructured : public ViewProviderPoints public: ViewProviderStructured(); - virtual ~ViewProviderStructured(); + ~ViewProviderStructured() override; /** * Extracts the point data from the feature \a pcFeature and creates * an Inventor node \a SoNode with these data. */ - virtual void attach(App::DocumentObject *); + void attach(App::DocumentObject *) override; /// Update the point representation - virtual void updateData(const App::Property*); + void updateData(const App::Property*) override; protected: - virtual void cut(const std::vector& picked, Gui::View3DInventorViewer &Viewer); + void cut(const std::vector& picked, Gui::View3DInventorViewer &Viewer) override; protected: SoIndexedPointSet * pcPoints; diff --git a/src/Mod/Points/Gui/Workbench.h b/src/Mod/Points/Gui/Workbench.h index 0862a6d113..9e204ab39b 100644 --- a/src/Mod/Points/Gui/Workbench.h +++ b/src/Mod/Points/Gui/Workbench.h @@ -38,12 +38,12 @@ class PointsGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; - Gui::MenuItem* setupMenuBar() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; + Gui::MenuItem* setupMenuBar() const override; }; } // namespace PointsGui diff --git a/src/Mod/Raytracing/App/AppRaytracingPy.cpp b/src/Mod/Raytracing/App/AppRaytracingPy.cpp index 379314a107..a5877cdf42 100644 --- a/src/Mod/Raytracing/App/AppRaytracingPy.cpp +++ b/src/Mod/Raytracing/App/AppRaytracingPy.cpp @@ -67,7 +67,7 @@ public: initialize("This module is the Raytracing module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object writeProjectFile(const Py::Tuple& args) diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h index c5b9908085..2ae94e7950 100644 --- a/src/Mod/Raytracing/App/LuxFeature.h +++ b/src/Mod/Raytracing/App/LuxFeature.h @@ -52,12 +52,12 @@ public: /** @name methods override Feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(void) override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "Gui::ViewProviderDocumentObject"; } //@} diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h index e67247a7ed..3dabc08226 100644 --- a/src/Mod/Raytracing/App/LuxProject.h +++ b/src/Mod/Raytracing/App/LuxProject.h @@ -55,13 +55,13 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); - short mustExecute() const; - const char* getViewProviderName(void) const { + App::DocumentObjectExecReturn *execute(void) override; + short mustExecute() const override; + const char* getViewProviderName(void) const override { return "RaytracingGui::ViewProviderLux"; } /// get called after a document has been fully restored - virtual void onDocumentRestored(); + void onDocumentRestored() override; //@} diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h index 38890a3e56..5be4372d33 100644 --- a/src/Mod/Raytracing/App/RayFeature.h +++ b/src/Mod/Raytracing/App/RayFeature.h @@ -52,12 +52,12 @@ public: /** @name methods override Feature */ //@{ - short mustExecute() const; + short mustExecute() const override; /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(void) override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "Gui::ViewProviderDocumentObject"; } //@} diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h index 401d9d74bf..f383da90ec 100644 --- a/src/Mod/Raytracing/App/RayProject.h +++ b/src/Mod/Raytracing/App/RayProject.h @@ -54,13 +54,13 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void); - short mustExecute() const; - const char* getViewProviderName(void) const { + App::DocumentObjectExecReturn *execute(void) override; + short mustExecute() const override; + const char* getViewProviderName(void) const override { return "RaytracingGui::ViewProviderPovray"; } /// get called after a document has been fully restored - virtual void onDocumentRestored(); + void onDocumentRestored() override; //@} diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h index 61ff34f17e..96789ca2cb 100644 --- a/src/Mod/Raytracing/App/RaySegment.h +++ b/src/Mod/Raytracing/App/RaySegment.h @@ -46,7 +46,7 @@ class RaytracingExport RaySegment: public App::DocumentObject public: /// Constructor RaySegment(void); - virtual ~RaySegment(); + ~RaySegment() override; App::PropertyString Result; @@ -54,10 +54,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(void) override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "Gui::ViewProviderDocumentObject"; } //@} diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp index d797d5d4e0..4d66397974 100644 --- a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp +++ b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp @@ -69,7 +69,7 @@ public: initialize("This module is the RaytracingGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object open(const Py::Tuple& args) diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h index fd0922fa20..f544804696 100644 --- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h +++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h @@ -41,12 +41,12 @@ class DlgSettingsRayImp : public Gui::Dialog::PreferencePage public: DlgSettingsRayImp( QWidget* parent = nullptr ); - ~DlgSettingsRayImp(); + ~DlgSettingsRayImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Raytracing/Gui/ViewProvider.h b/src/Mod/Raytracing/Gui/ViewProvider.h index 8550e67077..bd8199ee05 100644 --- a/src/Mod/Raytracing/Gui/ViewProvider.h +++ b/src/Mod/Raytracing/Gui/ViewProvider.h @@ -37,14 +37,14 @@ class ViewProviderLux : public Gui::ViewProviderDocumentObjectGroup public: ViewProviderLux(); - virtual ~ViewProviderLux(); + ~ViewProviderLux() override; - bool doubleClicked(void); - void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); + bool doubleClicked(void) override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; class ViewProviderPovray : public Gui::ViewProviderDocumentObjectGroup @@ -54,14 +54,14 @@ class ViewProviderPovray : public Gui::ViewProviderDocumentObjectGroup public: ViewProviderPovray(); - virtual ~ViewProviderPovray(); + ~ViewProviderPovray() override; - bool doubleClicked(void); - void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); + bool doubleClicked(void) override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; } // namespace RaytracingGui diff --git a/src/Mod/Raytracing/Gui/Workbench.h b/src/Mod/Raytracing/Gui/Workbench.h index a3b1b80873..3dec94b4b4 100644 --- a/src/Mod/Raytracing/Gui/Workbench.h +++ b/src/Mod/Raytracing/Gui/Workbench.h @@ -37,11 +37,11 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; }; } // namespace RaytracingGui diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index 8d57bca24d..4fa5de04a8 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -147,7 +147,7 @@ public: initialize("This module is the ReverseEngineering module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object approxSurface(const Py::Tuple& args, const Py::Dict& kwds) diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h index eb7f764053..75865b5fbc 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.h +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h @@ -190,7 +190,7 @@ public: * @param fParam Parameter value * @return ValueT */ - virtual ValueT LocalSupport(int iIndex, double fParam); + ValueT LocalSupport(int iIndex, double fParam) override; /** * Calculates the function value Nik(t) at the point fParam @@ -199,7 +199,7 @@ public: * @param fParam Parameter value * @return Function value Nik(t) */ - virtual double BasisFunction(int iIndex, double fParam); + double BasisFunction(int iIndex, double fParam) override; /** * Calculates the function values of the first iMaxDer derivatives at the point fParam @@ -211,13 +211,13 @@ public: * The list must be sufficiently long for iMaxDer+1 elements. * @return List of function values */ - virtual void DerivativesOfBasisFunction(int iIndex, int iMaxDer, double fParam, - TColStd_Array1OfReal& Derivat); + void DerivativesOfBasisFunction(int iIndex, int iMaxDer, double fParam, + TColStd_Array1OfReal& Derivat) override; /** * Calculates the kth derivative at the point fParam */ - virtual double DerivativeOfBasisFunction(int iIndex, int k, double fParam); + double DerivativeOfBasisFunction(int iIndex, int k, double fParam) override; /** * Calculates the integral of the product of two B-splines or their derivatives. @@ -229,7 +229,7 @@ public: /** * Destructor */ - virtual~ BSplineBasis(); + ~ BSplineBasis() override; protected: @@ -375,7 +375,7 @@ public: unsigned usUCtrlpoints=6, //Qty. of the control points in u-direction unsigned usVCtrlpoints=6); //Qty. of the control points in v-direction - virtual ~BSplineParameterCorrection(){} + ~BSplineParameterCorrection() override{} protected: /** @@ -386,18 +386,18 @@ protected: /** * Carries out a parameter correction. */ - virtual void DoParameterCorrection(int iIter); + void DoParameterCorrection(int iIter) override; /** * Solve an overdetermined LGS with the help of the Householder-Tansformation */ - virtual bool SolveWithoutSmoothing(); + bool SolveWithoutSmoothing() override; /** * Solve a regular system of equations by LU decomposition. Depending on the weighting, * smoothing terms are included */ - virtual bool SolveWithSmoothing(double fWeight); + bool SolveWithSmoothing(double fWeight) override; public: /** @@ -443,7 +443,7 @@ public: /** * Use smoothing-terms */ - virtual void EnableSmoothing(bool bSmooth=true, double fSmoothInfl=1.0f); + void EnableSmoothing(bool bSmooth=true, double fSmoothInfl=1.0f) override; /** * Use smoothing-terms diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 94cc7e1cca..c298cc3c88 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -52,7 +52,7 @@ public: initialize("This module is the ReverseEngineeringGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h index 6a06585a5a..a22d650a7e 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h @@ -36,14 +36,14 @@ class FitBSplineSurfaceWidget : public QWidget public: FitBSplineSurfaceWidget(const App::DocumentObjectT&, QWidget* parent = nullptr); - ~FitBSplineSurfaceWidget(); + ~FitBSplineSurfaceWidget() override; bool accept(); private: void restoreSettings(); void saveSettings(); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private Q_SLOTS: void on_makePlacement_clicked(); @@ -59,13 +59,13 @@ class TaskFitBSplineSurface : public Gui::TaskView::TaskDialog public: TaskFitBSplineSurface(const App::DocumentObjectT&); - ~TaskFitBSplineSurface(); + ~TaskFitBSplineSurface() override; public: - void open(); - bool accept(); + void open() override; + bool accept() override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.h b/src/Mod/ReverseEngineering/Gui/Poisson.h index eb8e3ed9e7..37426efd02 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.h +++ b/src/Mod/ReverseEngineering/Gui/Poisson.h @@ -36,12 +36,12 @@ class PoissonWidget : public QWidget public: PoissonWidget(const App::DocumentObjectT&, QWidget* parent = nullptr); - ~PoissonWidget(); + ~PoissonWidget() override; bool accept(); private: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -54,13 +54,13 @@ class TaskPoisson : public Gui::TaskView::TaskDialog public: TaskPoisson(const App::DocumentObjectT&); - ~TaskPoisson(); + ~TaskPoisson() override; public: - void open(); - bool accept(); + void open() override; + bool accept() override; - QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h index 8c684b6074..69a975bd40 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.h +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h @@ -42,11 +42,11 @@ class Segmentation : public QWidget public: Segmentation(Mesh::Feature* mesh, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~Segmentation(); + ~Segmentation() override; void accept(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; @@ -60,12 +60,12 @@ class TaskSegmentation : public Gui::TaskView::TaskDialog { public: TaskSegmentation(Mesh::Feature* mesh); - ~TaskSegmentation(); + ~TaskSegmentation() override; public: - bool accept(); + bool accept() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index 86fcde49c9..b74cf583b9 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -44,7 +44,7 @@ class SegmentationManual : public QWidget public: SegmentationManual(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~SegmentationManual(); + ~SegmentationManual() override; void reject(); void createSegment(); @@ -62,7 +62,7 @@ public Q_SLOTS: void on_sphereDetect_clicked(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: class Private; @@ -81,17 +81,17 @@ class TaskSegmentationManual : public Gui::TaskView::TaskDialog public: TaskSegmentationManual(); - ~TaskSegmentationManual(); + ~TaskSegmentationManual() override; public: - bool accept(); - void clicked(int); + bool accept() override; + void clicked(int) override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Close; } - virtual bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument(void) const override { return true; } - virtual void modifyStandardButtons(QDialogButtonBox*); + void modifyStandardButtons(QDialogButtonBox*) override; private: SegmentationManual* widget; diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.h b/src/Mod/ReverseEngineering/Gui/Workbench.h index 28c01e8247..047cff7e48 100644 --- a/src/Mod/ReverseEngineering/Gui/Workbench.h +++ b/src/Mod/ReverseEngineering/Gui/Workbench.h @@ -37,12 +37,12 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace ReverseEngineeringGui diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp index 496494c069..021c48a892 100644 --- a/src/Mod/Robot/App/AppRobot.cpp +++ b/src/Mod/Robot/App/AppRobot.cpp @@ -55,7 +55,7 @@ public: initialize("This module is the Robot module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object simulateToFile(const Py::Tuple& args) diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h index 357e063987..bf476e5ff8 100644 --- a/src/Mod/Robot/App/Robot6Axis.h +++ b/src/Mod/Robot/App/Robot6Axis.h @@ -55,12 +55,12 @@ class RobotExport Robot6Axis : public Base::Persistence public: Robot6Axis(); - ~Robot6Axis(); + ~Robot6Axis() override; // from base class - virtual unsigned int getMemSize () const; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize () const override; + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // interface /// set the kinematic parameters of the robot diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index e37659e11c..80873c20b2 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -41,20 +41,20 @@ class RobotExport RobotObject : public App::GeoFeature public: /// Constructor RobotObject(); - virtual ~RobotObject(); + ~RobotObject() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "RobotGui::ViewProviderRobotObject"; } - virtual App::DocumentObjectExecReturn *execute() { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute() const; - virtual PyObject *getPyObject(); + short mustExecute() const override; + PyObject *getPyObject() override; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; Robot6Axis &getRobot(){return robot;} @@ -75,7 +75,7 @@ public: protected: /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; Robot6Axis robot; diff --git a/src/Mod/Robot/App/kdl_cp/joint.hpp b/src/Mod/Robot/App/kdl_cp/joint.hpp index 798ce90775..820956b2e2 100644 --- a/src/Mod/Robot/App/kdl_cp/joint.hpp +++ b/src/Mod/Robot/App/kdl_cp/joint.hpp @@ -213,7 +213,7 @@ namespace KDL { class joint_type_exception: public std::exception{ - virtual const char* what() const throw(){ + const char* what() const throw() override{ return "Joint Type excption";} } joint_type_ex; diff --git a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp index 1845e9a142..f01bdc1944 100644 --- a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp +++ b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp @@ -68,14 +68,14 @@ class RotationalInterpolation_SingleAxis: public RotationalInterpolation double angle; public: RotationalInterpolation_SingleAxis(); - virtual void SetStartEnd(Rotation start,Rotation end); - virtual double Angle(); - virtual Rotation Pos(double th) const; - virtual Vector Vel(double th,double thd) const; - virtual Vector Acc(double th,double thd,double thdd) const; - virtual void Write(std::ostream& os) const; - virtual RotationalInterpolation* Clone() const; - virtual ~RotationalInterpolation_SingleAxis(); + void SetStartEnd(Rotation start,Rotation end) override; + double Angle() override; + Rotation Pos(double th) const override; + Vector Vel(double th,double thd) const override; + Vector Acc(double th,double thd,double thdd) const override; + void Write(std::ostream& os) const override; + RotationalInterpolation* Clone() const override; + ~RotationalInterpolation_SingleAxis() override; }; } diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index 44472c722a..fcae584436 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -60,7 +60,7 @@ public: initialize("This module is the RobotGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h index 120de366a9..b09c909345 100644 --- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h +++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h @@ -45,22 +45,22 @@ class RobotGuiExport TaskDlgEdge2Trac : public Gui::TaskView::TaskDialog public: TaskDlgEdge2Trac(Robot::Edge2TracObject *); - ~TaskDlgEdge2Trac(); + ~TaskDlgEdge2Trac() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or rject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { 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 8d70497f65..e46a06506b 100644 --- a/src/Mod/Robot/Gui/TaskDlgSimulate.h +++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h @@ -43,22 +43,22 @@ class RobotGuiExport TaskDlgSimulate : public Gui::TaskView::TaskDialog public: TaskDlgSimulate(Robot::RobotObject *pcRobotObject,Robot::TrajectoryObject *pcTrajectoryObject); - ~TaskDlgSimulate(); + ~TaskDlgSimulate() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or rject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Close|QDialogButtonBox::Help; } protected: diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h index bbfe36b323..eab1dc0bae 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h @@ -45,22 +45,22 @@ class RobotGuiExport TaskDlgTrajectoryDressUp : public Gui::TaskView::TaskDialog public: TaskDlgTrajectoryDressUp(Robot::TrajectoryDressUpObject *); - ~TaskDlgTrajectoryDressUp(); + ~TaskDlgTrajectoryDressUp() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or rject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h index 825c4f4bcf..527fa375d5 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h @@ -51,7 +51,7 @@ class TaskEdge2TracParameter : public Gui::TaskView::TaskBox public: TaskEdge2TracParameter(Robot::Edge2TracObject *pcObject,QWidget *parent = nullptr); - ~TaskEdge2TracParameter(); + ~TaskEdge2TracParameter() override; void setEdgeAndClusterNbr(int NbrEdges,int NbrClusters); diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.h b/src/Mod/Robot/Gui/TaskRobot6Axis.h index 8e36a9b316..4d0b1a85e9 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.h +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.h @@ -52,7 +52,7 @@ class TaskRobot6Axis : public Gui::TaskView::TaskBox public: TaskRobot6Axis(Robot::RobotObject *pcRobotObject,QWidget *parent = nullptr); - ~TaskRobot6Axis(); + ~TaskRobot6Axis() override; void setRobot(Robot::RobotObject *pcRobotObject); diff --git a/src/Mod/Robot/Gui/TaskRobotControl.h b/src/Mod/Robot/Gui/TaskRobotControl.h index 51f0f7e5e7..9e37904090 100644 --- a/src/Mod/Robot/Gui/TaskRobotControl.h +++ b/src/Mod/Robot/Gui/TaskRobotControl.h @@ -51,7 +51,7 @@ class TaskRobotControl : public Gui::TaskView::TaskBox public: TaskRobotControl(Robot::RobotObject *pcRobotObject,QWidget *parent = nullptr); - ~TaskRobotControl(); + ~TaskRobotControl() override; void setRobot(Robot::RobotObject *pcRobotObject); diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.h b/src/Mod/Robot/Gui/TaskRobotMessages.h index 763878a106..d406f3b920 100644 --- a/src/Mod/Robot/Gui/TaskRobotMessages.h +++ b/src/Mod/Robot/Gui/TaskRobotMessages.h @@ -51,7 +51,7 @@ class TaskRobotMessages : public Gui::TaskView::TaskBox public: TaskRobotMessages(Robot::RobotObject *pcRobotObject,QWidget *parent = nullptr); - ~TaskRobotMessages(); + ~TaskRobotMessages() override; private Q_SLOTS: diff --git a/src/Mod/Robot/Gui/TaskTrajectory.h b/src/Mod/Robot/Gui/TaskTrajectory.h index 0be7b1c905..fad5c932fc 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.h +++ b/src/Mod/Robot/Gui/TaskTrajectory.h @@ -59,7 +59,7 @@ class TaskTrajectory : public Gui::TaskView::TaskBox public: TaskTrajectory(Robot::RobotObject *pcRobotObject,Robot::TrajectoryObject *pcTrajectoryObject,QWidget *parent = nullptr); - ~TaskTrajectory(); + ~TaskTrajectory() override; /// Observer message from the Selection void OnChange(Gui::SelectionSingleton::SubjectType &rCaller, Gui::SelectionSingleton::MessageType Reason); diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h index ec704ccb47..0ac2bfb721 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h @@ -45,7 +45,7 @@ class TaskTrajectoryDressUpParameter : public Gui::TaskView::TaskBox public: TaskTrajectoryDressUpParameter(Robot::TrajectoryDressUpObject *obj,QWidget *parent = nullptr); - ~TaskTrajectoryDressUpParameter(); + ~TaskTrajectoryDressUpParameter() override; /// this methode write the values from the Gui to the object, usually in accept() void writeValues(); diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h index d886ed28cf..be6e9bf97d 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.h +++ b/src/Mod/Robot/Gui/TaskWatcher.h @@ -43,10 +43,10 @@ class RobotGuiExport TaskWatcherRobot : public Gui::TaskView::TaskWatcher public: TaskWatcherRobot(); - ~TaskWatcherRobot(); + ~TaskWatcherRobot() override; /// is called when the document or the selection changes. - virtual bool shouldShow(); + bool shouldShow() override; protected: TaskRobot6Axis *rob; diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.h b/src/Mod/Robot/Gui/TrajectorySimulate.h index 7ecbcf8276..19b1d813ce 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.h +++ b/src/Mod/Robot/Gui/TrajectorySimulate.h @@ -47,7 +47,7 @@ class TrajectorySimulate : public QDialog public: TrajectorySimulate(Robot::RobotObject *pcRobotObject,Robot::TrajectoryObject *pcTrajectoryObject,QWidget *parent = nullptr); - ~TrajectorySimulate(); + ~TrajectorySimulate() override; private Q_SLOTS: void start(); diff --git a/src/Mod/Sketcher/App/AppSketcherPy.cpp b/src/Mod/Sketcher/App/AppSketcherPy.cpp index bc80dbfa25..9a7389c055 100644 --- a/src/Mod/Sketcher/App/AppSketcherPy.cpp +++ b/src/Mod/Sketcher/App/AppSketcherPy.cpp @@ -58,7 +58,7 @@ public: initialize("This module is the Sketcher module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object open(const Py::Tuple& args) diff --git a/src/Mod/Sketcher/App/Constraint.h b/src/Mod/Sketcher/App/Constraint.h index 8c9620d022..d7b8c90c78 100644 --- a/src/Mod/Sketcher/App/Constraint.h +++ b/src/Mod/Sketcher/App/Constraint.h @@ -95,17 +95,17 @@ public: Constraint(Constraint&&) = delete; Constraint& operator=(Constraint&&) = delete; - virtual ~Constraint() = default; + ~Constraint() override = default; 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() const override; - virtual void Save(Base::Writer &/*writer*/) const override; - virtual void Restore(Base::XMLReader &/*reader*/) override; + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; Base::Quantity getPresentationValue() const; inline void setValue(double newValue) { diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h index 9886d38285..6185d77ece 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h +++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h @@ -66,29 +66,29 @@ public: public: ExternalGeometryExtension() = default; - virtual ~ExternalGeometryExtension() override = default; + ~ExternalGeometryExtension() override = default; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + 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)); } - virtual void setFlag(int flag, bool v=true) override { Flags.set((size_t)(flag),v); } + bool testFlag(int flag) const override { return Flags.test((size_t)(flag)); } + void setFlag(int flag, bool v=true) override { Flags.set((size_t)(flag),v); } // END_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) - virtual bool isClear() const override {return Flags.none();} - virtual size_t flagSize() const override {return Flags.size();} + bool isClear() const override {return Flags.none();} + size_t flagSize() const override {return Flags.size();} - virtual const std::string& getRef() const override {return Ref;} - virtual void setRef(const std::string & ref) override {Ref = ref;} + const std::string& getRef() const override {return Ref;} + void setRef(const std::string & ref) override {Ref = ref;} static bool getFlagsFromName(std::string str, ExternalGeometryExtension::Flag &flag); protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; - virtual void restoreAttributes(Base::XMLReader &reader) override; - virtual void saveAttributes(Base::Writer &writer) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; + void restoreAttributes(Base::XMLReader &reader) override; + void saveAttributes(Base::Writer &writer) const override; private: ExternalGeometryExtension(const ExternalGeometryExtension&) = default; diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.h b/src/Mod/Sketcher/App/ExternalGeometryFacade.h index 05f3338db3..2e759d8c69 100644 --- a/src/Mod/Sketcher/App/ExternalGeometryFacade.h +++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.h @@ -71,27 +71,27 @@ public: void setGeometry(Part::Geometry *geometry); /** External GeometryExtension Interface **/ - virtual bool testFlag(int flag) const override { return getExternalGeoExt()->testFlag(flag); } - virtual void setFlag(int flag, bool v=true) override { getExternalGeoExt()->setFlag(flag, v); } + bool testFlag(int flag) const override { return getExternalGeoExt()->testFlag(flag); } + void setFlag(int flag, bool v=true) override { getExternalGeoExt()->setFlag(flag, v); } - virtual bool isClear() const override {return getExternalGeoExt()->isClear();} - virtual size_t flagSize() const override {return getExternalGeoExt()->flagSize();} + bool isClear() const override {return getExternalGeoExt()->isClear();} + size_t flagSize() const override {return getExternalGeoExt()->flagSize();} - virtual const std::string& getRef() const override {return getExternalGeoExt()->getRef();} - virtual void setRef(const std::string & ref) override {getExternalGeoExt()->setRef(ref);} + const std::string& getRef() const override {return getExternalGeoExt()->getRef();} + void setRef(const std::string & ref) override {getExternalGeoExt()->setRef(ref);} /** GeometryExtension Interface **/ - inline virtual long getId() const override {return getGeoExt()->getId();} - virtual void setId(long id) override {getGeoExt()->setId(id);} + inline long getId() const override {return getGeoExt()->getId();} + void setId(long id) override {getGeoExt()->setId(id);} - virtual InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();} - virtual void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);} + InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();} + void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);} - virtual bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); } - virtual void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); } + bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); } + void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); } - virtual int getGeometryLayerId() const override { return getGeoExt()->getGeometryLayerId();} - virtual void setGeometryLayerId(int geolayer) override { getGeoExt()->setGeometryLayerId(geolayer);} + int getGeometryLayerId() const override { return getGeoExt()->getGeometryLayerId();} + void setGeometryLayerId(int geolayer) override { getGeoExt()->setGeometryLayerId(geolayer);} // Convenience accessor bool getBlocked() const { return this->testGeometryMode(GeometryMode::Blocked);} @@ -120,7 +120,7 @@ public: > GeometryT * getGeometry() const {return dynamic_cast(Geo);} - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; /** Geometry Interface **/ TopoDS_Shape toShape() const {return getGeo()->toShape();}; diff --git a/src/Mod/Sketcher/App/GeometryFacade.h b/src/Mod/Sketcher/App/GeometryFacade.h index 2c4d6844a1..954a97a5a6 100644 --- a/src/Mod/Sketcher/App/GeometryFacade.h +++ b/src/Mod/Sketcher/App/GeometryFacade.h @@ -133,7 +133,7 @@ public: GeometryFacade(GeometryFacade&&) = default; GeometryFacade& operator=(GeometryFacade&&) = default; - ~GeometryFacade(); + ~GeometryFacade() override; void setGeometry(Part::Geometry *geometry); void setOwner(bool owner) { @@ -146,17 +146,17 @@ public: } // Geometry Extension Interface - inline virtual long getId() const override {return getGeoExt()->getId();} - virtual void setId(long id) override {getGeoExt()->setId(id);} + inline long getId() const override {return getGeoExt()->getId();} + void setId(long id) override {getGeoExt()->setId(id);} - virtual InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();} - virtual void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);} + InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();} + void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);} - virtual bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); } - virtual void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); } + bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); } + void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); } - virtual int getGeometryLayerId() const override { return getGeoExt()->getGeometryLayerId();} - virtual void setGeometryLayerId(int geolayer) override { getGeoExt()->setGeometryLayerId(geolayer);} + int getGeometryLayerId() const override { return getGeoExt()->getGeometryLayerId();} + void setGeometryLayerId(int geolayer) override { getGeoExt()->setGeometryLayerId(geolayer);} // Convenience accessor bool getBlocked() const { return this->testGeometryMode(GeometryMode::Blocked);} @@ -186,7 +186,7 @@ public: > const GeometryT * getGeometry() const {return dynamic_cast(Geo);} - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; // Geometry Interface TopoDS_Shape toShape() const {return getGeo()->toShape();} diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index 3211695532..d95caf80c8 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -58,10 +58,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyConstraintList(); + ~PropertyConstraintList() override; - virtual void setSize(int newSize) override; - virtual int getSize() const override; + void setSize(int newSize) override; + int getSize() const override; const char* getEditorName() const override { return "SketcherGui::PropertyConstraintListItem"; @@ -109,16 +109,16 @@ public: return _lValueList; } - virtual PyObject *getPyObject() override; - virtual void setPyObject(PyObject *) override; + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const override; - virtual void Restore(Base::XMLReader &reader) override; + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual Property *Copy() const override; - virtual void Paste(const App::Property &from) override; + Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize() const override; + unsigned int getMemSize() const override; void acceptGeometry(const std::vector &GeoList); bool checkGeometry(const std::vector &GeoList); @@ -131,12 +131,12 @@ public: const Constraint *getConstraint(const App::ObjectIdentifier &path) const; - virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override; - virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const override; - virtual App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const override; - virtual void getPaths(std::vector & paths) const override; + void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override; + const boost::any getPathValue(const App::ObjectIdentifier & path) const override; + App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const override; + void getPaths(std::vector & paths) const override; - virtual bool getPyPathValue(const App::ObjectIdentifier &path, Py::Object &res) const override; + bool getPyPathValue(const App::ObjectIdentifier &path, Py::Object &res) const override; typedef std::pair ConstraintInfo ; diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index abc3b2018f..9f973197e2 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -45,12 +45,12 @@ class SketcherExport Sketch :public Base::Persistence public: Sketch(); - ~Sketch(); + ~Sketch() override; // from base class - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; /// solve the actual set up sketch int solve(); diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.h b/src/Mod/Sketcher/App/SketchGeometryExtension.h index ba2f6a05ee..638e8d04b3 100644 --- a/src/Mod/Sketcher/App/SketchGeometryExtension.h +++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h @@ -84,23 +84,23 @@ public: SketchGeometryExtension(); SketchGeometryExtension(long cid); - virtual ~SketchGeometryExtension() override = default; + ~SketchGeometryExtension() override = default; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; - virtual long getId() const override {return Id;} - virtual void setId(long id) override {Id = id;} + long getId() const override {return Id;} + void setId(long id) override {Id = id;} - virtual InternalType::InternalType getInternalType() const override {return InternalGeometryType;} - virtual void setInternalType(InternalType::InternalType type) override {InternalGeometryType = type;} + InternalType::InternalType getInternalType() const override {return InternalGeometryType;} + void setInternalType(InternalType::InternalType type) override {InternalGeometryType = type;} - virtual bool testGeometryMode(int flag) const override { return GeometryModeFlags.test((size_t)(flag)); }; - virtual void setGeometryMode(int flag, bool v=true) override { GeometryModeFlags.set((size_t)(flag), v); }; + bool testGeometryMode(int flag) const override { return GeometryModeFlags.test((size_t)(flag)); }; + void setGeometryMode(int flag, bool v=true) override { GeometryModeFlags.set((size_t)(flag), v); }; - virtual int getGeometryLayerId() const override { return GeometryLayer;} - virtual void setGeometryLayerId(int geolayer) override { GeometryLayer = geolayer;} + int getGeometryLayerId() const override { return GeometryLayer;} + void setGeometryLayerId(int geolayer) override { GeometryLayer = geolayer;} constexpr static std::array internaltype2str {{ "None", "EllipseMajorDiameter", "EllipseMinorDiameter","EllipseFocus1", "EllipseFocus2", "HyperbolaMajor", "HyperbolaMinor", "HyperbolaFocus", "ParabolaFocus", "BSplineControlPoint", "BSplineKnotPoint" }}; @@ -111,9 +111,9 @@ public: static bool getGeometryModeFromName(std::string str, GeometryMode::GeometryMode &type); protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; - virtual void restoreAttributes(Base::XMLReader &reader) override; - virtual void saveAttributes(Base::Writer &writer) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; + void restoreAttributes(Base::XMLReader &reader) override; + void saveAttributes(Base::Writer &writer) const override; private: SketchGeometryExtension(const SketchGeometryExtension&) = default; diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index a436653f36..ae802807ee 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -57,7 +57,7 @@ class SketcherExport SketchObject : public Part::Part2DObject public: SketchObject(); - ~SketchObject(); + ~SketchObject() override; /// Property /** @@ -397,17 +397,17 @@ public: int port_reversedExternalArcs(bool justAnalyze); // from base class - 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; + PyObject *getPyObject() override; + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; /// returns the number of construction lines (to be used as axes) - virtual int getAxisCount() const override; + 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; + Base::Axis getAxis(int axId) const override; /// verify and accept the assigned geometry - virtual void acceptGeometry() override; + void acceptGeometry() override; /// Check if constraint has invalid indexes bool evaluateConstraint(const Constraint *constraint) const; /// Check for constraints with invalid indexes @@ -546,11 +546,11 @@ public: // geometry extension functionalities for single element sketch object u protected: /// get called by the container when a property has changed - virtual void onChanged(const App::Property* /*prop*/) override; - virtual void onDocumentRestored() override; - virtual void restoreFinished() override; + void onChanged(const App::Property* /*prop*/) override; + void onDocumentRestored() override; + void restoreFinished() override; - virtual void setExpression(const App::ObjectIdentifier &path, std::shared_ptr expr) override; + void setExpression(const App::ObjectIdentifier &path, std::shared_ptr expr) override; std::string validateExpression(const App::ObjectIdentifier &path, std::shared_ptr expr); @@ -581,7 +581,7 @@ protected: // check whether constraint may be changed driving status int testDrivingChange(int ConstrId, bool isdriving); - virtual void onUndoRedoFinished() override; + void onUndoRedoFinished() override; // migration functions void migrateSketch(); diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index 887311dc99..e01b6a1b56 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -48,8 +48,8 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// Uses the standard ViewProvider //const char* getViewProviderName(void) const { // return "SketcherGui::ViewProviderSketchSF"; diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.h b/src/Mod/Sketcher/App/SolverGeometryExtension.h index d0daf18ed1..e1f92a560e 100644 --- a/src/Mod/Sketcher/App/SolverGeometryExtension.h +++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h @@ -234,13 +234,13 @@ public: SolverGeometryExtension(); - virtual ~SolverGeometryExtension() override = default; + ~SolverGeometryExtension() override = default; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; - virtual void notifyAttachment(Part::Geometry * geo) override; + void notifyAttachment(Part::Geometry * geo) override; SolverStatus getGeometry() const {return ( Edge.getStatus() == Independent && Start.getStatus() == Independent && @@ -290,7 +290,7 @@ public: } protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; private: SolverGeometryExtension(const SolverGeometryExtension&) = default; diff --git a/src/Mod/Sketcher/App/planegcs/Constraints.h b/src/Mod/Sketcher/App/planegcs/Constraints.h index 3e07d03d00..414a902f55 100644 --- a/src/Mod/Sketcher/App/planegcs/Constraints.h +++ b/src/Mod/Sketcher/App/planegcs/Constraints.h @@ -137,10 +137,10 @@ namespace GCS inline double* param2() { return pvec[1]; } public: ConstraintEqual(double *p1, double *p2, double p1p2ratio=1.0); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // Difference @@ -152,10 +152,10 @@ namespace GCS inline double* difference() { return pvec[2]; } public: ConstraintDifference(double *p1, double *p2, double *d); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // P2PDistance @@ -172,11 +172,11 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintP2PDistance(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); - virtual double maxStep(MAP_pD_D &dir, double lim=1.); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; + double maxStep(MAP_pD_D &dir, double lim=1.) override; }; // P2PAngle @@ -194,11 +194,11 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintP2PAngle(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); - virtual double maxStep(MAP_pD_D &dir, double lim=1.); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; + double maxStep(MAP_pD_D &dir, double lim=1.) override; }; // P2LDistance @@ -217,11 +217,11 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintP2LDistance(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); - virtual double maxStep(MAP_pD_D &dir, double lim=1.); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; + double maxStep(MAP_pD_D &dir, double lim=1.) override; double abs(double darea); }; @@ -241,10 +241,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPointOnLine(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // PointOnPerpBisector @@ -264,11 +264,11 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPointOnPerpBisector(){}; #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; - virtual double error(); - virtual double grad(double *); + double error() override; + double grad(double *) override; }; // Parallel @@ -288,10 +288,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintParallel(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // Perpendicular @@ -312,10 +312,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPerpendicular(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // L2LAngle @@ -338,11 +338,11 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintL2LAngle(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); - virtual double maxStep(MAP_pD_D &dir, double lim=1.); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; + double maxStep(MAP_pD_D &dir, double lim=1.) override; }; // MidpointOnLine @@ -363,10 +363,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintMidpointOnLine(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // TangentCircumf @@ -387,10 +387,10 @@ namespace GCS inline ConstraintTangentCircumf(bool internal_){internal=internal_;} #endif inline bool getInternal() {return internal;}; - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // PointOnEllipse class ConstraintPointOnEllipse : public Constraint @@ -409,10 +409,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPointOnEllipse(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintEllipseTangentLine : public Constraint @@ -424,20 +424,20 @@ namespace GCS void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. public: ConstraintEllipseTangentLine(Line &l, Ellipse &e); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintInternalAlignmentPoint2Ellipse : public Constraint { public: ConstraintInternalAlignmentPoint2Ellipse(Ellipse &e, Point &p1, InternalAlignmentType alignmentType); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; private: void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. void ReconstructGeomPointers(); //writes pointers in pvec to the parameters of crv1, crv2 and poa @@ -450,10 +450,10 @@ namespace GCS { public: ConstraintInternalAlignmentPoint2Hyperbola(Hyperbola &e, Point &p1, InternalAlignmentType alignmentType); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; private: void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. void ReconstructGeomPointers(); //writes pointers in pvec to the parameters of crv1, crv2 and poa @@ -471,10 +471,10 @@ namespace GCS void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. public: ConstraintEqualMajorAxesConic(MajorRadiusConic * a1, MajorRadiusConic * a2); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintEqualFocalDistance : public Constraint @@ -486,10 +486,10 @@ namespace GCS void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. public: ConstraintEqualFocalDistance(ArcOfParabola * a1, ArcOfParabola * a2); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintCurveValue : public Constraint @@ -510,12 +510,12 @@ namespace GCS * @param u : pointer to u parameter corresponding to the point */ ConstraintCurveValue(Point &p, double* pcoord, Curve& crv, double* u); - ~ConstraintCurveValue(); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); - virtual double maxStep(MAP_pD_D &dir, double lim=1.); + ~ConstraintCurveValue() override; + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; + double maxStep(MAP_pD_D &dir, double lim=1.) override; }; // PointOnHyperbola @@ -535,10 +535,10 @@ namespace GCS #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPointOnHyperbola(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; // PointOnParabola @@ -552,14 +552,14 @@ namespace GCS public: ConstraintPointOnParabola(Point &p, Parabola &e); ConstraintPointOnParabola(Point &p, ArcOfParabola &a); - ~ConstraintPointOnParabola(); + ~ConstraintPointOnParabola() override; #ifdef _GCS_EXTRACT_SOLVER_SUBSYSTEM_ inline ConstraintPointOnParabola(){} #endif - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintAngleViaPoint : public Constraint @@ -580,11 +580,11 @@ namespace GCS void ReconstructGeomPointers(); //writes pointers in pvec to the parameters of crv1, crv2 and poa public: ConstraintAngleViaPoint(Curve &acrv1, Curve &acrv2, Point p, double* angle); - ~ConstraintAngleViaPoint(); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ~ConstraintAngleViaPoint() override; + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintSnell : public Constraint //snell's law angles constrainer. Point needs to lie on all three curves to be constraied. @@ -610,11 +610,11 @@ namespace GCS public: //n1dn2 = n1 divided by n2. from n1 to n2. flipn1 = true instructs to flip ray1's tangent ConstraintSnell(Curve &ray1, Curve &ray2, Curve &boundary, Point p, double* n1, double* n2, bool flipn1, bool flipn2); - ~ConstraintSnell(); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ~ConstraintSnell() override; + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; class ConstraintEqualLineLength : public Constraint @@ -626,10 +626,10 @@ namespace GCS void errorgrad(double* err, double* grad, double *param); //error and gradient combined. Values are returned through pointers. public: ConstraintEqualLineLength(Line &l1, Line &l2); - virtual ConstraintType getTypeId(); - virtual void rescale(double coef=1.); - virtual double error(); - virtual double grad(double *); + ConstraintType getTypeId() override; + void rescale(double coef=1.) override; + double error() override; + double grad(double *) override; }; diff --git a/src/Mod/Sketcher/App/planegcs/Geo.h b/src/Mod/Sketcher/App/planegcs/Geo.h index a3a8915285..8324aa76be 100644 --- a/src/Mod/Sketcher/App/planegcs/Geo.h +++ b/src/Mod/Sketcher/App/planegcs/Geo.h @@ -123,50 +123,50 @@ namespace GCS { public: Line(){} - virtual ~Line(){} + ~Line() override{} Point p1; Point p2; DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Line* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Line* Copy() override; }; class Circle: public Curve { public: Circle(){rad = nullptr;} - virtual ~Circle(){} + ~Circle() override{} Point center; double *rad; DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Circle* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Circle* Copy() override; }; class Arc: public Circle { public: Arc(){startAngle=nullptr;endAngle=nullptr;rad=nullptr;} - virtual ~Arc(){} + ~Arc() override{} double *startAngle; double *endAngle; //double *rad; //inherited Point start; Point end; //Point center; //inherited - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Arc* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Arc* Copy() override; }; class MajorRadiusConic: public Curve { public: - virtual ~MajorRadiusConic(){} + ~MajorRadiusConic() override{} virtual double getRadMaj(const DeriVector2 ¢er, const DeriVector2 &f1, double b, double db, double &ret_dRadMaj) const = 0; virtual double getRadMaj(double* derivparam, double &ret_dRadMaj) const = 0; virtual double getRadMaj() const = 0; @@ -177,25 +177,25 @@ namespace GCS { public: Ellipse(){ radmin = nullptr;} - virtual ~Ellipse(){} + ~Ellipse() override{} Point center; Point focus1; double *radmin; - virtual double getRadMaj(const DeriVector2 ¢er, const DeriVector2 &f1, double b, double db, double &ret_dRadMaj) const override; - virtual double getRadMaj(double* derivparam, double &ret_dRadMaj) const override; - virtual double getRadMaj() const override; + double getRadMaj(const DeriVector2 ¢er, const DeriVector2 &f1, double b, double db, double &ret_dRadMaj) const override; + double getRadMaj(double* derivparam, double &ret_dRadMaj) const override; + double getRadMaj() const override; DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Ellipse* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Ellipse* Copy() override; }; class ArcOfEllipse: public Ellipse { public: ArcOfEllipse(){startAngle=nullptr;endAngle=nullptr;radmin = nullptr;} - virtual ~ArcOfEllipse(){} + ~ArcOfEllipse() override{} double *startAngle; double *endAngle; //double *radmin; //inherited @@ -204,80 +204,80 @@ namespace GCS //Point center; //inherited //double *focus1.x; //inherited //double *focus1.y; //inherited - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual ArcOfEllipse* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + ArcOfEllipse* Copy() override; }; class Hyperbola: public MajorRadiusConic { public: Hyperbola(){ radmin = nullptr;} - virtual ~Hyperbola(){} + ~Hyperbola() override{} Point center; Point focus1; double *radmin; - virtual double getRadMaj(const DeriVector2 ¢er, const DeriVector2 &f1, double b, double db, double &ret_dRadMaj) const override; - virtual double getRadMaj(double* derivparam, double &ret_dRadMaj) const override; - virtual double getRadMaj() const override; + double getRadMaj(const DeriVector2 ¢er, const DeriVector2 &f1, double b, double db, double &ret_dRadMaj) const override; + double getRadMaj(double* derivparam, double &ret_dRadMaj) const override; + double getRadMaj() const override; DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; - virtual DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Hyperbola* Copy() override; + DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Hyperbola* Copy() override; }; class ArcOfHyperbola: public Hyperbola { public: ArcOfHyperbola(){startAngle=nullptr;endAngle=nullptr;radmin = nullptr;} - virtual ~ArcOfHyperbola(){} + ~ArcOfHyperbola() override{} // parameters double *startAngle; double *endAngle; Point start; Point end; // interface helpers - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual ArcOfHyperbola* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + ArcOfHyperbola* Copy() override; }; class Parabola: public Curve { public: Parabola(){ } - virtual ~Parabola(){} + ~Parabola() override{} Point vertex; Point focus1; DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; - virtual DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual Parabola* Copy() override; + DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + Parabola* Copy() override; }; class ArcOfParabola: public Parabola { public: ArcOfParabola(){startAngle=nullptr;endAngle=nullptr;} - virtual ~ArcOfParabola(){} + ~ArcOfParabola() override{} // parameters double *startAngle; double *endAngle; Point start; Point end; // interface helpers - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual ArcOfParabola* Copy() override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + ArcOfParabola* Copy() override; }; class BSpline: public Curve { public: BSpline(){periodic=false;degree=2;} - virtual ~BSpline(){} + ~BSpline() override{} // parameters VEC_P poles; VEC_pD weights; @@ -294,10 +294,10 @@ namespace GCS VEC_I knotpointGeoids; // geoids of knotpoints as to index Geom array // interface helpers DeriVector2 CalculateNormal(const Point &p, const double* derivparam = nullptr) const override; - virtual DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; - virtual int PushOwnParams(VEC_pD &pvec) override; - virtual void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; - virtual BSpline* Copy() override; + DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; + int PushOwnParams(VEC_pD &pvec) override; + void ReconstructOnNewPvec (VEC_pD &pvec, int &cnt) override; + BSpline* Copy() override; }; } //namespace GCS diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index 79ef7de576..e5afafc317 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -68,7 +68,7 @@ public: initialize("This module is the SketcherGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 5ef5dee300..b049d39645 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -76,7 +76,7 @@ namespace SketcherGui { this->setMessage(ErrMsg); } - virtual ~ExceptionWrongInput() throw() {} + ~ExceptionWrongInput() throw() override {} QString ErrMsg; }; diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 5678895384..c3bfcea3b4 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -605,7 +605,7 @@ namespace SketcherGui { , object(obj), allowedSelTypes(0) {} - bool allow(App::Document *, App::DocumentObject *pObj, const char *sSubName) + bool allow(App::Document *, App::DocumentObject *pObj, const char *sSubName) override { if (pObj != this->object) return false; @@ -644,9 +644,9 @@ public: CmdSketcherConstraint(const char* name) : Command(name) {} - virtual ~CmdSketcherConstraint(){} + ~CmdSketcherConstraint() override{} - virtual const char* className() const + const char* className() const override { return "CmdSketcherConstraint"; } protected: @@ -667,8 +667,8 @@ protected: std::vector > allowedSelSequences; virtual void applyConstraint(std::vector &, int) {} - virtual void activated(int /*iMsg*/); - virtual bool isActive() + void activated(int /*iMsg*/) override; + bool isActive() override { return isCommandActive(getActiveGuiDocument()); } }; @@ -677,19 +677,19 @@ class DrawSketchHandlerGenConstraint: public DrawSketchHandler public: DrawSketchHandlerGenConstraint(CmdSketcherConstraint *_cmd) : cmd(_cmd), seqIndex(0) {} - virtual ~DrawSketchHandlerGenConstraint() + ~DrawSketchHandlerGenConstraint() override { Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d /*onSketchPos*/) override {} + void mouseMove(Base::Vector2d /*onSketchPos*/) override {} - virtual bool pressButton(Base::Vector2d /*onSketchPos*/) override + bool pressButton(Base::Vector2d /*onSketchPos*/) override { return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { SelIdPair selIdPair; selIdPair.GeoId = GeoEnum::GeoUndef; @@ -780,7 +780,7 @@ public: } private: - virtual void activated() override + void activated() override { selFilterGate = new GenericConstraintSelection(sketchgui->getObject()); @@ -862,12 +862,12 @@ class CmdSketcherConstrainHorizontal : public CmdSketcherConstraint { public: CmdSketcherConstrainHorizontal(); - virtual ~CmdSketcherConstrainHorizontal(){} - virtual const char* className() const + ~CmdSketcherConstrainHorizontal() override{} + const char* className() const override { return "CmdSketcherConstrainHorizontal"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; @@ -1100,12 +1100,12 @@ class CmdSketcherConstrainVertical : public CmdSketcherConstraint { public: CmdSketcherConstrainVertical(); - virtual ~CmdSketcherConstrainVertical(){} - virtual const char* className() const + ~CmdSketcherConstrainVertical() override{} + const char* className() const override { return "CmdSketcherConstrainVertical"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; @@ -1334,13 +1334,13 @@ class CmdSketcherConstrainLock : public CmdSketcherConstraint { public: CmdSketcherConstrainLock(); - virtual ~CmdSketcherConstrainLock(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainLock() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainLock"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainLock::CmdSketcherConstrainLock() @@ -1561,12 +1561,12 @@ class CmdSketcherConstrainBlock : public CmdSketcherConstraint { public: CmdSketcherConstrainBlock(); - virtual ~CmdSketcherConstrainBlock(){} - virtual const char* className() const + ~CmdSketcherConstrainBlock() override{} + const char* className() const override { return "CmdSketcherConstrainBlock"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainBlock::CmdSketcherConstrainBlock() @@ -1779,20 +1779,20 @@ public: GeoId1 = GeoId2 = GeoEnum::GeoUndef; PosId1 = PosId2 = Sketcher::PointPos::none; } - virtual ~DrawSketchHandlerCoincident() + ~DrawSketchHandlerCoincident() override { Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d onSketchPos) override {Q_UNUSED(onSketchPos);} + void mouseMove(Base::Vector2d onSketchPos) override {Q_UNUSED(onSketchPos);} - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { int VtId = getPreselectPoint(); int CrsId = getPreselectCross(); @@ -1853,7 +1853,7 @@ public: return true; } private: - virtual void activated() override + void activated() override { Gui::Selection().rmvSelectionGate(); GenericConstraintSelection* selFilterGate = new GenericConstraintSelection(sketchgui->getObject()); @@ -1873,12 +1873,12 @@ class CmdSketcherConstrainCoincident : public CmdSketcherConstraint { public: CmdSketcherConstrainCoincident(); - virtual ~CmdSketcherConstrainCoincident(){} - virtual const char* className() const + ~CmdSketcherConstrainCoincident() override{} + const char* className() const override { return "CmdSketcherConstrainCoincident"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; // returns true if a substitution took place bool substituteConstraintCombinations(SketchObject * Obj, int GeoId1, PointPos PosId1, @@ -2082,13 +2082,13 @@ class CmdSketcherConstrainDistance : public CmdSketcherConstraint { public: CmdSketcherConstrainDistance(); - virtual ~CmdSketcherConstrainDistance(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainDistance() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainDistance"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainDistance::CmdSketcherConstrainDistance() @@ -2429,12 +2429,12 @@ class CmdSketcherConstrainPointOnObject : public CmdSketcherConstraint { public: CmdSketcherConstrainPointOnObject(); - virtual ~CmdSketcherConstrainPointOnObject(){} - virtual const char* className() const + ~CmdSketcherConstrainPointOnObject() override{} + const char* className() const override { return "CmdSketcherConstrainPointOnObject"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; // returns true if a substitution took place bool substituteConstraintCombinations(SketchObject * Obj, int GeoId1, PointPos PosId1, int GeoId2); @@ -2679,13 +2679,13 @@ class CmdSketcherConstrainDistanceX : public CmdSketcherConstraint { public: CmdSketcherConstrainDistanceX(); - virtual ~CmdSketcherConstrainDistanceX(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainDistanceX() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainDistanceX"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainDistanceX::CmdSketcherConstrainDistanceX() @@ -2933,13 +2933,13 @@ class CmdSketcherConstrainDistanceY : public CmdSketcherConstraint { public: CmdSketcherConstrainDistanceY(); - virtual ~CmdSketcherConstrainDistanceY(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainDistanceY() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainDistanceY"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainDistanceY::CmdSketcherConstrainDistanceY() @@ -3180,12 +3180,12 @@ class CmdSketcherConstrainParallel : public CmdSketcherConstraint { public: CmdSketcherConstrainParallel(); - virtual ~CmdSketcherConstrainParallel(){} - virtual const char* className() const + ~CmdSketcherConstrainParallel() override{} + const char* className() const override { return "CmdSketcherConstrainParallel"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainParallel::CmdSketcherConstrainParallel() @@ -3330,12 +3330,12 @@ class CmdSketcherConstrainPerpendicular : public CmdSketcherConstraint { public: CmdSketcherConstrainPerpendicular(); - virtual ~CmdSketcherConstrainPerpendicular(){} - virtual const char* className() const + ~CmdSketcherConstrainPerpendicular() override{} + const char* className() const override { return "CmdSketcherConstrainPerpendicular"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainPerpendicular::CmdSketcherConstrainPerpendicular() @@ -3972,12 +3972,12 @@ class CmdSketcherConstrainTangent : public CmdSketcherConstraint { public: CmdSketcherConstrainTangent(); - virtual ~CmdSketcherConstrainTangent(){} - virtual const char* className() const + ~CmdSketcherConstrainTangent() override{} + const char* className() const override { return "CmdSketcherConstrainTangent"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; // returns true if a substitution took place bool substituteConstraintCombinations(SketchObject * Obj, int GeoId1, int GeoId2); }; @@ -4692,13 +4692,13 @@ class CmdSketcherConstrainRadius : public CmdSketcherConstraint { public: CmdSketcherConstrainRadius(); - virtual ~CmdSketcherConstrainRadius(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainRadius() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainRadius"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainRadius::CmdSketcherConstrainRadius() @@ -4992,13 +4992,13 @@ class CmdSketcherConstrainDiameter : public CmdSketcherConstraint { public: CmdSketcherConstrainDiameter(); - virtual ~CmdSketcherConstrainDiameter(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainDiameter() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainDiameter"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainDiameter::CmdSketcherConstrainDiameter() @@ -5266,13 +5266,13 @@ class CmdSketcherConstrainRadiam : public CmdSketcherConstraint { public: CmdSketcherConstrainRadiam(); - virtual ~CmdSketcherConstrainRadiam(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainRadiam() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainRadiam"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainRadiam::CmdSketcherConstrainRadiam() @@ -5712,13 +5712,13 @@ class CmdSketcherConstrainAngle : public CmdSketcherConstraint { public: CmdSketcherConstrainAngle(); - virtual ~CmdSketcherConstrainAngle(){} - virtual void updateAction(int mode); - virtual const char* className() const + ~CmdSketcherConstrainAngle() override{} + void updateAction(int mode) override; + const char* className() const override { return "CmdSketcherConstrainAngle"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainAngle::CmdSketcherConstrainAngle() @@ -6240,12 +6240,12 @@ class CmdSketcherConstrainEqual : public CmdSketcherConstraint { public: CmdSketcherConstrainEqual(); - virtual ~CmdSketcherConstrainEqual(){} - virtual const char* className() const + ~CmdSketcherConstrainEqual() override{} + const char* className() const override { return "CmdSketcherConstrainEqual"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainEqual::CmdSketcherConstrainEqual() @@ -6456,12 +6456,12 @@ class CmdSketcherConstrainSymmetric : public CmdSketcherConstraint { public: CmdSketcherConstrainSymmetric(); - virtual ~CmdSketcherConstrainSymmetric(){} - virtual const char* className() const + ~CmdSketcherConstrainSymmetric() override{} + const char* className() const override { return "CmdSketcherConstrainSymmetric"; } protected: - virtual void activated(int iMsg); - virtual void applyConstraint(std::vector &selSeq, int seqIndex); + void activated(int iMsg) override; + void applyConstraint(std::vector &selSeq, int seqIndex) override; }; CmdSketcherConstrainSymmetric::CmdSketcherConstrainSymmetric() diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 78be136dd1..104b680d33 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -1124,7 +1124,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_InsertKnot"); } diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index a74ebce7e9..6c832f13a4 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -1094,7 +1094,7 @@ public: { } - virtual ~DrawSketchHandlerCopy(){} + ~DrawSketchHandlerCopy() override{} /// mode table enum SelectMode { STATUS_SEEK_First, /**< enum value ----. */ @@ -1106,7 +1106,7 @@ public: Snap5Degree }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { @@ -1139,7 +1139,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d) override + bool pressButton(Base::Vector2d) override { if (Mode == STATUS_SEEK_First) { drawEdit(EditCurve); @@ -1148,7 +1148,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_End) @@ -1203,7 +1203,7 @@ public: return true; } private: - virtual void activated() override + void activated() override { setCursor(QPixmap(cursor_createcopy), 7, 7); Origin = static_cast(sketchgui->getObject())->getPoint(OriginGeoId, OriginPos); @@ -1351,13 +1351,13 @@ class CmdSketcherCopy : public SketcherCopy { public: CmdSketcherCopy(); - virtual ~CmdSketcherCopy(){} - virtual const char* className() const + ~CmdSketcherCopy() override{} + const char* className() const override { return "CmdSketcherCopy"; } - virtual void activate(); + void activate() override; protected: - virtual void activated(int iMsg); - virtual bool isActive(); + void activated(int iMsg) override; + bool isActive() override; }; CmdSketcherCopy::CmdSketcherCopy() @@ -1397,13 +1397,13 @@ class CmdSketcherClone : public SketcherCopy { public: CmdSketcherClone(); - virtual ~CmdSketcherClone(){} - virtual const char* className() const + ~CmdSketcherClone() override{} + const char* className() const override { return "CmdSketcherClone"; } - virtual void activate(); + void activate() override; protected: - virtual void activated(int iMsg); - virtual bool isActive(); + void activated(int iMsg) override; + bool isActive() override; }; CmdSketcherClone::CmdSketcherClone() @@ -1440,13 +1440,13 @@ class CmdSketcherMove : public SketcherCopy { public: CmdSketcherMove(); - virtual ~CmdSketcherMove(){} - virtual const char* className() const + ~CmdSketcherMove() override{} + const char* className() const override { return "CmdSketcherMove"; } - virtual void activate(); + void activate() override; protected: - virtual void activated(int iMsg); - virtual bool isActive(); + void activated(int iMsg) override; + bool isActive() override; }; CmdSketcherMove::CmdSketcherMove() @@ -1643,7 +1643,7 @@ public: { } - virtual ~DrawSketchHandlerRectangularArray(){} + ~DrawSketchHandlerRectangularArray() override{} /// mode table enum SelectMode { STATUS_SEEK_First, /**< enum value ----. */ @@ -1655,7 +1655,7 @@ public: Snap5Degree }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { @@ -1690,7 +1690,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d) override + bool pressButton(Base::Vector2d) override { if (Mode == STATUS_SEEK_First) { drawEdit(EditCurve); @@ -1699,7 +1699,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_End) { @@ -1740,7 +1740,7 @@ public: return true; } private: - virtual void activated() override + void activated() override { setCursor(QPixmap(cursor_createrectangulararray), 7, 7); Origin = static_cast(sketchgui->getObject())->getPoint(OriginGeoId, OriginPos); diff --git a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h index e5c388282e..5b97159634 100644 --- a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h +++ b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.h @@ -38,7 +38,7 @@ class ConstraintMultiFilterDialog : public QDialog public: ConstraintMultiFilterDialog(); - ~ConstraintMultiFilterDialog(); + ~ConstraintMultiFilterDialog() override; void setMultiFilter(const FilterValueBitset & bitset); FilterValueBitset getMultiFilter(); diff --git a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h index a2a05e8cbe..103f22504c 100644 --- a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h +++ b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.h @@ -38,7 +38,7 @@ class ConstraintSettingsDialog : public QDialog public: ConstraintSettingsDialog(); - ~ConstraintSettingsDialog(); + ~ConstraintSettingsDialog() override; Q_SIGNALS: void emit_filterInternalAlignment_stateChanged(int); @@ -46,8 +46,8 @@ Q_SIGNALS: void emit_visualisationTrackingFilter_stateChanged(int); public Q_SLOTS: - void accept(); - void reject(); + void accept() override; + void reject() override; 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/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index 8377bb456f..455f162d3c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -61,7 +61,7 @@ private: void updateCurvedEdgeCountSegmentsParameter(); /** Observer for parameter group. */ - virtual void OnChange(Base::Subject &rCaller, const char * sReason) override; + void OnChange(Base::Subject &rCaller, const char * sReason) override; private: int curvedEdgeCountSegments; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index 7c6d0c91ac..64653e4222 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -56,7 +56,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -120,7 +120,7 @@ public: } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ CenterPoint = onSketchPos; @@ -159,7 +159,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_End) { @@ -224,7 +224,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Arc"); } @@ -256,7 +256,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -371,7 +371,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ // 32 point curve + center + endpoint @@ -399,7 +399,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); // Need to look at. rx might need fixing. @@ -464,7 +464,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_3PointArc"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index 97f9da4424..18330f3c67 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -51,7 +51,7 @@ public: STATUS_Close }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -161,7 +161,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; @@ -187,7 +187,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_Close) { @@ -322,7 +322,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_ArcOfEllipse"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 6eb08dabdd..9d313fcd39 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -51,7 +51,7 @@ public: STATUS_Close }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -162,7 +162,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; @@ -190,7 +190,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d /*onSketchPos*/) override + bool releaseButton(Base::Vector2d /*onSketchPos*/) override { if (Mode==STATUS_Close) { unsetCursor(); @@ -336,7 +336,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_ArcOfHyperbola"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index 6b58a1140c..c400af0097 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -54,7 +54,7 @@ public: STATUS_Close }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -161,7 +161,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; @@ -188,7 +188,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d /*onSketchPos*/) override + bool releaseButton(Base::Vector2d /*onSketchPos*/) override { if (Mode==STATUS_Close) { unsetCursor(); @@ -293,7 +293,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_ArcOfParabola"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 123a14d715..bb32f08c31 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -63,7 +63,7 @@ public: MOUSE_NOT_PRESSED }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { prevCursorPosition = onSketchPos; @@ -88,7 +88,7 @@ public: } } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { prevCursorPosition = onSketchPos; @@ -199,7 +199,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { prevCursorPosition = onSketchPos; MousePressMode = MOUSE_NOT_PRESSED; @@ -207,7 +207,7 @@ public: return finishCommand(onSketchPos); } - virtual void registerPressedKey(bool pressed, int key) override + void registerPressedKey(bool pressed, int key) override { if (SoKeyboardEvent::D == key && pressed) { SplineDegree = QInputDialog::getInt( @@ -281,7 +281,7 @@ public: return; } - virtual void quit() override + void quit() override { // We must see if we need to create a B-spline before cancelling everything // and now just like any other Handler, @@ -335,7 +335,7 @@ private: IsClosed = false; } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_BSpline"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index 5b3c0fef08..b29a5e52c8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -97,20 +97,20 @@ public: Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Gui::Selection().getPreselection().pObjectName) applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); /* this is ok not to call to purgeHandler @@ -120,7 +120,7 @@ public: return true; } - virtual bool onSelectionChanged(const Gui::SelectionChanges& msg) override + bool onSelectionChanged(const Gui::SelectionChanges& msg) override { if (msg.Type == Gui::SelectionChanges::AddSelection) { App::DocumentObject* obj = sketchgui->getObject()->getDocument()->getObject(msg.pObjectName); @@ -155,7 +155,7 @@ public: } private: - virtual void activated() override + void activated() override { setAxisPickStyle(false); Gui::MDIView *mdi = Gui::Application::Instance->activeDocument()->getActiveView(); @@ -170,11 +170,11 @@ private: Gui::Selection().addSelectionGate(new CarbonCopySelection(sketchgui->getObject())); } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_CarbonCopy"); } - virtual void deactivated() override + void deactivated() override { Q_UNUSED(sketchgui); setAxisPickStyle(true); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index f42712df4a..0024dcd7b6 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -44,7 +44,7 @@ public: STATUS_Close }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -82,7 +82,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; @@ -94,7 +94,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_Close) { @@ -154,7 +154,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Circle"); } @@ -180,7 +180,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -239,7 +239,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { // N point curve + center + endpoint @@ -264,7 +264,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); // Need to look at. rx might need fixing. @@ -329,7 +329,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_3PointCircle"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 39bf81878f..2c9dc13b85 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -104,7 +104,7 @@ public: * @brief Updates the ellipse when the cursor moves * @param onSketchPos the position of the cursor on the sketch */ - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (method == PERIAPSIS_APOAPSIS_B) { if (mode == STATUS_SEEK_PERIAPSIS) { @@ -196,7 +196,7 @@ public: * @param onSketchPos the position of the cursor on the sketch * @return */ - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (method == PERIAPSIS_APOAPSIS_B) { if (mode == STATUS_SEEK_PERIAPSIS) { @@ -231,7 +231,7 @@ public: * @param onSketchPos the position of the cursor on the sketch * @return */ - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (mode == STATUS_Close) { @@ -257,7 +257,7 @@ private: * @brief Slot called when the create ellipse command is activated * @param sketchgui A pointer to the active sketch */ - virtual void activated() override + void activated() override { if (constrMethod == 0) { method = CENTER_PERIAPSIS_B; @@ -267,7 +267,7 @@ private: mode = STATUS_SEEK_PERIAPSIS; } } - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Ellipse"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index 750d0c1484..05468ff825 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -90,7 +90,7 @@ public: STATUS_SEEK_Second, }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_SEEK_Second) { @@ -203,13 +203,13 @@ public: } } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_SEEK_First) { @@ -288,7 +288,7 @@ public: } private: - virtual void activated() override + void activated() override { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); @@ -296,7 +296,7 @@ private: Gui::Selection().addSelectionGate(filterGate); } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Extension"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index b0a7f25efa..c8135fd437 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -99,20 +99,20 @@ public: Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Gui::Selection().getPreselection().pObjectName) applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); /* this is ok not to call to purgeHandler @@ -122,7 +122,7 @@ public: return true; } - virtual bool onSelectionChanged(const Gui::SelectionChanges& msg) override + bool onSelectionChanged(const Gui::SelectionChanges& msg) override { if (msg.Type == Gui::SelectionChanges::AddSelection) { App::DocumentObject* obj = sketchgui->getObject()->getDocument()->getObject(msg.pObjectName); @@ -165,7 +165,7 @@ public: } private: - virtual void activated() override + void activated() override { setAxisPickStyle(false); Gui::MDIView *mdi = Gui::Application::Instance->activeDocument()->getActiveView(); @@ -180,11 +180,11 @@ private: Gui::Selection().addSelectionGate(new ExternalSelection(sketchgui->getObject())); } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_External"); } - virtual void deactivated() override + void deactivated() override { Q_UNUSED(sketchgui); setAxisPickStyle(true); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index 228171596a..37388969f1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -91,18 +91,18 @@ public: STATUS_SEEK_Second }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { bool construction=false; int VtId = getPreselectPoint(); @@ -270,7 +270,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { Gui::Selection().rmvSelectionGate(); Gui::Selection().addSelectionGate(new FilletSelection(sketchgui->getObject())); diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index 14fcbe56f1..169bc79e3b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -43,7 +43,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { setPositionText(onSketchPos); @@ -69,7 +69,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; @@ -84,7 +84,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_End){ @@ -147,7 +147,7 @@ public: private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Line"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index 6b19a7165e..4604e75697 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -80,7 +80,7 @@ public: SNAP_MODE_45Degree }; - virtual void registerPressedKey(bool pressed, int key) override + void registerPressedKey(bool pressed, int key) override { if (Mode != STATUS_SEEK_Second) return; // SegmentMode can be changed only in STATUS_SEEK_Second mode @@ -159,7 +159,7 @@ public: } } - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { suppressTransition = false; if (Mode==STATUS_SEEK_First) { @@ -285,7 +285,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { @@ -381,7 +381,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { if (Mode == STATUS_Do || Mode == STATUS_Close) { bool addedGeometry = true; @@ -583,7 +583,7 @@ public: return true; } - virtual void quit() override { + void quit() override { // We must see if we need to create a B-spline before cancelling everything // and now just like any other Handler, @@ -621,7 +621,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Lineset"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index 60b5de7f5d..b8fbcf6b33 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -37,7 +37,7 @@ public: DrawSketchHandlerPoint() : selectionDone(false) {} virtual ~DrawSketchHandlerPoint() {} - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { setPositionText(onSketchPos); if (seekAutoConstraint(sugConstr, onSketchPos, Base::Vector2d(0.f,0.f))) { @@ -47,14 +47,14 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { EditPoint = onSketchPos; selectionDone = true; return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (selectionDone){ @@ -99,7 +99,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Point"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index 95b73bb3bd..61640c0a98 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -53,7 +53,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { @@ -94,7 +94,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ StartPos = onSketchPos; @@ -106,7 +106,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_End){ @@ -169,7 +169,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Regular_Polygon"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 32224a2f02..9bdf35072a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -54,7 +54,7 @@ public: public: - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First) { @@ -101,7 +101,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode==STATUS_SEEK_First){ if(constructionMethod == Diagonal) { @@ -135,7 +135,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode==STATUS_End){ @@ -285,7 +285,7 @@ public: private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Create_Box"); } @@ -314,7 +314,7 @@ public: STATUS_End }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { @@ -388,7 +388,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { StartPos = onSketchPos; @@ -401,7 +401,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_End) { @@ -567,7 +567,7 @@ public: } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Oblong"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index 826bdcdd0f..b763db6248 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -62,7 +62,7 @@ public: SNAP_DIR_Vert }; - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { @@ -132,7 +132,7 @@ public: applyCursor(); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { if (Mode == STATUS_SEEK_First) { StartPos = onSketchPos; @@ -144,7 +144,7 @@ public: return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); if (Mode == STATUS_End) { @@ -283,7 +283,7 @@ public: return true; } private: - virtual QString getCrosshairCursorSVGName() const override + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Slot"); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index b3108a6357..4eebebdda5 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -72,18 +72,18 @@ public: Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { int GeoId = getPreselectCurve(); if (GeoId >= 0) { @@ -112,14 +112,14 @@ public: } private: - virtual void activated() override + void activated() override { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); Gui::Selection().addSelectionGate(new SplittingSelection(sketchgui->getObject())); } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Splitting"); } }; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index 9e27b166cf..a658120c37 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -74,7 +74,7 @@ public: Gui::Selection().rmvSelectionGate(); } - virtual void mouseMove(Base::Vector2d onSketchPos) override + void mouseMove(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); @@ -113,13 +113,13 @@ public: } } - virtual bool pressButton(Base::Vector2d onSketchPos) override + bool pressButton(Base::Vector2d onSketchPos) override { Q_UNUSED(onSketchPos); return true; } - virtual bool releaseButton(Base::Vector2d onSketchPos) override + bool releaseButton(Base::Vector2d onSketchPos) override { int GeoId = getPreselectCurve(); if (GeoId > -1) { @@ -151,14 +151,14 @@ public: } private: - virtual void activated() override + void activated() override { Gui::Selection().clearSelection(); Gui::Selection().rmvSelectionGate(); Gui::Selection().addSelectionGate(new TrimmingSelection(sketchgui->getObject())); } - virtual QString getCrosshairCursorSVGName() const override { + QString getCrosshairCursorSVGName() const override { return QString::fromLatin1("Sketcher_Pointer_Trimming"); } diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.h b/src/Mod/Sketcher/Gui/EditDatumDialog.h index 5e009a0d61..0f28dbcde2 100644 --- a/src/Mod/Sketcher/Gui/EditDatumDialog.h +++ b/src/Mod/Sketcher/Gui/EditDatumDialog.h @@ -40,7 +40,7 @@ class EditDatumDialog : public QObject { public: EditDatumDialog(ViewProviderSketch* vp, int ConstrNbr); EditDatumDialog(Sketcher::SketchObject* pcSketch, int ConstrNbr); - ~EditDatumDialog(); + ~EditDatumDialog() override; void exec(bool atCursor=true); diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.h b/src/Mod/Sketcher/Gui/EditModeCoinManager.h index 40daa3b8cd..bb575b6ea9 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.h @@ -118,7 +118,7 @@ class SketcherGuiExport EditModeCoinManager public: ParameterObserver(EditModeCoinManager & client); - ~ParameterObserver(); + ~ParameterObserver() override; void subscribeToParameters(); diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h index 8afe43ba44..ef3dcdee2d 100644 --- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h +++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h @@ -45,19 +45,19 @@ class PropertyConstraintListItem: public Gui::PropertyEditor::PropertyItem Q_OBJECT PROPERTYITEM_HEADER - virtual ~PropertyConstraintListItem(); - virtual void assignProperty(const App::Property* prop); - virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; - virtual void setEditorData(QWidget *editor, const QVariant& data) const; - virtual QVariant editorData(QWidget *editor) const; + ~PropertyConstraintListItem() override; + void assignProperty(const App::Property* prop) override; + QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override; + void setEditorData(QWidget *editor, const QVariant& data) const override; + QVariant editorData(QWidget *editor) const override; protected: - virtual QVariant toString(const QVariant&) const; - virtual QVariant value(const App::Property*) const; - virtual void setValue(const QVariant&); - virtual bool event (QEvent* ev); + QVariant toString(const QVariant&) const override; + QVariant value(const App::Property*) const override; + void setValue(const QVariant&) override; + bool event (QEvent* ev) override; - virtual void initialize(); + void initialize() override; protected: PropertyConstraintListItem(); diff --git a/src/Mod/Sketcher/Gui/ShortcutListener.h b/src/Mod/Sketcher/Gui/ShortcutListener.h index 193bf17475..e10fecb2f9 100644 --- a/src/Mod/Sketcher/Gui/ShortcutListener.h +++ b/src/Mod/Sketcher/Gui/ShortcutListener.h @@ -45,10 +45,10 @@ class ShortcutListener: public QObject public: ShortcutListener(ViewProviderSketch * vp); - ~ShortcutListener(); + ~ShortcutListener() override; protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; ViewProviderSketch * pViewProvider; }; diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h index 440feb8637..1c117bd653 100644 --- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h +++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h @@ -35,12 +35,12 @@ class SketchMirrorDialog : public QDialog public: SketchMirrorDialog(); - ~SketchMirrorDialog(); + ~SketchMirrorDialog() override; int RefGeoid; Sketcher::PointPos RefPosid; - void accept(); + void accept() override; private: std::unique_ptr ui; diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h index f1ecac041d..914dde0a19 100644 --- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h +++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h @@ -36,12 +36,12 @@ class SketcherGuiExport SketchOrientationDialog : public QDialog public: SketchOrientationDialog(); - ~SketchOrientationDialog(); + ~SketchOrientationDialog() override; Base::Placement Pos; int DirType; - void accept(); + void accept() override; protected Q_SLOTS: void onPreview(); diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h index 8ced6e22f2..550dc5a72f 100644 --- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h +++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h @@ -35,9 +35,9 @@ class SketchRectangularArrayDialog : public QDialog public: SketchRectangularArrayDialog(); - ~SketchRectangularArrayDialog(); + ~SketchRectangularArrayDialog() override; - void accept(); + void accept() override; int Rows; int Cols; diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h index 4ce35769b3..973d4f5d5b 100644 --- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h +++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h @@ -35,9 +35,9 @@ class SketcherRegularPolygonDialog : public QDialog public: SketcherRegularPolygonDialog(); - ~SketcherRegularPolygonDialog(); + ~SketcherRegularPolygonDialog() override; - void accept(); + void accept() override; int sides; diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.h b/src/Mod/Sketcher/Gui/SketcherSettings.h index d833fcce7d..f1200de1f1 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.h +++ b/src/Mod/Sketcher/Gui/SketcherSettings.h @@ -42,13 +42,13 @@ class SketcherSettings : public Gui::Dialog::PreferencePage public: SketcherSettings(QWidget* parent = nullptr); - ~SketcherSettings(); + ~SketcherSettings() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; @@ -65,13 +65,13 @@ class SketcherSettingsDisplay : public Gui::Dialog::PreferencePage public: SketcherSettingsDisplay(QWidget* parent = nullptr); - ~SketcherSettingsDisplay(); + ~SketcherSettingsDisplay() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private Q_SLOTS: void onBtnTVApplyClicked(bool); @@ -90,13 +90,13 @@ class SketcherSettingsColors : public Gui::Dialog::PreferencePage public: SketcherSettingsColors(QWidget* parent = nullptr); - ~SketcherSettingsColors(); + ~SketcherSettingsColors() override; - void saveSettings(); - void loadSettings(); + void saveSettings() override; + void loadSettings() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.h b/src/Mod/Sketcher/Gui/SoDatumLabel.h index 8a33870eae..d283780e70 100644 --- a/src/Mod/Sketcher/Gui/SoDatumLabel.h +++ b/src/Mod/Sketcher/Gui/SoDatumLabel.h @@ -76,11 +76,11 @@ public: bool useAntialiasing; protected: - virtual ~SoDatumLabel() {}; - virtual void GLRender(SoGLRenderAction *action); - virtual void computeBBox(SoAction *, SbBox3f &box, SbVec3f ¢er); - virtual void generatePrimitives(SoAction * action); - virtual void notify(SoNotList * l); + ~SoDatumLabel() override {}; + void GLRender(SoGLRenderAction *action) override; + void computeBBox(SoAction *, SbBox3f &box, SbVec3f ¢er) override; + void generatePrimitives(SoAction * action) override; + void notify(SoNotList * l) override; private: void drawImage(); diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.h b/src/Mod/Sketcher/Gui/SoZoomTranslation.h index 582bf162f3..94b81a7e00 100644 --- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h +++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h @@ -41,14 +41,14 @@ public: SoSFVec3f abPos; protected: - virtual ~SoZoomTranslation() {}; - virtual void doAction(SoAction * action); - virtual void getPrimitiveCount(SoGetPrimitiveCountAction * action); - virtual void getMatrix(SoGetMatrixAction * action); - virtual void GLRender(SoGLRenderAction *action); - virtual void getBoundingBox(SoGetBoundingBoxAction * action); - virtual void callback(SoCallbackAction * action); - virtual void pick(SoPickAction * action); + ~SoZoomTranslation() override {}; + void doAction(SoAction * action) override; + void getPrimitiveCount(SoGetPrimitiveCountAction * action) override; + void getMatrix(SoGetMatrixAction * action) override; + void GLRender(SoGLRenderAction *action) override; + void getBoundingBox(SoGetBoundingBoxAction * action) override; + void callback(SoCallbackAction * action) override; + void pick(SoPickAction * action) override; float getScaleFactor(SoAction * action) const; }; diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index 4d20bddd18..9abfe74fba 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -46,24 +46,24 @@ class SketcherGuiExport TaskDlgEditSketch : public Gui::TaskView::TaskDialog public: TaskDlgEditSketch(ViewProviderSketch *sketchView); - ~TaskDlgEditSketch(); + ~TaskDlgEditSketch() override; ViewProviderSketch* getSketchView() const { return sketchView; } public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); - virtual bool isAllowedAlterDocument() const + bool reject() override; + bool isAllowedAlterDocument() const override { return false; } /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Close; } protected: diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index 4984c53a04..04323ffb89 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -96,10 +96,10 @@ public: updateVirtualSpaceStatus(); } - ~ConstraintItem() + ~ConstraintItem() override { } - void setData(int role, const QVariant & value) + void setData(int role, const QVariant & value) override { if (role == Qt::EditRole) this->value = value; @@ -107,7 +107,7 @@ public: QListWidgetItem::setData(role, value); } - QVariant data (int role) const + QVariant data (int role) const override { if (ConstraintNbr < 0 || ConstraintNbr >= sketch->Constraints.getSize()) return QVariant(); @@ -400,7 +400,7 @@ protected: return icon; } - void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const { + void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const override { QStyleOptionViewItem options = option; initStyleOption(&options, index); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h index 86aec275ca..f053d9cc06 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h @@ -48,10 +48,10 @@ class ConstraintView : public QListWidget public: explicit ConstraintView(QWidget *parent = nullptr); - ~ConstraintView(); + ~ConstraintView() override; protected: - void contextMenuEvent (QContextMenuEvent* event); + void contextMenuEvent (QContextMenuEvent* event) override; Q_SIGNALS: void onUpdateDrivingStatus(QListWidgetItem *item, bool status); @@ -84,10 +84,10 @@ class TaskSketcherConstraints : public Gui::TaskView::TaskBox, public Gui::Selec public: TaskSketcherConstraints(ViewProviderSketch *sketchView); - ~TaskSketcherConstraints(); + ~TaskSketcherConstraints() override; /// Observer message from the Selection - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: void slotConstraintsChanged(); @@ -125,7 +125,7 @@ public Q_SLOTS: void on_settingsDialogButton_clicked(bool); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; ViewProviderSketch *sketchView; typedef boost::signals2::connection Connection; Connection connectionConstraintsChanged; diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h index f72e3819a3..51f4b34079 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h @@ -46,15 +46,15 @@ class TaskSketcherCreateCommands : public TaskBox, public Gui::SelectionSingleto public: TaskSketcherCreateCommands(QWidget *parent = nullptr); - ~TaskSketcherCreateCommands(); + ~TaskSketcherCreateCommands() override; /// Observer message from the Selection void OnChange(Gui::SelectionSingleton::SubjectType &rCaller, - Gui::SelectionSingleton::MessageType Reason); + Gui::SelectionSingleton::MessageType Reason) override; private Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 0b579c06e9..c2881bd9f7 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -115,7 +115,7 @@ public: { } - ~ElementItem() + ~ElementItem() override { } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index 25efa7000d..7d390e74b4 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -45,15 +45,15 @@ class ElementView : public QListWidget public: explicit ElementView(QWidget *parent = nullptr); - ~ElementView(); + ~ElementView() override; Q_SIGNALS: void onFilterShortcutPressed(); protected: - void contextMenuEvent (QContextMenuEvent* event); - void keyPressEvent(QKeyEvent * event); + void contextMenuEvent (QContextMenuEvent* event) override; + void keyPressEvent(QKeyEvent * event) override; protected Q_SLOTS: // Constraints @@ -106,10 +106,10 @@ class TaskSketcherElements : public Gui::TaskView::TaskBox, public Gui::Selectio public: TaskSketcherElements(ViewProviderSketch *sketchView); - ~TaskSketcherElements(); + ~TaskSketcherElements() override; /// Observer message from the Selection - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; private: void slotElementsChanged(); @@ -129,8 +129,8 @@ public Q_SLOTS: void on_autoSwitchBox_stateChanged(int state); protected: - void changeEvent(QEvent *e); - void leaveEvent ( QEvent * event ); + void changeEvent(QEvent *e) override; + void leaveEvent ( QEvent * event ) override; ViewProviderSketch *sketchView; typedef boost::signals2::connection Connection; Connection connectionElementsChanged; diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h index f6c94019cb..41296d42c0 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h @@ -47,9 +47,9 @@ class SketcherGeneralWidget : public QWidget public: SketcherGeneralWidget(QWidget *parent=nullptr); - ~SketcherGeneralWidget(); + ~SketcherGeneralWidget() override; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void saveSettings(); void saveOrderingOrder(); @@ -72,7 +72,7 @@ Q_SIGNALS: void emitRenderOrderChanged(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; @@ -85,10 +85,10 @@ class TaskSketcherGeneral : public Gui::TaskView::TaskBox, public: TaskSketcherGeneral(ViewProviderSketch *sketchView); - ~TaskSketcherGeneral(); + ~TaskSketcherGeneral() override; /// Observer message from the Selection void OnChange(Gui::SelectionSingleton::SubjectType &rCaller, - Gui::SelectionSingleton::MessageType Reason); + Gui::SelectionSingleton::MessageType Reason) override; public Q_SLOTS: void onToggleGridView(bool on); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h index 300059c905..54da9834a1 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h @@ -45,7 +45,7 @@ class TaskSketcherMessages : public Gui::TaskView::TaskBox public: TaskSketcherMessages(ViewProviderSketch *sketchView); - ~TaskSketcherMessages(); + ~TaskSketcherMessages() override; void slotSetUp(const QString &state, const QString &msg, const QString& link, const QString& linkText); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h index a0db9e8f41..2a92683ede 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h @@ -43,7 +43,7 @@ class TaskSketcherSolverAdvanced : public Gui::TaskView::TaskBox public: TaskSketcherSolverAdvanced(ViewProviderSketch *sketchView); - ~TaskSketcherSolverAdvanced(); + ~TaskSketcherSolverAdvanced() override; private Q_SLOTS: void on_comboBoxDefaultSolver_currentIndexChanged(int index); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h index 3a51f5c7a6..9cbf4b69a4 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h @@ -43,10 +43,10 @@ class SketcherValidation : public QWidget public: SketcherValidation(Sketcher::SketchObject* Obj, QWidget* parent = nullptr); - ~SketcherValidation(); + ~SketcherValidation() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private Q_SLOTS: void on_findButton_clicked(); @@ -79,8 +79,8 @@ class TaskSketcherValidation : public Gui::TaskView::TaskDialog public: TaskSketcherValidation(Sketcher::SketchObject* Obj); - ~TaskSketcherValidation(); - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + ~TaskSketcherValidation() override; + QDialogButtonBox::StandardButtons getStandardButtons(void) const override { return QDialogButtonBox::Close; } }; diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.h b/src/Mod/Sketcher/Gui/ViewProviderPython.h index d1325153cd..4ab1b21dc0 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderPython.h +++ b/src/Mod/Sketcher/Gui/ViewProviderPython.h @@ -37,11 +37,11 @@ public: /// constructor ViewProviderCustom(); /// destructor - virtual ~ViewProviderCustom(); - virtual void updateData(const App::Property*); + ~ViewProviderCustom() override; + void updateData(const App::Property*) override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; std::map propView; }; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index f286f30295..f76238f6b5 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -392,7 +392,7 @@ public: /// constructor ViewProviderSketch(); /// destructor - virtual ~ViewProviderSketch(); + ~ViewProviderSketch() override; /** @name Properties */ //@{ @@ -463,7 +463,7 @@ public: bool isSelectable() const override; /// Observer message from the Selection - virtual void onSelectionChanged(const Gui::SelectionChanges& msg) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; //@} /** @name Access to Sketch and Solver objects */ @@ -504,29 +504,29 @@ public: /** @name base class implementer */ //@{ - virtual void attach(App::DocumentObject *) override; - virtual void updateData(const App::Property *) override; + void attach(App::DocumentObject *) override; + void updateData(const App::Property *) override; - virtual void setupContextMenu(QMenu *menu, QObject *receiver, const char *member) override; + void setupContextMenu(QMenu *menu, QObject *receiver, const char *member) override; /// is called when the Provider is in edit and a deletion request occurs - virtual bool onDelete(const std::vector &) override; + bool onDelete(const std::vector &) override; /// Is called by the tree if the user double clicks on the object. It returns the string /// for the transaction that will be shown in the undo/redo dialog. /// If null is returned then no transaction will be opened. - virtual const char* getTransactionText() const override { return nullptr; } + const char* getTransactionText() const override { return nullptr; } /// is called by the tree if the user double clicks on the object - virtual bool doubleClicked() override; + 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; + 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. - virtual bool keyPressed(bool pressed, int key) override; + bool keyPressed(bool pressed, int key) override; /// is called when the Provider is in edit and the mouse is clicked - virtual bool mouseButtonPressed(int Button, bool pressed, const SbVec2s& cursorPos, const Gui::View3DInventorViewer* viewer) override; - virtual bool mouseWheelEvent(int delta, const SbVec2s &cursorPos, const Gui::View3DInventorViewer* viewer) override; + bool mouseButtonPressed(int Button, bool pressed, const SbVec2s& cursorPos, const Gui::View3DInventorViewer* viewer) override; + bool mouseWheelEvent(int delta, const SbVec2s &cursorPos, const Gui::View3DInventorViewer* viewer) override; //@} /// Control the overlays appearing on the Tree and reflecting different sketcher states - virtual QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override; + QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override; /** @name Signals for controlling information in Task dialogs */ //@{ @@ -547,10 +547,10 @@ public: protected: /** @name enter/exit edit mode */ //@{ - virtual bool setEdit(int ModNum) override; - virtual void unsetEdit(int ModNum) override; - virtual void setEditViewer(Gui::View3DInventorViewer*, int ModNum) override; - virtual void unsetEditViewer(Gui::View3DInventorViewer*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + void setEditViewer(Gui::View3DInventorViewer*, int ModNum) override; + void unsetEditViewer(Gui::View3DInventorViewer*) override; //@} /** @name miscelanea editing functions */ @@ -582,7 +582,7 @@ protected: /** @name base class implementer */ //@{ /// get called by the container whenever a property has been changed - virtual void onChanged(const App::Property *prop) override; + void onChanged(const App::Property *prop) override; //@} private: diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h index 78e471e959..f1d9a6b2ae 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h @@ -34,11 +34,11 @@ class SketcherGuiExport ViewProviderSketchGeometryExtension : public Part::Geome public: ViewProviderSketchGeometryExtension(); - virtual ~ViewProviderSketchGeometryExtension() override = default; + ~ViewProviderSketchGeometryExtension() override = default; - virtual std::unique_ptr copy() const override; + std::unique_ptr copy() const override; - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; // Data Members @@ -52,7 +52,7 @@ public: virtual void setRepresentationFactor(double representationFactor) {RepresentationFactor = representationFactor;} protected: - virtual void copyAttributes(Part::GeometryExtension * cpy) const override; + void copyAttributes(Part::GeometryExtension * cpy) const override; private: ViewProviderSketchGeometryExtension(const ViewProviderSketchGeometryExtension&) = default; diff --git a/src/Mod/Sketcher/Gui/Workbench.h b/src/Mod/Sketcher/Gui/Workbench.h index 61a57f0ed1..a49178875f 100644 --- a/src/Mod/Sketcher/Gui/Workbench.h +++ b/src/Mod/Sketcher/Gui/Workbench.h @@ -40,12 +40,12 @@ class SketcherGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; SketcherGuiExport void addSketcherWorkbenchSketchActions(Gui::MenuItem& sketch); diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp index 9ed7ff379c..cb25a3e4db 100644 --- a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp +++ b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp @@ -30,7 +30,7 @@ public: initialize("This module is the Spreadsheet module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h index b46d8474f0..c224e4100e 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h @@ -51,13 +51,13 @@ public: return i != end() ? i->second : defaultWidth; } - virtual Property *Copy() const; + Property *Copy() const override; - virtual void Paste(const Property &from); + void Paste(const Property &from) override; - virtual void Save (Base::Writer & writer) const; + void Save (Base::Writer & writer) const override; - virtual void Restore(Base::XMLReader & reader); + void Restore(Base::XMLReader & reader) override; bool isDirty() const { return !dirty.empty(); } @@ -65,7 +65,7 @@ public: const std::set & getDirty() const { return dirty; } - PyObject *getPyObject(); + PyObject *getPyObject() override; void clear(); diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.h b/src/Mod/Spreadsheet/App/PropertyRowHeights.h index e97247f8d2..911dfc8317 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeights.h +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.h @@ -51,13 +51,13 @@ public: return *this; } - virtual App::Property *Copy() const; + App::Property *Copy() const override; - virtual void Paste(const App::Property &from); + void Paste(const App::Property &from) override; - virtual void Save (Base::Writer & writer) const; + void Save (Base::Writer & writer) const override; - virtual void Restore(Base::XMLReader & reader); + void Restore(Base::XMLReader & reader) override; bool isDirty() const { return dirty.size() > 0; } @@ -65,7 +65,7 @@ public: const std::set & getDirty() const { return dirty; } - PyObject *getPyObject(); + PyObject *getPyObject() override; static const int defaultHeight; diff --git a/src/Mod/Spreadsheet/App/PropertySheet.h b/src/Mod/Spreadsheet/App/PropertySheet.h index c1f2f1eed6..e58bd722cd 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.h +++ b/src/Mod/Spreadsheet/App/PropertySheet.h @@ -45,33 +45,33 @@ public: PropertySheet(Sheet * _owner = nullptr); - ~PropertySheet(); + ~PropertySheet() override; - virtual std::map getExpressions() const override; - virtual void setExpressions(std::map &&exprs) override; - virtual void onRelabeledDocument(const App::Document &doc) override; + std::map getExpressions() const override; + void setExpressions(std::map &&exprs) override; + void onRelabeledDocument(const App::Document &doc) override; - virtual void updateElementReference( + void updateElementReference( App::DocumentObject *feature,bool reverse=false,bool notify=false) override; - virtual bool referenceChanged() const override; - virtual bool adjustLink(const std::set &inList) override; - virtual Property *CopyOnImportExternal(const std::map &nameMap) const override; - virtual Property *CopyOnLabelChange(App::DocumentObject *obj, + bool referenceChanged() const override; + bool adjustLink(const std::set &inList) override; + Property *CopyOnImportExternal(const std::map &nameMap) const override; + Property *CopyOnLabelChange(App::DocumentObject *obj, const std::string &ref, const char *newLabel) const override; - virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent, + Property *CopyOnLinkReplace(const App::DocumentObject *parent, App::DocumentObject *oldObj, App::DocumentObject *newObj) const override; - virtual void breakLink(App::DocumentObject *obj, bool clear) override; + void breakLink(App::DocumentObject *obj, bool clear) override; - virtual void afterRestore() override; - virtual void onContainerRestored() override; + void afterRestore() override; + void onContainerRestored() override; - virtual Property *Copy(void) const override; + Property *Copy(void) const override; - virtual void Paste(const Property &from) override; + void Paste(const Property &from) override; - virtual void Save (Base::Writer & writer) const override; + void Save (Base::Writer & writer) const override; - virtual void Restore(Base::XMLReader & reader) override; + void Restore(Base::XMLReader & reader) override; void copyCells(Base::Writer &writer, const std::vector &ranges) const; @@ -145,7 +145,7 @@ public: void removeColumns(int col, int count); - virtual unsigned int getMemSize (void) const override; + unsigned int getMemSize (void) const override; bool mergeCells(App::CellAddress from, App::CellAddress to); @@ -188,8 +188,8 @@ public: std::string getColumn(int offset=0) const; - virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override; - virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const override; + void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override; + const boost::any getPathValue(const App::ObjectIdentifier & path) const override; unsigned getBindingBorder(App::CellAddress address) const; @@ -207,11 +207,11 @@ public: App::ObjectIdentifier *pTarget=nullptr) const; protected: - virtual void hasSetValue() override; - virtual void hasSetChildValue(App::Property &prop) override; - virtual void onBreakLink(App::DocumentObject *obj) override; - virtual void onAddDep(App::DocumentObject *obj) override; - virtual void onRemoveDep(App::DocumentObject *obj) override; + void hasSetValue() override; + void hasSetChildValue(App::Property &prop) override; + void onBreakLink(App::DocumentObject *obj) override; + void onAddDep(App::DocumentObject *obj) override; + void onRemoveDep(App::DocumentObject *obj) override; private: diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h index 0c746c2328..bed6b2d31e 100644 --- a/src/Mod/Spreadsheet/App/Sheet.h +++ b/src/Mod/Spreadsheet/App/Sheet.h @@ -63,10 +63,10 @@ class SpreadsheetExport PropertySpreadsheetQuantity : public App::PropertyQuanti TYPESYSTEM_HEADER(); public: PropertySpreadsheetQuantity(void){} - virtual ~PropertySpreadsheetQuantity(){} + ~PropertySpreadsheetQuantity() override{} - virtual Property *Copy(void) const; - virtual void Paste(const Property &from); + Property *Copy(void) const override; + void Paste(const Property &from) override; }; class SpreadsheetExport Sheet : public App::DocumentObject @@ -77,10 +77,10 @@ public: /// Constructor Sheet(); - virtual ~Sheet(); + ~Sheet() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "SpreadsheetGui::ViewProviderSheet"; } @@ -171,19 +171,19 @@ public: void providesTo(App::CellAddress address, std::set & result) const; bool hasCell(const std::vector &ranges) const; - PyObject *getPyObject(); + PyObject *getPyObject() override; PropertySheet *getCells() { return &cells; } - App::Property *getPropertyByName(const char *name) const; + App::Property *getPropertyByName(const char *name) const override; - App::Property *getDynamicPropertyByName(const char* name) const; + App::Property *getDynamicPropertyByName(const char* name) const override; - virtual void getPropertyNamedList(std::vector > &List) const; + void getPropertyNamedList(std::vector > &List) const override; - virtual short mustExecute(void) const; + short mustExecute(void) const override; - App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute(void) override; bool getCellAddress(const App::Property *prop, App::CellAddress &address); @@ -217,7 +217,7 @@ public: void observeDocument(App::Document *document); - virtual void renameObjectIdentifiers(const std::map & paths); + void renameObjectIdentifiers(const std::map & paths) override; void setCopyOrCutRanges(const std::vector &ranges, bool copy=true); const std::vector &getCopyOrCutRange(bool copy=true) const; @@ -225,13 +225,13 @@ public: protected: - virtual void onChanged(const App::Property *prop); + void onChanged(const App::Property *prop) override; void updateColumnsOrRows(bool horizontal, int section, int count) ; std::set providesTo(App::CellAddress address) const; - void onDocumentRestored(); + void onDocumentRestored() override; void recomputeCell(App::CellAddress p); @@ -251,7 +251,7 @@ protected: App::Property *setQuantityProperty(App::CellAddress key, double value, const Base::Unit &unit); - virtual void onSettingDocument(); + void onSettingDocument() override; void updateBindings(); diff --git a/src/Mod/Spreadsheet/App/SheetObserver.h b/src/Mod/Spreadsheet/App/SheetObserver.h index 3b4e855ae4..0a6f7a1547 100644 --- a/src/Mod/Spreadsheet/App/SheetObserver.h +++ b/src/Mod/Spreadsheet/App/SheetObserver.h @@ -33,10 +33,10 @@ class PropertySheet; class SheetObserver : public App::DocumentObserver { public: SheetObserver(App::Document* document, PropertySheet *_sheet); - ~SheetObserver() { } - virtual void slotCreatedObject(const App::DocumentObject& Obj); - virtual void slotDeletedObject(const App::DocumentObject& Obj); - virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); + ~SheetObserver() override { } + void slotCreatedObject(const App::DocumentObject& Obj) override; + void slotDeletedObject(const App::DocumentObject& Obj) override; + void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; void ref(); bool unref(); App::Document* getDocument() const { return App::DocumentObserver::getDocument(); } diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp index 321b1c2bef..3dd53f9bd2 100644 --- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp +++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp @@ -71,7 +71,7 @@ public: initialize("This module is the SpreadsheetGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object open(const Py::Tuple& args) diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h index 51d20e65de..02587dd503 100644 --- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h +++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h @@ -38,9 +38,9 @@ class DlgBindSheet : public QDialog public: explicit DlgBindSheet(Spreadsheet::Sheet *sheet, const std::vector &range, QWidget *parent = nullptr); - ~DlgBindSheet(); + ~DlgBindSheet() override; - void accept(); + void accept() override; public Q_SLOTS: void onDiscard(); diff --git a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h index d65e335044..dac4dc5bc3 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h +++ b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.h @@ -41,12 +41,12 @@ class DlgSettingsImp : public Gui::Dialog::PreferencePage public: DlgSettingsImp( QWidget* parent = nullptr ); - ~DlgSettingsImp(); + ~DlgSettingsImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Spreadsheet/Gui/DlgSheetConf.h b/src/Mod/Spreadsheet/Gui/DlgSheetConf.h index 6d20fc5a31..ce2aa42895 100644 --- a/src/Mod/Spreadsheet/Gui/DlgSheetConf.h +++ b/src/Mod/Spreadsheet/Gui/DlgSheetConf.h @@ -38,9 +38,9 @@ class DlgSheetConf : public QDialog public: explicit DlgSheetConf(Spreadsheet::Sheet *sheet, App::Range range, QWidget *parent = nullptr); - ~DlgSheetConf(); + ~DlgSheetConf() override; - void accept(); + void accept() override; App::Property *prepare(App::CellAddress &from, App::CellAddress &to, std::string &rangeConf, App::ObjectIdentifier &path, bool init); diff --git a/src/Mod/Spreadsheet/Gui/LineEdit.h b/src/Mod/Spreadsheet/Gui/LineEdit.h index a2b9ed58ee..8f253f7b09 100644 --- a/src/Mod/Spreadsheet/Gui/LineEdit.h +++ b/src/Mod/Spreadsheet/Gui/LineEdit.h @@ -35,13 +35,13 @@ class LineEdit : public Gui::ExpressionLineEdit public: explicit LineEdit(QWidget *parent = nullptr); - bool event(QEvent *event); + bool event(QEvent *event) override; Q_SIGNALS: void finishedWithKey(int key, Qt::KeyboardModifiers modifiers); private: - bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; private: diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.h b/src/Mod/Spreadsheet/Gui/PropertiesDialog.h index 6c8acaaa42..e68ceed029 100644 --- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.h +++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.h @@ -38,7 +38,7 @@ class PropertiesDialog : public QDialog public: explicit PropertiesDialog(Spreadsheet::Sheet *_sheet, const std::vector & _ranges, QWidget *parent = nullptr); - ~PropertiesDialog(); + ~PropertiesDialog() override; void apply(); void selectAlias(); diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.h b/src/Mod/Spreadsheet/Gui/SheetModel.h index f30ab5c8e5..91851df3ea 100644 --- a/src/Mod/Spreadsheet/Gui/SheetModel.h +++ b/src/Mod/Spreadsheet/Gui/SheetModel.h @@ -38,15 +38,15 @@ class SheetModel : public QAbstractTableModel Q_OBJECT public: explicit SheetModel(Spreadsheet::Sheet * _sheet, QObject *parent = nullptr); - ~SheetModel(); + ~SheetModel() override; SheetModel(QObject *parent); - int rowCount(const QModelIndex &parent = QModelIndex()) const ; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - bool setData(const QModelIndex &index, const QVariant &value, int role); - Qt::ItemFlags flags(const QModelIndex &) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override ; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; + Qt::ItemFlags flags(const QModelIndex &) const override; private Q_SLOTS: void setCellData(QModelIndex index, QString str); diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.h b/src/Mod/Spreadsheet/Gui/SheetTableView.h index b26c676e39..90164e4a81 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.h +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.h @@ -42,8 +42,8 @@ public: Q_SIGNALS: void resizeFinished(); protected: - void mouseReleaseEvent(QMouseEvent * event); - bool viewportEvent(QEvent *e); + void mouseReleaseEvent(QMouseEvent * event) override; + bool viewportEvent(QEvent *e) override; private: QTableView *owner; }; @@ -53,7 +53,7 @@ class SheetTableView : public QTableView Q_OBJECT public: explicit SheetTableView(QWidget *parent = nullptr); - ~SheetTableView(); + ~SheetTableView() override; void edit(const QModelIndex &index); void setSheet(Spreadsheet::Sheet *_sheet); @@ -72,7 +72,7 @@ public Q_SLOTS: void ModifyBlockSelection(int targetRow, int targetColumn); protected Q_SLOTS: - void commitData(QWidget *editor); + void commitData(QWidget *editor) override; void updateCellSpan(App::CellAddress address); void insertRows(); void insertRowsAfter(); @@ -86,13 +86,13 @@ protected Q_SLOTS: void onConfSetup(); protected: - bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event); - bool event(QEvent *event); - void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint); - void mousePressEvent(QMouseEvent* event); - void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); + bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event) override; + bool event(QEvent *event) override; + void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint) override; + void mousePressEvent(QMouseEvent* event) override; + void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override; - void contextMenuEvent (QContextMenuEvent * e); + void contextMenuEvent (QContextMenuEvent * e) override; void _copySelection(const std::vector &ranges, bool copy); diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h index d7cb3f2ebe..8d388c1375 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h @@ -39,13 +39,13 @@ class SpreadsheetDelegate : public QStyledItemDelegate public: explicit SpreadsheetDelegate(Spreadsheet::Sheet * sheet, QWidget *parent = nullptr); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, - const QModelIndex &index) const; - void setEditorData(QWidget *editor, const QModelIndex &index) const; + const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; + const QModelIndex &index) const override; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override; Q_SIGNALS: void finishedWithKey(int key, Qt::KeyboardModifiers modifiers); diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h index 9c72c454c0..b3d6916022 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h @@ -59,19 +59,19 @@ class SpreadsheetGuiExport SheetView : public Gui::MDIView public: SheetView(Gui::Document* pcDocument, App::DocumentObject* docObj, QWidget* parent); - ~SheetView(); + ~SheetView() override; - const char *getName(void) const {return "SheetView";} + const char *getName(void) const override {return "SheetView";} - bool onMsg(const char* pMsg,const char** ppReturn); - bool onHasMsg(const char* pMsg) const; + bool onMsg(const char* pMsg,const char** ppReturn) override; + bool onHasMsg(const char* pMsg) const override; /** @name Printing */ //@{ - void print(); - void printPdf(); - void printPreview(); - void print(QPrinter*); + void print() override; + void printPdf() override; + void printPreview() override; + void print(QPrinter*) override; //@} void updateCell(const App::Property * prop); @@ -93,9 +93,9 @@ public: void deleteSelection(); - PyObject *getPyObject(void); + PyObject *getPyObject(void) override; - virtual void deleteSelf(); + void deleteSelf() override; protected Q_SLOTS: void editingFinishedWithKey(int key, Qt::KeyboardModifiers modifiers); @@ -134,10 +134,10 @@ public: static void init_type(); SheetViewPy(SheetView *mdi); - ~SheetViewPy(); + ~SheetViewPy() override; - Py::Object repr(); - Py::Object getattr(const char *); + Py::Object repr() override; + Py::Object getattr(const char *) override; Py::Object getSheet(const Py::Tuple&); Py::Object cast_to_base(const Py::Tuple&); diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h index 565aac1fca..85f5ab2213 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h @@ -48,26 +48,26 @@ public: ViewProviderSheet(); /// destructor. - ~ViewProviderSheet(); + ~ViewProviderSheet() override; void setDisplayMode(const char* ModeName) override; - virtual bool useNewSelectionModel(void) const override {return false;} + bool useNewSelectionModel(void) const override {return false;} std::vector getDisplayModes() const override; - virtual bool doubleClicked(void) override; + bool doubleClicked(void) override; void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; Spreadsheet::Sheet* getSpreadsheetObject() const; - virtual void beforeDelete() override; + void beforeDelete() override; QIcon getIcon() const override; - virtual bool setEdit(int ModNum) override; + bool setEdit(int ModNum) override; - virtual bool isShow(void) const override { return true; } + bool isShow(void) const override { return true; } - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; inline SheetView* getView() const { return view; } diff --git a/src/Mod/Spreadsheet/Gui/Workbench.h b/src/Mod/Spreadsheet/Gui/Workbench.h index 06a0388c28..ba2f662d03 100644 --- a/src/Mod/Spreadsheet/Gui/Workbench.h +++ b/src/Mod/Spreadsheet/Gui/Workbench.h @@ -51,17 +51,17 @@ class SpreadsheetGuiExport Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); - void activated(); + ~Workbench() override; + void activated() override; private: bool initialized; std::unique_ptr workbenchHelper; protected: - Gui::MenuItem *setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem *setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace SpreadsheetModGui diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index 2ec41dba04..0c68f186f1 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -152,14 +152,14 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void keyPressEvent(QKeyEvent *e); - void keyReleaseEvent(QKeyEvent *e); - void paintEvent(QPaintEvent *e); - void focusInEvent(QFocusEvent *e); - void focusOutEvent(QFocusEvent *e); + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; }; /* @@ -172,7 +172,7 @@ class ColorPickerItem : public QFrame public: ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(), QWidget *parent = nullptr); - ~ColorPickerItem(); + ~ColorPickerItem() override; QColor color() const; QString text() const; @@ -187,10 +187,10 @@ public Q_SLOTS: void setColor(const QColor &color, const QString &text = QString()); protected: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void paintEvent(QPaintEvent *e); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void paintEvent(QPaintEvent *e) override; private: QColor c; @@ -208,7 +208,7 @@ class ColorPickerPopup : public QFrame public: ColorPickerPopup(int width, bool withColorDialog, QWidget *parent = nullptr); - ~ColorPickerPopup(); + ~ColorPickerPopup() override; void insertColor(const QColor &col, const QString &text, int index); void exec(); @@ -233,10 +233,10 @@ protected Q_SLOTS: void updateSelected(); protected: - void keyPressEvent(QKeyEvent *e); - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void keyPressEvent(QKeyEvent *e) override; + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; void regenerateGrid(); diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h index e7e344fdc3..391435839d 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h @@ -82,7 +82,7 @@ public: QtColorPicker(QWidget *parent = nullptr, int columns = -1, bool enableColorDialog = true); - ~QtColorPicker(); + ~QtColorPicker() override; void insertColor(const QColor &color, const QString &text = QString(), int index = -1); @@ -105,7 +105,7 @@ Q_SIGNALS: void colorSet(const QColor &); protected: - void paintEvent(QPaintEvent *e); + void paintEvent(QPaintEvent *e) override; private Q_SLOTS: void buttonPressed(bool toggled); diff --git a/src/Mod/Start/App/AppStart.cpp b/src/Mod/Start/App/AppStart.cpp index e442d3b55e..97e1d95d72 100644 --- a/src/Mod/Start/App/AppStart.cpp +++ b/src/Mod/Start/App/AppStart.cpp @@ -36,7 +36,7 @@ public: initialize("This module is the Start module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp index b538399765..ae16fa3665 100644 --- a/src/Mod/Start/Gui/AppStartGui.cpp +++ b/src/Mod/Start/Gui/AppStartGui.cpp @@ -52,7 +52,7 @@ public: initialize("This module is the StartGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.h b/src/Mod/Start/Gui/DlgStartPreferencesImp.h index 67b93dd233..124de87ec8 100644 --- a/src/Mod/Start/Gui/DlgStartPreferencesImp.h +++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.h @@ -35,12 +35,12 @@ namespace StartGui { public: DlgStartPreferencesImp( QWidget* parent = nullptr ); - ~DlgStartPreferencesImp(); + ~DlgStartPreferencesImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/Start/Gui/Workbench.h b/src/Mod/Start/Gui/Workbench.h index 074036e7f1..42930d3277 100644 --- a/src/Mod/Start/Gui/Workbench.h +++ b/src/Mod/Start/Gui/Workbench.h @@ -37,24 +37,24 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; /** Defines the standard context menu. */ - virtual void setupContextMenu(const char* recipient,Gui::MenuItem*) const; + void setupContextMenu(const char* recipient,Gui::MenuItem*) const override; /** Run some actions when the workbench gets activated. */ - virtual void activated(); + void activated() override; static void loadStartPage(); protected: /** Defines the standard menus. */ - virtual Gui::MenuItem* setupMenuBar() const; + Gui::MenuItem* setupMenuBar() const override; /** Defines the standard toolbars. */ - virtual Gui::ToolBarItem* setupToolBars() const; + Gui::ToolBarItem* setupToolBars() const override; /** Defines the standard command bars. */ - virtual Gui::ToolBarItem* setupCommandBars() const; + Gui::ToolBarItem* setupCommandBars() const override; /** Returns a DockWindowItems structure of dock windows this workbench. */ - virtual Gui::DockWindowItems* setupDockWindows() const; + Gui::DockWindowItems* setupDockWindows() const override; }; // namespace StartGui diff --git a/src/Mod/Surface/App/AppSurface.cpp b/src/Mod/Surface/App/AppSurface.cpp index 22ceb69343..149ace3c93 100644 --- a/src/Mod/Surface/App/AppSurface.cpp +++ b/src/Mod/Surface/App/AppSurface.cpp @@ -44,7 +44,7 @@ public: initialize("This module is the Surface module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h index a0f133cecf..324dfc2e94 100644 --- a/src/Mod/Surface/App/FeatureCut.h +++ b/src/Mod/Surface/App/FeatureCut.h @@ -42,8 +42,8 @@ public: App::PropertyLinkSubList ShapeList; //Shapes to be cut. // recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider // const char* getViewProviderName(void) const { // return "SurfaceGui::ViewProviderCut"; diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h index 5032dc79d6..b682531a25 100644 --- a/src/Mod/Surface/App/FeatureExtend.h +++ b/src/Mod/Surface/App/FeatureExtend.h @@ -38,7 +38,7 @@ class SurfaceExport Extend : public Part::Spline public: Extend(); - ~Extend(); + ~Extend() override; App::PropertyLinkSub Face; App::PropertyFloatConstraint Tolerance; @@ -60,8 +60,8 @@ public: } protected: - virtual void onChanged(const App::Property* prop) override; - virtual void handleChangedPropertyName(Base::XMLReader &reader, + void onChanged(const App::Property* prop) override; + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h index 161ef9bc24..1c6d58d929 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(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "SurfaceGui::ViewProviderFilling"; } diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h index b71f12b158..e4dd706278 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.h +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h @@ -68,12 +68,12 @@ public: App::PropertyBoolList ReversedList; // Booleans to handle orientation of the curves App::PropertyEnumeration FillType; // Fill method (1, 2, or 3 for Stretch, Coons, and Curved) - short mustExecute() const; - void onChanged(const App::Property*); - App::DocumentObjectExecReturn *execute(); + short mustExecute() const override; + void onChanged(const App::Property*) override; + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the view provider - const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "SurfaceGui::ViewProviderGeomFillSurface"; } diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h index 41c7cef44a..250af07359 100644 --- a/src/Mod/Surface/App/FeatureSections.h +++ b/src/Mod/Surface/App/FeatureSections.h @@ -38,7 +38,7 @@ class SurfaceExport Sections : public Part::Spline public: Sections(); - ~Sections(); + ~Sections() override; App::PropertyLinkSubList NSections; diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h index 30c2b585cd..b9e7b33c7b 100644 --- a/src/Mod/Surface/App/FeatureSewing.h +++ b/src/Mod/Surface/App/FeatureSewing.h @@ -48,8 +48,8 @@ public: App::PropertyBool Nonmanifold; //Option for non-manifold processing // recalculate the feature - App::DocumentObjectExecReturn *execute(); - short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; }; }//Namespace Surface diff --git a/src/Mod/Surface/Gui/AppSurfaceGui.cpp b/src/Mod/Surface/Gui/AppSurfaceGui.cpp index 3ab418b53f..89d00916b1 100644 --- a/src/Mod/Surface/Gui/AppSurfaceGui.cpp +++ b/src/Mod/Surface/Gui/AppSurfaceGui.cpp @@ -48,7 +48,7 @@ public: initialize("This module is the SurfaceGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: }; diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp index 60485bf9af..4c01b677a2 100644 --- a/src/Mod/Surface/Gui/TaskFilling.cpp +++ b/src/Mod/Surface/Gui/TaskFilling.cpp @@ -189,14 +189,14 @@ public: , editedObject(editedObject) { } - ~ShapeSelection() + ~ShapeSelection() override { mode = FillingPanel::None; } /** * Allow the user to pick only edges. */ - bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override { // don't allow references to itself if (pObj == editedObject) diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h index 4f1293281a..07a532c435 100644 --- a/src/Mod/Surface/Gui/TaskFilling.h +++ b/src/Mod/Surface/Gui/TaskFilling.h @@ -47,10 +47,10 @@ class ViewProviderFilling : public PartGui::ViewProviderSpline public: enum ShapeType {Vertex, Edge, Face}; - virtual void setupContextMenu(QMenu*, QObject*, const char*); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); - QIcon getIcon() const; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + QIcon getIcon() const override; void highlightReferences(ShapeType type, const References& refs, bool on); }; @@ -73,7 +73,7 @@ private: public: FillingPanel(ViewProviderFilling* vp, Surface::Filling* obj); - ~FillingPanel(); + ~FillingPanel() override; void open(); void checkOpenCommand(); @@ -82,14 +82,14 @@ public: void setEditedObject(Surface::Filling* obj); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on redo */ - virtual void slotRedoDocument(const Gui::Document& Doc); + void slotRedoDocument(const Gui::Document& Doc) override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; void modifyBoundary(bool); private Q_SLOTS: @@ -111,16 +111,16 @@ class TaskFilling : public Gui::TaskView::TaskDialog public: TaskFilling(ViewProviderFilling* vp, Surface::Filling* obj); - ~TaskFilling(); + ~TaskFilling() override; void setEditedObject(Surface::Filling* obj); public: - void open(); - void closed(); - bool accept(); - bool reject(); + void open() override; + void closed() override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.cpp b/src/Mod/Surface/Gui/TaskFillingEdge.cpp index 0c82d351c4..58e6b7fdb5 100644 --- a/src/Mod/Surface/Gui/TaskFillingEdge.cpp +++ b/src/Mod/Surface/Gui/TaskFillingEdge.cpp @@ -61,14 +61,14 @@ public: , editedObject(editedObject) { } - ~ShapeSelection() + ~ShapeSelection() override { mode = FillingEdgePanel::None; } /** * Allow the user to pick only edges. */ - bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override { // don't allow references to itself if (pObj == editedObject) diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.h b/src/Mod/Surface/Gui/TaskFillingEdge.h index 8f95bcf531..53fd2146b5 100644 --- a/src/Mod/Surface/Gui/TaskFillingEdge.h +++ b/src/Mod/Surface/Gui/TaskFillingEdge.h @@ -59,7 +59,7 @@ private: public: FillingEdgePanel(ViewProviderFilling* vp, Surface::Filling* obj); - ~FillingEdgePanel(); + ~FillingEdgePanel() override; void open(); void checkOpenCommand(); @@ -68,14 +68,14 @@ public: void setEditedObject(Surface::Filling* obj); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on redo */ - virtual void slotRedoDocument(const Gui::Document& Doc); + void slotRedoDocument(const Gui::Document& Doc) override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; void modifyBoundary(bool); private Q_SLOTS: diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.cpp b/src/Mod/Surface/Gui/TaskFillingVertex.cpp index e04cc352dc..7d9a606796 100644 --- a/src/Mod/Surface/Gui/TaskFillingVertex.cpp +++ b/src/Mod/Surface/Gui/TaskFillingVertex.cpp @@ -60,14 +60,14 @@ public: , editedObject(editedObject) { } - ~VertexSelection() + ~VertexSelection() override { mode = FillingVertexPanel::None; } /** * Allow the user to pick only edges. */ - bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override { // don't allow references to itself if (pObj == editedObject) diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.h b/src/Mod/Surface/Gui/TaskFillingVertex.h index 36dd18d7a4..bbc1052c5a 100644 --- a/src/Mod/Surface/Gui/TaskFillingVertex.h +++ b/src/Mod/Surface/Gui/TaskFillingVertex.h @@ -58,7 +58,7 @@ private: public: FillingVertexPanel(ViewProviderFilling* vp, Surface::Filling* obj); - ~FillingVertexPanel(); + ~FillingVertexPanel() override; void open(); void reject(); @@ -66,14 +66,14 @@ public: void setEditedObject(Surface::Filling* obj); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on redo */ - virtual void slotRedoDocument(const Gui::Document& Doc); + void slotRedoDocument(const Gui::Document& Doc) override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; private Q_SLOTS: void on_buttonVertexAdd_clicked(); diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp index d24688319b..f04494a796 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp @@ -148,7 +148,7 @@ public: /** * Allow the user to pick only edges. */ - bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName); + bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override; private: bool appendEdges; diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.h b/src/Mod/Surface/Gui/TaskGeomFillSurface.h index ccf3af9d63..a58142364c 100644 --- a/src/Mod/Surface/Gui/TaskGeomFillSurface.h +++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.h @@ -43,10 +43,10 @@ class ViewProviderGeomFillSurface : public PartGui::ViewProviderSpline { PROPERTY_HEADER(SurfaceGui::ViewProviderGeomFillSurface); public: - virtual void setupContextMenu(QMenu*, QObject*, const char*); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); - QIcon getIcon() const; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + QIcon getIcon() const override; void highlightReferences(bool on); }; @@ -69,7 +69,7 @@ private: public: GeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj); - ~GeomFillSurface(); + ~GeomFillSurface() override; void open(); void checkOpenCommand(); @@ -78,14 +78,14 @@ public: void setEditedObject(Surface::GeomFillSurface* obj); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on redo */ - virtual void slotRedoDocument(const Gui::Document& Doc); + void slotRedoDocument(const Gui::Document& Doc) override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; void changeFillType(GeomFill_FillingStyle); void flipOrientation(QListWidgetItem*); @@ -107,15 +107,15 @@ class TaskGeomFillSurface : public Gui::TaskView::TaskDialog public: TaskGeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj); - ~TaskGeomFillSurface(); + ~TaskGeomFillSurface() override; void setEditedObject(Surface::GeomFillSurface* obj); public: - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Surface/Gui/TaskSections.cpp b/src/Mod/Surface/Gui/TaskSections.cpp index a26391ba45..349710ff0c 100644 --- a/src/Mod/Surface/Gui/TaskSections.cpp +++ b/src/Mod/Surface/Gui/TaskSections.cpp @@ -193,14 +193,14 @@ public: , editedObject(editedObject) { } - ~ShapeSelection() + ~ShapeSelection() override { mode = SectionsPanel::None; } /** * Allow the user to pick only edges. */ - bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) + bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override { // don't allow references to itself if (pObj == editedObject) diff --git a/src/Mod/Surface/Gui/TaskSections.h b/src/Mod/Surface/Gui/TaskSections.h index 0a99374445..7c64caef52 100644 --- a/src/Mod/Surface/Gui/TaskSections.h +++ b/src/Mod/Surface/Gui/TaskSections.h @@ -46,10 +46,10 @@ class ViewProviderSections : public PartGui::ViewProviderSpline public: enum ShapeType {Vertex, Edge, Face}; - virtual void setupContextMenu(QMenu*, QObject*, const char*); - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); - QIcon getIcon() const; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; + QIcon getIcon() const override; void highlightReferences(ShapeType type, const References& refs, bool on); }; @@ -72,7 +72,7 @@ private: public: SectionsPanel(ViewProviderSections* vp, Surface::Sections* obj); - ~SectionsPanel(); + ~SectionsPanel() override; void open(); void checkOpenCommand(); @@ -81,14 +81,14 @@ public: void setEditedObject(Surface::Sections* obj); protected: - void changeEvent(QEvent *e); - virtual void onSelectionChanged(const Gui::SelectionChanges& msg); + void changeEvent(QEvent *e) override; + void onSelectionChanged(const Gui::SelectionChanges& msg) override; /** Notifies on undo */ - virtual void slotUndoDocument(const Gui::Document& Doc); + void slotUndoDocument(const Gui::Document& Doc) override; /** Notifies on redo */ - virtual void slotRedoDocument(const Gui::Document& Doc); + void slotRedoDocument(const Gui::Document& Doc) override; /** Notifies when the object is about to be removed. */ - virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj); + void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; private Q_SLOTS: void on_buttonEdgeAdd_clicked(); @@ -108,15 +108,15 @@ class TaskSections : public Gui::TaskView::TaskDialog public: TaskSections(ViewProviderSections* vp, Surface::Sections* obj); - ~TaskSections(); + ~TaskSections() override; void setEditedObject(Surface::Sections* obj); public: - void open(); - bool accept(); - bool reject(); + void open() override; + bool accept() override; + bool reject() override; - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } private: diff --git a/src/Mod/Surface/Gui/ViewProviderExtend.h b/src/Mod/Surface/Gui/ViewProviderExtend.h index 7b2aff4ce2..8c9812a2ae 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() const; + QIcon getIcon() const override; }; } //namespace SurfaceGui diff --git a/src/Mod/Surface/Gui/Workbench.h b/src/Mod/Surface/Gui/Workbench.h index d82b2a203b..e9b2d29059 100644 --- a/src/Mod/Surface/Gui/Workbench.h +++ b/src/Mod/Surface/Gui/Workbench.h @@ -34,11 +34,11 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; }; } // namespace SurfaceGui diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index d218e9e283..264a6105fa 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -191,10 +191,10 @@ public: ); initialize("This is a module for making drawings"); // register with Python } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h index 40f8ab390f..1a297be59f 100644 --- a/src/Mod/TechDraw/App/Cosmetic.h +++ b/src/Mod/TechDraw/App/Cosmetic.h @@ -70,23 +70,23 @@ public: CosmeticVertex(); CosmeticVertex(const CosmeticVertex* cv); CosmeticVertex(Base::Vector3d loc); - virtual ~CosmeticVertex() = default; + ~CosmeticVertex() override = default; void move(Base::Vector3d newPos); void moveRelative(Base::Vector3d movement); std::string toString() const; - void dump(const char* title); + void dump(const char* title) override; Base::Vector3d scaled(double factor); static bool restoreCosmetic(); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; CosmeticVertex* copy() const; CosmeticVertex* clone() const; @@ -99,7 +99,7 @@ public: bool visible; //base class vertex also has visible property boost::uuids::uuid getTag() const; - virtual std::string getTagAsString() const; + std::string getTagAsString() const override; protected: //Uniqueness @@ -128,21 +128,21 @@ public: CosmeticEdge(Base::Vector3d p1, Base::Vector3d p2); CosmeticEdge(TopoDS_Edge e); CosmeticEdge(TechDraw::BaseGeomPtr g); - virtual ~CosmeticEdge(); + ~CosmeticEdge() override; void initialize(); TopoDS_Edge TopoDS_EdgeFromVectors(Base::Vector3d pt1, Base::Vector3d pt2); TechDraw::BaseGeomPtr scaledGeometry(double scale); - virtual std::string toString() const; + std::string toString() const override; void dump(const char* title); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; CosmeticEdge* copy() const; CosmeticEdge* clone() const; @@ -154,7 +154,7 @@ public: LineFormat m_format; boost::uuids::uuid getTag() const; - virtual std::string getTagAsString() const; + std::string getTagAsString() const override; protected: //Uniqueness @@ -201,16 +201,16 @@ public: double v = 0.0, double r = 0.0, double x = 0.0); - virtual ~CenterLine(); + ~CenterLine() override; TechDraw::BaseGeomPtr BaseGeomPtrFromVectors(Base::Vector3d pt1, Base::Vector3d pt2); // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; CenterLine* copy() const; CenterLine* clone() const; @@ -309,14 +309,14 @@ public: GeomFormat(TechDraw::GeomFormat* gf); GeomFormat(int idx, LineFormat fmt); - ~GeomFormat(); + ~GeomFormat() override; // Persistence implementer --------------------- - virtual unsigned int getMemSize() const; - virtual void Save(Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; GeomFormat* copy() const; GeomFormat* clone() const; diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h index cd485dabd4..c11ae54fc2 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.h +++ b/src/Mod/TechDraw/App/CosmeticExtension.h @@ -44,7 +44,7 @@ class TechDrawExport CosmeticExtension : public App::DocumentObjectExtension { public: CosmeticExtension(); - virtual ~CosmeticExtension(); + ~CosmeticExtension() override; TechDraw::PropertyCosmeticVertexList CosmeticVertexes; TechDraw::PropertyCosmeticEdgeList CosmeticEdges; @@ -82,7 +82,7 @@ public: virtual void removeGeomFormat(std::string tag); - PyObject* getExtensionPyObject(); + PyObject* getExtensionPyObject() override; protected: /* virtual void extHandleChangedPropertyName(Base::XMLReader &reader, */ diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index b62a50d7cc..1afbbd3afd 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -44,22 +44,22 @@ class TechDrawExport DrawHatch : public App::DocumentObject public: DrawHatch(); - virtual ~DrawHatch(); + ~DrawHatch() override; App::PropertyLinkSub Source; // the dvp & face this hatch belongs to App::PropertyFile HatchPattern; App::PropertyFileIncluded SvgIncluded; - virtual App::DocumentObjectExecReturn *execute() override; - virtual short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderHatch"; } - virtual void unsetupObject() override; + void unsetupObject() override; //return PyObject as DrawHatchPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; DrawViewPart* getSourceView() const; bool affectsFace(int i); @@ -75,8 +75,8 @@ public: protected: void onChanged(const App::Property* prop) override; - virtual void onDocumentRestored() override; - virtual void setupObject() override; + void onDocumentRestored() override; + void setupObject() override; void setupFileIncluded(); void replaceFileIncluded(std::string newSvgFile); diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.h b/src/Mod/TechDraw/App/DrawLeaderLine.h index 2204c45840..c9611ab74f 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.h +++ b/src/Mod/TechDraw/App/DrawLeaderLine.h @@ -39,7 +39,7 @@ class TechDrawExport DrawLeaderLine : public TechDraw::DrawView public: DrawLeaderLine(); - virtual ~DrawLeaderLine(); + ~DrawLeaderLine() override; App::PropertyLink LeaderParent; App::PropertyVectorList WayPoints; @@ -52,14 +52,14 @@ public: App::PropertyBool Scalable; App::PropertyBool AutoHorizontal; - virtual short mustExecute() const override; - virtual App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderLeader"; } - virtual PyObject *getPyObject() override; - virtual QRectF getRect() const override { return QRectF(0,0,1,1);} + PyObject *getPyObject() override; + QRectF getRect() const override { return QRectF(0,0,1,1);} Base::Vector3d getAttachPoint(); DrawView* getBaseView() const; @@ -75,7 +75,7 @@ public: Base::Vector3d getTailPoint() const; protected: - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; private: /* static const char* ArrowTypeEnums[];*/ diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index 4a1562a990..e36c153c70 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -40,7 +40,7 @@ class TechDrawExport DrawPage: public App::DocumentObject public: DrawPage(); - virtual ~DrawPage(); + ~DrawPage() override; App::PropertyLinkList Views; App::PropertyLink Template; @@ -54,9 +54,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} - virtual void handleChangedPropertyType( + void handleChangedPropertyType( Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; int addView(App::DocumentObject *docObj); @@ -65,7 +65,7 @@ public: boost::signals2::signal signalGuiPaint; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderPage"; } @@ -108,8 +108,8 @@ public: protected: void onBeforeChange(const App::Property* prop) override; void onChanged(const App::Property* prop) override; - virtual void onDocumentRestored() override; - virtual void unsetupObject() override; + void onDocumentRestored() override; + void unsetupObject() override; bool m_forceRedraw; diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h index 5f77a4da18..f768a69a74 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.h +++ b/src/Mod/TechDraw/App/DrawProjGroup.h @@ -53,7 +53,7 @@ class TechDrawExport DrawProjGroup : public TechDraw::DrawViewCollection public: /// Constructor DrawProjGroup(); - ~DrawProjGroup(); + ~DrawProjGroup() override; App::PropertyLinkList Source; App::PropertyXLinkList XSource; @@ -71,7 +71,7 @@ public: Base::BoundBox3d getBoundingBox() const; double calculateAutomaticScale() const; - virtual QRectF getRect() const override; + QRectF getRect() const override; /// Check if container has a view of a specific type bool hasProjection(const char *viewProjType) const; @@ -97,15 +97,15 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderProjGroup"; } //return PyObject as DrawProjGroupPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; /// Determines either "First Angle" or "Third Angle". App::Enumeration usedProjectionType(); @@ -176,7 +176,7 @@ protected: Base::Vector3d dir2vec(gp_Dir d); gp_Dir vec2dir(Base::Vector3d v); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; bool m_lockScale; }; diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.h b/src/Mod/TechDraw/App/DrawProjGroupItem.h index a9453be62d..55ab458ddf 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.h +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.h @@ -55,50 +55,50 @@ class TechDrawExport DrawProjGroupItem : public TechDraw::DrawViewPart public: /// Constructor DrawProjGroupItem(); - virtual ~DrawProjGroupItem(); + ~DrawProjGroupItem() override; App::PropertyEnumeration Type; App::PropertyVector RotationVector; //this is superseded by dvp xdirection short mustExecute() const override; - virtual void onDocumentRestored() override; - virtual void unsetupObject() override; + void onDocumentRestored() override; + void unsetupObject() override; DrawProjGroup* getPGroup() const; double getRotateAngle(); - virtual Base::Vector3d getXDirection() const override; - virtual Base::Vector3d getLegacyX(const Base::Vector3d& pt, + Base::Vector3d getXDirection() const override; + Base::Vector3d getLegacyX(const Base::Vector3d& pt, const Base::Vector3d& axis, const bool flip = true) const override; - virtual App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName() const override { + App::DocumentObjectExecReturn *execute() override; + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderProjGroupItem"; } //return PyObject as DrawProjGroupItemPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; //this doesn't override for dvp pointer?? - virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt, + gp_Ax2 getViewAxis(const Base::Vector3d& pt, const Base::Vector3d& direction, const bool flip=true) const override; - virtual double getScale() const override; + double getScale() const override; void autoPosition(); bool isAnchor() const; //DPGI always fits on page since DPG handles scaling - virtual bool checkFit() const override { return true; } - virtual bool checkFit(DrawPage*) const override { return true; } + bool checkFit() const override { return true; } + bool checkFit(DrawPage*) const override { return true; } - virtual int countParentPages() const override; - virtual DrawPage* findParentPage() const override; - virtual std::vector findAllParentPages() const override; + int countParentPages() const override; + DrawPage* findParentPage() const override; + std::vector findAllParentPages() const override; protected: void onChanged(const App::Property* prop) override; - virtual bool isLocked() const override; - virtual bool showLock() const override; + bool isLocked() const override; + bool showLock() const override; private: static const char* TypeEnums[]; diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h index a2fdb3aee4..4b13488126 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.h +++ b/src/Mod/TechDraw/App/DrawRichAnno.h @@ -38,25 +38,25 @@ class TechDrawExport DrawRichAnno : public TechDraw::DrawView public: DrawRichAnno(); - virtual ~DrawRichAnno(); + ~DrawRichAnno() override; App::PropertyLink AnnoParent; App::PropertyString AnnoText; App::PropertyBool ShowFrame; App::PropertyFloat MaxWidth; - virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(); + short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderRichAnno"; } - virtual PyObject *getPyObject(); - virtual QRectF getRect() const { return QRectF(0,0,1,1);} + PyObject *getPyObject() override; + QRectF getRect() const override { return QRectF(0,0,1,1);} DrawView* getBaseView() const; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: }; diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h index 221a35782d..a523d064ec 100644 --- a/src/Mod/TechDraw/App/DrawTile.h +++ b/src/Mod/TechDraw/App/DrawTile.h @@ -37,25 +37,25 @@ class TechDrawExport DrawTile : public App::DocumentObject public: DrawTile(); - virtual ~DrawTile(); + ~DrawTile() override; App::PropertyLink TileParent; //eg DrawWeldSymbol App::PropertyIntegerConstraint TileRow; App::PropertyIntegerConstraint::Constraints TileRowConstraints; App::PropertyInteger TileColumn; - virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(void); + short mustExecute() const override; + App::DocumentObjectExecReturn *execute(void) override; - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "TechDrawGui::ViewProviderTile"; } - virtual PyObject *getPyObject(void); + PyObject *getPyObject(void) override; virtual DrawView* getParent(void) const; protected: - virtual void onChanged(const App::Property* prop); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void onChanged(const App::Property* prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; private: }; diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h index cb1d5d9a6d..1a52551dde 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.h +++ b/src/Mod/TechDraw/App/DrawTileWeld.h @@ -40,7 +40,7 @@ class TechDrawExport DrawTileWeld : public TechDraw::DrawTile public: DrawTileWeld(); - virtual ~DrawTileWeld(); + ~DrawTileWeld() override; App::PropertyString LeftText; App::PropertyString RightText; @@ -48,15 +48,15 @@ public: App::PropertyFile SymbolFile; App::PropertyFileIncluded SymbolIncluded; - virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(); - virtual void onDocumentRestored(); - virtual void setupObject(); + short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; + void onDocumentRestored() override; + void setupObject() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderTile"; } - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; virtual QRectF getRect() const { return QRectF(0,0,1,1);} void replaceSymbolIncluded(std::string newSymbolFile); @@ -66,7 +66,7 @@ public: std::string prefSymbol(); protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: }; diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index d123f0e8c3..3e3a7f5f06 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -52,7 +52,7 @@ class TechDrawExport DrawView : public App::DocumentObject public: /// Constructor DrawView(); - virtual ~DrawView(); + ~DrawView() override; App::PropertyDistance X; App::PropertyDistance Y; @@ -66,22 +66,22 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; - virtual void onDocumentRestored() override; - virtual short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; + void onDocumentRestored() override; + short mustExecute() const override; //@} - virtual void handleChangedPropertyType( + void handleChangedPropertyType( Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; bool isInClip(); DrawViewClip* getClipGroup(); /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDrawingView"; } //return PyObject as DrawViewPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; virtual DrawPage* findParentPage() const; virtual std::vector findAllParentPages() const; @@ -105,7 +105,7 @@ public: void setScaleAttribute(); protected: - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; virtual void validateScale(); std::string pageFeatName; bool autoPos; diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 17be99e269..fbfe1bc357 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView public: /// Constructor DrawViewAnnotation(); - virtual ~DrawViewAnnotation(); + ~DrawViewAnnotation() override; App::PropertyStringList Text; App::PropertyFont Font; @@ -52,22 +52,22 @@ public: App::PropertyEnumeration TextStyle; // Plain,Bold,Italic,Bold-Italic App::PropertyLength MaxWidth; - virtual QRectF getRect() const; + QRectF getRect() const override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderAnnotation"; } protected: - virtual void onChanged(const App::Property* prop); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void onChanged(const App::Property* prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; private: static const char* TextStyleEnums[]; diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index 75b733b095..994b6aca21 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -40,7 +40,7 @@ class TechDrawExport DrawViewArch : public TechDraw::DrawViewSymbol public: /// Constructor DrawViewArch(); - virtual ~DrawViewArch(); + ~DrawViewArch() override; App::PropertyLink Source; App::PropertyBool AllOn; @@ -56,15 +56,15 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderArch"; } - virtual short mustExecute() const override; + short mustExecute() const override; protected: diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h index b09dc0d186..4910841755 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.h +++ b/src/Mod/TechDraw/App/DrawViewBalloon.h @@ -46,7 +46,7 @@ class TechDrawExport DrawViewBalloon : public TechDraw::DrawView public: /// Constructor DrawViewBalloon(); - virtual ~DrawViewBalloon(); + ~DrawViewBalloon() override; App::PropertyLink SourceView; App::PropertyString Text; @@ -68,9 +68,9 @@ public: //virtual PyObject *getPyObject(void); - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderBalloon"; } @@ -87,10 +87,10 @@ public: protected: void onChanged(const App::Property* prop) override; - virtual void handleChangedPropertyType(Base::XMLReader &reader, + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; - virtual void handleChangedPropertyName(Base::XMLReader &reader, + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index 68c89c21e9..bc3b15e515 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewClip: public TechDraw::DrawView public: /// Constructor DrawViewClip(); - virtual ~DrawViewClip(); + ~DrawViewClip() override; App::PropertyLength Width; App::PropertyLength Height; @@ -51,28 +51,28 @@ public: void addView(DrawView *view); void removeView(DrawView *view); - short mustExecute() const; + short mustExecute() const override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewClip"; } //return PyObject as DrawViewClipPy - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; std::vector getChildViewNames(); bool isViewInClip(App::DocumentObject* view); - virtual QRectF getRect() const { return QRectF(0,0,Width.getValue(),Height.getValue()); } + QRectF getRect() const override { return QRectF(0,0,Width.getValue(),Height.getValue()); } protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; }; typedef App::FeaturePythonT DrawViewClipPython; diff --git a/src/Mod/TechDraw/App/DrawViewCollection.h b/src/Mod/TechDraw/App/DrawViewCollection.h index 8c9b8bcc53..02d67f13e3 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.h +++ b/src/Mod/TechDraw/App/DrawViewCollection.h @@ -43,8 +43,8 @@ public: public: /// Constructor DrawViewCollection(); - virtual ~DrawViewCollection(); - short mustExecute() const; + ~DrawViewCollection() override; + short mustExecute() const override; int addView(DrawView *view); int removeView(DrawView *view); @@ -54,18 +54,18 @@ public: int countChildren(); void lockChildren(); - virtual void onDocumentRestored(); - virtual App::DocumentObjectExecReturn *execute(); - virtual void unsetupObject(); + void onDocumentRestored() override; + App::DocumentObjectExecReturn *execute() override; + void unsetupObject() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewCollection"; } - virtual QRectF getRect() const; + QRectF getRect() const override; protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; bool nowUnsetting; }; diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h index 9d26ae5566..dca5cc9acc 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.h +++ b/src/Mod/TechDraw/App/DrawViewDetail.h @@ -51,20 +51,20 @@ class TechDrawExport DrawViewDetail : public DrawViewPart public: /// Constructor DrawViewDetail(); - virtual ~DrawViewDetail(); + ~DrawViewDetail() override; App::PropertyLink BaseView; App::PropertyVector AnchorPoint; App::PropertyFloat Radius; App::PropertyString Reference; - virtual short mustExecute() const override; - virtual App::DocumentObjectExecReturn *execute() override; - virtual void onChanged(const App::Property* prop) override; - virtual const char* getViewProviderName() const override { + short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; + void onChanged(const App::Property* prop) override; + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } - virtual void unsetupObject() override; + void unsetupObject() override; void detailExec(TopoDS_Shape s, @@ -73,7 +73,7 @@ public: double getFudgeRadius(); TopoDS_Shape projectEdgesOntoFace(TopoDS_Shape edgeShape, TopoDS_Face projFace, gp_Dir projDir); - virtual std::vector getDetailRefs() const override; + std::vector getDetailRefs() const override; protected: Base::Vector3d toR3(const gp_Ax2 fromSystem, const Base::Vector3d fromPoint); diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h index 393d7e0e4b..4a0850ab65 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.h +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h @@ -40,7 +40,7 @@ class TechDrawExport DrawViewDimExtent : public TechDraw::DrawViewDimension public: /// Constructor DrawViewDimExtent(); - virtual ~DrawViewDimExtent(); + ~DrawViewDimExtent() override; App::PropertyLinkSubList Source; //DrawViewPart & SubElements(Edges) //Cosmetic End points are stored in DVD::References2d @@ -48,19 +48,19 @@ public: App::PropertyInteger DirExtent; //Horizontal, Vertical, TBD App::PropertyStringList CosmeticTags; //id of cosmetic end points. - virtual App::DocumentObjectExecReturn *execute(); - virtual short mustExecute() const; - virtual void unsetupObject(); + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; + void unsetupObject() override; - virtual bool checkReferences2D() const; + bool checkReferences2D() const override; //return PyObject as DrawViewDimExtentPy - virtual PyObject *getPyObject(); + PyObject *getPyObject() override; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; std::vector getSubNames(); - virtual pointPair getPointsTwoVerts(); + pointPair getPointsTwoVerts() override; private: }; diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 02498bc771..0f9b57b4f1 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -130,7 +130,7 @@ class TechDrawExport DrawViewDimension : public TechDraw::DrawView public: /// Constructor DrawViewDimension(); - virtual ~DrawViewDimension(); + ~DrawViewDimension() override; App::PropertyEnumeration MeasureType; //True/Projected App::PropertyLinkSubList References2D; //Points to Projection SubFeatures @@ -170,15 +170,15 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDimension"; } //return PyObject as DrawViewDimensionPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; virtual std::string getFormattedToleranceValue(int partial); virtual std::pair getFormattedToleranceValues(int partial = 0); @@ -191,7 +191,7 @@ public: QStringList getPrefixSuffixSpec(QString fSpec); virtual DrawViewPart* getViewPart() const; - virtual QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit! + QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit! virtual int getRefType() const; //Vertex-Vertex, Edge, Edge-Edge static int getRefTypeSubElements(const std::vector &); //Vertex-Vertex, Edge, Edge-Edge void setAll3DMeasurement(); @@ -213,10 +213,10 @@ public: bool useDecimals() const; protected: - virtual void handleChangedPropertyType(Base::XMLReader &, const char * , App::Property * ) override; - virtual void Restore(Base::XMLReader& reader) override; - virtual void onChanged(const App::Property* prop) override; - virtual void onDocumentRestored() override; + void handleChangedPropertyType(Base::XMLReader &, const char * , App::Property * ) override; + void Restore(Base::XMLReader& reader) override; + void onChanged(const App::Property* prop) override; + void onDocumentRestored() override; std::string getPrefix() const; std::string getDefaultFormatSpec(bool isToleranceFormat = false) const; virtual pointPair getPointsOneEdge(); diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 5a3869d4a6..a68c4b4391 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -41,7 +41,7 @@ class TechDrawExport DrawViewDraft : public TechDraw::DrawViewSymbol public: /// Constructor DrawViewDraft(); - virtual ~DrawViewDraft(); + ~DrawViewDraft() override; App::PropertyLink Source; App::PropertyFloat LineWidth; @@ -55,15 +55,15 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDraft"; } - virtual short mustExecute() const override; + short mustExecute() const override; protected: /* virtual void onChanged(const App::Property* prop) override;*/ diff --git a/src/Mod/TechDraw/App/DrawViewImage.h b/src/Mod/TechDraw/App/DrawViewImage.h index dbe0277cab..2d2379dede 100644 --- a/src/Mod/TechDraw/App/DrawViewImage.h +++ b/src/Mod/TechDraw/App/DrawViewImage.h @@ -43,7 +43,7 @@ class TechDrawExport DrawViewImage : public TechDraw::DrawView public: /// Constructor DrawViewImage(); - virtual ~DrawViewImage(); + ~DrawViewImage() override; App::PropertyFile ImageFile; App::PropertyFileIncluded ImageIncluded; diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index 1548fbfb38..ac3469a6e6 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -55,20 +55,20 @@ class TechDrawExport DrawViewMulti : public DrawViewPart public: /// Constructor DrawViewMulti(); - virtual ~DrawViewMulti(); + ~DrawViewMulti() override; App::PropertyLinkList Sources; - virtual short mustExecute() const override; + short mustExecute() const override; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; - virtual void onChanged(const App::Property* prop) override; + App::DocumentObjectExecReturn *execute() override; + void onChanged(const App::Property* prop) override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h index 803a864d4b..82944facba 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.h +++ b/src/Mod/TechDraw/App/DrawViewPart.h @@ -81,7 +81,7 @@ class TechDrawExport DrawViewPart : public DrawView, public CosmeticExtension public: DrawViewPart(); - virtual ~DrawViewPart(); + ~DrawViewPart() override; App::PropertyLinkList Source; App::PropertyXLinkList XSource; @@ -103,13 +103,13 @@ public: App::PropertyBool IsoHidden; App::PropertyInteger IsoCount; - virtual short mustExecute() const override; - virtual void onDocumentRestored() override; - virtual App::DocumentObjectExecReturn *execute() override; - virtual const char* getViewProviderName() const override { + short mustExecute() const override; + void onDocumentRestored() override; + App::DocumentObjectExecReturn *execute() override; + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewPart"; } - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; std::vector getHatches() const; std::vector getGeomHatches() const; @@ -132,7 +132,7 @@ public: virtual Base::BoundBox3d getBoundingBox() const; double getBoxX() const; double getBoxY() const; - virtual QRectF getRect() const override; + QRectF getRect() const override; virtual std::vector getSectionRefs() const; //are there ViewSections based on this ViewPart? virtual std::vector getDetailRefs() const; @@ -204,8 +204,8 @@ protected: TechDraw::GeometryObject *geometryObject; Base::BoundBox3d bbox; - virtual void onChanged(const App::Property* prop) override; - virtual void unsetupObject() override; + void onChanged(const App::Property* prop) override; + void unsetupObject() override; virtual TechDraw::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis); //const?? virtual TechDraw::GeometryObject* makeGeometryForShape(TopoDS_Shape shape); //const?? diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h index be27cebb48..729d3e5677 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.h +++ b/src/Mod/TechDraw/App/DrawViewSection.h @@ -62,7 +62,7 @@ class TechDrawExport DrawViewSection : public DrawViewPart public: DrawViewSection(); - virtual ~DrawViewSection(); + ~DrawViewSection() override; App::PropertyLink BaseView; App::PropertyVector SectionNormal; @@ -83,13 +83,13 @@ 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() override; - virtual void onChanged(const App::Property* prop) override; - virtual const char* getViewProviderName() const override { + App::DocumentObjectExecReturn *execute() override; + void onChanged(const App::Property* prop) override; + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderViewSection"; } - virtual void unsetupObject() override; - virtual short mustExecute() const override; + void unsetupObject() override; + short mustExecute() const override; void sectionExec(TopoDS_Shape s); @@ -102,7 +102,7 @@ public: Base::Vector3d axis, double degAngle) const; gp_Ax2 getSectionCS() const; - virtual Base::Vector3d getXDirection() const override; //don't use XDirection.getValue() + Base::Vector3d getXDirection() const override; //don't use XDirection.getValue() TechDraw::DrawViewPart* getBaseDVP() const; TechDraw::DrawProjGroupItem* getBaseDPGI() const; @@ -138,8 +138,8 @@ protected: TopoDS_Shape m_cutShape; - virtual void onDocumentRestored() override; - virtual void setupObject() override; + void onDocumentRestored() override; + void setupObject() override; void setupSvgIncluded(); void setupPatIncluded(); void replaceSvgIncluded(std::string newSvgFile); diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h index 5e075719fd..5d9b5b6ada 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h @@ -39,7 +39,7 @@ class TechDrawExport DrawViewSpreadsheet : public TechDraw::DrawViewSymbol public: DrawViewSpreadsheet(); - virtual ~DrawViewSpreadsheet(); + ~DrawViewSpreadsheet() override; App::PropertyLink Source; App::PropertyString CellStart; App::PropertyString CellEnd; @@ -49,16 +49,16 @@ public: App::PropertyFloat TextSize; - virtual App::DocumentObjectExecReturn *execute(); - virtual short mustExecute() const; + App::DocumentObjectExecReturn *execute() override; + short mustExecute() const override; std::string getSheetImage(); - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderSpreadsheet"; } protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; std::vector getAvailColumns(); std::string getSVGHead(); std::string getSVGTail(); diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.h b/src/Mod/TechDraw/App/DrawViewSymbol.h index a760b24613..7ac68a1c19 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.h +++ b/src/Mod/TechDraw/App/DrawViewSymbol.h @@ -45,7 +45,7 @@ class TechDrawExport DrawViewSymbol : public TechDraw::DrawView public: /// Constructor DrawViewSymbol(); - virtual ~DrawViewSymbol(); + ~DrawViewSymbol() override; App::PropertyString Symbol; App::PropertyStringList EditableTexts; @@ -53,21 +53,21 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; //@} /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderSymbol"; } - virtual QRectF getRect() const override; - virtual bool checkFit(TechDraw::DrawPage* p) const override; + QRectF getRect() const override; + bool checkFit(TechDraw::DrawPage* p) const override; //return PyObject as DrawViewSymbolPy - virtual PyObject *getPyObject() override; + PyObject *getPyObject() override; protected: - virtual void onChanged(const App::Property* prop) override; + void onChanged(const App::Property* prop) override; Base::BoundBox3d bbox; std::vector getEditableFields(); diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index c106de20a6..86e1e72c8f 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -40,7 +40,7 @@ class TechDrawExport DrawWeldSymbol : public TechDraw::DrawView public: DrawWeldSymbol(); - virtual ~DrawWeldSymbol(); + ~DrawWeldSymbol() override; App::PropertyLink Leader; App::PropertyBool AllAround; @@ -48,21 +48,21 @@ public: App::PropertyBool AlternatingWeld; App::PropertyString TailText; - virtual short mustExecute() const; - virtual App::DocumentObjectExecReturn *execute(); - virtual void onSettingDocument(); + short mustExecute() const override; + App::DocumentObjectExecReturn *execute() override; + void onSettingDocument() override; - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderWeld"; } - virtual PyObject *getPyObject(); - virtual QRectF getRect() const { return QRectF(0,0,1,1);} + PyObject *getPyObject() override; + QRectF getRect() const override { return QRectF(0,0,1,1);} bool isTailRightSide(); std::vector getTiles() const; protected: - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; private: }; diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h index 1acdb5ad6e..510d1e0c9d 100644 --- a/src/Mod/TechDraw/App/Geometry.h +++ b/src/Mod/TechDraw/App/Geometry.h @@ -163,12 +163,12 @@ class TechDrawExport Circle: public BaseGeom Circle(); Circle(const TopoDS_Edge &e); Circle(Base::Vector3d center, double radius); - virtual ~Circle() = default; + ~Circle() override = default; public: - virtual std::string toString() const override; - virtual void Save(Base::Writer& w) const override; - virtual void Restore(Base::XMLReader& r) override; + std::string toString() const override; + void Save(Base::Writer& w) const override; + void Restore(Base::XMLReader& r) override; Base::Vector3d center; double radius; @@ -179,7 +179,7 @@ class TechDrawExport Ellipse: public BaseGeom public: Ellipse(const TopoDS_Edge &e); Ellipse(Base::Vector3d c, double mnr, double mjr); - virtual ~Ellipse() = default; + ~Ellipse() override = default; public: Base::Vector3d center; @@ -194,7 +194,7 @@ class TechDrawExport AOE: public Ellipse { public: AOE(const TopoDS_Edge &e); - ~AOE() = default; + ~AOE() override = default; public: Base::Vector3d startPnt; //TODO: The points are used for drawing, the angles for bounding box calcs - seems redundant @@ -218,12 +218,12 @@ class TechDrawExport AOC: public Circle AOC(const TopoDS_Edge &e); AOC(Base::Vector3d c, double r, double s, double e); AOC(); - ~AOC() = default; + ~AOC() override = default; public: - virtual std::string toString() const override; - virtual void Save(Base::Writer& w) const override; - virtual void Restore(Base::XMLReader& r) override; + std::string toString() const override; + void Save(Base::Writer& w) const override; + void Restore(Base::XMLReader& r) override; Base::Vector3d startPnt; Base::Vector3d endPnt; @@ -249,7 +249,7 @@ class TechDrawExport BezierSegment: public BaseGeom public: BezierSegment(const TopoDS_Edge &e); BezierSegment() { poles = degree = 0; } - ~BezierSegment() = default; + ~BezierSegment() override = default; int poles; int degree; @@ -261,7 +261,7 @@ class TechDrawExport BSpline: public BaseGeom { public: BSpline(const TopoDS_Edge &e); - ~BSpline() = default; + ~BSpline() override = default; public: Base::Vector3d startPnt; @@ -286,11 +286,11 @@ class TechDrawExport Generic: public BaseGeom public: Generic(const TopoDS_Edge &e); Generic(); - ~Generic() = default; + ~Generic() override = default; - virtual std::string toString() const override; - virtual void Save(Base::Writer& w) const override; - virtual void Restore(Base::XMLReader& r) override; + std::string toString() const override; + void Save(Base::Writer& w) const override; + void Restore(Base::XMLReader& r) override; Base::Vector3d asVector(); double slope(); Base::Vector3d apparentInter(GenericPtr g); diff --git a/src/Mod/TechDraw/App/LandmarkDimension.h b/src/Mod/TechDraw/App/LandmarkDimension.h index 0c73a5da14..7fd7c92685 100644 --- a/src/Mod/TechDraw/App/LandmarkDimension.h +++ b/src/Mod/TechDraw/App/LandmarkDimension.h @@ -46,30 +46,30 @@ class TechDrawExport LandmarkDimension : public TechDraw::DrawViewDimension public: /// Constructor LandmarkDimension(); - virtual ~LandmarkDimension(); + ~LandmarkDimension() override; App::PropertyStringList ReferenceTags; //tags of 2d vertices in DVP - virtual App::DocumentObjectExecReturn *execute() override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; - virtual void unsetupObject() override; + void unsetupObject() override; - virtual const char* getViewProviderName() const override { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderDimension"; } /* virtual PyObject *getPyObject(void) override;*/ - virtual bool checkReferences2D() const override; - virtual bool has2DReferences() const override; - virtual pointPair getPointsTwoVerts() override; + bool checkReferences2D() const override; + bool has2DReferences() const override; + pointPair getPointsTwoVerts() override; std::vector get2DPoints() const; - virtual DrawViewPart* getViewPart() const override; - virtual int getRefType() const override; + DrawViewPart* getViewPart() const override; + int getRefType() const override; gp_Ax2 getProjAxis() const; protected: - virtual void onChanged(const App::Property* prop) override; - virtual void onDocumentRestored() override; + void onChanged(const App::Property* prop) override; + void onDocumentRestored() override; Base::Vector3d projectPoint(const Base::Vector3d& pt, DrawViewPart* dvp) const; diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp index 3004397e6b..d5796672cf 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp @@ -82,10 +82,10 @@ public: ); initialize("This is a module for displaying drawings"); // register with Python } - virtual ~Module() {} + ~Module() override {} private: - virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) + Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override { try { return Py::ExtensionModule::invoke_method_varargs(method_def, args); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h index 118ad9cd3c..44d233ac20 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h @@ -37,12 +37,12 @@ class DlgPrefsTechDrawAdvancedImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawAdvancedImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawAdvancedImp(); + ~DlgPrefsTechDrawAdvancedImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index ced04cd34f..fdbefd264b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -37,15 +37,15 @@ class DlgPrefsTechDrawAnnotationImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawAnnotationImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawAnnotationImp(); + ~DlgPrefsTechDrawAnnotationImp() override; public Q_SLOTS: void onLineGroupChanged(int); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; int prefBalloonArrow() const; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h index 5ca8fafd10..e06f6eae9c 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h @@ -37,12 +37,12 @@ class DlgPrefsTechDrawColorsImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawColorsImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawColorsImp(); + ~DlgPrefsTechDrawColorsImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h index a230fe1681..978ad5abba 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h @@ -37,12 +37,12 @@ class DlgPrefsTechDrawDimensionsImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawDimensionsImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawDimensionsImp(); + ~DlgPrefsTechDrawDimensionsImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; int prefArrowStyle() const; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h index 480edf86af..0a201aab4b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h @@ -37,12 +37,12 @@ class DlgPrefsTechDrawGeneralImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawGeneralImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawGeneralImp(); + ~DlgPrefsTechDrawGeneralImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h index aa471e307b..c417efe675 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h @@ -37,12 +37,12 @@ class DlgPrefsTechDrawHLRImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawHLRImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawHLRImp(); + ~DlgPrefsTechDrawHLRImp() override; protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h index d3747547eb..041e193b3a 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h @@ -37,15 +37,15 @@ class DlgPrefsTechDrawScaleImp : public Gui::Dialog::PreferencePage public: DlgPrefsTechDrawScaleImp( QWidget* parent = nullptr ); - ~DlgPrefsTechDrawScaleImp(); + ~DlgPrefsTechDrawScaleImp() override; protected Q_SLOTS: void onScaleTypeChanged(int index); protected: - void saveSettings(); - void loadSettings(); - void changeEvent(QEvent *e); + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent *e) override; private: std::unique_ptr ui; diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h index 729e5265f7..d76bef562e 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.h +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h @@ -37,18 +37,18 @@ class DlgTemplateField : public QDialog public: DlgTemplateField( QWidget *parent = nullptr ); - virtual ~DlgTemplateField() = default; + ~DlgTemplateField() override = default; void setFieldName(std::string name); void setFieldContent(std::string content); QString getFieldContent(); public Q_SLOTS: - void accept(); - void reject(); + void accept() override; + void reject() override; protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: std::shared_ptr ui; diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 8b02c62b35..842a78de29 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -61,13 +61,13 @@ class TechDrawGuiExport MDIViewPage : public Gui::MDIView, public Gui::Selection public: MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = nullptr); - virtual ~MDIViewPage(); + ~MDIViewPage() override; void addChildrenToPage(); /// Observer message from the Tree Selection mechanism - void onSelectionChanged(const Gui::SelectionChanges& msg); + void onSelectionChanged(const Gui::SelectionChanges& msg) override; void preSelectionChanged(const QPoint &pos); /// QGraphicsScene selection routines @@ -80,14 +80,14 @@ public: void fixOrphans(bool force = false); void matchSceneRectToTemplate(); - bool onMsg(const char* pMsg,const char** ppReturn); - bool onHasMsg(const char* pMsg) const; + bool onMsg(const char* pMsg,const char** ppReturn) override; + bool onHasMsg(const char* pMsg) const override; - void print(); - void print(QPrinter* printer); - void printPdf(); + void print() override; + void print(QPrinter* printer) override; + void printPdf() override; void printPdf(std::string file); - void printPreview(); + void printPreview() override; void saveSVG(std::string file); void saveDXF(std::string file); @@ -95,7 +95,7 @@ public: void setDocumentObject(const std::string&); void setDocumentName(const std::string&); - PyObject* getPyObject(); + PyObject* getPyObject() override; TechDraw::DrawPage * getPage() { return m_vpPage->getDrawPage(); } QGVPage* getQGVPage() {return m_view;} @@ -113,10 +113,10 @@ public: bool addView(const App::DocumentObject *obj); static MDIViewPage *getFromScene(const QGSPage *scene); - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; public Q_SLOTS: - void viewAll(); + void viewAll() override; void saveSVG(); void saveDXF(); void savePDF(); @@ -134,7 +134,7 @@ protected: /// Attaches view of obj to m_scene. Returns true on success, false otherwise bool attachView(App::DocumentObject *obj); - void closeEvent(QCloseEvent*); + void closeEvent(QCloseEvent*) override; void setDimensionGroups(); void setBalloonGroups(); @@ -183,10 +183,10 @@ public: static void init_type(); MDIViewPagePy(MDIViewPage *mdi); - ~MDIViewPagePy(); + ~MDIViewPagePy() override; - Py::Object repr(); - Py::Object getattr(const char *); + Py::Object repr() override; + Py::Object getattr(const char *) override; Py::Object getPage(const Py::Tuple&); Py::Object cast_to_base(const Py::Tuple&); diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.h b/src/Mod/TechDraw/Gui/QGCustomClip.h index fc50a8bf2b..230540132f 100644 --- a/src/Mod/TechDraw/Gui/QGCustomClip.h +++ b/src/Mod/TechDraw/Gui/QGCustomClip.h @@ -43,13 +43,13 @@ class TechDrawGuiExport QGCustomClip : public QGraphicsItemGroup { public: explicit QGCustomClip(); - ~QGCustomClip() {} + ~QGCustomClip() override {} enum {Type = QGraphicsItem::UserType + 132}; - int type() const { return Type;} - virtual QRectF boundingRect() const; + int type() const override { return Type;} + QRectF boundingRect() const override; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); virtual void setRect(QRectF r); diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h index 70ed8a0d37..737a444477 100644 --- a/src/Mod/TechDraw/Gui/QGCustomImage.h +++ b/src/Mod/TechDraw/Gui/QGCustomImage.h @@ -45,12 +45,12 @@ class TechDrawGuiExport QGCustomImage : public QGraphicsPixmapItem { public: explicit QGCustomImage(); - ~QGCustomImage(); + ~QGCustomImage() override; enum {Type = QGraphicsItem::UserType + 201}; int type() const override { return Type;} - virtual void paint( QPainter *painter, + void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr ) override; virtual void centerAt(QPointF centerPos); diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index 8b1e14a1be..7def8c84da 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -52,13 +52,13 @@ class QGIFace : public QGIPrimPath { public: explicit QGIFace(int index = -1); - ~QGIFace(); + ~QGIFace() override; enum {Type = QGraphicsItem::UserType + 104}; int type() const override { return Type;} QRectF boundingRect() const override; QPainterPath shape() const override; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; public: enum fillMode { @@ -74,9 +74,9 @@ public: int getProjIndex() const { return projIndex; } void draw(); - virtual void setPrettyNormal() override; - virtual void setPrettyPre() override; - virtual void setPrettySel() override; + void setPrettyNormal() override; + void setPrettyPre() override; + void setPrettySel() override; void setDrawEdges(bool b); virtual void setOutline(const QPainterPath& path); diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h index a1a9facb76..e3218ebb2f 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.h +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h @@ -57,17 +57,17 @@ public: enum {Type = QGraphicsItem::UserType + 232}; explicit QGILeaderLine(); - ~QGILeaderLine() = default; + ~QGILeaderLine() override = default; int type() const override { return Type;} - virtual void paint( QPainter * painter, + void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QRectF boundingRect() const override; - virtual QPainterPath shape() const override; + QRectF boundingRect() const override; + QPainterPath shape() const override; - virtual void drawBorder() override; - virtual void updateView(bool update = false) override; + void drawBorder() override; + void updateView(bool update = false) override; virtual TechDraw::DrawLeaderLine* getFeature(); @@ -80,11 +80,11 @@ public: double getLineWidth(); double getEdgeFuzz() const; - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override; + void mousePressEvent(QGraphicsSceneMouseEvent * event) override; //void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; void setPrettyNormal(); void setPrettyPre(); @@ -94,18 +94,18 @@ public: public Q_SLOTS: void onLineEditFinished(QPointF attach, std::vector deltas); //QGEPath is finished editing points - virtual void onSourceChange(TechDraw::DrawView* newParent) override; + void onSourceChange(TechDraw::DrawView* newParent) override; Q_SIGNALS: void editComplete(); //tell caller that edit session is finished protected: - virtual void draw() override; + void draw() override; QPainterPath makeLeaderPath(std::vector qPoints); std::vector getWayPointsFromFeature(); QPointF getAttachFromFeature(); - virtual QVariant itemChange( GraphicsItemChange change, + QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; std::vector m_pathPoints; diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h index 2d26a38488..2838235c9e 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.h +++ b/src/Mod/TechDraw/Gui/QGIMatting.h @@ -43,13 +43,13 @@ class TechDrawGuiExport QGIMatting : public QGraphicsItemGroup { public: explicit QGIMatting(); - ~QGIMatting() {} + ~QGIMatting() override {} enum {Type = QGraphicsItem::UserType + 205}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); - virtual QRectF boundingRect() const; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + QRectF boundingRect() const override; virtual void setSize(double w, double h) {m_height = h; m_width = w;} //virtual void setHoleStyle(int hs) {m_holeStyle = hs;} diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h index 3992f87433..c8a31e9d0c 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.h +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h @@ -42,25 +42,25 @@ public: QGIProjGroup(); // TODO: if the QGIVO is deleted, should we clean up any remaining QGIVParts?? - ~QGIProjGroup() = default; + ~QGIProjGroup() override = default; enum {Type = QGraphicsItem::UserType + 113}; int type() const override { return Type;} void alignTo(QGIProjGroup *, const QString &alignment); - virtual void updateView(bool update = false) override; - virtual void rotateView() override; + void updateView(bool update = false) override; + void rotateView() override; - virtual void drawBorder() override; + void drawBorder() override; protected: - virtual bool sceneEventFilter(QGraphicsItem* watched, QEvent *event) override; - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem* watched, QEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; // Mouse handling - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event ) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent * event ) override; + void mousePressEvent(QGraphicsSceneMouseEvent * event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; QGIView * getAnchorQItem() const; private: diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index acaa4b2c2d..e667c199f2 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -75,12 +75,12 @@ class TechDrawGuiExport QGIView : public QObject, public QGraphicsItemGroup Q_OBJECT public: QGIView(); - virtual ~QGIView(); + ~QGIView() override; enum {Type = QGraphicsItem::UserType + 101}; int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual void paint( QPainter *painter, + QRectF boundingRect() const override; + void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr ) override; diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index 683389883b..bdc9eb7eb2 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -41,22 +41,22 @@ public: explicit QGIViewAnnotation(); /// m_textItem belongs to this group and will be deleted by Qt - ~QGIViewAnnotation() = default; + ~QGIViewAnnotation() override = default; enum {Type = QGraphicsItem::UserType + 120}; int type() const override { return Type;} - virtual void updateView(bool update = false) override; + void updateView(bool update = false) override; void setViewAnnoFeature(TechDraw::DrawViewAnnotation *obj); - virtual void draw() override; - virtual void rotateView() override; + void draw() override; + void rotateView() override; protected: void drawAnnotation(); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; QGCustomText *m_textItem; QColor m_colNormal; diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h index 4f9887b11b..0cf0814509 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h @@ -59,14 +59,14 @@ Q_OBJECT public: QGIBalloonLabel(); - virtual ~QGIBalloonLabel() = default; + ~QGIBalloonLabel() override = default; enum {Type = QGraphicsItem::UserType + 141}; int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - virtual void paint( QPainter *painter, + QRectF boundingRect() const override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr ) override; void setLabelCenter(); @@ -100,12 +100,12 @@ Q_SIGNALS: void dragFinished(); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; // virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; QGCustomText* m_labelText; @@ -129,14 +129,14 @@ public: enum {Type = QGraphicsItem::UserType + 140}; explicit QGIViewBalloon(); - virtual ~QGIViewBalloon() = default; + ~QGIViewBalloon() override = default; void setViewPartFeature(TechDraw::DrawViewBalloon *obj); int type() const override { return Type;} - virtual void drawBorder() override; - virtual void updateView(bool update = false) override; - virtual void paint( QPainter * painter, + void drawBorder() override; + void updateView(bool update = false) override; + void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; @@ -147,10 +147,10 @@ public: void setPrettySel(); void setPrettyNormal(); - virtual void setGroupSelection(bool b) override; + void setGroupSelection(bool b) override; virtual QGIBalloonLabel* getBalloonLabel() { return balloonLabel; } - virtual QColor getNormalColor() override; + QColor getNormalColor() override; int prefDefaultArrow() const; bool prefOrthoPyramid() const; @@ -163,13 +163,13 @@ public Q_SLOTS: void updateBalloon(bool obtuse = false); protected: - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) override; - virtual void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override; - virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; + void mousePressEvent( QGraphicsSceneMouseEvent * event) override; + void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override; + void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; void draw() override; void drawBalloon(bool dragged = false); - virtual QVariant itemChange( GraphicsItemChange change, + QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; virtual void setSvgPens(); virtual void setPens(); diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index 688d90bd86..8cd7e2abfd 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -35,20 +35,20 @@ class TechDrawGuiExport QGIViewClip : public QGIView public: QGIViewClip(); - ~QGIViewClip() = default; + ~QGIViewClip() override = default; enum {Type = QGraphicsItem::UserType + 123}; int type() const override { return Type;} - virtual void updateView(bool update = false) override; + void updateView(bool update = false) override; - virtual void draw() override; + void draw() override; QGCustomRect* getFrame() {return m_frame;} QGCustomClip* getClipArea() {return m_cliparea;} protected: void drawClip(); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; private: QGCustomRect* m_frame; diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.h b/src/Mod/TechDraw/Gui/QGIViewCollection.h index 2a5ca7f153..65be70ad38 100644 --- a/src/Mod/TechDraw/Gui/QGIViewCollection.h +++ b/src/Mod/TechDraw/Gui/QGIViewCollection.h @@ -37,16 +37,16 @@ class TechDrawGuiExport QGIViewCollection : public QGIView { public: QGIViewCollection(); - ~QGIViewCollection() = default; + ~QGIViewCollection() override = default; enum {Type = QGraphicsItem::UserType + 110}; int type() const override { return Type;} - virtual void updateView(bool update = false) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; + void updateView(bool update = false) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override; protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; }; diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index 43d9607cf0..7c5ffecd1a 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -61,14 +61,14 @@ Q_OBJECT public: QGIDatumLabel(); - virtual ~QGIDatumLabel() = default; + ~QGIDatumLabel() override = default; enum {Type = QGraphicsItem::UserType + 107}; int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - virtual void paint( QPainter *painter, + QRectF boundingRect() const override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr ) override; void setLabelCenter(); @@ -115,12 +115,12 @@ Q_SIGNALS: void dragFinished(); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override; // virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; QGCustomText* m_dimText; @@ -150,25 +150,25 @@ public: enum {Type = QGraphicsItem::UserType + 106}; explicit QGIViewDimension(); - ~QGIViewDimension() = default; + ~QGIViewDimension() override = default; void setViewPartFeature(TechDraw::DrawViewDimension *obj); int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual void paint( QPainter * painter, + QRectF boundingRect() const override; + void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; TechDraw::DrawViewDimension *dvDimension; - virtual void drawBorder() override; - virtual void updateView(bool update = false) override; + void drawBorder() override; + void updateView(bool update = false) override; virtual QColor prefNormalColor(); QString getLabelText(); void setPrettyPre(); void setPrettySel(); void setPrettyNormal(); - virtual void setGroupSelection(bool b) override; + void setGroupSelection(bool b) override; virtual QGIDatumLabel* getDatumLabel() { return datumLabel; } void setNormalColorAll(); @@ -183,9 +183,9 @@ public Q_SLOTS: protected: - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) override; - virtual void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override; - virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; + void mousePressEvent( QGraphicsSceneMouseEvent * event) override; + void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override; + void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override; static double getAnglePlacementFactor(double testAngle, double endAngle, double startRotation); static int compareAngleStraightness(double straightAngle, double leftAngle, double rightAngle, @@ -257,7 +257,7 @@ protected: void drawDiameter(TechDraw::DrawViewDimension *dimension, ViewProviderDimension *viewProvider) const; void drawAngle(TechDraw::DrawViewDimension *dimension, ViewProviderDimension *viewProvider) const; - virtual QVariant itemChange( GraphicsItemChange change, + QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; virtual void setSvgPens(); virtual void setPens(); diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.h b/src/Mod/TechDraw/Gui/QGIViewImage.h index 22befc9e3c..02ef85a5e1 100644 --- a/src/Mod/TechDraw/Gui/QGIViewImage.h +++ b/src/Mod/TechDraw/Gui/QGIViewImage.h @@ -38,16 +38,16 @@ class TechDrawGuiExport QGIViewImage : public QGIView { public: QGIViewImage(); - ~QGIViewImage(); + ~QGIViewImage() override; enum {Type = QGraphicsItem::UserType + 200}; int type() const override { return Type;} - virtual void updateView(bool update = false) override; + void updateView(bool update = false) override; void setViewImageFeature(TechDraw::DrawViewImage *obj); - virtual void draw() override; - virtual void rotateView() override; + void draw() override; + void rotateView() override; protected: virtual void drawImage(); diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index f497395037..4578620714 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -49,11 +49,11 @@ class TechDrawGuiExport QGIViewPart : public QGIView public: explicit QGIViewPart(); - ~QGIViewPart(); + ~QGIViewPart() override; enum {Type = QGraphicsItem::UserType + 102}; int type() const override { return Type;} - virtual void paint( QPainter * painter, + void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; @@ -61,9 +61,9 @@ public: void toggleCache(bool state) override; void toggleCosmeticLines(bool state); void setViewPartFeature(TechDraw::DrawViewPart *obj); - virtual void updateView(bool update = false) override; + void updateView(bool update = false) override; void tidy(); - virtual QRectF boundingRect() const override; + QRectF boundingRect() const override; virtual void drawAllSectionLines(); virtual void drawSectionLine(TechDraw::DrawViewSection* s, bool b); virtual void drawCenterLines(bool b); @@ -71,8 +71,8 @@ public: virtual void drawMatting(); bool showSection; - virtual void draw() override; - virtual void rotateView() override; + void draw() override; + void rotateView() override; static QPainterPath geomToPainterPath(TechDraw::BaseGeomPtr baseGeom, double rotation = 0.0); @@ -99,7 +99,7 @@ protected: void drawViewPart(); QGIFace* drawFace(TechDraw::FacePtr f, int idx); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; TechDraw::DrawHatch* faceIsHatched(int i,std::vector hatchObjs) const; TechDraw::DrawGeomHatch* faceIsGeomHatched(int i,std::vector geomObjs) const; diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.h b/src/Mod/TechDraw/Gui/QGIViewSection.h index c18d1b54dc..112d12974b 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSection.h +++ b/src/Mod/TechDraw/Gui/QGIViewSection.h @@ -33,10 +33,10 @@ class TechDrawGuiExport QGIViewSection : public QGIViewPart public: QGIViewSection() = default; - ~QGIViewSection() = default; + ~QGIViewSection() override = default; - virtual void draw() override; - virtual void updateView(bool update = false) override; + void draw() override; + void updateView(bool update = false) override; enum {Type = QGraphicsItem::UserType + 108}; int type() const override { return Type;} void drawSectionLine(TechDraw::DrawViewSection* s, bool b) override; diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h index 8d5cb1a624..4e3de25f5b 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.h @@ -36,7 +36,7 @@ class TechDrawGuiExport QGIViewSpreadsheet : public QGIViewSymbol { public: QGIViewSpreadsheet(); - ~QGIViewSpreadsheet() = default; + ~QGIViewSpreadsheet() override = default; enum {Type = QGraphicsItem::UserType + 124}; int type() const override { return Type;} diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index a5fc09d545..52d0edfe36 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -42,16 +42,16 @@ class TechDrawGuiExport QGIViewSymbol : public QGIView { public: QGIViewSymbol(); - ~QGIViewSymbol(); + ~QGIViewSymbol() override; enum {Type = QGraphicsItem::UserType + 121}; int type() const override { return Type;} - virtual void updateView(bool update = false) override; + void updateView(bool update = false) override; void setViewSymbolFeature(TechDraw::DrawViewSymbol *obj); - virtual void draw() override; - virtual void rotateView() override; + void draw() override; + void rotateView() override; protected: diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h index 9c93a40cab..f68a0978ac 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h @@ -61,18 +61,18 @@ public: enum {Type = QGraphicsItem::UserType + 340}; explicit QGIWeldSymbol(QGILeaderLine* myParent = nullptr); - ~QGIWeldSymbol() = default; + ~QGIWeldSymbol() override = default; int type() const override { return Type;} - virtual void paint( QPainter * painter, + void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QRectF boundingRect() const override; - virtual QPainterPath shape() const override; + QRectF boundingRect() const override; + QPainterPath shape() const override; double getEdgeFuzz() const; - virtual void drawBorder() override; - virtual void updateView(bool update = false) override; + void drawBorder() override; + void updateView(bool update = false) override; virtual TechDraw::DrawWeldSymbol* getFeature(); virtual void setFeature(TechDraw::DrawWeldSymbol* feat); @@ -88,12 +88,12 @@ public: void getTileFeats(); protected: - virtual QVariant itemChange( GraphicsItemChange change, + QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void draw() override; + void draw() override; void drawTile(TechDraw::DrawTileWeld* tileFeat); void drawAllAround(); void drawTailText(); diff --git a/src/Mod/TechDraw/Gui/QGSPage.h b/src/Mod/TechDraw/Gui/QGSPage.h index 23f41c5604..7c7dece416 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.h +++ b/src/Mod/TechDraw/Gui/QGSPage.h @@ -70,7 +70,7 @@ class TechDrawGuiExport QGSPage : public QGraphicsScene public: QGSPage(ViewProviderPage *vp, QWidget *parent = nullptr); - virtual ~QGSPage(); + ~QGSPage() override; QGIView * addViewDimension(TechDraw::DrawViewDimension *dim); QGIView * addViewBalloon(TechDraw::DrawViewBalloon *balloon); diff --git a/src/Mod/TechDraw/Gui/QGTracker.h b/src/Mod/TechDraw/Gui/QGTracker.h index 44f2bafc2a..9cae715bc0 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.h +++ b/src/Mod/TechDraw/Gui/QGTracker.h @@ -49,15 +49,15 @@ public: enum TrackerMode { None, Line, Circle, Rectangle, Point }; explicit QGTracker(QGSPage* scene = nullptr, QGTracker::TrackerMode m = QGTracker::TrackerMode::None); - ~QGTracker(); + ~QGTracker() override; enum {Type = QGraphicsItem::UserType + 210}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QPainterPath shape() const override; - virtual QRectF boundingRect() const override; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + QPainterPath shape() const override; + QRectF boundingRect() const override; void onMousePress(QPointF); void onMouseMove(QPointF pos); @@ -82,15 +82,15 @@ Q_SIGNALS: void qViewPicked(QPointF pos, TechDrawGui::QGIView* qgParent); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override; - virtual void keyPressEvent(QKeyEvent * event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override; + void keyPressEvent(QKeyEvent * event) override; - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; void getPickedQGIV(QPointF pos); QColor getTrackerColor(); diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.h b/src/Mod/TechDraw/Gui/QGVNavStyle.h index 63f6d73c5a..f9e72dabb3 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyle.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h @@ -62,7 +62,7 @@ class TechDrawGuiExport QGVNavStyle : public Base::BaseClass { public: QGVNavStyle(QGVPage* qgvp); - virtual ~QGVNavStyle(); + ~QGVNavStyle() override; void setViewer(QGVPage* qgvp) { m_viewer = qgvp;} ; QGVPage* getViewer() { return m_viewer;}; diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h index 8551166727..286b3e73fb 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.h @@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleBlender : public QGVNavStyle { public: QGVNavStyleBlender(QGVPage* qgvp); - virtual ~QGVNavStyleBlender(); + ~QGVNavStyleBlender() override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; //context menu (RMB) prevents pan mode 2 (LMB + RMB) - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h index 94bccfb2f9..ba3c6f6b3f 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.h @@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleCAD : public QGVNavStyle { public: QGVNavStyleCAD(QGVPage* qgvp); - virtual ~QGVNavStyleCAD(); + ~QGVNavStyleCAD() override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; //context menu (RMB) prevents pan mode 2 (LMB + RMB) - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h index cea5684aba..486fac3635 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.h @@ -36,13 +36,13 @@ class TechDrawGuiExport QGVNavStyleGesture : public QGVNavStyle { public: QGVNavStyleGesture(QGVPage* qgvp); - virtual ~QGVNavStyleGesture(); + ~QGVNavStyleGesture() override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h index e0219d006a..927eb73391 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.h @@ -36,11 +36,11 @@ class TechDrawGuiExport QGVNavStyleInventor : public QGVNavStyle { public: QGVNavStyleInventor(QGVPage* qgvp); - virtual ~QGVNavStyleInventor(); + ~QGVNavStyleInventor() override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h index 58dddc72fe..b7f8059c0b 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.h @@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleMaya : public QGVNavStyle { public: QGVNavStyleMaya(QGVPage* qgvp); - virtual ~QGVNavStyleMaya(); + ~QGVNavStyleMaya() override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h index 8cc34b6dd9..6a83fe8485 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.h @@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleOCC : public QGVNavStyle { public: QGVNavStyleOCC(QGVPage* qgvp); - virtual ~QGVNavStyleOCC(); + ~QGVNavStyleOCC() override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; //context menu (RMB) prevents pan mode 2 (RMB or CNTL+RMB) - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h index 187fbce11b..729b6e1720 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.h @@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleOpenSCAD : public QGVNavStyle { public: QGVNavStyleOpenSCAD(QGVPage* qgvp); - virtual ~QGVNavStyleOpenSCAD(); + ~QGVNavStyleOpenSCAD() override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h index 8b0e896aa5..35577eae57 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.h @@ -36,13 +36,13 @@ class TechDrawGuiExport QGVNavStyleRevit : public QGVNavStyle { public: QGVNavStyleRevit(QGVPage* qgvp); - virtual ~QGVNavStyleRevit(); + ~QGVNavStyleRevit() override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; - virtual bool allowContextMenu(QContextMenuEvent *event) override; + bool allowContextMenu(QContextMenuEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h index 499fd01258..b7a05fdd2f 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.h @@ -38,11 +38,11 @@ class TechDrawGuiExport QGVNavStyleTinkerCAD : public QGVNavStyle public: QGVNavStyleTinkerCAD(QGVPage* qgvp); - virtual ~QGVNavStyleTinkerCAD(); + ~QGVNavStyleTinkerCAD() override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; - virtual void handleMousePressEvent(QMouseEvent *event) override; - virtual void handleMouseReleaseEvent(QMouseEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; + void handleMousePressEvent(QMouseEvent *event) override; + void handleMouseReleaseEvent(QMouseEvent *event) override; protected: private: diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h index 39cd10215a..0b0c1c38a9 100644 --- a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h +++ b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.h @@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleTouchpad : public QGVNavStyle { public: QGVNavStyleTouchpad(QGVPage* qgvp); - virtual ~QGVNavStyleTouchpad(); + ~QGVNavStyleTouchpad() override; - virtual void handleKeyPressEvent(QKeyEvent *event) override; - virtual void handleKeyReleaseEvent(QKeyEvent *event) override; - virtual void handleMouseMoveEvent(QMouseEvent *event) override; + void handleKeyPressEvent(QKeyEvent *event) override; + void handleKeyReleaseEvent(QKeyEvent *event) override; + void handleMouseMoveEvent(QMouseEvent *event) override; protected: - virtual void setAnchor() override; + void setAnchor() override; private: diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index 8f129bd886..996dc8355a 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -77,7 +77,7 @@ public: enum RendererType { Native, OpenGL, Image }; QGVPage(ViewProviderPage *vp, QGSPage* s, QWidget *parent = nullptr); - virtual ~QGVPage(); + ~QGVPage() override; void setRenderer(RendererType type = Native); void drawBackground(QPainter *p, const QRectF &rect) override; diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h index 7c4d24d3b6..9e12ebf570 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.h +++ b/src/Mod/TechDraw/Gui/TaskActiveView.h @@ -90,24 +90,24 @@ class TaskDlgActiveView : public Gui::TaskView::TaskDialog public: TaskDlgActiveView(TechDraw::DrawPage* pageFeat); - ~TaskDlgActiveView(); + ~TaskDlgActiveView() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h index e4af5f3348..a1fd1ef0ce 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.h +++ b/src/Mod/TechDraw/Gui/TaskBalloon.h @@ -39,7 +39,7 @@ class TaskBalloon : public QWidget public: TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP); - ~TaskBalloon(); + ~TaskBalloon() override; public: virtual bool accept(); @@ -70,20 +70,20 @@ class TaskDlgBalloon : public Gui::TaskView::TaskDialog public: TaskDlgBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP); - ~TaskDlgBalloon(); + ~TaskDlgBalloon() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h index 946704bb24..7d46b1f690 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.h +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h @@ -68,7 +68,7 @@ public: TechDraw::DrawPage* page, std::string edgeName, bool editMode); - ~TaskCenterLine(); + ~TaskCenterLine() override; public Q_SLOTS: @@ -85,7 +85,7 @@ public: protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setUiConnect(); void setUiPrimary(); void setUiEdit(); @@ -140,24 +140,24 @@ public: TechDraw::DrawPage* page, std::string edgeName, bool editMode); - ~TaskDlgCenterLine(); + ~TaskDlgCenterLine() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index b968072bdd..ba34236639 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -64,7 +64,7 @@ class TaskCosVertex : public QWidget public: TaskCosVertex(TechDraw::DrawViewPart* baseFeat, TechDraw::DrawPage* page); - ~TaskCosVertex(); + ~TaskCosVertex() override; public Q_SLOTS: void onTrackerClicked(bool b); @@ -79,7 +79,7 @@ public: void enableTaskButtons(bool b); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void startTracker(); void removeTracker(); void abandonEditSession(); @@ -126,24 +126,24 @@ class TaskDlgCosVertex : public Gui::TaskView::TaskDialog public: TaskDlgCosVertex(TechDraw::DrawViewPart* baseFeat, TechDraw::DrawPage* page); - ~TaskDlgCosVertex(); + ~TaskDlgCosVertex() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h index aefde187e4..a06408c77c 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h @@ -58,7 +58,7 @@ public: std::vector is3d); TaskCosmeticLine(TechDraw::DrawViewPart* baseFeat, std::string edgeName); - ~TaskCosmeticLine(); + ~TaskCosmeticLine() override; public Q_SLOTS: @@ -70,7 +70,7 @@ public: protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setUiPrimary(); void setUiEdit(); @@ -103,20 +103,20 @@ public: std::vector is3d); TaskDlgCosmeticLine(TechDraw::DrawViewPart* baseFeat, std::string edgeName); - ~TaskDlgCosmeticLine(); + ~TaskDlgCosmeticLine() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h index f176ec212d..3c15dcc590 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h @@ -61,7 +61,7 @@ class TaskCustomizeFormat : public QWidget public: TaskCustomizeFormat(App::DocumentObject * object); - ~TaskCustomizeFormat(); + ~TaskCustomizeFormat() override; public Q_SLOTS: @@ -77,7 +77,7 @@ private Q_SLOTS: protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setUiEdit(); @@ -94,20 +94,20 @@ class TaskDlgCustomizeFormat : public Gui::TaskView::TaskDialog public: TaskDlgCustomizeFormat(App::DocumentObject * object); - ~TaskDlgCustomizeFormat(); + ~TaskDlgCustomizeFormat() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h index 91522942ac..dfd26e8fda 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.h +++ b/src/Mod/TechDraw/Gui/TaskDetail.h @@ -62,7 +62,7 @@ class TaskDetail : public QWidget public: TaskDetail(TechDraw::DrawViewPart* baseFeat); TaskDetail(TechDraw::DrawViewDetail* detailFeat); - ~TaskDetail(); + ~TaskDetail() override; public Q_SLOTS: void onDraggerClicked(bool b); @@ -83,7 +83,7 @@ public: void enableTaskButtons(bool b); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void startDragger(); void createDetail(); @@ -144,24 +144,24 @@ class TaskDlgDetail : public Gui::TaskView::TaskDialog public: TaskDlgDetail(TechDraw::DrawViewPart* baseFeat); TaskDlgDetail(TechDraw::DrawViewDetail* detailFeat); - ~TaskDlgDetail(); + ~TaskDlgDetail() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskDimension.h b/src/Mod/TechDraw/Gui/TaskDimension.h index 70cdafc4b9..cc0d189f5a 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.h +++ b/src/Mod/TechDraw/Gui/TaskDimension.h @@ -38,7 +38,7 @@ class TaskDimension : public QWidget public: TaskDimension(QGIViewDimension *parent, ViewProviderDimension *dimensionVP); - ~TaskDimension(); + ~TaskDimension() override; public: virtual bool accept(); @@ -80,20 +80,20 @@ class TaskDlgDimension : public Gui::TaskView::TaskDialog public: TaskDlgDimension(QGIViewDimension *parent, ViewProviderDimension *dimensionVP); - ~TaskDlgDimension(); + ~TaskDlgDimension() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h index 228769da6a..5bb7186b77 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h @@ -49,7 +49,7 @@ class TaskGeomHatch : public QWidget public: TaskGeomHatch(TechDraw::DrawGeomHatch* inHatch,TechDrawGui::ViewProviderGeomHatch* inVp, bool mode); - ~TaskGeomHatch(); + ~TaskGeomHatch() override; public: virtual bool accept(); @@ -61,7 +61,7 @@ protected Q_SLOTS: void onFileChanged(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void initUi(); // bool resetUi(); void updateValues(); @@ -100,21 +100,21 @@ class TaskDlgGeomHatch : public Gui::TaskView::TaskDialog public: TaskDlgGeomHatch(TechDraw::DrawGeomHatch* inHatch,TechDrawGui::ViewProviderGeomHatch* inVp, bool mode); - ~TaskDlgGeomHatch(); + ~TaskDlgGeomHatch() override; const ViewProviderGeomHatch * getViewProvider() const { return viewProvider; } public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void setCreateMode(bool b); diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h index 1679488c42..09faee2fdd 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.h +++ b/src/Mod/TechDraw/Gui/TaskHatch.h @@ -50,7 +50,7 @@ class TaskHatch : public QWidget public: TaskHatch(TechDraw::DrawViewPart* inDvp, std::vector subs); TaskHatch(TechDrawGui::ViewProviderHatch* inVp); - ~TaskHatch(); + ~TaskHatch() override; public: virtual bool accept(); @@ -62,7 +62,7 @@ protected Q_SLOTS: void onColorChanged(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void apply(bool forceUpdate = false); void createHatch(); @@ -99,20 +99,20 @@ class TaskDlgHatch : public Gui::TaskView::TaskDialog public: TaskDlgHatch(TechDraw::DrawViewPart* inDvp, std::vector subs); TaskDlgHatch(TechDrawGui::ViewProviderHatch* inVp); - ~TaskDlgHatch(); + ~TaskDlgHatch() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index 7a9197d7c9..3b7b8cdb90 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -66,7 +66,7 @@ public: TaskLeaderLine(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP); - ~TaskLeaderLine(); + ~TaskLeaderLine() override; public Q_SLOTS: void onTrackerClicked(bool b); @@ -90,7 +90,7 @@ protected Q_SLOTS: protected: void trackerPointsFromQPoints(std::vector pts); - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void startTracker(); void removeTracker(); void abandonEditSession(); @@ -171,24 +171,24 @@ public: TaskDlgLeaderLine(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); TaskDlgLeaderLine(TechDrawGui::ViewProviderLeader* leadVP); - ~TaskDlgLeaderLine(); + ~TaskDlgLeaderLine() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h index 759850985e..fefdd84b73 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.h +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h @@ -45,7 +45,7 @@ class TaskLineDecor : public QWidget public: TaskLineDecor(TechDraw::DrawViewPart* partFeat, std::vector edgeNames); - ~TaskLineDecor(); + ~TaskLineDecor() override; public: virtual bool accept(); @@ -60,7 +60,7 @@ protected Q_SLOTS: void onVisibleChanged(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void initUi(); void applyDecorations(); void getDefaults(); @@ -83,7 +83,7 @@ class TaskRestoreLines : public QWidget public: TaskRestoreLines(TechDraw::DrawViewPart* partFeat, TechDrawGui::TaskLineDecor* parent); - ~TaskRestoreLines(); + ~TaskRestoreLines() override; public: virtual bool accept(); @@ -96,7 +96,7 @@ protected Q_SLOTS: void onCenterPressed(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void initUi(); int countInvisibleLines(); int countInvisibleGeoms(); @@ -121,20 +121,20 @@ class TaskDlgLineDecor : public Gui::TaskView::TaskDialog public: TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat, std::vector edgeNames); - ~TaskDlgLineDecor(); + ~TaskDlgLineDecor() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } protected: diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h index 1bab95ad74..25da083593 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.h +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h @@ -46,7 +46,7 @@ class TaskLinkDim : public QWidget public: TaskLinkDim(std::vector parts,std::vector& subs, TechDraw::DrawPage* page); - ~TaskLinkDim(); + ~TaskLinkDim() override; public: bool accept(); @@ -56,7 +56,7 @@ protected Q_SLOTS: void onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void loadAvailDims(); void updateDims(); void loadToTree(const TechDraw::DrawViewDimension* dim, const bool selected, Gui::Document* guiDoc); @@ -75,20 +75,20 @@ class TaskDlgLinkDim : public Gui::TaskView::TaskDialog public: TaskDlgLinkDim(std::vector parts,std::vector& subs, TechDraw::DrawPage* page); - ~TaskDlgLinkDim(); + ~TaskDlgLinkDim() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index 32ba06ec06..7057e01987 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -47,7 +47,7 @@ class TaskProjGroup : public QWidget public: TaskProjGroup(TechDraw::DrawProjGroup* featView, bool mode); - ~TaskProjGroup(); + ~TaskProjGroup() override; public: virtual bool accept(); @@ -81,7 +81,7 @@ protected Q_SLOTS: void scaleManuallyChanged(int i); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; /// Connects and updates state of view checkboxes to match the state of multiView /*! @@ -129,27 +129,27 @@ class TaskDlgProjGroup : public Gui::TaskView::TaskDialog public: TaskDlgProjGroup(TechDraw::DrawProjGroup* featView,bool mode); - ~TaskDlgProjGroup(); + ~TaskDlgProjGroup() override; const ViewProviderProjGroup * getViewProvider() const { return viewProvider; } TechDraw::DrawProjGroup * getMultiView() const { return multiView; } - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; } - virtual void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void setCreateMode(bool b); diff --git a/src/Mod/TechDraw/Gui/TaskProjection.h b/src/Mod/TechDraw/Gui/TaskProjection.h index 5aabad3038..c3cf950f66 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.h +++ b/src/Mod/TechDraw/Gui/TaskProjection.h @@ -45,7 +45,7 @@ class TaskProjection : public QWidget public: TaskProjection(); - ~TaskProjection(); + ~TaskProjection() override; public: bool accept(); @@ -66,19 +66,19 @@ class TaskDlgProjection : public Gui::TaskView::TaskDialog public: TaskDlgProjection(); - ~TaskDlgProjection(); + ~TaskDlgProjection() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if a button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} + void helpRequested() override { return;} void update(); diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h index b3f68ffdeb..b0aa16b0f3 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.h +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h @@ -58,7 +58,7 @@ public: TaskRichAnno(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); TaskRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP); - ~TaskRichAnno(); + ~TaskRichAnno() override; public Q_SLOTS: void onEditorClicked(bool b); @@ -80,7 +80,7 @@ protected Q_SLOTS: void onEditorExit(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void createAnnoFeature(); void updateAnnoFeature(); @@ -137,24 +137,24 @@ public: TaskDlgRichAnno(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); TaskDlgRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP); - ~TaskDlgRichAnno(); + ~TaskDlgRichAnno() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h index da0b386799..362ff4cfef 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.h +++ b/src/Mod/TechDraw/Gui/TaskSectionView.h @@ -44,7 +44,7 @@ class TaskSectionView : public QWidget public: TaskSectionView(TechDraw::DrawViewPart* base); TaskSectionView(TechDraw::DrawViewSection* section); - ~TaskSectionView(); + ~TaskSectionView() override; public: virtual bool accept(); @@ -64,7 +64,7 @@ protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void saveSectionState(); void restoreSectionState(); @@ -124,29 +124,29 @@ class TaskDlgSectionView : public Gui::TaskView::TaskDialog public: TaskDlgSectionView(TechDraw::DrawViewPart* base); TaskDlgSectionView(TechDraw::DrawViewSection* section); - ~TaskDlgSectionView(); + ~TaskDlgSectionView() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role /* virtual void clicked(int);*/ /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} + void helpRequested() override { return;} - virtual QDialogButtonBox::StandardButtons getStandardButtons() const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } /* virtual void modifyStandardButtons(QDialogButtonBox* box);*/ void update(); - virtual bool isAllowedAlterSelection() const + bool isAllowedAlterSelection() const override { return false; } - virtual bool isAllowedAlterDocument() const + bool isAllowedAlterDocument() const override { return false; } protected: diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h index bc5ceddb38..8b7d1591b4 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h @@ -92,7 +92,7 @@ class TaskSelectLineAttributes : public QWidget public: TaskSelectLineAttributes(lineAttributes * ptActiveAttributes); - ~TaskSelectLineAttributes(); + ~TaskSelectLineAttributes() override; public Q_SLOTS: @@ -104,7 +104,7 @@ public: protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setUiEdit(); @@ -119,20 +119,20 @@ class TaskDlgSelectLineAttributes : public Gui::TaskView::TaskDialog public: TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes); - ~TaskDlgSelectLineAttributes(); + ~TaskDlgSelectLineAttributes() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h index 11a40fac62..96271e3b4a 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h @@ -76,7 +76,7 @@ class TaskSurfaceFinishSymbols : public QWidget public: TaskSurfaceFinishSymbols(TechDraw::DrawViewPart* view); - ~TaskSurfaceFinishSymbols(); + ~TaskSurfaceFinishSymbols() override; public Q_SLOTS: @@ -93,7 +93,7 @@ private Q_SLOTS: protected Q_SLOTS: protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void setUiEdit(); @@ -119,20 +119,20 @@ class TaskDlgSurfaceFinishSymbols : public Gui::TaskView::TaskDialog public: TaskDlgSurfaceFinishSymbols(TechDraw::DrawViewPart* view); - ~TaskDlgSurfaceFinishSymbols(); + ~TaskDlgSurfaceFinishSymbols() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index f332d537eb..36f976a2ee 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -175,24 +175,24 @@ class TaskDlgWeldingSymbol : public Gui::TaskView::TaskDialog public: TaskDlgWeldingSymbol(TechDraw::DrawLeaderLine* leader); TaskDlgWeldingSymbol(TechDraw::DrawWeldSymbol* weld); - ~TaskDlgWeldingSymbol(); + ~TaskDlgWeldingSymbol() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if an button is clicked which has no accept or reject role - virtual void clicked(int); + void clicked(int) override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user presses the help button - virtual void helpRequested() { return;} - virtual bool isAllowedAlterDocument() const + void helpRequested() override { return;} + bool isAllowedAlterDocument() const override { return false; } void update(); - void modifyStandardButtons(QDialogButtonBox* box); + void modifyStandardButtons(QDialogButtonBox* box) override; protected: diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h index 7872e6dae4..cbf26a3377 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h @@ -40,12 +40,12 @@ public: /// constructor ViewProviderAnnotation(); /// destructor - virtual ~ViewProviderAnnotation(); + ~ViewProviderAnnotation() override; - virtual bool useNewSelectionModel() const {return false;} - virtual void updateData(const App::Property*); + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; - virtual TechDraw::DrawViewAnnotation* getViewObject() const; + TechDraw::DrawViewAnnotation* getViewObject() const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h index 5aa29bdb1a..d17bed895c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h @@ -42,7 +42,7 @@ public: /// constructor ViewProviderBalloon(); /// destructor - virtual ~ViewProviderBalloon(); + ~ViewProviderBalloon() override; App::PropertyFont Font; App::PropertyLength Fontsize; @@ -50,18 +50,18 @@ public: App::PropertyBool LineVisible; App::PropertyColor Color; - 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(); - virtual bool canDelete(App::DocumentObject* obj) const; + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; + void onChanged(const App::Property* p) override; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; + bool canDelete(App::DocumentObject* obj) const override; - virtual TechDraw::DrawViewBalloon* getViewObject() const; + TechDraw::DrawViewBalloon* getViewObject() const override; protected: - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index 7100888ff7..c9a9e56fae 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -41,7 +41,7 @@ public: /// constructor ViewProviderDimension(); /// destructor - virtual ~ViewProviderDimension(); + ~ViewProviderDimension() override; App::PropertyFont Font; App::PropertyLength Fontsize; @@ -67,25 +67,25 @@ public: App::PropertyFloat GapFactorISO; App::PropertyFloat GapFactorASME; - virtual void attach(App::DocumentObject *); - 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 attach(App::DocumentObject *) override; + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; + void onChanged(const App::Property* p) override; + void setupContextMenu(QMenu*, QObject*, const char*) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; - virtual TechDraw::DrawViewDimension* getViewObject() const; + TechDraw::DrawViewDimension* getViewObject() const override; App::Color prefColor() const; std::string prefFont() const; double prefFontSize() const; double prefWeight() const; int prefStandardAndStyle() const; - virtual bool canDelete(App::DocumentObject* obj) const; + bool canDelete(App::DocumentObject* obj) const override; protected: - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; private: static const char *StandardAndStyleEnums[]; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index 7212654012..89089ebefc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -48,29 +48,29 @@ public: /// constructor ViewProviderDrawingView(); /// destructor - virtual ~ViewProviderDrawingView(); + ~ViewProviderDrawingView() override; App::PropertyBool KeepLabel; - virtual void attach(App::DocumentObject *) override; - virtual bool useNewSelectionModel() const override {return false;} + void attach(App::DocumentObject *) override; + bool useNewSelectionModel() const override {return false;} /// Hide the object in the view - virtual void hide() override; + void hide() override; /// Show the object in the view - virtual void show() override; - virtual bool isShow() const override; + void show() override; + bool isShow() const override; - virtual void onChanged(const App::Property *prop) override; - virtual void updateData(const App::Property*) override; + void onChanged(const App::Property *prop) override; + void updateData(const App::Property*) override; QGIView* getQView(); MDIViewPage* getMDIViewPage() const; - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; /** @name Restoring view provider from document load */ //@{ - virtual void startRestoring() override; - virtual void finishRestoring() override; + void startRestoring() override; + void finishRestoring() override; //@} virtual TechDraw::DrawView* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h index 7690dd1b53..236edb67ab 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h @@ -44,20 +44,20 @@ public: /// constructor ViewProviderHatch(); /// destructor - virtual ~ViewProviderHatch(); + ~ViewProviderHatch() override; App::PropertyColor HatchColor; App::PropertyFloatConstraint HatchScale; - virtual bool useNewSelectionModel() const override {return false;} - virtual void onChanged(const App::Property* prop) override; - virtual bool setEdit(int ModNum) override; - virtual bool doubleClicked() override; - virtual bool canDelete(App::DocumentObject* obj) const override; + bool useNewSelectionModel() const override {return false;} + void onChanged(const App::Property* prop) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; + bool canDelete(App::DocumentObject* obj) const override; TechDraw::DrawHatch* getViewObject() const; - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; private: static App::PropertyFloatConstraint::Constraints scaleRange; diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.h b/src/Mod/TechDraw/Gui/ViewProviderImage.h index 5dfc8bcb2c..b4cfbfacb3 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderImage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderImage.h @@ -39,16 +39,16 @@ public: /// constructor ViewProviderImage(); /// destructor - virtual ~ViewProviderImage(); + ~ViewProviderImage() override; App::PropertyBool Crop; //crop to feature width x height - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {return false;} /// returns a list of all possible modes - virtual void updateData(const App::Property*); - virtual void onChanged(const App::Property *prop); + void updateData(const App::Property*) override; + void onChanged(const App::Property *prop) override; - virtual TechDraw::DrawViewImage* getViewObject() const; + TechDraw::DrawViewImage* getViewObject() const override; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h index cf6dc33034..1717b765f9 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h @@ -46,33 +46,33 @@ public: /// constructor ViewProviderLeader(); /// destructor - virtual ~ViewProviderLeader(); + ~ViewProviderLeader() override; App::PropertyLength LineWidth; App::PropertyEnumeration LineStyle; App::PropertyColor Color; /* virtual void setDisplayMode(const char* ModeName);*/ - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {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(); - virtual bool onDelete(const std::vector &); - virtual bool canDelete(App::DocumentObject* obj) const; + void updateData(const App::Property*) override; + void onChanged(const App::Property* p) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; + bool onDelete(const std::vector &) override; + bool canDelete(App::DocumentObject* obj) const override; static const char* LineStyleEnums[]; - std::vector claimChildren() const; + std::vector claimChildren() const override; - virtual TechDraw::DrawLeaderLine* getViewObject() const; + TechDraw::DrawLeaderLine* getViewObject() const override; TechDraw::DrawLeaderLine* getFeature() const; protected: double getDefLineWeight(); App::Color getDefLineColor(); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; private: static App::PropertyIntegerConstraint::Constraints LineStyleRange; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index e12978901d..eaf8aed196 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -51,34 +51,34 @@ public: /// constructor ViewProviderPage(); /// destructor - virtual ~ViewProviderPage(); + ~ViewProviderPage() override; App::PropertyBool ShowFrames; App::PropertyBool ShowGrid; App::PropertyDistance GridSpacing; - virtual void attach(App::DocumentObject *) override; - virtual void setDisplayMode(const char* ModeName) override; - virtual bool useNewSelectionModel() const override {return false;} + void attach(App::DocumentObject *) override; + void setDisplayMode(const char* ModeName) override; + bool useNewSelectionModel() const override {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes() const override; + std::vector getDisplayModes() const override; /// Hides the view provider - virtual void hide() override; + void hide() override; /// Shows the view provider - virtual void show() override; - virtual bool isShow() const override; + void show() override; + bool isShow() const override; /// Claim all the views for the page std::vector claimChildren() const override; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked() override; + 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 onDelete(const std::vector &) override; + void onChanged(const App::Property *prop) override; + void updateData(const App::Property* prop) override; + void startRestoring() override; + void finishRestoring() override; bool isRestoring() {return !m_docReady;} TechDraw::DrawPage* getDrawPage() const; @@ -91,7 +91,7 @@ public: bool showMDIViewPage(); void removeMDIView(); - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; bool getFrameState(); void setFrameState(bool state); @@ -101,7 +101,7 @@ public: QGSPage* getGraphicsScene() { return m_graphicsScene; } void setGraphicsView(QGVPage* gv); void setGraphicsScene(QGSPage* gs); - virtual bool canDelete(App::DocumentObject* obj) const override; + bool canDelete(App::DocumentObject* obj) const override; void setGrid(); protected: diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h index dda9178676..fb47177150 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h @@ -37,26 +37,26 @@ class TechDrawGuiExport ViewProviderProjGroup : public ViewProviderDrawingView public: ViewProviderProjGroup(); /// constructor - ~ViewProviderProjGroup(); /// destructor + ~ViewProviderProjGroup() override; /// destructor - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Claim all the views for the page - std::vector claimChildren() const; + std::vector claimChildren() const override; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked(); - void setupContextMenu(QMenu*, QObject*, const char*); + bool doubleClicked() override; + void setupContextMenu(QMenu*, QObject*, const char*) override; TechDraw::DrawProjGroup* getObject() const; - virtual TechDraw::DrawProjGroup* getViewObject() const; - virtual bool onDelete(const std::vector &); - virtual bool canDelete(App::DocumentObject* obj) const; + TechDraw::DrawProjGroup* getViewObject() const override; + bool onDelete(const std::vector &) override; + bool canDelete(App::DocumentObject* obj) const override; protected: - bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h index 44ad890a97..eef2983b9b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h @@ -38,25 +38,25 @@ class TechDrawGuiExport ViewProviderProjGroupItem: public ViewProviderViewPart public: ViewProviderProjGroupItem(); - ~ViewProviderProjGroupItem(); + ~ViewProviderProjGroupItem() override; - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes() const; + std::vector getDisplayModes() const override; /// Is called by the tree if the user double click on the object - virtual bool doubleClicked(); - void setupContextMenu(QMenu*, QObject*, const char*); - virtual void updateData(const App::Property*); + bool doubleClicked() override; + void setupContextMenu(QMenu*, QObject*, const char*) override; + void updateData(const App::Property*) override; - virtual TechDraw::DrawProjGroupItem* getViewObject() const; + TechDraw::DrawProjGroupItem* getViewObject() const override; TechDraw::DrawProjGroupItem* getObject() const; - void unsetEdit(int ModNum); - virtual bool onDelete(const std::vector &); - virtual bool canDelete(App::DocumentObject* obj) const; + void unsetEdit(int ModNum) override; + bool onDelete(const std::vector &) override; + bool canDelete(App::DocumentObject* obj) const override; protected: - bool setEdit(int ModNum); + bool setEdit(int ModNum) override; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h index ac4f8654ca..a1a10b0b80 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h @@ -44,22 +44,22 @@ public: /// constructor ViewProviderRichAnno(); /// destructor - virtual ~ViewProviderRichAnno(); + ~ViewProviderRichAnno() override; App::PropertyLength LineWidth; App::PropertyEnumeration LineStyle; App::PropertyColor LineColor; - 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(); - virtual bool canDelete(App::DocumentObject* obj) const; + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; + void onChanged(const App::Property* p) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; + bool canDelete(App::DocumentObject* obj) const override; static const char* LineStyleEnums[]; - virtual TechDraw::DrawRichAnno* getViewObject() const; + TechDraw::DrawRichAnno* getViewObject() const override; TechDraw::DrawRichAnno* getFeature() const; protected: @@ -67,7 +67,7 @@ protected: std::string getDefFont(); double getDefFontSize(); double getDefLineWeight(); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; private: static App::PropertyIntegerConstraint::Constraints LineStyleRange; diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h index 1b87a66b60..e7c9c929a1 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h @@ -39,11 +39,11 @@ public: /// constructor ViewProviderSpreadsheet(); /// destructor - virtual ~ViewProviderSpreadsheet(); + ~ViewProviderSpreadsheet() override; - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {return false;} - virtual TechDraw::DrawViewSpreadsheet* getViewObject() const; + TechDraw::DrawViewSpreadsheet* getViewObject() const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h index b390814c43..fc4ff48387 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h @@ -41,12 +41,12 @@ public: /// constructor ViewProviderSymbol(); /// destructor - virtual ~ViewProviderSymbol(); + ~ViewProviderSymbol() override; - virtual bool useNewSelectionModel() const {return false;} - virtual void updateData(const App::Property*); + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; - virtual TechDraw::DrawViewSymbol* getViewObject() const; + TechDraw::DrawViewSymbol* getViewObject() const override; }; class TechDrawGuiExport ViewProviderDraft : public ViewProviderSymbol @@ -57,7 +57,7 @@ public: /// constructor ViewProviderDraft(); /// destructor - virtual ~ViewProviderDraft(); + ~ViewProviderDraft() override; }; class TechDrawGuiExport ViewProviderArch : public ViewProviderSymbol @@ -68,7 +68,7 @@ public: /// constructor ViewProviderArch(); /// destructor - virtual ~ViewProviderArch(); + ~ViewProviderArch() override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.h b/src/Mod/TechDraw/Gui/ViewProviderTile.h index afa4c3cd00..1afaa4965e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.h @@ -36,10 +36,10 @@ public: /// constructor ViewProviderTile(); /// destructor - virtual ~ViewProviderTile(); + ~ViewProviderTile() override; - virtual bool useNewSelectionModel() const {return false;} - virtual bool canDelete(App::DocumentObject *obj) const; + bool useNewSelectionModel() const override {return false;} + bool canDelete(App::DocumentObject *obj) const override; /* virtual TechDraw::DrawTile* getViewObject() const;*/ virtual TechDraw::DrawTile* getFeature() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h index ef217c2fc1..53dc8f9771 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h @@ -39,20 +39,20 @@ public: /// constructor ViewProviderViewClip(); /// destructor - virtual ~ViewProviderViewClip(); + ~ViewProviderViewClip() override; - virtual bool useNewSelectionModel() const {return false;} + bool useNewSelectionModel() const override {return false;} - virtual TechDraw::DrawViewClip* getViewObject() const; + TechDraw::DrawViewClip* getViewObject() const override; TechDraw::DrawViewClip* getObject() const; /// Hide the object in the view - virtual void hide(); + void hide() override; /// Show the object in the view - virtual void show(); - std::vector claimChildren() const; + void show() override; + std::vector claimChildren() const override; - virtual bool canDelete(App::DocumentObject* obj) const; + bool canDelete(App::DocumentObject* obj) const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h index e718f35425..5b5ebb4bf6 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h @@ -40,7 +40,7 @@ public: /// constructor ViewProviderViewPart(); /// destructor - virtual ~ViewProviderViewPart(); + ~ViewProviderViewPart() override; App::PropertyLength LineWidth; App::PropertyLength HiddenWidth; @@ -60,24 +60,24 @@ public: static const char* LineStyleEnums[]; - virtual void attach(App::DocumentObject *); - virtual bool useNewSelectionModel(void) const {return false;} - virtual bool onDelete(const std::vector &); - virtual bool canDelete(App::DocumentObject* obj) const; - virtual bool setEdit(int ModNum); - virtual bool doubleClicked(void); + void attach(App::DocumentObject *) override; + bool useNewSelectionModel(void) const override {return false;} + bool onDelete(const std::vector &) override; + bool canDelete(App::DocumentObject* obj) const override; + bool setEdit(int ModNum) override; + bool doubleClicked(void) override; public: - virtual void onChanged(const App::Property *prop); - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); + void onChanged(const App::Property *prop) override; + void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override; App::Color prefSectionColor(void); App::Color prefHighlightColor(void); int prefHighlightStyle(void); - virtual std::vector claimChildren(void) const; + std::vector claimChildren(void) const override; - virtual TechDraw::DrawViewPart* getViewObject() const; + TechDraw::DrawViewPart* getViewObject() const override; TechDraw::DrawViewPart* getViewPart() const; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h index d106c45d89..899d1b8281 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h @@ -39,7 +39,7 @@ public: /// constructor ViewProviderViewSection(); /// destructor - virtual ~ViewProviderViewSection(); + ~ViewProviderViewSection() override; App::PropertyBool ShowCutSurface; //obsolete - use CutSurfaceDisplay App::PropertyColor CutSurfaceColor; @@ -48,16 +48,16 @@ public: App::PropertyColor GeomHatchColor; App::PropertyFloat WeightPattern; - virtual void updateData(const App::Property*); - virtual void onChanged(const App::Property *prop); - virtual bool setEdit(int ModNum); - virtual bool doubleClicked(); + void updateData(const App::Property*) override; + void onChanged(const App::Property *prop) override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; void updateGraphic(); void getParameters(); - virtual bool canDelete(App::DocumentObject* obj) const; + bool canDelete(App::DocumentObject* obj) const override; - virtual TechDraw::DrawViewSection* getViewObject() const; + TechDraw::DrawViewSection* getViewObject() const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.h b/src/Mod/TechDraw/Gui/ViewProviderWeld.h index b88388331a..765b3fcd53 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.h +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.h @@ -40,26 +40,26 @@ public: /// constructor ViewProviderWeld(); /// destructor - virtual ~ViewProviderWeld(); + ~ViewProviderWeld() override; App::PropertyString Font; App::PropertyLength FontSize; App::PropertyLength TileFontSize; - virtual bool useNewSelectionModel() const {return false;} - virtual void onChanged(const App::Property* p); - virtual std::vector claimChildren() const; - virtual bool setEdit(int ModNum); - virtual bool doubleClicked(); + bool useNewSelectionModel() const override {return false;} + void onChanged(const App::Property* p) override; + std::vector claimChildren() const override; + bool setEdit(int ModNum) override; + bool doubleClicked() override; - virtual TechDraw::DrawWeldSymbol* getViewObject() const; + TechDraw::DrawWeldSymbol* getViewObject() const override; virtual TechDraw::DrawWeldSymbol* getFeature() const; std::string prefFontName(); double prefFontSize(); double prefTileTextAdjust(); - virtual bool onDelete(const std::vector &); - virtual bool canDelete(App::DocumentObject* obj) const; + bool onDelete(const std::vector &) override; + bool canDelete(App::DocumentObject* obj) const override; }; diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp index 01f2ea4202..fe65b5b73f 100644 --- a/src/Mod/Test/Gui/AppTestGui.cpp +++ b/src/Mod/Test/Gui/AppTestGui.cpp @@ -33,13 +33,13 @@ class ILoggerBlockerTest : public Base::ILogger { public: - virtual ~ILoggerBlockerTest() {Base::Console().DetachObserver(this);} + ~ILoggerBlockerTest() override {Base::Console().DetachObserver(this);} - virtual const char *Name() {return "ILoggerBlockerTest";} + const char *Name() override {return "ILoggerBlockerTest";} void flush() {buffer.str("");buffer.clear();} - void SendLog(const std::string& msg, Base::LogStyle level){ + void SendLog(const std::string& msg, Base::LogStyle level) override{ (void) msg; switch(level){ case Base::LogStyle::Warning: @@ -124,7 +124,7 @@ public: initialize("This module is the QtUnitGui module"); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object new_UnitTest(const Py::Tuple& args) diff --git a/src/Mod/Test/Gui/UnitTestImp.h b/src/Mod/Test/Gui/UnitTestImp.h index fcd6e6c7f9..c0a6fce3e6 100644 --- a/src/Mod/Test/Gui/UnitTestImp.h +++ b/src/Mod/Test/Gui/UnitTestImp.h @@ -53,7 +53,7 @@ public: void setErrorCount(int); void setRemainCount(int); void reset(); - void reject(); + void reject() override; static UnitTestDialog* instance(); static void destruct(); @@ -61,7 +61,7 @@ public: protected: UnitTestDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); - ~UnitTestDialog(); + ~UnitTestDialog() override; void setProgressColor(const QColor& col); public Q_SLOTS: diff --git a/src/Mod/Test/Gui/UnitTestPy.h b/src/Mod/Test/Gui/UnitTestPy.h index b3b5ab7df8..b5acfe492e 100644 --- a/src/Mod/Test/Gui/UnitTestPy.h +++ b/src/Mod/Test/Gui/UnitTestPy.h @@ -38,11 +38,11 @@ public: static void init_type(); // announce properties and methods UnitTestDialogPy(); - ~UnitTestDialogPy(); + ~UnitTestDialogPy() override; - Py::Object repr(); - Py::Object getattr(const char *); - int setattr(const char *, const Py::Object &); + Py::Object repr() override; + Py::Object getattr(const char *) override; + int setattr(const char *, const Py::Object &) override; Py::Object clearErrorList (const Py::Tuple&); Py::Object insertError (const Py::Tuple&); diff --git a/src/Mod/Web/App/AppWeb.cpp b/src/Mod/Web/App/AppWeb.cpp index 41bc08c725..15c5c5c41c 100644 --- a/src/Mod/Web/App/AppWeb.cpp +++ b/src/Mod/Web/App/AppWeb.cpp @@ -80,7 +80,7 @@ public: initialize("This module is the Web module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object startServer(const Py::Tuple& args) diff --git a/src/Mod/Web/App/Server.h b/src/Mod/Web/App/Server.h index 6469238607..693e5b603c 100644 --- a/src/Mod/Web/App/Server.h +++ b/src/Mod/Web/App/Server.h @@ -51,8 +51,8 @@ class FirewallPython : public Firewall { public: FirewallPython(const Py::Object&); - virtual ~FirewallPython(); - virtual bool filter(const QByteArray&) const; + ~FirewallPython() override; + bool filter(const QByteArray&) const override; private: Py::Object obj; @@ -62,7 +62,7 @@ class ServerEvent : public QEvent { public: ServerEvent(QTcpSocket* socket, const QByteArray&); - ~ServerEvent(); + ~ServerEvent() override; QTcpSocket* socket() const; const QByteArray& request() const; @@ -83,8 +83,8 @@ public: AppServer(bool direct = false, QObject* parent = nullptr); protected: - void incomingConnection(qintptr socket); - void customEvent(QEvent* e); + void incomingConnection(qintptr socket) override; + void customEvent(QEvent* e) override; private: std::string handleRequest(QByteArray); diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 7fbf74a483..f872b334a2 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -70,7 +70,7 @@ public: initialize("This module is the WebGui module."); // register with Python } - virtual ~Module() {} + ~Module() override {} private: Py::Object openBrowser(const Py::Tuple& args) diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 803717279c..155d0e52a4 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -91,7 +91,7 @@ public: { } - void interceptRequest(QWebEngineUrlRequestInfo &info) + void interceptRequest(QWebEngineUrlRequestInfo &info) override { // do something with this resource, click or get img for example if (info.navigationType() == QWebEngineUrlRequestInfo::NavigationTypeLink) { @@ -157,10 +157,10 @@ public: static void init_type(); // announce properties and methods BrowserViewPy(BrowserView* view); - ~BrowserViewPy(); + ~BrowserViewPy() override; - Py::Object repr(); - Py::Object getattr(const char *); + Py::Object repr() override; + Py::Object getattr(const char *) override; Py::Object cast_to_base(const Py::Tuple&); Py::Object setHtml(const Py::Tuple&); diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index c95ee775f1..5cb3cb024e 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -59,9 +59,9 @@ public: WebView(QWidget *parent = nullptr); protected: - void mousePressEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private Q_SLOTS: void triggerContextMenuAction(int); @@ -85,7 +85,7 @@ class WebGuiExport BrowserView : public Gui::MDIView, public: BrowserView(QWidget* parent); - ~BrowserView(); + ~BrowserView() override; void load(const char* URL); void load(const QUrl & url); @@ -93,15 +93,15 @@ public: void stop(); QUrl url() const; - void OnChange(Base::Subject &rCaller,const char* rcReason); + void OnChange(Base::Subject &rCaller,const char* rcReason) override; - const char *getName() const {return "BrowserView";} - virtual PyObject *getPyObject(); + const char *getName() const override {return "BrowserView";} + PyObject *getPyObject() override; - bool onMsg(const char* pMsg,const char** ppReturn); - bool onHasMsg(const char* pMsg) const; + bool onMsg(const char* pMsg,const char** ppReturn) override; + bool onHasMsg(const char* pMsg) const override; - bool canClose (); + bool canClose () override; #ifdef QTWEBENGINE public Q_SLOTS: @@ -145,10 +145,10 @@ class UrlWidget : public QLineEdit BrowserView *m_view; public: explicit UrlWidget(BrowserView *view); - ~UrlWidget(); + ~UrlWidget() override; void display(); protected: - void keyPressEvent(QKeyEvent *keyEvt); + void keyPressEvent(QKeyEvent *keyEvt) override; }; } // namespace WebGui diff --git a/src/Mod/Web/Gui/CookieJar.h b/src/Mod/Web/Gui/CookieJar.h index 7ccdaa43ec..7d3256cbae 100644 --- a/src/Mod/Web/Gui/CookieJar.h +++ b/src/Mod/Web/Gui/CookieJar.h @@ -39,8 +39,8 @@ namespace WebGui { public: FcCookieJar(QObject* parent = nullptr); - virtual ~FcCookieJar(); - virtual bool setCookiesFromUrl(const QList&, const QUrl&); + ~FcCookieJar() override; + bool setCookiesFromUrl(const QList&, const QUrl&) override; public Q_SLOTS: void scheduleSaveToDisk(); diff --git a/src/Mod/Web/Gui/Workbench.h b/src/Mod/Web/Gui/Workbench.h index 88949dc294..3033c9e574 100644 --- a/src/Mod/Web/Gui/Workbench.h +++ b/src/Mod/Web/Gui/Workbench.h @@ -37,20 +37,20 @@ class Workbench : public Gui::StdWorkbench public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; /** Defines the standard context menu. */ - virtual void setupContextMenu(const char* recipient,Gui::MenuItem*) const; + void setupContextMenu(const char* recipient,Gui::MenuItem*) const override; protected: /** Defines the standard menus. */ - virtual Gui::MenuItem* setupMenuBar() const; + Gui::MenuItem* setupMenuBar() const override; /** Defines the standard toolbars. */ - virtual Gui::ToolBarItem* setupToolBars() const; + Gui::ToolBarItem* setupToolBars() const override; /** Defines the standard command bars. */ - virtual Gui::ToolBarItem* setupCommandBars() const; + Gui::ToolBarItem* setupCommandBars() const override; /** Returns a DockWindowItems structure of dock windows this workbench. */ - virtual Gui::DockWindowItems* setupDockWindows() const; + Gui::DockWindowItems* setupDockWindows() const override; }; // namespace WebGui