diff --git a/src/Mod/Path/App/Command.h b/src/Mod/Path/App/Command.h
index a2cde1f8bc..bbd1301657 100644
--- a/src/Mod/Path/App/Command.h
+++ b/src/Mod/Path/App/Command.h
@@ -29,28 +29,29 @@
#include
#include
#include
+#include
namespace Path
{
/** The representation of a cnc command in a path */
class PathExport Command : public Base::Persistence
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
//constructors
Command();
Command(const char* name,
const std::map& parameters);
- ~Command();
+ ~Command() 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;
// specific methods
Base::Placement getPlacement (const Base::Vector3d pos = Base::Vector3d()) const; // returns a placement from the x,y,z,a,b,c parameters
- Base::Vector3d getCenter (void) const; // returns a 3d vector from the i,j,k parameters
+ Base::Vector3d getCenter () const; // returns a 3d vector from the i,j,k parameters
void setCenter(const Base::Vector3d&, bool clockwise=true); // sets the center coordinates and the command name
std::string toGCode (int precision=6, bool padzero=true) const; // returns a GCode string representation of the command
void setFromGCode (const std::string&); // sets the parameters from the contents of the given GCode string
diff --git a/src/Mod/Path/App/FeaturePath.h b/src/Mod/Path/App/FeaturePath.h
index 298077ffcd..a82a3b2884 100644
--- a/src/Mod/Path/App/FeaturePath.h
+++ b/src/Mod/Path/App/FeaturePath.h
@@ -35,29 +35,29 @@ namespace Path
class PathExport Feature : public App::GeoFeature
{
- PROPERTY_HEADER(Path::Feature);
+ PROPERTY_HEADER_WITH_OVERRIDE(Path::Feature);
public:
/// Constructor
- Feature(void);
- virtual ~Feature();
+ Feature();
+ ~Feature() override;
/// returns the type name of the ViewProvider
- virtual const char* getViewProviderName(void) const {
+ const char* getViewProviderName() const override {
return "PathGui::ViewProviderPath";
}
- 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;
PropertyPath Path;
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/Path/App/FeaturePathCompound.h b/src/Mod/Path/App/FeaturePathCompound.h
index 3fa2330bae..5345436116 100644
--- a/src/Mod/Path/App/FeaturePathCompound.h
+++ b/src/Mod/Path/App/FeaturePathCompound.h
@@ -33,21 +33,21 @@ namespace Path
class PathExport FeatureCompound : public Path::Feature
{
- PROPERTY_HEADER(Path::Feature);
+ PROPERTY_HEADER_WITH_OVERRIDE(Path::Feature);
public:
/// Constructor
- FeatureCompound(void);
- virtual ~FeatureCompound();
+ FeatureCompound();
+ ~FeatureCompound() override;
App::PropertyLinkList Group;
App::PropertyBool UsePlacements;
/// returns the type name of the ViewProvider
- virtual const char* getViewProviderName(void) const {
+ const char* getViewProviderName() const override {
return "PathGui::ViewProviderPathCompound";
}
- virtual App::DocumentObjectExecReturn *execute(void);
+ App::DocumentObjectExecReturn *execute() override;
/// Checks whether the object \a obj is part of this group.
bool hasObject(const DocumentObject* obj) const;
@@ -55,7 +55,7 @@ public:
void addObject(DocumentObject* obj);
/// Removes an object from this group.
void removeObject(DocumentObject* obj);
- virtual PyObject *getPyObject(void);
+ PyObject *getPyObject() override;
};
diff --git a/src/Mod/Path/App/FeaturePathShape.h b/src/Mod/Path/App/FeaturePathShape.h
index 6f995a45b9..2fa1101388 100644
--- a/src/Mod/Path/App/FeaturePathShape.h
+++ b/src/Mod/Path/App/FeaturePathShape.h
@@ -37,12 +37,12 @@ namespace Path
class PathExport FeatureShape : public Path::Feature
{
- PROPERTY_HEADER(Path::FeatureShape);
+ PROPERTY_HEADER_WITH_OVERRIDE(Path::FeatureShape);
public:
/// Constructor
FeatureShape();
- virtual ~FeatureShape();
+ ~FeatureShape() override;
// Part::PropertyPartShape Shape;
App::PropertyLinkList Sources;
@@ -52,17 +52,17 @@ public:
//@{
/// recalculate the feature
- virtual App::DocumentObjectExecReturn *execute();
+ App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
- virtual const char* getViewProviderName() const {
+ const char* getViewProviderName() const override {
return "PathGui::ViewProviderPathShape";
}
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/Path/App/Path.h b/src/Mod/Path/App/Path.h
index 28321f906d..e9b8264584 100644
--- a/src/Mod/Path/App/Path.h
+++ b/src/Mod/Path/App/Path.h
@@ -37,37 +37,37 @@ namespace Path
class PathExport Toolpath : public Base::Persistence
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
Toolpath();
Toolpath(const Toolpath&);
- ~Toolpath();
+ ~Toolpath() override;
Toolpath &operator=(const Toolpath&);
// from base class
- virtual unsigned int getMemSize (void) const;
- virtual void Save (Base::Writer &/*writer*/) const;
- virtual void Restore(Base::XMLReader &/*reader*/);
- void SaveDocFile (Base::Writer &writer) const;
- void RestoreDocFile(Base::Reader &reader);
+ unsigned int getMemSize () const override;
+ void Save (Base::Writer &/*writer*/) const override;
+ void Restore(Base::XMLReader &/*reader*/) override;
+ void SaveDocFile (Base::Writer &writer) const override;
+ void RestoreDocFile(Base::Reader &reader) override;
// interface
- void clear(void); // clears the internal data
+ void clear(); // clears the internal data
void addCommand(const Command &Cmd); // adds a command at the end
void insertCommand(const Command &Cmd, int); // inserts a command
void deleteCommand(int); // deletes a command
- double getLength(void); // return the Length (mm) of the Path
+ double getLength(); // return the Length (mm) of the Path
double getCycleTime(double, double, double, double); // return the Cycle Time (s) of the Path
- void recalculate(void); // recalculates the points
+ void recalculate(); // recalculates the points
void setFromGCode(const std::string); // sets the path from the contents of the given GCode string
- std::string toGCode(void) const; // gets a gcode string representation from the Path
- Base::BoundBox3d getBoundBox(void) const;
+ std::string toGCode() const; // gets a gcode string representation from the Path
+ Base::BoundBox3d getBoundBox() const;
// shortcut functions
- unsigned int getSize(void) const { return vpcCommands.size(); }
- const std::vector &getCommands(void) const { return vpcCommands; }
+ unsigned int getSize() const { return vpcCommands.size(); }
+ const std::vector &getCommands() const { return vpcCommands; }
const Command &getCommand(unsigned int pos) const { return *vpcCommands[pos]; }
// support for rotation
diff --git a/src/Mod/Path/App/PropertyPath.h b/src/Mod/Path/App/PropertyPath.h
index 16021ba43a..e34621c93e 100644
--- a/src/Mod/Path/App/PropertyPath.h
+++ b/src/Mod/Path/App/PropertyPath.h
@@ -34,36 +34,36 @@ namespace Path
/** The path property class. */
class PathExport PropertyPath : public App::Property
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyPath();
- ~PropertyPath();
+ ~PropertyPath() override;
/** @name Getter/setter */
//@{
/// set the part shape
void setValue(const Toolpath&);
/// get the part shape
- const Toolpath &getValue(void) const;
+ const Toolpath &getValue() const;
//@}
/** @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 SaveDocFile (Base::Writer &writer) const;
- void RestoreDocFile(Base::Reader &reader);
+ void Save (Base::Writer &writer) const override;
+ void Restore(Base::XMLReader &reader) override;
+ void SaveDocFile (Base::Writer &writer) const override;
+ void RestoreDocFile(Base::Reader &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/Path/App/Voronoi.h b/src/Mod/Path/App/Voronoi.h
index 98a8a8c779..48d0fa9578 100644
--- a/src/Mod/Path/App/Voronoi.h
+++ b/src/Mod/Path/App/Voronoi.h
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -43,12 +44,12 @@ namespace Path
class PathExport Voronoi
: public Base::BaseClass
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
//constructors
Voronoi();
- ~Voronoi();
+ ~Voronoi() override;
using color_type = std::size_t;
static const int InvalidIndex = INT_MAX;
diff --git a/src/Mod/Path/App/VoronoiCell.h b/src/Mod/Path/App/VoronoiCell.h
index da759b1204..bce5cb85f4 100644
--- a/src/Mod/Path/App/VoronoiCell.h
+++ b/src/Mod/Path/App/VoronoiCell.h
@@ -33,14 +33,14 @@ class Voronoi;
class PathExport VoronoiCell
: public Base::BaseClass
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
VoronoiCell(Voronoi::diagram_type *dia = nullptr, long index = Voronoi::InvalidIndex);
VoronoiCell(Voronoi::diagram_type *dia, const Voronoi::diagram_type::cell_type *cell);
- ~VoronoiCell();
+ ~VoronoiCell() override;
- bool isBound(void) const;
+ bool isBound() const;
Voronoi::point_type sourcePoint() const;
Voronoi::segment_type sourceSegment() const;
diff --git a/src/Mod/Path/App/VoronoiEdge.h b/src/Mod/Path/App/VoronoiEdge.h
index 7416853fac..30c4f2a910 100644
--- a/src/Mod/Path/App/VoronoiEdge.h
+++ b/src/Mod/Path/App/VoronoiEdge.h
@@ -35,14 +35,14 @@ class Voronoi;
class PathExport VoronoiEdge
: public Base::BaseClass
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
VoronoiEdge(Voronoi::diagram_type *dia = nullptr, long index = Voronoi::InvalidIndex);
VoronoiEdge(Voronoi::diagram_type *dia, const Voronoi::diagram_type::edge_type *edge);
- ~VoronoiEdge();
+ ~VoronoiEdge() override;
- bool isBound(void) const;
+ bool isBound() const;
Base::Reference dia;
long index;
diff --git a/src/Mod/Path/App/VoronoiVertex.h b/src/Mod/Path/App/VoronoiVertex.h
index fad9422267..fb83d87d08 100644
--- a/src/Mod/Path/App/VoronoiVertex.h
+++ b/src/Mod/Path/App/VoronoiVertex.h
@@ -35,14 +35,14 @@ class Voronoi;
class PathExport VoronoiVertex
: public Base::BaseClass
{
- TYPESYSTEM_HEADER();
+ TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
VoronoiVertex(Voronoi::diagram_type *dia = nullptr, long index = Voronoi::InvalidIndex);
VoronoiVertex(Voronoi::diagram_type *dia, const Voronoi::diagram_type::vertex_type *v);
- ~VoronoiVertex();
+ ~VoronoiVertex() override;
- bool isBound(void) const;
+ bool isBound() const;
Base::Reference dia;
long index;
diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/Path/Gui/TaskDlgPathCompound.h
index 0473b112ae..f3a19d5f75 100644
--- a/src/Mod/Path/Gui/TaskDlgPathCompound.h
+++ b/src/Mod/Path/Gui/TaskDlgPathCompound.h
@@ -60,22 +60,22 @@ class PathGuiExport TaskDlgPathCompound : public Gui::TaskView::TaskDialog
public:
TaskDlgPathCompound(PathGui::ViewProviderPathCompound *);
- ~TaskDlgPathCompound();
+ ~TaskDlgPathCompound() override;
public:
/// is called the TaskView when the dialog is opened
- virtual void open();
+ void open() override;
/// is called by the framework if an button is clicked which has no accept or rject role
- virtual void clicked(int);
+ void clicked(int) 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
+ virtual QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
protected:
diff --git a/src/Mod/Path/Gui/ViewProviderArea.h b/src/Mod/Path/Gui/ViewProviderArea.h
index 7da299d4b5..c96077acb6 100644
--- a/src/Mod/Path/Gui/ViewProviderArea.h
+++ b/src/Mod/Path/Gui/ViewProviderArea.h
@@ -25,30 +25,31 @@
#include
#include
+#include
namespace PathGui
{
class PathGuiExport ViewProviderArea : public PartGui::ViewProviderPlaneParametric
{
- PROPERTY_HEADER(PathGui::ViewProviderArea);
+ PROPERTY_HEADER_WITH_OVERRIDE(PathGui::ViewProviderArea);
public:
ViewProviderArea();
- virtual ~ViewProviderArea();
+ ~ViewProviderArea() override;
/// grouping handling
- virtual std::vector claimChildren(void) const;
- virtual void updateData(const App::Property*);
- virtual bool onDelete(const std::vector &);
+ std::vector claimChildren() const override;
+ void updateData(const App::Property*) override;
+ bool onDelete(const std::vector &) override;
/// drag and drop
- virtual bool canDragObjects() const;
- virtual bool canDragObject(App::DocumentObject*) const;
- virtual void dragObject(App::DocumentObject*);
- virtual bool canDropObjects() const;
- virtual bool canDropObject(App::DocumentObject*) const;
- virtual void dropObject(App::DocumentObject*);
+ bool canDragObjects() const override;
+ bool canDragObject(App::DocumentObject*) const override;
+ void dragObject(App::DocumentObject*) override;
+ bool canDropObjects() const override;
+ bool canDropObject(App::DocumentObject*) const override;
+ void dropObject(App::DocumentObject*) override;
};
using ViewProviderAreaPython = Gui::ViewProviderPythonFeatureT;
@@ -56,22 +57,22 @@ using ViewProviderAreaPython = Gui::ViewProviderPythonFeatureT
class PathGuiExport ViewProviderAreaView : public PartGui::ViewProviderPlaneParametric
{
- PROPERTY_HEADER(PathGui::ViewProviderAreaView);
+ PROPERTY_HEADER_WITH_OVERRIDE(PathGui::ViewProviderAreaView);
public:
ViewProviderAreaView();
- virtual ~ViewProviderAreaView();
- virtual std::vector claimChildren(void) const;
- virtual void updateData(const App::Property*);
- virtual bool onDelete(const std::vector &);
+ ~ViewProviderAreaView() override;
+ std::vector claimChildren(void) const override;
+ void updateData(const App::Property*) override;
+ bool onDelete(const std::vector &) override;
/// drag and drop
- virtual bool canDragObjects() const;
- virtual bool canDragObject(App::DocumentObject*) const;
- virtual void dragObject(App::DocumentObject*);
- virtual bool canDropObjects() const;
- virtual bool canDropObject(App::DocumentObject*) const;
- virtual void dropObject(App::DocumentObject*);
+ bool canDragObjects() const override;
+ bool canDragObject(App::DocumentObject*) const override;
+ void dragObject(App::DocumentObject*) override;
+ bool canDropObjects() const override;
+ bool canDropObject(App::DocumentObject*) const override;
+ void dropObject(App::DocumentObject*) override;
};
using ViewProviderAreaViewPython = Gui::ViewProviderPythonFeatureT;
diff --git a/src/Mod/Path/Gui/ViewProviderPath.h b/src/Mod/Path/Gui/ViewProviderPath.h
index 9b5b4c1762..8e3c8a01eb 100644
--- a/src/Mod/Path/Gui/ViewProviderPath.h
+++ b/src/Mod/Path/Gui/ViewProviderPath.h
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
class SoCoordinate3;
@@ -45,7 +46,7 @@ class PathSelectionObserver;
class PathGuiExport ViewProviderPath : public Gui::ViewProviderGeometryObject
{
- PROPERTY_HEADER(PathGui::ViewProviderPath);
+ PROPERTY_HEADER_WITH_OVERRIDE(PathGui::ViewProviderPath);
using inherited = ViewProviderGeometryObject;
public:
@@ -53,7 +54,7 @@ public:
ViewProviderPath();
/// destructor.
- ~ViewProviderPath();
+ ~ViewProviderPath() override;
// Display properties
App::PropertyInteger LineWidth;
@@ -67,29 +68,29 @@ public:
App::PropertyIntegerConstraint ShowCount;
App::PropertyIntegerConstraint::Constraints ShowCountConstraints;
- 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;
void recomputeBoundingBox();
- virtual QIcon getIcon() const;
+ virtual QIcon getIcon() const override;
- virtual bool useNewSelectionModel(void) const;
- virtual std::string getElement(const SoDetail *) const;
- SoDetail* getDetail(const char* subelement) const;
+ bool useNewSelectionModel() const override;
+ std::string getElement(const SoDetail *) const override;
+ SoDetail* getDetail(const char* subelement) const override;
void updateShowConstraints();
void updateVisual(bool rebuild = false);
void hideSelection();
- virtual void showBoundingBox(bool show);
+ void showBoundingBox(bool show) override;
friend class PathSelectionObserver;
protected:
- virtual void onChanged(const App::Property* prop);
- virtual unsigned long getBoundColor() const;
+ void onChanged(const App::Property* prop) override;
+ unsigned long getBoundColor() const override;
SoCoordinate3 * pcLineCoords;
SoCoordinate3 * pcMarkerCoords;
diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.h b/src/Mod/Path/Gui/ViewProviderPathCompound.h
index 0930cf8b8e..88471db0a8 100644
--- a/src/Mod/Path/Gui/ViewProviderPathCompound.h
+++ b/src/Mod/Path/Gui/ViewProviderPathCompound.h
@@ -31,20 +31,20 @@ namespace PathGui
class PathGuiExport ViewProviderPathCompound: public ViewProviderPath
{
- PROPERTY_HEADER(PathGui::ViewProviderPathCompound);
+ PROPERTY_HEADER_WITH_OVERRIDE(PathGui::ViewProviderPathCompound);
public:
- std::vector claimChildren(void)const;
- virtual bool canDragObjects() const;
- virtual void dragObject(App::DocumentObject*);
- virtual bool canDropObjects() const;
- virtual void dropObject(App::DocumentObject*);
- QIcon getIcon(void) const;
+ std::vector claimChildren() const override;
+ bool canDragObjects() const override;
+ void dragObject(App::DocumentObject*) override;
+ bool canDropObjects() const override;
+ void dropObject(App::DocumentObject*) override;
+ QIcon getIcon() 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/Path/Gui/ViewProviderPathShape.h b/src/Mod/Path/Gui/ViewProviderPathShape.h
index 8e60a3b7d8..4b83fa717f 100644
--- a/src/Mod/Path/Gui/ViewProviderPathShape.h
+++ b/src/Mod/Path/Gui/ViewProviderPathShape.h
@@ -31,24 +31,24 @@ namespace PathGui
class PathGuiExport ViewProviderPathShape: public ViewProviderPath
{
- PROPERTY_HEADER(PathGui::ViewProviderPathShape);
+ PROPERTY_HEADER_WITH_OVERRIDE(PathGui::ViewProviderPathShape);
public:
/// grouping handling
- virtual std::vector claimChildren(void) const;
- virtual void updateData(const App::Property*);
- virtual bool onDelete(const std::vector &);
+ std::vector claimChildren() const override;
+ void updateData(const App::Property*) override;
+ bool onDelete(const std::vector &) override;
/// drag and drop
- virtual bool canDragObjects() const;
- virtual bool canDragObject(App::DocumentObject*) const;
- virtual void dragObject(App::DocumentObject*);
- virtual bool canDropObjects() const;
- virtual bool canDropObject(App::DocumentObject*) const;
- virtual void dropObject(App::DocumentObject*);
+ bool canDragObjects() const override;
+ bool canDragObject(App::DocumentObject*) const override;
+ void dragObject(App::DocumentObject*) override;
+ bool canDropObjects() const override;
+ bool canDropObject(App::DocumentObject*) const override;
+ void dropObject(App::DocumentObject*) override;
- QIcon getIcon(void) const;
+ QIcon getIcon() const override;
};
} //namespace PathGui
diff --git a/src/Mod/Path/PathSimulator/App/PathSim.h b/src/Mod/Path/PathSimulator/App/PathSim.h
index 2b09a0b45f..5d056d89db 100644
--- a/src/Mod/Path/PathSimulator/App/PathSim.h
+++ b/src/Mod/Path/PathSimulator/App/PathSim.h
@@ -28,6 +28,7 @@
#include
#include
+#include
#include "VolSim.h"