Fix clang compiler warnings:

+ fix -Winconsistent-missing-override
This commit is contained in:
wmayer
2019-08-09 19:16:08 +02:00
parent 67b06d7a36
commit 4c648caaa8
9 changed files with 60 additions and 60 deletions

View File

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

View File

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

View File

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

View File

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