Mod: Use override etc 2
This commit is contained in:
@@ -44,7 +44,7 @@ public:
|
||||
initialize("This module is the Surface module."); // register with Python
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
@@ -42,8 +42,8 @@ public:
|
||||
App::PropertyLinkSubList ShapeList; //Shapes to be cut.
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
// const char* getViewProviderName(void) const {
|
||||
// return "SurfaceGui::ViewProviderCut";
|
||||
|
||||
@@ -38,7 +38,7 @@ class SurfaceExport Extend : public Part::Spline
|
||||
|
||||
public:
|
||||
Extend();
|
||||
~Extend();
|
||||
~Extend() override;
|
||||
|
||||
App::PropertyLinkSub Face;
|
||||
App::PropertyFloatConstraint Tolerance;
|
||||
@@ -60,8 +60,8 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual void onChanged(const App::Property* prop) override;
|
||||
virtual void handleChangedPropertyName(Base::XMLReader &reader,
|
||||
void onChanged(const App::Property* prop) override;
|
||||
void handleChangedPropertyName(Base::XMLReader &reader,
|
||||
const char * TypeName,
|
||||
const char *PropName) override;
|
||||
|
||||
|
||||
@@ -66,10 +66,10 @@ public:
|
||||
App::PropertyInteger MaximumSegments; //Maximum number of segments
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "SurfaceGui::ViewProviderFilling";
|
||||
}
|
||||
|
||||
|
||||
@@ -68,12 +68,12 @@ public:
|
||||
App::PropertyBoolList ReversedList; // Booleans to handle orientation of the curves
|
||||
App::PropertyEnumeration FillType; // Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
|
||||
|
||||
short mustExecute() const;
|
||||
void onChanged(const App::Property*);
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const override;
|
||||
void onChanged(const App::Property*) override;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "SurfaceGui::ViewProviderGeomFillSurface";
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ class SurfaceExport Sections : public Part::Spline
|
||||
|
||||
public:
|
||||
Sections();
|
||||
~Sections();
|
||||
~Sections() override;
|
||||
|
||||
App::PropertyLinkSubList NSections;
|
||||
|
||||
|
||||
@@ -48,8 +48,8 @@ public:
|
||||
App::PropertyBool Nonmanifold; //Option for non-manifold processing
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
};
|
||||
|
||||
}//Namespace Surface
|
||||
|
||||
@@ -48,7 +48,7 @@ public:
|
||||
initialize("This module is the SurfaceGui module."); // register with Python
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
@@ -189,14 +189,14 @@ public:
|
||||
, editedObject(editedObject)
|
||||
{
|
||||
}
|
||||
~ShapeSelection()
|
||||
~ShapeSelection() override
|
||||
{
|
||||
mode = FillingPanel::None;
|
||||
}
|
||||
/**
|
||||
* Allow the user to pick only edges.
|
||||
*/
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName)
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override
|
||||
{
|
||||
// don't allow references to itself
|
||||
if (pObj == editedObject)
|
||||
|
||||
@@ -47,10 +47,10 @@ class ViewProviderFilling : public PartGui::ViewProviderSpline
|
||||
|
||||
public:
|
||||
enum ShapeType {Vertex, Edge, Face};
|
||||
virtual void setupContextMenu(QMenu*, QObject*, const char*);
|
||||
virtual bool setEdit(int ModNum);
|
||||
virtual void unsetEdit(int ModNum);
|
||||
QIcon getIcon() const;
|
||||
void setupContextMenu(QMenu*, QObject*, const char*) override;
|
||||
bool setEdit(int ModNum) override;
|
||||
void unsetEdit(int ModNum) override;
|
||||
QIcon getIcon() const override;
|
||||
void highlightReferences(ShapeType type, const References& refs, bool on);
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@ private:
|
||||
|
||||
public:
|
||||
FillingPanel(ViewProviderFilling* vp, Surface::Filling* obj);
|
||||
~FillingPanel();
|
||||
~FillingPanel() override;
|
||||
|
||||
void open();
|
||||
void checkOpenCommand();
|
||||
@@ -82,14 +82,14 @@ public:
|
||||
void setEditedObject(Surface::Filling* obj);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
||||
/** Notifies on undo */
|
||||
virtual void slotUndoDocument(const Gui::Document& Doc);
|
||||
void slotUndoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies on redo */
|
||||
virtual void slotRedoDocument(const Gui::Document& Doc);
|
||||
void slotRedoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies when the object is about to be removed. */
|
||||
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
|
||||
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
|
||||
void modifyBoundary(bool);
|
||||
|
||||
private Q_SLOTS:
|
||||
@@ -111,16 +111,16 @@ class TaskFilling : public Gui::TaskView::TaskDialog
|
||||
|
||||
public:
|
||||
TaskFilling(ViewProviderFilling* vp, Surface::Filling* obj);
|
||||
~TaskFilling();
|
||||
~TaskFilling() override;
|
||||
void setEditedObject(Surface::Filling* obj);
|
||||
|
||||
public:
|
||||
void open();
|
||||
void closed();
|
||||
bool accept();
|
||||
bool reject();
|
||||
void open() override;
|
||||
void closed() override;
|
||||
bool accept() override;
|
||||
bool reject() override;
|
||||
|
||||
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
|
||||
QDialogButtonBox::StandardButtons getStandardButtons() const override
|
||||
{ return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; }
|
||||
|
||||
private:
|
||||
|
||||
@@ -61,14 +61,14 @@ public:
|
||||
, editedObject(editedObject)
|
||||
{
|
||||
}
|
||||
~ShapeSelection()
|
||||
~ShapeSelection() override
|
||||
{
|
||||
mode = FillingEdgePanel::None;
|
||||
}
|
||||
/**
|
||||
* Allow the user to pick only edges.
|
||||
*/
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName)
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override
|
||||
{
|
||||
// don't allow references to itself
|
||||
if (pObj == editedObject)
|
||||
|
||||
@@ -59,7 +59,7 @@ private:
|
||||
|
||||
public:
|
||||
FillingEdgePanel(ViewProviderFilling* vp, Surface::Filling* obj);
|
||||
~FillingEdgePanel();
|
||||
~FillingEdgePanel() override;
|
||||
|
||||
void open();
|
||||
void checkOpenCommand();
|
||||
@@ -68,14 +68,14 @@ public:
|
||||
void setEditedObject(Surface::Filling* obj);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
||||
/** Notifies on undo */
|
||||
virtual void slotUndoDocument(const Gui::Document& Doc);
|
||||
void slotUndoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies on redo */
|
||||
virtual void slotRedoDocument(const Gui::Document& Doc);
|
||||
void slotRedoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies when the object is about to be removed. */
|
||||
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
|
||||
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
|
||||
void modifyBoundary(bool);
|
||||
|
||||
private Q_SLOTS:
|
||||
|
||||
@@ -60,14 +60,14 @@ public:
|
||||
, editedObject(editedObject)
|
||||
{
|
||||
}
|
||||
~VertexSelection()
|
||||
~VertexSelection() override
|
||||
{
|
||||
mode = FillingVertexPanel::None;
|
||||
}
|
||||
/**
|
||||
* Allow the user to pick only edges.
|
||||
*/
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName)
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override
|
||||
{
|
||||
// don't allow references to itself
|
||||
if (pObj == editedObject)
|
||||
|
||||
@@ -58,7 +58,7 @@ private:
|
||||
|
||||
public:
|
||||
FillingVertexPanel(ViewProviderFilling* vp, Surface::Filling* obj);
|
||||
~FillingVertexPanel();
|
||||
~FillingVertexPanel() override;
|
||||
|
||||
void open();
|
||||
void reject();
|
||||
@@ -66,14 +66,14 @@ public:
|
||||
void setEditedObject(Surface::Filling* obj);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
||||
/** Notifies on undo */
|
||||
virtual void slotUndoDocument(const Gui::Document& Doc);
|
||||
void slotUndoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies on redo */
|
||||
virtual void slotRedoDocument(const Gui::Document& Doc);
|
||||
void slotRedoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies when the object is about to be removed. */
|
||||
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
|
||||
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
|
||||
|
||||
private Q_SLOTS:
|
||||
void on_buttonVertexAdd_clicked();
|
||||
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
/**
|
||||
* Allow the user to pick only edges.
|
||||
*/
|
||||
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName);
|
||||
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override;
|
||||
|
||||
private:
|
||||
bool appendEdges;
|
||||
|
||||
@@ -43,10 +43,10 @@ class ViewProviderGeomFillSurface : public PartGui::ViewProviderSpline
|
||||
{
|
||||
PROPERTY_HEADER(SurfaceGui::ViewProviderGeomFillSurface);
|
||||
public:
|
||||
virtual void setupContextMenu(QMenu*, QObject*, const char*);
|
||||
virtual bool setEdit(int ModNum);
|
||||
virtual void unsetEdit(int ModNum);
|
||||
QIcon getIcon() const;
|
||||
void setupContextMenu(QMenu*, QObject*, const char*) override;
|
||||
bool setEdit(int ModNum) override;
|
||||
void unsetEdit(int ModNum) override;
|
||||
QIcon getIcon() const override;
|
||||
void highlightReferences(bool on);
|
||||
};
|
||||
|
||||
@@ -69,7 +69,7 @@ private:
|
||||
|
||||
public:
|
||||
GeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj);
|
||||
~GeomFillSurface();
|
||||
~GeomFillSurface() override;
|
||||
|
||||
void open();
|
||||
void checkOpenCommand();
|
||||
@@ -78,14 +78,14 @@ public:
|
||||
void setEditedObject(Surface::GeomFillSurface* obj);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
||||
/** Notifies on undo */
|
||||
virtual void slotUndoDocument(const Gui::Document& Doc);
|
||||
void slotUndoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies on redo */
|
||||
virtual void slotRedoDocument(const Gui::Document& Doc);
|
||||
void slotRedoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies when the object is about to be removed. */
|
||||
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
|
||||
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
|
||||
void changeFillType(GeomFill_FillingStyle);
|
||||
void flipOrientation(QListWidgetItem*);
|
||||
|
||||
@@ -107,15 +107,15 @@ class TaskGeomFillSurface : public Gui::TaskView::TaskDialog
|
||||
|
||||
public:
|
||||
TaskGeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj);
|
||||
~TaskGeomFillSurface();
|
||||
~TaskGeomFillSurface() override;
|
||||
void setEditedObject(Surface::GeomFillSurface* obj);
|
||||
|
||||
public:
|
||||
void open();
|
||||
bool accept();
|
||||
bool reject();
|
||||
void open() override;
|
||||
bool accept() override;
|
||||
bool reject() override;
|
||||
|
||||
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
|
||||
QDialogButtonBox::StandardButtons getStandardButtons() const override
|
||||
{ return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; }
|
||||
|
||||
private:
|
||||
|
||||
@@ -193,14 +193,14 @@ public:
|
||||
, editedObject(editedObject)
|
||||
{
|
||||
}
|
||||
~ShapeSelection()
|
||||
~ShapeSelection() override
|
||||
{
|
||||
mode = SectionsPanel::None;
|
||||
}
|
||||
/**
|
||||
* Allow the user to pick only edges.
|
||||
*/
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName)
|
||||
bool allow(App::Document*, App::DocumentObject* pObj, const char* sSubName) override
|
||||
{
|
||||
// don't allow references to itself
|
||||
if (pObj == editedObject)
|
||||
|
||||
@@ -46,10 +46,10 @@ class ViewProviderSections : public PartGui::ViewProviderSpline
|
||||
|
||||
public:
|
||||
enum ShapeType {Vertex, Edge, Face};
|
||||
virtual void setupContextMenu(QMenu*, QObject*, const char*);
|
||||
virtual bool setEdit(int ModNum);
|
||||
virtual void unsetEdit(int ModNum);
|
||||
QIcon getIcon() const;
|
||||
void setupContextMenu(QMenu*, QObject*, const char*) override;
|
||||
bool setEdit(int ModNum) override;
|
||||
void unsetEdit(int ModNum) override;
|
||||
QIcon getIcon() const override;
|
||||
void highlightReferences(ShapeType type, const References& refs, bool on);
|
||||
};
|
||||
|
||||
@@ -72,7 +72,7 @@ private:
|
||||
|
||||
public:
|
||||
SectionsPanel(ViewProviderSections* vp, Surface::Sections* obj);
|
||||
~SectionsPanel();
|
||||
~SectionsPanel() override;
|
||||
|
||||
void open();
|
||||
void checkOpenCommand();
|
||||
@@ -81,14 +81,14 @@ public:
|
||||
void setEditedObject(Surface::Sections* obj);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
||||
/** Notifies on undo */
|
||||
virtual void slotUndoDocument(const Gui::Document& Doc);
|
||||
void slotUndoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies on redo */
|
||||
virtual void slotRedoDocument(const Gui::Document& Doc);
|
||||
void slotRedoDocument(const Gui::Document& Doc) override;
|
||||
/** Notifies when the object is about to be removed. */
|
||||
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
|
||||
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
|
||||
|
||||
private Q_SLOTS:
|
||||
void on_buttonEdgeAdd_clicked();
|
||||
@@ -108,15 +108,15 @@ class TaskSections : public Gui::TaskView::TaskDialog
|
||||
|
||||
public:
|
||||
TaskSections(ViewProviderSections* vp, Surface::Sections* obj);
|
||||
~TaskSections();
|
||||
~TaskSections() override;
|
||||
void setEditedObject(Surface::Sections* obj);
|
||||
|
||||
public:
|
||||
void open();
|
||||
bool accept();
|
||||
bool reject();
|
||||
void open() override;
|
||||
bool accept() override;
|
||||
bool reject() override;
|
||||
|
||||
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
|
||||
QDialogButtonBox::StandardButtons getStandardButtons() const override
|
||||
{ return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; }
|
||||
|
||||
private:
|
||||
|
||||
@@ -34,7 +34,7 @@ class ViewProviderExtend : public PartGui::ViewProviderSpline
|
||||
PROPERTY_HEADER(SurfaceGui::ViewProviderExtend);
|
||||
|
||||
public:
|
||||
QIcon getIcon() const;
|
||||
QIcon getIcon() const override;
|
||||
};
|
||||
|
||||
} //namespace SurfaceGui
|
||||
|
||||
@@ -34,11 +34,11 @@ class Workbench : public Gui::StdWorkbench
|
||||
|
||||
public:
|
||||
Workbench();
|
||||
virtual ~Workbench();
|
||||
~Workbench() override;
|
||||
|
||||
protected:
|
||||
Gui::MenuItem* setupMenuBar() const;
|
||||
Gui::ToolBarItem* setupToolBars() const;
|
||||
Gui::MenuItem* setupMenuBar() const override;
|
||||
Gui::ToolBarItem* setupToolBars() const override;
|
||||
};
|
||||
|
||||
} // namespace SurfaceGui
|
||||
|
||||
Reference in New Issue
Block a user