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

Mod: Use override etc 2

Browse Source
This commit is contained in:
berniev
2022-08-09 11:53:46 +10:00
committed by wwmayer
parent 75fa455c5d
commit 71dc5ead2f
697 changed files with 4956 additions and 4956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
View File

@@ -30,7 +30,7 @@ public:
initialize("This module is the Spreadsheet module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
};

10
src/Mod/Spreadsheet/App/PropertyColumnWidths.h
View File

@@ -51,13 +51,13 @@ public:
return i != end() ? i->second : defaultWidth;
}
virtual Property *Copy() const;
Property *Copy() const override;
virtual void Paste(const Property &from);
void Paste(const Property &from) override;
virtual void Save (Base::Writer & writer) const;
void Save (Base::Writer & writer) const override;
virtual void Restore(Base::XMLReader & reader);
void Restore(Base::XMLReader & reader) override;
bool isDirty() const { return !dirty.empty(); }
@@ -65,7 +65,7 @@ public:
const std::set<int> & getDirty() const { return dirty; }
PyObject *getPyObject();
PyObject *getPyObject() override;
void clear();

10
src/Mod/Spreadsheet/App/PropertyRowHeights.h
View File

@@ -51,13 +51,13 @@ public:
return *this;
}
virtual App::Property *Copy() const;
App::Property *Copy() const override;
virtual void Paste(const App::Property &from);
void Paste(const App::Property &from) override;
virtual void Save (Base::Writer & writer) const;
void Save (Base::Writer & writer) const override;
virtual void Restore(Base::XMLReader & reader);
void Restore(Base::XMLReader & reader) override;
bool isDirty() const { return dirty.size() > 0; }
@@ -65,7 +65,7 @@ public:
const std::set<int> & getDirty() const { return dirty; }
PyObject *getPyObject();
PyObject *getPyObject() override;
static const int defaultHeight;

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

@@ -45,33 +45,33 @@ public:
PropertySheet(Sheet * _owner = nullptr);
~PropertySheet();
~PropertySheet() override;
virtual std::map<App::ObjectIdentifier, const App::Expression*> getExpressions() const override;
virtual void setExpressions(std::map<App::ObjectIdentifier, App::ExpressionPtr> &&exprs) override;
virtual void onRelabeledDocument(const App::Document &doc) override;
std::map<App::ObjectIdentifier, const App::Expression*> getExpressions() const override;
void setExpressions(std::map<App::ObjectIdentifier, App::ExpressionPtr> &&exprs) override;
void onRelabeledDocument(const App::Document &doc) override;
virtual void updateElementReference(
void updateElementReference(
App::DocumentObject *feature,bool reverse=false,bool notify=false) override;
virtual bool referenceChanged() const override;
virtual bool adjustLink(const std::set<App::DocumentObject *> &inList) override;
virtual Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
virtual Property *CopyOnLabelChange(App::DocumentObject *obj,
bool referenceChanged() const override;
bool adjustLink(const std::set<App::DocumentObject *> &inList) override;
Property *CopyOnImportExternal(const std::map<std::string,std::string> &nameMap) const override;
Property *CopyOnLabelChange(App::DocumentObject *obj,
const std::string &ref, const char *newLabel) const override;
virtual Property *CopyOnLinkReplace(const App::DocumentObject *parent,
Property *CopyOnLinkReplace(const App::DocumentObject *parent,
App::DocumentObject *oldObj, App::DocumentObject *newObj) const override;
virtual void breakLink(App::DocumentObject *obj, bool clear) override;
void breakLink(App::DocumentObject *obj, bool clear) override;
virtual void afterRestore() override;
virtual void onContainerRestored() override;
void afterRestore() override;
void onContainerRestored() override;
virtual Property *Copy(void) const override;
Property *Copy(void) const override;
virtual void Paste(const Property &from) override;
void Paste(const Property &from) override;
virtual void Save (Base::Writer & writer) const override;
void Save (Base::Writer & writer) const override;
virtual void Restore(Base::XMLReader & reader) override;
void Restore(Base::XMLReader & reader) override;
void copyCells(Base::Writer &writer, const std::vector<App::Range> &ranges) const;
@@ -145,7 +145,7 @@ public:
void removeColumns(int col, int count);
virtual unsigned int getMemSize (void) const override;
unsigned int getMemSize (void) const override;
bool mergeCells(App::CellAddress from, App::CellAddress to);
@@ -188,8 +188,8 @@ public:
std::string getColumn(int offset=0) const;
virtual void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override;
virtual const boost::any getPathValue(const App::ObjectIdentifier & path) const override;
void setPathValue(const App::ObjectIdentifier & path, const boost::any & value) override;
const boost::any getPathValue(const App::ObjectIdentifier & path) const override;
unsigned getBindingBorder(App::CellAddress address) const;
@@ -207,11 +207,11 @@ public:
App::ObjectIdentifier *pTarget=nullptr) const;
protected:
virtual void hasSetValue() override;
virtual void hasSetChildValue(App::Property &prop) override;
virtual void onBreakLink(App::DocumentObject *obj) override;
virtual void onAddDep(App::DocumentObject *obj) override;
virtual void onRemoveDep(App::DocumentObject *obj) override;
void hasSetValue() override;
void hasSetChildValue(App::Property &prop) override;
void onBreakLink(App::DocumentObject *obj) override;
void onAddDep(App::DocumentObject *obj) override;
void onRemoveDep(App::DocumentObject *obj) override;
private:

30
src/Mod/Spreadsheet/App/Sheet.h
View File

@@ -63,10 +63,10 @@ class SpreadsheetExport PropertySpreadsheetQuantity : public App::PropertyQuanti
TYPESYSTEM_HEADER();
public:
PropertySpreadsheetQuantity(void){}
virtual ~PropertySpreadsheetQuantity(){}
~PropertySpreadsheetQuantity() override{}
virtual Property *Copy(void) const;
virtual void Paste(const Property &from);
Property *Copy(void) const override;
void Paste(const Property &from) override;
};
class SpreadsheetExport Sheet : public App::DocumentObject
@@ -77,10 +77,10 @@ public:
/// Constructor
Sheet();
virtual ~Sheet();
~Sheet() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName(void) const override {
return "SpreadsheetGui::ViewProviderSheet";
}
@@ -171,19 +171,19 @@ public:
void providesTo(App::CellAddress address, std::set<std::string> & result) const;
bool hasCell(const std::vector<App::Range> &ranges) const;
PyObject *getPyObject();
PyObject *getPyObject() override;
PropertySheet *getCells() { return &cells; }
App::Property *getPropertyByName(const char *name) const;
App::Property *getPropertyByName(const char *name) const override;
App::Property *getDynamicPropertyByName(const char* name) const;
App::Property *getDynamicPropertyByName(const char* name) const override;
virtual void getPropertyNamedList(std::vector<std::pair<const char*,App::Property*> > &List) const;
void getPropertyNamedList(std::vector<std::pair<const char*,App::Property*> > &List) const override;
virtual short mustExecute(void) const;
short mustExecute(void) const override;
App::DocumentObjectExecReturn *execute(void);
App::DocumentObjectExecReturn *execute(void) override;
bool getCellAddress(const App::Property *prop, App::CellAddress &address);
@@ -217,7 +217,7 @@ public:
void observeDocument(App::Document *document);
virtual void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths);
void renameObjectIdentifiers(const std::map<App::ObjectIdentifier, App::ObjectIdentifier> & paths) override;
void setCopyOrCutRanges(const std::vector<App::Range> &ranges, bool copy=true);
const std::vector<App::Range> &getCopyOrCutRange(bool copy=true) const;
@@ -225,13 +225,13 @@ public:
protected:
virtual void onChanged(const App::Property *prop);
void onChanged(const App::Property *prop) override;
void updateColumnsOrRows(bool horizontal, int section, int count) ;
std::set<App::CellAddress> providesTo(App::CellAddress address) const;
void onDocumentRestored();
void onDocumentRestored() override;
void recomputeCell(App::CellAddress p);
@@ -251,7 +251,7 @@ protected:
App::Property *setQuantityProperty(App::CellAddress key, double value, const Base::Unit &unit);
virtual void onSettingDocument();
void onSettingDocument() override;
void updateBindings();

8
src/Mod/Spreadsheet/App/SheetObserver.h
View File

@@ -33,10 +33,10 @@ class PropertySheet;
class SheetObserver : public App::DocumentObserver {
public:
SheetObserver(App::Document* document, PropertySheet *_sheet);
~SheetObserver() { }
virtual void slotCreatedObject(const App::DocumentObject& Obj);
virtual void slotDeletedObject(const App::DocumentObject& Obj);
virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
~SheetObserver() override { }
void slotCreatedObject(const App::DocumentObject& Obj) override;
void slotDeletedObject(const App::DocumentObject& Obj) override;
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override;
void ref();
bool unref();
App::Document* getDocument() const { return App::DocumentObserver::getDocument(); }

2
src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
View File

@@ -71,7 +71,7 @@ public:
initialize("This module is the SpreadsheetGui module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
Py::Object open(const Py::Tuple& args)

4
src/Mod/Spreadsheet/Gui/DlgBindSheet.h
View File

@@ -38,9 +38,9 @@ class DlgBindSheet : public QDialog
public:
explicit DlgBindSheet(Spreadsheet::Sheet *sheet, const std::vector<App::Range> &range, QWidget *parent = nullptr);
~DlgBindSheet();
~DlgBindSheet() override;
void accept();
void accept() override;
public Q_SLOTS:
void onDiscard();

8
src/Mod/Spreadsheet/Gui/DlgSettingsImp.h
View File

@@ -41,12 +41,12 @@ class DlgSettingsImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsImp( QWidget* parent = nullptr );
~DlgSettingsImp();
~DlgSettingsImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettings> ui;

4
src/Mod/Spreadsheet/Gui/DlgSheetConf.h
View File

@@ -38,9 +38,9 @@ class DlgSheetConf : public QDialog
public:
explicit DlgSheetConf(Spreadsheet::Sheet *sheet, App::Range range, QWidget *parent = nullptr);
~DlgSheetConf();
~DlgSheetConf() override;
void accept();
void accept() override;
App::Property *prepare(App::CellAddress &from, App::CellAddress &to,
std::string &rangeConf, App::ObjectIdentifier &path, bool init);

4
src/Mod/Spreadsheet/Gui/LineEdit.h
View File

@@ -35,13 +35,13 @@ class LineEdit : public Gui::ExpressionLineEdit
public:
explicit LineEdit(QWidget *parent = nullptr);
bool event(QEvent *event);
bool event(QEvent *event) override;
Q_SIGNALS:
void finishedWithKey(int key, Qt::KeyboardModifiers modifiers);
private:
bool eventFilter(QObject* object, QEvent* event);
bool eventFilter(QObject* object, QEvent* event) override;
private:

2
src/Mod/Spreadsheet/Gui/PropertiesDialog.h
View File

@@ -38,7 +38,7 @@ class PropertiesDialog : public QDialog
public:
explicit PropertiesDialog(Spreadsheet::Sheet *_sheet, const std::vector<App::Range> & _ranges, QWidget *parent = nullptr);
~PropertiesDialog();
~PropertiesDialog() override;
void apply();
void selectAlias();

14
src/Mod/Spreadsheet/Gui/SheetModel.h
View File

@@ -38,15 +38,15 @@ class SheetModel : public QAbstractTableModel
Q_OBJECT
public:
explicit SheetModel(Spreadsheet::Sheet * _sheet, QObject *parent = nullptr);
~SheetModel();
~SheetModel() override;
SheetModel(QObject *parent);
int rowCount(const QModelIndex &parent = QModelIndex()) const ;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
Qt::ItemFlags flags(const QModelIndex &) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const override ;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
Qt::ItemFlags flags(const QModelIndex &) const override;
private Q_SLOTS:
void setCellData(QModelIndex index, QString str);

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

@@ -42,8 +42,8 @@ public:
Q_SIGNALS:
void resizeFinished();
protected:
void mouseReleaseEvent(QMouseEvent * event);
bool viewportEvent(QEvent *e);
void mouseReleaseEvent(QMouseEvent * event) override;
bool viewportEvent(QEvent *e) override;
private:
QTableView *owner;
};
@@ -53,7 +53,7 @@ class SheetTableView : public QTableView
Q_OBJECT
public:
explicit SheetTableView(QWidget *parent = nullptr);
~SheetTableView();
~SheetTableView() override;
void edit(const QModelIndex &index);
void setSheet(Spreadsheet::Sheet *_sheet);
@@ -72,7 +72,7 @@ public Q_SLOTS:
void ModifyBlockSelection(int targetRow, int targetColumn);
protected Q_SLOTS:
void commitData(QWidget *editor);
void commitData(QWidget *editor) override;
void updateCellSpan(App::CellAddress address);
void insertRows();
void insertRowsAfter();
@@ -86,13 +86,13 @@ protected Q_SLOTS:
void onConfSetup();
protected:
bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event);
bool event(QEvent *event);
void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint);
void mousePressEvent(QMouseEvent* event);
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *event) override;
bool event(QEvent *event) override;
void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint) override;
void mousePressEvent(QMouseEvent* event) override;
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override;
void contextMenuEvent (QContextMenuEvent * e);
void contextMenuEvent (QContextMenuEvent * e) override;
void _copySelection(const std::vector<App::Range> &ranges, bool copy);

10
src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.h
View File

@@ -39,13 +39,13 @@ class SpreadsheetDelegate : public QStyledItemDelegate
public:
explicit SpreadsheetDelegate(Spreadsheet::Sheet * sheet, QWidget *parent = nullptr);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &,
const QModelIndex &index) const;
void setEditorData(QWidget *editor, const QModelIndex &index) const;
const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const;
const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
Q_SIGNALS:
void finishedWithKey(int key, Qt::KeyboardModifiers modifiers);

26
src/Mod/Spreadsheet/Gui/SpreadsheetView.h
View File

@@ -59,19 +59,19 @@ class SpreadsheetGuiExport SheetView : public Gui::MDIView
public:
SheetView(Gui::Document* pcDocument, App::DocumentObject* docObj, QWidget* parent);
~SheetView();
~SheetView() override;
const char *getName(void) const {return "SheetView";}
const char *getName(void) const override {return "SheetView";}
bool onMsg(const char* pMsg,const char** ppReturn);
bool onHasMsg(const char* pMsg) const;
bool onMsg(const char* pMsg,const char** ppReturn) override;
bool onHasMsg(const char* pMsg) const override;
/** @name Printing */
//@{
void print();
void printPdf();
void printPreview();
void print(QPrinter*);
void print() override;
void printPdf() override;
void printPreview() override;
void print(QPrinter*) override;
//@}
void updateCell(const App::Property * prop);
@@ -93,9 +93,9 @@ public:
void deleteSelection();
PyObject *getPyObject(void);
PyObject *getPyObject(void) override;
virtual void deleteSelf();
void deleteSelf() override;
protected Q_SLOTS:
void editingFinishedWithKey(int key, Qt::KeyboardModifiers modifiers);
@@ -134,10 +134,10 @@ public:
static void init_type();
SheetViewPy(SheetView *mdi);
~SheetViewPy();
~SheetViewPy() override;
Py::Object repr();
Py::Object getattr(const char *);
Py::Object repr() override;
Py::Object getattr(const char *) override;
Py::Object getSheet(const Py::Tuple&);
Py::Object cast_to_base(const Py::Tuple&);

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

@@ -48,26 +48,26 @@ public:
ViewProviderSheet();
/// destructor.
~ViewProviderSheet();
~ViewProviderSheet() override;
void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel(void) const override {return false;}
bool useNewSelectionModel(void) const override {return false;}
std::vector<std::string> getDisplayModes() const override;
virtual bool doubleClicked(void) override;
bool doubleClicked(void) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
Spreadsheet::Sheet* getSpreadsheetObject() const;
virtual void beforeDelete() override;
void beforeDelete() override;
QIcon getIcon() const override;
virtual bool setEdit(int ModNum) override;
bool setEdit(int ModNum) override;
virtual bool isShow(void) const override { return true; }
bool isShow(void) const override { return true; }
virtual Gui::MDIView *getMDIView() const override;
Gui::MDIView *getMDIView() const override;
inline SheetView* getView() const { return view; }

10
src/Mod/Spreadsheet/Gui/Workbench.h
View File

@@ -51,17 +51,17 @@ class SpreadsheetGuiExport Workbench : public Gui::StdWorkbench
public:
Workbench();
virtual ~Workbench();
void activated();
~Workbench() override;
void activated() override;
private:
bool initialized;
std::unique_ptr<WorkbenchHelper> workbenchHelper;
protected:
Gui::MenuItem *setupMenuBar() const;
Gui::ToolBarItem* setupToolBars() const;
Gui::ToolBarItem* setupCommandBars() const;
Gui::MenuItem *setupMenuBar() const override;
Gui::ToolBarItem* setupToolBars() const override;
Gui::ToolBarItem* setupCommandBars() const override;
};
} // namespace SpreadsheetModGui

36
src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
View File

@@ -152,14 +152,14 @@ signals:
void clicked();
protected:
void mousePressEvent(QMouseEvent *e);
void mouseMoveEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e);
void keyReleaseEvent(QKeyEvent *e);
void paintEvent(QPaintEvent *e);
void focusInEvent(QFocusEvent *e);
void focusOutEvent(QFocusEvent *e);
void mousePressEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
void keyReleaseEvent(QKeyEvent *e) override;
void paintEvent(QPaintEvent *e) override;
void focusInEvent(QFocusEvent *e) override;
void focusOutEvent(QFocusEvent *e) override;
};
/*
@@ -172,7 +172,7 @@ class ColorPickerItem : public QFrame
public:
ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(),
QWidget *parent = nullptr);
~ColorPickerItem();
~ColorPickerItem() override;
QColor color() const;
QString text() const;
@@ -187,10 +187,10 @@ public Q_SLOTS:
void setColor(const QColor &color, const QString &text = QString());
protected:
void mousePressEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void mouseMoveEvent(QMouseEvent *e);
void paintEvent(QPaintEvent *e);
void mousePressEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;
void paintEvent(QPaintEvent *e) override;
private:
QColor c;
@@ -208,7 +208,7 @@ class ColorPickerPopup : public QFrame
public:
ColorPickerPopup(int width, bool withColorDialog,
QWidget *parent = nullptr);
~ColorPickerPopup();
~ColorPickerPopup() override;
void insertColor(const QColor &col, const QString &text, int index);
void exec();
@@ -233,10 +233,10 @@ protected Q_SLOTS:
void updateSelected();
protected:
void keyPressEvent(QKeyEvent *e);
void showEvent(QShowEvent *e);
void hideEvent(QHideEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void keyPressEvent(QKeyEvent *e) override;
void showEvent(QShowEvent *e) override;
void hideEvent(QHideEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void regenerateGrid();

4
src/Mod/Spreadsheet/Gui/qtcolorpicker.h
View File

@@ -82,7 +82,7 @@ public:
QtColorPicker(QWidget *parent = nullptr,
int columns = -1, bool enableColorDialog = true);
~QtColorPicker();
~QtColorPicker() override;
void insertColor(const QColor &color, const QString &text = QString(), int index = -1);
@@ -105,7 +105,7 @@ Q_SIGNALS:
void colorSet(const QColor &);
protected:
void paintEvent(QPaintEvent *e);
void paintEvent(QPaintEvent *e) override;
private Q_SLOTS:
void buttonPressed(bool toggled);