[rkward] rkward: Mark applicable re-implementations as override, where applicable
Thomas Friedrichsmeier
null at kde.org
Sat Jan 25 09:23:17 GMT 2020
Git commit 1d0d713b5c44ea43bc8d036c019217a9bec26319 by Thomas Friedrichsmeier.
Committed on 25/01/2020 at 09:23.
Pushed by tfry into branch 'master'.
Mark applicable re-implementations as override, where applicable
M +3 -3 rkward/plugin/rkcheckbox.h
M +5 -5 rkward/plugin/rkdropdown.h
M +4 -4 rkward/plugin/rkformula.h
M +3 -3 rkward/plugin/rkpluginframe.h
M +4 -4 rkward/plugin/rkpluginsaveobject.h
M +5 -5 rkward/plugin/rkradio.h
M +2 -2 rkward/plugin/rkstandardcomponentgui.h
M +1 -1 rkward/plugin/rktabpage.h
M +2 -2 rkward/plugin/rktext.h
M +1 -1 rkward/plugin/rkvarselector.h
M +1 -1 rkward/windows/rkcallstackviewer.h
M +1 -1 rkward/windows/rkdebugconsole.h
https://commits.kde.org/rkward/1d0d713b5c44ea43bc8d036c019217a9bec26319
diff --git a/rkward/plugin/rkcheckbox.h b/rkward/plugin/rkcheckbox.h
index fe1015fa..3446f188 100644
--- a/rkward/plugin/rkcheckbox.h
+++ b/rkward/plugin/rkcheckbox.h
@@ -35,13 +35,13 @@ class RKCheckBox : public RKComponent {
public:
RKCheckBox (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKCheckBox ();
- int type () { return ComponentCheckBox; };
+ int type () override { return ComponentCheckBox; };
RKComponentPropertyBool *state;
- QVariant value (const QString &modifier=QString ()) {
+ QVariant value (const QString &modifier=QString ()) override {
if (modifier.isEmpty ()) return state->value ("labeled");
return (state->value (modifier));
};
- QStringList getUiLabelPair () const;
+ QStringList getUiLabelPair () const override;
public slots:
void changedStateFromUi (int);
void changedState (RKComponentPropertyBase *);
diff --git a/rkward/plugin/rkdropdown.h b/rkward/plugin/rkdropdown.h
index a2265564..c473fe61 100644
--- a/rkward/plugin/rkdropdown.h
+++ b/rkward/plugin/rkdropdown.h
@@ -32,15 +32,15 @@ class RKDropDown : public RKAbstractOptionSelector {
public:
RKDropDown (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKDropDown ();
- int type () { return ComponentDropDown; };
+ int type () override { return ComponentDropDown; };
public slots:
// workaround for a qt bug (3.3.7)
void comboItemActivated (int id);
protected:
- void setItemInGUI (int id);
- void addOptionToGUI (const QString &label, int id);
- void setItemEnabledInGUI (int id, bool enabled);
- QStringList getUiLabelPair () const;
+ void setItemInGUI (int id) override;
+ void addOptionToGUI (const QString &label, int id) override;
+ void setItemEnabledInGUI (int id, bool enabled) override;
+ QStringList getUiLabelPair () const override;
private:
QComboBox *box;
QListWidget *listwidget;
diff --git a/rkward/plugin/rkformula.h b/rkward/plugin/rkformula.h
index 8394df29..b16e707b 100644
--- a/rkward/plugin/rkformula.h
+++ b/rkward/plugin/rkformula.h
@@ -40,12 +40,12 @@ public:
RKFormula (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKFormula ();
- QVariant value (const QString &modifier=QString ()) { return model->value (modifier); };
- QStringList getUiLabelPair () const;
- bool isValid ();
+ QVariant value (const QString &modifier=QString ()) override { return model->value (modifier); };
+ QStringList getUiLabelPair () const override;
+ bool isValid () override;
/** RTTI */
- int type () { return ComponentFormula; };
+ int type () override { return ComponentFormula; };
public slots:
void typeChange (int id);
void addButtonClicked ();
diff --git a/rkward/plugin/rkpluginframe.h b/rkward/plugin/rkpluginframe.h
index f9d45fb4..43349b0a 100644
--- a/rkward/plugin/rkpluginframe.h
+++ b/rkward/plugin/rkpluginframe.h
@@ -36,12 +36,12 @@ public:
/** returns the page child elements should be drawn in */
QWidget *getPage ();
- int type () { return ComponentFrame; };
+ int type () override { return ComponentFrame; };
/** reimplemented to return the value of the checked property by default */
- QVariant value (const QString &modifier=QString ());
+ QVariant value (const QString &modifier=QString ()) override;
/** re-implemented to create "checked" property on demand. */
- RKComponentBase* lookupComponent (const QString &identifier, QString *remainder);
+ RKComponentBase* lookupComponent (const QString &identifier, QString *remainder) override;
private slots:
/** called when checked property changes */
void propertyChanged (RKComponentPropertyBase *property);
diff --git a/rkward/plugin/rkpluginsaveobject.h b/rkward/plugin/rkpluginsaveobject.h
index 0fe732c1..fe10baa1 100644
--- a/rkward/plugin/rkpluginsaveobject.h
+++ b/rkward/plugin/rkpluginsaveobject.h
@@ -37,10 +37,10 @@ public:
RKPluginSaveObject (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKPluginSaveObject ();
- QVariant value (const QString &modifier=QString ());
- QStringList getUiLabelPair () const;
- int type () { return ComponentSaveObject; };
- bool isValid ();
+ QVariant value (const QString &modifier=QString ()) override;
+ QStringList getUiLabelPair () const override;
+ int type () override { return ComponentSaveObject; };
+ bool isValid () override;
public slots:
void externalChange ();
void internalChange ();
diff --git a/rkward/plugin/rkradio.h b/rkward/plugin/rkradio.h
index 668fe0ba..6356e3f0 100644
--- a/rkward/plugin/rkradio.h
+++ b/rkward/plugin/rkradio.h
@@ -31,12 +31,12 @@ class RKRadio : public RKAbstractOptionSelector {
public:
RKRadio (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKRadio ();
- int type () { return ComponentRadio; };
+ int type () override { return ComponentRadio; };
protected:
- void setItemInGUI (int id);
- void addOptionToGUI (const QString &label, int id);
- void setItemEnabledInGUI (int id, bool enabled);
- QStringList getUiLabelPair () const;
+ void setItemInGUI (int id) override;
+ void addOptionToGUI (const QString &label, int id) override;
+ void setItemEnabledInGUI (int id, bool enabled) override;
+ QStringList getUiLabelPair () const override;
private:
QButtonGroup* group;
QGroupBox* group_box;
diff --git a/rkward/plugin/rkstandardcomponentgui.h b/rkward/plugin/rkstandardcomponentgui.h
index fa210d7b..4595d403 100644
--- a/rkward/plugin/rkstandardcomponentgui.h
+++ b/rkward/plugin/rkstandardcomponentgui.h
@@ -84,7 +84,7 @@ public:
virtual void enableSubmit (bool enable);
virtual void updateCode ();
/** reimplemented from QWidget to take care of showing the code display if needed */
- void showEvent (QShowEvent *e);
+ void showEvent (QShowEvent *e) override;
RKXMLGUIPreviewArea* addDockedPreview (RKComponentPropertyBool *controller, const QString& label, const QString &id=QString (), bool bottom = false);
/** Do anything needed after the dialog is created and its contents have been built. Base class adds the preview regions to the splitter */
virtual void finalize ();
@@ -109,7 +109,7 @@ private:
QCheckBox *toggle_code_box;
QPushButton *ok_button;
protected:
- void closeEvent (QCloseEvent *e);
+ void closeEvent (QCloseEvent *e) override;
RKStandardComponent *component;
QTimer *code_update_timer;
// common widgets
diff --git a/rkward/plugin/rktabpage.h b/rkward/plugin/rktabpage.h
index 469bb93b..b0473d19 100644
--- a/rkward/plugin/rktabpage.h
+++ b/rkward/plugin/rktabpage.h
@@ -39,7 +39,7 @@ public:
/** @returns the page child elements should be drawn in */
QWidget *getPage () { return this; };
- int type () { return ComponentTab; };
+ int type () override { return ComponentTab; };
public slots:
/** called when visibile or enabled properties change */
diff --git a/rkward/plugin/rktext.h b/rkward/plugin/rktext.h
index e8d13284..9b8a6563 100644
--- a/rkward/plugin/rktext.h
+++ b/rkward/plugin/rktext.h
@@ -36,8 +36,8 @@ public:
~RKText ();
RKComponentPropertyBase *text;
- QVariant value (const QString &modifier=QString ()) { return (text->value (modifier)); };
- int type () { return ComponentText; };
+ QVariant value (const QString &modifier=QString ()) override { return (text->value (modifier)); };
+ int type () override { return ComponentText; };
public slots:
void textChanged (RKComponentPropertyBase *);
private:
diff --git a/rkward/plugin/rkvarselector.h b/rkward/plugin/rkvarselector.h
index 0af828c6..7314aee4 100644
--- a/rkward/plugin/rkvarselector.h
+++ b/rkward/plugin/rkvarselector.h
@@ -40,7 +40,7 @@ class RKVarSelector : public RKComponent {
public:
RKVarSelector (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget);
~RKVarSelector ();
- int type () { return ComponentVarSelector; };
+ int type () override { return ComponentVarSelector; };
private slots:
void objectSelectionChanged ();
void rootChanged ();
diff --git a/rkward/windows/rkcallstackviewer.h b/rkward/windows/rkcallstackviewer.h
index f715b6c0..c6429354 100644
--- a/rkward/windows/rkcallstackviewer.h
+++ b/rkward/windows/rkcallstackviewer.h
@@ -33,7 +33,7 @@ public:
~RKCallstackViewer ();
/** reimplemented to create the real widget only when the viewer is shown for the first time */
- void showEvent (QShowEvent *e);
+ void showEvent (QShowEvent *e) override;
static RKCallstackViewer *instance () { return _instance; };
public slots:
void newDebugState ();
diff --git a/rkward/windows/rkdebugconsole.h b/rkward/windows/rkdebugconsole.h
index 70be9267..ff43e519 100644
--- a/rkward/windows/rkdebugconsole.h
+++ b/rkward/windows/rkdebugconsole.h
@@ -35,7 +35,7 @@ public:
static RKDebugConsole *instance () { return _instance; };
// reimplemented to refuse closing while inside the debugger
- bool close (bool auto_delete);
+ bool close (bool auto_delete) override;
public slots:
void newDebugState ();
private slots:
More information about the rkward-tracker
mailing list