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

Mod: Use override etc 2

Browse Source
This commit is contained in:
berniev
2022-08-09 11:53:46 +10:00
committed by wwmayer
parent 75fa455c5d
commit 71dc5ead2f
697 changed files with 4956 additions and 4956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/AppPartDesignPy.cpp
View File

@@ -40,7 +40,7 @@ public:
initialize("This module is the PartDesign module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
Py::Object makeFilletArc(const Py::Tuple& args)

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

@@ -63,8 +63,8 @@ public:
* Add the feature into the body at the current insert point.
* The insertion poin is the before next solid after the Tip feature
*/
virtual std::vector<App::DocumentObject*> addObject(App::DocumentObject*) override;
virtual std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override;
std::vector<App::DocumentObject*> addObject(App::DocumentObject*) override;
std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override;
/**
* Insert the feature into the body after the given feature.
@@ -82,7 +82,7 @@ public:
void setBaseProperty(App::DocumentObject* feature);
/// Remove the feature from the body
virtual std::vector<DocumentObject*> removeObject(DocumentObject* obj) override;
std::vector<DocumentObject*> removeObject(DocumentObject* obj) override;
/**
* Checks if the given document object lays after the current insert point
@@ -105,7 +105,7 @@ public:
* all features derived from PartDesign::Feature and Part::Datum and sketches
*/
static bool isAllowed(const App::DocumentObject *obj);
virtual bool allowObject(DocumentObject *obj) override {
bool allowObject(DocumentObject *obj) override {
return isAllowed(obj);
}
@@ -117,8 +117,8 @@ public:
PyObject *getPyObject() override;
virtual std::vector<std::string> getSubObjects(int reason=0) const override;
virtual App::DocumentObject *getSubObject(const char *subname,
std::vector<std::string> getSubObjects(int reason=0) const override;
App::DocumentObject *getSubObject(const char *subname,
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override;
void setShowTip(bool enable) {
@@ -141,17 +141,17 @@ public:
bool isSolid();
protected:
virtual void onSettingDocument() override;
void onSettingDocument() override;
/// Adjusts the first solid's feature's base on BaseFeature getting set
virtual void onChanged (const App::Property* prop) override;
void onChanged (const App::Property* prop) override;
/// Creates the corresponding Origin object
virtual void setupObject () override;
void setupObject () override;
/// Removes all planes and axis if they are still linked to the document
virtual void unsetupObject () override;
void unsetupObject () override;
virtual void onDocumentRestored() override;
void onDocumentRestored() override;
private:
boost::signals2::scoped_connection connection;

4
src/Mod/PartDesign/App/DatumCS.h
View File

@@ -36,7 +36,7 @@ class PartDesignExport CoordinateSystem : public Part::Datum
public:
CoordinateSystem();
virtual ~CoordinateSystem();
~CoordinateSystem() override;
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderDatumCoordinateSystem";
@@ -46,7 +46,7 @@ public:
Base::Vector3d getYAxis();
Base::Vector3d getZAxis();
virtual App::DocumentObject *getSubObject(const char *subname,
App::DocumentObject *getSubObject(const char *subname,
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override;
};

6
src/Mod/PartDesign/App/DatumLine.h
View File

@@ -38,13 +38,13 @@ class PartDesignExport Line : public Part::Datum
public:
Line();
virtual ~Line();
~Line() override;
App::PropertyEnumeration ResizeMode;
App::PropertyLength Length;
virtual void onChanged(const App::Property *prop);
void onChanged(const App::Property *prop) override;
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderDatumLine";
}

8
src/Mod/PartDesign/App/DatumPlane.h
View File

@@ -38,21 +38,21 @@ class PartDesignExport Plane : public Part::Datum
public:
Plane();
virtual ~Plane();
~Plane() override;
App::PropertyEnumeration ResizeMode;
App::PropertyLength Length;
App::PropertyLength Width;
virtual void onChanged(const App::Property *prop);
const char* getViewProviderName() const {
void onChanged(const App::Property *prop) override;
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderDatumPlane";
}
Base::Vector3d getNormal();
protected:
virtual void Restore(Base::XMLReader& reader);
void Restore(Base::XMLReader& reader) override;
private:
static const char* ResizeModeEnums[];

6
src/Mod/PartDesign/App/DatumPoint.h
View File

@@ -37,7 +37,7 @@ class PartDesignExport Point : public Part::Datum
public:
Point();
virtual ~Point();
~Point() override;
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderDatumPoint";
@@ -48,8 +48,8 @@ public:
typedef Part::Datum Superclass;
protected:
virtual void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
void onChanged(const App::Property* prop) override;
void onDocumentRestored() override;
private:
void makeShape();

6
src/Mod/PartDesign/App/Feature.h
View File

@@ -55,7 +55,7 @@ public:
App::PropertyLink BaseFeature;
App::PropertyLinkHidden _Body;
short mustExecute() const;
short mustExecute() const override;
/// Check whether the given feature is a datum feature
static bool isDatum(const App::DocumentObject* feature);
@@ -75,9 +75,9 @@ public:
/// Returns the BaseFeature property's TopoShape (if any)
Part::TopoShape getBaseTopoShape(bool silent=false) const;
virtual PyObject* getPyObject();
PyObject* getPyObject() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProvider";
}

6
src/Mod/PartDesign/App/FeatureAddSub.h
View File

@@ -44,7 +44,7 @@ public:
Type getAddSubType();
virtual short mustExecute() const override;
short mustExecute() const override;
virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);
@@ -65,7 +65,7 @@ class FeatureAdditivePython : public FeatureAddSubPython
public:
FeatureAdditivePython();
~FeatureAdditivePython();
~FeatureAdditivePython() override;
};
class FeatureSubtractivePython : public FeatureAddSubPython
@@ -74,7 +74,7 @@ class FeatureSubtractivePython : public FeatureAddSubPython
public:
FeatureSubtractivePython();
~FeatureSubtractivePython();
~FeatureSubtractivePython() override;
};
} //namespace PartDesign

12
src/Mod/PartDesign/App/FeatureBase.h
View File

@@ -37,17 +37,17 @@ class PartDesignExport FeatureBase : public PartDesign::Feature
public:
FeatureBase();
virtual short int mustExecute() const;
short int mustExecute() const override;
virtual Part::Feature* getBaseObject(bool silent=false) const;
Part::Feature* getBaseObject(bool silent=false) const override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderBase";
}
virtual void onChanged(const App::Property* prop);
virtual App::DocumentObjectExecReturn* execute();
virtual void onDocumentRestored();
void onChanged(const App::Property* prop) override;
App::DocumentObjectExecReturn* execute() override;
void onDocumentRestored() override;
};
} //namespace PartDesign

2
src/Mod/PartDesign/App/FeatureBoolean.h
View File

@@ -57,7 +57,7 @@ public:
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderBoolean";
}
virtual void onChanged(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
//@}
protected:

2
src/Mod/PartDesign/App/FeatureChamfer.h
View File

@@ -56,7 +56,7 @@ public:
}
//@}
virtual void onChanged(const App::Property* /*prop*/) override;
void onChanged(const App::Property* /*prop*/) override;
void updateProperties();

8
src/Mod/PartDesign/App/FeatureDraft.h
View File

@@ -48,16 +48,16 @@ public:
/** @name methods override feature */
//@{
/// recalculate the feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderDraft";
}
//@}
private:
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
static const App::PropertyAngle::Constraints floatAngle;
};

8
src/Mod/PartDesign/App/FeatureDressUp.h
View File

@@ -44,7 +44,7 @@ public:
App::PropertyLinkSub Base;
App::PropertyBool SupportTransform;
short mustExecute() const;
short mustExecute() const override;
/// updates the Placement property from the Placement of the BaseFeature
void positionByBaseFeature();
/**
@@ -54,17 +54,17 @@ public:
* silently return a nullptr, otherwise throw Base::Exception.
* Default is false.
*/
virtual Part::Feature* getBaseObject(bool silent=false) const;
Part::Feature* getBaseObject(bool silent=false) const override;
/// extracts all edges from the subshapes (including face edges) and furthermore adds
/// all C0 continuous edges to the vector
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&);
// add argument to return the selected face that edges were derived from
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&, std::vector< std::string >&);
virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);
void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape) override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
} //namespace PartDesign

2
src/Mod/PartDesign/App/FeatureExtrude.h
View File

@@ -59,7 +59,7 @@ public:
/** @name methods override feature */
//@{
short mustExecute() const;
short mustExecute() const override;
//@}
protected:

10
src/Mod/PartDesign/App/FeatureFillet.h
View File

@@ -44,17 +44,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::ViewProviderFillet";
}
//@}
protected:
void Restore(Base::XMLReader &reader);
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
void Restore(Base::XMLReader &reader) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
};
} //namespace Part

6
src/Mod/PartDesign/App/FeatureGroove.h
View File

@@ -55,10 +55,10 @@ public:
* If Reversed is true then the direction of revolution will be reversed.
* The created material will be cut out of the sketch support
*/
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderGroove";
}
//@}

10
src/Mod/PartDesign/App/FeatureHelix.h
View File

@@ -64,10 +64,10 @@ public:
/** @name methods override feature */
//@{
App::DocumentObjectExecReturn* execute();
short mustExecute() const;
App::DocumentObjectExecReturn* execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderHelix";
}
//@}
@@ -89,9 +89,9 @@ protected:
Base::Vector3d getProfileCenterPoint();
// handle changed property types for backward compatibility
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
static const App::PropertyFloatConstraint::Constraints floatTurns;
static const App::PropertyAngle::Constraints floatAngle;

10
src/Mod/PartDesign/App/FeatureHole.h
View File

@@ -77,14 +77,14 @@ public:
/** @name methods override feature */
//@{
/// recalculate the feature
App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderHole";
}
//@}
short mustExecute() const;
short mustExecute() const override;
typedef struct {
const char * designation;
@@ -104,12 +104,12 @@ public:
} UTSClearanceDefinition;
static const UTSClearanceDefinition UTSHoleDiameters[22];
virtual void Restore(Base::XMLReader & reader);
void Restore(Base::XMLReader & reader) override;
virtual void updateProps();
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
static const App::PropertyAngle::Constraints floatAngle;
private:

8
src/Mod/PartDesign/App/FeatureLinearPattern.h
View File

@@ -44,10 +44,10 @@ public:
/** @name methods override feature */
//@{
short mustExecute() const;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderLinearPattern";
}
//@}
@@ -61,10 +61,10 @@ public:
* transformation direction will be parallel to the given edge, which must be linear
* If Reversed is true, the direction of transformation will be opposite
*/
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> );
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> ) override;
protected:
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
static const App::PropertyIntegerConstraint::Constraints intOccurrences;
};

8
src/Mod/PartDesign/App/FeatureLoft.h
View File

@@ -42,17 +42,17 @@ public:
/** @name methods override feature */
//@{
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderLoft";
}
//@}
protected:
// handle changed property
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
private:
//static const char* TypeEnums[];

8
src/Mod/PartDesign/App/FeatureMultiTransform.h
View File

@@ -41,10 +41,10 @@ public:
/** @name methods override feature */
//@{
short mustExecute() const;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderMultiTransform";
}
//@}
@@ -56,10 +56,10 @@ public:
* by the Transformations property. Subfeatures can be Mirrored, LinearPattern, PolarPattern and
* Scaled.
*/
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals);
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals) override;
protected:
virtual void positionBySupport();
void positionBySupport() override;
};
} //namespace PartDesign

4
src/Mod/PartDesign/App/FeaturePad.h
View File

@@ -51,9 +51,9 @@ public:
* If Reversed is true then the direction of revolution will be reversed.
* The created material will be fused with the sketch support (if there is one)
*/
App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderPad";
}
//@}

8
src/Mod/PartDesign/App/FeaturePipe.h
View File

@@ -48,10 +48,10 @@ public:
App::PropertyEnumeration Transformation;
App::PropertyLinkSubList Sections;
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderPipe";
}
@@ -61,7 +61,7 @@ protected:
void buildPipePath(const Part::TopoShape& input, const std::vector<std::string>& edges, TopoDS_Shape& result);
void setupAlgorithm(BRepOffsetAPI_MakePipeShell& mkPipeShell, TopoDS_Shape& auxshape);
/// handle changed property
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
private:
static const char* TypeEnums[];

4
src/Mod/PartDesign/App/FeaturePocket.h
View File

@@ -48,9 +48,9 @@ public:
* If Midplane is true, then the extrusion will extend for half of the length on both sides of the sketch plane
* The created material will be cut out of the sketch support
*/
App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderPocket";
}
//@}

8
src/Mod/PartDesign/App/FeaturePolarPattern.h
View File

@@ -46,10 +46,10 @@ public:
/** @name methods override feature */
//@{
short mustExecute() const;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderPolarPattern";
}
//@}
@@ -64,10 +64,10 @@ public:
* the given edge, which must be linear.
* If Reversed is true, the direction of rotation will be opposite.
*/
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*>);
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*>) override;
protected:
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
static const App::PropertyIntegerConstraint::Constraints intOccurrences;
static const App::PropertyAngle::Constraints floatAngle;
};

40
src/Mod/PartDesign/App/FeaturePrimitive.h
View File

@@ -49,15 +49,15 @@ public:
FeaturePrimitive();
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderPrimitive";
}
Type getPrimitiveType() {return primitiveType;}
virtual void onChanged(const App::Property* prop) override;
virtual PyObject* getPyObject() override;
void onChanged(const App::Property* prop) override;
PyObject* getPyObject() override;
/// Do nothing, just to suppress warning, must be redefined in derived classes
virtual App::DocumentObjectExecReturn* execute() override {
App::DocumentObjectExecReturn* execute() override {
return PartDesign::FeatureAddSub::execute();
}
protected:
@@ -80,8 +80,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:
@@ -119,8 +119,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
};
class PartDesignExport AdditiveCylinder : public Cylinder {
@@ -156,8 +156,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:
@@ -195,8 +195,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:
@@ -237,8 +237,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:
@@ -278,8 +278,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:
@@ -316,8 +316,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
};
class PartDesignExport AdditivePrism : public Prism {
@@ -359,8 +359,8 @@ public:
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
protected:

6
src/Mod/PartDesign/App/FeatureRevolution.h
View File

@@ -55,10 +55,10 @@ public:
* If Reversed is true then the direction of revolution will be reversed.
* The created material will be fused with the sketch support (if there is one)
*/
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderRevolution";
}
//@}

6
src/Mod/PartDesign/App/FeatureScaled.h
View File

@@ -43,10 +43,10 @@ public:
/** @name methods override feature */
//@{
short mustExecute() const;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderScaled";
}
//@}
@@ -60,7 +60,7 @@ public:
*/
// Note: We can't just use the Originals property because this will fail if the Scaled feature
// is being used inside a MultiTransform feature
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals);
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals) override;
};
} //namespace PartDesign

14
src/Mod/PartDesign/App/FeatureSketchBased.h
View File

@@ -60,9 +60,9 @@ public:
App::PropertyBool AllowMultiFace;
short mustExecute() const;
short mustExecute() const override;
void setupObject();
void setupObject() override;
/** calculates and updates the Placement property based on the features
* this one is made from: either from Base, if there is one, or from sketch,
@@ -73,7 +73,7 @@ public:
/** applies a transform on the Placement of the Sketch or its
* support if it has one
*/
virtual void transformPlacement(const Base::Placement &transform);
void transformPlacement(const Base::Placement &transform) override;
/**
* Verifies the linked Profile and returns it if it is a valid 2D object
@@ -112,11 +112,11 @@ public:
/// retrieves the number of axes in the linked sketch (defined as construction lines)
int getSketchAxisCount() const;
virtual Part::Feature* getBaseObject(bool silent=false) const;
Part::Feature* getBaseObject(bool silent=false) const override;
//backwards compatibility: profile property was renamed and has different type now
virtual void Restore(Base::XMLReader& reader);
virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName);
void Restore(Base::XMLReader& reader) override;
void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override;
// calculate the through all length
double getThroughAllLength() const;
@@ -159,7 +159,7 @@ protected:
void getAxis(const App::DocumentObject* pcReferenceAxis, const std::vector<std::string>& subReferenceAxis,
Base::Vector3d& base, Base::Vector3d& dir, ForbiddenAxis checkAxis) const;
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
bool isParallelPlane(const TopoDS_Shape&, const TopoDS_Shape&) const;
bool isEqualGeometry(const TopoDS_Shape&, const TopoDS_Shape&) const;

6
src/Mod/PartDesign/App/FeatureThickness.h
View File

@@ -47,10 +47,10 @@ public:
/** @name methods override feature */
//@{
/// recalculate the feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the view provider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderThickness";
}
//@}

10
src/Mod/PartDesign/App/FeatureTransformed.h
View File

@@ -58,7 +58,7 @@ public:
* silently return a nullptr, otherwise throw Base::Exception.
* Default is false.
*/
virtual Part::Feature* getBaseObject(bool silent=false) const;
Part::Feature* getBaseObject(bool silent=false) const override;
/// Return the sketch of the first original
App::DocumentObject* getSketchObject() const;
@@ -78,8 +78,8 @@ public:
* If Originals is empty, execute() returns immediately without doing anything as
* the actual processing will happen in the MultiTransform feature
*/
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
/** returns the compound of the shapes that were rejected during the last execute
@@ -88,8 +88,8 @@ public:
TopoDS_Shape rejected;
protected:
void Restore(Base::XMLReader &reader);
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
void Restore(Base::XMLReader &reader) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
virtual void positionBySupport();
TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const;
void divideTools(const std::vector<TopoDS_Shape> &toolsIn, std::vector<TopoDS_Shape> &individualsOut,

30
src/Mod/PartDesign/App/ShapeBinder.h
View File

@@ -47,7 +47,7 @@ class PartDesignExport ShapeBinder : public Part::Feature
public:
ShapeBinder();
virtual ~ShapeBinder();
~ShapeBinder() override;
App::PropertyLinkSubListGlobal Support;
App::PropertyBool TraceSupport;
@@ -62,14 +62,14 @@ public:
protected:
Part::TopoShape updatedShape() const;
bool hasPlacementChanged() const;
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
virtual short int mustExecute() const override;
virtual App::DocumentObjectExecReturn* execute() override;
virtual void onChanged(const App::Property* prop) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
short int mustExecute() const override;
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property* prop) override;
private:
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
virtual void onSettingDocument() override;
void onSettingDocument() override;
typedef boost::signals2::connection Connection;
Connection connectDocumentChangedObject;
@@ -81,7 +81,7 @@ public:
typedef Part::Feature inherited;
SubShapeBinder();
~SubShapeBinder();
~SubShapeBinder() override;
const char* getViewProviderName() const override {
return "PartDesignGui::ViewProviderSubShapeBinder";
@@ -113,24 +113,24 @@ public:
};
void update(UpdateOption options = UpdateNone);
virtual int canLoadPartial() const override {
int canLoadPartial() const override {
return PartialLoad.getValue()?1:0;
}
virtual bool canLinkProperties() const override {return false;}
bool canLinkProperties() const override {return false;}
virtual App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr,
App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr,
Base::Matrix4D *mat=nullptr, bool transform=true, int depth=0) const override;
protected:
virtual App::DocumentObjectExecReturn* execute() override;
virtual void onChanged(const App::Property *prop) override;
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property *prop) override;
virtual void handleChangedPropertyType(
void handleChangedPropertyType(
Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
virtual void onDocumentRestored() override;
virtual void setupObject() override;
void onDocumentRestored() override;
void setupObject() override;
void setupCopyOnChange();
void checkCopyOnChange(const App::Property &prop);

2
src/Mod/PartDesign/Gui/AppPartDesignGui.cpp
View File

@@ -84,7 +84,7 @@ public:
initialize("This module is the PartDesignGui module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
};

2
src/Mod/PartDesign/Gui/DlgActiveBody.h
View File

@@ -46,7 +46,7 @@ class PartDesignGuiExport DlgActiveBody : public QDialog
public:
DlgActiveBody(QWidget* parent, App::Document*& doc,
const QString& infoText=QString());
~DlgActiveBody();
~DlgActiveBody() override;
void accept() override;
PartDesign::Body* getActiveBody() const { return activeBody; }

20
src/Mod/PartDesign/Gui/TaskBooleanParameters.h
View File

@@ -49,7 +49,7 @@ class TaskBooleanParameters : public Gui::TaskView::TaskBox, public Gui::Selecti
public:
TaskBooleanParameters(ViewProviderBoolean *BooleanView, QWidget *parent=nullptr);
~TaskBooleanParameters();
~TaskBooleanParameters() override;
const std::vector<std::string> getBodies() const;
int getType() const;
@@ -64,8 +64,8 @@ protected:
void exitSelectionMode();
protected:
void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
private:
QWidget* proxy;
@@ -84,7 +84,7 @@ class TaskDlgBooleanParameters : public Gui::TaskView::TaskDialog
public:
TaskDlgBooleanParameters(ViewProviderBoolean *BooleanView);
~TaskDlgBooleanParameters();
~TaskDlgBooleanParameters() override;
ViewProviderBoolean* getBooleanView() const
{ return BooleanView; }
@@ -92,19 +92,19 @@ public:
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 bool isAllowedAlterDocument() const
bool isAllowedAlterDocument() const override
{ return false; }
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
protected:

18
src/Mod/PartDesign/Gui/TaskChamferParameters.h
View File

@@ -40,9 +40,9 @@ class TaskChamferParameters : public TaskDressUpParameters
public:
TaskChamferParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr);
~TaskChamferParameters();
~TaskChamferParameters() override;
virtual void apply();
void apply() override;
private Q_SLOTS:
void onTypeChanged(int);
@@ -50,15 +50,15 @@ private Q_SLOTS:
void onSize2Changed(double);
void onAngleChanged(double);
void onFlipDirection(bool);
void onRefDeleted(void);
void onRefDeleted(void) override;
void onAddAllEdges(void);
void onCheckBoxUseAllEdgesToggled(bool checked);
protected:
virtual void clearButtons(const selectionModes notThis);
bool event(QEvent *e);
void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void clearButtons(const selectionModes notThis) override;
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
int getType(void) const;
double getSize(void) const;
@@ -79,11 +79,11 @@ class TaskDlgChamferParameters : public TaskDlgDressUpParameters
public:
TaskDlgChamferParameters(ViewProviderChamfer *DressUpView);
~TaskDlgChamferParameters();
~TaskDlgChamferParameters() override;
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

8
src/Mod/PartDesign/Gui/TaskDatumParameters.h
View File

@@ -51,7 +51,7 @@ class TaskDatumParameters : public PartGui::TaskAttacher
public:
TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *parent = nullptr);
~TaskDatumParameters();
~TaskDatumParameters() override;
};
/// simulation dialog for the TaskView
@@ -61,10 +61,10 @@ class TaskDlgDatumParameters : public PartGui::TaskDlgAttacher
public:
TaskDlgDatumParameters(ViewProviderDatum *DatumView);
~TaskDlgDatumParameters();
~TaskDlgDatumParameters() override;
virtual bool accept();
virtual bool reject();
bool accept() override;
bool reject() override;
};
} //namespace PartDesignGui

16
src/Mod/PartDesign/Gui/TaskDraftParameters.h
View File

@@ -38,7 +38,7 @@ class TaskDraftParameters : public TaskDressUpParameters
public:
TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr);
~TaskDraftParameters();
~TaskDraftParameters() override;
double getAngle() const;
bool getReversed() const;
@@ -51,13 +51,13 @@ private Q_SLOTS:
void onReversedChanged(bool reversed);
void onButtonPlane(const bool checked);
void onButtonLine(const bool checked);
void onRefDeleted();
void onRefDeleted() override;
protected:
virtual void clearButtons(const selectionModes notThis);
bool event(QEvent *e);
void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void clearButtons(const selectionModes notThis) override;
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
private:
std::unique_ptr<Ui_TaskDraftParameters> ui;
@@ -70,11 +70,11 @@ class TaskDlgDraftParameters : public TaskDlgDressUpParameters
public:
TaskDlgDraftParameters(ViewProviderDraft *DraftView);
~TaskDlgDraftParameters();
~TaskDlgDraftParameters() override;
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

8
src/Mod/PartDesign/Gui/TaskDressUpParameters.h
View File

@@ -46,7 +46,7 @@ class TaskDressUpParameters : public Gui::TaskView::TaskBox, public Gui::Selecti
public:
TaskDressUpParameters(ViewProviderDressUp *DressUpView, bool selectEdges, bool selectFaces, QWidget* parent = nullptr);
virtual ~TaskDressUpParameters();
~TaskDressUpParameters() override;
const std::vector<std::string> getReferences(void) const;
Part::Feature *getBase(void) const;
@@ -106,15 +106,15 @@ class TaskDlgDressUpParameters : public TaskDlgFeatureParameters
public:
TaskDlgDressUpParameters(ViewProviderDressUp *DressUpView);
virtual ~TaskDlgDressUpParameters();
~TaskDlgDressUpParameters() override;
ViewProviderDressUp* getDressUpView() const
{ return static_cast<ViewProviderDressUp*>(vp); }
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
virtual bool reject();
bool accept() override;
bool reject() override;
protected:
TaskDressUpParameters *parameter;

4
src/Mod/PartDesign/Gui/TaskExtrudeParameters.h
View File

@@ -54,9 +54,9 @@ class TaskExtrudeParameters : public TaskSketchBasedParameters
public:
TaskExtrudeParameters(ViewProviderSketchBased *SketchBasedView, QWidget *parent,
const std::string& pixmapname, const QString& parname);
~TaskExtrudeParameters();
~TaskExtrudeParameters() override;
virtual void saveHistory() override;
void saveHistory() override;
void fillDirectionCombo();
void addAxisToCombo(App::DocumentObject* linkObj, std::string linkSubname, QString itemText,

10
src/Mod/PartDesign/Gui/TaskFeatureParameters.h
View File

@@ -41,7 +41,7 @@ class TaskFeatureParameters : public Gui::TaskView::TaskBox,
public:
TaskFeatureParameters(PartDesignGui::ViewProvider* vp, QWidget *parent,
const std::string& pixmapname, const QString& parname);
virtual ~TaskFeatureParameters() {}
~TaskFeatureParameters() override {}
/// save field history
virtual void saveHistory() {}
@@ -56,7 +56,7 @@ protected Q_SLOTS:
private:
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
protected:
PartDesignGui::ViewProvider *vp;
@@ -71,13 +71,13 @@ class TaskDlgFeatureParameters : public Gui::TaskView::TaskDialog
public:
TaskDlgFeatureParameters(PartDesignGui::ViewProvider *vp);
virtual ~TaskDlgFeatureParameters();
~TaskDlgFeatureParameters() override;
public:
/// 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;
/// Returns the view provider dialog is runed for
PartDesignGui::ViewProvider *viewProvider() const { return vp; }

24
src/Mod/PartDesign/Gui/TaskFeaturePick.h
View File

@@ -61,7 +61,7 @@ public:
bool singleFeatureSelect,
QWidget *parent = nullptr);
~TaskFeaturePick();
~TaskFeaturePick() override;
std::vector<App::DocumentObject*> getFeatures();
std::vector<App::DocumentObject*> buildFeatures();
@@ -72,17 +72,17 @@ public:
protected Q_SLOTS:
void onUpdate(bool);
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void onItemSelectionChanged();
void onDoubleClick(QListWidgetItem *item);
protected:
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
/** Notifies on undo */
virtual void slotUndoDocument(const Gui::Document& Doc);
void slotUndoDocument(const Gui::Document& Doc) override;
/** Notifies on document deletion */
virtual void slotDeleteDocument(const Gui::Document& Doc);
void slotDeleteDocument(const Gui::Document& Doc) override;
private:
std::unique_ptr<Ui_TaskFeaturePick> ui;
@@ -111,25 +111,25 @@ public:
std::function<void (std::vector<App::DocumentObject*>)> workfunc,
bool singleFeatureSelect,
std::function<void (void)> abortfunc = 0);
~TaskDlgFeaturePick();
~TaskDlgFeaturePick() 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 bool isAllowedAlterDocument(void) const
bool isAllowedAlterDocument(void) const override
{ return false; }
void showExternal(bool val);
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
QDialogButtonBox::StandardButtons getStandardButtons(void) const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }

18
src/Mod/PartDesign/Gui/TaskFilletParameters.h
View File

@@ -37,22 +37,22 @@ class TaskFilletParameters : public TaskDressUpParameters
public:
TaskFilletParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr);
~TaskFilletParameters();
~TaskFilletParameters() override;
virtual void apply();
void apply() override;
private Q_SLOTS:
void onLengthChanged(double);
void onRefDeleted();
void onRefDeleted() override;
void onAddAllEdges();
void onCheckBoxUseAllEdgesToggled(bool checked);
protected:
double getLength() const;
virtual void clearButtons(const selectionModes notThis);
bool event(QEvent *e);
void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void clearButtons(const selectionModes notThis) override;
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
private:
std::unique_ptr<Ui_TaskFilletParameters> ui;
@@ -65,11 +65,11 @@ class TaskDlgFilletParameters : public TaskDlgDressUpParameters
public:
TaskDlgFilletParameters(ViewProviderFillet *DressUpView);
~TaskDlgFilletParameters();
~TaskDlgFilletParameters() override;
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

4
src/Mod/PartDesign/Gui/TaskHelixParameters.h
View File

@@ -46,9 +46,9 @@ class TaskHelixParameters : public TaskSketchBasedParameters
public:
TaskHelixParameters(ViewProviderHelix* HelixView, QWidget* parent = nullptr);
~TaskHelixParameters();
~TaskHelixParameters() override;
virtual void apply() override;
void apply() override;
static bool showPreview(PartDesign::Helix*);

6
src/Mod/PartDesign/Gui/TaskHoleParameters.h
View File

@@ -51,7 +51,7 @@ class TaskHoleParameters : public TaskSketchBasedParameters
public:
TaskHoleParameters(ViewProviderHole *HoleView, QWidget *parent = nullptr);
~TaskHoleParameters();
~TaskHoleParameters() override;
void apply() override;
@@ -114,7 +114,7 @@ private:
public:
Observer(TaskHoleParameters * _owner, PartDesign::Hole * _hole);
private:
virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override;
TaskHoleParameters * owner;
PartDesign::Hole * hole;
};
@@ -144,7 +144,7 @@ class TaskDlgHoleParameters : public TaskDlgSketchBasedParameters
public:
TaskDlgHoleParameters(ViewProviderHole *HoleView);
~TaskDlgHoleParameters();
~TaskDlgHoleParameters() override;
ViewProviderHole* getHoleView() const { return static_cast<ViewProviderHole*>(vp); }

18
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h
View File

@@ -51,9 +51,9 @@ public:
TaskLinearPatternParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr);
/// Constructor for task with parent task (MultiTransform mode)
TaskLinearPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout);
virtual ~TaskLinearPatternParameters();
~TaskLinearPatternParameters() override;
virtual void apply();
void apply() override;
private Q_SLOTS:
void onUpdateViewTimer();
@@ -62,14 +62,14 @@ private Q_SLOTS:
void onLength(const double l);
void onOccurrences(const uint n);
virtual void onUpdateView(bool);
virtual void onFeatureDeleted();
void onFeatureDeleted() override;
protected:
virtual void addObject(App::DocumentObject*);
virtual void removeObject(App::DocumentObject*);
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
virtual void clearButtons();
void addObject(App::DocumentObject*) override;
void removeObject(App::DocumentObject*) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons() override;
void getDirection(App::DocumentObject*& obj, std::vector<std::string>& sub) const;
bool getReverse() const;
double getLength() const;
@@ -96,7 +96,7 @@ class TaskDlgLinearPatternParameters : public TaskDlgTransformedParameters
public:
TaskDlgLinearPatternParameters(ViewProviderLinearPattern *LinearPatternView);
virtual ~TaskDlgLinearPatternParameters() {}
~TaskDlgLinearPatternParameters() override {}
};
} //namespace PartDesignGui

10
src/Mod/PartDesign/Gui/TaskLoftParameters.h
View File

@@ -47,7 +47,7 @@ class TaskLoftParameters : public TaskSketchBasedParameters
public:
TaskLoftParameters(ViewProviderLoft *LoftView, bool newObj=false, QWidget *parent = nullptr);
~TaskLoftParameters();
~TaskLoftParameters() override;
private Q_SLOTS:
void onProfileButton(bool);
@@ -61,10 +61,10 @@ private Q_SLOTS:
protected:
enum selectionModes { none, refAdd, refRemove, refProfile };
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void updateUI();
bool referenceSelected(const Gui::SelectionChanges& msg) const;
void removeFromListWidget(QListWidget*w, QString name);
@@ -85,13 +85,13 @@ class TaskDlgLoftParameters : public TaskDlgSketchBasedParameters
public:
TaskDlgLoftParameters(ViewProviderLoft *LoftView,bool newObj=false);
~TaskDlgLoftParameters();
~TaskDlgLoftParameters() override;
ViewProviderLoft* getLoftView() const
{ return static_cast<ViewProviderLoft*>(vp); }
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
protected:
TaskLoftParameters *parameter;

20
src/Mod/PartDesign/Gui/TaskMirroredParameters.h
View File

@@ -51,23 +51,23 @@ public:
/// Constructor for task with parent task (MultiTransform mode)
TaskMirroredParameters(TaskMultiTransformParameters *parentTask, QLayout *layout);
virtual ~TaskMirroredParameters();
~TaskMirroredParameters() override;
void getMirrorPlane(App::DocumentObject*& obj, std::vector<std::string>& sub) const;
virtual void apply();
void apply() override;
private Q_SLOTS:
void onPlaneChanged(int num);
virtual void onUpdateView(bool);
virtual void onFeatureDeleted();
void onFeatureDeleted() override;
protected:
virtual void addObject(App::DocumentObject*);
virtual void removeObject(App::DocumentObject*);
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
virtual void clearButtons();
void addObject(App::DocumentObject*) override;
void removeObject(App::DocumentObject*) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons() override;
private:
void setupUI();
@@ -86,11 +86,11 @@ class TaskDlgMirroredParameters : public TaskDlgTransformedParameters
public:
TaskDlgMirroredParameters(ViewProviderMirrored *MirroredView);
virtual ~TaskDlgMirroredParameters() {}
~TaskDlgMirroredParameters() override {}
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

24
src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h
View File

@@ -52,7 +52,7 @@ class TaskMultiTransformParameters : public TaskTransformedParameters
public:
TaskMultiTransformParameters(ViewProviderTransformed *TransformedView,QWidget *parent = nullptr);
virtual ~TaskMultiTransformParameters();
~TaskMultiTransformParameters() override;
const std::vector<App::DocumentObject*> getTransformFeatures() const;
@@ -61,7 +61,7 @@ public:
return subFeature;
}
virtual void apply();
void apply() override;
private Q_SLOTS:
void onTransformDelete();
@@ -74,20 +74,20 @@ private Q_SLOTS:
void onMoveUp();
void onMoveDown();
/// User finished editing a subFeature
virtual void onSubTaskButtonOK();
void onSubTaskButtonOK() override;
// Note: There is no Cancel button because I couldn't work out how to save the state of
// a subFeature so as to revert the changes of an edit operation
virtual void onUpdateView(bool);
virtual void onFeatureDeleted();
void onFeatureDeleted() override;
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
protected:
virtual void addObject(App::DocumentObject*);
virtual void removeObject(App::DocumentObject*);
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
virtual void clearButtons();
void addObject(App::DocumentObject*) override;
void removeObject(App::DocumentObject*) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons() override;
private:
void updateUI();
@@ -111,11 +111,11 @@ class TaskDlgMultiTransformParameters : public TaskDlgTransformedParameters
public:
TaskDlgMultiTransformParameters(ViewProviderMultiTransform *MultiTransformView);
virtual ~TaskDlgMultiTransformParameters() {}
~TaskDlgMultiTransformParameters() override {}
public:
/// 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();
};

4
src/Mod/PartDesign/Gui/TaskPadParameters.h
View File

@@ -44,9 +44,9 @@ class TaskPadParameters : public TaskExtrudeParameters
public:
TaskPadParameters(ViewProviderPad *PadView, QWidget *parent = nullptr, bool newObj=false);
~TaskPadParameters();
~TaskPadParameters() override;
virtual void apply() override;
void apply() override;
private:
void onModeChanged(int index) override;

16
src/Mod/PartDesign/Gui/TaskPipeParameters.h
View File

@@ -80,7 +80,7 @@ class TaskPipeParameters : public TaskSketchBasedParameters
public:
TaskPipeParameters(ViewProviderPipe *PipeView, bool newObj=false, QWidget *parent = nullptr);
~TaskPipeParameters();
~TaskPipeParameters() override;
bool accept();
@@ -95,7 +95,7 @@ protected:
bool referenceSelected(const Gui::SelectionChanges& msg) const;
private:
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void updateUI();
void clearButtons();
void exitSelectionMode();
@@ -121,7 +121,7 @@ class TaskPipeOrientation : public TaskSketchBasedParameters
public:
TaskPipeOrientation(ViewProviderPipe *PipeView, bool newObj=false, QWidget *parent = nullptr);
virtual ~TaskPipeOrientation();
~TaskPipeOrientation() override;
private Q_SLOTS:
@@ -137,7 +137,7 @@ protected:
bool referenceSelected(const Gui::SelectionChanges& msg) const;
private:
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons();
void exitSelectionMode();
@@ -155,7 +155,7 @@ class TaskPipeScaling : public TaskSketchBasedParameters
public:
TaskPipeScaling(ViewProviderPipe *PipeView,bool newObj=false,QWidget *parent = nullptr);
virtual ~TaskPipeScaling();
~TaskPipeScaling() override;
private Q_SLOTS:
void onScalingChanged(int);
@@ -168,7 +168,7 @@ protected:
bool referenceSelected(const Gui::SelectionChanges& msg) const;
private:
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons();
void exitSelectionMode();
@@ -186,11 +186,11 @@ class TaskDlgPipeParameters : public TaskDlgSketchBasedParameters
public:
TaskDlgPipeParameters(ViewProviderPipe *PipeView,bool newObj=false);
~TaskDlgPipeParameters();
~TaskDlgPipeParameters() override;
public:
/// 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)
protected Q_SLOTS:

4
src/Mod/PartDesign/Gui/TaskPocketParameters.h
View File

@@ -44,9 +44,9 @@ class TaskPocketParameters : public TaskExtrudeParameters
public:
TaskPocketParameters(ViewProviderPocket *PocketView, QWidget *parent = nullptr, bool newObj=false);
~TaskPocketParameters();
~TaskPocketParameters() override;
virtual void apply() override;
void apply() override;
private:
void onModeChanged(int index) override;

18
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h
View File

@@ -51,9 +51,9 @@ public:
TaskPolarPatternParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr);
/// Constructor for task with parent task (MultiTransform mode)
TaskPolarPatternParameters(TaskMultiTransformParameters *parentTask, QLayout *layout);
virtual ~TaskPolarPatternParameters();
~TaskPolarPatternParameters() override;
void apply();
void apply() override;
private Q_SLOTS:
void onUpdateViewTimer();
@@ -62,14 +62,14 @@ private Q_SLOTS:
void onAngle(const double a);
void onOccurrences(const uint n);
virtual void onUpdateView(bool);
virtual void onFeatureDeleted();
void onFeatureDeleted() override;
protected:
virtual void addObject(App::DocumentObject*);
virtual void removeObject(App::DocumentObject*);
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
virtual void clearButtons();
void addObject(App::DocumentObject*) override;
void removeObject(App::DocumentObject*) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons() override;
void getAxis(App::DocumentObject*& obj, std::vector<std::string>& sub) const;
const std::string getStdAxis() const;
const std::string getAxis() const;
@@ -98,7 +98,7 @@ class TaskDlgPolarPatternParameters : public TaskDlgTransformedParameters
public:
TaskDlgPolarPatternParameters(ViewProviderPolarPattern *PolarPatternView);
virtual ~TaskDlgPolarPatternParameters() {}
~TaskDlgPolarPatternParameters() override {}
};
} //namespace PartDesignGui

12
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h
View File

@@ -49,7 +49,7 @@ class TaskBoxPrimitives : public Gui::TaskView::TaskBox,
public:
TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent = nullptr);
~TaskBoxPrimitives();
~TaskBoxPrimitives() override;
bool setPrimitive(App::DocumentObject *);
@@ -99,7 +99,7 @@ public Q_SLOTS:
private:
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
private:
QWidget* proxy;
@@ -113,13 +113,13 @@ class TaskPrimitiveParameters : public Gui::TaskView::TaskDialog
public:
TaskPrimitiveParameters(ViewProviderPrimitive *PrimitiveView);
~TaskPrimitiveParameters();
~TaskPrimitiveParameters() override;
protected:
virtual QDialogButtonBox::StandardButtons getStandardButtons() const;
QDialogButtonBox::StandardButtons getStandardButtons() const override;
virtual bool accept();
virtual bool reject();
bool accept() override;
bool reject() override;
private:
TaskBoxPrimitives* primitive;

4
src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
View File

@@ -47,9 +47,9 @@ class TaskRevolutionParameters : public TaskSketchBasedParameters
public:
TaskRevolutionParameters(ViewProvider* RevolutionView,QWidget *parent = nullptr);
~TaskRevolutionParameters();
~TaskRevolutionParameters() override;
virtual void apply() override;
void apply() override;
/**
* @brief fillAxisCombo fills the combo and selects the item according to

16
src/Mod/PartDesign/Gui/TaskScaledParameters.h
View File

@@ -50,20 +50,20 @@ public:
TaskScaledParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr);
/// Constructor for task with parent task (MultiTransform mode)
TaskScaledParameters(TaskMultiTransformParameters *parentTask, QLayout *layout);
virtual ~TaskScaledParameters();
~TaskScaledParameters() override;
virtual void apply();
void apply() override;
private Q_SLOTS:
void onFactor(const double f);
void onOccurrences(const uint n);
virtual void onUpdateView(bool);
virtual void onFeatureDeleted();
void onFeatureDeleted() override;
protected:
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
virtual void clearButtons();
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void clearButtons() override;
double getFactor() const;
unsigned getOccurrences() const;
@@ -83,11 +83,11 @@ class TaskDlgScaledParameters : public TaskDlgTransformedParameters
public:
TaskDlgScaledParameters(ViewProviderScaled *ScaledView);
virtual ~TaskDlgScaledParameters() {}
~TaskDlgScaledParameters() override {}
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

12
src/Mod/PartDesign/Gui/TaskShapeBinder.h
View File

@@ -52,13 +52,13 @@ class TaskShapeBinder : public Gui::TaskView::TaskBox, Gui::SelectionObserver
public:
TaskShapeBinder(ViewProviderShapeBinder *view,bool newObj=false,QWidget *parent = nullptr);
~TaskShapeBinder();
~TaskShapeBinder() override;
void accept();
protected:
enum selectionModes { none, refAdd, refRemove, refObjAdd };
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
selectionModes selectionMode = none;
void removeFromListWidget(QListWidget *w, QString name);
@@ -67,7 +67,7 @@ protected:
private:
void setupButtonGroup();
void setupContextMenu();
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void onButtonToggled(QAbstractButton *button, bool checked);
void updateUI();
void supportChanged(const QString&);
@@ -92,13 +92,13 @@ class TaskDlgShapeBinder : public Gui::TaskView::TaskDialog
public:
TaskDlgShapeBinder(ViewProviderShapeBinder *view,bool newObj=false);
~TaskDlgShapeBinder();
~TaskDlgShapeBinder() override;
public:
/// 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;
protected:
TaskShapeBinder *parameter;

10
src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h
View File

@@ -47,10 +47,10 @@ class TaskSketchBasedParameters : public PartDesignGui::TaskFeatureParameters,
public:
TaskSketchBasedParameters(PartDesignGui::ViewProvider* vp, QWidget *parent,
const std::string& pixmapname, const QString& parname);
~TaskSketchBasedParameters();
~TaskSketchBasedParameters() override;
protected:
void onSelectionChanged(const Gui::SelectionChanges& msg)=0;
void onSelectionChanged(const Gui::SelectionChanges& msg) override =0;
const QString onAddSelection(const Gui::SelectionChanges& msg);
virtual void startReferenceSelection(App::DocumentObject* profile, App::DocumentObject* base);
virtual void finishReferenceSelection(App::DocumentObject* profile, App::DocumentObject* base);
@@ -80,13 +80,13 @@ class TaskDlgSketchBasedParameters : public PartDesignGui::TaskDlgFeatureParamet
public:
TaskDlgSketchBasedParameters(PartDesignGui::ViewProvider *vp);
~TaskDlgSketchBasedParameters();
~TaskDlgSketchBasedParameters() override;
public:
/// 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;
};
} //namespace PartDesignGui

16
src/Mod/PartDesign/Gui/TaskThicknessParameters.h
View File

@@ -37,7 +37,7 @@ class TaskThicknessParameters : public TaskDressUpParameters
public:
TaskThicknessParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr);
~TaskThicknessParameters();
~TaskThicknessParameters() override;
double getValue(void) const;
bool getReversed(void) const;
@@ -51,13 +51,13 @@ private Q_SLOTS:
void onJoinTypeChanged(int join);
void onReversedChanged(bool reversed);
void onIntersectionChanged(bool intersection);
void onRefDeleted(void);
void onRefDeleted(void) override;
protected:
virtual void clearButtons(const selectionModes notThis);
bool event(QEvent *e);
void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void clearButtons(const selectionModes notThis) override;
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
private:
std::unique_ptr<Ui_TaskThicknessParameters> ui;
@@ -70,11 +70,11 @@ class TaskDlgThicknessParameters : public TaskDlgDressUpParameters
public:
TaskDlgThicknessParameters(ViewProviderThickness *ThicknessView);
~TaskDlgThicknessParameters();
~TaskDlgThicknessParameters() override;
public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};
} //namespace PartDesignGui

2
src/Mod/PartDesign/Gui/TaskTransformedMessages.h
View File

@@ -43,7 +43,7 @@ class TaskTransformedMessages : public Gui::TaskView::TaskBox
public:
TaskTransformedMessages(ViewProviderTransformed *transformedView);
~TaskTransformedMessages();
~TaskTransformedMessages() override;
void slotDiagnosis(QString msg);

14
src/Mod/PartDesign/Gui/TaskTransformedParameters.h
View File

@@ -126,7 +126,7 @@ public:
TaskTransformedParameters(ViewProviderTransformed *TransformedView, QWidget *parent = nullptr);
/// Constructor for task with parent task (MultiTransform mode)
TaskTransformedParameters(TaskMultiTransformParameters *parentTask);
virtual ~TaskTransformedParameters();
~TaskTransformedParameters() override;
/// Returns the originals property of associated top feeature object
const std::vector<App::DocumentObject*> & getOriginals(void) const;
@@ -208,9 +208,9 @@ protected:
virtual void addObject(App::DocumentObject*);
virtual void removeObject(App::DocumentObject*);
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
virtual void changeEvent(QEvent *e) = 0;
virtual void onSelectionChanged(const Gui::SelectionChanges& msg) = 0;
void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override;
void changeEvent(QEvent *e) override = 0;
void onSelectionChanged(const Gui::SelectionChanges& msg) override = 0;
virtual void clearButtons()=0;
static void removeItemFromListWidget(QListWidget* widget, const QString& itemstr);
@@ -241,16 +241,16 @@ class TaskDlgTransformedParameters : public PartDesignGui::TaskDlgFeatureParamet
public:
TaskDlgTransformedParameters(ViewProviderTransformed *TransformedView);
virtual ~TaskDlgTransformedParameters() {}
~TaskDlgTransformedParameters() override {}
ViewProviderTransformed* getTransformedView() const
{ return static_cast<ViewProviderTransformed*>(vp); }
public:
/// 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;
protected:
TaskTransformedParameters *parameter;
TaskTransformedMessages *message;

16
src/Mod/PartDesign/Gui/ViewProvider.h
View File

@@ -46,9 +46,9 @@ public:
/// constructor
ViewProvider();
/// destructor
virtual ~ViewProvider();
~ViewProvider() override;
virtual bool doubleClicked(void) override;
bool doubleClicked(void) override;
void updateData(const App::Property*) override;
void onChanged(const App::Property* prop) override;
@@ -68,16 +68,16 @@ public:
//Returns the ViewProvider of the body the feature belongs to, or NULL, if not in a body
ViewProviderBody* getBodyViewProvider();
virtual PyObject* getPyObject(void) override;
PyObject* getPyObject(void) override;
virtual QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override;
QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override;
protected:
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
virtual bool onDelete(const std::vector<std::string> &) override;
bool onDelete(const std::vector<std::string> &) override;
/**
* Returns a newly create dialog for the part to be placed in the task view

6
src/Mod/PartDesign/Gui/ViewProviderAddSub.h
View File

@@ -37,10 +37,10 @@ public:
/// constructor
ViewProviderAddSub();
/// destructor
virtual ~ViewProviderAddSub();
~ViewProviderAddSub() override;
virtual void attach(App::DocumentObject*);
virtual void updateData(const App::Property*);
void attach(App::DocumentObject*) override;
void updateData(const App::Property*) override;
protected:
void updateAddSubShapeIndicator();

10
src/Mod/PartDesign/Gui/ViewProviderBase.h
View File

@@ -36,14 +36,14 @@ public:
/// constructor
ViewProviderBase();
/// destructor
virtual ~ViewProviderBase();
~ViewProviderBase() override;
virtual bool doubleClicked();
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
bool doubleClicked() override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
};
} // namespace PartDesignGui

26
src/Mod/PartDesign/Gui/ViewProviderBody.h
View File

@@ -50,25 +50,25 @@ public:
/// constructor
ViewProviderBody();
/// destructor
virtual ~ViewProviderBody();
~ViewProviderBody() override;
App::PropertyEnumeration DisplayModeBody;
virtual void attach(App::DocumentObject *) override;
void attach(App::DocumentObject *) override;
virtual bool doubleClicked(void) override;
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool doubleClicked(void) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
virtual std::vector< std::string > getDisplayModes(void) const override;
virtual void setDisplayMode(const char* ModeName) override;
virtual void setOverrideMode(const std::string& mode) override;
std::vector< std::string > getDisplayModes(void) const override;
void setDisplayMode(const char* ModeName) override;
void setOverrideMode(const std::string& mode) override;
virtual bool onDelete(const std::vector<std::string> &) override;
bool onDelete(const std::vector<std::string> &) override;
/// Update the children's highlighting when triggered
virtual void updateData(const App::Property* prop) override;
void updateData(const App::Property* prop) override;
///unify children visuals
virtual void onChanged(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
/// Update the sizes of origin and datums
void updateOriginDatumSize ();
@@ -80,11 +80,11 @@ public:
SbBox3f getBoundBox ();
/** Check whether objects can be added to the view provider by drag and drop */
virtual bool canDropObjects() const override;
bool canDropObjects() const override;
/** Check whether the object can be dropped to the view provider by drag and drop */
virtual bool canDropObject(App::DocumentObject*) const override;
bool canDropObject(App::DocumentObject*) const override;
/** Add an object to the view provider by drag and drop */
virtual void dropObject(App::DocumentObject*) override;
void dropObject(App::DocumentObject*) override;
protected:
void slotChangedObjectApp ( const App::DocumentObject& obj, const App::Property& prop );

10
src/Mod/PartDesign/Gui/ViewProviderBoolean.h
View File

@@ -40,19 +40,19 @@ public:
/// constructor
ViewProviderBoolean();
/// destructor
virtual ~ViewProviderBoolean();
~ViewProviderBoolean() override;
App::PropertyEnumeration Display;
/// grouping handling
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &) override;
virtual void attach(App::DocumentObject*) override;
virtual void onChanged(const App::Property* prop) override;
bool onDelete(const std::vector<std::string> &) override;
void attach(App::DocumentObject*) override;
void onChanged(const App::Property* prop) override;
protected:
virtual bool setEdit(int ModNum) override;
bool setEdit(int ModNum) override;
static const char* DisplayEnum[];

4
src/Mod/PartDesign/Gui/ViewProviderChamfer.h
View File

@@ -41,11 +41,11 @@ public:
menuName = tr("Chamfer parameters");}
/// return "Chamfer"
virtual const std::string & featureName() const;
const std::string & featureName() const override;
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

24
src/Mod/PartDesign/Gui/ViewProviderDatum.h
View File

@@ -42,29 +42,29 @@ class PartDesignGuiExport ViewProviderDatum : public Gui::ViewProviderGeometryOb
{
Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderDatum)
PROPERTY_HEADER_WITH_EXTENSIONS(PartDesignGui::ViewProviderDatum);
public:
/// constructor
ViewProviderDatum();
/// destructor
virtual ~ViewProviderDatum();
~ViewProviderDatum() override;
/// grouping handling
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual void attach(App::DocumentObject *) override;
virtual bool onDelete(const std::vector<std::string> &) override;
virtual bool doubleClicked(void) override;
void attach(App::DocumentObject *) override;
bool onDelete(const std::vector<std::string> &) override;
bool doubleClicked(void) override;
std::vector<std::string> getDisplayModes(void) const override;
void setDisplayMode(const char* ModeName) override;
/// indicates if the ViewProvider use the new Selection model
virtual bool useNewSelectionModel(void) const override { return true; }
bool useNewSelectionModel(void) const override { return true; }
/// indicates if the ViewProvider can be selected
virtual bool isSelectable(void) const override;
bool isSelectable(void) const override;
/// return a hit element to the selection path or 0
virtual std::string getElement(const SoDetail *) const override;
virtual SoDetail* getDetail(const char*) const override;
std::string getElement(const SoDetail *) const override;
SoDetail* getDetail(const char*) const override;
/**
* Enable/Disable the selectability of the datum
@@ -91,7 +91,7 @@ public:
/// The datum type (Plane, Line or Point)
// TODO remove this attribute (2015-09-08, Fat-Zer)
QString datumType;
QString datumText;
QString datumText;
QString datumMenuText;
/**
@@ -114,8 +114,8 @@ public:
static double marginFactor () { return 0.1; };
protected:
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
/**
* Guesses the context this datum belongs to and returns appropriate bounding box of all

14
src/Mod/PartDesign/Gui/ViewProviderDatumCS.h
View File

@@ -47,16 +47,16 @@ public:
/// Constructor
ViewProviderDatumCoordinateSystem();
virtual ~ViewProviderDatumCoordinateSystem();
~ViewProviderDatumCoordinateSystem() override;
virtual void attach ( App::DocumentObject *obj );
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property*);
void attach ( App::DocumentObject *obj ) override;
void updateData(const App::Property*) override;
void onChanged(const App::Property*) override;
virtual void setExtents (Base::BoundBox3d bbox);
void setExtents (Base::BoundBox3d bbox) override;
virtual SoDetail* getDetail(const char* subelement) const;
virtual std::string getElement(const SoDetail* detail) const;
SoDetail* getDetail(const char* subelement) const override;
std::string getElement(const SoDetail* detail) const override;
private:
void setupLabels();

8
src/Mod/PartDesign/Gui/ViewProviderDatumLine.h
View File

@@ -38,12 +38,12 @@ class PartDesignGuiExport ViewProviderDatumLine : public PartDesignGui::ViewProv
public:
/// Constructor
ViewProviderDatumLine();
virtual ~ViewProviderDatumLine();
~ViewProviderDatumLine() override;
virtual void attach ( App::DocumentObject *obj );
virtual void updateData(const App::Property*);
void attach ( App::DocumentObject *obj ) override;
void updateData(const App::Property*) override;
void setExtents (Base::BoundBox3d bbox);
void setExtents (Base::BoundBox3d bbox) override;
void setExtents(double l);
private:

8
src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h
View File

@@ -36,12 +36,12 @@ class PartDesignGuiExport ViewProviderDatumPlane : public PartDesignGui::ViewPro
public:
/// Constructor
ViewProviderDatumPlane();
virtual ~ViewProviderDatumPlane();
~ViewProviderDatumPlane() override;
virtual void attach ( App::DocumentObject *obj );
virtual void updateData(const App::Property*);
void attach ( App::DocumentObject *obj ) override;
void updateData(const App::Property*) override;
void setExtents (Base::BoundBox3d bbox);
void setExtents (Base::BoundBox3d bbox) override;
void setExtents(double l, double w);
private:

6
src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h
View File

@@ -36,14 +36,14 @@ class PartDesignGuiExport ViewProviderDatumPoint : public PartDesignGui::ViewPro
public:
/// Constructor
ViewProviderDatumPoint();
virtual ~ViewProviderDatumPoint();
~ViewProviderDatumPoint() override;
virtual void attach ( App::DocumentObject *obj );
void attach ( App::DocumentObject *obj ) override;
// Note: don't overload setExtents () here because point doesn't really depends on it
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
} // namespace PartDesignGui

4
src/Mod/PartDesign/Gui/ViewProviderDraft.h
View File

@@ -42,11 +42,11 @@ public:
menuName = tr("Draft parameters"); }
/// return "Draft"
virtual const std::string & featureName() const;
const std::string & featureName() const override;
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};
} // namespace PartDesignGui

6
src/Mod/PartDesign/Gui/ViewProviderDressUp.h
View File

@@ -41,11 +41,11 @@ public:
ViewProviderDressUp()
{}
/// destructor
virtual ~ViewProviderDressUp()
~ViewProviderDressUp() override
{}
/// grouping handling
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
/// Highlight the references that have been selected
void highlightReferences(const bool on);
@@ -58,7 +58,7 @@ public:
QString menuName;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
private:
std::vector<App::Color> originalFaceColors;

4
src/Mod/PartDesign/Gui/ViewProviderFillet.h
View File

@@ -41,11 +41,11 @@ public:
menuName = tr("Fillet parameters"); }
/// return "Fillet"
virtual const std::string & featureName() const;
const std::string & featureName() const override;
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};
} // namespace PartDesignGui

6
src/Mod/PartDesign/Gui/ViewProviderGroove.h
View File

@@ -37,16 +37,16 @@ public:
/// constructor
ViewProviderGroove();
/// destructor
virtual ~ViewProviderGroove();
~ViewProviderGroove() override;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
protected:
/**
* Returns a newly created TaskDlgRevolutionParameters
* NOTE: as for now groove and revolution share the dialog implementation
*/
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

16
src/Mod/PartDesign/Gui/ViewProviderHelix.h
View File

@@ -37,22 +37,22 @@ public:
/// constructor
ViewProviderHelix();
/// destructor
virtual ~ViewProviderHelix();
~ViewProviderHelix() override;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
/// grouping handling
std::vector<App::DocumentObject*> claimChildren(void)const;
std::vector<App::DocumentObject*> claimChildren(void)const override;
virtual bool onDelete(const std::vector<std::string> &);
bool onDelete(const std::vector<std::string> &) override;
protected:
virtual QIcon getIcon(void) const;
QIcon getIcon(void) const override;
/// Returns a newly created TaskDlgHelixParameters
virtual TaskDlgFeatureParameters *getEditDialog();
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
TaskDlgFeatureParameters *getEditDialog() override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
};

10
src/Mod/PartDesign/Gui/ViewProviderHole.h
View File

@@ -37,14 +37,14 @@ public:
/// constructor
ViewProviderHole();
/// destructor
virtual ~ViewProviderHole();
~ViewProviderHole() override;
/// grouping handling
std::vector<App::DocumentObject*> claimChildren()const;
void setupContextMenu(QMenu *menu, QObject *receiver, const char *member);
bool onDelete(const std::vector<std::string> &s);
std::vector<App::DocumentObject*> claimChildren()const override;
void setupContextMenu(QMenu *menu, QObject *receiver, const char *member) override;
bool onDelete(const std::vector<std::string> &s) override;
protected:
bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};

2
src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
View File

@@ -40,7 +40,7 @@ public:
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

16
src/Mod/PartDesign/Gui/ViewProviderLoft.h
View File

@@ -42,22 +42,22 @@ public:
/// constructor
ViewProviderLoft();
/// destructor
virtual ~ViewProviderLoft();
~ViewProviderLoft() override;
/// grouping handling
std::vector<App::DocumentObject*> claimChildren(void)const;
void setupContextMenu(QMenu*, QObject*, const char*);
std::vector<App::DocumentObject*> claimChildren(void)const override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &);
bool onDelete(const std::vector<std::string> &) override;
void highlightProfile(bool on);
void highlightSection(bool on);
void highlightReferences(Reference mode, bool on);
protected:
virtual QIcon getIcon(void) const;
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual TaskDlgFeatureParameters* getEditDialog();
QIcon getIcon(void) const override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
TaskDlgFeatureParameters* getEditDialog() override;
private:
void highlightReferences(Part::Feature*, const std::vector<std::string>&, bool);

2
src/Mod/PartDesign/Gui/ViewProviderMirrored.h
View File

@@ -41,7 +41,7 @@ public:
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

8
src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
View File

@@ -39,14 +39,14 @@ public:
sPixmap = "PartDesign_MultiTransform.svg";
}
std::vector<App::DocumentObject*> claimChildren() const;
void setupContextMenu(QMenu*, QObject*, const char*);
std::vector<App::DocumentObject*> claimChildren() const override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &);
bool onDelete(const std::vector<std::string> &) override;
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

6
src/Mod/PartDesign/Gui/ViewProviderPad.h
View File

@@ -36,13 +36,13 @@ public:
/// constructor
ViewProviderPad();
/// destructor
virtual ~ViewProviderPad();
~ViewProviderPad() override;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
protected:
/// Returns a newly created TaskDlgPadParameters
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

16
src/Mod/PartDesign/Gui/ViewProviderPipe.h
View File

@@ -43,22 +43,22 @@ public:
/// constructor
ViewProviderPipe();
/// destructor
virtual ~ViewProviderPipe();
~ViewProviderPipe() override;
/// grouping handling
std::vector<App::DocumentObject*> claimChildren()const;
void setupContextMenu(QMenu*, QObject*, const char*);
std::vector<App::DocumentObject*> claimChildren()const override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &);
bool onDelete(const std::vector<std::string> &) override;
void highlightReferences(Reference mode, bool on);
protected:
virtual QIcon getIcon() const;
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
QIcon getIcon() const override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
/// Returns a newly created TaskDlgPipeParameters
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
private:
void highlightReferences(Part::Feature*, const std::vector<std::string>&, bool);

6
src/Mod/PartDesign/Gui/ViewProviderPocket.h
View File

@@ -37,13 +37,13 @@ public:
/// constructor
ViewProviderPocket();
/// destructor
virtual ~ViewProviderPocket();
~ViewProviderPocket() override;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
protected:
/// Returns a newly created TaskDlgPocketParameters
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

2
src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
View File

@@ -41,7 +41,7 @@ public:
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

14
src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
View File

@@ -36,16 +36,16 @@ public:
/// constructor
ViewProviderPrimitive();
/// destructor
virtual ~ViewProviderPrimitive();
~ViewProviderPrimitive() override;
virtual void attach(App::DocumentObject*);
virtual void updateData(const App::Property*);
void attach(App::DocumentObject*) override;
void updateData(const App::Property*) override;
protected:
virtual QIcon getIcon(void) const;
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
QIcon getIcon(void) const override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
void updateAddSubShapeIndicator();

6
src/Mod/PartDesign/Gui/ViewProviderRevolution.h
View File

@@ -37,13 +37,13 @@ public:
/// constructor
ViewProviderRevolution();
/// destructor
virtual ~ViewProviderRevolution();
~ViewProviderRevolution() override;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
protected:
/// Returns a newly created TaskDlgRevolutionParameters
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

2
src/Mod/PartDesign/Gui/ViewProviderScaled.h
View File

@@ -41,7 +41,7 @@ public:
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};

16
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
View File

@@ -36,14 +36,14 @@ class PartDesignGuiExport ViewProviderShapeBinder : public PartGui::ViewProvider
public:
/// Constructor
ViewProviderShapeBinder();
virtual ~ViewProviderShapeBinder();
~ViewProviderShapeBinder() override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void highlightReferences(bool on);
protected:
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
private:
std::vector<App::Color> originalLineColors;
@@ -69,11 +69,11 @@ public:
const std::vector<std::string> &) override;
std::vector<App::DocumentObject*> claimChildren() const override;
virtual bool doubleClicked() override;
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
virtual bool setEdit(int ModNum) override;
virtual void attach(App::DocumentObject *obj) override;
virtual void onChanged(const App::Property *prop) override;
bool doubleClicked() override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool setEdit(int ModNum) override;
void attach(App::DocumentObject *obj) override;
void onChanged(const App::Property *prop) override;
private:
enum {

6
src/Mod/PartDesign/Gui/ViewProviderSketchBased.h
View File

@@ -38,12 +38,12 @@ public:
/// constructor
ViewProviderSketchBased();
/// destructor
virtual ~ViewProviderSketchBased();
~ViewProviderSketchBased() override;
/// grouping handling
std::vector<App::DocumentObject*> claimChildren()const;
std::vector<App::DocumentObject*> claimChildren()const override;
virtual bool onDelete(const std::vector<std::string> &);
bool onDelete(const std::vector<std::string> &) override;
};

4
src/Mod/PartDesign/Gui/ViewProviderThickness.h
View File

@@ -41,11 +41,11 @@ public:
menuName = tr("Thickness parameters"); }
/// return "Thickness"
virtual const std::string & featureName() const;
const std::string & featureName() const override;
protected:
/// Returns a newly create dialog for the part to be placed in the task view
virtual TaskDlgFeatureParameters *getEditDialog();
TaskDlgFeatureParameters *getEditDialog() override;
};
} // namespace PartDesignGui

10
src/Mod/PartDesign/Gui/ViewProviderTransformed.h
View File

@@ -39,12 +39,12 @@ public:
ViewProviderTransformed()
: featureName("undefined"), pcRejectedRoot(nullptr) {}
/// destructor
virtual ~ViewProviderTransformed()
~ViewProviderTransformed() override
{}
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &) override;
bool onDelete(const std::vector<std::string> &) override;
/// signals if the transformation contains errors
boost::signals2::signal<void (QString msg)> signalDiagnosis;
@@ -54,11 +54,11 @@ public:
// Name of menu dialog
QString menuName;
virtual Gui::ViewProvider *startEditing(int ModNum=0) override;
Gui::ViewProvider *startEditing(int ModNum=0) override;
protected:
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
bool checkDlgOpen(TaskDlgTransformedParameters* transformedDlg);

14
src/Mod/PartDesign/Gui/Workbench.h
View File

@@ -46,20 +46,20 @@ class PartDesignGuiExport Workbench : public Gui::StdWorkbench
public:
Workbench();
virtual ~Workbench();
~Workbench() override;
/** Run some actions when the workbench gets activated. */
virtual void activated();
void activated() override;
/** Run some actions when the workbench gets deactivated. */
virtual void deactivated();
void deactivated() override;
/// Add custom entries to the context menu
virtual void setupContextMenu(const char* recipient, Gui::MenuItem*) const;
void setupContextMenu(const char* recipient, Gui::MenuItem*) const 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;
private:
/// Refresh the Body's highlighting when a document becomes active