diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index e1dc025063..ea1a17de32 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -1,7 +1,9 @@ # Many warnings caused by vtk if(CMAKE_COMPILER_IS_CLANGXX) - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-pedantic") # needed for vtk headers +elseif(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-pedantic") # needed for vtk headers endif() if(MSVC) diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index a3ab684a81..a69b9a2f89 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -72,7 +72,7 @@ double round(double r) { } #endif -PROPERTY_SOURCE(Fem::Constraint, App::DocumentObject); +PROPERTY_SOURCE(Fem::Constraint, App::DocumentObject) Constraint::Constraint() { diff --git a/src/Mod/Fem/App/FemConstraintBearing.cpp b/src/Mod/Fem/App/FemConstraintBearing.cpp index 7d722afbb6..22e82cc127 100644 --- a/src/Mod/Fem/App/FemConstraintBearing.cpp +++ b/src/Mod/Fem/App/FemConstraintBearing.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintBearing, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintBearing, Fem::Constraint) ConstraintBearing::ConstraintBearing() { diff --git a/src/Mod/Fem/App/FemConstraintContact.cpp b/src/Mod/Fem/App/FemConstraintContact.cpp index 9466308b63..0bb09a0389 100644 --- a/src/Mod/Fem/App/FemConstraintContact.cpp +++ b/src/Mod/Fem/App/FemConstraintContact.cpp @@ -37,7 +37,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintContact, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintContact, Fem::Constraint) ConstraintContact::ConstraintContact() { diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.cpp b/src/Mod/Fem/App/FemConstraintDisplacement.cpp index 647a8d4180..6a50add28c 100644 --- a/src/Mod/Fem/App/FemConstraintDisplacement.cpp +++ b/src/Mod/Fem/App/FemConstraintDisplacement.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintDisplacement, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintDisplacement, Fem::Constraint) ConstraintDisplacement::ConstraintDisplacement() { diff --git a/src/Mod/Fem/App/FemConstraintFixed.cpp b/src/Mod/Fem/App/FemConstraintFixed.cpp index 98329a1292..efd96196bc 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.cpp +++ b/src/Mod/Fem/App/FemConstraintFixed.cpp @@ -49,7 +49,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintFixed, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintFixed, Fem::Constraint) ConstraintFixed::ConstraintFixed() { diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp b/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp index c3de1555f9..c8181f71d2 100644 --- a/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintFluidBoundary, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintFluidBoundary, Fem::Constraint) // also defined in TaskFemConstraintFluidBoundary.cpp and FoamCaseBuilder/BasicBuilder.py, update simultaneously // the second (index 1) item is the default enum, as index 0 causes compiling error diff --git a/src/Mod/Fem/App/FemConstraintForce.cpp b/src/Mod/Fem/App/FemConstraintForce.cpp index 1f29af5d5c..3737c492da 100644 --- a/src/Mod/Fem/App/FemConstraintForce.cpp +++ b/src/Mod/Fem/App/FemConstraintForce.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintForce, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintForce, Fem::Constraint) ConstraintForce::ConstraintForce() { diff --git a/src/Mod/Fem/App/FemConstraintGear.cpp b/src/Mod/Fem/App/FemConstraintGear.cpp index 4c221f6580..92de563210 100644 --- a/src/Mod/Fem/App/FemConstraintGear.cpp +++ b/src/Mod/Fem/App/FemConstraintGear.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintGear, Fem::ConstraintBearing); +PROPERTY_SOURCE(Fem::ConstraintGear, Fem::ConstraintBearing) ConstraintGear::ConstraintGear() { diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.cpp b/src/Mod/Fem/App/FemConstraintHeatflux.cpp index 86068f6d7e..9485b97907 100644 --- a/src/Mod/Fem/App/FemConstraintHeatflux.cpp +++ b/src/Mod/Fem/App/FemConstraintHeatflux.cpp @@ -39,7 +39,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintHeatflux, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintHeatflux, Fem::Constraint) static const char* ConstraintTypes[] = {"DFlux","Convection", NULL}; diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp b/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp index d2ef08588b..ace92e2061 100644 --- a/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp +++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintInitialTemperature, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintInitialTemperature, Fem::Constraint) ConstraintInitialTemperature::ConstraintInitialTemperature() { diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp b/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp index def8ea0de4..e2822943e1 100644 --- a/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp +++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.cpp @@ -37,7 +37,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintPlaneRotation, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintPlaneRotation, Fem::Constraint) ConstraintPlaneRotation::ConstraintPlaneRotation() { diff --git a/src/Mod/Fem/App/FemConstraintPressure.cpp b/src/Mod/Fem/App/FemConstraintPressure.cpp index ebdecdecd2..75365ba960 100644 --- a/src/Mod/Fem/App/FemConstraintPressure.cpp +++ b/src/Mod/Fem/App/FemConstraintPressure.cpp @@ -37,7 +37,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintPressure, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintPressure, Fem::Constraint) ConstraintPressure::ConstraintPressure() { diff --git a/src/Mod/Fem/App/FemConstraintPulley.cpp b/src/Mod/Fem/App/FemConstraintPulley.cpp index b71e6cf19c..7c62848416 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.cpp +++ b/src/Mod/Fem/App/FemConstraintPulley.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintPulley, Fem::ConstraintGear); +PROPERTY_SOURCE(Fem::ConstraintPulley, Fem::ConstraintGear) ConstraintPulley::ConstraintPulley() { diff --git a/src/Mod/Fem/App/FemConstraintTemperature.cpp b/src/Mod/Fem/App/FemConstraintTemperature.cpp index 3846be44e3..363a34b07f 100644 --- a/src/Mod/Fem/App/FemConstraintTemperature.cpp +++ b/src/Mod/Fem/App/FemConstraintTemperature.cpp @@ -40,7 +40,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintTemperature, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintTemperature, Fem::Constraint) static const char* ConstraintTypes[] = {"CFlux","Temperature", NULL}; diff --git a/src/Mod/Fem/App/FemConstraintTransform.cpp b/src/Mod/Fem/App/FemConstraintTransform.cpp index 3dfef65547..ab7179242c 100644 --- a/src/Mod/Fem/App/FemConstraintTransform.cpp +++ b/src/Mod/Fem/App/FemConstraintTransform.cpp @@ -37,7 +37,7 @@ using namespace Fem; -PROPERTY_SOURCE(Fem::ConstraintTransform, Fem::Constraint); +PROPERTY_SOURCE(Fem::ConstraintTransform, Fem::Constraint) static const char* TransformTypes[] = {"Cylindrical","Rectangular", NULL}; diff --git a/src/Mod/Fem/App/FemMeshProperty.cpp b/src/Mod/Fem/App/FemMeshProperty.cpp index 67f24098f5..cd59a327dc 100644 --- a/src/Mod/Fem/App/FemMeshProperty.cpp +++ b/src/Mod/Fem/App/FemMeshProperty.cpp @@ -40,7 +40,7 @@ using namespace Fem; -TYPESYSTEM_SOURCE(Fem::PropertyFemMesh , App::PropertyComplexGeoData); +TYPESYSTEM_SOURCE(Fem::PropertyFemMesh , App::PropertyComplexGeoData) PropertyFemMesh::PropertyFemMesh() : _FemMesh(new FemMesh) { diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp b/src/Mod/Fem/App/PropertyPostDataObject.cpp index a67963631b..d655b52e38 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.cpp +++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp @@ -55,7 +55,7 @@ using namespace Fem; -TYPESYSTEM_SOURCE(Fem::PropertyPostDataObject , App::Property); +TYPESYSTEM_SOURCE(Fem::PropertyPostDataObject , App::Property) PropertyPostDataObject::PropertyPostDataObject() { diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 9532cb54ad..a4076527c7 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -1,7 +1,9 @@ # Many warnings caused by vtk if(CMAKE_COMPILER_IS_CLANGXX) - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-pedantic") # needed for vtk headers +elseif(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-pedantic") # needed for vtk headers endif() if(MSVC) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 661169c51b..f8b86e2736 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -108,7 +108,7 @@ std::string gethideMeshShowPartStr(std::string showConstr="") // commands Part, Analysis, Solver //================================================================================================ -DEF_STD_CMD_A(CmdFemAddPart); +DEF_STD_CMD_A(CmdFemAddPart) CmdFemAddPart::CmdFemAddPart() : Command("FEM_FemAddPart") @@ -173,7 +173,7 @@ bool CmdFemAddPart::isActive(void) //================================================================================================ // analysis /* done in Python -DEF_STD_CMD_A(CmdFemCreateAnalysis); +DEF_STD_CMD_A(CmdFemCreateAnalysis) CmdFemCreateAnalysis::CmdFemCreateAnalysis() : Command("FEM_CreateAnalysis") @@ -237,7 +237,7 @@ bool CmdFemCreateAnalysis::isActive(void) //================================================================================================ // solver /* done in Python -DEF_STD_CMD_A(CmdFemCreateSolver); +DEF_STD_CMD_A(CmdFemCreateSolver) CmdFemCreateSolver::CmdFemCreateSolver() : Command("FEM_CreateSolver") @@ -285,7 +285,7 @@ bool CmdFemCreateSolver::isActive(void) // commands Constraints //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintBearing); +DEF_STD_CMD_A(CmdFemConstraintBearing) CmdFemConstraintBearing::CmdFemConstraintBearing() : Command("FEM_ConstraintBearing") @@ -326,7 +326,7 @@ bool CmdFemConstraintBearing::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintContact); +DEF_STD_CMD_A(CmdFemConstraintContact) CmdFemConstraintContact::CmdFemConstraintContact() : Command("FEM_ConstraintContact") @@ -371,7 +371,7 @@ bool CmdFemConstraintContact::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintDisplacement); +DEF_STD_CMD_A(CmdFemConstraintDisplacement) CmdFemConstraintDisplacement::CmdFemConstraintDisplacement() : Command("FEM_ConstraintDisplacement") @@ -414,7 +414,7 @@ bool CmdFemConstraintDisplacement::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintFixed); +DEF_STD_CMD_A(CmdFemConstraintFixed) CmdFemConstraintFixed::CmdFemConstraintFixed() : Command("FEM_ConstraintFixed") @@ -456,7 +456,7 @@ bool CmdFemConstraintFixed::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintFluidBoundary); +DEF_STD_CMD_A(CmdFemConstraintFluidBoundary) CmdFemConstraintFluidBoundary::CmdFemConstraintFluidBoundary() : Command("FEM_ConstraintFluidBoundary") @@ -499,7 +499,7 @@ bool CmdFemConstraintFluidBoundary::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintForce); +DEF_STD_CMD_A(CmdFemConstraintForce) CmdFemConstraintForce::CmdFemConstraintForce() : Command("FEM_ConstraintForce") @@ -543,7 +543,7 @@ bool CmdFemConstraintForce::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintGear); +DEF_STD_CMD_A(CmdFemConstraintGear) CmdFemConstraintGear::CmdFemConstraintGear() : Command("FEM_ConstraintGear") @@ -584,7 +584,7 @@ bool CmdFemConstraintGear::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintHeatflux); +DEF_STD_CMD_A(CmdFemConstraintHeatflux) CmdFemConstraintHeatflux::CmdFemConstraintHeatflux() : Command("FEM_ConstraintHeatflux") @@ -629,7 +629,7 @@ bool CmdFemConstraintHeatflux::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintInitialTemperature); +DEF_STD_CMD_A(CmdFemConstraintInitialTemperature) CmdFemConstraintInitialTemperature::CmdFemConstraintInitialTemperature() : Command("FEM_ConstraintInitialTemperature") @@ -672,7 +672,7 @@ bool CmdFemConstraintInitialTemperature::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintPlaneRotation); +DEF_STD_CMD_A(CmdFemConstraintPlaneRotation) CmdFemConstraintPlaneRotation::CmdFemConstraintPlaneRotation() : Command("FEM_ConstraintPlaneRotation") @@ -714,7 +714,7 @@ bool CmdFemConstraintPlaneRotation::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintPressure); +DEF_STD_CMD_A(CmdFemConstraintPressure) CmdFemConstraintPressure::CmdFemConstraintPressure() : Command("FEM_ConstraintPressure") @@ -759,7 +759,7 @@ bool CmdFemConstraintPressure::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintPulley); +DEF_STD_CMD_A(CmdFemConstraintPulley) CmdFemConstraintPulley::CmdFemConstraintPulley() : Command("FEM_ConstraintPulley") @@ -805,7 +805,7 @@ bool CmdFemConstraintPulley::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintTemperature); +DEF_STD_CMD_A(CmdFemConstraintTemperature) CmdFemConstraintTemperature::CmdFemConstraintTemperature() : Command("FEM_ConstraintTemperature") @@ -848,7 +848,7 @@ bool CmdFemConstraintTemperature::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintTransform); +DEF_STD_CMD_A(CmdFemConstraintTransform) CmdFemConstraintTransform::CmdFemConstraintTransform() : Command("FEM_ConstraintTransform") @@ -898,7 +898,7 @@ bool CmdFemConstraintTransform::isActive(void) // commands mesh //================================================================================================ -DEF_STD_CMD_A(CmdFemDefineNodesSet); +DEF_STD_CMD_A(CmdFemDefineNodesSet) void DefineNodesCallback(void * ud, SoEventCallback * n) { @@ -1040,7 +1040,7 @@ bool CmdFemDefineNodesSet::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemCreateNodesSet); +DEF_STD_CMD_A(CmdFemCreateNodesSet) CmdFemCreateNodesSet::CmdFemCreateNodesSet() : Command("FEM_CreateNodesSet") @@ -1134,7 +1134,7 @@ void setupFilter(Gui::Command* cmd, std::string Name) { cmd->updateActive(); cmd->doCommand(Gui::Command::Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); } -}; +} std::string Plot() { @@ -1196,7 +1196,7 @@ plt.show()\n"; //================================================================================================ -DEF_STD_CMD_A(CmdFemPostClipFilter); +DEF_STD_CMD_A(CmdFemPostClipFilter) CmdFemPostClipFilter::CmdFemPostClipFilter() : Command("FEM_PostCreateClipFilter") @@ -1222,7 +1222,7 @@ bool CmdFemPostClipFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostCutFilter); +DEF_STD_CMD_A(CmdFemPostCutFilter) CmdFemPostCutFilter::CmdFemPostCutFilter() : Command("FEM_PostCreateCutFilter") @@ -1248,7 +1248,7 @@ bool CmdFemPostCutFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostDataAlongLineFilter); +DEF_STD_CMD_A(CmdFemPostDataAlongLineFilter) CmdFemPostDataAlongLineFilter::CmdFemPostDataAlongLineFilter() : Command("FEM_PostCreateDataAlongLineFilter") @@ -1274,7 +1274,7 @@ bool CmdFemPostDataAlongLineFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostDataAtPointFilter); +DEF_STD_CMD_A(CmdFemPostDataAtPointFilter) CmdFemPostDataAtPointFilter::CmdFemPostDataAtPointFilter() : Command("FEM_PostCreateDataAtPointFilter") @@ -1302,7 +1302,7 @@ bool CmdFemPostDataAtPointFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostLinearizedStressesFilter); +DEF_STD_CMD_A(CmdFemPostLinearizedStressesFilter) CmdFemPostLinearizedStressesFilter::CmdFemPostLinearizedStressesFilter() : Command("FEM_PostCreateLinearizedStressesFilter") @@ -1359,7 +1359,7 @@ bool CmdFemPostLinearizedStressesFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostScalarClipFilter); +DEF_STD_CMD_A(CmdFemPostScalarClipFilter) CmdFemPostScalarClipFilter::CmdFemPostScalarClipFilter() : Command("FEM_PostCreateScalarClipFilter") @@ -1385,7 +1385,7 @@ bool CmdFemPostScalarClipFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostWarpVectorFilter); +DEF_STD_CMD_A(CmdFemPostWarpVectorFilter) CmdFemPostWarpVectorFilter::CmdFemPostWarpVectorFilter() : Command("FEM_PostCreateWarpVectorFilter") @@ -1411,7 +1411,7 @@ bool CmdFemPostWarpVectorFilter::isActive(void) //================================================================================================ -DEF_STD_CMD_ACL(CmdFemPostFunctions); +DEF_STD_CMD_ACL(CmdFemPostFunctions) CmdFemPostFunctions::CmdFemPostFunctions() : Command("FEM_PostCreateFunctions") @@ -1551,7 +1551,7 @@ bool CmdFemPostFunctions::isActive(void) //================================================================================================ -DEF_STD_CMD_AC(CmdFemPostApllyChanges); +DEF_STD_CMD_AC(CmdFemPostApllyChanges) CmdFemPostApllyChanges::CmdFemPostApllyChanges() : Command("FEM_PostApplyChanges") @@ -1596,7 +1596,7 @@ Gui::Action * CmdFemPostApllyChanges::createAction(void) //================================================================================================ -DEF_STD_CMD_A(CmdFemPostPipelineFromResult); +DEF_STD_CMD_A(CmdFemPostPipelineFromResult) CmdFemPostPipelineFromResult::CmdFemPostPipelineFromResult() : Command("FEM_PostPipelineFromResult") diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 1d093e0fce..bd3cba1389 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -162,7 +162,7 @@ bool FemFace::isSameFace (FemFace &face) } return false; -}; +} // ---------------------------------------------------------------------------- @@ -715,7 +715,7 @@ inline void insEdgeVec(std::map > &map, int n1, int n2) // map[n2].insert(n1); //else map[n2].insert(n1); -}; +} inline unsigned long ElemFold(unsigned long Element,unsigned long FaceNbr) { diff --git a/src/Mod/Import/Gui/Command.cpp b/src/Mod/Import/Gui/Command.cpp index 893164ee4b..807f050ae8 100644 --- a/src/Mod/Import/Gui/Command.cpp +++ b/src/Mod/Import/Gui/Command.cpp @@ -39,7 +39,7 @@ using Gui::FileDialog; //=========================================================================== // Import_Box //=========================================================================== -DEF_STD_CMD_A(FCCmdImportReadBREP); +DEF_STD_CMD_A(FCCmdImportReadBREP) FCCmdImportReadBREP::FCCmdImportReadBREP() : Command("Import_ReadBREP") @@ -75,7 +75,7 @@ bool FCCmdImportReadBREP::isActive(void) //=========================================================================== // PartImportStep //=========================================================================== -DEF_STD_CMD_A(ImportStep); +DEF_STD_CMD_A(ImportStep) ImportStep::ImportStep() : Command("Part_ImportStep") @@ -115,7 +115,7 @@ bool ImportStep::isActive(void) //=========================================================================== // ImportIges //=========================================================================== -DEF_STD_CMD_A(ImportIges); +DEF_STD_CMD_A(ImportIges) ImportIges::ImportIges() : Command("Import_Iges") diff --git a/src/Mod/PartDesign/App/Feature.cpp b/src/Mod/PartDesign/App/Feature.cpp index 4ecaf053ab..50568a3962 100644 --- a/src/Mod/PartDesign/App/Feature.cpp +++ b/src/Mod/PartDesign/App/Feature.cpp @@ -45,6 +45,7 @@ #include "Mod/Part/App/DatumFeature.h" #include + FC_LOG_LEVEL_INIT("PartDesign",true,true) @@ -222,7 +223,7 @@ Body* Feature::getFeatureBody() const { } return nullptr; -}; +} }//namespace PartDesign diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp index e0c3c1df15..f637f57eed 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -42,7 +42,8 @@ #include #include #include -FC_LOG_LEVEL_INIT("PartDesign",true,true); + +FC_LOG_LEVEL_INIT("PartDesign",true,true) #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 3b82ed94a4..7b7b8f0f6c 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -71,7 +71,7 @@ // TODO Remove this header after fixing code so it won;t be needed here (2015-10-20, Fat-Zer) #include "ui_DlgReference.h" -FC_LOG_LEVEL_INIT("PartDesign",true,true); +FC_LOG_LEVEL_INIT("PartDesign",true,true) using namespace std; using namespace Attacher; @@ -153,7 +153,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) /* Datum feature commands =======================================================*/ -DEF_STD_CMD_A(CmdPartDesignPlane); +DEF_STD_CMD_A(CmdPartDesignPlane) CmdPartDesignPlane::CmdPartDesignPlane() :Command("PartDesign_Plane") @@ -181,7 +181,7 @@ bool CmdPartDesignPlane::isActive(void) return false; } -DEF_STD_CMD_A(CmdPartDesignLine); +DEF_STD_CMD_A(CmdPartDesignLine) CmdPartDesignLine::CmdPartDesignLine() :Command("PartDesign_Line") @@ -209,7 +209,7 @@ bool CmdPartDesignLine::isActive(void) return false; } -DEF_STD_CMD_A(CmdPartDesignPoint); +DEF_STD_CMD_A(CmdPartDesignPoint) CmdPartDesignPoint::CmdPartDesignPoint() :Command("PartDesign_Point") @@ -269,7 +269,7 @@ bool CmdPartDesignCS::isActive(void) // PartDesign_ShapeBinder //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignShapeBinder); +DEF_STD_CMD_A(CmdPartDesignShapeBinder) CmdPartDesignShapeBinder::CmdPartDesignShapeBinder() :Command("PartDesign_ShapeBinder") @@ -334,7 +334,7 @@ bool CmdPartDesignShapeBinder::isActive(void) // PartDesign_SubShapeBinder //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignSubShapeBinder); +DEF_STD_CMD_A(CmdPartDesignSubShapeBinder) CmdPartDesignSubShapeBinder::CmdPartDesignSubShapeBinder() :Command("PartDesign_SubShapeBinder") @@ -508,7 +508,7 @@ bool CmdPartDesignClone::isActive(void) //=========================================================================== /* Sketch commands =======================================================*/ -DEF_STD_CMD_A(CmdPartDesignNewSketch); +DEF_STD_CMD_A(CmdPartDesignNewSketch) CmdPartDesignNewSketch::CmdPartDesignNewSketch() :Command("PartDesign_NewSketch") @@ -1178,7 +1178,7 @@ void finishProfileBased(const Gui::Command* cmd, const Part::Feature* sketch, Ap //=========================================================================== // PartDesign_Pad //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignPad); +DEF_STD_CMD_A(CmdPartDesignPad) CmdPartDesignPad::CmdPartDesignPad() : Command("PartDesign_Pad") @@ -1229,7 +1229,7 @@ bool CmdPartDesignPad::isActive(void) //=========================================================================== // PartDesign_Pocket //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignPocket); +DEF_STD_CMD_A(CmdPartDesignPocket) CmdPartDesignPocket::CmdPartDesignPocket() : Command("PartDesign_Pocket") @@ -1276,7 +1276,7 @@ bool CmdPartDesignPocket::isActive(void) //=========================================================================== // PartDesign_Hole //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignHole); +DEF_STD_CMD_A(CmdPartDesignHole) CmdPartDesignHole::CmdPartDesignHole() : Command("PartDesign_Hole") @@ -1322,7 +1322,7 @@ bool CmdPartDesignHole::isActive(void) //=========================================================================== // PartDesign_Revolution //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignRevolution); +DEF_STD_CMD_A(CmdPartDesignRevolution) CmdPartDesignRevolution::CmdPartDesignRevolution() : Command("PartDesign_Revolution") @@ -1380,7 +1380,7 @@ bool CmdPartDesignRevolution::isActive(void) //=========================================================================== // PartDesign_Groove //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignGroove); +DEF_STD_CMD_A(CmdPartDesignGroove) CmdPartDesignGroove::CmdPartDesignGroove() : Command("PartDesign_Groove") @@ -1446,7 +1446,7 @@ bool CmdPartDesignGroove::isActive(void) //=========================================================================== // PartDesign_Additive_Pipe //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignAdditivePipe); +DEF_STD_CMD_A(CmdPartDesignAdditivePipe) CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe() : Command("PartDesign_AdditivePipe") @@ -1496,7 +1496,7 @@ bool CmdPartDesignAdditivePipe::isActive(void) //=========================================================================== // PartDesign_Subtractive_Pipe //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignSubtractivePipe); +DEF_STD_CMD_A(CmdPartDesignSubtractivePipe) CmdPartDesignSubtractivePipe::CmdPartDesignSubtractivePipe() : Command("PartDesign_SubtractivePipe") @@ -1546,7 +1546,7 @@ bool CmdPartDesignSubtractivePipe::isActive(void) //=========================================================================== // PartDesign_Additive_Loft //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignAdditiveLoft); +DEF_STD_CMD_A(CmdPartDesignAdditiveLoft) CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft() : Command("PartDesign_AdditiveLoft") @@ -1596,7 +1596,7 @@ bool CmdPartDesignAdditiveLoft::isActive(void) //=========================================================================== // PartDesign_Subtractive_Loft //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignSubtractiveLoft); +DEF_STD_CMD_A(CmdPartDesignSubtractiveLoft) CmdPartDesignSubtractiveLoft::CmdPartDesignSubtractiveLoft() : Command("PartDesign_SubtractiveLoft") @@ -1744,7 +1744,7 @@ void makeChamferOrFillet(Gui::Command* cmd, const std::string& which) //=========================================================================== // PartDesign_Fillet //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignFillet); +DEF_STD_CMD_A(CmdPartDesignFillet) CmdPartDesignFillet::CmdPartDesignFillet() :Command("PartDesign_Fillet") @@ -1772,7 +1772,7 @@ bool CmdPartDesignFillet::isActive(void) //=========================================================================== // PartDesign_Chamfer //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignChamfer); +DEF_STD_CMD_A(CmdPartDesignChamfer) CmdPartDesignChamfer::CmdPartDesignChamfer() :Command("PartDesign_Chamfer") @@ -1801,7 +1801,7 @@ bool CmdPartDesignChamfer::isActive(void) //=========================================================================== // PartDesign_Draft //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignDraft); +DEF_STD_CMD_A(CmdPartDesignDraft) CmdPartDesignDraft::CmdPartDesignDraft() :Command("PartDesign_Draft") @@ -1858,7 +1858,7 @@ bool CmdPartDesignDraft::isActive(void) //=========================================================================== // PartDesign_Thickness //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignThickness); +DEF_STD_CMD_A(CmdPartDesignThickness) CmdPartDesignThickness::CmdPartDesignThickness() :Command("PartDesign_Thickness") @@ -2010,7 +2010,7 @@ void finishTransformed(Gui::Command* cmd, App::DocumentObject *Feat) //=========================================================================== // PartDesign_Mirrored //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignMirrored); +DEF_STD_CMD_A(CmdPartDesignMirrored) CmdPartDesignMirrored::CmdPartDesignMirrored() : Command("PartDesign_Mirrored") @@ -2072,7 +2072,7 @@ bool CmdPartDesignMirrored::isActive(void) //=========================================================================== // PartDesign_LinearPattern //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignLinearPattern); +DEF_STD_CMD_A(CmdPartDesignLinearPattern) CmdPartDesignLinearPattern::CmdPartDesignLinearPattern() : Command("PartDesign_LinearPattern") @@ -2136,7 +2136,7 @@ bool CmdPartDesignLinearPattern::isActive(void) //=========================================================================== // PartDesign_PolarPattern //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignPolarPattern); +DEF_STD_CMD_A(CmdPartDesignPolarPattern) CmdPartDesignPolarPattern::CmdPartDesignPolarPattern() : Command("PartDesign_PolarPattern") @@ -2201,7 +2201,7 @@ bool CmdPartDesignPolarPattern::isActive(void) //=========================================================================== // PartDesign_Scaled //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignScaled); +DEF_STD_CMD_A(CmdPartDesignScaled) CmdPartDesignScaled::CmdPartDesignScaled() : Command("PartDesign_Scaled") @@ -2250,7 +2250,7 @@ bool CmdPartDesignScaled::isActive(void) //=========================================================================== // PartDesign_MultiTransform //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignMultiTransform); +DEF_STD_CMD_A(CmdPartDesignMultiTransform) CmdPartDesignMultiTransform::CmdPartDesignMultiTransform() : Command("PartDesign_MultiTransform") @@ -2373,7 +2373,7 @@ bool CmdPartDesignMultiTransform::isActive(void) //=========================================================================== /* Boolean commands =======================================================*/ -DEF_STD_CMD_A(CmdPartDesignBoolean); +DEF_STD_CMD_A(CmdPartDesignBoolean) CmdPartDesignBoolean::CmdPartDesignBoolean() :Command("PartDesign_Boolean") diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 97b7e03678..6b82f309f8 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -83,7 +83,7 @@ App::Part* assertActivePart () { // PartDesign_Body //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignBody); +DEF_STD_CMD_A(CmdPartDesignBody) CmdPartDesignBody::CmdPartDesignBody() : Command("PartDesign_Body") @@ -329,7 +329,7 @@ bool CmdPartDesignBody::isActive(void) // PartDesign_Migrate //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignMigrate); +DEF_STD_CMD_A(CmdPartDesignMigrate) CmdPartDesignMigrate::CmdPartDesignMigrate() : Command("PartDesign_Migrate") @@ -543,7 +543,7 @@ bool CmdPartDesignMigrate::isActive(void) //=========================================================================== // PartDesign_MoveTip //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignMoveTip); +DEF_STD_CMD_A(CmdPartDesignMoveTip) CmdPartDesignMoveTip::CmdPartDesignMoveTip() : Command("PartDesign_MoveTip") @@ -622,7 +622,7 @@ bool CmdPartDesignMoveTip::isActive(void) // PartDesign_DuplicateSelection //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignDuplicateSelection); +DEF_STD_CMD_A(CmdPartDesignDuplicateSelection) CmdPartDesignDuplicateSelection::CmdPartDesignDuplicateSelection() :Command("PartDesign_DuplicateSelection") @@ -677,7 +677,7 @@ bool CmdPartDesignDuplicateSelection::isActive(void) // PartDesign_MoveFeature //=========================================================================== -DEF_STD_CMD_A(CmdPartDesignMoveFeature); +DEF_STD_CMD_A(CmdPartDesignMoveFeature) CmdPartDesignMoveFeature::CmdPartDesignMoveFeature() :Command("PartDesign_MoveFeature") @@ -839,7 +839,7 @@ bool CmdPartDesignMoveFeature::isActive(void) return hasActiveDocument () && !PartDesignGui::isLegacyWorkflow ( getDocument () ); } -DEF_STD_CMD_A(CmdPartDesignMoveFeatureInTree); +DEF_STD_CMD_A(CmdPartDesignMoveFeatureInTree) CmdPartDesignMoveFeatureInTree::CmdPartDesignMoveFeatureInTree() :Command("PartDesign_MoveFeatureInTree") diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index 2a47d76187..ac8d964cb2 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -44,7 +44,7 @@ using namespace std; -DEF_STD_CMD_ACL(CmdPrimtiveCompAdditive); +DEF_STD_CMD_ACL(CmdPrimtiveCompAdditive) static const char * primitiveIntToName(int id) { @@ -59,7 +59,7 @@ static const char * primitiveIntToName(int id) case 7: return "Wedge"; default: return nullptr; }; -}; +} CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive() : Command("PartDesign_CompPrimitiveAdditive") @@ -230,7 +230,7 @@ bool CmdPrimtiveCompAdditive::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_ACL(CmdPrimtiveCompSubtractive); +DEF_STD_CMD_ACL(CmdPrimtiveCompSubtractive) CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive() : Command("PartDesign_CompPrimitiveSubtractive") diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index cc7a899f6b..1bd6f96a3b 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -52,7 +52,7 @@ #include "Utils.h" #include "WorkflowManager.h" -FC_LOG_LEVEL_INIT("PartDesignGui",true,true); +FC_LOG_LEVEL_INIT("PartDesignGui",true,true) //=========================================================================== // Helper for Body diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index 6858522f59..87aec1239f 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -347,7 +347,7 @@ ViewProviderBody* ViewProvider::getBodyViewProvider() { namespace Gui { /// @cond DOXERR -PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderPython, PartDesignGui::ViewProvider); +PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderPython, PartDesignGui::ViewProvider) /// @endcond // explicit template instantiation diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 1f937564d8..2835e26754 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -42,7 +42,7 @@ #include "ViewProviderShapeBinder.h" #include "TaskShapeBinder.h" -FC_LOG_LEVEL_INIT("ShapeBinder",true,true); +FC_LOG_LEVEL_INIT("ShapeBinder",true,true) using namespace PartDesignGui; diff --git a/src/Mod/Robot/App/PropertyTrajectory.cpp b/src/Mod/Robot/App/PropertyTrajectory.cpp index 9ccc3e2abb..9576b8b59e 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.cpp +++ b/src/Mod/Robot/App/PropertyTrajectory.cpp @@ -40,7 +40,7 @@ using namespace Robot; -TYPESYSTEM_SOURCE(Robot::PropertyTrajectory , App::Property); +TYPESYSTEM_SOURCE(Robot::PropertyTrajectory , App::Property) PropertyTrajectory::PropertyTrajectory() { diff --git a/src/Mod/Robot/App/Robot6Axis.cpp b/src/Mod/Robot/App/Robot6Axis.cpp index 914a4d956d..082493d414 100644 --- a/src/Mod/Robot/App/Robot6Axis.cpp +++ b/src/Mod/Robot/App/Robot6Axis.cpp @@ -67,7 +67,7 @@ AxisDefinition KukaIR500[6] = { }; -TYPESYSTEM_SOURCE(Robot::Robot6Axis , Base::Persistence); +TYPESYSTEM_SOURCE(Robot::Robot6Axis , Base::Persistence) Robot6Axis::Robot6Axis() { diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index 6af82e053e..ad24b00171 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -58,7 +58,7 @@ using namespace Base; //using namespace KDL; -TYPESYSTEM_SOURCE(Robot::Trajectory , Base::Persistence); +TYPESYSTEM_SOURCE(Robot::Trajectory , Base::Persistence) Trajectory::Trajectory() :pcTrajectory(0) diff --git a/src/Mod/Robot/App/Waypoint.cpp b/src/Mod/Robot/App/Waypoint.cpp index 43108ed577..f69e45578c 100644 --- a/src/Mod/Robot/App/Waypoint.cpp +++ b/src/Mod/Robot/App/Waypoint.cpp @@ -54,7 +54,7 @@ using namespace Base; using namespace KDL; -TYPESYSTEM_SOURCE(Robot::Waypoint , Base::Persistence); +TYPESYSTEM_SOURCE(Robot::Waypoint , Base::Persistence) Waypoint::Waypoint(const char* name, const Base::Placement &endPos, diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp index 091b553741..6bddf5f613 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp @@ -283,4 +283,4 @@ int ChainIkSolverPos_LMA::CartToJnt(const KDL::JntArray& q_init, const KDL::Fram -};//namespace KDL +}//namespace KDL diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp index e6c440f323..e06691a50c 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.hpp @@ -237,7 +237,7 @@ private: -}; // namespace KDL +} // namespace KDL diff --git a/src/Mod/Robot/App/kdl_cp/jntarray.cpp b/src/Mod/Robot/App/kdl_cp/jntarray.cpp index c931e5ae7d..ac4328359a 100644 --- a/src/Mod/Robot/App/kdl_cp/jntarray.cpp +++ b/src/Mod/Robot/App/kdl_cp/jntarray.cpp @@ -117,8 +117,8 @@ namespace KDL return src1.data.isApprox(src2.data,eps); } - bool operator==(const JntArray& src1,const JntArray& src2){return Equal(src1,src2);}; - //bool operator!=(const JntArray& src1,const JntArray& src2){return Equal(src1,src2);}; + bool operator==(const JntArray& src1,const JntArray& src2){return Equal(src1,src2);} + //bool operator!=(const JntArray& src1,const JntArray& src2){return Equal(src1,src2);} } diff --git a/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp b/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp index b1bc105282..14ca6d9340 100644 --- a/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp +++ b/src/Mod/Robot/App/kdl_cp/jntspaceinertiamatrix.cpp @@ -115,8 +115,8 @@ namespace KDL return src1.data.isApprox(src2.data,eps); } - bool operator==(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2){return Equal(src1,src2,epsilon);}; - //bool operator!=(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2){return Equal(src1,src2);}; + bool operator==(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2){return Equal(src1,src2,epsilon);} + //bool operator!=(const JntSpaceInertiaMatrix& src1,const JntSpaceInertiaMatrix& src2){return Equal(src1,src2);} } diff --git a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.cpp b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.cpp index e20d36f0fc..bbf71088bf 100644 --- a/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.cpp +++ b/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.cpp @@ -47,7 +47,7 @@ namespace KDL { RotationalInterpolation_SingleAxis::RotationalInterpolation_SingleAxis() - {}; + {} void RotationalInterpolation_SingleAxis::SetStartEnd(Rotation start,Rotation end) { R_base_start = start; diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 14babfcede..7baee270c1 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -46,7 +46,7 @@ using namespace std; using namespace RobotGui; -DEF_STD_CMD_A(CmdRobotSetHomePos); +DEF_STD_CMD_A(CmdRobotSetHomePos) CmdRobotSetHomePos::CmdRobotSetHomePos() :Command("Robot_SetHomePos") @@ -95,7 +95,7 @@ bool CmdRobotSetHomePos::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotRestoreHomePos); +DEF_STD_CMD_A(CmdRobotRestoreHomePos) CmdRobotRestoreHomePos::CmdRobotRestoreHomePos() :Command("Robot_RestoreHomePos") @@ -149,7 +149,7 @@ bool CmdRobotRestoreHomePos::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotConstraintAxle); +DEF_STD_CMD_A(CmdRobotConstraintAxle) CmdRobotConstraintAxle::CmdRobotConstraintAxle() :Command("Robot_Create") @@ -190,7 +190,7 @@ bool CmdRobotConstraintAxle::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotSimulate); +DEF_STD_CMD_A(CmdRobotSimulate) CmdRobotSimulate::CmdRobotSimulate() :Command("Robot_Simulate") diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 1a131b0b2b..a132db9aa1 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -41,7 +41,7 @@ using namespace std; -DEF_STD_CMD_A(CmdRobotExportKukaCompact); +DEF_STD_CMD_A(CmdRobotExportKukaCompact) CmdRobotExportKukaCompact::CmdRobotExportKukaCompact() :Command("Robot_ExportKukaCompact") @@ -103,7 +103,7 @@ bool CmdRobotExportKukaCompact::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotExportKukaFull); +DEF_STD_CMD_A(CmdRobotExportKukaFull) CmdRobotExportKukaFull::CmdRobotExportKukaFull() :Command("Robot_ExportKukaFull") diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp index b5eb6ed632..683b8bbd6f 100644 --- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp +++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp @@ -42,7 +42,7 @@ using namespace std; -DEF_STD_CMD_A(CmdRobotInsertKukaIR500); +DEF_STD_CMD_A(CmdRobotInsertKukaIR500) CmdRobotInsertKukaIR500::CmdRobotInsertKukaIR500() :Command("Robot_InsertKukaIR500") @@ -84,7 +84,7 @@ bool CmdRobotInsertKukaIR500::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotInsertKukaIR16); +DEF_STD_CMD_A(CmdRobotInsertKukaIR16) CmdRobotInsertKukaIR16::CmdRobotInsertKukaIR16() :Command("Robot_InsertKukaIR16") @@ -125,7 +125,7 @@ bool CmdRobotInsertKukaIR16::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotInsertKukaIR210); +DEF_STD_CMD_A(CmdRobotInsertKukaIR210) CmdRobotInsertKukaIR210::CmdRobotInsertKukaIR210() :Command("Robot_InsertKukaIR210") @@ -165,7 +165,7 @@ bool CmdRobotInsertKukaIR210::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotInsertKukaIR125); +DEF_STD_CMD_A(CmdRobotInsertKukaIR125) CmdRobotInsertKukaIR125::CmdRobotInsertKukaIR125() :Command("Robot_InsertKukaIR125") @@ -206,7 +206,7 @@ bool CmdRobotInsertKukaIR125::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotAddToolShape); +DEF_STD_CMD_A(CmdRobotAddToolShape) CmdRobotAddToolShape::CmdRobotAddToolShape() :Command("Robot_AddToolShape") diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index eef291a0c8..7a73a29db7 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -53,7 +53,7 @@ using namespace RobotGui; // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotCreateTrajectory); +DEF_STD_CMD_A(CmdRobotCreateTrajectory) CmdRobotCreateTrajectory::CmdRobotCreateTrajectory() :Command("Robot_CreateTrajectory") @@ -86,7 +86,7 @@ bool CmdRobotCreateTrajectory::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotInsertWaypoint); +DEF_STD_CMD_A(CmdRobotInsertWaypoint) CmdRobotInsertWaypoint::CmdRobotInsertWaypoint() :Command("Robot_InsertWaypoint") @@ -143,7 +143,7 @@ bool CmdRobotInsertWaypoint::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotInsertWaypointPreselect); +DEF_STD_CMD_A(CmdRobotInsertWaypointPreselect) CmdRobotInsertWaypointPreselect::CmdRobotInsertWaypointPreselect() :Command("Robot_InsertWaypointPreselect") @@ -207,7 +207,7 @@ bool CmdRobotInsertWaypointPreselect::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotSetDefaultOrientation); +DEF_STD_CMD_A(CmdRobotSetDefaultOrientation) CmdRobotSetDefaultOrientation::CmdRobotSetDefaultOrientation() :Command("Robot_SetDefaultOrientation") @@ -245,7 +245,7 @@ bool CmdRobotSetDefaultOrientation::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotSetDefaultValues); +DEF_STD_CMD_A(CmdRobotSetDefaultValues) CmdRobotSetDefaultValues::CmdRobotSetDefaultValues() :Command("Robot_SetDefaultValues") @@ -311,7 +311,7 @@ bool CmdRobotSetDefaultValues::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotEdge2Trac); +DEF_STD_CMD_A(CmdRobotEdge2Trac) CmdRobotEdge2Trac::CmdRobotEdge2Trac() :Command("Robot_Edge2Trac") @@ -375,7 +375,7 @@ bool CmdRobotEdge2Trac::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotTrajectoryDressUp); +DEF_STD_CMD_A(CmdRobotTrajectoryDressUp) CmdRobotTrajectoryDressUp::CmdRobotTrajectoryDressUp() :Command("Robot_TrajectoryDressUp") @@ -422,7 +422,7 @@ bool CmdRobotTrajectoryDressUp::isActive(void) // ##################################################################################################### -DEF_STD_CMD_A(CmdRobotTrajectoryCompound); +DEF_STD_CMD_A(CmdRobotTrajectoryCompound) CmdRobotTrajectoryCompound::CmdRobotTrajectoryCompound() :Command("Robot_TrajectoryCompound") diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h index 95ea1ca831..ada9668270 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.h +++ b/src/Mod/Robot/Gui/TaskWatcher.h @@ -51,8 +51,6 @@ public: protected: TaskRobot6Axis *rob; TaskRobotControl *ctr ; -; - }; diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp index 234ab91412..0061b28744 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp +++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp @@ -50,7 +50,7 @@ using namespace Sketcher; // PropertyConstraintList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(Sketcher::PropertyConstraintList, App::PropertyLists); +TYPESYSTEM_SOURCE(Sketcher::PropertyConstraintList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 4a1264a69d..3978b3604d 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -89,7 +89,7 @@ using namespace Sketcher; using namespace Base; -FC_LOG_LEVEL_INIT("Sketch",true,true); +FC_LOG_LEVEL_INIT("Sketch",true,true) const int GeoEnum::RtPnt = -1; const int GeoEnum::HAxis = -1; diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index b008b308b6..8df8002089 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -133,7 +133,7 @@ namespace SketcherGui { /* Sketch commands =======================================================*/ -DEF_STD_CMD_A(CmdSketcherNewSketch); +DEF_STD_CMD_A(CmdSketcherNewSketch) CmdSketcherNewSketch::CmdSketcherNewSketch() :Command("Sketcher_NewSketch") @@ -251,7 +251,7 @@ bool CmdSketcherNewSketch::isActive(void) return false; } -DEF_STD_CMD_A(CmdSketcherEditSketch); +DEF_STD_CMD_A(CmdSketcherEditSketch) CmdSketcherEditSketch::CmdSketcherEditSketch() :Command("Sketcher_EditSketch") @@ -282,7 +282,7 @@ bool CmdSketcherEditSketch::isActive(void) return Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) == 1; } -DEF_STD_CMD_A(CmdSketcherLeaveSketch); +DEF_STD_CMD_A(CmdSketcherLeaveSketch) CmdSketcherLeaveSketch::CmdSketcherLeaveSketch() : Command("Sketcher_LeaveSketch") @@ -328,7 +328,7 @@ bool CmdSketcherLeaveSketch::isActive(void) return false; } -DEF_STD_CMD_A(CmdSketcherReorientSketch); +DEF_STD_CMD_A(CmdSketcherReorientSketch) CmdSketcherReorientSketch::CmdSketcherReorientSketch() :Command("Sketcher_ReorientSketch") @@ -411,7 +411,7 @@ bool CmdSketcherReorientSketch::isActive(void) (Sketcher::SketchObject::getClassTypeId()) == 1; } -DEF_STD_CMD_A(CmdSketcherMapSketch); +DEF_STD_CMD_A(CmdSketcherMapSketch) CmdSketcherMapSketch::CmdSketcherMapSketch() : Command("Sketcher_MapSketch") @@ -569,7 +569,7 @@ bool CmdSketcherMapSketch::isActive(void) return getActiveGuiDocument() != 0; } -DEF_STD_CMD_A(CmdSketcherViewSketch); +DEF_STD_CMD_A(CmdSketcherViewSketch) CmdSketcherViewSketch::CmdSketcherViewSketch() : Command("Sketcher_ViewSketch") @@ -607,7 +607,7 @@ bool CmdSketcherViewSketch::isActive(void) return false; } -DEF_STD_CMD_A(CmdSketcherValidateSketch); +DEF_STD_CMD_A(CmdSketcherValidateSketch) CmdSketcherValidateSketch::CmdSketcherValidateSketch() : Command("Sketcher_ValidateSketch") @@ -641,7 +641,7 @@ bool CmdSketcherValidateSketch::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdSketcherMirrorSketch); +DEF_STD_CMD_A(CmdSketcherMirrorSketch) CmdSketcherMirrorSketch::CmdSketcherMirrorSketch() : Command("Sketcher_MirrorSketch") @@ -751,7 +751,7 @@ bool CmdSketcherMirrorSketch::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdSketcherMergeSketches); +DEF_STD_CMD_A(CmdSketcherMergeSketches) CmdSketcherMergeSketches::CmdSketcherMergeSketches() : Command("Sketcher_MergeSketches") @@ -831,7 +831,7 @@ bool CmdSketcherMergeSketches::isActive(void) // Acknowledgement of idea and original python macro goes to SpritKopf: // https://github.com/Spritkopf/freecad-macros/blob/master/clip-sketch/clip_sketch.FCMacro // https://forum.freecadweb.org/viewtopic.php?p=231481#p231085 -DEF_STD_CMD_A(CmdSketcherViewSection); +DEF_STD_CMD_A(CmdSketcherViewSection) CmdSketcherViewSection::CmdSketcherViewSection() : Command("Sketcher_ViewSection") diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index bbefe36f38..4d8fc012ad 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -64,7 +64,7 @@ namespace SketcherGui { extern GeometryCreationMode geometryCreationMode; /* Constrain commands =======================================================*/ -DEF_STD_CMD_A(CmdSketcherToggleConstruction); +DEF_STD_CMD_A(CmdSketcherToggleConstruction) CmdSketcherToggleConstruction::CmdSketcherToggleConstruction() :Command("Sketcher_ToggleConstruction") diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 80746c26f9..1d459a87d6 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -5857,7 +5857,7 @@ void CmdSketcherConstrainDiameter::updateAction(int mode) // ====================================================================================== -DEF_STD_CMD_ACLU(CmdSketcherCompConstrainRadDia); +DEF_STD_CMD_ACLU(CmdSketcherCompConstrainRadDia) CmdSketcherCompConstrainRadDia::CmdSketcherCompConstrainRadDia() : Command("Sketcher_CompConstrainRadDia") @@ -6934,7 +6934,7 @@ void CmdSketcherConstrainSymmetric::applyConstraint(std::vector &selS // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherConstrainSnellsLaw); +DEF_STD_CMD_A(CmdSketcherConstrainSnellsLaw) CmdSketcherConstrainSnellsLaw::CmdSketcherConstrainSnellsLaw() :Command("Sketcher_ConstrainSnellsLaw") @@ -7084,7 +7084,7 @@ bool CmdSketcherConstrainSnellsLaw::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherConstrainInternalAlignment); +DEF_STD_CMD_A(CmdSketcherConstrainInternalAlignment) CmdSketcherConstrainInternalAlignment::CmdSketcherConstrainInternalAlignment() :Command("Sketcher_ConstrainInternalAlignment") @@ -7500,7 +7500,7 @@ bool CmdSketcherConstrainInternalAlignment::isActive(void) // ====================================================================================== /*** Creation Mode / Toggle to or from Reference ***/ -DEF_STD_CMD_A(CmdSketcherToggleDrivingConstraint); +DEF_STD_CMD_A(CmdSketcherToggleDrivingConstraint) CmdSketcherToggleDrivingConstraint::CmdSketcherToggleDrivingConstraint() :Command("Sketcher_ToggleDrivingConstraint") @@ -7624,7 +7624,7 @@ bool CmdSketcherToggleDrivingConstraint::isActive(void) return isCreateGeoActive( getActiveGuiDocument() ); } -DEF_STD_CMD_A(CmdSketcherToggleActiveConstraint); +DEF_STD_CMD_A(CmdSketcherToggleActiveConstraint) CmdSketcherToggleActiveConstraint::CmdSketcherToggleActiveConstraint() :Command("Sketcher_ToggleActiveConstraint") diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 908661b604..b543e33301 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -408,7 +408,7 @@ protected: std::vector sugConstr1, sugConstr2; }; -DEF_STD_CMD_AU(CmdSketcherCreateLine); +DEF_STD_CMD_AU(CmdSketcherCreateLine) CmdSketcherCreateLine::CmdSketcherCreateLine() : Command("Sketcher_CreateLine") @@ -647,7 +647,7 @@ protected: std::vector sugConstr1, sugConstr2; }; -DEF_STD_CMD_AU(CmdSketcherCreateRectangle); +DEF_STD_CMD_AU(CmdSketcherCreateRectangle) CmdSketcherCreateRectangle::CmdSketcherCreateRectangle() : Command("Sketcher_CreateRectangle") @@ -1380,7 +1380,7 @@ protected: } }; -DEF_STD_CMD_AU(CmdSketcherCreatePolyline); +DEF_STD_CMD_AU(CmdSketcherCreatePolyline) CmdSketcherCreatePolyline::CmdSketcherCreatePolyline() : Command("Sketcher_CreatePolyline") @@ -1665,7 +1665,7 @@ protected: std::vector sugConstr1, sugConstr2, sugConstr3; }; -DEF_STD_CMD_A(CmdSketcherCreateArc); +DEF_STD_CMD_A(CmdSketcherCreateArc) CmdSketcherCreateArc::CmdSketcherCreateArc() : Command("Sketcher_CreateArc") @@ -1976,7 +1976,7 @@ protected: Sketcher::PointPos arcPos1, arcPos2; }; -DEF_STD_CMD_A(CmdSketcherCreate3PointArc); +DEF_STD_CMD_A(CmdSketcherCreate3PointArc) CmdSketcherCreate3PointArc::CmdSketcherCreate3PointArc() : Command("Sketcher_Create3PointArc") @@ -2003,7 +2003,7 @@ bool CmdSketcherCreate3PointArc::isActive(void) } -DEF_STD_CMD_ACLU(CmdSketcherCompCreateArc); +DEF_STD_CMD_ACLU(CmdSketcherCompCreateArc) CmdSketcherCompCreateArc::CmdSketcherCompCreateArc() : Command("Sketcher_CompCreateArc") @@ -2278,7 +2278,7 @@ protected: }; -DEF_STD_CMD_A(CmdSketcherCreateCircle); +DEF_STD_CMD_A(CmdSketcherCreateCircle) CmdSketcherCreateCircle::CmdSketcherCreateCircle() : Command("Sketcher_CreateCircle") @@ -3114,7 +3114,7 @@ private: }; /// @brief Macro that declares a new sketcher command class 'CmdSketcherCreateEllipseByCenter' -DEF_STD_CMD_A(CmdSketcherCreateEllipseByCenter); +DEF_STD_CMD_A(CmdSketcherCreateEllipseByCenter) /** * @brief ctor @@ -3144,7 +3144,7 @@ bool CmdSketcherCreateEllipseByCenter::isActive(void) } /// @brief Macro that declares a new sketcher command class 'CmdSketcherCreateEllipseBy3Points' -DEF_STD_CMD_A(CmdSketcherCreateEllipseBy3Points); +DEF_STD_CMD_A(CmdSketcherCreateEllipseBy3Points) /** * @brief ctor @@ -3518,7 +3518,7 @@ protected: std::vector sugConstr1, sugConstr2, sugConstr3, sugConstr4; }; -DEF_STD_CMD_A(CmdSketcherCreateArcOfEllipse); +DEF_STD_CMD_A(CmdSketcherCreateArcOfEllipse) CmdSketcherCreateArcOfEllipse::CmdSketcherCreateArcOfEllipse() : Command("Sketcher_CreateArcOfEllipse") @@ -3900,7 +3900,7 @@ protected: }; -DEF_STD_CMD_A(CmdSketcherCreateArcOfHyperbola); +DEF_STD_CMD_A(CmdSketcherCreateArcOfHyperbola) CmdSketcherCreateArcOfHyperbola::CmdSketcherCreateArcOfHyperbola() : Command("Sketcher_CreateArcOfHyperbola") @@ -5254,7 +5254,7 @@ protected: std::vector sugConstr1, sugConstr2, sugConstr3; }; -DEF_STD_CMD_A(CmdSketcherCreate3PointCircle); +DEF_STD_CMD_A(CmdSketcherCreate3PointCircle) CmdSketcherCreate3PointCircle::CmdSketcherCreate3PointCircle() : Command("Sketcher_Create3PointCircle") @@ -5281,7 +5281,7 @@ bool CmdSketcherCreate3PointCircle::isActive(void) } -DEF_STD_CMD_ACLU(CmdSketcherCompCreateCircle); +DEF_STD_CMD_ACLU(CmdSketcherCompCreateCircle) CmdSketcherCompCreateCircle::CmdSketcherCompCreateCircle() : Command("Sketcher_CompCreateCircle") @@ -5502,7 +5502,7 @@ protected: std::vector sugConstr; }; -DEF_STD_CMD_A(CmdSketcherCreatePoint); +DEF_STD_CMD_A(CmdSketcherCreatePoint) CmdSketcherCreatePoint::CmdSketcherCreatePoint() : Command("Sketcher_CreatePoint") @@ -5531,7 +5531,7 @@ bool CmdSketcherCreatePoint::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreateText); +DEF_STD_CMD_A(CmdSketcherCreateText) CmdSketcherCreateText::CmdSketcherCreateText() : Command("Sketcher_CreateText") @@ -5559,7 +5559,7 @@ bool CmdSketcherCreateText::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreateDraftLine); +DEF_STD_CMD_A(CmdSketcherCreateDraftLine) CmdSketcherCreateDraftLine::CmdSketcherCreateDraftLine() : Command("Sketcher_CreateDraftLine") @@ -5876,7 +5876,7 @@ protected: Base::Vector2d firstPos; }; -DEF_STD_CMD_A(CmdSketcherCreateFillet); +DEF_STD_CMD_A(CmdSketcherCreateFillet) CmdSketcherCreateFillet::CmdSketcherCreateFillet() : Command("Sketcher_CreateFillet") @@ -5937,7 +5937,7 @@ namespace SketcherGui { return false; } }; -}; +} /* XPM */ @@ -6039,7 +6039,7 @@ public: } }; -DEF_STD_CMD_A(CmdSketcherTrimming); +DEF_STD_CMD_A(CmdSketcherTrimming) CmdSketcherTrimming::CmdSketcherTrimming() : Command("Sketcher_Trimming") @@ -6393,7 +6393,7 @@ private: } }; -DEF_STD_CMD_A(CmdSketcherExtend); +DEF_STD_CMD_A(CmdSketcherExtend) //TODO: fix the translations for this CmdSketcherExtend::CmdSketcherExtend() @@ -6620,7 +6620,7 @@ public: } }; -DEF_STD_CMD_A(CmdSketcherExternal); +DEF_STD_CMD_A(CmdSketcherExternal) CmdSketcherExternal::CmdSketcherExternal() : Command("Sketcher_External") @@ -6705,7 +6705,7 @@ namespace SketcherGui { return true; } }; -}; +} /* XPM */ @@ -6837,7 +6837,7 @@ static const char *cursor_carboncopy[]={ } }; - DEF_STD_CMD_AU(CmdSketcherCarbonCopy); + DEF_STD_CMD_AU(CmdSketcherCarbonCopy) CmdSketcherCarbonCopy::CmdSketcherCarbonCopy() : Command("Sketcher_CarbonCopy") @@ -7117,7 +7117,7 @@ protected: std::vector sugConstr1, sugConstr2; }; -DEF_STD_CMD_AU(CmdSketcherCreateSlot); +DEF_STD_CMD_AU(CmdSketcherCreateSlot) CmdSketcherCreateSlot::CmdSketcherCreateSlot() : Command("Sketcher_CreateSlot") @@ -7351,7 +7351,8 @@ protected: }; -DEF_STD_CMD_A(CmdSketcherCreateTriangle); +DEF_STD_CMD_A(CmdSketcherCreateTriangle) + CmdSketcherCreateTriangle::CmdSketcherCreateTriangle() : Command("Sketcher_CreateTriangle") { @@ -7377,7 +7378,8 @@ bool CmdSketcherCreateTriangle::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateSquare); +DEF_STD_CMD_A(CmdSketcherCreateSquare) + CmdSketcherCreateSquare::CmdSketcherCreateSquare() : Command("Sketcher_CreateSquare") { @@ -7403,7 +7405,8 @@ bool CmdSketcherCreateSquare::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreatePentagon); +DEF_STD_CMD_A(CmdSketcherCreatePentagon) + CmdSketcherCreatePentagon::CmdSketcherCreatePentagon() : Command("Sketcher_CreatePentagon") { @@ -7430,7 +7433,8 @@ bool CmdSketcherCreatePentagon::isActive(void) } -DEF_STD_CMD_A(CmdSketcherCreateHexagon); +DEF_STD_CMD_A(CmdSketcherCreateHexagon) + CmdSketcherCreateHexagon::CmdSketcherCreateHexagon() : Command("Sketcher_CreateHexagon") { @@ -7456,7 +7460,8 @@ bool CmdSketcherCreateHexagon::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateHeptagon); +DEF_STD_CMD_A(CmdSketcherCreateHeptagon) + CmdSketcherCreateHeptagon::CmdSketcherCreateHeptagon() : Command("Sketcher_CreateHeptagon") { @@ -7482,7 +7487,8 @@ bool CmdSketcherCreateHeptagon::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateOctagon); +DEF_STD_CMD_A(CmdSketcherCreateOctagon) + CmdSketcherCreateOctagon::CmdSketcherCreateOctagon() : Command("Sketcher_CreateOctagon") { @@ -7508,7 +7514,8 @@ bool CmdSketcherCreateOctagon::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateRegularPolygon); +DEF_STD_CMD_A(CmdSketcherCreateRegularPolygon) + CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() : Command("Sketcher_CreateRegularPolygon") { @@ -7534,7 +7541,7 @@ bool CmdSketcherCreateRegularPolygon::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } -DEF_STD_CMD_ACLU(CmdSketcherCompCreateRegularPolygon); +DEF_STD_CMD_ACLU(CmdSketcherCompCreateRegularPolygon) CmdSketcherCompCreateRegularPolygon::CmdSketcherCompCreateRegularPolygon() : Command("Sketcher_CompCreateRegularPolygon") diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 335bff971f..58ff09456a 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -98,7 +98,7 @@ void ShowRestoreInformationLayer(SketcherGui::ViewProviderSketch* vp, char * vis } // Show/Hide B-spline degree -DEF_STD_CMD_A(CmdSketcherBSplineDegree); +DEF_STD_CMD_A(CmdSketcherBSplineDegree) CmdSketcherBSplineDegree::CmdSketcherBSplineDegree() :Command("Sketcher_BSplineDegree") @@ -132,7 +132,7 @@ bool CmdSketcherBSplineDegree::isActive(void) } // Show/Hide B-spline polygon -DEF_STD_CMD_A(CmdSketcherBSplinePolygon); +DEF_STD_CMD_A(CmdSketcherBSplinePolygon) CmdSketcherBSplinePolygon::CmdSketcherBSplinePolygon() :Command("Sketcher_BSplinePolygon") @@ -166,7 +166,7 @@ bool CmdSketcherBSplinePolygon::isActive(void) } // Show/Hide B-spline comb -DEF_STD_CMD_A(CmdSketcherBSplineComb); +DEF_STD_CMD_A(CmdSketcherBSplineComb) CmdSketcherBSplineComb::CmdSketcherBSplineComb() :Command("Sketcher_BSplineComb") @@ -200,7 +200,7 @@ bool CmdSketcherBSplineComb::isActive(void) } // -DEF_STD_CMD_A(CmdSketcherBSplineKnotMultiplicity); +DEF_STD_CMD_A(CmdSketcherBSplineKnotMultiplicity) CmdSketcherBSplineKnotMultiplicity::CmdSketcherBSplineKnotMultiplicity() :Command("Sketcher_BSplineKnotMultiplicity") @@ -234,7 +234,7 @@ bool CmdSketcherBSplineKnotMultiplicity::isActive(void) } // Composite drop down menu for show/hide geometry information layer -DEF_STD_CMD_ACLU(CmdSketcherCompBSplineShowHideGeometryInformation); +DEF_STD_CMD_ACLU(CmdSketcherCompBSplineShowHideGeometryInformation) CmdSketcherCompBSplineShowHideGeometryInformation::CmdSketcherCompBSplineShowHideGeometryInformation() : Command("Sketcher_CompBSplineShowHideGeometryInformation") @@ -338,7 +338,7 @@ bool CmdSketcherCompBSplineShowHideGeometryInformation::isActive(void) } // Convert to NURB -DEF_STD_CMD_A(CmdSketcherConvertToNURB); +DEF_STD_CMD_A(CmdSketcherConvertToNURB) CmdSketcherConvertToNURB::CmdSketcherConvertToNURB() :Command("Sketcher_BSplineConvertToNURB") @@ -417,7 +417,7 @@ bool CmdSketcherConvertToNURB::isActive(void) } // Convert to NURB -DEF_STD_CMD_A(CmdSketcherIncreaseDegree); +DEF_STD_CMD_A(CmdSketcherIncreaseDegree) CmdSketcherIncreaseDegree::CmdSketcherIncreaseDegree() :Command("Sketcher_BSplineIncreaseDegree") @@ -494,7 +494,7 @@ bool CmdSketcherIncreaseDegree::isActive(void) return isSketcherBSplineActive( getActiveGuiDocument(), true ); } -DEF_STD_CMD_A(CmdSketcherIncreaseKnotMultiplicity); +DEF_STD_CMD_A(CmdSketcherIncreaseKnotMultiplicity) CmdSketcherIncreaseKnotMultiplicity::CmdSketcherIncreaseKnotMultiplicity() :Command("Sketcher_BSplineIncreaseKnotMultiplicity") @@ -653,7 +653,7 @@ bool CmdSketcherIncreaseKnotMultiplicity::isActive(void) return isSketcherBSplineActive( getActiveGuiDocument(), true ); } -DEF_STD_CMD_A(CmdSketcherDecreaseKnotMultiplicity); +DEF_STD_CMD_A(CmdSketcherDecreaseKnotMultiplicity) CmdSketcherDecreaseKnotMultiplicity::CmdSketcherDecreaseKnotMultiplicity() :Command("Sketcher_BSplineDecreaseKnotMultiplicity") @@ -800,7 +800,7 @@ bool CmdSketcherDecreaseKnotMultiplicity::isActive(void) // Composite drop down for knot increase/decrease -DEF_STD_CMD_ACLU(CmdSketcherCompModifyKnotMultiplicity); +DEF_STD_CMD_ACLU(CmdSketcherCompModifyKnotMultiplicity) CmdSketcherCompModifyKnotMultiplicity::CmdSketcherCompModifyKnotMultiplicity() : Command("Sketcher_CompModifyKnotMultiplicity") diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index 4039caa576..a412a0e433 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -88,7 +88,7 @@ void ActivateAcceleratorHandler(Gui::Document *doc, DrawSketchHandler *handler) } // Close Shape Command -DEF_STD_CMD_A(CmdSketcherCloseShape); +DEF_STD_CMD_A(CmdSketcherCloseShape) CmdSketcherCloseShape::CmdSketcherCloseShape() :Command("Sketcher_CloseShape") @@ -194,7 +194,7 @@ bool CmdSketcherCloseShape::isActive(void) // Connect Edges Command -DEF_STD_CMD_A(CmdSketcherConnect); +DEF_STD_CMD_A(CmdSketcherConnect) CmdSketcherConnect::CmdSketcherConnect() :Command("Sketcher_ConnectLines") @@ -277,7 +277,7 @@ bool CmdSketcherConnect::isActive(void) } // Select Constraints of selected elements -DEF_STD_CMD_A(CmdSketcherSelectConstraints); +DEF_STD_CMD_A(CmdSketcherSelectConstraints) CmdSketcherSelectConstraints::CmdSketcherSelectConstraints() :Command("Sketcher_SelectConstraints") @@ -341,7 +341,7 @@ bool CmdSketcherSelectConstraints::isActive(void) } // Select Origin -DEF_STD_CMD_A(CmdSketcherSelectOrigin); +DEF_STD_CMD_A(CmdSketcherSelectOrigin) CmdSketcherSelectOrigin::CmdSketcherSelectOrigin() :Command("Sketcher_SelectOrigin") @@ -389,7 +389,7 @@ bool CmdSketcherSelectOrigin::isActive(void) } // Select Vertical Axis -DEF_STD_CMD_A(CmdSketcherSelectVerticalAxis); +DEF_STD_CMD_A(CmdSketcherSelectVerticalAxis) CmdSketcherSelectVerticalAxis::CmdSketcherSelectVerticalAxis() :Command("Sketcher_SelectVerticalAxis") @@ -433,7 +433,7 @@ bool CmdSketcherSelectVerticalAxis::isActive(void) } // Select Horizontal Axis -DEF_STD_CMD_A(CmdSketcherSelectHorizontalAxis); +DEF_STD_CMD_A(CmdSketcherSelectHorizontalAxis) CmdSketcherSelectHorizontalAxis::CmdSketcherSelectHorizontalAxis() :Command("Sketcher_SelectHorizontalAxis") @@ -476,7 +476,7 @@ bool CmdSketcherSelectHorizontalAxis::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), false ); } -DEF_STD_CMD_A(CmdSketcherSelectRedundantConstraints); +DEF_STD_CMD_A(CmdSketcherSelectRedundantConstraints) CmdSketcherSelectRedundantConstraints::CmdSketcherSelectRedundantConstraints() :Command("Sketcher_SelectRedundantConstraints") @@ -529,7 +529,7 @@ bool CmdSketcherSelectRedundantConstraints::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), false ); } -DEF_STD_CMD_A(CmdSketcherSelectConflictingConstraints); +DEF_STD_CMD_A(CmdSketcherSelectConflictingConstraints) CmdSketcherSelectConflictingConstraints::CmdSketcherSelectConflictingConstraints() :Command("Sketcher_SelectConflictingConstraints") @@ -580,7 +580,7 @@ bool CmdSketcherSelectConflictingConstraints::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), false ); } -DEF_STD_CMD_A(CmdSketcherSelectElementsAssociatedWithConstraints); +DEF_STD_CMD_A(CmdSketcherSelectElementsAssociatedWithConstraints) CmdSketcherSelectElementsAssociatedWithConstraints::CmdSketcherSelectElementsAssociatedWithConstraints() :Command("Sketcher_SelectElementsAssociatedWithConstraints") @@ -702,7 +702,7 @@ bool CmdSketcherSelectElementsAssociatedWithConstraints::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), true ); } -DEF_STD_CMD_A(CmdSketcherSelectElementsWithDoFs); +DEF_STD_CMD_A(CmdSketcherSelectElementsWithDoFs) CmdSketcherSelectElementsWithDoFs::CmdSketcherSelectElementsWithDoFs() :Command("Sketcher_SelectElementsWithDoFs") @@ -809,7 +809,7 @@ bool CmdSketcherSelectElementsWithDoFs::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), false ); } -DEF_STD_CMD_A(CmdSketcherRestoreInternalAlignmentGeometry); +DEF_STD_CMD_A(CmdSketcherRestoreInternalAlignmentGeometry) CmdSketcherRestoreInternalAlignmentGeometry::CmdSketcherRestoreInternalAlignmentGeometry() :Command("Sketcher_RestoreInternalAlignmentGeometry") @@ -902,7 +902,7 @@ bool CmdSketcherRestoreInternalAlignmentGeometry::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), true ); } -DEF_STD_CMD_A(CmdSketcherSymmetry); +DEF_STD_CMD_A(CmdSketcherSymmetry) CmdSketcherSymmetry::CmdSketcherSymmetry() :Command("Sketcher_Symmetry") @@ -1791,7 +1791,7 @@ static const char *cursor_createrectangulararray[]={ }; -DEF_STD_CMD_A(CmdSketcherRectangularArray); +DEF_STD_CMD_A(CmdSketcherRectangularArray) CmdSketcherRectangularArray::CmdSketcherRectangularArray() :Command("Sketcher_RectangularArray") @@ -1930,7 +1930,7 @@ bool CmdSketcherRectangularArray::isActive(void) } // Select Origin -DEF_STD_CMD_A(CmdSketcherDeleteAllGeometry); +DEF_STD_CMD_A(CmdSketcherDeleteAllGeometry) CmdSketcherDeleteAllGeometry::CmdSketcherDeleteAllGeometry() :Command("Sketcher_DeleteAllGeometry") @@ -1993,7 +1993,7 @@ bool CmdSketcherDeleteAllGeometry::isActive(void) return isSketcherAcceleratorActive( getActiveGuiDocument(), false ); } -DEF_STD_CMD_A(CmdSketcherDeleteAllConstraints); +DEF_STD_CMD_A(CmdSketcherDeleteAllConstraints) CmdSketcherDeleteAllConstraints::CmdSketcherDeleteAllConstraints() :Command("Sketcher_DeleteAllConstraints") diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp index 488a6950d1..ffea76a62e 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp @@ -87,7 +87,7 @@ void ActivateVirtualSpaceHandler(Gui::Document *doc,DrawSketchHandler *handler) } // Show/Hide B-spline degree -DEF_STD_CMD_A(CmdSketcherSwitchVirtualSpace); +DEF_STD_CMD_A(CmdSketcherSwitchVirtualSpace) CmdSketcherSwitchVirtualSpace::CmdSketcherSwitchVirtualSpace() :Command("Sketcher_SwitchVirtualSpace") diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp index dffd888cf0..76af0787e0 100644 --- a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp +++ b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp @@ -63,7 +63,7 @@ using namespace SketcherGui; // ------------------------------------------------------ -SO_NODE_SOURCE(SoDatumLabel); +SO_NODE_SOURCE(SoDatumLabel) void SoDatumLabel::initClass() { diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp index 136c1af475..9b3b781583 100644 --- a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp +++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp @@ -52,7 +52,7 @@ using namespace SketcherGui; // ------------------------------------------------------ -SO_NODE_SOURCE(SoZoomTranslation); +SO_NODE_SOURCE(SoZoomTranslation) void SoZoomTranslation::initClass() { diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 8d5b7f3f4a..b3fbb39eea 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -119,7 +119,7 @@ #include "TaskSketcherValidation.h" #include "CommandConstraints.h" -FC_LOG_LEVEL_INIT("Sketch",true,true); +FC_LOG_LEVEL_INIT("Sketch",true,true) // The first is used to point at a SoDatumLabel for some // constraints, and at a SoMaterial for others... diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp index 09ad43ecfc..90d225d227 100644 --- a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp +++ b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp @@ -50,7 +50,7 @@ using namespace TechDraw; // PropertyCenterLineList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(TechDraw::PropertyCenterLineList, App::PropertyLists); +TYPESYSTEM_SOURCE(TechDraw::PropertyCenterLineList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp index 2ab39dcdb9..5029990c50 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp +++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp @@ -50,7 +50,7 @@ using namespace TechDraw; // PropertyCosmeticEdgeList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(TechDraw::PropertyCosmeticEdgeList, App::PropertyLists); +TYPESYSTEM_SOURCE(TechDraw::PropertyCosmeticEdgeList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp index 833b42d62d..16a2722628 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp +++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp @@ -50,7 +50,7 @@ using namespace TechDraw; // PropertyCosmeticVertexList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(TechDraw::PropertyCosmeticVertexList, App::PropertyLists); +TYPESYSTEM_SOURCE(TechDraw::PropertyCosmeticVertexList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp index d5b90c8e46..4e20df6e80 100644 --- a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp +++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp @@ -50,7 +50,7 @@ using namespace TechDraw; // PropertyGeomFormatList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(TechDraw::PropertyGeomFormatList, App::PropertyLists); +TYPESYSTEM_SOURCE(TechDraw::PropertyGeomFormatList, App::PropertyLists) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index b1c139591c..208ca310db 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -86,7 +86,7 @@ using namespace std; // TechDraw_NewPageDef (default template) //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewPageDef); +DEF_STD_CMD_A(CmdTechDrawNewPageDef) CmdTechDrawNewPageDef::CmdTechDrawNewPageDef() : Command("TechDraw_NewPageDef") @@ -156,7 +156,7 @@ bool CmdTechDrawNewPageDef::isActive(void) // TechDraw_NewPage (with template choice) //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewPage); +DEF_STD_CMD_A(CmdTechDrawNewPage) CmdTechDrawNewPage::CmdTechDrawNewPage() : Command("TechDraw_NewPage") @@ -236,7 +236,7 @@ bool CmdTechDrawNewPage::isActive(void) // TechDraw_NewView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewView); +DEF_STD_CMD_A(CmdTechDrawNewView) CmdTechDrawNewView::CmdTechDrawNewView() : Command("TechDraw_NewView") @@ -330,7 +330,7 @@ bool CmdTechDrawNewView::isActive(void) // TechDraw_NewActiveView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewActiveView); +DEF_STD_CMD_A(CmdTechDrawNewActiveView) CmdTechDrawNewActiveView::CmdTechDrawNewActiveView() : Command("TechDraw_NewActiveView") @@ -364,7 +364,7 @@ bool CmdTechDrawNewActiveView::isActive(void) // TechDraw_NewViewSection //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewViewSection); +DEF_STD_CMD_A(CmdTechDrawNewViewSection) CmdTechDrawNewViewSection::CmdTechDrawNewViewSection() : Command("TechDraw_NewViewSection") @@ -434,7 +434,7 @@ bool CmdTechDrawNewViewSection::isActive(void) // TechDraw_NewViewDetail //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewViewDetail); +DEF_STD_CMD_A(CmdTechDrawNewViewDetail) CmdTechDrawNewViewDetail::CmdTechDrawNewViewDetail() : Command("TechDraw_NewViewDetail") @@ -503,7 +503,7 @@ bool CmdTechDrawNewViewDetail::isActive(void) // TechDraw_ProjGroup //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawProjGroup); +DEF_STD_CMD_A(CmdTechDrawProjGroup) CmdTechDrawProjGroup::CmdTechDrawProjGroup() : Command("TechDraw_ProjGroup") @@ -699,7 +699,7 @@ bool _checkDrawViewPartBalloon(Gui::Command* cmd) { return true; } -DEF_STD_CMD_A(CmdTechDrawNewBalloon); +DEF_STD_CMD_A(CmdTechDrawNewBalloon) CmdTechDrawNewBalloon::CmdTechDrawNewBalloon() : Command("TechDraw_NewBalloon") @@ -748,7 +748,7 @@ bool CmdTechDrawNewBalloon::isActive(void) // TechDraw_Clip //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClip); +DEF_STD_CMD_A(CmdTechDrawClip) CmdTechDrawClip::CmdTechDrawClip() : Command("TechDraw_Clip") @@ -788,7 +788,7 @@ bool CmdTechDrawClip::isActive(void) // TechDraw_ClipPlus //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClipPlus); +DEF_STD_CMD_A(CmdTechDrawClipPlus) CmdTechDrawClipPlus::CmdTechDrawClipPlus() : Command("TechDraw_ClipPlus") @@ -871,7 +871,7 @@ bool CmdTechDrawClipPlus::isActive(void) // TechDraw_ClipMinus //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClipMinus); +DEF_STD_CMD_A(CmdTechDrawClipMinus) CmdTechDrawClipMinus::CmdTechDrawClipMinus() : Command("TechDraw_ClipMinus") @@ -945,7 +945,7 @@ bool CmdTechDrawClipMinus::isActive(void) // TechDraw_Symbol //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawSymbol); +DEF_STD_CMD_A(CmdTechDrawSymbol) CmdTechDrawSymbol::CmdTechDrawSymbol() : Command("TechDraw_Symbol") @@ -999,7 +999,7 @@ bool CmdTechDrawSymbol::isActive(void) // TechDraw_DraftView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawDraftView); +DEF_STD_CMD_A(CmdTechDrawDraftView) CmdTechDrawDraftView::CmdTechDrawDraftView() : Command("TechDraw_DraftView") @@ -1052,7 +1052,7 @@ bool CmdTechDrawDraftView::isActive(void) // TechDraw_ArchView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawArchView); +DEF_STD_CMD_A(CmdTechDrawArchView) CmdTechDrawArchView::CmdTechDrawArchView() : Command("TechDraw_ArchView") @@ -1102,7 +1102,7 @@ bool CmdTechDrawArchView::isActive(void) // TechDraw_Spreadheet //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawSpreadsheet); +DEF_STD_CMD_A(CmdTechDrawSpreadsheet) CmdTechDrawSpreadsheet::CmdTechDrawSpreadsheet() : Command("TechDraw_Spreadsheet") @@ -1162,7 +1162,7 @@ bool CmdTechDrawSpreadsheet::isActive(void) // TechDraw_ExportPage (Svg) //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawExportPage); +DEF_STD_CMD_A(CmdTechDrawExportPage) CmdTechDrawExportPage::CmdTechDrawExportPage() : Command("TechDraw_ExportPage") @@ -1206,7 +1206,7 @@ bool CmdTechDrawExportPage::isActive(void) // TechDraw_ExportPage (Dxf) //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawExportPageDxf); +DEF_STD_CMD_A(CmdTechDrawExportPageDxf) CmdTechDrawExportPageDxf::CmdTechDrawExportPageDxf() : Command("TechDraw_ExportPageDxf") diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp index cc13ebdd9b..15cd655d78 100644 --- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp +++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp @@ -87,7 +87,7 @@ void exec2PointCenterLine(Gui::Command* cmd); // TechDraw_Leader //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawLeaderLine); +DEF_STD_CMD_A(CmdTechDrawLeaderLine) CmdTechDrawLeaderLine::CmdTechDrawLeaderLine() : Command("TechDraw_LeaderLine") @@ -147,7 +147,7 @@ bool CmdTechDrawLeaderLine::isActive(void) // TechDraw_RichAnno //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawRichAnno); +DEF_STD_CMD_A(CmdTechDrawRichAnno) CmdTechDrawRichAnno::CmdTechDrawRichAnno() : Command("TechDraw_RichAnno") @@ -198,7 +198,7 @@ bool CmdTechDrawRichAnno::isActive(void) // CosmeticVertexGroup //=========================================================================== -DEF_STD_CMD_ACL(CmdTechDrawCosmeticVertexGrp); +DEF_STD_CMD_ACL(CmdTechDrawCosmeticVertexGrp) CmdTechDrawCosmeticVertexGrp::CmdTechDrawCosmeticVertexGrp() : Command("TechDraw_CosmeticVertexGrp") @@ -412,7 +412,7 @@ void execQuadrant(Gui::Command* cmd) cmd->updateActive(); } -DEF_STD_CMD_A(CmdTechDrawCosmeticVertex); +DEF_STD_CMD_A(CmdTechDrawCosmeticVertex) CmdTechDrawCosmeticVertex::CmdTechDrawCosmeticVertex() : Command("TechDraw_CosmeticVertex") @@ -471,7 +471,7 @@ bool CmdTechDrawCosmeticVertex::isActive(void) // TechDraw_Midpoints //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawMidpoints); +DEF_STD_CMD_A(CmdTechDrawMidpoints) CmdTechDrawMidpoints::CmdTechDrawMidpoints() : Command("TechDraw_Midpoints") @@ -508,7 +508,7 @@ bool CmdTechDrawMidpoints::isActive(void) // TechDraw_Quadrant //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawQuadrant); +DEF_STD_CMD_A(CmdTechDrawQuadrant) CmdTechDrawQuadrant::CmdTechDrawQuadrant() : Command("TechDraw_Quadrant") @@ -545,7 +545,7 @@ bool CmdTechDrawQuadrant::isActive(void) // TechDraw_Annotation //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawAnnotation); +DEF_STD_CMD_A(CmdTechDrawAnnotation) CmdTechDrawAnnotation::CmdTechDrawAnnotation() : Command("TechDraw_Annotation") @@ -585,7 +585,7 @@ bool CmdTechDrawAnnotation::isActive(void) // CenterLineGroup //=========================================================================== -DEF_STD_CMD_ACL(CmdTechDrawCenterLineGrp); +DEF_STD_CMD_ACL(CmdTechDrawCenterLineGrp) CmdTechDrawCenterLineGrp::CmdTechDrawCenterLineGrp() : Command("TechDraw_CenterLineGrp") @@ -688,7 +688,7 @@ bool CmdTechDrawCenterLineGrp::isActive(void) // TechDraw_Centerline //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawFaceCenterLine); +DEF_STD_CMD_A(CmdTechDrawFaceCenterLine) CmdTechDrawFaceCenterLine::CmdTechDrawFaceCenterLine() : Command("TechDraw_FaceCenterLine") @@ -802,7 +802,7 @@ void execCenterLine(Gui::Command* cmd) // TechDraw_2LineCenterline //=========================================================================== -DEF_STD_CMD_A(CmdTechDraw2LineCenterLine); +DEF_STD_CMD_A(CmdTechDraw2LineCenterLine) CmdTechDraw2LineCenterLine::CmdTechDraw2LineCenterLine() : Command("TechDraw_2LineCenterLine") @@ -914,7 +914,7 @@ void exec2LineCenterLine(Gui::Command* cmd) // TechDraw_2PointCenterline //=========================================================================== -DEF_STD_CMD_A(CmdTechDraw2PointCenterLine); +DEF_STD_CMD_A(CmdTechDraw2PointCenterLine) CmdTechDraw2PointCenterLine::CmdTechDraw2PointCenterLine() : Command("TechDraw_2PointCenterLine") @@ -1017,7 +1017,7 @@ void exec2PointCenterLine(Gui::Command* cmd) // TechDraw_CosmeticEraser //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawCosmeticEraser); +DEF_STD_CMD_A(CmdTechDrawCosmeticEraser) CmdTechDrawCosmeticEraser::CmdTechDrawCosmeticEraser() : Command("TechDraw_CosmeticEraser") @@ -1152,7 +1152,7 @@ bool CmdTechDrawCosmeticEraser::isActive(void) // TechDraw_DecorateLine //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawDecorateLine); +DEF_STD_CMD_A(CmdTechDrawDecorateLine) CmdTechDrawDecorateLine::CmdTechDrawDecorateLine() : Command("TechDraw_DecorateLine") @@ -1229,7 +1229,7 @@ bool CmdTechDrawDecorateLine::isActive(void) // TechDraw_ShowAll //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawShowAll); +DEF_STD_CMD_A(CmdTechDrawShowAll) CmdTechDrawShowAll::CmdTechDrawShowAll() : Command("TechDraw_ShowAll") @@ -1286,7 +1286,7 @@ bool CmdTechDrawShowAll::isActive(void) // TechDraw_WeldSymbol //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawWeldSymbol); +DEF_STD_CMD_A(CmdTechDrawWeldSymbol) CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol() : Command("TechDraw_WeldSymbol") diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 976f79a6b7..f701539b3b 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -108,7 +108,7 @@ char* _edgeTypeToText(int e); // this is deprecated. use individual add dimension commands. -DEF_STD_CMD_A(CmdTechDrawNewDimension); +DEF_STD_CMD_A(CmdTechDrawNewDimension) CmdTechDrawNewDimension::CmdTechDrawNewDimension() : Command("TechDraw_NewDimension") @@ -235,7 +235,7 @@ bool CmdTechDrawNewDimension::isActive(void) // TechDraw_NewRadiusDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewRadiusDimension); +DEF_STD_CMD_A(CmdTechDrawNewRadiusDimension) CmdTechDrawNewRadiusDimension::CmdTechDrawNewRadiusDimension() : Command("TechDraw_NewRadiusDimension") @@ -357,7 +357,7 @@ bool CmdTechDrawNewRadiusDimension::isActive(void) // TechDraw_NewDiameterDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewDiameterDimension); +DEF_STD_CMD_A(CmdTechDrawNewDiameterDimension) CmdTechDrawNewDiameterDimension::CmdTechDrawNewDiameterDimension() : Command("TechDraw_NewDiameterDimension") @@ -478,7 +478,7 @@ bool CmdTechDrawNewDiameterDimension::isActive(void) // TechDraw_NewLengthDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewLengthDimension); +DEF_STD_CMD_A(CmdTechDrawNewLengthDimension) CmdTechDrawNewLengthDimension::CmdTechDrawNewLengthDimension() : Command("TechDraw_NewLengthDimension") @@ -591,7 +591,7 @@ bool CmdTechDrawNewLengthDimension::isActive(void) // TechDraw_NewDistanceXDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewDistanceXDimension); +DEF_STD_CMD_A(CmdTechDrawNewDistanceXDimension) CmdTechDrawNewDistanceXDimension::CmdTechDrawNewDistanceXDimension() : Command("TechDraw_NewDistanceXDimension") @@ -704,7 +704,7 @@ bool CmdTechDrawNewDistanceXDimension::isActive(void) // TechDraw_NewDistanceYDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewDistanceYDimension); +DEF_STD_CMD_A(CmdTechDrawNewDistanceYDimension) CmdTechDrawNewDistanceYDimension::CmdTechDrawNewDistanceYDimension() : Command("TechDraw_NewDistanceYDimension") @@ -816,7 +816,7 @@ bool CmdTechDrawNewDistanceYDimension::isActive(void) // TechDraw_NewAngleDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewAngleDimension); +DEF_STD_CMD_A(CmdTechDrawNewAngleDimension) CmdTechDrawNewAngleDimension::CmdTechDrawNewAngleDimension() : Command("TechDraw_NewAngleDimension") @@ -904,7 +904,7 @@ bool CmdTechDrawNewAngleDimension::isActive(void) // TechDraw_NewAngle3PtDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewAngle3PtDimension); +DEF_STD_CMD_A(CmdTechDrawNewAngle3PtDimension) CmdTechDrawNewAngle3PtDimension::CmdTechDrawNewAngle3PtDimension() : Command("TechDraw_NewAngle3PtDimension") @@ -996,7 +996,7 @@ bool CmdTechDrawNewAngle3PtDimension::isActive(void) // TechDraw_LinkDimension //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawLinkDimension); +DEF_STD_CMD_A(CmdTechDrawLinkDimension) CmdTechDrawLinkDimension::CmdTechDrawLinkDimension() : Command("TechDraw_LinkDimension") diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index 22f3fe02e4..e0107314f2 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -74,7 +74,7 @@ bool _checkSelectionHatch(Gui::Command* cmd); //// TechDraw_Leader ////=========================================================================== -//DEF_STD_CMD_A(CmdTechDrawLeaderLine); +//DEF_STD_CMD_A(CmdTechDrawLeaderLine) //CmdTechDrawLeaderLine::CmdTechDrawLeaderLine() // : Command("TechDraw_LeaderLine") @@ -134,7 +134,7 @@ bool _checkSelectionHatch(Gui::Command* cmd); //// TechDraw_RichAnno ////=========================================================================== -//DEF_STD_CMD_A(CmdTechDrawRichAnno); +//DEF_STD_CMD_A(CmdTechDrawRichAnno) //CmdTechDrawRichAnno::CmdTechDrawRichAnno() // : Command("TechDraw_RichAnno") @@ -193,7 +193,7 @@ bool _checkSelectionHatch(Gui::Command* cmd); // TechDraw_NewHatch //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewHatch); +DEF_STD_CMD_A(CmdTechDrawNewHatch) CmdTechDrawNewHatch::CmdTechDrawNewHatch() : Command("TechDraw_NewHatch") @@ -304,7 +304,7 @@ bool CmdTechDrawNewHatch::isActive(void) // TechDraw_NewGeomHatch //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewGeomHatch); +DEF_STD_CMD_A(CmdTechDrawNewGeomHatch) CmdTechDrawNewGeomHatch::CmdTechDrawNewGeomHatch() : Command("TechDraw_NewGeomHatch") @@ -374,7 +374,7 @@ bool CmdTechDrawNewGeomHatch::isActive(void) // TechDraw_Image //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawImage); +DEF_STD_CMD_A(CmdTechDrawImage) CmdTechDrawImage::CmdTechDrawImage() : Command("TechDraw_Image") @@ -426,7 +426,7 @@ bool CmdTechDrawImage::isActive(void) // TechDraw_ToggleFrame //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawToggleFrame); +DEF_STD_CMD_A(CmdTechDrawToggleFrame) CmdTechDrawToggleFrame::CmdTechDrawToggleFrame() : Command("TechDraw_ToggleFrame") @@ -473,7 +473,7 @@ bool CmdTechDrawToggleFrame::isActive(void) // TechDraw_Redraw //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawRedraw); +DEF_STD_CMD_A(CmdTechDrawRedraw) CmdTechDrawRedraw::CmdTechDrawRedraw() : Command("TechDraw_Redraw")