kindred/create
1
1
Fork 0
Code Issues 44 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

14
src/App/Document.h
View File

@@ -60,7 +60,7 @@ namespace App
/// The document class
class AppExport Document : public App::PropertyContainer
{
PROPERTY_HEADER(App::Document);
PROPERTY_HEADER_WITH_OVERRIDE(App::Document);
public:
enum Status {
@@ -222,11 +222,11 @@ public:
const char* getName() const;
//@}
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;
/// returns the complete document memory consumption, including all managed DocObjects and Undo Redo.
unsigned int getMemSize (void) const;
unsigned int getMemSize (void) const override;
/** @name Object handling */
//@{
@@ -478,7 +478,7 @@ public:
/// Function called to signal that an object identifier has been renamed
void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths, const std::function<bool(const App::DocumentObject*)> &selector = [](const App::DocumentObject *) { return true; });
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
virtual std::string getFullName() const override;
@@ -508,8 +508,8 @@ protected:
void writeObjects(const std::vector<App::DocumentObject*>&, Base::Writer &writer) const;
bool saveToFile(const char* filename) const;
void onBeforeChange(const Property* prop);
void onChanged(const Property* prop);
void onBeforeChange(const Property* prop) override;
void onChanged(const Property* prop) override;
/// callback from the Document objects before property will be changed
void onBeforeChangeProperty(const TransactionalObject *Who, const Property *What);
/// callback from the Document objects after property was changed

14
src/App/DocumentObject.h
View File

@@ -90,7 +90,7 @@ public:
*/
class AppExport DocumentObject: public App::TransactionalObject
{
PROPERTY_HEADER(App::DocumentObject);
PROPERTY_HEADER_WITH_OVERRIDE(App::DocumentObject);
public:
@@ -126,8 +126,8 @@ public:
std::string getExportName(bool forced=false) const;
/// Return the object full name of the form DocName#ObjName
virtual std::string getFullName() const override;
virtual bool isAttachedToDocument() const;
virtual const char* detachFromDocument();
virtual bool isAttachedToDocument() const override;
virtual const char* detachFromDocument() override;
/// gets the document in which this Object is handled
App::Document *getDocument(void) const;
@@ -303,7 +303,7 @@ public:
* additional or different behavior.
*/
virtual void onLostLinkToObject(DocumentObject*);
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
/** Get the sub element/object by name
*
@@ -405,7 +405,7 @@ public:
static DocumentObjectExecReturn *StdReturn;
virtual void Save (Base::Writer &writer) const;
virtual void Save (Base::Writer &writer) const override;
/* Expression support */
@@ -576,9 +576,9 @@ protected:
void setDocument(App::Document* doc);
/// get called before the value is changed
virtual void onBeforeChange(const Property* prop);
virtual void onBeforeChange(const Property* prop) override;
/// get called by the container when a property was changed
virtual void onChanged(const Property* prop);
virtual void onChanged(const Property* prop) override;
/// get called after a document has been fully restored
virtual void onDocumentRestored();
/// get called after setting the document

4
src/App/DocumentObjectGroup.h
View File

@@ -44,11 +44,11 @@ public:
virtual ~DocumentObjectGroup();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override{
return "Gui::ViewProviderDocumentObjectGroup";
}
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
};
typedef App::FeaturePythonT<DocumentObjectGroup> DocumentObjectGroupPython;

6
src/App/Expression.cpp
View File

@@ -423,8 +423,8 @@ static Py::Object _pyObjectFromAny(const App::any &value, const Expression *e) {
return Py::Long(cast<int>(value));
#endif
else if (is_type(value,typeid(long))) {
long l = cast<long>(value);
#if PY_MAJOR_VERSION < 3
long l = cast<long>(value);
if(std::abs(l)<=INT_MAX)
return Py::Int(int(l));
#endif
@@ -505,7 +505,7 @@ bool pyToQuantity(Quantity &q, const Py::Object &pyobj) {
return true;
}
static inline Quantity pyToQuantity(const Py::Object &pyobj,
/*static inline Quantity pyToQuantity(const Py::Object &pyobj,
const Expression *e, const char *msg=0)
{
Quantity q;
@@ -515,7 +515,7 @@ static inline Quantity pyToQuantity(const Py::Object &pyobj,
__EXPR_THROW(TypeError,msg,e);
}
return q;
}
}*/
Py::Object pyFromQuantity(const Quantity &quantity) {
if(!quantity.getUnit().isEmpty())

11
src/App/Expression.h
View File

@@ -35,6 +35,12 @@
#include <deque>
#include <App/Range.h>
//FIXME: PyObjectExpression hides overloaded virtual functions
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Woverloaded-virtual"
#endif
namespace App {
class DocumentObject;
@@ -654,4 +660,9 @@ public:
}
}
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#endif // EXPRESSION_H

2
src/App/ExtensionContainer.h
View File

@@ -193,7 +193,7 @@ private:
};
#define PROPERTY_HEADER_WITH_EXTENSIONS(_class_) \
PROPERTY_HEADER(_class)
PROPERTY_HEADER_WITH_OVERRIDE(_class)
/// We make sur that the PropertyData of the container is not connected to the one of the extension
#define PROPERTY_SOURCE_WITH_EXTENSIONS(_class_, _parentclass_) \

18
src/App/FeaturePython.h
View File

@@ -159,7 +159,7 @@ public:
template <class FeatureT>
class FeaturePythonT : public FeatureT
{
PROPERTY_HEADER(App::FeaturePythonT<FeatureT>);
PROPERTY_HEADER_WITH_OVERRIDE(App::FeaturePythonT<FeatureT>);
public:
FeaturePythonT() {
@@ -173,7 +173,7 @@ public:
/** @name methods override DocumentObject */
//@{
short mustExecute() const {
short mustExecute() const override {
if (this->isTouched())
return 1;
auto ret = FeatureT::mustExecute();
@@ -181,7 +181,7 @@ public:
return imp->mustExecute()?1:0;
}
/// recalculate the Feature
virtual DocumentObjectExecReturn *execute(void) {
virtual DocumentObjectExecReturn *execute(void) override {
try {
bool handled = imp->execute();
if (!handled)
@@ -199,7 +199,7 @@ public:
return FeatureT::getViewProviderNameOverride();
}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return FeatureT::getViewProviderName();
//return "Gui::ViewProviderPythonFeature";
}
@@ -279,14 +279,14 @@ public:
return FeatureT::canLoadPartial();
}
PyObject *getPyObject(void) {
PyObject *getPyObject(void) override {
if (FeatureT::PythonObject.is(Py::_None())) {
// ref counter is set to 1
FeatureT::PythonObject = Py::Object(imp->getPyObject(),true);
}
return Py::new_reference_to(FeatureT::PythonObject);
}
void setPyObject(PyObject *obj) {
void setPyObject(PyObject *obj) override {
if (obj)
FeatureT::PythonObject = obj;
else
@@ -294,7 +294,7 @@ public:
}
protected:
virtual void onBeforeChange(const Property* prop) {
virtual void onBeforeChange(const Property* prop) override {
FeatureT::onBeforeChange(prop);
imp->onBeforeChange(prop);
}
@@ -302,13 +302,13 @@ protected:
if(!imp->onBeforeChangeLabel(newLabel))
FeatureT::onBeforeChangeLabel(newLabel);
}
virtual void onChanged(const Property* prop) {
virtual void onChanged(const Property* prop) override {
if(prop == &Proxy)
imp->init(Proxy.getValue().ptr());
imp->onChanged(prop);
FeatureT::onChanged(prop);
}
virtual void onDocumentRestored() {
virtual void onDocumentRestored() override {
imp->onDocumentRestored();
FeatureT::onDocumentRestored();
}

4
src/App/Link.h
View File

@@ -50,7 +50,7 @@ namespace App
class AppExport LinkBaseExtension : public App::DocumentObjectExtension
{
EXTENSION_PROPERTY_HEADER(App::LinkExtension);
EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::LinkExtension);
typedef App::DocumentObjectExtension inherited;
public:
@@ -318,7 +318,7 @@ typedef ExtensionPythonT<LinkBaseExtension> LinkBaseExtensionPython;
class AppExport LinkExtension : public LinkBaseExtension
{
EXTENSION_PROPERTY_HEADER(App::LinkExtension);
EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(App::LinkExtension);
typedef LinkBaseExtension inherited;
public:

4
src/App/Part.h
View File

@@ -80,7 +80,7 @@ public:
virtual ~Part();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName(void) const override {
return "Gui::ViewProviderPart";
}
@@ -91,7 +91,7 @@ public:
*/
static App::Part* getPartOfObject (const DocumentObject* obj);
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
};
//typedef App::FeaturePythonT<Part> PartPython;

6
src/App/Property.h
View File

@@ -57,7 +57,7 @@ class ObjectIdentifier;
*/
class AppExport Property : public Base::Persistence
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
enum Status
@@ -110,7 +110,7 @@ public:
* This method is defined in Base::Persistence
* @see Base::Persistence
*/
virtual unsigned int getMemSize (void) const {
virtual unsigned int getMemSize (void) const override {
// you have to implement this method in all property classes!
return sizeof(father) + sizeof(StatusBits);
}
@@ -424,7 +424,7 @@ protected:
class AppExport PropertyLists : public Property, public PropertyListsBase
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual void setPyObject(PyObject *obj) override {
_setPyObject(obj);

20
src/App/PropertyExpressionEngine.h
View File

@@ -64,7 +64,7 @@ private:
class AppExport PropertyExpressionEngine : public App::PropertyExpressionContainer,
private App::AtomicPropertyChangeInterface<PropertyExpressionEngine>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual void updateElementReference(
@@ -103,7 +103,7 @@ public:
PropertyExpressionEngine();
~PropertyExpressionEngine();
unsigned int getMemSize (void) const;
unsigned int getMemSize (void) const override;
virtual std::map<App::ObjectIdentifier, const App::Expression*> getExpressions() const override;
virtual void setExpressions(std::map<App::ObjectIdentifier, App::ExpressionPtr> &&exprs) override;
@@ -111,17 +111,17 @@ public:
void setValue() { } // Dummy
Property *Copy(void) const;
Property *Copy(void) const override;
void Paste(const Property &from);
void Paste(const Property &from) override;
void Save (Base::Writer & writer) const;
void Save (Base::Writer & writer) const override;
void Restore(Base::XMLReader &reader);
void Restore(Base::XMLReader &reader) override;
void setValue(const App::ObjectIdentifier &path, boost::shared_ptr<App::Expression> expr);
const boost::any getPathValue(const App::ObjectIdentifier & path) const;
const boost::any getPathValue(const App::ObjectIdentifier & path) const override;
/// Execute options
enum ExecuteOption {
@@ -153,7 +153,7 @@ public:
void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths);
App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier &p) const;
App::ObjectIdentifier canonicalPath(const App::ObjectIdentifier &p) const override;
size_t numExpressions() const;
@@ -164,8 +164,8 @@ public:
virtual void onContainerRestored() override;
/* Python interface */
PyObject *getPyObject(void);
void setPyObject(PyObject *);
PyObject *getPyObject(void) override;
void setPyObject(PyObject *) override;
protected:
virtual void hasSetValue() override;

78
src/App/PropertyGeo.h
View File

@@ -56,7 +56,7 @@ class Placement;
*/
class AppExport PropertyVector: public Property
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -77,25 +77,25 @@ public:
void setValue(double x, double y, double z);
/// Get valid paths for this property; used by auto completer
void getPaths(std::vector<ObjectIdentifier> &paths) const;
void getPaths(std::vector<ObjectIdentifier> &paths) const override;
/** This method returns a string representation of the property
*/
const Base::Vector3d &getValue(void) const;
const char* getEditorName(void) const {
const char* getEditorName(void) const override {
return "Gui::PropertyEditor::PropertyVectorItem";
}
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const {
virtual unsigned int getMemSize (void) const override {
return sizeof(Base::Vector3d);
}
@@ -192,7 +192,7 @@ public:
class AppExport PropertyVectorList: public PropertyListsT<Base::Vector3d>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
typedef PropertyListsT<Base::Vector3d> inherited;
@@ -212,18 +212,18 @@ public:
void setValue(double x, double y, double z);
using inherited::setValue;
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 void SaveDocFile (Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
virtual void SaveDocFile (Base::Writer &writer) const override;
virtual void RestoreDocFile(Base::Reader &reader) override;
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
protected:
Base::Vector3d getPyValue(PyObject *) const override;
@@ -283,7 +283,7 @@ private:
*/
class AppExport PropertyPlacement: public Property
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -315,28 +315,28 @@ public:
const Base::Placement &getValue(void) const;
/// Get valid paths for this property; used by auto completer
void getPaths(std::vector<ObjectIdentifier> &paths) const;
void getPaths(std::vector<ObjectIdentifier> &paths) const override;
void setPathValue(const ObjectIdentifier &path, const boost::any &value);
void setPathValue(const ObjectIdentifier &path, const boost::any &value) override;
virtual const boost::any getPathValue(const ObjectIdentifier &path) const override;
virtual bool getPyPathValue(const ObjectIdentifier &path, Py::Object &res) const override;
const char* getEditorName(void) const {
const char* getEditorName(void) const override {
return "Gui::PropertyEditor::PropertyPlacementItem";
}
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const {
virtual unsigned int getMemSize (void) const override {
return sizeof(Base::Placement);
}
@@ -377,7 +377,7 @@ public:
class AppExport PropertyPlacementList: public PropertyListsT<Base::Placement>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -387,18 +387,18 @@ public:
virtual ~PropertyPlacementList();
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 void SaveDocFile (Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
virtual void SaveDocFile (Base::Writer &writer) const override;
virtual void RestoreDocFile(Base::Reader &reader) override;
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
protected:
Base::Placement getPyValue(PyObject *) const override;

125
src/App/PropertyLinks.h
View File

@@ -102,7 +102,7 @@ protected:
/// Parent class of all link type properties
class AppExport PropertyLinkBase : public Property, public ScopedLink
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
typedef std::pair<std::string,std::string> ShadowSub;
@@ -571,7 +571,7 @@ private:
*/
class AppExport PropertyLink : public PropertyLinkBase
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -607,19 +607,19 @@ public:
return _pcLink ? dynamic_cast<_type>(_pcLink) : 0;
}
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const{
virtual unsigned int getMemSize (void) const override {
return sizeof(App::DocumentObject *);
}
virtual const char* getEditorName(void) const
virtual const char* getEditorName(void) const override
{ return "Gui::PropertyEditor::PropertyLinkItem"; }
virtual void getLinks(std::vector<App::DocumentObject *> &objs,
@@ -665,7 +665,7 @@ public:
class AppExport PropertyLinkListBase: public PropertyLinkBase, public PropertyListsBase
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
virtual void setPyObject(PyObject *obj) override {
_setPyObject(obj);
@@ -675,7 +675,7 @@ public:
class AppExport PropertyLinkList :
public PropertyListsT<DocumentObject*,std::vector<DocumentObject*>, PropertyLinkListBase>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
typedef PropertyListsT<DocumentObject*,std::vector<DocumentObject*>,PropertyLinkListBase> inherited;
public:
@@ -691,8 +691,8 @@ public:
*/
virtual ~PropertyLinkList();
virtual void setSize(int newSize);
virtual void setSize(int newSize, const_reference def);
virtual void setSize(int newSize) override;
virtual void setSize(int newSize, const_reference def) override;
/** Sets the property
*/
@@ -700,16 +700,16 @@ public:
void set1Value(int idx, DocumentObject * const &value) override;
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize(void) const;
virtual const char* getEditorName(void) const
virtual unsigned int getMemSize(void) const override;
virtual const char* getEditorName(void) const override
{ return "Gui::PropertyEditor::PropertyLinkListItem"; }
virtual void getLinks(std::vector<App::DocumentObject *> &objs,
@@ -772,7 +772,7 @@ class PropertyXLinkSub;
*/
class AppExport PropertyLinkSub : public PropertyLinkBase
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -825,14 +825,14 @@ public:
return _pcLinkSub ? dynamic_cast<_type>(_pcLinkSub) : 0;
}
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
/// Return a copy of the property if any changes caused by importing external object
virtual Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
@@ -843,7 +843,7 @@ public:
virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent,
App::DocumentObject *oldObj, App::DocumentObject *newObj) const override;
virtual unsigned int getMemSize (void) const{
virtual unsigned int getMemSize (void) const override {
return sizeof(App::DocumentObject *);
}
@@ -896,7 +896,7 @@ public:
class AppExport PropertyLinkSubList : public PropertyLinkBase
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
typedef std::pair<DocumentObject*, std::vector<std::string> > SubSet;
@@ -967,14 +967,14 @@ public:
void setSubListValues(const std::vector<SubSet>&);
std::vector<SubSet> getSubListValues(bool newStyle=false) const;
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
/// Return a copy of the property if any changes caused by importing external object
virtual Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
@@ -985,7 +985,7 @@ public:
virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent,
App::DocumentObject *oldObj, App::DocumentObject *newObj) const override;
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
virtual void updateElementReference(
DocumentObject *feature,bool reverse=false, bool notify=false) override;
@@ -1005,7 +1005,6 @@ private:
std::vector<std::string> _lSubList;
std::vector<ShadowSub> _ShadowSubList;
std::vector<int> _mapped;
bool _restoreLabel;
};
/** The general Link Property with Child scope
@@ -1041,7 +1040,7 @@ class PropertyXLinkSubList;
*/
class AppExport PropertyXLink : public PropertyLinkGlobal
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyXLink(bool allowPartial=false, PropertyLinkBase *parent=0);
@@ -1067,11 +1066,11 @@ public:
virtual int checkRestore(std::string *msg=0) const 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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
/// Return a copy of the property if any changes caused by importing external object
virtual Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
@@ -1082,8 +1081,8 @@ public:
virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent,
App::DocumentObject *oldObj, App::DocumentObject *newObj) const override;
virtual PyObject *getPyObject(void);
virtual void setPyObject(PyObject *);
virtual PyObject *getPyObject(void) override;
virtual void setPyObject(PyObject *) override;
friend class DocInfo;
@@ -1159,10 +1158,16 @@ protected:
};
//FIXME: PropertyXLinkSub hides overloaded virtual functions
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Woverloaded-virtual"
#endif
/** Link to one or more (sub)object from the same or different document
*/
class AppExport PropertyXLinkSub: public PropertyXLink {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyXLinkSub(bool allowPartial=false, PropertyLinkBase *parent=0);
@@ -1180,18 +1185,22 @@ public:
virtual bool upgrade(Base::XMLReader &reader, const char *typeName) override;
virtual PyObject *getPyObject(void);
virtual void setPyObject(PyObject *);
virtual PyObject *getPyObject(void) override;
virtual void setPyObject(PyObject *) override;
protected:
virtual PropertyXLink *createInstance() const;
virtual PropertyXLink *createInstance() const override;
};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
/** Link to one or more (sub)object(s) of one or more object(s) from the same or different document
*/
class AppExport PropertyXLinkSubList: public PropertyLinkBase {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyXLinkSubList();
@@ -1244,14 +1253,14 @@ public:
return _Links;
}
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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
@@ -1261,7 +1270,7 @@ public:
virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent,
App::DocumentObject *oldObj, App::DocumentObject *newObj) const override;
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
virtual void updateElementReference(
DocumentObject *feature,bool reverse=false, bool notify=false) override;
@@ -1293,7 +1302,7 @@ protected:
* @sa See PropertyExpressionEngine for example usage
*/
class AppExport PropertyXLinkContainer : public PropertyLinkBase {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyXLinkContainer();
~PropertyXLinkContainer();

108
src/App/PropertyStandard.h
View File

@@ -303,7 +303,7 @@ public:
*/
class AppExport PropertyIntegerList: public PropertyListsT<long>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
/**
@@ -319,17 +319,17 @@ public:
*/
virtual ~PropertyIntegerList();
virtual const char* getEditorName(void) const
virtual const char* getEditorName(void) const override
{ return "Gui::PropertyEditor::PropertyIntegerListItem"; }
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 Property &from);
virtual unsigned int getMemSize (void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const override;
protected:
long getPyValue(PyObject *item) const override;
@@ -582,7 +582,7 @@ public:
class AppExport PropertyFloatList: public PropertyListsT<double>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
@@ -598,20 +598,20 @@ public:
*/
virtual ~PropertyFloatList();
virtual const char* getEditorName(void) const
virtual const char* getEditorName(void) const override
{ return "Gui::PropertyEditor::PropertyFloatListItem"; }
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 void SaveDocFile (Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
virtual void SaveDocFile (Base::Writer &writer) const override;
virtual void RestoreDocFile(Base::Reader &reader) override;
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
virtual unsigned int getMemSize (void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const override;
protected:
double getPyValue(PyObject *item) const override;
@@ -723,7 +723,7 @@ public:
class AppExport PropertyStringList: public PropertyListsT<std::string>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
typedef PropertyListsT<std::string> inherited;
public:
@@ -743,18 +743,18 @@ public:
void setValues(const std::list<std::string>&);
using inherited::setValues;
virtual const char* getEditorName(void) const
virtual const char* getEditorName(void) const override
{ return "Gui::PropertyEditor::PropertyStringListItem"; }
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 Property &from);
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize (void) const override;
protected:
std::string getPyValue(PyObject *item) const override;
@@ -809,22 +809,22 @@ private:
*/
class AppExport PropertyBoolList : public PropertyListsT<bool,boost::dynamic_bitset<> >
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
typedef PropertyListsT<bool,boost::dynamic_bitset<> > inherited;
public:
PropertyBoolList();
virtual ~PropertyBoolList();
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 Property &from);
virtual unsigned int getMemSize (void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const override;
protected:
bool getPyValue(PyObject *) const override;
@@ -881,7 +881,7 @@ private:
class AppExport PropertyColorList: public PropertyListsT<Color>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
@@ -897,17 +897,17 @@ public:
*/
virtual ~PropertyColorList();
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 void SaveDocFile (Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
virtual void SaveDocFile (Base::Writer &writer) const override;
virtual void RestoreDocFile(Base::Reader &reader) override;
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
virtual unsigned int getMemSize (void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize (void) const override;
protected:
Color getPyValue(PyObject *) const override;
@@ -969,7 +969,7 @@ private:
*/
class AppExport PropertyMaterialList : public PropertyListsT<Material>
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
@@ -985,19 +985,19 @@ public:
*/
virtual ~PropertyMaterialList();
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) 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 void SaveDocFile(Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
virtual void SaveDocFile(Base::Writer &writer) const override;
virtual void RestoreDocFile(Base::Reader &reader) override;
virtual const char* getEditorName(void) const;
virtual const char* getEditorName(void) const override;
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
virtual unsigned int getMemSize(void) const;
virtual Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
virtual unsigned int getMemSize(void) const override;
protected:
Material getPyValue(PyObject *) const override;
@@ -1010,7 +1010,7 @@ protected:
* object, and then read back as the Python binding of the newly created object.
*/
class AppExport PropertyPersistentObject: public PropertyString {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
typedef PropertyString inherited;
public:
virtual PyObject *getPyObject(void) override;

10
src/Base/Exception.h
View File

@@ -253,15 +253,15 @@ public:
/// Assignment operator
FileException &operator=(const FileException &inst);
/// Description of the exception
virtual const char* what() const throw();
virtual const char* what() const throw() override;
/// Report generation
virtual void ReportException (void) const;
virtual void ReportException (void) const override;
/// Get file name for use with tranlatable message
std::string getFileName() const;
/// returns a Python dictionary containing the exception data
virtual PyObject * getPyObject(void);
virtual PyObject * getPyObject(void) override;
/// returns sets the exception data from a Python dictionary
virtual void setPyObject( PyObject * pydict);
virtual void setPyObject( PyObject * pydict) override;
virtual PyObject * getPyExceptionType() const override;
protected:
@@ -326,7 +326,7 @@ public:
virtual ~MemoryException() throw() {}
#if defined (__GNUC__)
/// Description of the exception
virtual const char* what() const throw();
virtual const char* what() const throw() override;
#endif
};

2
src/Base/Interpreter.h
View File

@@ -113,7 +113,7 @@ public:
const std::string &getStackTrace(void) const {return _stackTrace;}
const std::string &getErrorType(void) const {return _errorType;}
virtual PyObject *getPyExceptionType(void) const override {return _exceptionType;}
void ReportException (void) const;
void ReportException (void) const override;
protected:
std::string _stackTrace;

1
src/Gui/ExpressionCompleter.cpp
View File

@@ -259,7 +259,6 @@ public:
}
int rowCount(const QModelIndex & parent = QModelIndex()) const {
const auto &docs = App::GetApplication().getDocuments();
Info info;
int row = 0;
if(!parent.isValid()) {

5
src/Gui/MainWindow.cpp
View File

@@ -1279,9 +1279,10 @@ void MainWindow::appendRecentFile(const QString& filename)
}
}
void MainWindow::updateActions(bool delay) {
void MainWindow::updateActions(bool delay)
{
//make it safe to call before the main window is actually created
if(!this)
if (!instance)
return;
if(!d->activityTimer->isActive())
d->activityTimer->start(150);

16
src/Gui/ProgressBar.h
View File

@@ -100,10 +100,10 @@ public:
* to indicate that the user can click on the dialog. Every pause() must eventually be followed
* by a corresponding @ref resume().
*/
void pause();
void pause() override;
/** This sets the wait cursor again and grabs the keyboard. @see pause() */
void resume();
bool isBlocking() const;
void resume() override;
bool isBlocking() const override;
/** Returns an instance of the progress bar. It creates one if needed. */
QProgressBar* getProgressBar(QWidget* parent=0);
@@ -116,15 +116,15 @@ protected:
~Sequencer ();
/** Puts text to the status bar */
void setText (const char* pszTxt);
void setText (const char* pszTxt) override;
/** Starts the progress bar */
void startStep();
void startStep() override;
/** Increase the progress bar. */
void nextStep(bool canAbort);
void nextStep(bool canAbort) override;
/** Sets the progress indicator to a certain position. */
void setProgress(size_t);
void setProgress(size_t) override;
/** Resets the sequencer */
void resetData();
void resetData() override;
void showRemainingTime();
private:

4
src/Gui/PropertyView.h
View File

@@ -75,12 +75,12 @@ public Q_SLOTS:
void onTimer();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
private:
void onSelectionChanged(const SelectionChanges& msg);
void onSelectionChanged(const SelectionChanges& msg) override;
void slotChangePropertyData(const App::DocumentObject&, const App::Property&);
void slotChangePropertyView(const Gui::ViewProvider&, const App::Property&);
void slotAppendDynamicProperty(const App::Property&);

8
src/Gui/SelectionView.h
View File

@@ -62,16 +62,16 @@ public:
virtual ~SelectionView();
/// Observer message from the Selection
virtual void onSelectionChanged(const SelectionChanges& msg);
virtual void onSelectionChanged(const SelectionChanges& msg) override;
virtual void leaveEvent(QEvent*) override;
bool onMsg(const char* pMsg,const char** ppReturn);
bool onMsg(const char* pMsg,const char** ppReturn) override;
virtual const char *getName(void) const {return "SelectionView";}
virtual const char *getName(void) const override {return "SelectionView";}
/// get called when the document is changed or updated
virtual void onUpdate(void);
virtual void onUpdate(void) override;
QListWidget* selectionView;
QLabel* countLabel;

4
src/Gui/Tree.cpp
View File

@@ -198,7 +198,7 @@ struct Stats {
DEFINE_STATS
};
static Stats _Stats;
//static Stats _Stats;
struct TimingInfo {
bool timed = false;
@@ -2054,7 +2054,7 @@ void TreeWidget::dropEvent(QDropEvent *event)
if(copied.size())
res = copied.back();
}else
res = thisDoc->moveObject({obj},true);
res = thisDoc->moveObject(obj,true);
if(res) {
propPlacement = dynamic_cast<App::PropertyPlacement*>(
res->getPropertyByName("Placement"));

34
src/Gui/Tree.h
View File

@@ -83,7 +83,7 @@ public:
void selectAllLinks(App::DocumentObject *obj);
void expandSelectedItems(TreeItemMode mode);
bool eventFilter(QObject *, QEvent *ev);
bool eventFilter(QObject *, QEvent *ev) override;
struct SelInfo {
App::DocumentObject *topParent;
@@ -127,24 +127,24 @@ public:
protected:
/// Observer message from the Selection
void onSelectionChanged(const SelectionChanges& msg);
void contextMenuEvent (QContextMenuEvent * e);
void drawRow(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const;
void onSelectionChanged(const SelectionChanges& msg) override;
void contextMenuEvent (QContextMenuEvent * e) override;
void drawRow(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
/** @name Drag and drop */
//@{
void startDrag(Qt::DropActions supportedActions);
void startDrag(Qt::DropActions supportedActions) override;
bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data,
Qt::DropAction action);
Qt::DropActions supportedDropActions () const;
QMimeData * mimeData (const QList<QTreeWidgetItem *> items) const;
void dragEnterEvent(QDragEnterEvent * event);
void dragLeaveEvent(QDragLeaveEvent * event);
void dragMoveEvent(QDragMoveEvent *event);
void dropEvent(QDropEvent *event);
Qt::DropAction action) override;
Qt::DropActions supportedDropActions () const override;
QMimeData * mimeData (const QList<QTreeWidgetItem *> items) const override;
void dragEnterEvent(QDragEnterEvent * event) override;
void dragLeaveEvent(QDragLeaveEvent * event) override;
void dragMoveEvent(QDragMoveEvent *event) override;
void dropEvent(QDropEvent *event) override;
//@}
bool event(QEvent *e);
void keyPressEvent(QKeyEvent *event);
void mouseDoubleClickEvent(QMouseEvent * event);
bool event(QEvent *e) override;
void keyPressEvent(QKeyEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent * event) override;
protected:
void showEvent(QShowEvent *) override;
@@ -195,7 +195,7 @@ private:
void slotChangeObject(const Gui::ViewProviderDocumentObject&, const App::Property &prop);
void slotTouchedObject(const App::DocumentObject&);
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setupText();
void updateChildren(App::DocumentObject *obj,
@@ -274,7 +274,7 @@ public:
void updateItemSelection(DocumentObjectItem *);
void selectItems(bool sync);
void testStatus(void);
void setData(int column, int role, const QVariant & value);
void setData(int column, int role, const QVariant & value) override;
void populateItem(DocumentObjectItem *item, bool refresh=false, bool delayUpdate=true);
bool populateObject(App::DocumentObject *obj);
void selectAllInstances(const ViewProviderDocumentObject &vpd);

2
src/Gui/View3DInventorViewer.cpp
View File

@@ -756,7 +756,7 @@ void View3DInventorViewer::checkGroupOnTop(const SelectionChanges &Reason) {
SoSelectionElementAction action(node->getDetail()?
SoSelectionElementAction::Remove:SoSelectionElementAction::None,true);
auto path = node->getPath();
SoTempPath tmpPath(2+path?path->getLength():0);
SoTempPath tmpPath(2 + (path ? path->getLength() : 0));
tmpPath.ref();
tmpPath.append(pcGroup);
tmpPath.append(node);

22
src/Gui/ViewProviderDocumentObject.h
View File

@@ -48,7 +48,7 @@ class Document;
class GuiExport ViewProviderDocumentObject : public ViewProvider
{
PROPERTY_HEADER(Gui::ViewProviderDocumentObject);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDocumentObject);
public:
/// constructor.
@@ -69,30 +69,30 @@ public:
/// Set the active mode, i.e. the first item of the 'Display' property.
void setActiveMode();
/// 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 void show(void) override;
virtual bool canDropObjectEx(App::DocumentObject *, App::DocumentObject *,
const char *, const std::vector<std::string> &) const override;
virtual int replaceObject(App::DocumentObject*, App::DocumentObject*) override;
virtual bool showInTree() const;
virtual bool showInTree() const override;
/// Get a list of TaskBoxes associated with this object
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>&) const;
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>&) const override;
/// Run a redraw
void updateView();
/// Get the object of this ViewProvider object
App::DocumentObject *getObject(void) const {return pcObject;}
/// Asks the view provider if the given object can be deleted.
virtual bool canDelete(App::DocumentObject* obj) const;
virtual bool canDelete(App::DocumentObject* obj) const override;
/// Get the GUI document to this ViewProvider object
Gui::Document* getDocument() const;
/// Get the python wrapper for that ViewProvider
PyObject* getPyObject();
PyObject* getPyObject() override;
/// return a hit element given the picked point which contains the full node path
virtual bool getElementPicked(const SoPickedPoint *, std::string &subname) const override;
@@ -162,9 +162,9 @@ protected:
*/
Gui::MDIView* getViewOfNode(SoNode* node) const;
/// get called before the value is changed
virtual void onBeforeChange(const App::Property* prop);
virtual void onBeforeChange(const App::Property* prop) override;
/// Gets 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;
/** Searches in all view providers that are attached to an object that
* is part of the same document as the object this view provider is
* attached to for an front root of \a type.
@@ -177,8 +177,8 @@ protected:
/** @name Transaction handling
*/
//@{
virtual bool isAttachedToDocument() const;
virtual const char* detachFromDocument();
virtual bool isAttachedToDocument() const override;
virtual const char* detachFromDocument() override;
/// get called when a property status has changed
virtual void onPropertyStatusChanged(const App::Property &prop, unsigned long oldStatus) override;

4
src/Gui/ViewProviderDocumentObjectGroup.h
View File

@@ -43,8 +43,8 @@ public:
virtual ~ViewProviderDocumentObjectGroup();
/// returns a list of all possible modes
std::vector<std::string> getDisplayModes(void) const;
bool isShow(void) const;
std::vector<std::string> getDisplayModes(void) const override;
bool isShow(void) const override;
protected:

16
src/Gui/ViewProviderDragger.h
View File

@@ -43,7 +43,7 @@ class SoFCCSysDragger;
*/
class GuiExport ViewProviderDragger : public ViewProviderDocumentObject
{
PROPERTY_HEADER(Gui::ViewProviderDragger);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDragger);
public:
/// constructor.
@@ -54,9 +54,9 @@ public:
/** @name Edit methods */
//@{
bool doubleClicked(void);
void setupContextMenu(QMenu*, QObject*, const char*);
void updateData(const App::Property*);
bool doubleClicked(void) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void updateData(const App::Property*) override;
virtual ViewProvider *startEditing(int ModNum=0) override;
@@ -64,10 +64,10 @@ public:
static void updateTransform(const Base::Placement &from, SoTransform *to);
protected:
bool setEdit(int ModNum);
void unsetEdit(int ModNum);
void setEditViewer(View3DInventorViewer*, int ModNum);
void unsetEditViewer(View3DInventorViewer*);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
void setEditViewer(View3DInventorViewer*, int ModNum) override;
void unsetEditViewer(View3DInventorViewer*) override;
//@}
SoFCCSysDragger *csysDragger = nullptr;

6
src/Gui/ViewProviderLink.h
View File

@@ -71,7 +71,7 @@ protected:
};
class GuiExport LinkView : public Base::BaseClass, public LinkOwner {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
LinkView();
@@ -79,7 +79,7 @@ public:
LinkView &operator=(const LinkView&) = delete;
LinkView(const LinkView&) = delete;
virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;
virtual void unlink(LinkInfoPtr) override;
virtual void onLinkedIconChange(LinkInfoPtr) override;
@@ -181,7 +181,7 @@ protected:
class GuiExport ViewProviderLink : public ViewProviderDocumentObject
{
PROPERTY_HEADER(Gui::ViewProviderLink);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderLink);
typedef ViewProviderDocumentObject inherited;
public:

6
src/Gui/ViewProviderPart.h
View File

@@ -43,12 +43,12 @@ public:
/// destructor.
virtual ~ViewProviderPart();
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;
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;
};
typedef ViewProviderPythonFeatureT<ViewProviderPart> ViewProviderPartPython;

16
src/Gui/ViewProviderPlacement.h
View File

@@ -43,28 +43,28 @@ namespace Gui
class GuiExport ViewProviderPlacement : public ViewProviderGeometryObject
{
PROPERTY_HEADER(Gui::ViewProviderPlacement);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPlacement);
public:
/// Constructor
ViewProviderPlacement(void);
virtual ~ViewProviderPlacement();
void attach(App::DocumentObject *);
void updateData(const App::Property*);
std::vector<std::string> getDisplayModes(void) const;
void setDisplayMode(const char* ModeName);
void attach(App::DocumentObject *) override;
void updateData(const App::Property*) 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;
virtual bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override;
virtual bool getDetailPath(const char *, SoFullPath *, bool, SoDetail *&) const override;
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

90
src/Gui/ViewProviderPythonFeature.h
View File

@@ -191,7 +191,7 @@ public:
template <class ViewProviderT>
class ViewProviderPythonFeatureT : public ViewProviderT
{
PROPERTY_HEADER(Gui::ViewProviderPythonFeatureT<ViewProviderT>);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPythonFeatureT<ViewProviderT>);
public:
/// constructor.
@@ -205,37 +205,37 @@ public:
}
// Returns the icon
QIcon getIcon() const {
QIcon getIcon() const override {
QIcon icon = imp->getIcon();
if (icon.isNull())
icon = ViewProviderT::getIcon();
return icon;
}
std::vector<App::DocumentObject*> claimChildren() const {
std::vector<App::DocumentObject*> claimChildren() const override {
return imp->claimChildren(ViewProviderT::claimChildren());
}
/** @name Nodes */
//@{
virtual SoSeparator* getRoot() {
virtual SoSeparator* getRoot() override {
return ViewProviderT::getRoot();
}
virtual SoSeparator* getFrontRoot() const {
virtual SoSeparator* getFrontRoot() const override {
return ViewProviderT::getFrontRoot();
}
// returns the root node of the Provider (3D)
virtual SoSeparator* getBackRoot() const {
virtual SoSeparator* getBackRoot() const override {
return ViewProviderT::getBackRoot();
}
//@}
/** @name Selection handling */
//@{
virtual bool useNewSelectionModel() const {
virtual bool useNewSelectionModel() const override {
return imp->useNewSelectionModel();
}
virtual bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const {
virtual bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override {
auto ret = imp->getElementPicked(pp,subname);
if(ret == ViewProviderPythonFeatureImp::NotImplemented)
return ViewProviderT::getElementPicked(pp,subname);
@@ -243,42 +243,42 @@ public:
return true;
return false;
}
virtual std::string getElement(const SoDetail *det) const {
virtual std::string getElement(const SoDetail *det) const override {
std::string name = imp->getElement(det);
if (!name.empty()) return name;
return ViewProviderT::getElement(det);
}
virtual SoDetail* getDetail(const char* name) const {
virtual SoDetail* getDetail(const char* name) const override {
SoDetail* det = imp->getDetail(name);
if (det) return det;
return ViewProviderT::getDetail(name);
}
virtual bool getDetailPath(const char *name, SoFullPath *path, bool append,SoDetail *&det) const {
virtual bool getDetailPath(const char *name, SoFullPath *path, bool append,SoDetail *&det) const override {
auto ret = imp->getDetailPath(name,path,append,det);
if(ret == ViewProviderPythonFeatureImp::NotImplemented)
return ViewProviderT::getDetailPath(name,path,append,det);
return ret == ViewProviderPythonFeatureImp::Accepted;
}
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const {
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const override {
return ViewProviderT::getSelectionShape(Element);
};
//@}
/** @name Update data methods*/
//@{
virtual void attach(App::DocumentObject *obj) {
virtual void attach(App::DocumentObject *obj) override {
// delay loading of the actual attach() method because the Python
// view provider class is not attached yet
ViewProviderT::pcObject = obj;
}
virtual void updateData(const App::Property* prop) {
virtual void updateData(const App::Property* prop) override {
imp->updateData(prop);
ViewProviderT::updateData(prop);
}
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>& c) const {
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>& c) const override {
ViewProviderT::getTaskViewContent(c);
}
virtual bool onDelete(const std::vector<std::string> & sub) {
virtual bool onDelete(const std::vector<std::string> & sub) override {
bool ok = imp->onDelete(sub);
if (!ok) return ok;
return ViewProviderT::onDelete(sub);
@@ -297,11 +297,11 @@ public:
/** @name Restoring view provider from document load */
//@{
virtual void startRestoring() {
virtual void startRestoring() override {
ViewProviderT::startRestoring();
imp->startRestoring();
}
virtual void finishRestoring() {
virtual void finishRestoring() override {
imp->finishRestoring();
ViewProviderT::finishRestoring();
}
@@ -310,7 +310,7 @@ public:
/** @name Drag and drop */
//@{
/// Returns true if the view provider generally supports dragging objects
virtual bool canDragObjects() const {
virtual bool canDragObjects() const override {
switch (imp->canDragObjects()) {
case ViewProviderPythonFeatureImp::Accepted:
return true;
@@ -321,7 +321,7 @@ public:
}
}
/// Check whether the object can be removed from the view provider by drag and drop
virtual bool canDragObject(App::DocumentObject* obj) const {
virtual bool canDragObject(App::DocumentObject* obj) const override {
switch (imp->canDragObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
return true;
@@ -332,7 +332,7 @@ public:
}
}
/// Starts to drag the object
virtual void dragObject(App::DocumentObject* obj) {
virtual void dragObject(App::DocumentObject* obj) override {
App::AutoTransaction committer;
switch (imp->dragObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
@@ -343,7 +343,7 @@ public:
}
}
/// Returns true if the view provider generally accepts dropping of objects
virtual bool canDropObjects() const {
virtual bool canDropObjects() const override {
switch (imp->canDropObjects()) {
case ViewProviderPythonFeatureImp::Accepted:
return true;
@@ -354,7 +354,7 @@ public:
}
}
/// Check whether the object can be dropped to the view provider by drag and drop
virtual bool canDropObject(App::DocumentObject* obj) const {
virtual bool canDropObject(App::DocumentObject* obj) const override {
switch (imp->canDropObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
return true;
@@ -365,7 +365,7 @@ public:
}
}
/// If the dropped object type is accepted the object will be added as child
virtual void dropObject(App::DocumentObject* obj) {
virtual void dropObject(App::DocumentObject* obj) override {
App::AutoTransaction committer;
switch (imp->dropObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
@@ -400,7 +400,7 @@ public:
}
/** Add an object with full quanlified name to the view provider by drag and drop */
virtual std::string dropObjectEx(App::DocumentObject *obj, App::DocumentObject *owner,
const char *subname, const std::vector<std::string> &elements)
const char *subname, const std::vector<std::string> &elements) override
{
App::AutoTransaction committer;
std::string ret;
@@ -418,24 +418,24 @@ public:
/** @name Display methods */
//@{
/// Returns true if the icon must always appear enabled in the tree view
virtual bool isShow() const {
virtual bool isShow() const override {
bool ok = imp->isShow();
if (ok) return ok;
return ViewProviderT::isShow();
}
/// get the default display mode
virtual const char* getDefaultDisplayMode() const {
virtual const char* getDefaultDisplayMode() const override {
return imp->getDefaultDisplayMode();
}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes(void) const {
virtual std::vector<std::string> getDisplayModes(void) const override {
std::vector<std::string> modes = ViewProviderT::getDisplayModes();
std::vector<std::string> more_modes = imp->getDisplayModes();
modes.insert(modes.end(), more_modes.begin(), more_modes.end());
return modes;
}
/// set the display mode
virtual void setDisplayMode(const char* ModeName) {
virtual void setDisplayMode(const char* ModeName) override {
std::string mask = imp->setDisplayMode(ModeName);
ViewProviderT::setDisplayMaskMode(mask.c_str());
ViewProviderT::setDisplayMode(ModeName);
@@ -453,7 +453,7 @@ public:
}
}
PyObject* getPyObject() {
PyObject* getPyObject() override {
return ViewProviderT::getPyObject();
}
@@ -462,7 +462,7 @@ public:
}
protected:
virtual void onChanged(const App::Property* prop) {
virtual void onChanged(const App::Property* prop) override {
if (prop == &Proxy) {
imp->init(Proxy.getValue().ptr());
if (ViewProviderT::pcObject && !Proxy.getValue().is(Py::_None())) {
@@ -489,7 +489,7 @@ protected:
}
}
/// is called by the document when the provider goes in edit mode
virtual bool setEdit(int ModNum)
virtual bool setEdit(int ModNum) override
{
switch (imp->setEdit(ModNum)) {
case ViewProviderPythonFeatureImp::Accepted:
@@ -501,7 +501,7 @@ protected:
}
}
/// is called when you lose the edit mode
virtual void unsetEdit(int ModNum)
virtual void unsetEdit(int ModNum) override
{
switch (imp->unsetEdit(ModNum)) {
case ViewProviderPythonFeatureImp::Accepted:
@@ -511,23 +511,23 @@ protected:
return ViewProviderT::unsetEdit(ModNum);
}
}
virtual void setEditViewer(View3DInventorViewer *viewer, int ModNum) {
virtual void setEditViewer(View3DInventorViewer *viewer, int ModNum) override {
if(!imp->setEditViewer(viewer,ModNum))
ViewProviderT::setEditViewer(viewer,ModNum);
}
virtual void unsetEditViewer(View3DInventorViewer *viewer) {
virtual void unsetEditViewer(View3DInventorViewer *viewer) override {
if(!imp->unsetEditViewer(viewer))
ViewProviderT::unsetEditViewer(viewer);
}
virtual std::string getDropPrefix() const {
virtual std::string getDropPrefix() const override {
std::string prefix;
if(!imp->getDropPrefix(prefix))
return ViewProviderT::getDropPrefix();
return prefix;
}
virtual int replaceObject(App::DocumentObject *oldObj, App::DocumentObject *newObj) {
virtual int replaceObject(App::DocumentObject *oldObj, App::DocumentObject *newObj) override {
App::AutoTransaction committer;
switch (imp->replaceObject(oldObj,newObj)) {
case ViewProviderPythonFeatureImp::Accepted:
@@ -539,6 +539,12 @@ protected:
}
}
//FIXME: ViewProviderPythonFeatureT hides overloaded virtual functions
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Woverloaded-virtual"
#endif
virtual ViewProviderDocumentObject *getLinkedViewProvider(bool recursive=false) const {
auto res = imp->getLinkedViewProvider(recursive);
if(!res)
@@ -546,15 +552,19 @@ protected:
return res;
}
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
public:
virtual void setupContextMenu(QMenu* menu, QObject* recipient, const char* member)
virtual void setupContextMenu(QMenu* menu, QObject* recipient, const char* member) override
{
ViewProviderT::setupContextMenu(menu, recipient, member);
imp->setupContextMenu(menu);
}
protected:
virtual bool doubleClicked(void)
virtual bool doubleClicked(void) override
{
App::AutoTransaction committer;
switch (imp->doubleClicked()) {
@@ -566,7 +576,7 @@ protected:
return ViewProviderT::doubleClicked();
}
}
virtual void setOverrideMode(const std::string &mode)
virtual void setOverrideMode(const std::string &mode) override
{
ViewProviderT::setOverrideMode(mode);
viewerMode = mode;

12
src/Gui/propertyeditor/PropertyItem.h
View File

@@ -986,14 +986,14 @@ class GuiExport PropertyLinkItem: public PropertyItem
Q_OBJECT
PROPERTYITEM_HEADER
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
virtual void setEditorData(QWidget *editor, const QVariant& data) const;
virtual QVariant editorData(QWidget *editor) const;
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override;
virtual void setEditorData(QWidget *editor, const QVariant& data) const override;
virtual QVariant editorData(QWidget *editor) const override;
protected:
virtual QVariant toString(const QVariant&) const;
virtual QVariant value(const App::Property*) const;
virtual void setValue(const QVariant&);
virtual QVariant toString(const QVariant&) const override;
virtual QVariant value(const App::Property*) const override;
virtual void setValue(const QVariant&) override;
virtual QVariant data(int column, int role) const override;
protected:

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