From 18cffaf2067374629f8734d6c3d2ad8a2d7fb8dd Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Aug 2023 17:24:15 +0200 Subject: [PATCH] Robot: modernize C++: use default member init --- src/Mod/Robot/App/RobotObject.cpp | 1 - src/Mod/Robot/App/RobotObject.h | 2 +- src/Mod/Robot/App/Simulation.cpp | 2 +- src/Mod/Robot/App/Simulation.h | 6 +++--- src/Mod/Robot/App/Trajectory.cpp | 6 +----- src/Mod/Robot/App/Trajectory.h | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 1 - src/Mod/Robot/Gui/ViewProviderRobotObject.h | 4 ++-- 8 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Mod/Robot/App/RobotObject.cpp b/src/Mod/Robot/App/RobotObject.cpp index 11417a1c54..4b332a3dc3 100644 --- a/src/Mod/Robot/App/RobotObject.cpp +++ b/src/Mod/Robot/App/RobotObject.cpp @@ -37,7 +37,6 @@ PROPERTY_SOURCE(Robot::RobotObject, App::GeoFeature) RobotObject::RobotObject() -:block(false) { ADD_PROPERTY_TYPE(RobotVrmlFile ,(nullptr),"Robot definition" ,Prop_None,"Included file with the VRML representation of the robot"); ADD_PROPERTY_TYPE(RobotKinematicFile,(nullptr),"Robot definition",Prop_None,"Included file with kinematic definition of the robot Axis"); diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index ae146bca3f..791eb7eb12 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -76,7 +76,7 @@ protected: Robot6Axis robot; - bool block; + bool block{false}; }; diff --git a/src/Mod/Robot/App/Simulation.cpp b/src/Mod/Robot/App/Simulation.cpp index 7b2292dcb5..16ff7e3246 100644 --- a/src/Mod/Robot/App/Simulation.cpp +++ b/src/Mod/Robot/App/Simulation.cpp @@ -34,7 +34,7 @@ using namespace KDL; //=========================================================================== Simulation::Simulation(const Robot::Trajectory &Trac,Robot::Robot6Axis &Rob) -:Pos(0.0),Trac(Trac),Rob(Rob) +:Trac(Trac),Rob(Rob) { // simulate a trajectory with only one waypoint make no sense! assert(Trac.getSize() > 1); diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h index 6f27994087..ac3ee59e8b 100644 --- a/src/Mod/Robot/App/Simulation.h +++ b/src/Mod/Robot/App/Simulation.h @@ -54,9 +54,9 @@ public: // apply the start axis angles and set to time 0. Restores the exact start position void reset(); - double Pos; - double Axis[6]; - double startAxis[6]; + double Pos{0.0}; + double Axis[6]{}; + double startAxis[6]{}; Trajectory Trac; Robot6Axis &Rob; diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index 1b1d1ed7cc..6b48567373 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -58,11 +58,7 @@ using namespace Base; TYPESYSTEM_SOURCE(Robot::Trajectory , Base::Persistence) -Trajectory::Trajectory() -:pcTrajectory(nullptr) -{ - -} +Trajectory::Trajectory() = default; Trajectory::Trajectory(const Trajectory& Trac) :vpcWaypoints(Trac.vpcWaypoints.size()),pcTrajectory(nullptr) diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h index b115a67029..1e6c7d56cc 100644 --- a/src/Mod/Robot/App/Trajectory.h +++ b/src/Mod/Robot/App/Trajectory.h @@ -77,7 +77,7 @@ protected: std::vector vpcWaypoints; - KDL::Trajectory_Composite *pcTrajectory; + KDL::Trajectory_Composite *pcTrajectory{nullptr}; }; } //namespace Part diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index 5db94b8567..900e701f0a 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -49,7 +49,6 @@ using namespace RobotGui; PROPERTY_SOURCE(RobotGui::ViewProviderRobotObject, Gui::ViewProviderGeometryObject) ViewProviderRobotObject::ViewProviderRobotObject() - : pcDragger(nullptr),toolShape(nullptr) { ADD_PROPERTY(Manipulator,(0)); diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h index d082463b99..fc8e294be9 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h @@ -75,10 +75,10 @@ protected: //SoTransform * pcTcpTransform; //SoTrackballDragger * pcDragger; - SoJackDragger * pcDragger; + SoJackDragger * pcDragger{nullptr}; // view provider of the toolshape if set - Gui::ViewProvider *toolShape; + Gui::ViewProvider *toolShape{nullptr}; // Pointers to the robot axis nodes in the VRML model SoVRMLTransform *Axis1Node;