Fix clang compiler warnings:
+ fix -Winconsistent-missing-override
This commit is contained in:
@@ -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 );
|
||||
|
||||
@@ -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[];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user