diff --git a/src/Mod/PartDesign/App/DatumCS.h b/src/Mod/PartDesign/App/DatumCS.h index 47f763a795..d08949bf7d 100644 --- a/src/Mod/PartDesign/App/DatumCS.h +++ b/src/Mod/PartDesign/App/DatumCS.h @@ -31,13 +31,13 @@ namespace PartDesign class PartDesignExport CoordinateSystem : public Part::Datum { - PROPERTY_HEADER(PartDesign::CoordinateSystem); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::CoordinateSystem); public: CoordinateSystem(); virtual ~CoordinateSystem(); - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderDatumCoordinateSystem"; } diff --git a/src/Mod/PartDesign/App/FeatureBoolean.h b/src/Mod/PartDesign/App/FeatureBoolean.h index 770a8595fa..22ee5ab2f5 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.h +++ b/src/Mod/PartDesign/App/FeatureBoolean.h @@ -51,17 +51,17 @@ public: /** @name methods override feature */ //@{ /// Recalculate the feature - App::DocumentObjectExecReturn *execute(void); - short mustExecute() const; + App::DocumentObjectExecReturn *execute(void) override; + short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderBoolean"; } - virtual void onChanged(const App::Property* prop); + virtual void onChanged(const App::Property* prop) override; //@} protected: - void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName); + void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override; TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const; diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h index 7905d1f1b3..d231646955 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.h +++ b/src/Mod/PartDesign/App/FeaturePrimitive.h @@ -51,19 +51,19 @@ public: FeaturePrimitive(); - virtual const char* getViewProviderName(void) const { + virtual const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderPrimitive"; } Type getPrimitiveType() {return primitiveType;} - virtual void onChanged(const App::Property* prop); - virtual PyObject* getPyObject(); + virtual void onChanged(const App::Property* prop) override; + virtual PyObject* getPyObject() override; /// Do nothing, just to suppress warning, must be redefined in derived classes - virtual App::DocumentObjectExecReturn* execute() { + virtual App::DocumentObjectExecReturn* execute() override { return PartDesign::FeatureAddSub::execute(); } protected: - void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName); + void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName) override; //make the boolean ops with the primitives provided by the derived features App::DocumentObjectExecReturn* execute(const TopoDS_Shape& primitiveShape); Type primitiveType = Box; diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index 23d4993770..e02b83acd1 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -42,7 +42,7 @@ namespace PartDesign class PartDesignExport ShapeBinder : public Part::Feature { - PROPERTY_HEADER(PartDesign::ShapeBinder); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::ShapeBinder); public: ShapeBinder(); @@ -54,30 +54,30 @@ public: static void getFilteredReferences(App::PropertyLinkSubList* prop, App::GeoFeature*& object, std::vector< std::string >& subobjects); static Part::TopoShape buildShapeFromReferences(App::GeoFeature* obj, std::vector< std::string > subs); - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderShapeBinder"; } protected: - virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); - virtual short int mustExecute(void) const; - virtual App::DocumentObjectExecReturn* execute(void); + virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override; + virtual short int mustExecute(void) const override; + virtual App::DocumentObjectExecReturn* execute(void) override; private: void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); - virtual void onSettingDocument(); + virtual void onSettingDocument() override; typedef boost::signals2::connection Connection; Connection connectDocumentChangedObject; }; class PartDesignExport SubShapeBinder : public Part::Feature { - PROPERTY_HEADER(PartDesign::SubShapeBinder); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubShapeBinder); public: typedef Part::Feature inherited; SubShapeBinder(); - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderSubShapeBinder"; } @@ -99,7 +99,7 @@ public: return PartialLoad.getValue()?1:0; } - virtual bool canLinkProperties() const {return false;} + virtual bool canLinkProperties() const override {return false;} protected: virtual App::DocumentObjectExecReturn* execute(void) override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index dffab56d4b..d67e77f583 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -53,21 +53,21 @@ public: App::PropertyEnumeration DisplayModeBody; - virtual void attach(App::DocumentObject *); + virtual void attach(App::DocumentObject *) override; - virtual bool doubleClicked(void); - virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); + virtual bool doubleClicked(void) override; + virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; - virtual std::vector< std::string > getDisplayModes(void) const; - virtual void setDisplayMode(const char* ModeName); - virtual void setOverrideMode(const std::string& mode); + virtual std::vector< std::string > getDisplayModes(void) const override; + virtual void setDisplayMode(const char* ModeName) override; + virtual void setOverrideMode(const std::string& mode) override; - virtual bool onDelete(const std::vector &); + virtual bool onDelete(const std::vector &) override; /// Update the children's highlighting when triggered - virtual void updateData(const App::Property* prop); + virtual void updateData(const App::Property* prop) override; ///unify children visuals - virtual void onChanged(const App::Property* prop); + virtual void onChanged(const App::Property* prop) override; /// Update the sizes of origin and datums void updateOriginDatumSize (); @@ -79,11 +79,11 @@ public: SbBox3f getBoundBox (); /** Check whether objects can be added to the view provider by drag and drop */ - virtual bool canDropObjects() const; + virtual bool canDropObjects() const override; /** Check whether the object can be dropped to the view provider by drag and drop */ - virtual bool canDropObject(App::DocumentObject*) const; + virtual bool canDropObject(App::DocumentObject*) const override; /** Add an object to the view provider by drag and drop */ - virtual void dropObject(App::DocumentObject*); + virtual void dropObject(App::DocumentObject*) override; protected: void slotChangedObjectApp ( const App::DocumentObject& obj, const App::Property& prop ); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h index aa731d7902..0b61941003 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBoolean.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBoolean.h @@ -44,14 +44,14 @@ public: App::PropertyEnumeration Display; /// grouping handling - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &); - virtual void attach(App::DocumentObject*); - virtual void onChanged(const App::Property* prop); + virtual bool onDelete(const std::vector &) override; + virtual void attach(App::DocumentObject*) override; + virtual void onChanged(const App::Property* prop) override; protected: - virtual bool setEdit(int ModNum); + virtual bool setEdit(int ModNum) override; static const char* DisplayEnum[]; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.h b/src/Mod/PartDesign/Gui/ViewProviderDatum.h index ac6e8fef2c..dd32eae563 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.h @@ -46,21 +46,21 @@ public: virtual ~ViewProviderDatum(); /// grouping handling - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual void attach(App::DocumentObject *); - virtual bool onDelete(const std::vector &); - virtual bool doubleClicked(void); - std::vector getDisplayModes(void) const; - void setDisplayMode(const char* ModeName); + virtual void attach(App::DocumentObject *) override; + virtual bool onDelete(const std::vector &) override; + virtual bool doubleClicked(void) override; + std::vector getDisplayModes(void) const override; + void setDisplayMode(const char* ModeName) override; /// indicates if the ViewProvider use the new Selection model - virtual bool useNewSelectionModel(void) const { return true; } + virtual bool useNewSelectionModel(void) const override { return true; } /// indicates if the ViewProvider can be selected - virtual bool isSelectable(void) const ; + virtual bool isSelectable(void) const override; /// return a hit element to the selection path or 0 - virtual std::string getElement(const SoDetail *) const; - virtual SoDetail* getDetail(const char*) const; + virtual std::string getElement(const SoDetail *) const override; + virtual SoDetail* getDetail(const char*) const override; /** * Enable/Disable the selectability of the datum @@ -109,8 +109,8 @@ public: static double marginFactor () { return 0.1; }; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + virtual bool setEdit(int ModNum) override; + virtual void unsetEdit(int ModNum) override; /** * Guesses the context this datum belongs to and returns appropriate bounding box of all diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 260a7ec631..ba30ec742b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -31,19 +31,19 @@ namespace PartDesignGui { // TODO may be derive from something else e.g. ViewProviderGeometryObject (2015-09-11, Fat-Zer) class PartDesignGuiExport ViewProviderShapeBinder : public PartGui::ViewProviderPart { - PROPERTY_HEADER(PartDesignGui::ViewProviderShapeBinder); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderShapeBinder); public: /// Constructor ViewProviderShapeBinder(); virtual ~ViewProviderShapeBinder(); - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; void highlightReferences(const bool on, bool auxiliary); protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + virtual bool setEdit(int ModNum) override; + virtual void unsetEdit(int ModNum) override; private: std::vector originalLineColors; @@ -53,7 +53,7 @@ private: class PartDesignGuiExport ViewProviderSubShapeBinder : public PartGui::ViewProviderPart { - PROPERTY_HEADER(PartDesignGui::ViewProviderShapeBinder); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderShapeBinder); public: diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index da5828b987..ad61e73314 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -32,7 +32,7 @@ class TaskDlgTransformedParameters; class PartDesignGuiExport ViewProviderTransformed : public ViewProvider { - PROPERTY_HEADER(PartDesignGui::ViewProviderTransformed); + PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderTransformed); public: /// constructor @@ -42,9 +42,9 @@ public: virtual ~ViewProviderTransformed() {} - void setupContextMenu(QMenu*, QObject*, const char*); + void setupContextMenu(QMenu*, QObject*, const char*) override; - virtual bool onDelete(const std::vector &); + virtual bool onDelete(const std::vector &) override; /// signals if the transformation contains errors boost::signals2::signal signalDiagnosis; @@ -55,8 +55,8 @@ public: virtual Gui::ViewProvider *startEditing(int ModNum=0) override; protected: - virtual bool setEdit(int ModNum); - virtual void unsetEdit(int ModNum); + virtual bool setEdit(int ModNum) override; + virtual void unsetEdit(int ModNum) override; bool checkDlgOpen(TaskDlgTransformedParameters* transformedDlg);