From d2c9f8cbdc407517c608a301d10e034454289e01 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 4 Aug 2023 12:23:35 +0200 Subject: [PATCH] TD: modernize C++: use override --- src/Mod/TechDraw/App/DrawComplexSection.h | 2 +- src/Mod/TechDraw/App/DrawGeomHatch.h | 2 +- src/Mod/TechDraw/App/DrawLeaderLine.h | 2 +- src/Mod/TechDraw/App/DrawParametricTemplate.h | 20 +++++++------- src/Mod/TechDraw/App/DrawProjGroup.h | 2 +- src/Mod/TechDraw/App/DrawProjGroupItem.h | 2 +- src/Mod/TechDraw/App/DrawRichAnno.h | 2 +- src/Mod/TechDraw/App/DrawTemplate.h | 2 +- src/Mod/TechDraw/App/DrawTile.h | 2 +- src/Mod/TechDraw/App/DrawViewAnnotation.h | 2 +- src/Mod/TechDraw/App/DrawViewArch.h | 2 +- src/Mod/TechDraw/App/DrawViewClip.h | 2 +- src/Mod/TechDraw/App/DrawViewDimExtent.h | 2 +- src/Mod/TechDraw/App/DrawViewDraft.h | 2 +- src/Mod/TechDraw/App/DrawWeldSymbol.h | 2 +- src/Mod/TechDraw/App/FeatureProjection.h | 6 ++--- src/Mod/TechDraw/App/PropertyCenterLineList.h | 24 ++++++++--------- .../TechDraw/App/PropertyCosmeticEdgeList.h | 24 ++++++++--------- .../TechDraw/App/PropertyCosmeticVertexList.h | 24 ++++++++--------- src/Mod/TechDraw/App/PropertyGeomFormatList.h | 24 ++++++++--------- src/Mod/TechDraw/Gui/DlgPageChooser.h | 6 ++--- src/Mod/TechDraw/Gui/DlgStringListEditor.h | 6 ++--- src/Mod/TechDraw/Gui/QGCustomBorder.h | 8 +++--- src/Mod/TechDraw/Gui/QGCustomLabel.h | 8 +++--- src/Mod/TechDraw/Gui/QGCustomRect.h | 8 +++--- src/Mod/TechDraw/Gui/QGCustomSvg.h | 10 +++---- src/Mod/TechDraw/Gui/QGCustomText.h | 22 ++++++++-------- src/Mod/TechDraw/Gui/QGDisplayArea.h | 10 +++---- src/Mod/TechDraw/Gui/QGEPath.h | 4 +-- src/Mod/TechDraw/Gui/QGIArrow.h | 4 +-- src/Mod/TechDraw/Gui/QGICMark.h | 10 +++---- src/Mod/TechDraw/Gui/QGICaption.h | 6 ++--- src/Mod/TechDraw/Gui/QGICenterLine.h | 8 +++--- src/Mod/TechDraw/Gui/QGIDecoration.h | 12 ++++----- src/Mod/TechDraw/Gui/QGIDimLines.h | 8 +++--- src/Mod/TechDraw/Gui/QGIDrawingTemplate.h | 8 +++--- src/Mod/TechDraw/Gui/QGIEdge.h | 8 +++--- src/Mod/TechDraw/Gui/QGIGhostHighlight.h | 6 ++--- src/Mod/TechDraw/Gui/QGIHighlight.h | 6 ++--- src/Mod/TechDraw/Gui/QGILeaderLine.h | 2 +- src/Mod/TechDraw/Gui/QGIPrimPath.h | 26 +++++++++---------- src/Mod/TechDraw/Gui/QGIRichAnno.h | 26 +++++++++---------- src/Mod/TechDraw/Gui/QGISectionLine.h | 8 +++--- src/Mod/TechDraw/Gui/QGITemplate.h | 6 ++--- src/Mod/TechDraw/Gui/QGITile.h | 10 +++---- src/Mod/TechDraw/Gui/QGIVertex.h | 4 +-- src/Mod/TechDraw/Gui/QGIView.h | 2 +- src/Mod/TechDraw/Gui/QGIViewBalloon.h | 4 +-- src/Mod/TechDraw/Gui/QGIViewDimension.h | 4 +-- src/Mod/TechDraw/Gui/QGMText.h | 24 ++++++++--------- src/Mod/TechDraw/Gui/QGSPage.h | 2 +- src/Mod/TechDraw/Gui/QGVPage.h | 2 +- src/Mod/TechDraw/Gui/SymbolChooser.h | 2 +- src/Mod/TechDraw/Gui/TaskActiveView.h | 4 +-- src/Mod/TechDraw/Gui/TaskComplexSection.h | 2 +- src/Mod/TechDraw/Gui/TaskCosVertex.h | 2 +- src/Mod/TechDraw/Gui/TaskDetail.h | 2 +- src/Mod/TechDraw/Gui/TaskDimRepair.h | 16 ++++++------ src/Mod/TechDraw/Gui/TaskGeomHatch.h | 2 +- src/Mod/TechDraw/Gui/TaskLeaderLine.h | 2 +- src/Mod/TechDraw/Gui/TaskProjGroup.h | 2 +- src/Mod/TechDraw/Gui/TaskRichAnno.h | 2 +- src/Mod/TechDraw/Gui/TaskSectionView.h | 2 +- .../TechDraw/Gui/TaskSurfaceFinishSymbols.h | 2 +- src/Mod/TechDraw/Gui/TaskWeldingSymbol.h | 18 ++++++------- src/Mod/TechDraw/Gui/TemplateTextField.h | 8 +++--- .../Gui/ViewProviderCosmeticExtension.h | 6 ++--- src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderTemplate.h | 16 ++++++------ .../TechDraw/Gui/Widgets/CompassDialWidget.h | 4 +-- src/Mod/TechDraw/Gui/Widgets/CompassWidget.h | 4 +-- .../TechDraw/Gui/Widgets/VectorEditWidget.h | 2 +- src/Mod/TechDraw/Gui/Workbench.h | 10 +++---- src/Mod/TechDraw/Gui/mrichtextedit.h | 6 ++--- src/Mod/TechDraw/Gui/mtextedit.h | 6 ++--- 75 files changed, 275 insertions(+), 275 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawComplexSection.h b/src/Mod/TechDraw/App/DrawComplexSection.h index b342dd4ec2..9da0e55f4d 100644 --- a/src/Mod/TechDraw/App/DrawComplexSection.h +++ b/src/Mod/TechDraw/App/DrawComplexSection.h @@ -41,7 +41,7 @@ class TechDrawExport DrawComplexSection: public DrawViewSection public: DrawComplexSection(); - ~DrawComplexSection() = default; + ~DrawComplexSection() override = default; App::PropertyLink CuttingToolWireObject; App::PropertyEnumeration ProjectionStrategy;//Offset or Aligned diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.h b/src/Mod/TechDraw/App/DrawGeomHatch.h index 04bf1b1cf7..55e8c0fc7d 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.h +++ b/src/Mod/TechDraw/App/DrawGeomHatch.h @@ -54,7 +54,7 @@ class TechDrawExport DrawGeomHatch : public App::DocumentObject public: DrawGeomHatch(); - ~DrawGeomHatch() = default; + ~DrawGeomHatch() override = default; App::PropertyLinkSub Source; //the dvX & face(s) this crosshatch belongs to App::PropertyFile FilePattern; diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.h b/src/Mod/TechDraw/App/DrawLeaderLine.h index a52c4a7ef7..46f28baa34 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.h +++ b/src/Mod/TechDraw/App/DrawLeaderLine.h @@ -40,7 +40,7 @@ class TechDrawExport DrawLeaderLine : public TechDraw::DrawView public: DrawLeaderLine(); - ~DrawLeaderLine() = default; + ~DrawLeaderLine() override = default; App::PropertyLink LeaderParent; App::PropertyVectorList WayPoints; diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index c3f6c7b414..38a22347fd 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -43,31 +43,31 @@ namespace TechDraw class TechDrawExport DrawParametricTemplate: public TechDraw::DrawTemplate { - PROPERTY_HEADER(TechDraw::DrawParametricTemplate); + PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawParametricTemplate); public: DrawParametricTemplate(); /// Constructor - ~DrawParametricTemplate(); + ~DrawParametricTemplate() override; App::PropertyFile Template; /** @name methods override Feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(); + App::DocumentObjectExecReturn *execute() override; //@} - short mustExecute() const; + short mustExecute() const override; /// returns the type name of the ViewProvider - virtual const char* getViewProviderName() const { + const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderTemplate"; } // from base class - virtual PyObject *getPyObject(); - virtual unsigned int getMemSize() const; + PyObject *getPyObject() override; + unsigned int getMemSize() const override; public: std::vector getGeometry() { return geom; } @@ -76,11 +76,11 @@ public: // Template Drawing Methods int drawLine(double x1, double y1, double x2, double y2); - double getHeight() const; - double getWidth() const; + double getHeight() const override; + double getWidth() const override; protected: - void onChanged(const App::Property* prop); + void onChanged(const App::Property* prop) override; protected: std::vector geom; diff --git a/src/Mod/TechDraw/App/DrawProjGroup.h b/src/Mod/TechDraw/App/DrawProjGroup.h index 3197c4bd4f..b7cea65fcf 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.h +++ b/src/Mod/TechDraw/App/DrawProjGroup.h @@ -55,7 +55,7 @@ class TechDrawExport DrawProjGroup : public TechDraw::DrawViewCollection public: /// Constructor DrawProjGroup(); - ~DrawProjGroup() = default; + ~DrawProjGroup() override = default; App::PropertyLinkList Source; App::PropertyXLinkList XSource; diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.h b/src/Mod/TechDraw/App/DrawProjGroupItem.h index e394f5450a..7e1a93fe4d 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.h +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.h @@ -55,7 +55,7 @@ class TechDrawExport DrawProjGroupItem : public TechDraw::DrawViewPart public: /// Constructor DrawProjGroupItem(); - ~DrawProjGroupItem() = default; + ~DrawProjGroupItem() override = default; App::PropertyEnumeration Type; App::PropertyVector RotationVector; //this is superseded by dvp xdirection diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h index 0f0131fded..0118cbf989 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.h +++ b/src/Mod/TechDraw/App/DrawRichAnno.h @@ -39,7 +39,7 @@ class TechDrawExport DrawRichAnno : public TechDraw::DrawView public: DrawRichAnno(); - ~DrawRichAnno() = default; + ~DrawRichAnno() override = default; App::PropertyLink AnnoParent; App::PropertyString AnnoText; diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index 868385618a..4849381aab 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -63,7 +63,7 @@ public: } // from base class - virtual PyObject *getPyObject(void) override; + PyObject *getPyObject(void) override; private: static const char* OrientationEnums[]; diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h index ee8c4dbb5c..04c30e1323 100644 --- a/src/Mod/TechDraw/App/DrawTile.h +++ b/src/Mod/TechDraw/App/DrawTile.h @@ -39,7 +39,7 @@ class TechDrawExport DrawTile : public App::DocumentObject public: DrawTile(); - ~DrawTile() = default; + ~DrawTile() override = default; App::PropertyLink TileParent; //eg DrawWeldSymbol App::PropertyIntegerConstraint TileRow; diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h index 7f99903f78..bec639f85d 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.h +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView public: /// Constructor DrawViewAnnotation(); - ~DrawViewAnnotation() = default; + ~DrawViewAnnotation() override = default; App::PropertyStringList Text; App::PropertyFont Font; diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index 5ae47e01f8..ef3b55d280 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -41,7 +41,7 @@ class TechDrawExport DrawViewArch : public TechDraw::DrawViewSymbol public: /// Constructor DrawViewArch(); - ~DrawViewArch() = default; + ~DrawViewArch() override = default; App::PropertyLink Source; App::PropertyBool AllOn; diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index 3f7a60bc91..fa6e915362 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewClip: public TechDraw::DrawView public: /// Constructor DrawViewClip(); - ~DrawViewClip() = default; + ~DrawViewClip() override = default; App::PropertyLength Width; App::PropertyLength Height; diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h index 562a4e83c2..962b3e41cc 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.h +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h @@ -41,7 +41,7 @@ class TechDrawExport DrawViewDimExtent : public TechDraw::DrawViewDimension public: /// Constructor DrawViewDimExtent(); - ~DrawViewDimExtent() = default; + ~DrawViewDimExtent() override = default; App::PropertyLinkSubList Source; //DrawViewPart & SubElements(Edges) //Cosmetic End points are stored in DVD::References2d diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 287bc22083..062a4be8c3 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -42,7 +42,7 @@ class TechDrawExport DrawViewDraft : public TechDraw::DrawViewSymbol public: /// Constructor DrawViewDraft(); - ~DrawViewDraft() = default; + ~DrawViewDraft() override = default; App::PropertyLink Source; App::PropertyFloat LineWidth; diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h index c25c1f3980..0e85712990 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.h +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h @@ -41,7 +41,7 @@ class TechDrawExport DrawWeldSymbol : public TechDraw::DrawView public: DrawWeldSymbol(); - ~DrawWeldSymbol() = default; + ~DrawWeldSymbol() override = default; App::PropertyLink Leader; App::PropertyBool AllAround; diff --git a/src/Mod/TechDraw/App/FeatureProjection.h b/src/Mod/TechDraw/App/FeatureProjection.h index 0d04915581..9ac49ef3a0 100644 --- a/src/Mod/TechDraw/App/FeatureProjection.h +++ b/src/Mod/TechDraw/App/FeatureProjection.h @@ -38,12 +38,12 @@ namespace TechDraw */ class TechDrawExport FeatureProjection : public Part::Feature { - PROPERTY_HEADER(TechDraw::FeatureProjection); + PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::FeatureProjection); public: /// Constructor FeatureProjection(); - virtual ~FeatureProjection(); + ~FeatureProjection() override; App::PropertyLink Source; App::PropertyVector Direction; @@ -61,7 +61,7 @@ public: /** @name methods override feature */ //@{ /// recalculate the Feature - virtual App::DocumentObjectExecReturn *execute(void); + App::DocumentObjectExecReturn *execute() override; //@} }; diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.h b/src/Mod/TechDraw/App/PropertyCenterLineList.h index f13ed00efe..7fbf2146cf 100644 --- a/src/Mod/TechDraw/App/PropertyCenterLineList.h +++ b/src/Mod/TechDraw/App/PropertyCenterLineList.h @@ -39,14 +39,14 @@ class CenterLine; class TechDrawExport PropertyCenterLineList: public App::PropertyLists { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: PropertyCenterLineList(); - virtual ~PropertyCenterLineList(); + ~PropertyCenterLineList() override; - virtual void setSize(int newSize); - virtual int getSize(void) const; + void setSize(int newSize) override; + int getSize() const override; /** Sets the property */ @@ -58,20 +58,20 @@ public: return _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual App::Property *Copy(void) const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const; + unsigned int getMemSize() const override; private: std::vector _lValueList; diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h index d3c0b8ee6d..3c2dbcf647 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h +++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h @@ -39,7 +39,7 @@ class CosmeticEdge; class TechDrawExport PropertyCosmeticEdgeList: public App::PropertyLists { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: /** @@ -52,10 +52,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyCosmeticEdgeList(); + virtual ~PropertyCosmeticEdgeList() override; - virtual void setSize(int newSize); - virtual int getSize(void) const; + void setSize(int newSize) override; + int getSize(void) const override; /** Sets the property */ @@ -68,20 +68,20 @@ public: return _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual App::Property *Copy(void) const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const; + unsigned int getMemSize(void) const override; private: std::vector _lValueList; diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h index c5eec43816..385556bccc 100644 --- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h +++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h @@ -41,7 +41,7 @@ class CosmeticVertex; class TechDrawExport PropertyCosmeticVertexList: public App::PropertyLists { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: /** @@ -54,10 +54,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyCosmeticVertexList(); + ~PropertyCosmeticVertexList() override; - virtual void setSize(int newSize); - virtual int getSize(void) const; + void setSize(int newSize) override; + int getSize(void) const override; /** Sets the property */ @@ -69,20 +69,20 @@ public: return _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual App::Property *Copy(void) const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const; + unsigned int getMemSize() const override; private: std::vector _lValueList; diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.h b/src/Mod/TechDraw/App/PropertyGeomFormatList.h index 1ca3abfb96..7e2e6d61e7 100644 --- a/src/Mod/TechDraw/App/PropertyGeomFormatList.h +++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.h @@ -38,7 +38,7 @@ class GeomFormat; class TechDrawExport PropertyGeomFormatList: public App::PropertyLists { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: /** @@ -51,10 +51,10 @@ public: * A destructor. * A more elaborate description of the destructor. */ - virtual ~PropertyGeomFormatList(); + ~PropertyGeomFormatList() override; - virtual void setSize(int newSize); - virtual int getSize(void) const; + void setSize(int newSize) override; + int getSize() const override; /** Sets the property */ @@ -66,20 +66,20 @@ public: return _lValueList[idx]; } - const std::vector &getValues(void) const { + const std::vector &getValues() const { return _lValueList; } - virtual PyObject *getPyObject(void); - virtual void setPyObject(PyObject *); + PyObject *getPyObject() override; + void setPyObject(PyObject *) override; - virtual void Save(Base::Writer &writer) const; - virtual void Restore(Base::XMLReader &reader); + void Save(Base::Writer &writer) const override; + void Restore(Base::XMLReader &reader) override; - virtual App::Property *Copy(void) const; - virtual void Paste(const App::Property &from); + App::Property *Copy() const override; + void Paste(const App::Property &from) override; - virtual unsigned int getMemSize(void) const; + unsigned int getMemSize() const override; private: std::vector _lValueList; diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.h b/src/Mod/TechDraw/Gui/DlgPageChooser.h index 591c464531..8fee2d50bb 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.h +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h @@ -37,11 +37,11 @@ public: DlgPageChooser(const std::vector labels, const std::vector names, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgPageChooser(); + ~DlgPageChooser() override; std::string getSelection() const; - void accept(); - void reject(); + void accept() override; + void reject() override; private Q_SLOTS: diff --git a/src/Mod/TechDraw/Gui/DlgStringListEditor.h b/src/Mod/TechDraw/Gui/DlgStringListEditor.h index eadc48da90..b8a28c2e06 100644 --- a/src/Mod/TechDraw/Gui/DlgStringListEditor.h +++ b/src/Mod/TechDraw/Gui/DlgStringListEditor.h @@ -40,11 +40,11 @@ class TechDrawGuiExport DlgStringListEditor : public QDialog public: DlgStringListEditor(const std::vector texts, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); - ~DlgStringListEditor(); + ~DlgStringListEditor() override; std::vector getTexts() const; - void accept(); - void reject(); + void accept() override; + void reject() override; public Q_SLOTS: void slotItemActivated(QListWidgetItem* item); diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.h b/src/Mod/TechDraw/Gui/QGCustomBorder.h index 103bcb1a8a..30a740452a 100644 --- a/src/Mod/TechDraw/Gui/QGCustomBorder.h +++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h @@ -40,13 +40,13 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomBorder : public QGraphicsRectItem { public: - explicit QGCustomBorder(void); - ~QGCustomBorder() {} + explicit QGCustomBorder(); + ~QGCustomBorder() override = default; enum {Type = QGraphicsItem::UserType + 136}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h index 3d429527a3..2652a2b189 100644 --- a/src/Mod/TechDraw/Gui/QGCustomLabel.h +++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h @@ -40,13 +40,13 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomLabel : public QGraphicsTextItem { public: - explicit QGCustomLabel(void); - ~QGCustomLabel() {} + explicit QGCustomLabel(); + ~QGCustomLabel() override = default; enum {Type = QGraphicsItem::UserType + 135}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.h b/src/Mod/TechDraw/Gui/QGCustomRect.h index 866cf509e3..e330b3b821 100644 --- a/src/Mod/TechDraw/Gui/QGCustomRect.h +++ b/src/Mod/TechDraw/Gui/QGCustomRect.h @@ -40,13 +40,13 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomRect : public QGraphicsRectItem { public: - explicit QGCustomRect(void); - ~QGCustomRect() {} + explicit QGCustomRect(); + ~QGCustomRect() override = default; enum {Type = QGraphicsItem::UserType + 133}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.h b/src/Mod/TechDraw/Gui/QGCustomSvg.h index c7d38b79cf..c9a9fd2c6d 100644 --- a/src/Mod/TechDraw/Gui/QGCustomSvg.h +++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h @@ -43,15 +43,15 @@ namespace TechDrawGui class TechDrawGuiExport QGCustomSvg : public QGraphicsSvgItem { public: - explicit QGCustomSvg(void); - ~QGCustomSvg(); + explicit QGCustomSvg(); + ~QGCustomSvg() override; enum {Type = QGraphicsItem::UserType + 131}; int type() const override { return Type;} - virtual void paint( QPainter *painter, - const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr ) override; + void paint( QPainter *painter, + const QStyleOptionGraphicsItem *option, + QWidget *widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); virtual bool load(QByteArray *svgString); diff --git a/src/Mod/TechDraw/Gui/QGCustomText.h b/src/Mod/TechDraw/Gui/QGCustomText.h index bdf3787b7f..47951086a6 100644 --- a/src/Mod/TechDraw/Gui/QGCustomText.h +++ b/src/Mod/TechDraw/Gui/QGCustomText.h @@ -44,12 +44,12 @@ class TechDrawGuiExport QGCustomText : public QGraphicsTextItem { public: explicit QGCustomText(QGraphicsItem* parent = nullptr); - ~QGCustomText() {} + ~QGCustomText() override {} enum {Type = QGraphicsItem::UserType + 130}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QRectF boundingRect() const override; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + QRectF boundingRect() const override; QRectF tightBoundingRect() const; QPointF tightBoundingAdjust() const; @@ -65,12 +65,12 @@ public: virtual void justifyRightAt(QPointF centerPos, bool vCenter = true); virtual void justifyRightAt(double cX, double cY, bool vCenter = true); - virtual double getHeight(void); - virtual double getWidth(void); + virtual double getHeight(); + virtual double getWidth(); - virtual QColor getNormalColor(void); - virtual QColor getPreColor(void); - virtual QColor getSelectColor(void); + virtual QColor getNormalColor(); + virtual QColor getPreColor(); + virtual QColor getSelectColor(); virtual void setColor(QColor c); virtual void setTightBounding(bool tight); @@ -79,11 +79,11 @@ public: void makeMark(Base::Vector3d v); protected: - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - Base::Reference getParmGroup(void); + Base::Reference getParmGroup(); bool isHighlighted; bool tightBounding; // Option to use tighter boundingRect(), works only for plaintext QGCustomText diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.h b/src/Mod/TechDraw/Gui/QGDisplayArea.h index 3acd564d71..9fc116017b 100644 --- a/src/Mod/TechDraw/Gui/QGDisplayArea.h +++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h @@ -40,14 +40,14 @@ namespace TechDrawGui class TechDrawGuiExport QGDisplayArea : public QGraphicsItemGroup { public: - explicit QGDisplayArea(void); - ~QGDisplayArea() {} + explicit QGDisplayArea(); + ~QGDisplayArea() override {} enum {Type = QGraphicsItem::UserType + 137}; - int type() const { return Type;} - virtual QRectF boundingRect() const; + int type() const override { return Type;} + QRectF boundingRect() const override; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGEPath.h b/src/Mod/TechDraw/Gui/QGEPath.h index 35ac3081ca..c03298fec0 100644 --- a/src/Mod/TechDraw/Gui/QGEPath.h +++ b/src/Mod/TechDraw/Gui/QGEPath.h @@ -45,7 +45,7 @@ class TechDrawGuiExport QGMarker : public QObject, public QGIVertex Q_OBJECT public: explicit QGMarker(int idx); - ~QGMarker() = default; + ~QGMarker() override = default; enum {Type = QGraphicsItem::UserType + 302}; int type() const override { return Type;} @@ -78,7 +78,7 @@ class TechDrawGuiExport QGEPath : public QObject, public QGIPrimPath public: explicit QGEPath(QGILeaderLine* leader); - ~QGEPath() = default; + ~QGEPath() override = default; enum {Type = QGraphicsItem::UserType + 301}; int type() const override { return Type;} diff --git a/src/Mod/TechDraw/Gui/QGIArrow.h b/src/Mod/TechDraw/Gui/QGIArrow.h index 215dfecf6c..ea69594509 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.h +++ b/src/Mod/TechDraw/Gui/QGIArrow.h @@ -52,10 +52,10 @@ class TechDrawGuiExport QGIArrow : public QGIPrimPath { public: explicit QGIArrow(); - ~QGIArrow() {} + ~QGIArrow() override {} enum {Type = QGraphicsItem::UserType + 109}; - int type() const { return Type;} + int type() const override { return Type;} public: void draw(); diff --git a/src/Mod/TechDraw/Gui/QGICMark.h b/src/Mod/TechDraw/Gui/QGICMark.h index bee5b8201d..4cb3481cef 100644 --- a/src/Mod/TechDraw/Gui/QGICMark.h +++ b/src/Mod/TechDraw/Gui/QGICMark.h @@ -34,21 +34,21 @@ class TechDrawGuiExport QGICMark : public QGIVertex { public: explicit QGICMark(int index); - ~QGICMark() {} + ~QGICMark() override {} enum {Type = QGraphicsItem::UserType + 171}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QRectF boundingRect() const override; - virtual QPainterPath shape() const override; + QRectF boundingRect() const override; + QPainterPath shape() const override; void draw(void); float getSize() { return m_size; } void setSize(float s); float getThick() { return m_width; } void setThick(float t); - virtual void setPrettyNormal() override; + void setPrettyNormal() override; double getMarkFuzz(void) const; diff --git a/src/Mod/TechDraw/Gui/QGICaption.h b/src/Mod/TechDraw/Gui/QGICaption.h index 5683891895..179972ace0 100644 --- a/src/Mod/TechDraw/Gui/QGICaption.h +++ b/src/Mod/TechDraw/Gui/QGICaption.h @@ -33,11 +33,11 @@ namespace TechDrawGui class TechDrawGuiExport QGICaption : public QGCustomText { public: - explicit QGICaption(void); - ~QGICaption() {} + explicit QGICaption(); + ~QGICaption() override {} enum {Type = QGraphicsItem::UserType + 180}; - int type() const { return Type;} + int type() const override { return Type;} }; diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.h b/src/Mod/TechDraw/Gui/QGICenterLine.h index fbdc8678eb..37b00b2fee 100644 --- a/src/Mod/TechDraw/Gui/QGICenterLine.h +++ b/src/Mod/TechDraw/Gui/QGICenterLine.h @@ -37,15 +37,15 @@ class TechDrawGuiExport QGICenterLine : public QGIDecoration { public: explicit QGICenterLine(); - ~QGICenterLine() {} + ~QGICenterLine() override = default; enum {Type = QGraphicsItem::UserType + 174}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; void setBounds(double x1, double y1, double x2, double y2); - virtual void draw(); + void draw() override; void setIntersection(bool isIntersecting); diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.h b/src/Mod/TechDraw/Gui/QGIDecoration.h index f773720e06..1b9701c605 100644 --- a/src/Mod/TechDraw/Gui/QGIDecoration.h +++ b/src/Mod/TechDraw/Gui/QGIDecoration.h @@ -50,8 +50,8 @@ namespace TechDrawGui class TechDrawGuiExport QGIDecoration : public QGraphicsItemGroup { public: - explicit QGIDecoration(void); - ~QGIDecoration() {} + explicit QGIDecoration(); + ~QGIDecoration() override = default; enum {Type = QGraphicsItem::UserType + 173}; int type() const override { return Type;} @@ -72,7 +72,7 @@ public: double getWidth() { return m_width; } void setStyle(Qt::PenStyle s); void setColor(QColor c); - QColor getColor(void) { return m_colNormal; } + QColor getColor() { return m_colNormal; } void setFill(Qt::BrushStyle bs) { m_brushCurrent = bs; } void makeMark(double x, double y); void makeMark(Base::Vector3d v); @@ -81,9 +81,9 @@ protected: void setPrettyNormal(); void setPrettyPre(); void setPrettySel(); - virtual QColor prefNormalColor(void); - virtual QColor prefPreColor(void); - virtual QColor prefSelectColor(void); + virtual QColor prefNormalColor(); + virtual QColor prefPreColor(); + virtual QColor prefSelectColor(); QPen m_pen; QBrush m_brush; QColor m_colCurrent; diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.h b/src/Mod/TechDraw/Gui/QGIDimLines.h index 281a6acc5b..e234eaa57a 100644 --- a/src/Mod/TechDraw/Gui/QGIDimLines.h +++ b/src/Mod/TechDraw/Gui/QGIDimLines.h @@ -39,12 +39,12 @@ class TechDrawGuiExport QGIDimLines : public QGIPrimPath { public: explicit QGIDimLines(); - ~QGIDimLines() {} + ~QGIDimLines() override = default; enum {Type = QGraphicsItem::UserType + 175}; int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual QPainterPath shape() const override; + QRectF boundingRect() const override; + QPainterPath shape() const override; public: void draw(); @@ -55,7 +55,7 @@ public: protected: //QVariant itemChange(GraphicsItemChange change, const QVariant &value); - double getEdgeFuzz(void) const; + double getEdgeFuzz() const; private: diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h index e1667dfaf7..e0d68a350e 100644 --- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h +++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.h @@ -46,14 +46,14 @@ class TechDrawGuiExport QGIDrawingTemplate : public QGITemplate public: explicit QGIDrawingTemplate(QGSPage *); - ~QGIDrawingTemplate(); + ~QGIDrawingTemplate() override; enum {Type = QGraphicsItem::UserType + 151}; - int type() const { return Type;} + int type() const override { return Type;} void clearContents(); - void draw(); - virtual void updateView(bool update = false); + void draw() override; + void updateView(bool update = false) override; protected: TechDraw::DrawParametricTemplate * getParametricTemplate(); diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 13dba5d014..d8ed9b974b 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -34,13 +34,13 @@ class TechDrawGuiExport QGIEdge : public QGIPrimPath { public: explicit QGIEdge(int index); - ~QGIEdge() {} + ~QGIEdge() override = default; enum {Type = QGraphicsItem::UserType + 103}; int type() const override { return Type;} - virtual QRectF boundingRect() const override; - virtual QPainterPath shape() const override; + QRectF boundingRect() const override; + QPainterPath shape() const override; int getProjIndex() const { return projIndex; } @@ -49,7 +49,7 @@ public: bool getHiddenEdge() { return(isHiddenEdge); } void setSmoothEdge(bool b) { isSmoothEdge = b; } bool getSmoothEdge() { return(isSmoothEdge); } - virtual void setPrettyNormal() override; + void setPrettyNormal() override; double getEdgeFuzz(void) const; diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h index 9c37a6a388..4035721edf 100644 --- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h +++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h @@ -42,7 +42,7 @@ class TechDrawGuiExport QGIGhostHighlight : public QObject, public QGIHighlight Q_OBJECT public: explicit QGIGhostHighlight(); - ~QGIGhostHighlight(); + ~QGIGhostHighlight() override; enum {Type = QGraphicsItem::UserType + 177}; int type() const override { return Type;} @@ -54,8 +54,8 @@ Q_SIGNALS: void positionChange(QPointF p); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; bool m_dragging; diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.h b/src/Mod/TechDraw/Gui/QGIHighlight.h index c83ac81028..18409846fc 100644 --- a/src/Mod/TechDraw/Gui/QGIHighlight.h +++ b/src/Mod/TechDraw/Gui/QGIHighlight.h @@ -43,7 +43,7 @@ class TechDrawGuiExport QGIHighlight : public QGIDecoration { public: explicit QGIHighlight(); - ~QGIHighlight(); + ~QGIHighlight() override; enum {Type = QGraphicsItem::UserType + 176}; int type() const override { return Type;} @@ -55,7 +55,7 @@ public: void setBounds(double x1, double y1, double x2, double y2); void setReference(const char* sym); void setFont(QFont f, double fsize); - virtual void draw() override; + void draw() override; void setInteractive(bool state); void setFeatureName(std::string name) { m_featureName = name; } std::string getFeatureName() { return m_featureName; } @@ -69,7 +69,7 @@ protected: void makeHighlight(); void makeReference(); void setTools(); - int getHoleStyle(void); + int getHoleStyle(); private: QString m_refText; diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h index 689e07545b..002a205ee3 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.h +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h @@ -62,7 +62,7 @@ public: }; explicit QGILeaderLine(); - ~QGILeaderLine() = default; + ~QGILeaderLine() override = default; int type() const override { diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h index bdcb4adacf..36128243d0 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.h +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h @@ -43,13 +43,13 @@ class TechDrawGuiExport QGIPrimPath : public QGraphicsPathItem { public: explicit QGIPrimPath(); - ~QGIPrimPath() {} + ~QGIPrimPath() override = default; enum {Type = QGraphicsItem::UserType + 170}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; - virtual QPainterPath shape() const override { return path(); } + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + QPainterPath shape() const override { return path(); } void setHighlighted(bool state); virtual void setPrettyNormal(); @@ -71,20 +71,20 @@ public: void setFill(QBrush b); void resetFill(); void setFillColor(QColor c); - QColor getFillColor(void) { return m_colDefFill; } + QColor getFillColor() { return m_colDefFill; } void setFillOverride(bool b) { m_fillOverride = b; } protected: - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual QColor getNormalColor(void); - virtual QColor getPreColor(void); - virtual QColor getSelectColor(void); - Base::Reference getParmGroup(void); - virtual Qt::PenCapStyle prefCapStyle(void); + virtual QColor getNormalColor(); + virtual QColor getPreColor(); + virtual QColor getSelectColor(); + Base::Reference getParmGroup(); + virtual Qt::PenCapStyle prefCapStyle(); bool isHighlighted; diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h index 517bc1602c..bc6d70d96e 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.h +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h @@ -58,33 +58,33 @@ public: enum {Type = QGraphicsItem::UserType + 233}; explicit QGIRichAnno(); - ~QGIRichAnno() = default; + ~QGIRichAnno() override = default; int type() const override { return Type;} - virtual void paint( QPainter * painter, - const QStyleOptionGraphicsItem * option, - QWidget * widget = nullptr ) override; - virtual QRectF boundingRect() const override; + void paint( QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget = nullptr ) override; + QRectF boundingRect() const override; - virtual void drawBorder() override; - virtual void updateView(bool update = false) override; + void drawBorder() override; + void updateView(bool update = false) override; - void setTextItem(void); + void setTextItem(); - virtual TechDraw::DrawRichAnno* getFeature(void); + virtual TechDraw::DrawRichAnno* getFeature(); QPen rectPen() const; void setExportingPdf(bool b) { m_isExportingPdf = b; } - bool getExportingPdf(void) { return m_isExportingPdf; } + bool getExportingPdf() { return m_isExportingPdf; } void setExportingSvg(bool b) { m_isExportingSvg = b; } - bool getExportingSvg(void) { return m_isExportingSvg; } + bool getExportingSvg() { return m_isExportingSvg; } protected: - virtual void draw() override; + void draw() override; void setLineSpacing(int lineSpacing); QFont prefFont(void); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; bool m_isExportingPdf; bool m_isExportingSvg; diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h index ebb6dbbdec..ca2f927f8e 100644 --- a/src/Mod/TechDraw/Gui/QGISectionLine.h +++ b/src/Mod/TechDraw/Gui/QGISectionLine.h @@ -47,12 +47,12 @@ class TechDrawGuiExport QGISectionLine : public QGIDecoration { public: explicit QGISectionLine(); - ~QGISectionLine() {} + ~QGISectionLine() override = default; enum {Type = QGraphicsItem::UserType + 172}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; void setEnds(Base::Vector3d l1, Base::Vector3d l2); void setBounds(double x1, double y1, double x2, double y2); @@ -68,7 +68,7 @@ public: bool pathMode() { return m_pathMode; } void setChangePoints(TechDraw::ChangePointVector changePoints); void clearChangePoints(); - virtual void draw(); + void draw() override; protected: QColor getSectionColor(); diff --git a/src/Mod/TechDraw/Gui/QGITemplate.h b/src/Mod/TechDraw/Gui/QGITemplate.h index 38cc3a073e..52202b4574 100644 --- a/src/Mod/TechDraw/Gui/QGITemplate.h +++ b/src/Mod/TechDraw/Gui/QGITemplate.h @@ -47,10 +47,10 @@ class TechDrawGuiExport QGITemplate : public QObject, public QGraphicsItemGroup public: QGITemplate(QGSPage *); - ~QGITemplate(); + ~QGITemplate() override; enum {Type = QGraphicsItem::UserType + 150}; - int type() const { return Type;} + int type() const override { return Type;} void clearContents(); @@ -60,7 +60,7 @@ public: inline qreal getY() { return y() * -1; } virtual void updateView(bool update = false); - std::vector getTextFields(void) { return textFields; }; + std::vector getTextFields() { return textFields; }; virtual void draw() = 0; diff --git a/src/Mod/TechDraw/Gui/QGITile.h b/src/Mod/TechDraw/Gui/QGITile.h index d307f2b3c5..a9eb95d321 100644 --- a/src/Mod/TechDraw/Gui/QGITile.h +++ b/src/Mod/TechDraw/Gui/QGITile.h @@ -47,12 +47,12 @@ class TechDrawGuiExport QGITile : public QGIDecoration { public: explicit QGITile(TechDraw::DrawTileWeld*); - ~QGITile(void); + ~QGITile() override; enum {Type = QGraphicsItem::UserType + 325}; - int type(void) const { return Type;} + int type(void) const override { return Type;} - virtual QRectF boundingRect() const; + QRectF boundingRect() const override; void setTileTextLeft(std::string s); void setTileTextRight(std::string s); @@ -64,8 +64,8 @@ public: void setTileScale(double s); void setTailRight(bool b) { m_tailRight = b; } void setAltWeld(bool b) { m_altWeld = b; } - bool isTailRight(void); - virtual void draw(void); + bool isTailRight(); + void draw() override; protected: QColor getTileColor(void) const; diff --git a/src/Mod/TechDraw/Gui/QGIVertex.h b/src/Mod/TechDraw/Gui/QGIVertex.h index 3f846a8682..31ed77576c 100644 --- a/src/Mod/TechDraw/Gui/QGIVertex.h +++ b/src/Mod/TechDraw/Gui/QGIVertex.h @@ -34,11 +34,11 @@ class TechDrawGuiExport QGIVertex : public QGIPrimPath { public: explicit QGIVertex(int index); - ~QGIVertex() {} + ~QGIVertex() override = default; enum {Type = QGraphicsItem::UserType + 105}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; int getProjIndex() const { return projIndex; } diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index 983f4d933a..ee3e132e0c 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -77,7 +77,7 @@ class TechDrawGuiExport QGIView : public QObject, public QGraphicsItemGroup Q_OBJECT public: QGIView(); - ~QGIView(); + ~QGIView() override; enum {Type = QGraphicsItem::UserType + 101}; int type() const override { return Type;} diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h index f37b3f4162..00cccbbf73 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h @@ -62,7 +62,7 @@ class QGIBalloonLabel: public QGraphicsObject public: QGIBalloonLabel(); - ~QGIBalloonLabel() = default; + ~QGIBalloonLabel() override = default; enum { @@ -174,7 +174,7 @@ public: }; explicit QGIViewBalloon(); - ~QGIViewBalloon() = default; + ~QGIViewBalloon() override = default; void setViewPartFeature(TechDraw::DrawViewBalloon* balloonFeat); int type() const override diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index ce6708a68a..46e16e802c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -62,7 +62,7 @@ Q_OBJECT public: QGIDatumLabel(); - ~QGIDatumLabel() = default; + ~QGIDatumLabel() override = default; enum {Type = QGraphicsItem::UserType + 107}; int type() const override { return Type;} @@ -159,7 +159,7 @@ public: enum {Type = QGraphicsItem::UserType + 106}; QGIViewDimension(); - ~QGIViewDimension() = default; + ~QGIViewDimension() override = default; void setViewPartFeature(TechDraw::DrawViewDimension *obj); int type() const override { return Type;} diff --git a/src/Mod/TechDraw/Gui/QGMText.h b/src/Mod/TechDraw/Gui/QGMText.h index 1e42aed927..d65759e6b3 100644 --- a/src/Mod/TechDraw/Gui/QGMText.h +++ b/src/Mod/TechDraw/Gui/QGMText.h @@ -46,21 +46,21 @@ Q_OBJECT public: explicit QGMText(void); - ~QGMText() {} + ~QGMText() override = default; enum {Type = QGraphicsItem::UserType + 300}; int type() const override { return Type;} - virtual void paint( QPainter * painter, - const QStyleOptionGraphicsItem * option, - QWidget * widget = nullptr ) override; + void paint( QPainter * painter, + const QStyleOptionGraphicsItem * option, + QWidget * widget = nullptr ) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; virtual void showBox(bool b) { m_showBox = b; } - virtual bool showBox(void) { return m_showBox; } + virtual bool showBox() { return m_showBox; } - virtual void setPrettyNormal() override; - virtual void setPrettyPre() override; - virtual void setPrettySel() override; + void setPrettyNormal() override; + void setPrettyPre() override; + void setPrettySel() override; Q_SIGNALS: void dragging(); @@ -69,9 +69,9 @@ Q_SIGNALS: void dragFinished(); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; private: bool m_showBox; diff --git a/src/Mod/TechDraw/Gui/QGSPage.h b/src/Mod/TechDraw/Gui/QGSPage.h index 63794b4b14..dfb1a6b899 100644 --- a/src/Mod/TechDraw/Gui/QGSPage.h +++ b/src/Mod/TechDraw/Gui/QGSPage.h @@ -75,7 +75,7 @@ class TechDrawGuiExport QGSPage: public QGraphicsScene public: explicit QGSPage(ViewProviderPage* vpPage, QWidget* parent = nullptr); - ~QGSPage() = default; + ~QGSPage() override = default; bool addView(const App::DocumentObject* obj); bool attachView(App::DocumentObject* obj); diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index 7fa5ca5433..7ae6a8e486 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -85,7 +85,7 @@ public: }; QGVPage(ViewProviderPage* vpPage, QGSPage* scenePage, QWidget* parent = nullptr); - ~QGVPage(); + ~QGVPage() override; void setRenderer(RendererType type = Native); void drawBackground(QPainter* painter, const QRectF& rect) override; diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h index c8dddfab66..d8ed9a8bae 100644 --- a/src/Mod/TechDraw/Gui/SymbolChooser.h +++ b/src/Mod/TechDraw/Gui/SymbolChooser.h @@ -39,7 +39,7 @@ public: SymbolChooser(QWidget *parent = nullptr, QString startDir = QString(), QString source = QString()); - ~SymbolChooser(); + ~SymbolChooser() override; public Q_SLOTS: void onOKClicked(); diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h index 553f85c1e6..b07bff267d 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.h +++ b/src/Mod/TechDraw/Gui/TaskActiveView.h @@ -51,7 +51,7 @@ class TechDrawGuiExport TaskActiveView : public QWidget public: TaskActiveView(TechDraw::DrawPage* pageFeat); - ~TaskActiveView(); + ~TaskActiveView() override; public Q_SLOTS: @@ -64,7 +64,7 @@ public: void enableTaskButtons(bool b); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; void blockButtons(bool b); void setUiPrimary(void); diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.h b/src/Mod/TechDraw/Gui/TaskComplexSection.h index a6f2498072..4adaeb1a1b 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.h +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.h @@ -63,7 +63,7 @@ public: App::DocumentObject* profileObject, std::vector profileSubs); TaskComplexSection(TechDraw::DrawComplexSection* complexSection); - ~TaskComplexSection() = default; + ~TaskComplexSection() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h index a72810109e..7120472121 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.h +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h @@ -58,7 +58,7 @@ class TaskCosVertex : public QWidget public: TaskCosVertex(TechDraw::DrawViewPart* baseFeat, TechDraw::DrawPage* page); - ~TaskCosVertex() = default; + ~TaskCosVertex() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h index 0fedb3d579..ab91f04646 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.h +++ b/src/Mod/TechDraw/Gui/TaskDetail.h @@ -62,7 +62,7 @@ class TaskDetail : public QWidget public: explicit TaskDetail(TechDraw::DrawViewPart* baseFeat); explicit TaskDetail(TechDraw::DrawViewDetail* detailFeat); - ~TaskDetail() = default; + ~TaskDetail() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.h b/src/Mod/TechDraw/Gui/TaskDimRepair.h index 39ea26c981..dbed5ceb88 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.h +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.h @@ -88,24 +88,24 @@ class TaskDlgDimReference: public Gui::TaskView::TaskDialog Q_OBJECT public: - TaskDlgDimReference(TechDraw::DrawViewDimension* inDvd); - ~TaskDlgDimReference(); + explicit TaskDlgDimReference(TechDraw::DrawViewDimension* inDvd); + ~TaskDlgDimReference() 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 reject 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 presses the help button - virtual void helpRequested() + void helpRequested() override { return; } - virtual bool isAllowedAlterDocument(void) const + bool isAllowedAlterDocument() const override { return false; } diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h index 6bc3143efe..c191c53a5e 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h @@ -50,7 +50,7 @@ class TaskGeomHatch : public QWidget public: TaskGeomHatch(TechDraw::DrawGeomHatch* inHatch, TechDrawGui::ViewProviderGeomHatch* inVp, bool mode); - ~TaskGeomHatch() = default; + ~TaskGeomHatch() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h index 1cfd02252d..63ad256d71 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h @@ -58,7 +58,7 @@ public: TaskLeaderLine(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); explicit TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP); - ~TaskLeaderLine() = default; + ~TaskLeaderLine() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index 8fdf6e01b4..4f9544e980 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -49,7 +49,7 @@ class TaskProjGroup : public QWidget public: TaskProjGroup(TechDraw::DrawProjGroup* featView, bool mode); - ~TaskProjGroup() = default; + ~TaskProjGroup() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h index 45fa430e4b..51799e05d1 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.h +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h @@ -58,7 +58,7 @@ public: TaskRichAnno(TechDraw::DrawView* baseFeat, TechDraw::DrawPage* page); explicit TaskRichAnno(TechDrawGui::ViewProviderRichAnno* annoVP); - ~TaskRichAnno() = default; + ~TaskRichAnno() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h index 9412f290da..9fded79896 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.h +++ b/src/Mod/TechDraw/Gui/TaskSectionView.h @@ -48,7 +48,7 @@ class TaskSectionView : public QWidget public: explicit TaskSectionView(TechDraw::DrawViewPart* base); explicit TaskSectionView(TechDraw::DrawViewSection* section); - ~TaskSectionView() = default; + ~TaskSectionView() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h index eac4632bc3..cd9a14e987 100644 --- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h +++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h @@ -79,7 +79,7 @@ class TaskSurfaceFinishSymbols : public QWidget public: explicit TaskSurfaceFinishSymbols(TechDraw::DrawViewPart* view); - ~TaskSurfaceFinishSymbols() = default; + ~TaskSurfaceFinishSymbols() override = default; virtual bool accept(); virtual bool reject(); diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h index 5d8090e097..25a5925244 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h @@ -97,7 +97,7 @@ class TechDrawGuiExport TaskWeldingSymbol : public QWidget public: TaskWeldingSymbol(TechDraw::DrawLeaderLine* leadFeat); TaskWeldingSymbol(TechDraw::DrawWeldSymbol* weldFeat); - ~TaskWeldingSymbol(); + ~TaskWeldingSymbol() override; virtual bool accept(); virtual bool reject(); @@ -123,18 +123,18 @@ public Q_SLOTS: void onSymbolSelected(QString symbolPath, QString source); protected: - void changeEvent(QEvent *event); - void setUiPrimary(void); + void changeEvent(QEvent *event) override; + void setUiPrimary(); void setUiEdit(); - TechDraw::DrawWeldSymbol* createWeldingSymbol(void); - void updateWeldingSymbol(void); + TechDraw::DrawWeldSymbol* createWeldingSymbol(); + void updateWeldingSymbol(); - void getTileFeats(void); - void updateTiles(void); + void getTileFeats(); + void updateTiles(); - void collectArrowData(void); - void collectOtherData(void); + void collectArrowData(); + void collectOtherData(); std::string prefSymbolDir(); diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h index b39ed90f83..3b880277e0 100644 --- a/src/Mod/TechDraw/Gui/TemplateTextField.h +++ b/src/Mod/TechDraw/Gui/TemplateTextField.h @@ -45,10 +45,10 @@ class TechDrawGuiExport TemplateTextField : public QGraphicsRectItem TechDraw::DrawTemplate *myTmplte, const std::string &myFieldName); - virtual ~TemplateTextField() = default; + ~TemplateTextField() override = default; enum {Type = QGraphicsItem::UserType + 160}; - int type() const { return Type;} + int type() const override { return Type;} /// Returns the field name that this TemplateTextField represents std::string fieldName() const { return fieldNameStr; } @@ -58,10 +58,10 @@ class TechDrawGuiExport TemplateTextField : public QGraphicsRectItem std::string fieldNameStr; /// Need this to properly handle mouse release - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; /// Trigger the dialog for editing template text - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h index 34f4fac097..51cb09013b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h @@ -36,10 +36,10 @@ class TechDrawGuiExport ViewProviderCosmeticExtension : public Gui::ViewProvider public: /// Constructor - ViewProviderCosmeticExtension(void); - virtual ~ViewProviderCosmeticExtension() = default; + ViewProviderCosmeticExtension(); + ~ViewProviderCosmeticExtension() override = default; - virtual QIcon extensionMergeGreyableOverlayIcons(const QIcon & orig) const override; + QIcon extensionMergeGreyableOverlayIcons(const QIcon & orig) const override; }; using ViewProviderCosmeticExtensionPython = Gui::ViewProviderExtensionPythonT; diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h index 0b45767d01..868ac4e1d5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h @@ -64,7 +64,7 @@ public: TechDraw::DrawGeomHatch* getViewObject() const; - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h index 8f82ff787f..f9c6819ca5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h @@ -49,19 +49,19 @@ public: void attach(App::DocumentObject *) override; - virtual bool useNewSelectionModel(void) const override {return false;} - virtual void updateData(const App::Property*) override; - virtual void onChanged(const App::Property *prop) override; - virtual void hide(void) override; - virtual void show(void) override; - virtual bool isShow(void) const override; + bool useNewSelectionModel() const override {return false;} + void updateData(const App::Property*) override; + void onChanged(const App::Property *prop) override; + void hide() override; + void show() override; + bool isShow() const override; QGITemplate* getQTemplate(void); TechDraw::DrawTemplate* getTemplate() const; MDIViewPage* getMDIViewPage(void) const; - virtual Gui::MDIView *getMDIView() const override; + Gui::MDIView *getMDIView() const override; void setMarkers(bool state); - virtual bool onDelete(const std::vector &) override; + bool onDelete(const std::vector &) override; const char* whoAmI() const; diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h index ac08dd32f3..181d891ddb 100644 --- a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.h @@ -36,8 +36,8 @@ class CompassDialWidget : public QWidget Q_OBJECT public: - CompassDialWidget(QWidget* parent = 0); - ~CompassDialWidget() = default; + CompassDialWidget(QWidget* parent = nullptr); + ~CompassDialWidget() override = default; QSize sizeHint() const override; QSize minimumSizeHint() const override; diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h index 7a6b1fda82..fff82ace91 100644 --- a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.h @@ -46,8 +46,8 @@ class CompassWidget: public QWidget Q_PROPERTY(double angle READ dialAngle WRITE setDialAngle NOTIFY angleChanged) public: - CompassWidget(QWidget* parent = 0); - ~CompassWidget() = default; + CompassWidget(QWidget* parent = nullptr); + ~CompassWidget() override = default; QSize sizeHint() const override; QSize minimumSizeHint() const override; diff --git a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h index 5ca66ab76d..696e60d952 100644 --- a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h +++ b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.h @@ -51,7 +51,7 @@ class VectorEditWidget : public QWidget public: VectorEditWidget(QWidget* parent = 0); - ~VectorEditWidget() = default; + ~VectorEditWidget() override = default; QSize minimumSizeHint() const override; bool eventFilter(QObject *target, QEvent *event) override; diff --git a/src/Mod/TechDraw/Gui/Workbench.h b/src/Mod/TechDraw/Gui/Workbench.h index f6ff098dbe..6633b73e6e 100644 --- a/src/Mod/TechDraw/Gui/Workbench.h +++ b/src/Mod/TechDraw/Gui/Workbench.h @@ -35,16 +35,16 @@ namespace TechDrawGui { */ class TechDrawGuiExport Workbench : public Gui::StdWorkbench { - TYPESYSTEM_HEADER(); + TYPESYSTEM_HEADER_WITH_OVERRIDE(); public: Workbench(); - virtual ~Workbench(); + ~Workbench() override; protected: - Gui::MenuItem* setupMenuBar() const; - Gui::ToolBarItem* setupToolBars() const; - Gui::ToolBarItem* setupCommandBars() const; + Gui::MenuItem* setupMenuBar() const override; + Gui::ToolBarItem* setupToolBars() const override; + Gui::ToolBarItem* setupCommandBars() const override; }; } // namespace TechDrawGui diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.h b/src/Mod/TechDraw/Gui/mrichtextedit.h index cafe0617a4..6c5f3bf6a4 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.h +++ b/src/Mod/TechDraw/Gui/mrichtextedit.h @@ -43,7 +43,7 @@ class MRichTextEdit : public QWidget, protected Ui::MRichTextEdit { public: MRichTextEdit(QWidget *parent = nullptr, QString textIn = QString() ); - ~MRichTextEdit() = default; + ~MRichTextEdit() override = default; QString toPlainText() const { return f_textedit->toPlainText(); } QString toHtml() const; @@ -70,8 +70,8 @@ protected: void bgColorChanged(const QColor &color); void list(bool checked, QTextListFormat::Style style); void indent(int delta); - void focusInEvent(QFocusEvent *event); - void keyPressEvent(QKeyEvent *event); + void focusInEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; bool hasMultipleSizes(); void addFontSize(QString fontSize); diff --git a/src/Mod/TechDraw/Gui/mtextedit.h b/src/Mod/TechDraw/Gui/mtextedit.h index eb6737c2b1..a8eca1ff9c 100644 --- a/src/Mod/TechDraw/Gui/mtextedit.h +++ b/src/Mod/TechDraw/Gui/mtextedit.h @@ -38,9 +38,9 @@ class MTextEdit : public QTextEdit { void dropImage(const QImage& image, const QString& format); protected: - bool canInsertFromMimeData(const QMimeData *source) const; - void insertFromMimeData(const QMimeData *source); - QMimeData *createMimeDataFromSelection() const; + bool canInsertFromMimeData(const QMimeData *source) const override; + void insertFromMimeData(const QMimeData *source) override; + QMimeData *createMimeDataFromSelection() const override; };