From e48c52c480d42bf313bc5bfc8d1b7d56abfc3561 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 18 Sep 2019 11:32:42 +0200 Subject: [PATCH] force strict ISO C++ (-Wpedantic) for Drawing, Image, Inspection, Mesh, MeshPart, Part, Path, Points, Raytracing, ReverseEngineering, Spreadsheet, Start, Surface, Web TODO: fix several -Woverflow in area --- src/Mod/Drawing/Gui/Command.cpp | 26 +++--- src/Mod/Image/Gui/Command.cpp | 6 +- src/Mod/Inspection/App/InspectionFeature.cpp | 2 +- src/Mod/Inspection/Gui/Command.cpp | 4 +- src/Mod/Mesh/App/Core/Algorithm.h | 2 +- src/Mod/Mesh/App/Core/Helpers.h | 2 +- src/Mod/Mesh/App/Core/SetOperations.h | 2 +- src/Mod/Mesh/App/MeshProperties.cpp | 6 +- src/Mod/Mesh/Gui/Command.cpp | 62 ++++++------- src/Mod/MeshPart/App/CurveProjector.h | 2 +- src/Mod/MeshPart/App/MeshAlgos.h | 2 +- src/Mod/MeshPart/App/Mesher.cpp | 5 ++ src/Mod/Part/App/Attacher.cpp | 4 +- src/Mod/Part/App/FaceMakerCheese.cpp | 2 +- src/Mod/Part/App/PartFeature.cpp | 2 +- src/Mod/Part/App/PropertyGeometryList.cpp | 2 +- src/Mod/Part/App/PropertyTopoShape.cpp | 6 +- src/Mod/Part/App/TopoShape.cpp | 4 +- src/Mod/Part/Gui/Command.cpp | 90 +++++++++---------- src/Mod/Part/Gui/CommandParametric.cpp | 10 +-- src/Mod/Part/Gui/CommandSimple.cpp | 16 ++-- src/Mod/Part/Gui/DlgExtrusion.cpp | 2 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 2 +- src/Mod/Part/Gui/SoBrepEdgeSet.cpp | 2 +- src/Mod/Part/Gui/SoBrepFaceSet.cpp | 2 +- src/Mod/Part/Gui/SoBrepPointSet.cpp | 2 +- src/Mod/Part/Gui/SoFCShapeObject.cpp | 2 +- src/Mod/Part/Gui/TaskDimension.cpp | 6 +- src/Mod/Path/App/Area.cpp | 2 +- src/Mod/Path/App/Command.cpp | 2 +- src/Mod/Path/App/Path.cpp | 2 +- src/Mod/Path/App/PropertyPath.cpp | 2 +- src/Mod/Path/App/PropertyTool.cpp | 2 +- src/Mod/Path/App/PropertyTooltable.cpp | 2 +- src/Mod/Path/App/Tool.cpp | 2 +- src/Mod/Path/App/Tooltable.cpp | 2 +- src/Mod/Path/libarea/Area.cpp | 16 ++-- src/Mod/Path/libarea/Area.h | 16 ++-- src/Mod/Path/libarea/kurve/geometry.h | 4 +- src/Mod/Points/Gui/Command.cpp | 10 +-- src/Mod/Raytracing/Gui/Command.cpp | 18 ++-- src/Mod/ReverseEngineering/Gui/Command.cpp | 8 +- src/Mod/Spreadsheet/App/Cell.cpp | 2 +- .../Spreadsheet/App/PropertyColumnWidths.cpp | 2 +- .../Spreadsheet/App/PropertyRowHeights.cpp | 2 +- src/Mod/Spreadsheet/App/PropertySheet.cpp | 4 +- src/Mod/Spreadsheet/App/Sheet.cpp | 4 +- src/Mod/Spreadsheet/Gui/Command.cpp | 30 +++---- src/Mod/Start/Gui/Command.cpp | 2 +- src/Mod/Surface/Gui/Command.cpp | 2 +- src/Mod/Web/Gui/Command.cpp | 16 ++-- 51 files changed, 216 insertions(+), 211 deletions(-) diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp index 7266f780a4..140cea10e1 100644 --- a/src/Mod/Drawing/Gui/Command.cpp +++ b/src/Mod/Drawing/Gui/Command.cpp @@ -50,7 +50,7 @@ using namespace std; // CmdDrawingOpen //=========================================================================== -DEF_STD_CMD(CmdDrawingOpen); +DEF_STD_CMD(CmdDrawingOpen) CmdDrawingOpen::CmdDrawingOpen() : Command("Drawing_Open") @@ -86,7 +86,7 @@ void CmdDrawingOpen::activated(int iMsg) // Drawing_NewPage //=========================================================================== -DEF_STD_CMD_ACL(CmdDrawingNewPage); +DEF_STD_CMD_ACL(CmdDrawingNewPage) CmdDrawingNewPage::CmdDrawingNewPage() : Command("Drawing_NewPage") @@ -263,7 +263,7 @@ bool CmdDrawingNewPage::isActive(void) // Drawing_NewA3Landscape //=========================================================================== -DEF_STD_CMD_A(CmdDrawingNewA3Landscape); +DEF_STD_CMD_A(CmdDrawingNewA3Landscape) CmdDrawingNewA3Landscape::CmdDrawingNewA3Landscape() : Command("Drawing_NewA3Landscape") @@ -302,7 +302,7 @@ bool CmdDrawingNewA3Landscape::isActive(void) // Drawing_NewView //=========================================================================== -DEF_STD_CMD(CmdDrawingNewView); +DEF_STD_CMD(CmdDrawingNewView) CmdDrawingNewView::CmdDrawingNewView() : Command("Drawing_NewView") @@ -381,7 +381,7 @@ void CmdDrawingNewView::activated(int iMsg) // Drawing_OrthoView //=========================================================================== -DEF_STD_CMD_A(CmdDrawingOrthoViews); +DEF_STD_CMD_A(CmdDrawingOrthoViews) CmdDrawingOrthoViews::CmdDrawingOrthoViews() : Command("Drawing_OrthoViews") @@ -431,7 +431,7 @@ bool CmdDrawingOrthoViews::isActive(void) // Drawing_OpenBrowserView //=========================================================================== -DEF_STD_CMD_A(CmdDrawingOpenBrowserView); +DEF_STD_CMD_A(CmdDrawingOpenBrowserView) CmdDrawingOpenBrowserView::CmdDrawingOpenBrowserView() : Command("Drawing_OpenBrowserView") @@ -469,7 +469,7 @@ bool CmdDrawingOpenBrowserView::isActive(void) // Drawing_Annotation //=========================================================================== -DEF_STD_CMD_A(CmdDrawingAnnotation); +DEF_STD_CMD_A(CmdDrawingAnnotation) CmdDrawingAnnotation::CmdDrawingAnnotation() : Command("Drawing_Annotation") @@ -517,7 +517,7 @@ bool CmdDrawingAnnotation::isActive(void) // Drawing_Clip //=========================================================================== -DEF_STD_CMD_A(CmdDrawingClip); +DEF_STD_CMD_A(CmdDrawingClip) CmdDrawingClip::CmdDrawingClip() : Command("Drawing_Clip") @@ -562,7 +562,7 @@ bool CmdDrawingClip::isActive(void) // Drawing_Symbol //=========================================================================== -DEF_STD_CMD_A(CmdDrawingSymbol); +DEF_STD_CMD_A(CmdDrawingSymbol) CmdDrawingSymbol::CmdDrawingSymbol() : Command("Drawing_Symbol") @@ -622,7 +622,7 @@ bool CmdDrawingSymbol::isActive(void) // Drawing_ExportPage //=========================================================================== -DEF_STD_CMD_A(CmdDrawingExportPage); +DEF_STD_CMD_A(CmdDrawingExportPage) CmdDrawingExportPage::CmdDrawingExportPage() : Command("Drawing_ExportPage") @@ -678,7 +678,7 @@ bool CmdDrawingExportPage::isActive(void) // Drawing_ProjectShape //=========================================================================== -DEF_STD_CMD_A(CmdDrawingProjectShape); +DEF_STD_CMD_A(CmdDrawingProjectShape) CmdDrawingProjectShape::CmdDrawingProjectShape() : Command("Drawing_ProjectShape") @@ -714,7 +714,7 @@ bool CmdDrawingProjectShape::isActive(void) // Drawing_Draft_View //=========================================================================== -DEF_STD_CMD_A(CmdDrawingDraftView); +DEF_STD_CMD_A(CmdDrawingDraftView) CmdDrawingDraftView::CmdDrawingDraftView() : Command("Drawing_DraftView") @@ -745,7 +745,7 @@ bool CmdDrawingDraftView::isActive(void) // Drawing_Spreadheet_View //=========================================================================== -DEF_STD_CMD_A(CmdDrawingSpreadsheetView); +DEF_STD_CMD_A(CmdDrawingSpreadsheetView) CmdDrawingSpreadsheetView::CmdDrawingSpreadsheetView() : Command("Drawing_SpreadsheetView") diff --git a/src/Mod/Image/Gui/Command.cpp b/src/Mod/Image/Gui/Command.cpp index 2ea0e2728e..98b089b895 100644 --- a/src/Mod/Image/Gui/Command.cpp +++ b/src/Mod/Image/Gui/Command.cpp @@ -44,7 +44,7 @@ using namespace ImageGui; -DEF_STD_CMD(CmdImageOpen); +DEF_STD_CMD(CmdImageOpen) CmdImageOpen::CmdImageOpen() : Command("Image_Open") @@ -92,7 +92,7 @@ void CmdImageOpen::activated(int iMsg) } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdCreateImagePlane); +DEF_STD_CMD_A(CmdCreateImagePlane) CmdCreateImagePlane::CmdCreateImagePlane() :Command("Image_CreateImagePlane") @@ -166,7 +166,7 @@ bool CmdCreateImagePlane::isActive() } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD(CmdImageScaling); +DEF_STD_CMD(CmdImageScaling) CmdImageScaling::CmdImageScaling() : Command("Image_Scaling") diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index aac0006ba5..390407056a 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -493,7 +493,7 @@ float InspectNominalShape::getDistance(const Base::Vector3f& point) // ---------------------------------------------------------------- -TYPESYSTEM_SOURCE(Inspection::PropertyDistanceList, App::PropertyLists); +TYPESYSTEM_SOURCE(Inspection::PropertyDistanceList, App::PropertyLists) PropertyDistanceList::PropertyDistanceList() { diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp index de8b4d9fb6..cf3ae7cba0 100644 --- a/src/Mod/Inspection/Gui/Command.cpp +++ b/src/Mod/Inspection/Gui/Command.cpp @@ -40,7 +40,7 @@ #include "ViewProviderInspection.h" -DEF_STD_CMD_A(CmdVisualInspection); +DEF_STD_CMD_A(CmdVisualInspection) CmdVisualInspection::CmdVisualInspection() : Command("Inspection_VisualInspection") @@ -66,7 +66,7 @@ bool CmdVisualInspection::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdInspectElement); +DEF_STD_CMD_A(CmdInspectElement) CmdInspectElement::CmdInspectElement() : Command("Inspection_InspectElement") diff --git a/src/Mod/Mesh/App/Core/Algorithm.h b/src/Mod/Mesh/App/Core/Algorithm.h index 5ac8bb2d92..23084c5c36 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.h +++ b/src/Mod/Mesh/App/Core/Algorithm.h @@ -511,6 +511,6 @@ protected: std::vector _norm; }; -}; // namespace MeshCore +} // namespace MeshCore #endif // MESH_ALGORITHM_H diff --git a/src/Mod/Mesh/App/Core/Helpers.h b/src/Mod/Mesh/App/Core/Helpers.h index 404644e171..7726fb2dca 100644 --- a/src/Mod/Mesh/App/Core/Helpers.h +++ b/src/Mod/Mesh/App/Core/Helpers.h @@ -97,7 +97,7 @@ inline void MeshHelpPoint::Set (unsigned long ulCorner, unsigned long ulFacet, c { _ulInd = (ulFacet << 2) | ulCorner; _clPt = rclPt; -}; +} inline bool MeshHelpPoint::operator < (const MeshHelpPoint &rclObj) const { diff --git a/src/Mod/Mesh/App/Core/SetOperations.h b/src/Mod/Mesh/App/Core/SetOperations.h index 860dc85d7f..f1c69d8355 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.h +++ b/src/Mod/Mesh/App/Core/SetOperations.h @@ -185,6 +185,6 @@ private: }; -}; // namespace MeshCore +} // namespace MeshCore #endif // MESH_SETOPERATIONS_H diff --git a/src/Mod/Mesh/App/MeshProperties.cpp b/src/Mod/Mesh/App/MeshProperties.cpp index 617857fece..e0940844e2 100644 --- a/src/Mod/Mesh/App/MeshProperties.cpp +++ b/src/Mod/Mesh/App/MeshProperties.cpp @@ -44,9 +44,9 @@ using namespace Mesh; -TYPESYSTEM_SOURCE(Mesh::PropertyNormalList, App::PropertyLists); -TYPESYSTEM_SOURCE(Mesh::PropertyCurvatureList , App::PropertyLists); -TYPESYSTEM_SOURCE(Mesh::PropertyMeshKernel , App::PropertyComplexGeoData); +TYPESYSTEM_SOURCE(Mesh::PropertyNormalList, App::PropertyLists) +TYPESYSTEM_SOURCE(Mesh::PropertyCurvatureList , App::PropertyLists) +TYPESYSTEM_SOURCE(Mesh::PropertyMeshKernel , App::PropertyComplexGeoData) PropertyNormalList::PropertyNormalList() { diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 090eb9784b..b0bf5016f6 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -214,7 +214,7 @@ bool CmdMeshToolMesh::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshUnion); +DEF_STD_CMD_A(CmdMeshUnion) CmdMeshUnion::CmdMeshUnion() :Command("Mesh_Union") @@ -284,7 +284,7 @@ bool CmdMeshUnion::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshDifference); +DEF_STD_CMD_A(CmdMeshDifference) CmdMeshDifference::CmdMeshDifference() :Command("Mesh_Difference") @@ -354,7 +354,7 @@ bool CmdMeshDifference::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshIntersection); +DEF_STD_CMD_A(CmdMeshIntersection) CmdMeshIntersection::CmdMeshIntersection() :Command("Mesh_Intersection") @@ -424,7 +424,7 @@ bool CmdMeshIntersection::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshImport); +DEF_STD_CMD_A(CmdMeshImport) CmdMeshImport::CmdMeshImport() :Command("Mesh_Import") @@ -477,7 +477,7 @@ bool CmdMeshImport::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshExport); +DEF_STD_CMD_A(CmdMeshExport) CmdMeshExport::CmdMeshExport() :Command("Mesh_Export") @@ -548,7 +548,7 @@ bool CmdMeshExport::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshFromGeometry); +DEF_STD_CMD_A(CmdMeshFromGeometry) CmdMeshFromGeometry::CmdMeshFromGeometry() :Command("Mesh_FromGeometry") @@ -606,7 +606,7 @@ bool CmdMeshFromGeometry::isActive(void) //=========================================================================== // Mesh_FromPart //=========================================================================== -DEF_STD_CMD_A(CmdMeshFromPartShape); +DEF_STD_CMD_A(CmdMeshFromPartShape) CmdMeshFromPartShape::CmdMeshFromPartShape() : Command("Mesh_FromPartShape") @@ -632,7 +632,7 @@ bool CmdMeshFromPartShape::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshVertexCurvature); +DEF_STD_CMD_A(CmdMeshVertexCurvature) CmdMeshVertexCurvature::CmdMeshVertexCurvature() : Command("Mesh_VertexCurvature") @@ -675,7 +675,7 @@ bool CmdMeshVertexCurvature::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshVertexCurvatureInfo); +DEF_STD_CMD_A(CmdMeshVertexCurvatureInfo) CmdMeshVertexCurvatureInfo::CmdMeshVertexCurvatureInfo() :Command("Mesh_CurvatureInfo") @@ -719,7 +719,7 @@ bool CmdMeshVertexCurvatureInfo::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshPolySegm); +DEF_STD_CMD_A(CmdMeshPolySegm) CmdMeshPolySegm::CmdMeshPolySegm() :Command("Mesh_PolySegm") @@ -775,7 +775,7 @@ bool CmdMeshPolySegm::isActive(void) //-------------------------------------------------------------------------------------- #if 0 -DEF_STD_CMD_A(CmdMeshPolySelect); +DEF_STD_CMD_A(CmdMeshPolySelect) CmdMeshPolySelect::CmdMeshPolySelect() : Command("Mesh_PolySelect") @@ -828,7 +828,7 @@ bool CmdMeshPolySelect::isActive(void) #endif //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshAddFacet); +DEF_STD_CMD_A(CmdMeshAddFacet) CmdMeshAddFacet::CmdMeshAddFacet() : Command("Mesh_AddFacet") @@ -874,7 +874,7 @@ bool CmdMeshAddFacet::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshPolyCut); +DEF_STD_CMD_A(CmdMeshPolyCut) CmdMeshPolyCut::CmdMeshPolyCut() : Command("Mesh_PolyCut") @@ -935,7 +935,7 @@ bool CmdMeshPolyCut::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshPolyTrim); +DEF_STD_CMD_A(CmdMeshPolyTrim) CmdMeshPolyTrim::CmdMeshPolyTrim() : Command("Mesh_PolyTrim") @@ -995,7 +995,7 @@ bool CmdMeshPolyTrim::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshTrimByPlane); +DEF_STD_CMD_A(CmdMeshTrimByPlane) CmdMeshTrimByPlane::CmdMeshTrimByPlane() : Command("Mesh_TrimByPlane") @@ -1023,7 +1023,7 @@ bool CmdMeshTrimByPlane::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshSectionByPlane); +DEF_STD_CMD_A(CmdMeshSectionByPlane) CmdMeshSectionByPlane::CmdMeshSectionByPlane() : Command("Mesh_SectionByPlane") @@ -1051,7 +1051,7 @@ bool CmdMeshSectionByPlane::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshPolySplit); +DEF_STD_CMD_A(CmdMeshPolySplit) CmdMeshPolySplit::CmdMeshPolySplit() : Command("Mesh_PolySplit") @@ -1105,7 +1105,7 @@ bool CmdMeshPolySplit::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshEvaluation); +DEF_STD_CMD_A(CmdMeshEvaluation) CmdMeshEvaluation::CmdMeshEvaluation() :Command("Mesh_Evaluation") @@ -1147,7 +1147,7 @@ bool CmdMeshEvaluation::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshEvaluateFacet); +DEF_STD_CMD_A(CmdMeshEvaluateFacet) CmdMeshEvaluateFacet::CmdMeshEvaluateFacet() :Command("Mesh_EvaluateFacet") @@ -1190,7 +1190,7 @@ bool CmdMeshEvaluateFacet::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshRemoveComponents); +DEF_STD_CMD_A(CmdMeshRemoveComponents) CmdMeshRemoveComponents::CmdMeshRemoveComponents() : Command("Mesh_RemoveComponents") @@ -1235,7 +1235,7 @@ bool CmdMeshRemoveComponents::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshRemoveCompByHand); +DEF_STD_CMD_A(CmdMeshRemoveCompByHand) CmdMeshRemoveCompByHand::CmdMeshRemoveCompByHand() :Command("Mesh_RemoveCompByHand") @@ -1277,7 +1277,7 @@ bool CmdMeshRemoveCompByHand::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshEvaluateSolid); +DEF_STD_CMD_A(CmdMeshEvaluateSolid) CmdMeshEvaluateSolid::CmdMeshEvaluateSolid() :Command("Mesh_EvaluateSolid") @@ -1314,7 +1314,7 @@ bool CmdMeshEvaluateSolid::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshSmoothing); +DEF_STD_CMD_A(CmdMeshSmoothing) CmdMeshSmoothing::CmdMeshSmoothing() :Command("Mesh_Smoothing") @@ -1376,7 +1376,7 @@ bool CmdMeshSmoothing::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshHarmonizeNormals); +DEF_STD_CMD_A(CmdMeshHarmonizeNormals) CmdMeshHarmonizeNormals::CmdMeshHarmonizeNormals() :Command("Mesh_HarmonizeNormals") @@ -1410,7 +1410,7 @@ bool CmdMeshHarmonizeNormals::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshFlipNormals); +DEF_STD_CMD_A(CmdMeshFlipNormals) CmdMeshFlipNormals::CmdMeshFlipNormals() :Command("Mesh_FlipNormals") @@ -1444,7 +1444,7 @@ bool CmdMeshFlipNormals::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshBoundingBox); +DEF_STD_CMD_A(CmdMeshBoundingBox) CmdMeshBoundingBox::CmdMeshBoundingBox() :Command("Mesh_BoundingBox") @@ -1485,7 +1485,7 @@ bool CmdMeshBoundingBox::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshBuildRegularSolid); +DEF_STD_CMD_A(CmdMeshBuildRegularSolid) CmdMeshBuildRegularSolid::CmdMeshBuildRegularSolid() :Command("Mesh_BuildRegularSolid") @@ -1512,7 +1512,7 @@ bool CmdMeshBuildRegularSolid::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshFillupHoles); +DEF_STD_CMD_A(CmdMeshFillupHoles) CmdMeshFillupHoles::CmdMeshFillupHoles() :Command("Mesh_FillupHoles") @@ -1549,7 +1549,7 @@ bool CmdMeshFillupHoles::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshFillInteractiveHole); +DEF_STD_CMD_A(CmdMeshFillInteractiveHole) CmdMeshFillInteractiveHole::CmdMeshFillInteractiveHole() :Command("Mesh_FillInteractiveHole") @@ -1590,7 +1590,7 @@ bool CmdMeshFillInteractiveHole::isActive(void) return false; } -DEF_STD_CMD_A(CmdMeshSegmentation); +DEF_STD_CMD_A(CmdMeshSegmentation) CmdMeshSegmentation::CmdMeshSegmentation() : Command("Mesh_Segmentation") @@ -1660,7 +1660,7 @@ bool CmdMeshSegmentationBestFit::isActive(void) //-------------------------------------------------------------------------------------- -DEF_STD_CMD_A(CmdMeshMerge); +DEF_STD_CMD_A(CmdMeshMerge) CmdMeshMerge::CmdMeshMerge() :Command("Mesh_Merge") diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index 6e0a73df98..1e6b2eca0f 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -39,7 +39,7 @@ namespace MeshCore class MeshKernel; class MeshGeomFacet; class MeshFacetGrid; -}; +} using MeshCore::MeshKernel; using MeshCore::MeshGeomFacet; diff --git a/src/Mod/MeshPart/App/MeshAlgos.h b/src/Mod/MeshPart/App/MeshAlgos.h index 3936464d58..d524f7effd 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.h +++ b/src/Mod/MeshPart/App/MeshAlgos.h @@ -40,7 +40,7 @@ class TopoDS_Shape; namespace MeshCore { class MeshKernel; -}; +} using MeshCore::MeshKernel; diff --git a/src/Mod/MeshPart/App/Mesher.cpp b/src/Mod/MeshPart/App/Mesher.cpp index 757ddcff46..c1132c41d5 100644 --- a/src/Mod/MeshPart/App/Mesher.cpp +++ b/src/Mod/MeshPart/App/Mesher.cpp @@ -39,6 +39,9 @@ #if defined(__clang__) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Woverloaded-virtual" +#elif defined (__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wpedantic" #endif #include @@ -70,6 +73,8 @@ #endif // HAVE_NETGEN #if defined(__clang__) # pragma clang diagnostic pop +#elif defined (__GNUC__) +# pragma GCC diagnostic pop #endif #endif // HAVE_SMESH diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp index d26cd243b4..971761d8b5 100644 --- a/src/Mod/Part/App/Attacher.cpp +++ b/src/Mod/Part/App/Attacher.cpp @@ -1611,7 +1611,7 @@ double AttachEngine3D::calculateFoldAngle(gp_Vec axA, gp_Vec axB, gp_Vec edA, gp //================================================================================= -TYPESYSTEM_SOURCE(Attacher::AttachEnginePlane, Attacher::AttachEngine); +TYPESYSTEM_SOURCE(Attacher::AttachEnginePlane, Attacher::AttachEngine) AttachEnginePlane::AttachEnginePlane() { @@ -1640,7 +1640,7 @@ Base::Placement AttachEnginePlane::calculateAttachedPlacement(Base::Placement or //================================================================================= -TYPESYSTEM_SOURCE(Attacher::AttachEngineLine, Attacher::AttachEngine); +TYPESYSTEM_SOURCE(Attacher::AttachEngineLine, Attacher::AttachEngine) AttachEngineLine::AttachEngineLine() { diff --git a/src/Mod/Part/App/FaceMakerCheese.cpp b/src/Mod/Part/App/FaceMakerCheese.cpp index 180d8470f1..098037c29d 100644 --- a/src/Mod/Part/App/FaceMakerCheese.cpp +++ b/src/Mod/Part/App/FaceMakerCheese.cpp @@ -52,7 +52,7 @@ using namespace Part; -TYPESYSTEM_SOURCE(Part::FaceMakerCheese, Part::FaceMakerPublic); +TYPESYSTEM_SOURCE(Part::FaceMakerCheese, Part::FaceMakerPublic) TopoDS_Face FaceMakerCheese::validateFace(const TopoDS_Face& face) diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index b5999be135..57aea59385 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -75,7 +75,7 @@ using namespace Part; -FC_LOG_LEVEL_INIT("Part",true,true); +FC_LOG_LEVEL_INIT("Part",true,true) PROPERTY_SOURCE(Part::Feature, App::GeoFeature) diff --git a/src/Mod/Part/App/PropertyGeometryList.cpp b/src/Mod/Part/App/PropertyGeometryList.cpp index ac2924b15f..80b4e55406 100644 --- a/src/Mod/Part/App/PropertyGeometryList.cpp +++ b/src/Mod/Part/App/PropertyGeometryList.cpp @@ -51,7 +51,7 @@ using namespace Part; // PropertyGeometryList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(Part::PropertyGeometryList, App::PropertyLists); +TYPESYSTEM_SOURCE(Part::PropertyGeometryList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp index 4e91f0089c..6c6d8b00f4 100644 --- a/src/Mod/Part/App/PropertyTopoShape.cpp +++ b/src/Mod/Part/App/PropertyTopoShape.cpp @@ -72,7 +72,7 @@ using namespace Part; -TYPESYSTEM_SOURCE(Part::PropertyPartShape , App::PropertyComplexGeoData); +TYPESYSTEM_SOURCE(Part::PropertyPartShape , App::PropertyComplexGeoData) PropertyPartShape::PropertyPartShape() { @@ -445,7 +445,7 @@ void PropertyPartShape::RestoreDocFile(Base::Reader &reader) // ------------------------------------------------------------------------- -TYPESYSTEM_SOURCE(Part::PropertyShapeHistory , App::PropertyLists); +TYPESYSTEM_SOURCE(Part::PropertyShapeHistory , App::PropertyLists) PropertyShapeHistory::PropertyShapeHistory() { @@ -511,7 +511,7 @@ void PropertyShapeHistory::Paste(const Property &from) // ------------------------------------------------------------------------- -TYPESYSTEM_SOURCE(Part::PropertyFilletEdges , App::PropertyLists); +TYPESYSTEM_SOURCE(Part::PropertyFilletEdges , App::PropertyLists) PropertyFilletEdges::PropertyFilletEdges() { diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index ce6749ebbd..15a9e153d3 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -205,7 +205,7 @@ #include "FaceMakerBullseye.h" #include "BRepOffsetAPI_MakeOffsetFix.h" -FC_LOG_LEVEL_INIT("TopoShape",true,true); +FC_LOG_LEVEL_INIT("TopoShape",true,true) using namespace Part; @@ -278,7 +278,7 @@ BooleanException::BooleanException(const BooleanException &inst) // ------------------------------------------------ -TYPESYSTEM_SOURCE(Part::ShapeSegment , Data::Segment); +TYPESYSTEM_SOURCE(Part::ShapeSegment , Data::Segment) std::string ShapeSegment::getName() const { diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index efa069cc13..df2b46da86 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -81,7 +81,7 @@ //=========================================================================== // Part_PickCurveNet //=========================================================================== -DEF_STD_CMD(CmdPartPickCurveNet); +DEF_STD_CMD(CmdPartPickCurveNet) CmdPartPickCurveNet::CmdPartPickCurveNet() :Command("Part_PickCurveNet") @@ -103,7 +103,7 @@ void CmdPartPickCurveNet::activated(int iMsg) //=========================================================================== // Part_NewDoc //=========================================================================== -DEF_STD_CMD(CmdPartNewDoc); +DEF_STD_CMD(CmdPartNewDoc) CmdPartNewDoc::CmdPartNewDoc() :Command("Part_NewDoc") @@ -127,7 +127,7 @@ void CmdPartNewDoc::activated(int iMsg) //=========================================================================== // Part_Box2 //=========================================================================== -DEF_STD_CMD_A(CmdPartBox2); +DEF_STD_CMD_A(CmdPartBox2) CmdPartBox2::CmdPartBox2() :Command("Part_Box2") @@ -168,7 +168,7 @@ bool CmdPartBox2::isActive(void) //=========================================================================== // Part_Box3 //=========================================================================== -DEF_STD_CMD_A(CmdPartBox3); +DEF_STD_CMD_A(CmdPartBox3) CmdPartBox3::CmdPartBox3() :Command("Part_Box3") @@ -209,7 +209,7 @@ bool CmdPartBox3::isActive(void) //=========================================================================== // Part_Primitives //=========================================================================== -DEF_STD_CMD_A(CmdPartPrimitives); +DEF_STD_CMD_A(CmdPartPrimitives) CmdPartPrimitives::CmdPartPrimitives() :Command("Part_Primitives") @@ -263,7 +263,7 @@ bool checkForSolids(const TopoDS_Shape& shape) //=========================================================================== // Part_Cut //=========================================================================== -DEF_STD_CMD_A(CmdPartCut); +DEF_STD_CMD_A(CmdPartCut) CmdPartCut::CmdPartCut() :Command("Part_Cut") @@ -341,7 +341,7 @@ bool CmdPartCut::isActive(void) //=========================================================================== // Part_Common //=========================================================================== -DEF_STD_CMD_A(CmdPartCommon); +DEF_STD_CMD_A(CmdPartCommon) CmdPartCommon::CmdPartCommon() :Command("Part_Common") @@ -441,7 +441,7 @@ bool CmdPartCommon::isActive(void) //=========================================================================== // Part_Fuse //=========================================================================== -DEF_STD_CMD_A(CmdPartFuse); +DEF_STD_CMD_A(CmdPartFuse) CmdPartFuse::CmdPartFuse() :Command("Part_Fuse") @@ -542,7 +542,7 @@ bool CmdPartFuse::isActive(void) // Part_CompJoinFeatures (dropdown toolbar button for Connect, Embed and Cutout) //=========================================================================== -DEF_STD_CMD_ACL(CmdPartCompJoinFeatures); +DEF_STD_CMD_ACL(CmdPartCompJoinFeatures) CmdPartCompJoinFeatures::CmdPartCompJoinFeatures() : Command("Part_CompJoinFeatures") @@ -648,7 +648,7 @@ bool CmdPartCompJoinFeatures::isActive(void) // Part_CompSplitFeatures (dropdown toolbar button for BooleanFragments, Slice) //=========================================================================== -DEF_STD_CMD_ACL(CmdPartCompSplitFeatures); +DEF_STD_CMD_ACL(CmdPartCompSplitFeatures) CmdPartCompSplitFeatures::CmdPartCompSplitFeatures() : Command("Part_CompSplitFeatures") @@ -770,7 +770,7 @@ bool CmdPartCompSplitFeatures::isActive(void) // Part_CompCompoundTools (dropdown toolbar button for BooleanFragments, Slice) //=========================================================================== -DEF_STD_CMD_ACL(CmdPartCompCompoundTools); +DEF_STD_CMD_ACL(CmdPartCompCompoundTools) CmdPartCompCompoundTools::CmdPartCompCompoundTools() : Command("Part_CompCompoundTools") @@ -877,7 +877,7 @@ bool CmdPartCompCompoundTools::isActive(void) //=========================================================================== // Part_Compound //=========================================================================== -DEF_STD_CMD_A(CmdPartCompound); +DEF_STD_CMD_A(CmdPartCompound) CmdPartCompound::CmdPartCompound() :Command("Part_Compound") @@ -934,7 +934,7 @@ bool CmdPartCompound::isActive(void) //=========================================================================== // Part_Section //=========================================================================== -DEF_STD_CMD_A(CmdPartSection); +DEF_STD_CMD_A(CmdPartSection) CmdPartSection::CmdPartSection() :Command("Part_Section") @@ -982,7 +982,7 @@ bool CmdPartSection::isActive(void) //=========================================================================== // CmdPartImport //=========================================================================== -DEF_STD_CMD_A(CmdPartImport); +DEF_STD_CMD_A(CmdPartImport) CmdPartImport::CmdPartImport() :Command("Part_Import") @@ -1042,7 +1042,7 @@ bool CmdPartImport::isActive(void) //=========================================================================== // CmdPartExport //=========================================================================== -DEF_STD_CMD_A(CmdPartExport); +DEF_STD_CMD_A(CmdPartExport) CmdPartExport::CmdPartExport() : Command("Part_Export") @@ -1089,7 +1089,7 @@ bool CmdPartExport::isActive(void) //=========================================================================== // PartImportCurveNet //=========================================================================== -DEF_STD_CMD_A(CmdPartImportCurveNet); +DEF_STD_CMD_A(CmdPartImportCurveNet) CmdPartImportCurveNet::CmdPartImportCurveNet() :Command("Part_ImportCurveNet") @@ -1137,7 +1137,7 @@ bool CmdPartImportCurveNet::isActive(void) //=========================================================================== // Part_MakeSolid //=========================================================================== -DEF_STD_CMD_A(CmdPartMakeSolid); +DEF_STD_CMD_A(CmdPartMakeSolid) CmdPartMakeSolid::CmdPartMakeSolid() :Command("Part_MakeSolid") @@ -1215,7 +1215,7 @@ bool CmdPartMakeSolid::isActive(void) //=========================================================================== // Part_ReverseShape //=========================================================================== -DEF_STD_CMD_A(CmdPartReverseShape); +DEF_STD_CMD_A(CmdPartReverseShape) CmdPartReverseShape::CmdPartReverseShape() :Command("Part_ReverseShape") @@ -1269,7 +1269,7 @@ bool CmdPartReverseShape::isActive(void) //=========================================================================== // Part_Boolean //=========================================================================== -DEF_STD_CMD_A(CmdPartBoolean); +DEF_STD_CMD_A(CmdPartBoolean) CmdPartBoolean::CmdPartBoolean() :Command("Part_Boolean") @@ -1300,7 +1300,7 @@ bool CmdPartBoolean::isActive(void) //=========================================================================== // Part_Extrude //=========================================================================== -DEF_STD_CMD_A(CmdPartExtrude); +DEF_STD_CMD_A(CmdPartExtrude) CmdPartExtrude::CmdPartExtrude() :Command("Part_Extrude") @@ -1328,7 +1328,7 @@ bool CmdPartExtrude::isActive(void) //=========================================================================== // Part_MakeFace //=========================================================================== -DEF_STD_CMD_A(CmdPartMakeFace); +DEF_STD_CMD_A(CmdPartMakeFace) CmdPartMakeFace::CmdPartMakeFace() : Command("Part_MakeFace") @@ -1377,7 +1377,7 @@ bool CmdPartMakeFace::isActive(void) //=========================================================================== // Part_Revolve //=========================================================================== -DEF_STD_CMD_A(CmdPartRevolve); +DEF_STD_CMD_A(CmdPartRevolve) CmdPartRevolve::CmdPartRevolve() :Command("Part_Revolve") @@ -1405,7 +1405,7 @@ bool CmdPartRevolve::isActive(void) //=========================================================================== // Part_Fillet //=========================================================================== -DEF_STD_CMD_A(CmdPartFillet); +DEF_STD_CMD_A(CmdPartFillet) CmdPartFillet::CmdPartFillet() :Command("Part_Fillet") @@ -1433,7 +1433,7 @@ bool CmdPartFillet::isActive(void) //=========================================================================== // Part_Chamfer //=========================================================================== -DEF_STD_CMD_A(CmdPartChamfer); +DEF_STD_CMD_A(CmdPartChamfer) CmdPartChamfer::CmdPartChamfer() :Command("Part_Chamfer") @@ -1461,7 +1461,7 @@ bool CmdPartChamfer::isActive(void) //=========================================================================== // Part_Mirror //=========================================================================== -DEF_STD_CMD_A(CmdPartMirror); +DEF_STD_CMD_A(CmdPartMirror) CmdPartMirror::CmdPartMirror() :Command("Part_Mirror") @@ -1489,7 +1489,7 @@ bool CmdPartMirror::isActive(void) //=========================================================================== // Part_CrossSections //=========================================================================== -DEF_STD_CMD_A(CmdPartCrossSections); +DEF_STD_CMD_A(CmdPartCrossSections) CmdPartCrossSections::CmdPartCrossSections() :Command("Part_CrossSections") @@ -1529,7 +1529,7 @@ bool CmdPartCrossSections::isActive(void) // Part_Builder //=========================================================================== -DEF_STD_CMD_A(CmdPartBuilder); +DEF_STD_CMD_A(CmdPartBuilder) CmdPartBuilder::CmdPartBuilder() :Command("Part_Builder") @@ -1558,7 +1558,7 @@ bool CmdPartBuilder::isActive(void) // Part_Loft //=========================================================================== -DEF_STD_CMD_A(CmdPartLoft); +DEF_STD_CMD_A(CmdPartLoft) CmdPartLoft::CmdPartLoft() : Command("Part_Loft") @@ -1587,7 +1587,7 @@ bool CmdPartLoft::isActive(void) // Part_Sweep //=========================================================================== -DEF_STD_CMD_A(CmdPartSweep); +DEF_STD_CMD_A(CmdPartSweep) CmdPartSweep::CmdPartSweep() : Command("Part_Sweep") @@ -1616,7 +1616,7 @@ bool CmdPartSweep::isActive(void) // Part_Offset //=========================================================================== -DEF_STD_CMD_A(CmdPartOffset); +DEF_STD_CMD_A(CmdPartOffset) CmdPartOffset::CmdPartOffset() : Command("Part_Offset") @@ -1665,7 +1665,7 @@ bool CmdPartOffset::isActive(void) // Part_Offset2D //=========================================================================== -DEF_STD_CMD_A(CmdPartOffset2D); +DEF_STD_CMD_A(CmdPartOffset2D) CmdPartOffset2D::CmdPartOffset2D() : Command("Part_Offset2D") @@ -1713,7 +1713,7 @@ bool CmdPartOffset2D::isActive(void) // Part_CompOffset (dropdown toolbar button for Offset features) //=========================================================================== -DEF_STD_CMD_ACL(CmdPartCompOffset); +DEF_STD_CMD_ACL(CmdPartCompOffset) CmdPartCompOffset::CmdPartCompOffset() : Command("Part_CompOffset") @@ -1806,7 +1806,7 @@ bool CmdPartCompOffset::isActive(void) // Part_Thickness //=========================================================================== -DEF_STD_CMD_A(CmdPartThickness); +DEF_STD_CMD_A(CmdPartThickness) CmdPartThickness::CmdPartThickness() : Command("Part_Thickness") @@ -1881,7 +1881,7 @@ bool CmdPartThickness::isActive(void) // Part_ShapeInfo //=========================================================================== -DEF_STD_CMD_A(CmdShapeInfo); +DEF_STD_CMD_A(CmdShapeInfo) CmdShapeInfo::CmdShapeInfo() :Command("Part_ShapeInfo") @@ -1981,7 +1981,7 @@ bool CmdShapeInfo::isActive(void) // Part_RuledSurface //=========================================================================== -DEF_STD_CMD_A(CmdPartRuledSurface); +DEF_STD_CMD_A(CmdPartRuledSurface) CmdPartRuledSurface::CmdPartRuledSurface() : Command("Part_RuledSurface") @@ -2097,7 +2097,7 @@ bool CmdPartRuledSurface::isActive(void) // Part_CheckGeometry //=========================================================================== -DEF_STD_CMD_A(CmdCheckGeometry); +DEF_STD_CMD_A(CmdCheckGeometry) CmdCheckGeometry::CmdCheckGeometry() : Command("Part_CheckGeometry") @@ -2131,7 +2131,7 @@ bool CmdCheckGeometry::isActive(void) // Part_ColorPerFace //=========================================================================== -DEF_STD_CMD_A(CmdColorPerFace); +DEF_STD_CMD_A(CmdColorPerFace) CmdColorPerFace::CmdColorPerFace() : Command("Part_ColorPerFace") @@ -2168,7 +2168,7 @@ bool CmdColorPerFace::isActive(void) // Part_Measure_Linear //=========================================================================== -DEF_STD_CMD_A(CmdMeasureLinear); +DEF_STD_CMD_A(CmdMeasureLinear) CmdMeasureLinear::CmdMeasureLinear() : Command("Part_Measure_Linear") @@ -2197,7 +2197,7 @@ bool CmdMeasureLinear::isActive(void) // Part_Measure_Angular //=========================================================================== -DEF_STD_CMD_A(CmdMeasureAngular); +DEF_STD_CMD_A(CmdMeasureAngular) CmdMeasureAngular::CmdMeasureAngular() : Command("Part_Measure_Angular") @@ -2226,7 +2226,7 @@ bool CmdMeasureAngular::isActive(void) // Part_Measure_Refresh //=========================================================================== -DEF_STD_CMD_A(CmdMeasureRefresh); +DEF_STD_CMD_A(CmdMeasureRefresh) CmdMeasureRefresh::CmdMeasureRefresh() : Command("Part_Measure_Refresh") @@ -2255,7 +2255,7 @@ bool CmdMeasureRefresh::isActive(void) // Part_Measure_Clear_All //=========================================================================== -DEF_STD_CMD_A(CmdMeasureClearAll); +DEF_STD_CMD_A(CmdMeasureClearAll) CmdMeasureClearAll::CmdMeasureClearAll() : Command("Part_Measure_Clear_All") @@ -2284,7 +2284,7 @@ bool CmdMeasureClearAll::isActive(void) // Part_Measure_Toggle_All //=========================================================================== -DEF_STD_CMD_A(CmdMeasureToggleAll); +DEF_STD_CMD_A(CmdMeasureToggleAll) CmdMeasureToggleAll::CmdMeasureToggleAll() : Command("Part_Measure_Toggle_All") @@ -2319,7 +2319,7 @@ bool CmdMeasureToggleAll::isActive(void) // Part_Measure_Toggle_3d //=========================================================================== -DEF_STD_CMD_A(CmdMeasureToggle3d); +DEF_STD_CMD_A(CmdMeasureToggle3d) CmdMeasureToggle3d::CmdMeasureToggle3d() : Command("Part_Measure_Toggle_3d") @@ -2348,7 +2348,7 @@ bool CmdMeasureToggle3d::isActive(void) // Part_Measure_Toggle_Delta //=========================================================================== -DEF_STD_CMD_A(CmdMeasureToggleDelta); +DEF_STD_CMD_A(CmdMeasureToggleDelta) CmdMeasureToggleDelta::CmdMeasureToggleDelta() : Command("Part_Measure_Toggle_Delta") @@ -2406,7 +2406,7 @@ bool CmdBoxSelection::isActive(void) //=========================================================================== // Part_projectionOnSurface //=========================================================================== -DEF_STD_CMD_A(CmdPartProjectionOnSurface); +DEF_STD_CMD_A(CmdPartProjectionOnSurface) CmdPartProjectionOnSurface::CmdPartProjectionOnSurface() :Command("Part_projectionOnSurface") diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index 5fe7c3b44d..ffac5763f6 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -37,7 +37,7 @@ //=========================================================================== // Part_Cylinder //=========================================================================== -DEF_STD_CMD_A(CmdPartCylinder); +DEF_STD_CMD_A(CmdPartCylinder) CmdPartCylinder::CmdPartCylinder() : Command("Part_Cylinder") @@ -78,7 +78,7 @@ bool CmdPartCylinder::isActive(void) //=========================================================================== // Part_Box //=========================================================================== -DEF_STD_CMD_A(CmdPartBox); +DEF_STD_CMD_A(CmdPartBox) CmdPartBox::CmdPartBox() : Command("Part_Box") @@ -119,7 +119,7 @@ bool CmdPartBox::isActive(void) //=========================================================================== // Part_Sphere //=========================================================================== -DEF_STD_CMD_A(CmdPartSphere); +DEF_STD_CMD_A(CmdPartSphere) CmdPartSphere::CmdPartSphere() : Command("Part_Sphere") @@ -160,7 +160,7 @@ bool CmdPartSphere::isActive(void) //=========================================================================== // Part_Cone //=========================================================================== -DEF_STD_CMD_A(CmdPartCone); +DEF_STD_CMD_A(CmdPartCone) CmdPartCone::CmdPartCone() : Command("Part_Cone") @@ -201,7 +201,7 @@ bool CmdPartCone::isActive(void) //=========================================================================== // Part_Torus //=========================================================================== -DEF_STD_CMD_A(CmdPartTorus); +DEF_STD_CMD_A(CmdPartTorus) CmdPartTorus::CmdPartTorus() : Command("Part_Torus") diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index bc74ab2756..bd482edb96 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -48,7 +48,7 @@ //=========================================================================== // Part_SimpleCylinder //=========================================================================== -DEF_STD_CMD_A(CmdPartSimpleCylinder); +DEF_STD_CMD_A(CmdPartSimpleCylinder) CmdPartSimpleCylinder::CmdPartSimpleCylinder() :Command("Part_SimpleCylinder") @@ -99,7 +99,7 @@ bool CmdPartSimpleCylinder::isActive(void) //=========================================================================== // Part_ShapeFromMesh //=========================================================================== -DEF_STD_CMD_A(CmdPartShapeFromMesh); +DEF_STD_CMD_A(CmdPartShapeFromMesh) CmdPartShapeFromMesh::CmdPartShapeFromMesh() :Command("Part_ShapeFromMesh") @@ -171,7 +171,7 @@ bool CmdPartShapeFromMesh::isActive(void) //=========================================================================== // Part_PointsFromMesh //=========================================================================== -DEF_STD_CMD_A(CmdPartPointsFromMesh); +DEF_STD_CMD_A(CmdPartPointsFromMesh) CmdPartPointsFromMesh::CmdPartPointsFromMesh() :Command("Part_PointsFromMesh") @@ -221,7 +221,7 @@ bool CmdPartPointsFromMesh::isActive(void) //=========================================================================== // Part_SimpleCopy //=========================================================================== -DEF_STD_CMD_A(CmdPartSimpleCopy); +DEF_STD_CMD_A(CmdPartSimpleCopy) CmdPartSimpleCopy::CmdPartSimpleCopy() : Command("Part_SimpleCopy") @@ -292,7 +292,7 @@ bool CmdPartSimpleCopy::isActive(void) //=========================================================================== // Part_TransformedCopy //=========================================================================== -DEF_STD_CMD_A(CmdPartTransformedCopy); +DEF_STD_CMD_A(CmdPartTransformedCopy) CmdPartTransformedCopy::CmdPartTransformedCopy() : Command("Part_TransformedCopy") @@ -320,7 +320,7 @@ bool CmdPartTransformedCopy::isActive(void) //=========================================================================== // Part_ElementCopy //=========================================================================== -DEF_STD_CMD_A(CmdPartElementCopy); +DEF_STD_CMD_A(CmdPartElementCopy) CmdPartElementCopy::CmdPartElementCopy() : Command("Part_ElementCopy") @@ -348,7 +348,7 @@ bool CmdPartElementCopy::isActive(void) //=========================================================================== // Part_RefineShape //=========================================================================== -DEF_STD_CMD_A(CmdPartRefineShape); +DEF_STD_CMD_A(CmdPartRefineShape) CmdPartRefineShape::CmdPartRefineShape() : Command("Part_RefineShape") @@ -376,7 +376,7 @@ bool CmdPartRefineShape::isActive(void) //=========================================================================== // Part_Defeaturing //=========================================================================== -DEF_STD_CMD_A(CmdPartDefeaturing); +DEF_STD_CMD_A(CmdPartDefeaturing) CmdPartDefeaturing::CmdPartDefeaturing() : Command("Part_Defeaturing") diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index b46dd51680..2ebc8bc113 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -57,7 +57,7 @@ #include #include -FC_LOG_LEVEL_INIT("Part",true,true); +FC_LOG_LEVEL_INIT("Part",true,true) using namespace PartGui; diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 83460a0c40..be2ba625a7 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -223,7 +223,7 @@ namespace PartGui { } }; }; -}; +} /* TRANSLATOR PartGui::DlgFilletEdges */ diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp index 6352f53fb9..b57aedccd4 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp @@ -65,7 +65,7 @@ using namespace PartGui; -SO_NODE_SOURCE(SoBrepEdgeSet); +SO_NODE_SOURCE(SoBrepEdgeSet) struct SoBrepEdgeSet::SelContext: Gui::SoFCSelectionContext { std::vector hl, sl; diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.cpp b/src/Mod/Part/Gui/SoBrepFaceSet.cpp index e7f8fcf87f..6e192e03c9 100644 --- a/src/Mod/Part/Gui/SoBrepFaceSet.cpp +++ b/src/Mod/Part/Gui/SoBrepFaceSet.cpp @@ -83,7 +83,7 @@ using namespace PartGui; -SO_NODE_SOURCE(SoBrepFaceSet); +SO_NODE_SOURCE(SoBrepFaceSet) #define PRIVATE(p) ((p)->pimpl) diff --git a/src/Mod/Part/Gui/SoBrepPointSet.cpp b/src/Mod/Part/Gui/SoBrepPointSet.cpp index f322cb45c3..268084490d 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.cpp +++ b/src/Mod/Part/Gui/SoBrepPointSet.cpp @@ -64,7 +64,7 @@ using namespace PartGui; -SO_NODE_SOURCE(SoBrepPointSet); +SO_NODE_SOURCE(SoBrepPointSet) void SoBrepPointSet::initClass() { diff --git a/src/Mod/Part/Gui/SoFCShapeObject.cpp b/src/Mod/Part/Gui/SoFCShapeObject.cpp index c061a3b69e..2ea9155972 100644 --- a/src/Mod/Part/Gui/SoFCShapeObject.cpp +++ b/src/Mod/Part/Gui/SoFCShapeObject.cpp @@ -53,7 +53,7 @@ using namespace PartGui; -SO_NODE_SOURCE(SoFCControlPoints); +SO_NODE_SOURCE(SoFCControlPoints) void SoFCControlPoints::initClass() { diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index c67e4a7959..e170df52b5 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -365,7 +365,7 @@ void PartGui::ensure3dDimensionVisible() } -SO_KIT_SOURCE(PartGui::DimensionLinear); +SO_KIT_SOURCE(PartGui::DimensionLinear) void PartGui::DimensionLinear::initClass() { @@ -1110,7 +1110,7 @@ void PartGui::goDimensionAngularNoTask(const VectorAdapter &vector1Adapter, cons dimension->unref(); } -SO_KIT_SOURCE(PartGui::DimensionAngular); +SO_KIT_SOURCE(PartGui::DimensionAngular) void PartGui::DimensionAngular::initClass() { @@ -1272,7 +1272,7 @@ void PartGui::DimensionAngular::setupDimension() material->unref(); } -SO_ENGINE_SOURCE(PartGui::ArcEngine); +SO_ENGINE_SOURCE(PartGui::ArcEngine) PartGui::ArcEngine::ArcEngine() { diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 1b0f51cbda..4df82bc9f7 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -152,7 +152,7 @@ CAreaConfig::~CAreaConfig() { ////////////////////////////////////////////////////////////////////////////// -TYPESYSTEM_SOURCE(Path::Area, Base::BaseClass); +TYPESYSTEM_SOURCE(Path::Area, Base::BaseClass) bool Area::s_aborting; diff --git a/src/Mod/Path/App/Command.cpp b/src/Mod/Path/App/Command.cpp index 95c9bee7dd..3c7e9195b4 100644 --- a/src/Mod/Path/App/Command.cpp +++ b/src/Mod/Path/App/Command.cpp @@ -40,7 +40,7 @@ using namespace Base; using namespace Path; -TYPESYSTEM_SOURCE(Path::Command , Base::Persistence); +TYPESYSTEM_SOURCE(Path::Command , Base::Persistence) // Constructors & destructors diff --git a/src/Mod/Path/App/Path.cpp b/src/Mod/Path/App/Path.cpp index cc526c0684..b67013e754 100644 --- a/src/Mod/Path/App/Path.cpp +++ b/src/Mod/Path/App/Path.cpp @@ -43,7 +43,7 @@ using namespace Path; using namespace Base; -TYPESYSTEM_SOURCE(Path::Toolpath , Base::Persistence); +TYPESYSTEM_SOURCE(Path::Toolpath , Base::Persistence) Toolpath::Toolpath() { diff --git a/src/Mod/Path/App/PropertyPath.cpp b/src/Mod/Path/App/PropertyPath.cpp index 05b5ce8536..8fcb988734 100644 --- a/src/Mod/Path/App/PropertyPath.cpp +++ b/src/Mod/Path/App/PropertyPath.cpp @@ -42,7 +42,7 @@ using namespace Path; -TYPESYSTEM_SOURCE(Path::PropertyPath, App::Property); +TYPESYSTEM_SOURCE(Path::PropertyPath, App::Property) PropertyPath::PropertyPath() { diff --git a/src/Mod/Path/App/PropertyTool.cpp b/src/Mod/Path/App/PropertyTool.cpp index a7c23c9b9b..39fd026484 100644 --- a/src/Mod/Path/App/PropertyTool.cpp +++ b/src/Mod/Path/App/PropertyTool.cpp @@ -40,7 +40,7 @@ using namespace Path; -TYPESYSTEM_SOURCE(Path::PropertyTool, App::Property); +TYPESYSTEM_SOURCE(Path::PropertyTool, App::Property) PropertyTool::PropertyTool() { diff --git a/src/Mod/Path/App/PropertyTooltable.cpp b/src/Mod/Path/App/PropertyTooltable.cpp index 6bc72c30e1..b471a82f8a 100644 --- a/src/Mod/Path/App/PropertyTooltable.cpp +++ b/src/Mod/Path/App/PropertyTooltable.cpp @@ -40,7 +40,7 @@ using namespace Path; -TYPESYSTEM_SOURCE(Path::PropertyTooltable, App::Property); +TYPESYSTEM_SOURCE(Path::PropertyTooltable, App::Property) PropertyTooltable::PropertyTooltable() { diff --git a/src/Mod/Path/App/Tool.cpp b/src/Mod/Path/App/Tool.cpp index 288626911e..9c8a33f9f4 100644 --- a/src/Mod/Path/App/Tool.cpp +++ b/src/Mod/Path/App/Tool.cpp @@ -33,7 +33,7 @@ using namespace Base; using namespace Path; -TYPESYSTEM_SOURCE(Path::Tool , Base::Persistence); +TYPESYSTEM_SOURCE(Path::Tool , Base::Persistence) // Constructors & destructors diff --git a/src/Mod/Path/App/Tooltable.cpp b/src/Mod/Path/App/Tooltable.cpp index a9351899e9..699e93e8f2 100644 --- a/src/Mod/Path/App/Tooltable.cpp +++ b/src/Mod/Path/App/Tooltable.cpp @@ -34,7 +34,7 @@ using namespace Base; using namespace Path; -TYPESYSTEM_SOURCE(Path::Tooltable , Base::Persistence); +TYPESYSTEM_SOURCE(Path::Tooltable , Base::Persistence) Tooltable::Tooltable() { diff --git a/src/Mod/Path/libarea/Area.cpp b/src/Mod/Path/libarea/Area.cpp index be6b8e8e98..4a7ae894fa 100644 --- a/src/Mod/Path/libarea/Area.cpp +++ b/src/Mod/Path/libarea/Area.cpp @@ -32,15 +32,15 @@ double CArea::m_after_MakeOffsets_length = 0.0; _type CArea::get_##_name() {return m_##_name;}\ void CArea::set_##_name(_type _name) {m_##_name = _name;} -_CAREA_PARAM_DEFINE(Point,double,tolerance); +_CAREA_PARAM_DEFINE(Point,double,tolerance) CAREA_PARAM_DEFINE(bool,fit_arcs) -CAREA_PARAM_DEFINE(bool,clipper_simple); -CAREA_PARAM_DEFINE(double,clipper_clean_distance); -CAREA_PARAM_DEFINE(double,accuracy); -CAREA_PARAM_DEFINE(double,units); -CAREA_PARAM_DEFINE(short,min_arc_points); -CAREA_PARAM_DEFINE(short,max_arc_points); -CAREA_PARAM_DEFINE(double,clipper_scale); +CAREA_PARAM_DEFINE(bool,clipper_simple) +CAREA_PARAM_DEFINE(double,clipper_clean_distance) +CAREA_PARAM_DEFINE(double,accuracy) +CAREA_PARAM_DEFINE(double,units) +CAREA_PARAM_DEFINE(short,min_arc_points) +CAREA_PARAM_DEFINE(short,max_arc_points) +CAREA_PARAM_DEFINE(double,clipper_scale) void CArea::append(const CCurve& curve) { diff --git a/src/Mod/Path/libarea/Area.h b/src/Mod/Path/libarea/Area.h index 3f6eabe756..0e2c291e54 100644 --- a/src/Mod/Path/libarea/Area.h +++ b/src/Mod/Path/libarea/Area.h @@ -94,15 +94,15 @@ public: static _type get_##_name();\ static void set_##_name(_type _name); - CAREA_PARAM_DECLARE(double,tolerance); + CAREA_PARAM_DECLARE(double,tolerance) CAREA_PARAM_DECLARE(bool,fit_arcs) - CAREA_PARAM_DECLARE(bool,clipper_simple); - CAREA_PARAM_DECLARE(double,clipper_clean_distance); - CAREA_PARAM_DECLARE(double,accuracy); - CAREA_PARAM_DECLARE(double,units); - CAREA_PARAM_DECLARE(short,min_arc_points); - CAREA_PARAM_DECLARE(short,max_arc_points); - CAREA_PARAM_DECLARE(double,clipper_scale); + CAREA_PARAM_DECLARE(bool,clipper_simple) + CAREA_PARAM_DECLARE(double,clipper_clean_distance) + CAREA_PARAM_DECLARE(double,accuracy) + CAREA_PARAM_DECLARE(double,units) + CAREA_PARAM_DECLARE(short,min_arc_points) + CAREA_PARAM_DECLARE(short,max_arc_points) + CAREA_PARAM_DECLARE(double,clipper_scale) // Following functions is add to operate on possible open curves void PopulateClipper(ClipperLib::Clipper &c, ClipperLib::PolyType type) const; diff --git a/src/Mod/Path/libarea/kurve/geometry.h b/src/Mod/Path/libarea/kurve/geometry.h index ad3aee0d33..869beb3dbf 100644 --- a/src/Mod/Path/libarea/kurve/geometry.h +++ b/src/Mod/Path/libarea/kurve/geometry.h @@ -531,7 +531,7 @@ inline bool FNEZ(double a, double tolerance = TIGHT_TOLERANCE) {return fabs(a) > if(p.y > pmax.y) pmax.y = p.y; if(p.x < pmin.x) pmin.x = p.x; if(p.y < pmin.y) pmin.y = p.y; - }; + } inline void MinMax(const Point3d& p, Point3d& pmin, Point3d& pmax) { if(p.x > pmax.x) pmax.x = p.x; @@ -540,7 +540,7 @@ inline bool FNEZ(double a, double tolerance = TIGHT_TOLERANCE) {return fabs(a) > if(p.x < pmin.x) pmin.x = p.x; if(p.y < pmin.y) pmin.y = p.y; if(p.z < pmin.z) pmin.z = p.z; - }; + } diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp index f593b273de..c55efcb5c4 100644 --- a/src/Mod/Points/Gui/Command.cpp +++ b/src/Mod/Points/Gui/Command.cpp @@ -56,7 +56,7 @@ //=========================================================================== // CmdPointsImport //=========================================================================== -DEF_STD_CMD_A(CmdPointsImport); +DEF_STD_CMD_A(CmdPointsImport) CmdPointsImport::CmdPointsImport() : Command("Points_Import") @@ -103,7 +103,7 @@ bool CmdPointsImport::isActive(void) return false; } -DEF_STD_CMD_A(CmdPointsExport); +DEF_STD_CMD_A(CmdPointsExport) CmdPointsExport::CmdPointsExport() : Command("Points_Export") @@ -142,7 +142,7 @@ bool CmdPointsExport::isActive(void) return getSelection().countObjectsOfType(Points::Feature::getClassTypeId()) > 0; } -DEF_STD_CMD_A(CmdPointsTransform); +DEF_STD_CMD_A(CmdPointsTransform) CmdPointsTransform::CmdPointsTransform() :Command("Points_Transform") @@ -179,7 +179,7 @@ bool CmdPointsTransform::isActive(void) return getSelection().countObjectsOfType(Points::Feature::getClassTypeId()) > 0; } -DEF_STD_CMD_A(CmdPointsConvert); +DEF_STD_CMD_A(CmdPointsConvert) CmdPointsConvert::CmdPointsConvert() :Command("Points_Convert") @@ -264,7 +264,7 @@ bool CmdPointsConvert::isActive(void) return getSelection().countObjectsOfType(Base::Type::fromName("App::GeoFeature")) > 0; } -DEF_STD_CMD_A(CmdPointsPolyCut); +DEF_STD_CMD_A(CmdPointsPolyCut) CmdPointsPolyCut::CmdPointsPolyCut() :Command("Points_PolyCut") diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp index a861413a5f..8898dbdb51 100644 --- a/src/Mod/Raytracing/Gui/Command.cpp +++ b/src/Mod/Raytracing/Gui/Command.cpp @@ -73,7 +73,7 @@ //=========================================================================== // CmdRaytracingWriteCamera //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingWriteCamera); +DEF_STD_CMD_A(CmdRaytracingWriteCamera) CmdRaytracingWriteCamera::CmdRaytracingWriteCamera() :Command("Raytracing_WriteCamera") @@ -166,7 +166,7 @@ bool CmdRaytracingWriteCamera::isActive(void) //=========================================================================== // CmdRaytracingWritePart //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingWritePart); +DEF_STD_CMD_A(CmdRaytracingWritePart) CmdRaytracingWritePart::CmdRaytracingWritePart() :Command("Raytracing_WritePart") @@ -212,7 +212,7 @@ bool CmdRaytracingWritePart::isActive(void) //=========================================================================== // CmdRaytracingWriteView //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingWriteView); +DEF_STD_CMD_A(CmdRaytracingWriteView) CmdRaytracingWriteView::CmdRaytracingWriteView() :Command("Raytracing_WriteView") @@ -311,7 +311,7 @@ bool CmdRaytracingWriteView::isActive(void) // Raytracing_NewPovrayProject //=========================================================================== -DEF_STD_CMD_AC(CmdRaytracingNewPovrayProject); +DEF_STD_CMD_AC(CmdRaytracingNewPovrayProject) CmdRaytracingNewPovrayProject::CmdRaytracingNewPovrayProject() : Command("Raytracing_NewPovrayProject") @@ -428,7 +428,7 @@ bool CmdRaytracingNewPovrayProject::isActive(void) // Raytracing_NewPartView //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingNewPartSegment); +DEF_STD_CMD_A(CmdRaytracingNewPartSegment) CmdRaytracingNewPartSegment::CmdRaytracingNewPartSegment() : Command("Raytracing_NewPartSegment") @@ -511,7 +511,7 @@ bool CmdRaytracingNewPartSegment::isActive(void) // Raytracing_ExportProject //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingExportProject); +DEF_STD_CMD_A(CmdRaytracingExportProject) CmdRaytracingExportProject::CmdRaytracingExportProject() : Command("Raytracing_ExportProject") @@ -578,7 +578,7 @@ bool CmdRaytracingExportProject::isActive(void) // Raytracing_Render //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingRender); +DEF_STD_CMD_A(CmdRaytracingRender) CmdRaytracingRender::CmdRaytracingRender() : Command("Raytracing_Render") @@ -745,7 +745,7 @@ bool CmdRaytracingRender::isActive(void) // Raytracing_NewLuxProject //=========================================================================== -DEF_STD_CMD_AC(CmdRaytracingNewLuxProject); +DEF_STD_CMD_AC(CmdRaytracingNewLuxProject) CmdRaytracingNewLuxProject::CmdRaytracingNewLuxProject() : Command("Raytracing_NewLuxProject") @@ -857,7 +857,7 @@ bool CmdRaytracingNewLuxProject::isActive(void) // Raytracing_ResetCamera //=========================================================================== -DEF_STD_CMD_A(CmdRaytracingResetCamera); +DEF_STD_CMD_A(CmdRaytracingResetCamera) CmdRaytracingResetCamera::CmdRaytracingResetCamera() : Command("Raytracing_ResetCamera") diff --git a/src/Mod/ReverseEngineering/Gui/Command.cpp b/src/Mod/ReverseEngineering/Gui/Command.cpp index ef778750c7..4619b612df 100644 --- a/src/Mod/ReverseEngineering/Gui/Command.cpp +++ b/src/Mod/ReverseEngineering/Gui/Command.cpp @@ -50,7 +50,7 @@ using namespace std; -DEF_STD_CMD_A(CmdApproxSurface); +DEF_STD_CMD_A(CmdApproxSurface) CmdApproxSurface::CmdApproxSurface() : Command("Reen_ApproxSurface") @@ -85,7 +85,7 @@ bool CmdApproxSurface::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdApproxPlane); +DEF_STD_CMD_A(CmdApproxPlane) CmdApproxPlane::CmdApproxPlane() : Command("Reen_ApproxPlane") @@ -186,7 +186,7 @@ bool CmdApproxPlane::isActive(void) return false; } -DEF_STD_CMD_A(CmdPoissonReconstruction); +DEF_STD_CMD_A(CmdPoissonReconstruction) CmdPoissonReconstruction::CmdPoissonReconstruction() : Command("Reen_PoissonReconstruction") @@ -220,7 +220,7 @@ bool CmdPoissonReconstruction::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdViewTriangulation); +DEF_STD_CMD_A(CmdViewTriangulation) CmdViewTriangulation::CmdViewTriangulation() : Command("Reen_ViewTriangulation") diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp index 7101d60377..07e7123c40 100644 --- a/src/Mod/Spreadsheet/App/Cell.cpp +++ b/src/Mod/Spreadsheet/App/Cell.cpp @@ -38,7 +38,7 @@ #include "Sheet.h" #include -FC_LOG_LEVEL_INIT("Spreadsheet",true,true); +FC_LOG_LEVEL_INIT("Spreadsheet",true,true) #ifdef _MSC_VER #define __func__ __FUNCTION__ diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp index f9335dbd76..d3b9a9655b 100644 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp @@ -37,7 +37,7 @@ using namespace Spreadsheet; const int PropertyColumnWidths::defaultWidth = 100; const int PropertyColumnWidths::defaultHeaderWidth = 50; -TYPESYSTEM_SOURCE(Spreadsheet::PropertyColumnWidths , App::Property); +TYPESYSTEM_SOURCE(Spreadsheet::PropertyColumnWidths , App::Property) PropertyColumnWidths::PropertyColumnWidths() { diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp index cbe985a6e8..9a61fa2ab3 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp @@ -36,7 +36,7 @@ using namespace Spreadsheet; const int PropertyRowHeights::defaultHeight = 30; -TYPESYSTEM_SOURCE(Spreadsheet::PropertyRowHeights , App::Property); +TYPESYSTEM_SOURCE(Spreadsheet::PropertyRowHeights , App::Property) PropertyRowHeights::PropertyRowHeights() { diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index b0caaf3f7f..ac3c6afe62 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -43,13 +43,13 @@ #include "Utils.h" #include #include -FC_LOG_LEVEL_INIT("Spreadsheet", true, true); +FC_LOG_LEVEL_INIT("Spreadsheet", true, true) using namespace App; using namespace Base; using namespace Spreadsheet; -TYPESYSTEM_SOURCE(Spreadsheet::PropertySheet , App::PropertyExpressionContainer); +TYPESYSTEM_SOURCE(Spreadsheet::PropertySheet , App::PropertyExpressionContainer) void PropertySheet::clear() { diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index d99119f800..261ae353d7 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -55,7 +55,7 @@ #include #include -FC_LOG_LEVEL_INIT("Spreadsheet",true,true); +FC_LOG_LEVEL_INIT("Spreadsheet",true,true) using namespace Base; using namespace App; @@ -1449,7 +1449,7 @@ std::string Sheet::getColumn(int offset) const { /////////////////////////////////////////////////////////////////////////////// -TYPESYSTEM_SOURCE(Spreadsheet::PropertySpreadsheetQuantity, App::PropertyQuantity); +TYPESYSTEM_SOURCE(Spreadsheet::PropertySpreadsheetQuantity, App::PropertyQuantity) Property *PropertySpreadsheetQuantity::Copy() const { diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp index bcf2ab0429..becd079d45 100644 --- a/src/Mod/Spreadsheet/Gui/Command.cpp +++ b/src/Mod/Spreadsheet/Gui/Command.cpp @@ -52,7 +52,7 @@ using namespace App; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetMergeCells); +DEF_STD_CMD_A(CmdSpreadsheetMergeCells) CmdSpreadsheetMergeCells::CmdSpreadsheetMergeCells() : Command("Spreadsheet_MergeCells") @@ -105,7 +105,7 @@ bool CmdSpreadsheetMergeCells::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetSplitCell); +DEF_STD_CMD_A(CmdSpreadsheetSplitCell) CmdSpreadsheetSplitCell::CmdSpreadsheetSplitCell() : Command("Spreadsheet_SplitCell") @@ -161,7 +161,7 @@ bool CmdSpreadsheetSplitCell::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetImport); +DEF_STD_CMD_A(CmdSpreadsheetImport) CmdSpreadsheetImport::CmdSpreadsheetImport() : Command("Spreadsheet_Import") @@ -201,7 +201,7 @@ bool CmdSpreadsheetImport::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetExport); +DEF_STD_CMD_A(CmdSpreadsheetExport) CmdSpreadsheetExport::CmdSpreadsheetExport() : Command("Spreadsheet_Export") @@ -250,7 +250,7 @@ bool CmdSpreadsheetExport::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignLeft); +DEF_STD_CMD_A(CmdSpreadsheetAlignLeft) CmdSpreadsheetAlignLeft::CmdSpreadsheetAlignLeft() : Command("Spreadsheet_AlignLeft") @@ -302,7 +302,7 @@ bool CmdSpreadsheetAlignLeft::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignCenter); +DEF_STD_CMD_A(CmdSpreadsheetAlignCenter) CmdSpreadsheetAlignCenter::CmdSpreadsheetAlignCenter() : Command("Spreadsheet_AlignCenter") @@ -354,7 +354,7 @@ bool CmdSpreadsheetAlignCenter::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignRight); +DEF_STD_CMD_A(CmdSpreadsheetAlignRight) CmdSpreadsheetAlignRight::CmdSpreadsheetAlignRight() : Command("Spreadsheet_AlignRight") @@ -406,7 +406,7 @@ bool CmdSpreadsheetAlignRight::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignTop); +DEF_STD_CMD_A(CmdSpreadsheetAlignTop) CmdSpreadsheetAlignTop::CmdSpreadsheetAlignTop() : Command("Spreadsheet_AlignTop") @@ -458,7 +458,7 @@ bool CmdSpreadsheetAlignTop::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignBottom); +DEF_STD_CMD_A(CmdSpreadsheetAlignBottom) CmdSpreadsheetAlignBottom::CmdSpreadsheetAlignBottom() : Command("Spreadsheet_AlignBottom") @@ -510,7 +510,7 @@ bool CmdSpreadsheetAlignBottom::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetAlignVCenter); +DEF_STD_CMD_A(CmdSpreadsheetAlignVCenter) CmdSpreadsheetAlignVCenter::CmdSpreadsheetAlignVCenter() : Command("Spreadsheet_AlignVCenter") @@ -562,7 +562,7 @@ bool CmdSpreadsheetAlignVCenter::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetStyleBold); +DEF_STD_CMD_A(CmdSpreadsheetStyleBold) CmdSpreadsheetStyleBold::CmdSpreadsheetStyleBold() : Command("Spreadsheet_StyleBold") @@ -636,7 +636,7 @@ bool CmdSpreadsheetStyleBold::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetStyleItalic); +DEF_STD_CMD_A(CmdSpreadsheetStyleItalic) CmdSpreadsheetStyleItalic::CmdSpreadsheetStyleItalic() : Command("Spreadsheet_StyleItalic") @@ -710,7 +710,7 @@ bool CmdSpreadsheetStyleItalic::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetStyleUnderline); +DEF_STD_CMD_A(CmdSpreadsheetStyleUnderline) CmdSpreadsheetStyleUnderline::CmdSpreadsheetStyleUnderline() : Command("Spreadsheet_StyleUnderline") @@ -783,7 +783,7 @@ bool CmdSpreadsheetStyleUnderline::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdSpreadsheetSetAlias); +DEF_STD_CMD_A(CmdSpreadsheetSetAlias) CmdSpreadsheetSetAlias::CmdSpreadsheetSetAlias() : Command("Spreadsheet_SetAlias") @@ -847,7 +847,7 @@ bool CmdSpreadsheetSetAlias::isActive() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -DEF_STD_CMD_A(CmdCreateSpreadsheet); +DEF_STD_CMD_A(CmdCreateSpreadsheet) CmdCreateSpreadsheet::CmdCreateSpreadsheet() :Command("Spreadsheet_CreateSheet") diff --git a/src/Mod/Start/Gui/Command.cpp b/src/Mod/Start/Gui/Command.cpp index 1afe60377b..fdd7342876 100644 --- a/src/Mod/Start/Gui/Command.cpp +++ b/src/Mod/Start/Gui/Command.cpp @@ -36,7 +36,7 @@ using namespace std; -DEF_STD_CMD(CmdStartPage); +DEF_STD_CMD(CmdStartPage) CmdStartPage::CmdStartPage() :Command("Start_StartPage") diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp index 9d98aec578..0106c5a8bb 100644 --- a/src/Mod/Surface/Gui/Command.cpp +++ b/src/Mod/Surface/Gui/Command.cpp @@ -68,7 +68,7 @@ //=========================================================================== // CmdSurfaceCut THIS IS THE SURFACE CUT COMMAND //=========================================================================== -DEF_STD_CMD(CmdSurfaceCut); +DEF_STD_CMD(CmdSurfaceCut) CmdSurfaceCut::CmdSurfaceCut() :Command("Surface_Cut") diff --git a/src/Mod/Web/Gui/Command.cpp b/src/Mod/Web/Gui/Command.cpp index 398417c947..e97429fe82 100644 --- a/src/Mod/Web/Gui/Command.cpp +++ b/src/Mod/Web/Gui/Command.cpp @@ -41,7 +41,7 @@ using namespace WebGui; // CmdWebOpenWebsite //=========================================================================== -DEF_STD_CMD(CmdWebOpenWebsite); +DEF_STD_CMD(CmdWebOpenWebsite) CmdWebOpenWebsite::CmdWebOpenWebsite() : Command("Web_OpenWebsite") @@ -67,7 +67,7 @@ void CmdWebOpenWebsite::activated(int iMsg) // CmdWebBrowserBack //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserBack); +DEF_STD_CMD_A(CmdWebBrowserBack) CmdWebBrowserBack::CmdWebBrowserBack() : Command("Web_BrowserBack") @@ -96,7 +96,7 @@ bool CmdWebBrowserBack::isActive(void) // CmdWebBrowserNext //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserNext); +DEF_STD_CMD_A(CmdWebBrowserNext) CmdWebBrowserNext::CmdWebBrowserNext() : Command("Web_BrowserNext") @@ -125,7 +125,7 @@ bool CmdWebBrowserNext::isActive(void) // CmdWebBrowserRefresh //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserRefresh); +DEF_STD_CMD_A(CmdWebBrowserRefresh) CmdWebBrowserRefresh::CmdWebBrowserRefresh() : Command("Web_BrowserRefresh") @@ -153,7 +153,7 @@ bool CmdWebBrowserRefresh::isActive(void) // CmdWebBrowserStop //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserStop); +DEF_STD_CMD_A(CmdWebBrowserStop) CmdWebBrowserStop::CmdWebBrowserStop() :Command("Web_BrowserStop") @@ -183,7 +183,7 @@ bool CmdWebBrowserStop::isActive(void) // CmdWebBrowserZoomIn //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserZoomIn); +DEF_STD_CMD_A(CmdWebBrowserZoomIn) CmdWebBrowserZoomIn::CmdWebBrowserZoomIn() : Command("Web_BrowserZoomIn") @@ -212,7 +212,7 @@ bool CmdWebBrowserZoomIn::isActive(void) // CmdWebBrowserZoomOut //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserZoomOut); +DEF_STD_CMD_A(CmdWebBrowserZoomOut) CmdWebBrowserZoomOut::CmdWebBrowserZoomOut() : Command("Web_BrowserZoomOut") @@ -241,7 +241,7 @@ bool CmdWebBrowserZoomOut::isActive(void) // CmdWebBrowserSetUrl //=========================================================================== -DEF_STD_CMD_A(CmdWebBrowserSetURL); +DEF_STD_CMD_A(CmdWebBrowserSetURL) CmdWebBrowserSetURL::CmdWebBrowserSetURL() : Command("Web_BrowserSetURL")