Fix clang compiler warnings:

+ fix -Winconsistent-missing-override
FreeCAD · Aug 17, 2019 · 3759b83 · 3759b83
1 parent a731566
commit 3759b83
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.h b/src/Mod/Spreadsheet/App/PropertySheet.h
@@ -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 @@ class SpreadsheetExport PropertySheet : public App::PropertyExpressionContainer
     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 @@ class SpreadsheetExport PropertySheet : public App::PropertyExpressionContainer
 
     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 @@ class SpreadsheetExport PropertySheet : public App::PropertyExpressionContainer
 
     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);
 

diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
@@ -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 @@ class SpreadsheetGuiExport ViewProviderSheet : public Gui::ViewProviderDocumentO
     /// 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;
 };