Mod: Use override etc 2
This commit is contained in:
@@ -97,7 +97,7 @@ namespace Path {
|
||||
{
|
||||
initialize("Working with Voronoi diagrams and data structures");
|
||||
}
|
||||
virtual ~VoronoiModule() {}
|
||||
~VoronoiModule() override {}
|
||||
};
|
||||
|
||||
class Module : public Py::ExtensionModule<Module>
|
||||
@@ -144,7 +144,7 @@ namespace Path {
|
||||
PyModule_AddObject(m_module, "Voronoi", voronoi.module().ptr());
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -173,7 +173,7 @@ public:
|
||||
|
||||
Area(const AreaParams* params = nullptr);
|
||||
Area(const Area& other, bool deep_copy = true);
|
||||
virtual ~Area();
|
||||
~Area() override;
|
||||
|
||||
bool isBuilt() const;
|
||||
|
||||
|
||||
@@ -41,18 +41,18 @@ class PathExport FeatureArea : public Part::Feature
|
||||
public:
|
||||
/// Constructor
|
||||
FeatureArea();
|
||||
virtual ~FeatureArea();
|
||||
~FeatureArea() override;
|
||||
|
||||
Area &getArea();
|
||||
const std::vector<TopoDS_Shape> &getShapes();
|
||||
|
||||
/// returns the type name of the ViewProvider
|
||||
virtual const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PathGui::ViewProviderArea";
|
||||
}
|
||||
virtual App::DocumentObjectExecReturn *execute();
|
||||
virtual short mustExecute() const;
|
||||
virtual PyObject *getPyObject();
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
PyObject *getPyObject() override;
|
||||
|
||||
App::PropertyLinkList Sources;
|
||||
Part::PropertyPartShape WorkPlane;
|
||||
@@ -82,10 +82,10 @@ public:
|
||||
|
||||
std::list<TopoDS_Shape> getShapes();
|
||||
|
||||
virtual const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PathGui::ViewProviderAreaView";
|
||||
}
|
||||
virtual App::DocumentObjectExecReturn *execute();
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
|
||||
App::PropertyLink Source;
|
||||
App::PropertyInteger SectionIndex;
|
||||
|
||||
@@ -220,21 +220,21 @@ public:
|
||||
BoundBoxSegmentVisitor()
|
||||
{ }
|
||||
|
||||
virtual void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts)
|
||||
void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
|
||||
{
|
||||
(void)id;
|
||||
processPt(last);
|
||||
processPts(pts);
|
||||
processPt(next);
|
||||
}
|
||||
virtual void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts)
|
||||
void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
|
||||
{
|
||||
(void)id;
|
||||
processPt(last);
|
||||
processPts(pts);
|
||||
processPt(next);
|
||||
}
|
||||
virtual void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts, const Base::Vector3d ¢er)
|
||||
void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts, const Base::Vector3d ¢er) override
|
||||
{
|
||||
(void)id;
|
||||
(void)center;
|
||||
@@ -242,8 +242,8 @@ public:
|
||||
processPts(pts);
|
||||
processPt(next);
|
||||
}
|
||||
virtual void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts,
|
||||
const std::deque<Base::Vector3d> &p, const std::deque<Base::Vector3d> &q)
|
||||
void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts,
|
||||
const std::deque<Base::Vector3d> &p, const std::deque<Base::Vector3d> &q) override
|
||||
{
|
||||
(void)id;
|
||||
(void)q; // always within the bounds of p
|
||||
@@ -252,7 +252,7 @@ public:
|
||||
processPts(p);
|
||||
processPt(next);
|
||||
}
|
||||
virtual void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next)
|
||||
void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) override
|
||||
{
|
||||
(void)id;
|
||||
processPt(last);
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
initialize("This module is the PathGui module."); // register with Python
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
Py::Object open(const Py::Tuple& args)
|
||||
|
||||
@@ -37,12 +37,12 @@ class DlgProcessorChooser : public QDialog
|
||||
|
||||
public:
|
||||
DlgProcessorChooser(std::vector<std::string> &scriptnames, bool withArguments = false);
|
||||
~DlgProcessorChooser();
|
||||
~DlgProcessorChooser() override;
|
||||
|
||||
std::string getProcessor();
|
||||
std::string getArguments();
|
||||
|
||||
void accept();
|
||||
void accept() override;
|
||||
|
||||
protected Q_SLOTS:
|
||||
|
||||
|
||||
@@ -36,13 +36,13 @@ class DlgSettingsPathColor : public Gui::Dialog::PreferencePage
|
||||
|
||||
public:
|
||||
DlgSettingsPathColor(QWidget* parent = nullptr);
|
||||
~DlgSettingsPathColor();
|
||||
~DlgSettingsPathColor() override;
|
||||
|
||||
void saveSettings();
|
||||
void loadSettings();
|
||||
void saveSettings() override;
|
||||
void loadSettings() override;
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
void changeEvent(QEvent *e) override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<Ui_DlgSettingsPathColor> ui;
|
||||
|
||||
@@ -42,12 +42,12 @@ class TaskWidgetPathCompound : public Gui::TaskView::TaskBox
|
||||
|
||||
public:
|
||||
TaskWidgetPathCompound(ViewProviderPathCompound *CompoundView, QWidget *parent=nullptr);
|
||||
~TaskWidgetPathCompound();
|
||||
~TaskWidgetPathCompound() override;
|
||||
|
||||
std::vector<std::string> getList() const;
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
void changeEvent(QEvent *e) override;
|
||||
|
||||
private:
|
||||
QWidget* proxy;
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) {
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override {
|
||||
if(msg.Type == Gui::SelectionChanges::RmvPreselect) {
|
||||
setArrow();
|
||||
return;
|
||||
@@ -492,33 +492,33 @@ public:
|
||||
command2Edge.resize(tp.getSize(),-1);
|
||||
}
|
||||
|
||||
virtual void setup(const Base::Vector3d &last)
|
||||
void setup(const Base::Vector3d &last) override
|
||||
{
|
||||
points.push_back(last);
|
||||
markers.push_back(last);
|
||||
}
|
||||
|
||||
virtual void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts)
|
||||
void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
|
||||
{
|
||||
(void)last;
|
||||
gx(id, &next, pts, 0);
|
||||
}
|
||||
|
||||
virtual void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts)
|
||||
void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
|
||||
{
|
||||
(void)last;
|
||||
gx(id, &next, pts, 1);
|
||||
}
|
||||
|
||||
virtual void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts, const Base::Vector3d ¢er)
|
||||
void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts, const Base::Vector3d ¢er) override
|
||||
{
|
||||
(void)last;
|
||||
gx(id, &next, pts, 1);
|
||||
markers.push_back(center);
|
||||
}
|
||||
|
||||
virtual void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts,
|
||||
const std::deque<Base::Vector3d> &p, const std::deque<Base::Vector3d> &q)
|
||||
void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts,
|
||||
const std::deque<Base::Vector3d> &p, const std::deque<Base::Vector3d> &q) override
|
||||
{
|
||||
(void)last;
|
||||
|
||||
@@ -547,7 +547,7 @@ public:
|
||||
pushCommand(id);
|
||||
}
|
||||
|
||||
virtual void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next)
|
||||
void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) override
|
||||
{
|
||||
#if 0
|
||||
Base::Vector3d p1(next.x,next.y,last.z);
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
initialize("This module is the PathSimulator module."); // register with Python
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user