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

Fix clang compiler warnings:

Browse Source 
+ fix -Winconsistent-missing-override
This commit is contained in:
wmayer
2019-08-09 20:07:02 +02:00
parent a731566661
commit 3759b83b7c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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