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

Clean up clang inconsistent override warnings.

Browse Source
This commit is contained in:
Ian Rees
2017-03-01 18:00:30 +13:00
committed by wmayer
parent 3d6fc352c5
commit 4303384667
21 changed files with 107 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/App/FaceMaker.h
View File

@@ -132,7 +132,7 @@ public:
*/
class PartExport FaceMakerSimple : public FaceMakerPublic
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual std::string getUserFriendlyName() const override;
virtual std::string getBriefExplanation() const override;

2
src/Mod/Part/App/FaceMakerBullseye.h
View File

@@ -44,7 +44,7 @@ namespace Part
*/
class PartExport FaceMakerBullseye: public FaceMakerPublic
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
FaceMakerBullseye()
:planeSupplied(false){}

2
src/Mod/Part/App/FaceMakerCheese.h
View File

@@ -41,7 +41,7 @@ namespace Part
*/
class PartExport FaceMakerCheese: public FaceMakerPublic
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual std::string getUserFriendlyName() const override;
virtual std::string getBriefExplanation() const override;

10
src/Mod/Part/App/FeatureExtrusion.h
View File

@@ -35,7 +35,7 @@ namespace Part
class PartExport Extrusion : public Part::Feature
{
PROPERTY_HEADER(Part::Extrusion);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Extrusion);
public:
Extrusion();
@@ -73,10 +73,10 @@ 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 "PartGui::ViewProviderExtrusion";
}
//@}
@@ -135,7 +135,7 @@ protected:
*/
class FaceMakerExtrusion: public FaceMakerCheese
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual std::string getUserFriendlyName() const override;
virtual std::string getBriefExplanation() const override;

8
src/Mod/Part/App/FeatureFace.h
View File

@@ -31,7 +31,7 @@ namespace Part
class PartExport Face : public Part::Feature
{
PROPERTY_HEADER(Part::Face);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Face);
public:
Face();
@@ -42,10 +42,10 @@ 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 ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName(void) const override {
return "PartGui::ViewProviderFace";
}
void setupObject() override;

4
src/Mod/Part/App/FeatureOffset.h
View File

@@ -32,7 +32,7 @@ namespace Part
class PartExport Offset : public Part::Feature
{
PROPERTY_HEADER(Part::Offset);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Offset);
public:
Offset();
@@ -63,7 +63,7 @@ private:
class PartExport Offset2D : public Offset
{
PROPERTY_HEADER(Part::Offset2D);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Offset2D);
public:
Offset2D();
~Offset2D();

10
src/Mod/Part/App/FeatureRevolution.h
View File

@@ -33,7 +33,7 @@ namespace Part
class PartExport Revolution : public Part::Feature
{
PROPERTY_HEADER(Part::Revolution);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Revolution);
public:
Revolution();
@@ -50,13 +50,13 @@ public:
/** @name methods override feature */
//@{
/// recalculate the feature
App::DocumentObjectExecReturn *execute(void);
short mustExecute() const;
App::DocumentObjectExecReturn *execute(void) override;
short mustExecute() const override;
void onChanged(const App::Property* prop) override;
/// returns the type name of the view provider
const char* getViewProviderName(void) const {
const char* getViewProviderName(void) const override{
return "PartGui::ViewProviderRevolution";
}
//@}
@@ -82,7 +82,7 @@ private:
static App::PropertyFloatConstraint::Constraints angleRangeU;
protected:
virtual void setupObject();
virtual void setupObject() override;
};
} //namespace Part

2
src/Mod/Part/Gui/TaskAttacher.h
View File

@@ -87,7 +87,7 @@ private Q_SLOTS:
void visibilityAutomation(bool opening_not_closing);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
void objectDeleted(const Gui::ViewProviderDocumentObject&);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;

20
src/Mod/PartDesign/App/Body.h
View File

@@ -40,7 +40,7 @@ class Feature;
class PartDesignExport Body : public Part::BodyBase
{
PROPERTY_HEADER(PartDesign::Body);
PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Body);
public:
@@ -52,11 +52,11 @@ 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::ViewProviderBody";
}
//@}
@@ -107,7 +107,7 @@ public:
* all features derived from PartDesign::Feature and Part::Datum and sketches
*/
static bool isAllowed(const App::DocumentObject* f);
virtual bool allowObject(DocumentObject* f) {return isAllowed(f);};
virtual bool allowObject(DocumentObject* f) override {return isAllowed(f);};
/**
* Return the body which this feature belongs too, or NULL
@@ -115,14 +115,14 @@ public:
*/
static Body *findBodyOf(const App::DocumentObject* feature);
PyObject *getPyObject(void);
PyObject *getPyObject(void) override;
protected:
virtual void onSettingDocument();
virtual void onSettingDocument() override;
/// Adjusts the first solid's feature's base on on BaseFeature getting setted
virtual void onChanged (const App::Property* prop);
virtual void onChanged (const App::Property* prop) override;
/**
* Return the solid feature before the given feature, or before the Tip feature
@@ -137,9 +137,9 @@ protected:
App::DocumentObject *getNextSolidFeature(App::DocumentObject* start = NULL);
/// Creates the corresponding Origin object
virtual void setupObject ();
virtual void setupObject () override;
/// Removes all planes and axis if they are still linked to the document
virtual void unsetupObject ();
virtual void unsetupObject () override;
private:
boost::signals::scoped_connection connection;

16
src/Mod/TechDraw/App/DrawProjGroup.h
View File

@@ -47,7 +47,7 @@ class Cube;
*/
class TechDrawExport DrawProjGroup : public TechDraw::DrawViewCollection
{
PROPERTY_HEADER(TechDraw::DrawProjGroup);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawProjGroup);
public:
/// Constructor
@@ -66,7 +66,7 @@ public:
Base::BoundBox3d getBoundingBox() const;
double calculateAutomaticScale() const;
virtual QRectF getRect(void) const;
virtual QRectF getRect(void) const override;
virtual bool checkFit(TechDraw::DrawPage* p) const override;
/// Check if container has a view of a specific type
bool hasProjection(const char *viewProjType) const;
@@ -91,20 +91,20 @@ public:
bool distributeProjections(void);
void resetPositions(void);
short mustExecute() const;
short mustExecute() const override;
/** @name methods overide Feature */
//@{
/// recalculate the Feature
virtual void onDocumentRestored();
virtual App::DocumentObjectExecReturn *execute(void);
virtual void onDocumentRestored() override;
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::ViewProviderProjGroup";
}
//return PyObject as DrawProjGroupPy
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
/// Determines either "First Angle" or "Third Angle".
App::Enumeration usedProjectionType(void);
@@ -132,7 +132,7 @@ public:
void dumpISO(char * title);
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
//! Moves anchor view to keep our bounding box centre on the origin
void moveToCentre();

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

@@ -48,7 +48,7 @@ class DrawProjGroup;
class TechDrawExport DrawProjGroupItem : public TechDraw::DrawViewPart
{
PROPERTY_HEADER(TechDraw::DrawProjGroupItem);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawProjGroupItem);
public:
/// Constructor
@@ -58,26 +58,26 @@ public:
App::PropertyEnumeration Type;
App::PropertyVector RotationVector;
short mustExecute() const;
virtual void onDocumentRestored();
virtual void unsetupObject();
short mustExecute() const override;
virtual void onDocumentRestored() override;
virtual void unsetupObject() override;
DrawProjGroup* getGroup(void) const;
double getRotateAngle();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderProjGroupItem";
}
//return PyObject as DrawProjGroupItemPy
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt,
const Base::Vector3d& direction,
const bool flip=true) const override;
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
static const char* TypeEnums[];

10
src/Mod/TechDraw/App/DrawViewSymbol.h
View File

@@ -37,7 +37,7 @@ class DrawPage;
class TechDrawExport DrawViewSymbol : public TechDraw::DrawView
{
PROPERTY_HEADER(TechDraw::DrawViewSymbol);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewSymbol);
public:
/// Constructor
@@ -50,19 +50,19 @@ public:
/** @name methods overide 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::ViewProviderSymbol";
}
virtual QRectF getRect() const;
virtual QRectF getRect() const override;
virtual bool checkFit(TechDraw::DrawPage* p) const override;
protected:
virtual void onChanged(const App::Property* prop);
virtual void onChanged(const App::Property* prop) override;
Base::BoundBox3d bbox;
};

15
src/Mod/TechDraw/Gui/QGIViewDimension.h
View File

@@ -94,12 +94,14 @@ public:
~QGIViewDimension() = default;
void setViewPartFeature(TechDraw::DrawViewDimension *obj);
int type() const { return Type;}
int type() const override { return Type;}
virtual void drawBorder();
virtual void drawBorder() override;
virtual void updateView(bool update = false) override;
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
virtual QColor getNormalColor(void);
virtual void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = 0 ) override;
virtual QColor getNormalColor(void) override;
public Q_SLOTS:
void datumLabelDragged(void);
@@ -109,8 +111,9 @@ public Q_SLOTS:
void updateDim(void);
protected:
void draw();
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
void draw() override;
virtual QVariant itemChange( GraphicsItemChange change,
const QVariant &value ) override;
virtual void setSvgPens(void);
virtual void setPens(void);