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

Merge branch 'master' into fixes/tooltable

Browse Source
This commit is contained in:
sliptonic
2019-08-18 12:32:35 -05:00
committed by GitHub
parent 32b0f86167 7e60631239
commit b5da3e32bc
67 changed files with 570 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/App/AppPartPy.cpp
View File

@@ -520,7 +520,7 @@ private:
}
}
virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args)
virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override
{
try {
return Py::ExtensionModule<Module>::invoke_method_varargs(method_def, args);

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

@@ -78,16 +78,16 @@ public:
* TODO introduce a findBodiesOf() if needed (2015-08-04, Fat-Zer)
*/
static BodyBase* findBodyOf(const App::DocumentObject* f);
virtual PyObject* getPyObject();
virtual PyObject* getPyObject() override;
protected:
/// If BaseFeature is getting changed and Tip points to it reset the Tip
virtual void onBeforeChange (const App::Property* prop);
virtual void onBeforeChange (const App::Property* prop) override;
/// If BaseFeature is set and Tip is null set the Tip to it
virtual void onChanged (const App::Property* prop);
virtual void onChanged (const App::Property* prop) override;
virtual void handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName);
const char *PropName) override;
};

6
src/Mod/Part/App/DatumFeature.h
View File

@@ -46,7 +46,7 @@ public:
//short mustExecute();
/// returns the type name of the view provider
virtual const char* getViewProviderName(void) const = 0;
virtual const char* getViewProviderName(void) const override = 0;
/// Return a shape including Placement representing the datum feature
virtual TopoDS_Shape getShape() const;
@@ -57,8 +57,8 @@ public:
virtual App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj,
Base::Matrix4D *mat, bool transform, int depth) const override;
protected:
void onDocumentRestored();
void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName);
void onDocumentRestored() override;
void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName) override;
};
} //namespace Part

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

@@ -54,7 +54,7 @@ public:
/// Same as Part::Compound, except it marks the Shape as transient, and rebuild it during restore
class Compound2 : public Compound {
PROPERTY_HEADER(Part::Compound2);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Compound2);
public:
Compound2();
virtual void onDocumentRestored() override;

2
src/Mod/Part/App/Geometry.cpp
View File

@@ -375,7 +375,7 @@ Geometry *Geometry::clone(void) const
cpy->tag = this->tag;
for(auto & ext: extensions)
cpy->extensions.push_back(std::move(ext->copy()));
cpy->extensions.push_back(ext->copy());
return cpy;
}

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

@@ -32,7 +32,7 @@ namespace Part {
template <typename T>
class PartExport GeometryDefaultExtension: public Part::GeometryExtension
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
inline GeometryDefaultExtension();
GeometryDefaultExtension(const T& val, std::string name = std::string());

12
src/Mod/Part/App/Part2DObject.h
View File

@@ -57,7 +57,7 @@ class PartExport Part2DObject : public Part::Feature, public Part::AttachExtensi
public:
Part2DObject();
virtual void transformPlacement(const Base::Placement &transform);
virtual void transformPlacement(const Base::Placement &transform) override;
/// returns the number of construction lines (to be used as axes)
virtual int getAxisCount(void) const;
@@ -85,19 +85,19 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute(void);
App::DocumentObjectExecReturn *execute(void) override;
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName(void) const override {
return "PartGui::ViewProvider2DObject";
}
//@}
void Restore(Base::XMLReader &reader);
void Restore(Base::XMLReader &reader) override;
protected:
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName);
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override;
};
typedef App::FeaturePythonT<Part2DObject> Part2DObjectPython;

16
src/Mod/Part/App/PartFeature.h
View File

@@ -46,7 +46,7 @@ class PartFeaturePy;
*/
class PartExport Feature : public App::GeoFeature
{
PROPERTY_HEADER(Part::Feature);
PROPERTY_HEADER_WITH_OVERRIDE(Part::Feature);
public:
/// Constructor
@@ -57,14 +57,14 @@ public:
/** @name methods override feature */
//@{
virtual short mustExecute(void) const;
virtual short mustExecute() const override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const;
virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const;
virtual const char* getViewProviderName() const override;
virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const override;
virtual PyObject* getPyObject(void);
virtual PyObject* getPyObject() override;
TopLoc_Location getLocation() const;
@@ -111,10 +111,10 @@ public:
protected:
/// recompute only this object
virtual App::DocumentObjectExecReturn *recompute(void);
virtual App::DocumentObjectExecReturn *recompute() override;
/// recalculate the feature
virtual App::DocumentObjectExecReturn *execute(void);
virtual void onChanged(const App::Property* prop);
virtual App::DocumentObjectExecReturn *execute() override;
virtual void onChanged(const App::Property* prop) override;
/**
* Build a history of changes
* MakeShape: The operation that created the changes, e.g. BRepAlgoAPI_Common

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

@@ -42,14 +42,14 @@ public:
/** @name methods override feature */
//@{
/// recalculate the feature
App::DocumentObjectExecReturn *execute(void);
short mustExecute() const;
PyObject* getPyObject();
App::DocumentObjectExecReturn *execute(void) override;
short mustExecute() const override;
PyObject* getPyObject() override;
//@}
protected:
void Restore(Base::XMLReader &reader);
void onChanged (const App::Property* prop);
void Restore(Base::XMLReader &reader) override;
void onChanged (const App::Property* prop) override;
};
class PartExport Vertex : public Part::Primitive

1
src/Mod/Part/App/TopoShape.cpp
View File

@@ -143,6 +143,7 @@
# include <StlAPI_Writer.hxx>
# include <Standard_Failure.hxx>
# include <gp_GTrsf.hxx>
# include <gp_Pln.hxx>
# include <ShapeAnalysis_Shell.hxx>
# include <ShapeBuild_ReShape.hxx>
# include <ShapeExtend_Explorer.hxx>

1
src/Mod/Part/App/TopoShape.h
View File

@@ -33,6 +33,7 @@
class gp_Ax1;
class gp_Ax2;
class gp_Pln;
class gp_Vec;
namespace App {

6
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -628,9 +628,9 @@ void DlgFilletEdges::setupFillet(const std::vector<App::DocumentObject*>& objs)
App::Document* doc = d->object->getDocument();
// get current selection and their sub-elements
std::vector<Gui::SelectionObject> selObj = Gui::Selection().getSelectionEx(doc->getName());
std::vector<Gui::SelectionObject>::iterator selIt = std::find_if(selObj.begin(), selObj.end(),
Private::SelectionObjectCompare(d->object));
//std::vector<Gui::SelectionObject> selObj = Gui::Selection().getSelectionEx(doc->getName());
//std::vector<Gui::SelectionObject>::iterator selIt = std::find_if(selObj.begin(), selObj.end(),
// Private::SelectionObjectCompare(d->object));
/*

28
src/Mod/Part/Gui/ViewProviderExt.h
View File

@@ -64,7 +64,7 @@ class SoBrepPointSet;
class PartGuiExport ViewProviderPartExt : public Gui::ViewProviderGeometryObject
{
PROPERTY_HEADER(PartGui::ViewProviderPartExt);
PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPartExt);
public:
/// constructor
@@ -91,14 +91,14 @@ public:
// Faces (Gui::ViewProviderGeometryObject::ShapeColor and Gui::ViewProviderGeometryObject::ShapeMaterial apply)
App::PropertyColorList DiffuseColor;
virtual void attach(App::DocumentObject *);
virtual void setDisplayMode(const char* ModeName);
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const;
virtual std::vector<std::string> getDisplayModes(void) const override;
/// Update the view representation
void reload();
virtual void updateData(const App::Property*);
virtual void updateData(const App::Property*) override;
/** @name Selection handling
* This group of methods do the selection handling.
@@ -107,13 +107,13 @@ public:
*/
//@{
/// indicates if the ViewProvider use the new Selection model
virtual bool useNewSelectionModel(void) const {return true;}
virtual bool useNewSelectionModel(void) const override {return true;}
/// return a hit element to the selection path or 0
virtual std::string getElement(const SoDetail*) const;
virtual SoDetail* getDetail(const char*) const;
virtual std::vector<Base::Vector3d> getModelPoints(const SoPickedPoint *) const;
virtual std::string getElement(const SoDetail*) const override;
virtual SoDetail* getDetail(const char*) const override;
virtual std::vector<Base::Vector3d> getModelPoints(const SoPickedPoint *) const override;
/// return the highlight lines for a given element or the whole shape
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const;
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const override;
//@}
/** @name Highlight handling
@@ -136,16 +136,16 @@ public:
/** @name Edit methods */
//@{
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
protected:
bool setEdit(int ModNum);
void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
//@}
protected:
/// get called by the container whenever a property has been changed
virtual void onChanged(const App::Property* prop);
virtual void onChanged(const App::Property* prop) override;
bool loadParameter();
void updateVisual();
void getNormals(const TopoDS_Face& theFace, const Handle(Poly_Triangulation)& aPolyTri,

4
src/Mod/PartDesign/App/DatumCS.h
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";
}

10
src/Mod/PartDesign/App/FeatureBoolean.h
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;

10
src/Mod/PartDesign/App/FeaturePrimitive.h
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;

18
src/Mod/PartDesign/App/ShapeBinder.h
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;

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

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

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

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

@@ -46,21 +46,21 @@ public:
virtual ~ViewProviderDatum();
/// grouping handling
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual void attach(App::DocumentObject *);
virtual bool onDelete(const std::vector<std::string> &);
virtual bool doubleClicked(void);
std::vector<std::string> getDisplayModes(void) const;
void setDisplayMode(const char* ModeName);
virtual void attach(App::DocumentObject *) override;
virtual bool onDelete(const std::vector<std::string> &) override;
virtual 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 { return true; }
virtual bool useNewSelectionModel(void) const override { return true; }
/// indicates if the ViewProvider can be selected
virtual bool isSelectable(void) const ;
virtual bool isSelectable(void) const override;
/// return a hit element to the selection path or 0
virtual std::string getElement(const SoDetail *) const;
virtual SoDetail* getDetail(const char*) const;
virtual std::string getElement(const SoDetail *) const override;
virtual SoDetail* getDetail(const char*) const override;
/**
* Enable/Disable the selectability of the datum
@@ -109,8 +109,8 @@ public:
static double marginFactor () { return 0.1; };
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
/**
* Guesses the context this datum belongs to and returns appropriate bounding box of all

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

@@ -31,19 +31,19 @@ namespace PartDesignGui {
// TODO may be derive from something else e.g. ViewProviderGeometryObject (2015-09-11, Fat-Zer)
class PartDesignGuiExport ViewProviderShapeBinder : public PartGui::ViewProviderPart
{
PROPERTY_HEADER(PartDesignGui::ViewProviderShapeBinder);
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderShapeBinder);
public:
/// Constructor
ViewProviderShapeBinder();
virtual ~ViewProviderShapeBinder();
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
void highlightReferences(const bool on, bool auxiliary);
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
private:
std::vector<App::Color> originalLineColors;
@@ -53,7 +53,7 @@ private:
class PartDesignGuiExport ViewProviderSubShapeBinder : public PartGui::ViewProviderPart
{
PROPERTY_HEADER(PartDesignGui::ViewProviderShapeBinder);
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderShapeBinder);
public:

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

@@ -32,7 +32,7 @@ class TaskDlgTransformedParameters;
class PartDesignGuiExport ViewProviderTransformed : public ViewProvider
{
PROPERTY_HEADER(PartDesignGui::ViewProviderTransformed);
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderTransformed);
public:
/// constructor
@@ -42,9 +42,9 @@ public:
virtual ~ViewProviderTransformed()
{}
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &);
virtual bool onDelete(const std::vector<std::string> &) override;
/// signals if the transformation contains errors
boost::signals2::signal<void (QString msg)> signalDiagnosis;
@@ -55,8 +55,8 @@ public:
virtual Gui::ViewProvider *startEditing(int ModNum=0) override;
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
bool checkDlgOpen(TaskDlgTransformedParameters* transformedDlg);

2
src/Mod/Sketcher/App/ExternalGeometryExtension.h
View File

@@ -31,7 +31,7 @@ namespace Sketcher
class SketcherExport ExternalGeometryExtension : public Part::GeometryExtension
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
// START_CREDIT_BLOCK: Credit under LGPL for this block to Zheng, Lei (realthunder) <realthunder.dev@gmail.com>
enum Flag {

30
src/Mod/Sketcher/App/PropertyConstraintList.h
View File

@@ -45,7 +45,7 @@ class Constraint;
class SketcherExport PropertyConstraintList : public App::PropertyLists
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -60,10 +60,10 @@ public:
*/
virtual ~PropertyConstraintList();
virtual void setSize(int newSize);
virtual int getSize(void) const;
virtual void setSize(int newSize) override;
virtual int getSize(void) const override;
const char* getEditorName(void) const {
const char* getEditorName(void) const override {
return "SketcherGui::PropertyConstraintListItem";
}
@@ -109,16 +109,16 @@ public:
return _lValueList;
}
virtual PyObject *getPyObject(void);
virtual void setPyObject(PyObject *);
virtual PyObject *getPyObject(void) override;
virtual void setPyObject(PyObject *) override;
virtual void Save(Base::Writer &writer) const;
virtual void Restore(Base::XMLReader &reader);
virtual void Save(Base::Writer &writer) const override;
virtual void Restore(Base::XMLReader &reader) override;
virtual Property *Copy(void) const;
virtual void Paste(const App::Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const App::Property &from) override;
virtual unsigned int getMemSize(void) const;
virtual unsigned int getMemSize(void) const override;
void acceptGeometry(const std::vector<Part::Geometry *> &GeoList);
void checkGeometry(const std::vector<Part::Geometry *> &GeoList);
@@ -129,10 +129,10 @@ public:
const Constraint *getConstraint(const App::ObjectIdentifier &path) const;
virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value);
virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const;
virtual App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const;
virtual void getPaths(std::vector<App::ObjectIdentifier> & paths) const;
virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override;
virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const override;
virtual App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier & p) const override;
virtual void getPaths(std::vector<App::ObjectIdentifier> & paths) const override;
virtual bool getPyPathValue(const App::ObjectIdentifier &path, Py::Object &res) const override;

2
src/Mod/Sketcher/App/SketchGeometryExtension.h
View File

@@ -31,7 +31,7 @@ namespace Sketcher
class SketcherExport SketchGeometryExtension : public Part::GeometryExtension
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
SketchGeometryExtension();
SketchGeometryExtension(long cid);

16
src/Mod/Spreadsheet/App/PropertySheet.h
View File

@@ -39,7 +39,7 @@ class SheetObserver;
class SpreadsheetExport PropertySheet : public App::PropertyExpressionContainer
, private App::AtomicPropertyChangeInterface<PropertySheet> {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertySheet(Sheet * _owner = 0);
@@ -64,13 +64,13 @@ public:
virtual void afterRestore() override;
virtual void onContainerRestored() override;
virtual Property *Copy(void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from);
virtual void Paste(const Property &from) override;
virtual void Save (Base::Writer & writer) const;
virtual void Save (Base::Writer & writer) const override;
virtual void Restore(Base::XMLReader & reader);
virtual void Restore(Base::XMLReader & reader) override;
void copyCells(Base::Writer &writer, const std::vector<App::Range> &ranges) const;
@@ -138,7 +138,7 @@ public:
void removeColumns(int col, int count);
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
bool mergeCells(App::CellAddress from, App::CellAddress to);
@@ -156,8 +156,8 @@ public:
void recomputeDependencies(App::CellAddress key);
PyObject *getPyObject(void);
void setPyObject(PyObject *);
PyObject *getPyObject(void) override;
void setPyObject(PyObject *) override;
void invalidateDependants(const App::DocumentObject *docObj);

20
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
View File

@@ -39,7 +39,7 @@ class SheetView;
class SpreadsheetGuiExport ViewProviderSheet : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(SpreadsheetGui::ViewProviderSheet);
PROPERTY_HEADER_WITH_OVERRIDE(SpreadsheetGui::ViewProviderSheet);
public:
/// constructor.
@@ -48,28 +48,28 @@ public:
/// destructor.
~ViewProviderSheet();
void setDisplayMode(const char* ModeName);
virtual bool useNewSelectionModel(void) const {return false;}
std::vector<std::string> getDisplayModes() const;
void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
std::vector<std::string> getDisplayModes() const override;
virtual bool doubleClicked(void);
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
virtual bool doubleClicked(void) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
Spreadsheet::Sheet* getSpreadsheetObject() const;
virtual void beforeDelete() override;
QIcon getIcon() const;
QIcon getIcon() const override;
virtual bool setEdit(int ModNum);
virtual bool setEdit(int ModNum) override;
virtual bool isShow(void) const { return true; }
virtual bool isShow(void) const override { return true; }
virtual Gui::MDIView *getMDIView() override;
protected:
SheetView* showSpreadsheetView();
void updateData(const App::Property *prop);
void updateData(const App::Property *prop) override;
private:
QPointer<SheetView> view;
};

18
src/Mod/TechDraw/App/DrawPage.h
View File

@@ -37,7 +37,7 @@ namespace TechDraw
class TechDrawExport DrawPage: public App::DocumentObject
{
PROPERTY_HEADER(TechDraw::DrawPage);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawPage);
public:
DrawPage(void);
@@ -55,22 +55,22 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute(void) override;
//@}
virtual void handleChangedPropertyType(
Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
int addView(App::DocumentObject *docObj);
int removeView(App::DocumentObject* docObj);
short mustExecute() const;
short mustExecute() const override;
boost::signals2::signal<void (const DrawPage*)> signalGuiPaint;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderPage";
}
PyObject *getPyObject(void);
PyObject *getPyObject(void) override;
//App::DocumentObjectExecReturn * recompute(void);
@@ -99,10 +99,10 @@ public:
int getNextBalloonIndex(void);
protected:
void onBeforeChange(const App::Property* prop);
void onChanged(const App::Property* prop);
virtual void onDocumentRestored();
virtual void unsetupObject();
void onBeforeChange(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
virtual void unsetupObject() override;
private:

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

@@ -85,7 +85,7 @@ class DrawViewSection;
class TechDrawExport DrawViewPart : public DrawView
{
PROPERTY_HEADER(TechDraw::DrawViewPart);
PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewPart);
public:
DrawViewPart(void);
@@ -114,13 +114,13 @@ public:
TechDraw::PropertyCenterLineList CenterLines;
TechDraw::PropertyGeomFormatList GeomFormats;
virtual short mustExecute() const;
virtual short mustExecute() const override;
virtual void onDocumentRestored() override;
virtual App::DocumentObjectExecReturn *execute(void);
virtual const char* getViewProviderName(void) const {
virtual App::DocumentObjectExecReturn *execute(void) override;
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderViewPart";
}
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
std::vector<TechDraw::DrawHatch*> getHatches(void) const;
std::vector<TechDraw::DrawGeomHatch*> getGeomHatches(void) const;
@@ -142,7 +142,7 @@ public:
virtual Base::BoundBox3d getBoundingBox() const;
double getBoxX(void) const;
double getBoxY(void) const;
virtual QRectF getRect() const;
virtual QRectF getRect() const override;
virtual std::vector<DrawViewSection*> getSectionRefs() const; //are there ViewSections based on this ViewPart?
virtual std::vector<DrawViewDetail*> getDetailRefs() const;
const Base::Vector3d& getUDir(void) const {return uDir;} //paperspace X
@@ -210,8 +210,8 @@ protected:
TechDraw::GeometryObject *geometryObject;
Base::BoundBox3d bbox;
void onChanged(const App::Property* prop);
virtual void unsetupObject();
void onChanged(const App::Property* prop) override;
virtual void unsetupObject() override;
virtual TechDraw::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis);
void extractFaces();

1
src/Mod/TechDraw/Gui/TaskCenterLine.h
View File

@@ -162,7 +162,6 @@ protected:
private:
Ui_TaskCL2Lines* ui;
TechDraw::DrawViewPart* m_partFeat;
TechDrawGui::TaskCenterLine* m_tcl;
};

26
src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
View File

@@ -43,7 +43,7 @@ class MDIViewPage;
class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(TechDrawGui::ViewProviderDrawingView);
PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderDrawingView);
public:
/// constructor
@@ -53,20 +53,20 @@ public:
App::PropertyBool KeepLabel;
virtual void attach(App::DocumentObject *);
virtual void setDisplayMode(const char* ModeName);
virtual bool useNewSelectionModel(void) const {return false;}
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const;
virtual std::vector<std::string> getDisplayModes(void) const override;
/// Hide the object in the view
virtual void hide(void);
virtual void hide(void) override;
/// Show the object in the view
virtual void show(void);
virtual bool isShow(void) const;
virtual void show(void) override;
virtual bool isShow(void) const override;
virtual void onChanged(const App::Property *prop);
virtual void updateData(const App::Property*);
virtual void unsetEdit(int ModNum);
virtual void onChanged(const App::Property *prop) override;
virtual void updateData(const App::Property*) override;
virtual void unsetEdit(int ModNum) override;
QGIView* getQView(void);
MDIViewPage* getMDIViewPage() const;
@@ -74,8 +74,8 @@ public:
/** @name Restoring view provider from document load */
//@{
virtual void startRestoring();
virtual void finishRestoring();
virtual void startRestoring() override;
virtual void finishRestoring() override;
//@}
virtual TechDraw::DrawView* getViewObject() const;

20
src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
View File

@@ -41,7 +41,7 @@ namespace TechDrawGui {
class TechDrawGuiExport ViewProviderGeomHatch : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(TechDrawGui::ViewProviderGeomHatch);
PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderGeomHatch);
public:
/// constructor
@@ -53,16 +53,16 @@ public:
App::PropertyColor ColorPattern;
virtual void attach(App::DocumentObject *);
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property *prop);
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual bool doubleClicked(void);
virtual void attach(App::DocumentObject *) override;
virtual void updateData(const App::Property*) override;
virtual void onChanged(const App::Property *prop) override;
virtual bool setEdit(int ModNum) override;
virtual void unsetEdit(int ModNum) override;
virtual bool doubleClicked(void) override;
virtual bool useNewSelectionModel(void) const {return false;}
virtual void setDisplayMode(const char* ModeName);
virtual std::vector<std::string> getDisplayModes(void) const;
virtual bool useNewSelectionModel(void) const override {return false;}
virtual void setDisplayMode(const char* ModeName) override;
virtual std::vector<std::string> getDisplayModes(void) const override;
void updateGraphic(void);
void getParameters(void);

14
src/Mod/TechDraw/Gui/ViewProviderHatch.h
View File

@@ -36,7 +36,7 @@ namespace TechDrawGui {
class TechDrawGuiExport ViewProviderHatch : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(TechDrawGui::ViewProviderHatch);
PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderHatch);
public:
/// constructor
@@ -47,13 +47,13 @@ public:
App::PropertyColor HatchColor;
App::PropertyFloatConstraint HatchScale;
virtual void attach(App::DocumentObject *);
virtual void setDisplayMode(const char* ModeName);
virtual bool useNewSelectionModel(void) const {return false;}
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const;
virtual void onChanged(const App::Property* prop);
virtual void updateData(const App::Property*);
virtual std::vector<std::string> getDisplayModes(void) const override;
virtual void onChanged(const App::Property* prop) override;
virtual void updateData(const App::Property*) override;
TechDraw::DrawHatch* getViewObject() const;

36
src/Mod/TechDraw/Gui/ViewProviderPage.h
View File

@@ -41,7 +41,7 @@ class QGVPage;
class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(TechDrawGui::ViewProviderPage);
PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderPage);
public:
/// constructor
@@ -51,28 +51,28 @@ public:
App::PropertyBool ShowFrames;
virtual void attach(App::DocumentObject *);
virtual void setDisplayMode(const char* ModeName);
virtual bool useNewSelectionModel(void) const {return false;}
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const;
virtual std::vector<std::string> getDisplayModes(void) const override;
/// Hides the view provider
virtual void hide(void);
virtual void hide(void) override;
/// Shows the view provider
virtual void show(void);
virtual bool isShow(void) const;
virtual void show(void) override;
virtual bool isShow(void) const override;
/// Claim all the views for the page
std::vector<App::DocumentObject*> claimChildren(void) const;
std::vector<App::DocumentObject*> claimChildren(void) const override;
/// Is called by the tree if the user double click on the object
virtual bool doubleClicked(void);
void setupContextMenu(QMenu*, QObject*, const char*);
virtual bool onDelete(const std::vector<std::string> &);
virtual void onChanged(const App::Property *prop);
virtual void updateData(const App::Property* prop);
virtual void startRestoring();
virtual void finishRestoring();
virtual bool doubleClicked(void) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &) override;
virtual void onChanged(const App::Property *prop) override;
virtual void updateData(const App::Property* prop) override;
virtual void startRestoring() override;
virtual void finishRestoring() override;
bool isRestoring(void) {return !m_docReady;}
TechDraw::DrawPage* getDrawPage() const;
@@ -80,7 +80,7 @@ public:
typedef boost::signals2::scoped_connection Connection;
Connection connectGuiRepaint;
void unsetEdit(int ModNum);
void unsetEdit(int ModNum) override;
MDIViewPage* getMDIViewPage();
bool showMDIViewPage();
void removeMDIView(void);
@@ -94,7 +94,7 @@ public:
void setGraphicsView(QGVPage* gv);
protected:
bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
private:
QPointer<MDIViewPage> m_mdiView;

20
src/Mod/TechDraw/Gui/ViewProviderTemplate.h
View File

@@ -36,7 +36,7 @@ class MDIViewPage;
class TechDrawGuiExport ViewProviderTemplate : public Gui::ViewProviderDocumentObject
{
PROPERTY_HEADER(TechDrawGui::ViewProviderTemplate);
PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderTemplate);
public:
/// constructor
@@ -44,16 +44,16 @@ public:
/// destructor
virtual ~ViewProviderTemplate();
virtual void attach(App::DocumentObject *);
virtual void setDisplayMode(const char* ModeName);
virtual bool useNewSelectionModel(void) const {return false;}
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const;
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property *prop);
virtual void hide(void);
virtual void show(void);
virtual bool isShow(void) const;
virtual std::vector<std::string> getDisplayModes(void) const override;
virtual void updateData(const App::Property*) override;
virtual void onChanged(const App::Property *prop) override;
virtual void hide(void) override;
virtual void show(void) override;
virtual bool isShow(void) const override;
QGITemplate* getQTemplate(void);
TechDraw::DrawTemplate* getTemplate() const;
MDIViewPage* getMDIViewPage(void);