From bbe617614b01a4c34732f4ef3610caa9dec26988 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 25 Jul 2022 11:02:30 +0200 Subject: [PATCH] Robot: [skip ci] Fix several clazy issues: * Using copy-ctor but class KDL::Rotation has a trivial copy-ctor but non trivial assign operator [-Wclazy-rule-of-two-soft] * Maybe you meant to call ViewProviderGeometryObject::attach() instead [-Wclazy-skipped-base-method] * Missing emit keyword on signal call RobotGui::TaskTrajectory::axisChanged [-Wclazy-incorrect-emit] --- src/Mod/Robot/App/kdl_cp/frameacc.hpp | 1 + src/Mod/Robot/App/kdl_cp/frames.inl | 1 + src/Mod/Robot/App/kdl_cp/framevel.hpp | 1 + src/Mod/Robot/App/kdl_cp/path_circle.cpp | 1 + src/Mod/Robot/App/kdl_cp/path_line.cpp | 1 + src/Mod/Robot/Gui/TaskTrajectory.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderTrajectory.cpp | 2 +- 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Mod/Robot/App/kdl_cp/frameacc.hpp b/src/Mod/Robot/App/kdl_cp/frameacc.hpp index fd912c5a2e..afb3780d4d 100644 --- a/src/Mod/Robot/App/kdl_cp/frameacc.hpp +++ b/src/Mod/Robot/App/kdl_cp/frameacc.hpp @@ -25,6 +25,7 @@ * $Id: rrframes.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ +// clazy:excludeall=rule-of-two-soft #ifndef RRFRAMES_H #define RRFRAMES_H diff --git a/src/Mod/Robot/App/kdl_cp/frames.inl b/src/Mod/Robot/App/kdl_cp/frames.inl index d83e3aa69a..b3834e7ad7 100644 --- a/src/Mod/Robot/App/kdl_cp/frames.inl +++ b/src/Mod/Robot/App/kdl_cp/frames.inl @@ -24,6 +24,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ +// clazy:excludeall=rule-of-two-soft /** * \file frames.inl diff --git a/src/Mod/Robot/App/kdl_cp/framevel.hpp b/src/Mod/Robot/App/kdl_cp/framevel.hpp index 3cfa32a3cb..f9daf37980 100644 --- a/src/Mod/Robot/App/kdl_cp/framevel.hpp +++ b/src/Mod/Robot/App/kdl_cp/framevel.hpp @@ -19,6 +19,7 @@ * $Id: rframes.h,v 1.1.1.1 2002/08/26 14:14:21 rmoreas Exp $ * $Name: $ ****************************************************************************/ +// clazy:excludeall=rule-of-two-soft #ifndef KDL_FRAMEVEL_H #define KDL_FRAMEVEL_H diff --git a/src/Mod/Robot/App/kdl_cp/path_circle.cpp b/src/Mod/Robot/App/kdl_cp/path_circle.cpp index 5efd22bc80..e981df81ee 100644 --- a/src/Mod/Robot/App/kdl_cp/path_circle.cpp +++ b/src/Mod/Robot/App/kdl_cp/path_circle.cpp @@ -38,6 +38,7 @@ * $Id: path_circle.cpp,v 1.1.1.1.2.5 2003/07/24 13:26:15 psoetens Exp $ * $Name: $ ****************************************************************************/ +// clazy:excludeall=rule-of-two-soft #include "path_circle.hpp" diff --git a/src/Mod/Robot/App/kdl_cp/path_line.cpp b/src/Mod/Robot/App/kdl_cp/path_line.cpp index 789f5428db..1d14a91fc0 100644 --- a/src/Mod/Robot/App/kdl_cp/path_line.cpp +++ b/src/Mod/Robot/App/kdl_cp/path_line.cpp @@ -38,6 +38,7 @@ * $Id: path_line.cpp,v 1.1.1.1.2.3 2003/07/24 13:26:15 psoetens Exp $ * $Name: $ ****************************************************************************/ +// clazy:excludeall=rule-of-two-soft #include "path_line.hpp" diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp index a85420bbac..0a37843825 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp @@ -139,7 +139,7 @@ void TaskTrajectory::setTo(void) sim.setToTime(timePos); } ViewProv->setAxisTo(sim.Axis[0],sim.Axis[1],sim.Axis[2],sim.Axis[3],sim.Axis[4],sim.Axis[5],sim.Rob.getTcp()); - axisChanged(sim.Axis[0],sim.Axis[1],sim.Axis[2],sim.Axis[3],sim.Axis[4],sim.Axis[5],sim.Rob.getTcp()); + Q_EMIT axisChanged(sim.Axis[0],sim.Axis[1],sim.Axis[2],sim.Axis[3],sim.Axis[4],sim.Axis[5],sim.Rob.getTcp()); viewTool(sim.Rob.getTcp()); } diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index bf1d90f4ac..65a6877ac7 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -96,7 +96,7 @@ ViewProviderTrajectory::~ViewProviderTrajectory() void ViewProviderTrajectory::attach(App::DocumentObject *pcObj) { - ViewProviderDocumentObject::attach(pcObj); + ViewProviderGeometryObject::attach(pcObj); // Draw trajectory lines SoSeparator* linesep = new SoSeparator;