kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

TechDraw: [skip ci] fix -Winconsistent-missing-override

Browse Source
This commit is contained in:
wmayer
2019-12-29 00:02:15 +01:00
parent 100dd0bfcc
commit 7f77b1e6c9
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/TechDraw/App/DrawViewBalloon.h
View File

@@ -42,7 +42,7 @@ class DrawViewPart;
class TechDrawExport DrawViewBalloon : public TechDraw::DrawView
{
PROPERTY_HEADER(TechDraw::DrawViewBalloon);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewBalloon);
public:
/// Constructor
@@ -60,18 +60,18 @@ public:
App::PropertyBool OriginIsSet;
App::PropertyFloat TextWrapLen;
short mustExecute() const;
short mustExecute() const override;
DrawViewPart* getViewPart() const;
QPointF origin;
//virtual PyObject *getPyObject(void);
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute(void) override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderBalloon";
}
@@ -81,10 +81,10 @@ public:
void handleXYLock(void) override;
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
/* virtual void onDocumentRestored();*/
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName);
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override;
private:
};

14
src/Mod/TechDraw/App/DrawViewDimension.h
View File

@@ -105,7 +105,7 @@ public:
App::PropertyFloat OverTolerance;
App::PropertyFloat UnderTolerance;
short mustExecute() const;
short mustExecute() const override;
bool has2DReferences(void) const;
bool has3DReferences(void) const;
bool hasTolerance(void) const;
@@ -113,20 +113,20 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute(void) override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderDimension";
}
//return PyObject as DrawViewDimensionPy
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
virtual std::string getFormatedValue(int partial = 0);
virtual double getDimValue();
DrawViewPart* getViewPart() const;
virtual QRectF getRect() const { return QRectF(0,0,1,1);} //pretend dimensions always fit!
virtual QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit!
static int getRefType1(const std::string s);
static int getRefType2(const std::string s1, const std::string s2);
static int getRefType3(const std::string g1,
@@ -145,8 +145,8 @@ public:
bool isMultiValueSchema(void) const;
protected:
virtual void onChanged(const App::Property* prop);
virtual void onDocumentRestored();
virtual void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
bool showUnits() const;
bool useDecimals() const;
std::string getPrefix() const;