From 19faa4727d12f7656c26a374fd090512422fd975 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 19 Aug 2023 11:29:28 +0200 Subject: [PATCH] Robot: modernize C++: return braced init list --- src/Mod/Robot/App/RobotAlgos.h | 2 ++ src/Mod/Robot/App/RobotObjectPyImp.cpp | 2 +- src/Mod/Robot/App/Trajectory.cpp | 7 +++---- src/Mod/Robot/App/WaypointPyImp.cpp | 4 ++-- src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h index 1f24cdd0a0..173ea3c2b5 100644 --- a/src/Mod/Robot/App/RobotAlgos.h +++ b/src/Mod/Robot/App/RobotAlgos.h @@ -25,6 +25,8 @@ #include #include +#include +#include "kdl_cp/frames_io.hpp" namespace Robot diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp index 50fd855f4a..086685286f 100644 --- a/src/Mod/Robot/App/RobotObjectPyImp.cpp +++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp @@ -32,7 +32,7 @@ using namespace Robot; // returns a string which represents the object e.g. when printed in python std::string RobotObjectPy::representation() const { - return std::string(""); + return {""}; } diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index ca91490a1f..1b1d1ed7cc 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -119,10 +119,9 @@ double Trajectory::getDuration(int n) const Placement Trajectory::getPosition(double time)const { - if(pcTrajectory) + if (pcTrajectory) return Placement(toPlacement(pcTrajectory->Pos(time))); - else - return Placement(); + return {}; } double Trajectory::getVelocity(double time)const @@ -236,7 +235,7 @@ void Trajectory::generateTrajectory() std::string Trajectory::getUniqueWaypointName(const char *Name) const { if (!Name || *Name == '\0') - return std::string(); + return {}; // check for first character whether it's a digit std::string CleanName = Name; diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index 3f27fcaba1..7716b8c754 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -148,7 +148,7 @@ void WaypointPy::setVelocity(Py::Float arg) Py::String WaypointPy::getName() const { - return Py::String(getWaypointPtr()->Name.c_str()); + return {getWaypointPtr()->Name}; } void WaypointPy::setName(Py::String arg) @@ -202,7 +202,7 @@ void WaypointPy::setPos(Py::Object arg) Py::Boolean WaypointPy::getCont() const { - return Py::Boolean(getWaypointPtr()->Cont); + return {getWaypointPtr()->Cont}; } void WaypointPy::setCont(Py::Boolean arg) diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp index 7e6be66a0d..6d041db056 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp @@ -60,5 +60,5 @@ void ViewProviderTrajectoryCompound::unsetEdit(int) std::vector ViewProviderTrajectoryCompound::claimChildren()const { - return std::vector(static_cast(getObject())->Source.getValues()); + return static_cast(getObject())->Source.getValues(); }