TD: modernize C++: use override

This commit is contained in:
wmayer
2023-08-04 12:23:35 +02:00
committed by wwmayer
parent 6ff3ee9951
commit ed251a914b
75 changed files with 275 additions and 275 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawLeaderLine : public TechDraw::DrawView
public:
DrawLeaderLine();
~DrawLeaderLine() = default;
~DrawLeaderLine() override = default;
App::PropertyLink LeaderParent;
App::PropertyVectorList WayPoints;

View File

@@ -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<TechDraw::BaseGeomPtr> 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<TechDraw::BaseGeomPtr> geom;

View File

@@ -55,7 +55,7 @@ class TechDrawExport DrawProjGroup : public TechDraw::DrawViewCollection
public:
/// Constructor
DrawProjGroup();
~DrawProjGroup() = default;
~DrawProjGroup() override = default;
App::PropertyLinkList Source;
App::PropertyXLinkList XSource;

View File

@@ -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

View File

@@ -39,7 +39,7 @@ class TechDrawExport DrawRichAnno : public TechDraw::DrawView
public:
DrawRichAnno();
~DrawRichAnno() = default;
~DrawRichAnno() override = default;
App::PropertyLink AnnoParent;
App::PropertyString AnnoText;

View File

@@ -63,7 +63,7 @@ public:
}
// from base class
virtual PyObject *getPyObject(void) override;
PyObject *getPyObject(void) override;
private:
static const char* OrientationEnums[];

View File

@@ -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;

View File

@@ -42,7 +42,7 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView
public:
/// Constructor
DrawViewAnnotation();
~DrawViewAnnotation() = default;
~DrawViewAnnotation() override = default;
App::PropertyStringList Text;
App::PropertyFont Font;

View File

@@ -41,7 +41,7 @@ class TechDrawExport DrawViewArch : public TechDraw::DrawViewSymbol
public:
/// Constructor
DrawViewArch();
~DrawViewArch() = default;
~DrawViewArch() override = default;
App::PropertyLink Source;
App::PropertyBool AllOn;

View File

@@ -42,7 +42,7 @@ class TechDrawExport DrawViewClip: public TechDraw::DrawView
public:
/// Constructor
DrawViewClip();
~DrawViewClip() = default;
~DrawViewClip() override = default;
App::PropertyLength Width;
App::PropertyLength Height;

View File

@@ -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

View File

@@ -42,7 +42,7 @@ class TechDrawExport DrawViewDraft : public TechDraw::DrawViewSymbol
public:
/// Constructor
DrawViewDraft();
~DrawViewDraft() = default;
~DrawViewDraft() override = default;
App::PropertyLink Source;
App::PropertyFloat LineWidth;

View File

@@ -41,7 +41,7 @@ class TechDrawExport DrawWeldSymbol : public TechDraw::DrawView
public:
DrawWeldSymbol();
~DrawWeldSymbol() = default;
~DrawWeldSymbol() override = default;
App::PropertyLink Leader;
App::PropertyBool AllAround;

View File

@@ -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;
//@}
};

View File

@@ -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<CenterLine*> &getValues(void) const {
const std::vector<CenterLine*> &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<CenterLine*> _lValueList;

View File

@@ -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<CosmeticEdge*> &getValues(void) const {
const std::vector<CosmeticEdge*> &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<CosmeticEdge*> _lValueList;

View File

@@ -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<CosmeticVertex*> &getValues(void) const {
const std::vector<CosmeticVertex*> &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<CosmeticVertex*> _lValueList;

View File

@@ -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<GeomFormat*> &getValues(void) const {
const std::vector<GeomFormat*> &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<GeomFormat*> _lValueList;