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

Gui: Use override etc 2

Browse Source
This commit is contained in:
berniev
2022-08-09 13:56:15 +10:00
committed by wwmayer
parent 810c3780de
commit 75fa455c5d
213 changed files with 1723 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/3Dconnexion/GuiAbstractNativeEvent.h
View File

@@ -37,7 +37,7 @@ namespace Gui
Q_OBJECT
public:
GuiAbstractNativeEvent(GUIApplicationNativeEventAware *app);
virtual ~GuiAbstractNativeEvent()=0;
~GuiAbstractNativeEvent() override =0;
virtual void initSpaceball(QMainWindow *window)=0;
private:
GuiAbstractNativeEvent();

2
src/Gui/3Dconnexion/GuiNativeEventMac.h
View File

@@ -63,7 +63,7 @@ namespace Gui
public:
GuiNativeEvent(GUIApplicationNativeEventAware *app);
~GuiNativeEvent() override;
void initSpaceball(QMainWindow *window) override final;
void initSpaceball(QMainWindow *window) final;
private:
GuiNativeEvent();
GuiNativeEvent(const GuiNativeEvent&);

6
src/Gui/Action.cpp
View File

@@ -387,7 +387,7 @@ public:
WorkbenchActionEvent(QAction* a)
: QEvent(QEvent::User), act(a)
{ }
~WorkbenchActionEvent()
~WorkbenchActionEvent() override
{ }
QAction* action() const
{ return act; }
@@ -680,12 +680,12 @@ public:
handle->Attach(this);
}
virtual ~Private()
~Private() override
{
handle->Detach(this);
}
void OnChange(Base::Subject<const char*> &, const char *reason)
void OnChange(Base::Subject<const char*> &, const char *reason) override
{
if (!updating && reason && strcmp(reason, "RecentFiles")==0) {
Base::StateLocker guard(updating);

4
src/Gui/ActionFunction.h
View File

@@ -68,7 +68,7 @@ class GuiExport ActionFunction : public QObject
public:
/// Constructor
ActionFunction(QObject*);
virtual ~ActionFunction();
~ActionFunction() override;
/*!
Connects the QAction's triggered() signal with the function \a func
@@ -97,7 +97,7 @@ class GuiExport TimerFunction : public QObject
public:
/// Constructor
TimerFunction(QObject* = nullptr);
virtual ~TimerFunction();
~TimerFunction() override;
void setFunction(std::function<void()> func);
void setFunction(std::function<void(QObject*)> func, QObject* args);

2
src/Gui/Assistant.h
View File

@@ -36,7 +36,7 @@ class Assistant : public QObject
public:
Assistant();
~Assistant();
~Assistant() override;
void showDocumentation(const QString &file);
private Q_SLOTS:

10
src/Gui/AutoSaver.h
View File

@@ -70,7 +70,7 @@ class AutoSaver : public QObject
private:
static AutoSaver* self;
AutoSaver(QObject* parent);
virtual ~AutoSaver();
~AutoSaver() override;
public:
static AutoSaver* instance();
@@ -86,7 +86,7 @@ public:
protected:
void slotCreateDocument(const App::Document& Doc);
void slotDeleteDocument(const App::Document& Doc);
void timerEvent(QTimerEvent * event);
void timerEvent(QTimerEvent * event) override;
void saveDocument(const std::string&, AutoSaveProperty&);
public Q_SLOTS:
@@ -102,15 +102,15 @@ class RecoveryWriter : public Base::FileWriter
{
public:
RecoveryWriter(AutoSaveProperty&);
virtual ~RecoveryWriter();
~RecoveryWriter() override;
/*!
This method can be re-implemented in sub-classes to avoid
to write out certain objects. The default implementation
always returns true.
*/
virtual bool shouldWrite(const std::string&, const Base::Persistence *) const;
virtual void writeFiles();
bool shouldWrite(const std::string&, const Base::Persistence *) const override;
void writeFiles() override;
private:
AutoSaveProperty& saver;

2
src/Gui/BitmapFactory.h
View File

@@ -143,7 +143,7 @@ private:
static BitmapFactoryInst* _pcSingleton;
BitmapFactoryInst();
~BitmapFactoryInst();
~BitmapFactoryInst() override;
BitmapFactoryInstP* d;
};

10
src/Gui/CallTips.h
View File

@@ -56,16 +56,16 @@ public:
/// Construction
CallTipsList(QPlainTextEdit* parent);
/// Destruction
~CallTipsList();
~CallTipsList() override;
void keyboardSearch (const QString&);
void keyboardSearch (const QString&) override;
void showTips(const QString&);
void validateCursor();
protected:
bool eventFilter(QObject *, QEvent *);
void showEvent(QShowEvent*);
void hideEvent(QHideEvent*);
bool eventFilter(QObject *, QEvent *) override;
void showEvent(QShowEvent*) override;
void hideEvent(QHideEvent*) override;
private Q_SLOTS:
void callTipItemActivated(QListWidgetItem *item);

4
src/Gui/ComboView.h
View File

@@ -74,7 +74,7 @@ public:
* A destructor.
* A more elaborate description of the destructor.
*/
virtual ~ComboView();
~ComboView() override;
Gui::TaskView::TaskView *getTaskPanel(){return taskPanel;}
QTabWidget* getTabPanel() const { return tabs;}
@@ -92,7 +92,7 @@ protected:
void showDialog(Gui::TaskView::TaskDialog *dlg);
void closeDialog();
void closedDialog();
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
int oldTabIndex;

76
src/Gui/Command.h
View File

@@ -314,7 +314,7 @@ class GuiExport Command : public CommandBase
{
protected:
Command(const char* name);
virtual ~Command();
~Command() override;
protected:
/** @name Methods to override when creating a new command
@@ -323,7 +323,7 @@ protected:
/// Methods which gets called when activated, needs to be reimplemented!
virtual void activated(int iMsg)=0;
/// Creates the used Action
virtual Action * createAction();
Action * createAction() override;
/// Applies the menu text, tool and status tip to the passed action object
void applyCommandData(const char* context, Action* );
const char* keySequenceToAccel(int) const;
@@ -419,9 +419,9 @@ public:
/// Checks if the active object of the active document is valid
static bool isActiveObjectValid();
/// Translate command
void languageChange();
void languageChange() override;
/// Updates the QAction with respect to the passed mode.
void updateAction(int mode);
void updateAction(int mode) override;
/// Setup checkable actions based on current TriggerSource
void setupCheckable(int iMsg);
//@}
@@ -642,9 +642,9 @@ public:
Command *addCommand(const char *cmdName);
protected:
virtual void activated(int iMsg);
virtual Gui::Action * createAction();
virtual void languageChange();
void activated(int iMsg) override;
Gui::Action * createAction() override;
void languageChange() override;
void setup(Action *);
@@ -665,34 +665,34 @@ class PythonCommand: public Command
{
public:
PythonCommand(const char* name, PyObject * pcPyCommand, const char* pActivationString);
virtual ~PythonCommand();
~PythonCommand() override;
protected:
/** @name Methods reimplemented for Command Framework */
//@{
/// Method which gets called when activated
virtual void activated(int iMsg);
void activated(int iMsg) override;
/// if the command is not always active
virtual bool isActive();
bool isActive() override;
/// Get the help URL
const char* getHelpUrl() const;
const char* getHelpUrl() const override;
/// Creates the used Action
virtual Action * createAction();
Action * createAction() override;
//@}
public:
/** @name Methods to get the properties of the command */
//@{
/// Reassigns QAction stuff after the language has changed.
void languageChange();
const char* className() const
void languageChange() override;
const char* className() const override
{ return "PythonCommand"; }
const char* getWhatsThis () const;
const char* getMenuText () const;
const char* getToolTipText() const;
const char* getStatusTip () const;
const char* getPixmap () const;
const char* getAccel () const;
const char* getWhatsThis () const override;
const char* getMenuText () const override;
const char* getToolTipText() const override;
const char* getStatusTip () const override;
const char* getPixmap () const override;
const char* getAccel () const override;
bool isCheckable () const;
bool isChecked () const;
//@}
@@ -716,34 +716,34 @@ class PythonGroupCommand: public Command
{
public:
PythonGroupCommand(const char* name, PyObject * pcPyCommand);
virtual ~PythonGroupCommand();
~PythonGroupCommand() override;
protected:
/** @name Methods reimplemented for Command Framework */
//@{
/// Method which gets called when activated
virtual void activated(int iMsg);
void activated(int iMsg) override;
/// if the command is not always active
virtual bool isActive();
bool isActive() override;
/// Get the help URL
const char* getHelpUrl() const;
const char* getHelpUrl() const override;
/// Creates the used Action
virtual Action * createAction();
Action * createAction() override;
//@}
public:
/** @name Methods to get the properties of the command */
//@{
/// Reassigns QAction stuff after the language has changed.
void languageChange();
const char* className() const
void languageChange() override;
const char* className() const override
{ return "PythonGroupCommand"; }
const char* getWhatsThis () const;
const char* getMenuText () const;
const char* getToolTipText() const;
const char* getStatusTip () const;
const char* getPixmap () const;
const char* getAccel () const;
const char* getWhatsThis () const override;
const char* getMenuText () const override;
const char* getToolTipText() const override;
const char* getStatusTip () const override;
const char* getPixmap () const override;
const char* getAccel () const override;
bool isExclusive () const;
bool hasDropDownMenu () const;
//@}
@@ -771,23 +771,23 @@ class MacroCommand: public Command
{
public:
MacroCommand(const char* name, bool system = false);
virtual ~MacroCommand();
~MacroCommand() override;
protected:
/** @name methods reimplemented for Command Framework */
//@{
/// Method which get called when activated
void activated(int iMsg);
void activated(int iMsg) override;
/// Creates the used Action
Action * createAction();
Action * createAction() override;
//@}
public:
/// Returns the script name
const char* getScriptName () const { return sScriptName; }
/// Ignore when language has changed.
void languageChange() {}
const char* className() const
void languageChange() override {}
const char* className() const override
{ return "Gui::MacroCommand"; }
/** @name Methods to set the properties of the Script Command */

8
src/Gui/CommandDoc.cpp
View File

@@ -1673,10 +1673,10 @@ public:
eType = ForEdit;
}
virtual const char* className() const {return "StdCmdExpression";}
const char* className() const override {return "StdCmdExpression";}
protected:
virtual void activated(int iMsg) {
void activated(int iMsg) override {
std::map<App::Document*, std::set<App::DocumentObject*> > objs;
switch(iMsg) {
case 0:
@@ -1705,7 +1705,7 @@ protected:
copyExpressions(objs);
}
virtual Gui::Action * createAction() {
Gui::Action * createAction() override {
ActionGroup* pcAction = new ActionGroup(this, getMainWindow());
pcAction->setDropDownMenu(true);
applyCommandData(this->className(), pcAction);
@@ -1849,7 +1849,7 @@ protected:
}
}
bool isActive() {
bool isActive() override {
if(!App::GetApplication().getActiveDocument()) {
pcActionCopyAll->setEnabled(false);
pcActionCopySel->setEnabled(false);

14
src/Gui/CommandLink.cpp
View File

@@ -60,14 +60,14 @@ class StdCmdLinkMakeGroup : public Gui::Command
{
public:
StdCmdLinkMakeGroup();
const char* className() const
const char* className() const override
{ return "StdCmdLinkMakeGroup"; }
protected:
virtual void activated(int iMsg);
virtual bool isActive();
virtual Action * createAction();
virtual void languageChange();
void activated(int iMsg) override;
bool isActive() override;
Action * createAction() override;
void languageChange() override;
};
StdCmdLinkMakeGroup::StdCmdLinkMakeGroup()
@@ -857,7 +857,7 @@ public:
addCommand(new StdCmdLinkSelectAllLinks());
}
virtual const char* className() const {return "StdCmdLinkSelectActions";}
const char* className() const override {return "StdCmdLinkSelectActions";}
};
//======================================================================
@@ -885,7 +885,7 @@ public:
addCommand(new StdCmdLinkImportAll());
}
virtual const char* className() const {return "StdCmdLinkActions";}
const char* className() const override {return "StdCmdLinkActions";}
};
//===========================================================================

12
src/Gui/CommandStd.cpp
View File

@@ -839,14 +839,14 @@ class StdCmdUserEditMode : public Gui::Command
{
public:
StdCmdUserEditMode();
virtual ~StdCmdUserEditMode(){}
virtual void languageChange();
virtual const char* className() const {return "StdCmdUserEditMode";}
~StdCmdUserEditMode() override{}
void languageChange() override;
const char* className() const override {return "StdCmdUserEditMode";}
void updateIcon(int mode);
protected:
virtual void activated(int iMsg);
virtual bool isActive();
virtual Gui::Action * createAction();
void activated(int iMsg) override;
bool isActive() override;
Gui::Action * createAction() override;
};
StdCmdUserEditMode::StdCmdUserEditMode()

14
src/Gui/CommandTest.cpp
View File

@@ -567,10 +567,10 @@ public:
BarThread(unsigned long s) : steps(s)
{
}
~BarThread()
~BarThread() override
{
}
void run()
void run() override
{
QMutex mutex;
QMutexLocker ml(&mutex);
@@ -728,7 +728,7 @@ public:
TestConsoleObserver() : matchMsg(0), matchWrn(0), matchErr(0), matchLog(0)
{
}
void SendLog(const std::string& msg, Base::LogStyle level){
void SendLog(const std::string& msg, Base::LogStyle level) override{
QMutexLocker ml(&mutex);
@@ -752,7 +752,7 @@ public:
class ConsoleMessageTask : public QRunnable
{
public:
void run()
void run() override
{
for (int i=0; i<10; i++)
Base::Console().Message("Write a message to the console output.\n");
@@ -762,7 +762,7 @@ public:
class ConsoleWarningTask : public QRunnable
{
public:
void run()
void run() override
{
for (int i=0; i<10; i++)
Base::Console().Warning("Write a warning to the console output.\n");
@@ -772,7 +772,7 @@ public:
class ConsoleErrorTask : public QRunnable
{
public:
void run()
void run() override
{
for (int i=0; i<10; i++)
Base::Console().Error("Write an error to the console output.\n");
@@ -782,7 +782,7 @@ public:
class ConsoleLogTask : public QRunnable
{
public:
void run()
void run() override
{
for (int i=0; i<10; i++)
Base::Console().Log("Write a log to the console output.\n");

26
src/Gui/CommandView.cpp
View File

@@ -254,15 +254,15 @@ class StdCmdFreezeViews : public Gui::Command
{
public:
StdCmdFreezeViews();
virtual ~StdCmdFreezeViews(){}
const char* className() const
~StdCmdFreezeViews() override{}
const char* className() const override
{ return "StdCmdFreezeViews"; }
protected:
virtual void activated(int iMsg);
virtual bool isActive();
virtual Action * createAction();
virtual void languageChange();
void activated(int iMsg) override;
bool isActive() override;
Action * createAction() override;
void languageChange() override;
private:
void onSaveViews();
@@ -587,14 +587,14 @@ class StdCmdDrawStyle : public Gui::Command
{
public:
StdCmdDrawStyle();
virtual ~StdCmdDrawStyle(){}
virtual void languageChange();
virtual const char* className() const {return "StdCmdDrawStyle";}
~StdCmdDrawStyle() override{}
void languageChange() override;
const char* className() const override {return "StdCmdDrawStyle";}
void updateIcon(const Gui::MDIView* view);
protected:
virtual void activated(int iMsg);
virtual bool isActive();
virtual Gui::Action * createAction();
void activated(int iMsg) override;
bool isActive() override;
Gui::Action * createAction() override;
};
StdCmdDrawStyle::StdCmdDrawStyle()
@@ -3567,7 +3567,7 @@ public:
addCommand(new StdTreeDrag(),!cmds.empty());
addCommand(new StdTreeSelection(),!cmds.empty());
};
virtual const char* className() const {return "StdCmdTreeViewActions";}
const char* className() const override {return "StdCmdTreeViewActions";}
};

2
src/Gui/CommandWindow.cpp
View File

@@ -374,7 +374,7 @@ public:
// virtual ~FilterStatusBar() {}
protected:
Action * action;
bool eventFilter(QObject *obj, QEvent *event)
bool eventFilter(QObject *obj, QEvent *event) override
{
if (getMainWindow()->findChild<QStatusBar *>() && obj == getMainWindow()->statusBar() && ((event->type() == QEvent::Hide) || (event->type() == QEvent::Show))) {
this->action->setChecked(getMainWindow()->statusBar()->isVisible());

2
src/Gui/Control.h
View File

@@ -122,7 +122,7 @@ private:
/// Construction
ControlSingleton();
/// Destruction
virtual ~ControlSingleton();
~ControlSingleton() override;
static ControlSingleton* _pcSingleton;
};

4
src/Gui/DAGView/DAGFilter.h
View File

@@ -56,7 +56,7 @@ namespace Gui
{
public:
FilterOrigin();
virtual bool goFilter(const Vertex &vertexIn, const Graph &graphIn, const GraphLinkContainer &linkIn) const override;
bool goFilter(const Vertex &vertexIn, const Graph &graphIn, const GraphLinkContainer &linkIn) const override;
};
/*! Hide nodes of type*/
@@ -65,7 +65,7 @@ namespace Gui
public:
explicit FilterTyped(const std::string &typeIn);
std::string type;
virtual bool goFilter(const Vertex &vertexIn, const Graph &graphIn, const GraphLinkContainer &linkIn) const override;
bool goFilter(const Vertex &vertexIn, const Graph &graphIn, const GraphLinkContainer &linkIn) const override;
};
}
}

12
src/Gui/DAGView/DAGModel.h
View File

@@ -57,7 +57,7 @@ namespace Gui
void acceptedSignal();
void rejectedSignal();
protected:
virtual void keyPressEvent(QKeyEvent*);
void keyPressEvent(QKeyEvent*) override;
};
class Model : public QGraphicsScene
@@ -65,15 +65,15 @@ namespace Gui
Q_OBJECT
public:
Model(QObject *parentIn, const Gui::Document &documentIn);
virtual ~Model() override;
~Model() override;
void awake(); //!< hooked up to event dispatcher for update when idle.
void selectionChanged(const SelectionChanges& msg);
protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override;
virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent* event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override;
void contextMenuEvent(QGraphicsSceneContextMenuEvent* event) override;
private Q_SLOTS:
void updateSlot();

2
src/Gui/DAGView/DAGRectItem.h
View File

@@ -50,7 +50,7 @@ namespace Gui
void editingFinished(){editing = false;}
bool isEditing(){return editing;}
protected:
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr);
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
private:
QBrush backgroundBrush; //!< brush used for background. not used yet.
QBrush editBrush; //!< brush used when object is in edit mode.

6
src/Gui/DAGView/DAGView.h
View File

@@ -44,13 +44,13 @@ namespace Gui
Q_OBJECT
public:
View(QWidget *parentIn = nullptr);
virtual ~View() override;
~View() override;
public Q_SLOTS:
void awakeSlot(); //!< hooked up to event dispatcher for update when idle.
private:
virtual void onSelectionChanged(const SelectionChanges& msg) override;
void onSelectionChanged(const SelectionChanges& msg) override;
void slotActiveDocument(const Gui::Document &documentIn);
void slotDeleteDocument(const Gui::Document &documentIn);
@@ -67,7 +67,7 @@ namespace Gui
Q_OBJECT
public:
DockWindow(Gui::Document* gDocumentIn = nullptr, QWidget *parent = nullptr);
~DockWindow(){}
~DockWindow() override{}
private:
View *dagView;

18
src/Gui/DlgActionsImp.h
View File

@@ -54,7 +54,7 @@ class DlgCustomActionsImp : public CustomizeActionPage
public:
DlgCustomActionsImp( QWidget* parent = nullptr );
~DlgCustomActionsImp();
~DlgCustomActionsImp() override;
Q_SIGNALS:
void addMacroAction( const QByteArray& );
@@ -63,8 +63,8 @@ Q_SIGNALS:
protected:
/** Trigger for reparent event. */
bool event(QEvent* e);
void changeEvent(QEvent *e);
bool event(QEvent* e) override;
void changeEvent(QEvent *e) override;
protected Q_SLOTS:
/** Enables/disables buttons for deletion */
@@ -77,9 +77,9 @@ protected Q_SLOTS:
void on_buttonRemoveAction_clicked();
/** Shows the setup of the action */
void on_buttonReplaceAction_clicked();
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
private:
/** Shows all actions and their pixmaps if available */
@@ -97,8 +97,8 @@ class IconDialog : public QDialog
public:
IconDialog(QWidget* parent);
~IconDialog();
void resizeEvent(QResizeEvent*);
~IconDialog() override;
void resizeEvent(QResizeEvent*) override;
QListWidgetItem* currentItem() const;
private Q_SLOTS:
@@ -114,7 +114,7 @@ class IconFolders : public QDialog
public:
IconFolders(const QStringList&, QWidget* parent);
~IconFolders();
~IconFolders() override;
QStringList getPaths() const;
private Q_SLOTS:

4
src/Gui/DlgActivateWindowImp.h
View File

@@ -41,10 +41,10 @@ class DlgActivateWindowImp : public QDialog
public:
DlgActivateWindowImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgActivateWindowImp();
~DlgActivateWindowImp() override;
protected:
void accept();
void accept() override;
private:
Ui_DlgActivateWindow* ui;

10
src/Gui/DlgCommandsImp.h
View File

@@ -47,17 +47,17 @@ class DlgCustomCommandsImp : public CustomizeActionPage
public:
DlgCustomCommandsImp(QWidget* parent = nullptr);
~DlgCustomCommandsImp();
~DlgCustomCommandsImp() override;
protected Q_SLOTS:
void onGroupActivated(QTreeWidgetItem *i);
void onDescription(QTreeWidgetItem *i);
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgCustomCommands> ui;

2
src/Gui/DlgCreateNewPreferencePackImp.h
View File

@@ -52,7 +52,7 @@ class GuiExport DlgCreateNewPreferencePackImp : public QDialog
public:
DlgCreateNewPreferencePackImp(QWidget* parent = nullptr);
~DlgCreateNewPreferencePackImp();
~DlgCreateNewPreferencePackImp() override;
void setPreferencePackTemplates(const std::vector<PreferencePackManager::TemplateFile> &availableTemplates);
void setPreferencePackNames(const std::vector<std::string>& usedNames);

4
src/Gui/DlgCustomizeImp.h
View File

@@ -52,7 +52,7 @@ class DlgCustomizeImp : public QDialog
public:
DlgCustomizeImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgCustomizeImp();
~DlgCustomizeImp() override;
static void addPage(const char* className);
void addPage (QWidget* w);
@@ -63,7 +63,7 @@ Q_SIGNALS:
void modifyMacroAction(const QByteArray&);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
/** @name for internal use only */

10
src/Gui/DlgCustomizeSpNavSettings.h
View File

@@ -40,12 +40,12 @@ namespace Gui
public:
explicit DlgCustomizeSpNavSettings(QWidget *parent = nullptr);
~DlgCustomizeSpNavSettings();
~DlgCustomizeSpNavSettings() override;
protected Q_SLOTS:
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
void on_CBDominant_clicked();
void on_CBFlipYZ_clicked();
void on_CBRotations_clicked();
@@ -73,7 +73,7 @@ namespace Gui
void on_ButtonCalibrate_clicked();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
ParameterGrp::handle spaceballMotionGroup() const;

44
src/Gui/DlgCustomizeSpaceball.h
View File

@@ -60,8 +60,8 @@ namespace Gui
Q_OBJECT
public:
ButtonModel(QObject *parent);
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
void insertButtonRows(int number);
void setCommand(int row, QString command);
void goButtonPress(int number);
@@ -108,14 +108,14 @@ namespace Gui
Q_OBJECT
public:
CommandModel(QObject *parent = nullptr);
~CommandModel();
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
virtual QModelIndex parent(const QModelIndex &index) const;
virtual int rowCount(const QModelIndex &parent) const;
virtual int columnCount(const QModelIndex &parent) const;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
virtual Qt::ItemFlags flags (const QModelIndex &index) const;
~CommandModel() override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &index) const override;
int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags (const QModelIndex &index) const override;
void goAddMacro(const QByteArray &macroName);
void goRemoveMacro(const QByteArray &macroName);
private:
@@ -131,10 +131,10 @@ namespace Gui
Q_OBJECT
public:
PrintModel(QObject *parent, ButtonModel *buttonModelIn, CommandModel *commandModelIn);
virtual int rowCount(const QModelIndex &parent) const;
virtual int columnCount(const QModelIndex &parent) const;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
private:
ButtonModel *buttonModel;
CommandModel *commandModel;
@@ -145,17 +145,17 @@ namespace Gui
Q_OBJECT
public:
DlgCustomizeSpaceball(QWidget *parent = nullptr);
virtual ~DlgCustomizeSpaceball();
~DlgCustomizeSpaceball() override;
protected:
void changeEvent(QEvent *e);
virtual bool event(QEvent *event);
virtual void hideEvent(QHideEvent *event);
virtual void showEvent (QShowEvent *event);
void changeEvent(QEvent *e) override;
bool event(QEvent *event) override;
void hideEvent(QHideEvent *event) override;
void showEvent (QShowEvent *event) override;
protected Q_SLOTS:
void onAddMacroAction(const QByteArray &macroName);
void onRemoveMacroAction(const QByteArray &macroName);
void onModifyMacroAction(const QByteArray &macroName);
void onAddMacroAction(const QByteArray &macroName) override;
void onRemoveMacroAction(const QByteArray &macroName) override;
void onModifyMacroAction(const QByteArray &macroName) override;
private Q_SLOTS:
void goClear();

20
src/Gui/DlgDisplayPropertiesImp.h
View File

@@ -57,12 +57,12 @@ class DlgDisplayPropertiesImp : public QDialog,
public:
DlgDisplayPropertiesImp(bool floating, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgDisplayPropertiesImp();
~DlgDisplayPropertiesImp() override;
/// Observer message from the Selection
void OnChange(Gui::SelectionSingleton::SubjectType &rCaller,
Gui::SelectionSingleton::MessageType Reason);
Gui::SelectionSingleton::MessageType Reason) override;
void showDefaultButtons(bool);
void reject();
void reject() override;
private Q_SLOTS:
void on_changeMaterial_activated(int);
@@ -78,7 +78,7 @@ private Q_SLOTS:
void on_buttonColorPlot_clicked();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
void slotChangedObject(const Gui::ViewProvider&, const App::Property& Prop);
@@ -105,18 +105,18 @@ class TaskDisplayProperties : public Gui::TaskView::TaskDialog
public:
TaskDisplayProperties();
~TaskDisplayProperties();
~TaskDisplayProperties() override;
public:
bool reject();
bool reject() override;
bool isAllowedAlterDocument() const
bool isAllowedAlterDocument() const override
{ return true; }
bool isAllowedAlterView() const
bool isAllowedAlterView() const override
{ return true; }
bool isAllowedAlterSelection() const
bool isAllowedAlterSelection() const override
{ return true; }
QDialogButtonBox::StandardButtons getStandardButtons() const;
QDialogButtonBox::StandardButtons getStandardButtons() const override;
private:
DlgDisplayPropertiesImp* widget;

2
src/Gui/DlgEditFileIncludePropertyExternal.h
View File

@@ -40,7 +40,7 @@ class GuiExport DlgEditFileIncludePropertyExternal : public DlgRunExternal
public:
DlgEditFileIncludePropertyExternal( App::PropertyFileIncluded& Prop, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
virtual ~DlgEditFileIncludePropertyExternal();
~DlgEditFileIncludePropertyExternal() override;
int Do();

8
src/Gui/DlgEditorImp.h
View File

@@ -46,11 +46,11 @@ class DlgSettingsEditorImp : public PreferencePage
public:
DlgSettingsEditorImp( QWidget* parent = nullptr );
~DlgSettingsEditorImp();
~DlgSettingsEditorImp() override;
public:
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected Q_SLOTS:
void on_displayItems_currentItemChanged(QTreeWidgetItem *i);
@@ -59,7 +59,7 @@ protected Q_SLOTS:
void on_fontSize_valueChanged(const QString&);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setEditorTabWidth(int);
private:

10
src/Gui/DlgExpressionInput.h
View File

@@ -52,7 +52,7 @@ class GuiExport DlgExpressionInput : public QDialog
public:
explicit DlgExpressionInput(const App::ObjectIdentifier & _path, std::shared_ptr<const App::Expression> _expression, const Base::Unit &_impliedUnit, QWidget *parent = nullptr);
~DlgExpressionInput();
~DlgExpressionInput() override;
std::shared_ptr<App::Expression> getExpression() const { return expression; }
@@ -61,15 +61,15 @@ public:
QPoint expressionPosition() const;
void setExpressionInputSize(int width, int height);
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
public Q_SLOTS:
void show();
protected:
void showEvent(QShowEvent*);
void mouseReleaseEvent(QMouseEvent*);
void mousePressEvent(QMouseEvent*);
void showEvent(QShowEvent*) override;
void mouseReleaseEvent(QMouseEvent*) override;
void mousePressEvent(QMouseEvent*) override;
private Q_SLOTS:
void textChanged(const QString & text);

8
src/Gui/DlgGeneralImp.h
View File

@@ -46,13 +46,13 @@ class DlgGeneralImp : public PreferencePage
public:
DlgGeneralImp( QWidget* parent = nullptr );
~DlgGeneralImp();
~DlgGeneralImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
protected Q_SLOTS:
void onLoadPreferencePackClicked(const std::string &packName);

12
src/Gui/DlgKeyboardImp.h
View File

@@ -46,10 +46,10 @@ class DlgCustomKeyboardImp : public CustomizeActionPage
public:
DlgCustomKeyboardImp( QWidget* parent = nullptr );
~DlgCustomKeyboardImp();
~DlgCustomKeyboardImp() override;
protected:
void showEvent(QShowEvent* e);
void showEvent(QShowEvent* e) override;
protected Q_SLOTS:
void on_categoryBox_activated(int index);
@@ -59,12 +59,12 @@ protected Q_SLOTS:
void on_buttonReset_clicked();
void on_buttonResetAll_clicked();
void on_editShortcut_textChanged(const QString&);
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setShortcutOfCurrentAction(const QString&);
private:

2
src/Gui/DlgMacroExecuteImp.cpp
View File

@@ -58,7 +58,7 @@ namespace Gui {
: QTreeWidgetItem(widget),
systemWide(systemwide){}
~MacroItem(){}
~MacroItem() override{}
bool systemWide;
};

4
src/Gui/DlgMacroExecuteImp.h
View File

@@ -45,9 +45,9 @@ class DlgMacroExecuteImp : public QDialog, public Gui::WindowParameter
public:
DlgMacroExecuteImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
~DlgMacroExecuteImp();
~DlgMacroExecuteImp() override;
void accept();
void accept() override;
public Q_SLOTS:
void on_fileChooser_fileNameChanged(const QString&);

2
src/Gui/DlgMacroRecordImp.h
View File

@@ -43,7 +43,7 @@ class DlgMacroRecordImp : public QDialog, public Gui::WindowParameter
public:
DlgMacroRecordImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
virtual ~DlgMacroRecordImp();
~DlgMacroRecordImp() override;
protected Q_SLOTS:
void on_buttonStart_clicked();

2
src/Gui/DlgMaterialPropertiesImp.h
View File

@@ -40,7 +40,7 @@ class DlgMaterialPropertiesImp : public QDialog
public:
DlgMaterialPropertiesImp(const std::string& mat, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgMaterialPropertiesImp();
~DlgMaterialPropertiesImp() override;
void setViewProviders(const std::vector<Gui::ViewProvider*>&);
QColor diffuseColor() const;

6
src/Gui/DlgObjectSelection.h
View File

@@ -71,7 +71,7 @@ public:
QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
/// Destructor
~DlgObjectSelection();
~DlgObjectSelection() override;
/// Options for getSelections()
enum class SelectionOptions {
@@ -91,8 +91,8 @@ public:
/// Override the prompt message
void setMessage(const QString &);
void accept();
void reject();
void accept() override;
void reject() override;
private Q_SLOTS:
void onDepItemChanged(QTreeWidgetItem * item, int);

8
src/Gui/DlgOnlineHelpImp.h
View File

@@ -42,15 +42,15 @@ class DlgOnlineHelpImp : public PreferencePage
public:
DlgOnlineHelpImp( QWidget* parent = nullptr );
~DlgOnlineHelpImp();
~DlgOnlineHelpImp() override;
static QString getStartpage();
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
protected:
void on_lineEditDownload_fileNameSelected(const QString&);

90
src/Gui/DlgParameterImp.h
View File

@@ -48,10 +48,10 @@ class GuiExport DlgParameterImp : public QDialog
public:
DlgParameterImp( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() );
~DlgParameterImp();
~DlgParameterImp() override;
void accept();
void reject();
void accept() override;
void reject() override;
void activateParameterSet(const char*);
@@ -66,9 +66,9 @@ protected Q_SLOTS:
void on_checkSort_toggled(bool);
protected:
void changeEvent(QEvent *e);
void showEvent(QShowEvent*);
void closeEvent(QCloseEvent*);
void changeEvent(QEvent *e) override;
void showEvent(QShowEvent*) override;
void closeEvent(QCloseEvent*) override;
protected:
QTreeWidget* paramGroup;
@@ -96,13 +96,13 @@ class ParameterGroup : public QTreeWidget
public:
ParameterGroup( QWidget * parent = nullptr );
virtual ~ParameterGroup();
~ParameterGroup() override;
protected:
/** Shows the context menu. */
void contextMenuEvent ( QContextMenuEvent* event );
void contextMenuEvent ( QContextMenuEvent* event ) override;
/** Triggers the "Del" key. */
void keyPressEvent (QKeyEvent* event);
void keyPressEvent (QKeyEvent* event) override;
protected Q_SLOTS:
/** Removes the underlying parameter group and its sub-groups from the
@@ -123,7 +123,7 @@ protected Q_SLOTS:
void onRenameSelectedItem();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
QMenu* menuEdit;
@@ -148,7 +148,7 @@ class ParameterValue : public QTreeWidget
public:
ParameterValue( QWidget * parent = nullptr );
virtual ~ParameterValue();
~ParameterValue() override;
/** Sets the current parameter group that is displayed. */
void setCurrentGroup( const Base::Reference<ParameterGrp>& _hcGrp );
@@ -157,10 +157,10 @@ public:
protected:
/** Shows the context menu. */
void contextMenuEvent ( QContextMenuEvent* event );
void contextMenuEvent ( QContextMenuEvent* event ) override;
/** Invokes onDeleteSelectedItem() if the "Del" key was pressed. */
void keyPressEvent (QKeyEvent* event);
void resizeEvent(QResizeEvent*);
void keyPressEvent (QKeyEvent* event) override;
void resizeEvent(QResizeEvent*) override;
protected Q_SLOTS:
/** Changes the value of the leaf of the selected item. */
@@ -186,7 +186,7 @@ protected Q_SLOTS:
* @note We need to reimplement this method as QTreeWidgetItem::flags()
* doesn't have an int parameter.
*/
bool edit ( const QModelIndex & index, QAbstractItemView::EditTrigger trigger, QEvent * event );
bool edit ( const QModelIndex & index, QAbstractItemView::EditTrigger trigger, QEvent * event ) override;
private:
QMenu* menuEdit;
@@ -215,10 +215,10 @@ public:
/// Constructor
ParameterGroupItem( ParameterGroupItem * parent, const Base::Reference<ParameterGrp> &hcGrp );
ParameterGroupItem( QTreeWidget* parent, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterGroupItem();
~ParameterGroupItem() override;
void setData ( int column, int role, const QVariant & value );
QVariant data ( int column, int role ) const;
void setData ( int column, int role, const QVariant & value ) override;
QVariant data ( int column, int role ) const override;
void fillUp();
Base::Reference<ParameterGrp> _hcGrp;
@@ -238,10 +238,10 @@ class ParameterValueItem : public QTreeWidgetItem
public:
/// Constructor
ParameterValueItem ( QTreeWidget* parent, const Base::Reference<ParameterGrp> &hcGrp);
virtual ~ParameterValueItem();
~ParameterValueItem() override;
/** If the name of the item has changed replace() is invoked. */
virtual void setData ( int column, int role, const QVariant & value );
void setData ( int column, int role, const QVariant & value ) override;
/** Opens an input dialog to change the value. */
virtual void changeValue() = 0;
/** Append this item as leaf to the parameter group. */
@@ -266,14 +266,14 @@ class ParameterText : public ParameterValueItem
public:
/// Constructor
ParameterText ( QTreeWidget * parent, QString label1, const char* value, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterText();
~ParameterText() override;
void changeValue();
void appendToGroup();
void removeFromGroup();
void changeValue() override;
void appendToGroup() override;
void removeFromGroup() override;
protected:
void replace( const QString& oldName, const QString& newName );
void replace( const QString& oldName, const QString& newName ) override;
};
/**
@@ -285,14 +285,14 @@ class ParameterInt : public ParameterValueItem
public:
/// Constructor
ParameterInt ( QTreeWidget * parent, QString label1, long value, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterInt();
~ParameterInt() override;
void changeValue();
void appendToGroup();
void removeFromGroup();
void changeValue() override;
void appendToGroup() override;
void removeFromGroup() override;
protected:
void replace( const QString& oldName, const QString& newName );
void replace( const QString& oldName, const QString& newName ) override;
};
/**
@@ -304,14 +304,14 @@ class ParameterUInt : public ParameterValueItem
public:
/// Constructor
ParameterUInt ( QTreeWidget * parent, QString label1, unsigned long value, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterUInt();
~ParameterUInt() override;
void changeValue();
void appendToGroup();
void removeFromGroup();
void changeValue() override;
void appendToGroup() override;
void removeFromGroup() override;
protected:
void replace( const QString& oldName, const QString& newName );
void replace( const QString& oldName, const QString& newName ) override;
};
/**
@@ -323,14 +323,14 @@ class ParameterFloat : public ParameterValueItem
public:
/// Constructor
ParameterFloat ( QTreeWidget * parent, QString label1, double value, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterFloat();
~ParameterFloat() override;
void changeValue();
void appendToGroup();
void removeFromGroup();
void changeValue() override;
void appendToGroup() override;
void removeFromGroup() override;
protected:
void replace( const QString& oldName, const QString& newName );
void replace( const QString& oldName, const QString& newName ) override;
};
/**
@@ -342,14 +342,14 @@ class ParameterBool : public ParameterValueItem
public:
/// Constructor
ParameterBool ( QTreeWidget * parent, QString label1, bool value, const Base::Reference<ParameterGrp> &hcGrp);
~ParameterBool();
~ParameterBool() override;
void changeValue();
void appendToGroup();
void removeFromGroup();
void changeValue() override;
void appendToGroup() override;
void removeFromGroup() override;
protected:
void replace( const QString& oldName, const QString& newName );
void replace( const QString& oldName, const QString& newName ) override;
};
} // namespace Dialog

10
src/Gui/DlgPreferencesImp.h
View File

@@ -119,16 +119,16 @@ public:
static void reloadSettings();
DlgPreferencesImp(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgPreferencesImp();
~DlgPreferencesImp() override;
void accept();
void accept() override;
void reload();
void activateGroupPage(const QString& group, int id);
protected:
void changeEvent(QEvent *e);
void showEvent(QShowEvent*);
void resizeEvent(QResizeEvent*);
void changeEvent(QEvent *e) override;
void showEvent(QShowEvent*) override;
void resizeEvent(QResizeEvent*) override;
protected Q_SLOTS:

4
src/Gui/DlgProjectInformationImp.h
View File

@@ -41,8 +41,8 @@ class DlgProjectInformationImp : public QDialog
public:
DlgProjectInformationImp(App::Document* doc, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgProjectInformationImp();
void accept();
~DlgProjectInformationImp() override;
void accept() override;
private Q_SLOTS:
void open_url();

2
src/Gui/DlgProjectUtility.h
View File

@@ -36,7 +36,7 @@ class DlgProjectUtility : public QDialog
public:
DlgProjectUtility(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgProjectUtility();
~DlgProjectUtility() override;
private Q_SLOTS:
void on_extractButton_clicked();

4
src/Gui/DlgPropertyLink.cpp
View File

@@ -54,8 +54,8 @@ class ItemDelegate: public QStyledItemDelegate {
public:
ItemDelegate(QObject* parent=nullptr): QStyledItemDelegate(parent) {}
virtual QWidget* createEditor(QWidget *parent,
const QStyleOptionViewItem &option, const QModelIndex &index) const
QWidget* createEditor(QWidget *parent,
const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
if(index.column() != 1)
return nullptr;

18
src/Gui/DlgPropertyLink.h
View File

@@ -40,9 +40,9 @@ class DlgPropertyLink : public QDialog, public Gui::SelectionObserver
public:
DlgPropertyLink(QWidget* parent = nullptr);
~DlgPropertyLink();
~DlgPropertyLink() override;
void accept();
void accept() override;
QList<App::SubObjectT> currentLinks() const;
QList<App::SubObjectT> originalLinks() const;
@@ -62,17 +62,17 @@ public:
static QString formatLinks(App::Document *ownerDoc, QList<App::SubObjectT> links);
protected:
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
void closeEvent (QCloseEvent * e);
void leaveEvent(QEvent *);
bool eventFilter(QObject *obj, QEvent *ev);
void keyPressEvent(QKeyEvent *ev);
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void closeEvent (QCloseEvent * e) override;
void leaveEvent(QEvent *) override;
bool eventFilter(QObject *obj, QEvent *ev) override;
void keyPressEvent(QKeyEvent *ev) override;
void detachObserver();
void attachObserver();
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
private Q_SLOTS:
void on_checkObjectType_toggled(bool);

8
src/Gui/DlgReportViewImp.h
View File

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

2
src/Gui/DlgRevertToBackupConfigImp.h
View File

@@ -40,7 +40,7 @@ class DlgRevertToBackupConfigImp : public QDialog
public:
DlgRevertToBackupConfigImp( QWidget* parent = nullptr );
~DlgRevertToBackupConfigImp();
~DlgRevertToBackupConfigImp() override;
public Q_SLOTS:
void accept() override;

6
src/Gui/DlgRunExternal.h
View File

@@ -42,7 +42,7 @@ class GuiExport DlgRunExternal : public QDialog
public:
DlgRunExternal(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
virtual ~DlgRunExternal();
~DlgRunExternal() override;
int Do(void);
@@ -50,8 +50,8 @@ public:
QStringList arguments;
protected Q_SLOTS:
virtual void reject(void);
virtual void accept(void);
void reject(void) override;
void accept(void) override;
virtual void abort(void);
virtual void advanced(void);
void finished (int exitCode, QProcess::ExitStatus exitStatus);

8
src/Gui/DlgSettings3DViewImp.h
View File

@@ -44,16 +44,16 @@ class DlgSettings3DViewImp : public PreferencePage
public:
DlgSettings3DViewImp(QWidget* parent = nullptr);
~DlgSettings3DViewImp();
~DlgSettings3DViewImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
private Q_SLOTS:
void onAliasingChanged(int);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettings3DView> ui;

8
src/Gui/DlgSettingsCacheDirectory.h
View File

@@ -42,13 +42,13 @@ class DlgSettingsCacheDirectory : public PreferencePage
public:
DlgSettingsCacheDirectory(QWidget* parent = nullptr);
~DlgSettingsCacheDirectory();
~DlgSettingsCacheDirectory() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
void runCheck();

4
src/Gui/DlgSettingsColorGradientImp.h
View File

@@ -47,9 +47,9 @@ public:
DlgSettingsColorGradientImp(const App::ColorGradient& cg,
QWidget* parent = nullptr,
Qt::WindowFlags fl = Qt::WindowFlags());
~DlgSettingsColorGradientImp();
~DlgSettingsColorGradientImp() override;
void accept();
void accept() override;
/** @name Color profile */
//@{

8
src/Gui/DlgSettingsDocumentImp.h
View File

@@ -42,16 +42,16 @@ class DlgSettingsDocumentImp : public PreferencePage
public:
DlgSettingsDocumentImp( QWidget* parent = nullptr );
~DlgSettingsDocumentImp();
~DlgSettingsDocumentImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected Q_SLOTS:
void onLicenseTypeChanged(int index);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsDocument> ui;

4
src/Gui/DlgSettingsImageImp.h
View File

@@ -44,7 +44,7 @@ class DlgSettingsImageImp : public QWidget
public:
DlgSettingsImageImp( QWidget* parent = nullptr );
~DlgSettingsImageImp();
~DlgSettingsImageImp() override;
/** @name Image dimensions */
//@{
@@ -79,7 +79,7 @@ protected Q_SLOTS:
protected:
// helper to force an aspect ratio
void adjustImageSize(float fRatio);
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:

8
src/Gui/DlgSettingsLazyLoadedImp.h
View File

@@ -45,17 +45,17 @@ class DlgSettingsLazyLoadedImp : public PreferencePage
public:
DlgSettingsLazyLoadedImp( QWidget* parent = nullptr );
~DlgSettingsLazyLoadedImp();
~DlgSettingsLazyLoadedImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected Q_SLOTS:
void onLoadClicked(const QString& wbName);
protected:
void buildUnloadedWorkbenchList();
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsLazyLoaded> ui;

8
src/Gui/DlgSettingsMacroImp.h
View File

@@ -42,13 +42,13 @@ class DlgSettingsMacroImp : public PreferencePage
public:
DlgSettingsMacroImp( QWidget* parent = nullptr );
~DlgSettingsMacroImp();
~DlgSettingsMacroImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsMacro> ui;

10
src/Gui/DlgSettingsNavigation.h
View File

@@ -45,17 +45,17 @@ class DlgSettingsNavigation : public PreferencePage
public:
DlgSettingsNavigation(QWidget* parent = nullptr);
~DlgSettingsNavigation();
~DlgSettingsNavigation() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
private Q_SLOTS:
void on_mouseButton_clicked();
void onNewDocViewChanged(int);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void retranslate();
private:
@@ -69,7 +69,7 @@ class CameraDialog : public QDialog
public:
CameraDialog(QWidget* parent=nullptr);
~CameraDialog();
~CameraDialog() override;
void setValues(double q0, double q1, double q2, double q3);
void getValues(double& q0, double& q1, double& q2, double& q3) const;

8
src/Gui/DlgSettingsPythonConsole.h
View File

@@ -42,13 +42,13 @@ class DlgSettingsPythonConsole : public PreferencePage
public:
DlgSettingsPythonConsole(QWidget* parent = nullptr);
~DlgSettingsPythonConsole();
~DlgSettingsPythonConsole() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsPythonConsole> ui;

8
src/Gui/DlgSettingsSelection.h
View File

@@ -44,13 +44,13 @@ class DlgSettingsSelection : public PreferencePage
public:
DlgSettingsSelection(QWidget* parent = nullptr);
~DlgSettingsSelection();
~DlgSettingsSelection() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsSelection> ui;

8
src/Gui/DlgSettingsUnitsImp.h
View File

@@ -41,13 +41,13 @@ class DlgSettingsUnitsImp : public PreferencePage
public:
DlgSettingsUnitsImp(QWidget* parent = nullptr);
~DlgSettingsUnitsImp();
~DlgSettingsUnitsImp() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
public Q_SLOTS:
void on_comboBox_ViewSystem_currentIndexChanged(int index);

8
src/Gui/DlgSettingsViewColor.h
View File

@@ -42,13 +42,13 @@ class DlgSettingsViewColor : public PreferencePage
public:
DlgSettingsViewColor(QWidget* parent = nullptr);
~DlgSettingsViewColor();
~DlgSettingsViewColor() override;
void saveSettings();
void loadSettings();
void saveSettings() override;
void loadSettings() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
protected Q_SLOTS:
void onSwitchGradientColorsPressed();

34
src/Gui/DlgToolbarsImp.h
View File

@@ -47,7 +47,7 @@ protected:
enum Type { Toolbar, Toolboxbar };
DlgCustomToolbars(Type, QWidget* parent = nullptr);
virtual ~DlgCustomToolbars();
~DlgCustomToolbars() override;
protected Q_SLOTS:
void on_categoryBox_activated(int index);
@@ -59,13 +59,13 @@ protected Q_SLOTS:
void on_newButton_clicked();
void on_renameButton_clicked();
void on_deleteButton_clicked();
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
protected:
void changeEvent(QEvent *e);
void hideEvent(QHideEvent * event);
void changeEvent(QEvent *e) override;
void hideEvent(QHideEvent * event) override;
virtual void addCustomToolbar(const QString&);
virtual void removeCustomToolbar(const QString&);
virtual void renameCustomToolbar(const QString&, const QString&);
@@ -95,17 +95,17 @@ class DlgCustomToolbarsImp : public DlgCustomToolbars
public:
DlgCustomToolbarsImp(QWidget* parent = nullptr);
~DlgCustomToolbarsImp();
~DlgCustomToolbarsImp() override;
protected:
void changeEvent(QEvent *e);
virtual void addCustomToolbar(const QString&);
virtual void removeCustomToolbar(const QString&);
virtual void renameCustomToolbar(const QString&, const QString&);
virtual void addCustomCommand(const QString&, const QByteArray&);
virtual void removeCustomCommand(const QString&, const QByteArray&);
virtual void moveUpCustomCommand(const QString&, const QByteArray&);
virtual void moveDownCustomCommand(const QString&, const QByteArray&);
void changeEvent(QEvent *e) override;
void addCustomToolbar(const QString&) override;
void removeCustomToolbar(const QString&) override;
void renameCustomToolbar(const QString&, const QString&) override;
void addCustomCommand(const QString&, const QByteArray&) override;
void removeCustomCommand(const QString&, const QByteArray&) override;
void moveUpCustomCommand(const QString&, const QByteArray&) override;
void moveDownCustomCommand(const QString&, const QByteArray&) override;
private:
QList<QAction*> getActionGroup(QAction*);
@@ -127,10 +127,10 @@ class DlgCustomToolBoxbarsImp : public DlgCustomToolbars
public:
DlgCustomToolBoxbarsImp(QWidget* parent = nullptr);
~DlgCustomToolBoxbarsImp();
~DlgCustomToolBoxbarsImp() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
};
} // namespace Dialog

4
src/Gui/DlgUndoRedo.h
View File

@@ -38,7 +38,7 @@ class UndoDialog : public QMenu
public:
UndoDialog( QWidget* parent = nullptr );
virtual ~UndoDialog();
~UndoDialog() override;
protected Q_SLOTS:
void onSelected();
@@ -54,7 +54,7 @@ class RedoDialog : public QMenu
public:
RedoDialog( QWidget* parent = nullptr );
virtual ~RedoDialog();
~RedoDialog() override;
protected Q_SLOTS:
void onSelected();

6
src/Gui/DlgUnitsCalculatorImp.h
View File

@@ -43,11 +43,11 @@ class DlgUnitsCalculator : public QDialog
public:
DlgUnitsCalculator(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
~DlgUnitsCalculator();
~DlgUnitsCalculator() override;
protected:
void accept();
void reject();
void accept() override;
void reject() override;
protected Q_SLOTS:
void textChanged(const QString);

12
src/Gui/DlgWorkbenchesImp.h
View File

@@ -41,19 +41,19 @@ class DlgWorkbenchesImp : public CustomizeActionPage
public:
DlgWorkbenchesImp(QWidget* parent = nullptr);
~DlgWorkbenchesImp();
~DlgWorkbenchesImp() override;
static QStringList load_enabled_workbenches();
static QStringList load_disabled_workbenches();
static const QString all_workbenches;
protected:
void changeEvent(QEvent *e);
void hideEvent(QHideEvent * event);
void changeEvent(QEvent *e) override;
void hideEvent(QHideEvent * event) override;
protected Q_SLOTS:
void onAddMacroAction(const QByteArray&);
void onRemoveMacroAction(const QByteArray&);
void onModifyMacroAction(const QByteArray&);
void onAddMacroAction(const QByteArray&) override;
void onRemoveMacroAction(const QByteArray&) override;
void onModifyMacroAction(const QByteArray&) override;
void on_add_to_enabled_workbenches_btn_clicked();
void on_remove_from_enabled_workbenches_btn_clicked();
void on_shift_workbench_up_btn_clicked();

12
src/Gui/DockWindow.h
View File

@@ -57,21 +57,21 @@ public:
/** View destructor
* Detach the view from the document, if attached.
*/
virtual ~DockWindow();
~DockWindow() override;
/** @name methods to override
*/
//@{
/// get called when the document is updated
virtual void onUpdate(){}
void onUpdate() override{}
/// returns the name of the view (important for messages)
virtual const char *getName() const { return "DockWindow"; }
const char *getName() const override { return "DockWindow"; }
/// Message handler
virtual bool onMsg(const char* ,const char** ){ return false; }
bool onMsg(const char* ,const char** ) override{ return false; }
/// Message handler test
virtual bool onHasMsg(const char*) const { return false; }
bool onHasMsg(const char*) const override { return false; }
/// overwrite when checking on close state
virtual bool canClose(){return true;}
bool canClose() override{return true;}
//@}
Q_SIGNALS:

2
src/Gui/DockWindowManager.h
View File

@@ -109,7 +109,7 @@ private:
QDockWidget* findDockWidget(const QList<QDockWidget*>&, const QString&) const;
DockWindowManager();
~DockWindowManager();
~DockWindowManager() override;
static DockWindowManager* _instance;
struct DockWindowManagerP* d;
};

14
src/Gui/Document.h
View File

@@ -69,7 +69,7 @@ class GuiExport Document : public Base::Persistence
{
public:
Document(App::Document* pcDocument, Application * app);
~Document();
~Document() override;
protected:
/** @name I/O of the document */
@@ -141,7 +141,7 @@ public:
/** @name I/O of the document */
//@{
unsigned int getMemSize () const;
unsigned int getMemSize () const override;
/// Save the document
bool save();
/// Save the document under a new file name
@@ -151,13 +151,13 @@ public:
/// Save all open document
static void saveAll();
/// This method is used to save properties or very small amounts of data to an XML document.
virtual void Save (Base::Writer &writer) const;
void Save (Base::Writer &writer) const override;
/// This method is used to restore properties from an XML document.
virtual void Restore(Base::XMLReader &reader);
void Restore(Base::XMLReader &reader) override;
/// This method is used to save large amounts of data to a binary file.
virtual void SaveDocFile (Base::Writer &writer) const;
void SaveDocFile (Base::Writer &writer) const override;
/// This method is used to restore large amounts of data from a binary file.
virtual void RestoreDocFile(Base::Reader &reader);
void RestoreDocFile(Base::Reader &reader) override;
void exportObjects(const std::vector<App::DocumentObject*>&, Base::Writer&);
void importObjects(const std::vector<App::DocumentObject*>&, Base::Reader&,
const std::map<std::string, std::string>& nameMapping);
@@ -293,7 +293,7 @@ public:
/// called by Application before being deleted
void beforeDelete();
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
const char *getCameraSettings() const;
bool saveCameraSettings(const char *) const;

14
src/Gui/DocumentModel.cpp
View File

@@ -51,7 +51,7 @@ namespace Gui {
TYPESYSTEM_HEADER();
public:
virtual ~DocumentModelIndex()
~DocumentModelIndex() override
{ qDeleteAll(childItems); }
void setParent(DocumentModelIndex* parent)
@@ -118,8 +118,8 @@ namespace Gui {
public:
ApplicationIndex(){}
int findChild(const Gui::Document& d) const;
Qt::ItemFlags flags() const;
QVariant data(int role) const;
Qt::ItemFlags flags() const override;
QVariant data(int role) const override;
};
// ------------------------------------------------------------------------
@@ -142,14 +142,14 @@ namespace Gui {
if (!documentIcon)
documentIcon = new QIcon(Gui::BitmapFactory().pixmap("Document"));
}
~DocumentIndex()
~DocumentIndex() override
{
qDeleteAll(childItems); childItems.clear();
}
ViewProviderIndex* cloneViewProvider(const ViewProviderDocumentObject&) const;
int rowOfViewProvider(const ViewProviderDocumentObject&) const;
void findViewProviders(const ViewProviderDocumentObject&, QList<ViewProviderIndex*>&) const;
QVariant data(int role) const;
QVariant data(int role) const override;
};
// ------------------------------------------------------------------------
@@ -162,10 +162,10 @@ namespace Gui {
public:
const Gui::ViewProviderDocumentObject& v;
ViewProviderIndex(const Gui::ViewProviderDocumentObject& v, DocumentIndex* d);
~ViewProviderIndex();
~ViewProviderIndex() override;
ViewProviderIndex* clone() const;
void findViewProviders(const ViewProviderDocumentObject&, QList<ViewProviderIndex*>&) const;
QVariant data(int role) const;
QVariant data(int role) const override;
private:
DocumentIndex* d;

20
src/Gui/DocumentModel.h
View File

@@ -39,17 +39,17 @@ class DocumentModel : public QAbstractItemModel
{
public:
DocumentModel(QObject* parent);
virtual ~DocumentModel();
~DocumentModel() override;
int columnCount (const QModelIndex & parent = QModelIndex()) const;
QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const;
bool setData (const QModelIndex & idx, const QVariant & value, int role);
Qt::ItemFlags flags(const QModelIndex &index) const;
QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex()) const;
QModelIndex parent (const QModelIndex & index) const;
int rowCount (const QModelIndex & parent = QModelIndex()) const;
QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
bool setHeaderData (int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole);
int columnCount (const QModelIndex & parent = QModelIndex()) const override;
QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
bool setData (const QModelIndex & idx, const QVariant & value, int role) override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex()) const override;
QModelIndex parent (const QModelIndex & index) const override;
int rowCount (const QModelIndex & parent = QModelIndex()) const override;
QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
bool setHeaderData (int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole) override;
private:
void slotNewDocument(const Gui::Document&);

8
src/Gui/DocumentRecovery.h
View File

@@ -44,14 +44,14 @@ class DocumentRecovery : public QDialog
public:
DocumentRecovery(const QList<QFileInfo>&, QWidget* parent = nullptr);
virtual ~DocumentRecovery();
~DocumentRecovery() override;
void accept();
void accept() override;
bool foundDocuments() const;
protected:
void closeEvent(QCloseEvent*);
void contextMenuEvent(QContextMenuEvent*);
void closeEvent(QCloseEvent*) override;
void contextMenuEvent(QContextMenuEvent*) override;
QString createProjectFile(const QString&);
void cleanup(QDir&, const QList<QFileInfo>&, const QString&);

10
src/Gui/DownloadItem.h
View File

@@ -43,7 +43,7 @@ class EditTableView : public QTableView
public:
EditTableView(QWidget *parent = nullptr);
void keyPressEvent(QKeyEvent *event);
void keyPressEvent(QKeyEvent *event) override;
public Q_SLOTS:
void removeOne();
@@ -58,7 +58,7 @@ public:
SqueezeLabel(QWidget *parent = nullptr);
protected:
void paintEvent(QPaintEvent *event);
void paintEvent(QPaintEvent *event) override;
};
@@ -73,14 +73,14 @@ Q_OBJECT
public:
AutoSaver(QObject *parent);
~AutoSaver();
~AutoSaver() override;
void saveIfNecessary();
public Q_SLOTS:
void changeOccurred();
protected:
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) override;
private:
QBasicTimer m_timer;
@@ -137,7 +137,7 @@ private Q_SLOTS:
void finished();
private:
void contextMenuEvent(QContextMenuEvent *);
void contextMenuEvent(QContextMenuEvent *) override;
void getFileName();
void init();
void updateInfoLabel();

10
src/Gui/DownloadManager.h
View File

@@ -60,7 +60,7 @@ public:
private:
DownloadManager(QWidget *parent = nullptr);
~DownloadManager();
~DownloadManager() override;
public:
int activeDownloads() const;
@@ -69,7 +69,7 @@ public:
RemovePolicy removePolicy() const;
void setRemovePolicy(RemovePolicy policy);
void closeEvent(QCloseEvent* e);
void closeEvent(QCloseEvent* e) override;
QUrl redirectUrl(const QUrl&) const;
public Q_SLOTS:
@@ -108,9 +108,9 @@ class DownloadModel : public QAbstractListModel
public:
DownloadModel(DownloadManager *downloadManager, QObject *parent = nullptr);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
private:
DownloadManager *m_downloadManager;

44
src/Gui/EditorView.h
View File

@@ -60,19 +60,19 @@ public:
};
EditorView(QPlainTextEdit* editor, QWidget* parent);
~EditorView();
~EditorView() override;
QPlainTextEdit* getEditor() const;
void setDisplayName(DisplayName);
void OnChange(Base::Subject<const char*> &rCaller,const char* rcReason);
void OnChange(Base::Subject<const char*> &rCaller,const char* rcReason) override;
const char *getName() const {return "EditorView";}
void onUpdate(){}
const char *getName() const override {return "EditorView";}
void onUpdate() override{}
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;
bool canClose();
bool canClose() override;
/** @name Standard actions of the editor */
//@{
@@ -83,21 +83,21 @@ public:
void paste ();
void undo ();
void redo ();
void print ();
void printPdf();
void printPreview();
void print(QPrinter*);
void print () override;
void printPdf() override;
void printPreview() override;
void print(QPrinter*) override;
//@}
QStringList undoActions() const;
QStringList redoActions() const;
QStringList undoActions() const override;
QStringList redoActions() const override;
QString fileName() const;
protected:
void focusInEvent(QFocusEvent* e);
void showEvent(QShowEvent*);
void hideEvent(QHideEvent*);
void closeEvent(QCloseEvent*);
void focusInEvent(QFocusEvent* e) override;
void showEvent(QShowEvent*) override;
void hideEvent(QHideEvent*) override;
void closeEvent(QCloseEvent*) override;
private Q_SLOTS:
void checkTimestamp();
@@ -125,10 +125,10 @@ class GuiExport PythonEditorView : public EditorView
public:
PythonEditorView(PythonEditor* editor, QWidget* parent);
~PythonEditorView();
~PythonEditorView() override;
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;
public Q_SLOTS:
void executeScript();
@@ -151,8 +151,8 @@ public:
void setEditor(QPlainTextEdit *textEdit);
protected:
void keyPressEvent(QKeyEvent*);
void changeEvent(QEvent*);
void keyPressEvent(QKeyEvent*) override;
void changeEvent(QEvent*) override;
public Q_SLOTS:
void activate();

4
src/Gui/ExpressionBindingPy.h
View File

@@ -34,9 +34,9 @@ public:
static void init_type(); // announce properties and methods
ExpressionBindingPy(ExpressionBinding*);
~ExpressionBindingPy();
~ExpressionBindingPy() override;
Py::Object repr();
Py::Object repr() override;
Py::Object bind(const Py::Tuple&);
Py::Object isBound(const Py::Tuple&);

10
src/Gui/ExpressionCompleter.cpp
View File

@@ -138,7 +138,7 @@ public:
return res;
}
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const {
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override {
if(role!=Qt::EditRole && role!=Qt::DisplayRole && role!=Qt::UserRole)
return QVariant();
QVariant v;
@@ -260,7 +260,7 @@ public:
return;
}
QModelIndex parent(const QModelIndex & index) const {
QModelIndex parent(const QModelIndex & index) const override {
if(!index.isValid())
return QModelIndex();
Info info;
@@ -277,7 +277,7 @@ public:
return QModelIndex();
}
QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const {
QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override {
if(row<0)
return QModelIndex();
Info info;
@@ -296,7 +296,7 @@ public:
return createIndex(row,column,infoId(info));
}
int rowCount(const QModelIndex & parent = QModelIndex()) const {
int rowCount(const QModelIndex & parent = QModelIndex()) const override {
Info info;
int row = 0;
if(!parent.isValid()) {
@@ -318,7 +318,7 @@ public:
return count;
}
int columnCount(const QModelIndex &) const {
int columnCount(const QModelIndex &) const override {
return 1;
}

12
src/Gui/ExpressionCompleter.h
View File

@@ -69,8 +69,8 @@ public Q_SLOTS:
private:
void init();
virtual QString pathFromIndex ( const QModelIndex & index ) const;
virtual QStringList splitPath ( const QString & path ) const;
QString pathFromIndex ( const QModelIndex & index ) const override;
QStringList splitPath ( const QString & path ) const override;
int prefixStart = 0;
int prefixEnd = 0;
@@ -97,8 +97,8 @@ public Q_SLOTS:
void slotTextChanged(const QString & text);
void slotCompleteText(const QString & completionPrefix);
protected:
void keyPressEvent(QKeyEvent * event);
void contextMenuEvent(QContextMenuEvent * event);
void keyPressEvent(QKeyEvent * event) override;
void contextMenuEvent(QContextMenuEvent * event) override;
private:
ExpressionCompleter * completer;
bool block;
@@ -117,8 +117,8 @@ public:
void hideCompleter();
void setExactMatch(bool enabled=true);
protected:
void keyPressEvent(QKeyEvent * event);
void contextMenuEvent(QContextMenuEvent * event);
void keyPressEvent(QKeyEvent * event) override;
void contextMenuEvent(QContextMenuEvent * event) override;
Q_SIGNALS:
void textChanged2(QString text, int pos);
public Q_SLOTS:

26
src/Gui/FileDialog.h
View File

@@ -77,9 +77,9 @@ public:
static void saveLocation(const QString&);
FileDialog(QWidget * parent = nullptr);
~FileDialog();
~FileDialog() override;
void accept();
void accept() override;
private Q_SLOTS:
void onSelectedFilter(const QString&);
@@ -107,9 +107,9 @@ public:
};
FileOptionsDialog ( QWidget* parent, Qt::WindowFlags );
virtual ~FileOptionsDialog();
~FileOptionsDialog() override;
void accept();
void accept() override;
void setOptionsWidget( ExtensionPosition pos , QWidget*, bool show = false );
QWidget* getOptionsWidget() const;
@@ -134,11 +134,11 @@ class FileIconProvider : public QFileIconProvider
{
public:
FileIconProvider();
~FileIconProvider();
~FileIconProvider() override;
QIcon icon(IconType type) const;
QIcon icon(const QFileInfo & info) const;
QString type(const QFileInfo & info) const;
QIcon icon(IconType type) const override;
QIcon icon(const QFileInfo & info) const override;
QString type(const QFileInfo & info) const override;
};
// ----------------------------------------------------------------------
@@ -166,7 +166,7 @@ public:
public:
FileChooser ( QWidget * parent = nullptr );
virtual ~FileChooser();
~FileChooser() override;
/**
* Returns the set filter.
@@ -219,7 +219,7 @@ private Q_SLOTS:
void editingFinished();
protected:
void resizeEvent(QResizeEvent*);
void resizeEvent(QResizeEvent*) override;
private:
QLineEdit *lineEdit;
@@ -246,7 +246,7 @@ public:
typedef QMap<QString, QString> Dict;
SelectModule (const QString& type, const Dict&, QWidget* parent);
virtual ~SelectModule();
~SelectModule() override;
QString getModule() const;
/** @name Import/Export handler
@@ -261,8 +261,8 @@ public:
static Dict importHandler(const QStringList& fn, const QString& filter=QString());
//@}
void accept();
void reject();
void accept() override;
void reject() override;
private Q_SLOTS:
void onButtonClicked();

44
src/Gui/Flag.h
View File

@@ -42,24 +42,24 @@ class GuiExport Flag : public QtGLWidget
public:
Flag(QWidget* parent=nullptr);
~Flag();
~Flag() override;
QSize sizeHint() const;
QSize sizeHint() const override;
void setOrigin(const SbVec3f&);
const SbVec3f& getOrigin() const;
void drawLine(Gui::View3DInventorViewer*, int tox, int toy);
void setText(const QString&);
protected:
void initializeGL();
void resizeGL(int width, int height);
void paintGL();
void initializeGL() override;
void resizeGL(int width, int height) override;
void paintGL() override;
void paintEvent(QPaintEvent *);
void mouseMoveEvent(QMouseEvent *);
void mousePressEvent(QMouseEvent *);
void resizeEvent(QResizeEvent *);
void contextMenuEvent(QContextMenuEvent *);
void paintEvent(QPaintEvent *) override;
void mouseMoveEvent(QMouseEvent *) override;
void mousePressEvent(QMouseEvent *) override;
void resizeEvent(QResizeEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
private:
QString text;
@@ -77,18 +77,18 @@ public:
FlagLayout(QWidget *parent, int margin = 0, int spacing = -1);
FlagLayout(int spacing = -1);
~FlagLayout();
~FlagLayout() override;
void addItem(QLayoutItem *item);
void addItem(QLayoutItem *item) override;
void addWidget(QWidget *widget, Position position);
Qt::Orientations expandingDirections() const;
bool hasHeightForWidth() const;
int count() const;
QLayoutItem *itemAt(int index) const;
QSize minimumSize() const;
void setGeometry(const QRect &rect);
QSize sizeHint() const;
QLayoutItem *takeAt(int index);
Qt::Orientations expandingDirections() const override;
bool hasHeightForWidth() const override;
int count() const override;
QLayoutItem *itemAt(int index) const override;
QSize minimumSize() const override;
void setGeometry(const QRect &rect) override;
QSize sizeHint() const override;
QLayoutItem *takeAt(int index) override;
void add(QLayoutItem *item, Position position);
@@ -116,14 +116,14 @@ class GuiExport GLFlagWindow : public Gui::GLGraphicsItem
public:
GLFlagWindow(View3DInventorViewer*);
virtual ~GLFlagWindow();
~GLFlagWindow() override;
void addFlag(Flag* item, FlagLayout::Position pos);
void removeFlag(Flag* item);
void deleteFlags();
Flag* getFlag(int) const;
int countFlags() const;
void paintGL();
void paintGL() override;
private:
View3DInventorViewer* _viewer;

10
src/Gui/GLPainter.h
View File

@@ -90,7 +90,7 @@ public:
GLGraphicsItem()
{
}
virtual ~GLGraphicsItem()
~GLGraphicsItem() override
{
}
virtual void paintGL() = 0;
@@ -106,14 +106,14 @@ class GuiExport Rubberband : public Gui::GLGraphicsItem
public:
Rubberband(View3DInventorViewer* v);
Rubberband();
~Rubberband();
~Rubberband() override;
void setWorking(bool on);
void setLineStipple(bool on);
bool isWorking();
void setViewer(View3DInventorViewer* v);
void setCoords(int x1, int y1, int x2, int y2);
void setColor(float r, float g, float b, float a);
void paintGL();
void paintGL() override;
};
class GuiExport Polyline : public Gui::GLGraphicsItem
@@ -128,7 +128,7 @@ class GuiExport Polyline : public Gui::GLGraphicsItem
public:
Polyline(View3DInventorViewer* v);
Polyline();
~Polyline();
~Polyline() override;
void setWorking(bool on);
bool isWorking() const;
void setViewer(View3DInventorViewer* v);
@@ -140,7 +140,7 @@ public:
void addNode(const QPoint& p);
void popNode();
void clear();
void paintGL();
void paintGL() override;
};
} // namespace Gui

20
src/Gui/GestureNavigationStyle.cpp
View File

@@ -94,7 +94,7 @@ class NS::Event : public sc::event<NS::Event>
{
public:
Event():inventor_event(nullptr), modifiers{}, flags(new Flags){}
virtual ~Event(){}
~Event() override{}
void log() const {
if (isPress(1))
@@ -245,7 +245,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> IdleState\n");
}
virtual ~IdleState(){}
~IdleState() override{}
sc::result react(const NS::Event& ev){
auto &ns = this->outermost_context().ns;
@@ -371,7 +371,7 @@ public:
// unregisterRecognizer routines failed to affect anything.
}
virtual ~AwaitingMoveState(){
~AwaitingMoveState() override{
//always clear postponed events when leaving this state.
this->outermost_context().ns.postponedEvents.discardAll();
}
@@ -494,7 +494,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> RotateState\n");
}
virtual ~RotateState(){}
~RotateState() override{}
sc::result react(const NS::Event& ev){
if(ev.isMouseButtonEvent()){
@@ -539,7 +539,7 @@ public:
this->ratio = ns.viewer->getSoRenderManager()->getViewportRegion().getViewportAspectRatio();
ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~PanState(){}
~PanState() override{}
sc::result react(const NS::Event& ev){
if(ev.isMouseButtonEvent()){
@@ -586,7 +586,7 @@ public:
this->ratio = ns.viewer->getSoRenderManager()->getViewportRegion().getViewportAspectRatio();
ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~StickyPanState(){
~StickyPanState() override{
auto &ns = this->outermost_context().ns;
ns.button2down = false; //a workaround for dealing with Qt not sending UP event after a tap-hold-drag sequence.
}
@@ -631,7 +631,7 @@ public:
Base::Console().Log(" -> TiltState\n");
ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~TiltState(){}
~TiltState() override{}
sc::result react(const NS::Event& ev){
if(ev.isMouseButtonEvent()){
@@ -684,7 +684,7 @@ public:
enableTilt = !(App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("DisableTouchTilt",true));
}
virtual ~GestureState(){
~GestureState() override{
auto &ns = this->outermost_context().ns;
//a workaround for Qt not always sending release evends during touchecreen gestures on Windows
ns.button1down = false;
@@ -759,7 +759,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> AwaitingReleaseState\n");
}
virtual ~AwaitingReleaseState(){}
~AwaitingReleaseState() override{}
sc::result react(const NS::Event& ev){
auto &ns = this->outermost_context().ns;
@@ -810,7 +810,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> InteractState\n");
}
virtual ~InteractState(){}
~InteractState() override{}
sc::result react(const NS::Event& ev){
if(ev.isMouseButtonEvent()){

2
src/Gui/GestureNavigationStyle.h
View File

@@ -39,7 +39,7 @@ class GestureNavigationStyle: public UserNavigationStyle
public:
GestureNavigationStyle();
virtual ~GestureNavigationStyle() override;
~GestureNavigationStyle() override;
const char* mouseButtons(ViewerMode) override;
protected:

2
src/Gui/GraphicsViewZoom.h
View File

@@ -87,7 +87,7 @@ private:
double _zoom_factor_base;
bool m_invert_zoom;
QPointF target_scene_pos, target_viewport_pos;
bool eventFilter(QObject* object, QEvent* event);
bool eventFilter(QObject* object, QEvent* event) override;
};
#endif // GRAPHICSVIEWZOOM_H

6
src/Gui/GraphvizView.cpp
View File

@@ -69,7 +69,7 @@ public:
{
}
virtual ~GraphvizWorker()
~GraphvizWorker() override
{
dotProc.moveToThread(this);
unflattenProc.moveToThread(this);
@@ -90,7 +90,7 @@ public:
Q_EMIT emitFinished();
}
void run() {
void run() override {
QByteArray preprocessed = str;
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DependencyGraph");
@@ -140,7 +140,7 @@ class GraphvizGraphicsView final : public QGraphicsView
{
public:
GraphvizGraphicsView(QGraphicsScene* scene, QWidget* parent);
~GraphvizGraphicsView() = default;
~GraphvizGraphicsView() override = default;
GraphvizGraphicsView(const GraphvizGraphicsView&) = delete;
GraphvizGraphicsView(GraphvizGraphicsView&&) = delete;

14
src/Gui/GraphvizView.h
View File

@@ -43,23 +43,23 @@ class GuiExport GraphvizView : public MDIView
public:
GraphvizView(App::Document &_doc, QWidget* parent=nullptr);
~GraphvizView();
~GraphvizView() override;
QByteArray exportGraph(const QString& filter);
/// Message handler
virtual bool onMsg(const char* pMsg,const char** ppReturn);
bool onMsg(const char* pMsg,const char** ppReturn) override;
/// Message handler test
virtual bool onHasMsg(const char* pMsg) const;
bool onHasMsg(const char* pMsg) const override;
/** @name Printing */
//@{
virtual void print(QPrinter* printer);
void print(QPrinter* printer) override;
/** Print content of view */
virtual void print();
void print() override;
/** Print to PDF file */
virtual void printPdf();
void printPdf() override;
/** Show a preview dialog */
virtual void printPreview();
void printPreview() override;
//@}
private Q_SLOTS:

12
src/Gui/GuiApplication.h
View File

@@ -42,13 +42,13 @@ class GUIApplication : public GUIApplicationNativeEventAware
public:
explicit GUIApplication(int & argc, char ** argv);
virtual ~GUIApplication();
~GUIApplication() override;
/**
* Make forwarding events exception-safe and get more detailed information
* where an unhandled exception comes from.
*/
bool notify (QObject * receiver, QEvent * event);
bool notify (QObject * receiver, QEvent * event) override;
/// Pointer to exceptions caught in Qt event handler
std::shared_ptr<Base::SystemExitException> caughtException;
@@ -57,7 +57,7 @@ public Q_SLOTS:
void commitData(QSessionManager &manager);
protected:
bool event(QEvent * event);
bool event(QEvent * event) override;
};
class GUISingleApplication : public GUIApplication
@@ -66,7 +66,7 @@ class GUISingleApplication : public GUIApplication
public:
explicit GUISingleApplication(int & argc, char ** argv);
virtual ~GUISingleApplication();
~GUISingleApplication() override;
bool isRunning() const;
bool sendMessage(const QByteArray &message, int timeout = 5000);
@@ -89,7 +89,7 @@ class WheelEventFilter : public QObject
public:
WheelEventFilter(QObject* parent);
bool eventFilter(QObject* obj, QEvent* ev);
bool eventFilter(QObject* obj, QEvent* ev) override;
};
class KeyboardFilter : public QObject
@@ -98,7 +98,7 @@ class KeyboardFilter : public QObject
public:
KeyboardFilter(QObject* parent);
bool eventFilter(QObject* obj, QEvent* ev);
bool eventFilter(QObject* obj, QEvent* ev) override;
};
}

2
src/Gui/GuiApplicationNativeEventAware.h
View File

@@ -39,7 +39,7 @@ namespace Gui
Q_OBJECT
public:
GUIApplicationNativeEventAware(int &argc, char *argv[]);
~GUIApplicationNativeEventAware();
~GUIApplicationNativeEventAware() override;
void initSpaceball(QMainWindow *window);
bool isSpaceballPresent() const {return spaceballPresent;}
void setSpaceballPresent(bool present) {spaceballPresent = present;}

2
src/Gui/GuiConsole.h
View File

@@ -46,7 +46,7 @@ public:
/// Constructor
GUIConsole();
/// Destructor
virtual ~GUIConsole();
~GUIConsole() override;
void SendLog(const std::string& msg, Base::LogStyle level) override;
const char* Name() override {return "GUIConsole";}

6
src/Gui/InputField.cpp
View File

@@ -53,10 +53,10 @@ class InputValidator : public QValidator
{
public:
InputValidator(InputField* parent);
~InputValidator();
~InputValidator() override;
void fixup(QString& input) const;
State validate(QString& input, int& pos) const;
void fixup(QString& input) const override;
State validate(QString& input, int& pos) const override;
private:
InputField* dptr;

22
src/Gui/InputField.h
View File

@@ -75,7 +75,7 @@ class GuiExport InputField : public ExpressionLineEdit, public ExpressionBinding
public:
InputField (QWidget * parent = nullptr);
virtual ~InputField();
~InputField() override;
/// set the field with a quantity
void setValue(const Base::Quantity&);
@@ -166,9 +166,9 @@ public:
std::vector<QString> getSavedValues();
//@}
void bind(const App::ObjectIdentifier &_path);
bool apply(const std::string &propName);
bool apply();
void bind(const App::ObjectIdentifier &_path) override;
bool apply(const std::string &propName) override;
bool apply() override;
Q_SIGNALS:
/** gets emitted if the user has entered a VALID input
@@ -194,13 +194,13 @@ protected Q_SLOTS:
void updateIconLabel(const QString& text);
protected:
virtual void showEvent(QShowEvent * event);
virtual void focusInEvent(QFocusEvent * event);
virtual void focusOutEvent(QFocusEvent * event);
virtual void keyPressEvent(QKeyEvent * event);
virtual void wheelEvent(QWheelEvent * event);
virtual void contextMenuEvent(QContextMenuEvent * event);
virtual void resizeEvent(QResizeEvent*);
void showEvent(QShowEvent * event) override;
void focusInEvent(QFocusEvent * event) override;
void focusOutEvent(QFocusEvent * event) override;
void keyPressEvent(QKeyEvent * event) override;
void wheelEvent(QWheelEvent * event) override;
void contextMenuEvent(QContextMenuEvent * event) override;
void resizeEvent(QResizeEvent*) override;
private:
QPixmap getValidationIcon(const char* name, const QSize& size) const;

50
src/Gui/InputVector.h
View File

@@ -43,8 +43,8 @@ class GuiExport LocationWidget : public QWidget
public:
LocationWidget (QWidget * parent = nullptr);
virtual ~LocationWidget();
QSize sizeHint() const;
~LocationWidget() override;
QSize sizeHint() const override;
Base::Vector3d getPosition() const;
void setPosition(const Base::Vector3d&);
@@ -56,7 +56,7 @@ private Q_SLOTS:
void on_direction_activated(int);
private:
void changeEvent(QEvent*);
void changeEvent(QEvent*) override;
void retranslateUi();
private:
@@ -81,10 +81,10 @@ class GuiExport LocationDialog : public QDialog
protected:
LocationDialog(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
virtual ~LocationDialog();
~LocationDialog() override;
protected:
virtual void changeEvent(QEvent *e) = 0;
void changeEvent(QEvent *e) override = 0;
private Q_SLOTS:
void on_direction_activated(int);
@@ -118,7 +118,7 @@ public:
this->setupUi(this);
this->retranslate();
}
virtual ~LocationDialogUi(){}
~LocationDialogUi() override{}
void retranslate()
{
@@ -162,7 +162,7 @@ public:
this->zPos->value().getValue());
}
Base::Vector3d getDirection() const
Base::Vector3d getDirection() const override
{
QVariant data = this->direction->itemData (this->direction->currentIndex());
if (data.canConvert<Base::Vector3d>()) {
@@ -174,7 +174,7 @@ public:
}
protected:
void changeEvent(QEvent *e)
void changeEvent(QEvent *e) override
{
if (e->type() == QEvent::LanguageChange) {
this->retranslate();
@@ -212,7 +212,7 @@ private:
QVariant::fromValue<Base::Vector3d>(dir));
this->direction->setCurrentIndex(this->direction->count()-2);
}
void directionActivated(int index)
void directionActivated(int index) override
{
// last item is selected to define direction by user
if (index+1 == this->direction->count()) {
@@ -367,18 +367,18 @@ public:
: LocationDialog(parent, fl), ui(this)
{
}
virtual ~LocationDialogImp()
~LocationDialogImp() override
{
// no need to delete child widgets, Qt does it all for us
}
Base::Vector3d getDirection() const
Base::Vector3d getDirection() const override
{
return ui.getDirection();
}
protected:
void changeEvent(QEvent *e)
void changeEvent(QEvent *e) override
{
if (e->type() == QEvent::LanguageChange) {
ui.retranslate(this);
@@ -389,7 +389,7 @@ protected:
}
private:
void directionActivated(int index)
void directionActivated(int index) override
{
ui.directionActivated(this,index);
}
@@ -428,16 +428,16 @@ public:
LocationImpUi(Ui* ui) : ui(ui)
{
}
~LocationImpUi()
~LocationImpUi() override
{
}
boost::any get()
boost::any get() override
{
return ui;
}
void retranslate(QDialog *dlg)
void retranslate(QDialog *dlg) override
{
ui->retranslateUi(dlg);
@@ -465,21 +465,21 @@ public:
}
}
void setPosition(const Base::Vector3d& v)
void setPosition(const Base::Vector3d& v) override
{
ui->xPos->setValue(v.x);
ui->yPos->setValue(v.y);
ui->zPos->setValue(v.z);
}
Base::Vector3d getPosition() const
Base::Vector3d getPosition() const override
{
return Base::Vector3d(ui->xPos->value().getValue(),
ui->yPos->value().getValue(),
ui->zPos->value().getValue());
}
Base::Vector3d getDirection() const
Base::Vector3d getDirection() const override
{
QVariant data = ui->direction->itemData (ui->direction->currentIndex());
if (data.canConvert<Base::Vector3d>()) {
@@ -491,7 +491,7 @@ public:
}
public:
void setDirection(const Base::Vector3d& dir)
void setDirection(const Base::Vector3d& dir) override
{
if (dir.Length() < Base::Vector3d::epsilon()) {
return;
@@ -518,7 +518,7 @@ public:
QVariant::fromValue<Base::Vector3d>(dir));
ui->direction->setCurrentIndex(ui->direction->count()-2);
}
bool directionActivated(LocationDialog* dlg, int index)
bool directionActivated(LocationDialog* dlg, int index) override
{
// last item is selected to define direction by user
if (index+1 == ui->direction->count()) {
@@ -560,17 +560,17 @@ public:
uit->setupUi(this);
ui->retranslate(this);
}
virtual ~LocationDialogUiImp();
~LocationDialogUiImp() override;
Base::Vector3d getDirection() const;
Base::Vector3d getDirection() const override;
Base::Vector3d getPosition() const;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
void directionActivated(int index);
void directionActivated(int index) override;
protected:
std::unique_ptr<AbstractUi> ui;

20
src/Gui/MDIView.h
View File

@@ -68,21 +68,21 @@ public:
/** View destructor
* Detach the view from the document, if attached.
*/
~MDIView();
~MDIView() override;
/// get called when the document is updated
virtual void onRelabel(Gui::Document *pDoc);
void onRelabel(Gui::Document *pDoc) override;
virtual void viewAll();
/// Message handler
virtual bool onMsg(const char* pMsg,const char** ppReturn);
bool onMsg(const char* pMsg,const char** ppReturn) override;
/// Message handler test
virtual bool onHasMsg(const char* pMsg) const;
bool onHasMsg(const char* pMsg) const override;
/// overwrite when checking on close state
virtual bool canClose();
bool canClose() override;
/// delete itself
virtual void deleteSelf();
virtual PyObject *getPyObject();
void deleteSelf() override;
PyObject *getPyObject() override;
/** @name Printing */
//@{
public Q_SLOTS:
@@ -107,7 +107,7 @@ public:
virtual QStringList redoActions() const;
//@}
QSize minimumSizeHint () const;
QSize minimumSizeHint () const override;
/// MDI view mode enum
enum ViewMode {
@@ -169,9 +169,9 @@ protected Q_SLOTS:
virtual void windowStateChanged(Gui::MDIView*);
protected:
void closeEvent(QCloseEvent *e);
void closeEvent(QCloseEvent *e) override;
/** \internal */
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
protected:
PyObject* pythonObject;

4
src/Gui/MDIViewPy.h
View File

@@ -42,9 +42,9 @@ public:
static Py::ExtensionObject<MDIViewPy> create(MDIView *mdi);
MDIViewPy(MDIView *mdi);
~MDIViewPy();
~MDIViewPy() override;
Py::Object repr();
Py::Object repr() override;
/** @name Printing */
//@{

4
src/Gui/Macro.h
View File

@@ -44,7 +44,7 @@ class GuiExport MacroManager : public Base::Observer<const char*>
{
protected:
MacroManager();
~MacroManager();
~MacroManager() override;
public:
@@ -90,7 +90,7 @@ public:
/// Get the Python debugger
PythonDebugger* debugger() const;
/** Observes its parameter group. */
void OnChange(Base::Subject<const char*> &rCaller, const char * sReason);
void OnChange(Base::Subject<const char*> &rCaller, const char * sReason) override;
/// Return the added lines regardless of recording or not
long getLines() const {return totalLines;}

6
src/Gui/MainWindow.cpp
View File

@@ -126,7 +126,7 @@ public:
CustomMessageEvent(int t, const QString& s, int timeout=0)
: QEvent(QEvent::User), _type(t), msg(s), _timeout(timeout)
{ }
~CustomMessageEvent()
~CustomMessageEvent() override
{ }
int type() const
{ return _type; }
@@ -172,13 +172,13 @@ public:
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
}
~MDITabbar()
~MDITabbar() override
{
delete menu;
}
protected:
void contextMenuEvent ( QContextMenuEvent * e )
void contextMenuEvent ( QContextMenuEvent * e ) override
{
menu->clear();
CommandManager& cMgr = Application::Instance->commandManager();

28
src/Gui/MainWindow.h
View File

@@ -58,7 +58,7 @@ public:
UrlHandler(QObject* parent = nullptr)
: QObject(parent){
}
virtual ~UrlHandler() {
~UrlHandler() override {
}
virtual void openUrl(App::Document*, const QUrl&) {
}
@@ -87,11 +87,11 @@ public:
*/
MainWindow(QWidget * parent = nullptr, Qt::WindowFlags f = Qt::Window);
/** Destroys the object and frees any allocated resources. */
~MainWindow();
~MainWindow() override;
/**
* Filters events if this object has been installed as an event filter for the watched object.
*/
bool eventFilter(QObject* o, QEvent* e);
bool eventFilter(QObject* o, QEvent* e) override;
/**
* Adds an MDI window \a view to the main window's workspace and adds a new tab
* to the tab bar.
@@ -129,7 +129,7 @@ public:
/**
* Returns true that the context menu contains the 'Customize...' menu item.
*/
QMenu * createPopupMenu();
QMenu * createPopupMenu() override;
/** @name Splasher and access methods */
//@{
@@ -253,28 +253,28 @@ protected:
/**
* This method checks if the main window can be closed by checking all open documents and views.
*/
void closeEvent (QCloseEvent * e);
void showEvent (QShowEvent * e);
void hideEvent (QHideEvent * e);
void timerEvent (QTimerEvent * ) {
void closeEvent (QCloseEvent * e) override;
void showEvent (QShowEvent * e) override;
void hideEvent (QHideEvent * e) override;
void timerEvent (QTimerEvent * ) override {
Q_EMIT timeEvent();
}
void customEvent(QEvent * e);
bool event (QEvent * e);
void customEvent(QEvent * e) override;
bool event (QEvent * e) override;
/**
* Try to interpret dropped elements.
*/
void dropEvent (QDropEvent * e);
void dropEvent (QDropEvent * e) override;
/**
* Checks if a mime source object can be interpreted.
*/
void dragEnterEvent(QDragEnterEvent * e);
void dragEnterEvent(QDragEnterEvent * e) override;
/**
* This method is called from the Qt framework automatically whenever a
* QTranslator object has been installed. This allows to translate all
* relevant user visible text.
*/
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private Q_SLOTS:
/**
@@ -349,7 +349,7 @@ class StatusBarObserver: public WindowParameter, public Base::ILogger
{
public:
StatusBarObserver();
virtual ~StatusBarObserver();
~StatusBarObserver() override;
/** Observes its parameter group. */
void OnChange(Base::Subject<const char*> &rCaller, const char * sReason) override;

4
src/Gui/MainWindowPy.h
View File

@@ -43,9 +43,9 @@ public:
static Py::ExtensionObject<MainWindowPy> create(MainWindow *mw);
MainWindowPy(MainWindow *mw);
~MainWindowPy();
~MainWindowPy() override;
Py::Object repr();
Py::Object repr() override;
Py::Object getWindows(const Py::Tuple&);
Py::Object getWindowsOfType(const Py::Tuple&);

6
src/Gui/ManualAlignment.cpp
View File

@@ -429,14 +429,14 @@ public:
static_cast<SoGroup*>(getViewer(1)->getSoRenderManager()->getSceneGraph())->
addChild(setupHeadUpDisplay(tr("Fixed object")));
}
~AlignmentView()
~AlignmentView() override
{
}
PyObject* getPyObject()
PyObject* getPyObject() override
{
Py_Return;
}
bool canClose()
bool canClose() override
{
return false;
}

2
src/Gui/ManualAlignment.h
View File

@@ -191,7 +191,7 @@ class GuiExport ManualAlignment : public QObject
protected:
ManualAlignment();
~ManualAlignment();
~ManualAlignment() override;
public:
static ManualAlignment* instance();

6
src/Gui/MergeDocuments.cpp
View File

@@ -48,11 +48,11 @@ public:
: Base::XMLReader(FileName, str), nameMap(name)
{}
void addName(const char* s1, const char* s2)
void addName(const char* s1, const char* s2) override
{
nameMap[s1] = s2;
}
const char* getName(const char* name) const
const char* getName(const char* name) const override
{
std::map<std::string, std::string>::const_iterator it = nameMap.find(name);
if (it != nameMap.end())
@@ -60,7 +60,7 @@ public:
else
return name;
}
bool doNameMapping() const
bool doNameMapping() const override
{
return true;
}

Some files were not shown because too many files have changed in this diff Show More