From ccca592c04feb0ba37b8c2bce11d4e34d4919613 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 4 Aug 2023 01:42:56 +0200 Subject: [PATCH] Robot: modernize C++: use override --- src/Mod/Robot/App/Edge2TracObject.h | 12 +++++------ src/Mod/Robot/App/PropertyTrajectory.h | 20 +++++++++---------- src/Mod/Robot/App/Trajectory.h | 16 +++++++-------- src/Mod/Robot/App/TrajectoryCompound.h | 10 +++++----- src/Mod/Robot/App/TrajectoryDressUpObject.h | 12 +++++------ src/Mod/Robot/App/TrajectoryObject.h | 20 +++++++++---------- src/Mod/Robot/App/Waypoint.h | 11 +++++----- src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h | 12 +++++------ .../Robot/Gui/ViewProviderEdge2TracObject.h | 8 ++++---- src/Mod/Robot/Gui/ViewProviderRobotObject.h | 19 +++++++++--------- src/Mod/Robot/Gui/ViewProviderTrajectory.h | 15 +++++++------- .../Gui/ViewProviderTrajectoryCompound.h | 9 ++++----- .../Robot/Gui/ViewProviderTrajectoryDressUp.h | 8 ++++---- src/Mod/Robot/Gui/Workbench.h | 13 ++++++------ 14 files changed, 94 insertions(+), 91 deletions(-) diff --git a/src/Mod/Robot/App/Edge2TracObject.h b/src/Mod/Robot/App/Edge2TracObject.h index c440dd8d90..5affa6b52b 100644 --- a/src/Mod/Robot/App/Edge2TracObject.h +++ b/src/Mod/Robot/App/Edge2TracObject.h @@ -33,12 +33,12 @@ namespace Robot class RobotExport Edge2TracObject : public TrajectoryObject { - PROPERTY_HEADER(Robot::TrajectoryObject); + PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject); public: /// Constructor - Edge2TracObject(void); - virtual ~Edge2TracObject(); + Edge2TracObject(); + ~Edge2TracObject() override; App::PropertyLinkSub Source; App::PropertyFloatConstraint SegValue; @@ -50,14 +50,14 @@ public: int NbrOfEdges; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName() const override { return "RobotGui::ViewProviderEdge2TracObject"; } - virtual App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute() override; protected: /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; }; diff --git a/src/Mod/Robot/App/PropertyTrajectory.h b/src/Mod/Robot/App/PropertyTrajectory.h index 7d2c0283d7..8e5eba9cb0 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.h +++ b/src/Mod/Robot/App/PropertyTrajectory.h @@ -37,18 +37,18 @@ namespace Robot */ class RobotExport PropertyTrajectory : public App::Property { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: PropertyTrajectory(); - ~PropertyTrajectory(); + ~PropertyTrajectory() override; /** @name Getter/setter */ //@{ /// set the part shape void setValue(const Trajectory&); /// get the part shape - const Trajectory &getValue(void) const; + const Trajectory &getValue() const; //@} @@ -60,18 +60,18 @@ public: /** @name Python interface */ //@{ - PyObject* getPyObject(void); - void setPyObject(PyObject *value); + PyObject* getPyObject() override; + void setPyObject(PyObject *value) override; //@} /** @name Save/restore */ //@{ - void Save (Base::Writer &writer) const; - void Restore(Base::XMLReader &reader); + void Save (Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - App::Property *Copy(void) const; - void Paste(const App::Property &from); - unsigned int getMemSize (void) const; + App::Property *Copy() const override; + void Paste(const App::Property &from) override; + unsigned int getMemSize () const override; //@} private: diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h index d5db4e234b..b115a67029 100644 --- a/src/Mod/Robot/App/Trajectory.h +++ b/src/Mod/Robot/App/Trajectory.h @@ -41,27 +41,27 @@ namespace Robot */ class RobotExport Trajectory : public Base::Persistence { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: Trajectory(); Trajectory(const Trajectory&); - ~Trajectory(); + ~Trajectory() override; Trajectory &operator=(const Trajectory&); // from base class - virtual unsigned int getMemSize (void) const; - virtual void Save (Base::Writer &/*writer*/) const; - virtual void Restore(Base::XMLReader &/*reader*/); + unsigned int getMemSize () const override; + void Save (Base::Writer &/*writer*/) const override; + void Restore(Base::XMLReader &/*reader*/) override; // interface - void generateTrajectory(void); + void generateTrajectory(); void addWaypoint(const Waypoint &WPnt); - unsigned int getSize(void) const{return vpcWaypoints.size();} + unsigned int getSize() const{return vpcWaypoints.size();} const Waypoint &getWaypoint(unsigned int pos)const {return *vpcWaypoints[pos];} std::string getUniqueWaypointName(const char *Name) const; - const std::vector &getWaypoints(void)const{return vpcWaypoints;} + const std::vector &getWaypoints()const{return vpcWaypoints;} /// delete the last n waypoints void deleteLast(unsigned int n=1); diff --git a/src/Mod/Robot/App/TrajectoryCompound.h b/src/Mod/Robot/App/TrajectoryCompound.h index 6de01b0807..52eb60421a 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.h +++ b/src/Mod/Robot/App/TrajectoryCompound.h @@ -33,20 +33,20 @@ namespace Robot class RobotExport TrajectoryCompound : public TrajectoryObject { - PROPERTY_HEADER(Robot::TrajectoryObject); + PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject); public: /// Constructor - TrajectoryCompound(void); - virtual ~TrajectoryCompound(); + TrajectoryCompound(); + ~TrajectoryCompound() override; App::PropertyLinkList Source; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName() const override { return "RobotGui::ViewProviderTrajectoryCompound"; } - virtual App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute() override; protected: /// get called by the container when a property has changed diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.h b/src/Mod/Robot/App/TrajectoryDressUpObject.h index 82b8590d85..b68773bdc9 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.h +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.h @@ -34,12 +34,12 @@ namespace Robot class RobotExport TrajectoryDressUpObject : public TrajectoryObject { - PROPERTY_HEADER(Robot::TrajectoryObject); + PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject); public: /// Constructor - TrajectoryDressUpObject(void); - virtual ~TrajectoryDressUpObject(); + TrajectoryDressUpObject(); + ~TrajectoryDressUpObject() override; App::PropertyLink Source; App::PropertySpeed Speed; @@ -52,17 +52,17 @@ public: /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName() const override { return "RobotGui::ViewProviderTrajectoryDressUp"; } - virtual App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute() override; static const char* ContTypeEnums[]; static const char* AddTypeEnums[]; protected: /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; }; diff --git a/src/Mod/Robot/App/TrajectoryObject.h b/src/Mod/Robot/App/TrajectoryObject.h index 0a22e22e60..6184cbdf61 100644 --- a/src/Mod/Robot/App/TrajectoryObject.h +++ b/src/Mod/Robot/App/TrajectoryObject.h @@ -35,30 +35,30 @@ namespace Robot class RobotExport TrajectoryObject : public App::GeoFeature { - PROPERTY_HEADER(Robot::TrajectoryObject); + PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject); public: /// Constructor - TrajectoryObject(void); - virtual ~TrajectoryObject(); + TrajectoryObject(); + ~TrajectoryObject() override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { + const char* getViewProviderName() const override { return "RobotGui::ViewProviderTrajectory"; } - virtual App::DocumentObjectExecReturn *execute(void) { + App::DocumentObjectExecReturn *execute() override { return App::DocumentObject::StdReturn; } - virtual short mustExecute(void) const; - virtual PyObject *getPyObject(void); + short mustExecute() const override; + PyObject *getPyObject() override; - App::PropertyPlacement Base; - PropertyTrajectory Trajectory; + App::PropertyPlacement Base; + PropertyTrajectory Trajectory; protected: /// get called by the container when a property has changed - virtual void onChanged (const App::Property* prop); + void onChanged (const App::Property* prop) override; }; diff --git a/src/Mod/Robot/App/Waypoint.h b/src/Mod/Robot/App/Waypoint.h index 0c822aa2d3..7f0f4be145 100644 --- a/src/Mod/Robot/App/Waypoint.h +++ b/src/Mod/Robot/App/Waypoint.h @@ -25,6 +25,7 @@ #include #include +#include namespace Robot @@ -34,7 +35,7 @@ namespace Robot */ class RobotExport Waypoint : public Base::Persistence { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: enum WaypointType { @@ -55,12 +56,12 @@ public: unsigned int tool = 0, unsigned int base = 0); - ~Waypoint(); + ~Waypoint() override; // from base class - virtual unsigned int getMemSize(void) const; - virtual void Save(Base::Writer& /*writer*/) const; - virtual void Restore(Base::XMLReader& /*reader*/); + unsigned int getMemSize() const override; + void Save(Base::Writer& /*writer*/) const override; + void Restore(Base::XMLReader& /*reader*/) override; std::string Name; diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h index 81b073e339..8c33ac523b 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h @@ -39,20 +39,20 @@ class RobotGuiExport TaskDlgTrajectoryCompound : public Gui::TaskView::TaskDialo public: TaskDlgTrajectoryCompound(Robot::TrajectoryCompound *); - ~TaskDlgTrajectoryCompound(); + ~TaskDlgTrajectoryCompound() override; public: /// is called the TaskView when the dialog is opened - virtual void open(); + void open() override; /// is called by the framework if the dialog is accepted (Ok) - virtual bool accept(); + bool accept() override; /// is called by the framework if the dialog is rejected (Cancel) - virtual bool reject(); + bool reject() override; /// is called by the framework if the user press the help button - virtual void helpRequested(); + void helpRequested() override; /// returns for Close and Help button - virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h index b16dfe988f..a2d60dd5fa 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h @@ -31,13 +31,13 @@ namespace RobotGui class RobotGuiExport ViewProviderEdge2TracObject : public ViewProviderTrajectory { - PROPERTY_HEADER(RobotGui::ViewProviderEdge2TracObject); + PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderEdge2TracObject); public: - virtual bool doubleClicked(void); + bool doubleClicked() override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h index d4e4366c13..d082463b99 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h @@ -27,6 +27,7 @@ #include #include #include +#include class SoDragger; @@ -38,23 +39,23 @@ namespace RobotGui class RobotGuiExport ViewProviderRobotObject : public Gui::ViewProviderGeometryObject { - PROPERTY_HEADER(RobotGui::ViewProviderRobotObject); + PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderRobotObject); public: /// constructor. ViewProviderRobotObject(); /// destructor. - ~ViewProviderRobotObject(); + ~ViewProviderRobotObject() override; App::PropertyBool Manipulator; - void attach(App::DocumentObject *pcObject); - void setDisplayMode(const char* ModeName); - std::vector getDisplayModes() const; - void updateData(const App::Property*); + void attach(App::DocumentObject *pcObject) override; + void setDisplayMode(const char* ModeName) override; + std::vector getDisplayModes() const override; + void updateData(const App::Property*) override; - virtual void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; /// for simulation without changing the document: void setAxisTo(float A1,float A2,float A3,float A4,float A5,float A6,const Base::Placement &Tcp); @@ -63,8 +64,8 @@ protected: static void sDraggerMotionCallback(void *data, SoDragger *dragger); void DraggerMotionCallback(SoDragger *dragger); - void setDragger(void); - void resetDragger(void); + void setDragger(); + void resetDragger(); Gui::SoFCSelection * pcRobotRoot; Gui::SoFCSelection * pcSimpleRoot; diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.h b/src/Mod/Robot/Gui/ViewProviderTrajectory.h index f40d974546..d7f903883f 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.h @@ -25,6 +25,7 @@ #include #include +#include class SoCoordinate3; @@ -38,20 +39,20 @@ namespace RobotGui class RobotGuiExport ViewProviderTrajectory : public Gui::ViewProviderGeometryObject { - PROPERTY_HEADER(RobotGui::ViewProviderTrajectory); + PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectory); public: /// constructor. ViewProviderTrajectory(); /// destructor. - ~ViewProviderTrajectory(); + ~ViewProviderTrajectory() override; - void attach(App::DocumentObject *pcObject); - void setDisplayMode(const char* ModeName); - std::vector getDisplayModes() const; - void updateData(const App::Property*); - void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); + void attach(App::DocumentObject *pcObject) override; + void setDisplayMode(const char* ModeName) override; + std::vector getDisplayModes() const override; + void updateData(const App::Property*) override; + void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; protected: diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h index 0bff0a50be..504aa7621f 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h @@ -31,16 +31,15 @@ namespace RobotGui class RobotGuiExport ViewProviderTrajectoryCompound: public ViewProviderTrajectory { - PROPERTY_HEADER(RobotGui::ViewProviderTrajectoryCompound); + PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectoryCompound); public: - /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren() const override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h index 824e8b488e..5b14899a7b 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h @@ -31,17 +31,17 @@ namespace RobotGui class RobotGuiExport ViewProviderTrajectoryDressUp : public ViewProviderTrajectory { - PROPERTY_HEADER(RobotGui::ViewProviderTrajectoryDressUp); + PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectoryDressUp); public: //virtual bool doubleClicked(void); /// grouping handling - std::vector claimChildren(void)const; + std::vector claimChildren() const override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + bool setEdit(int ModNum) override; + void unsetEdit(int ModNum) override; }; diff --git a/src/Mod/Robot/Gui/Workbench.h b/src/Mod/Robot/Gui/Workbench.h index 24c224a6be..6aa96a2345 100644 --- a/src/Mod/Robot/Gui/Workbench.h +++ b/src/Mod/Robot/Gui/Workbench.h @@ -25,6 +25,7 @@ #include #include +#include namespace RobotGui { @@ -34,21 +35,21 @@ namespace RobotGui { */ class RobotGuiExport Workbench : public Gui::StdWorkbench { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; /** Run some actions when the workbench gets activated. */ - virtual void activated(); + void activated() override; /** Run some actions when the workbench gets deactivated. */ - virtual void deactivated(); + void deactivated() override; protected: - Gui::ToolBarItem* setupToolBars() const; - Gui::MenuItem* setupMenuBar() const; + Gui::ToolBarItem* setupToolBars() const override; + Gui::MenuItem* setupMenuBar() const override; std::vector Watcher; };