summaryrefslogtreecommitdiff
path: root/src/gui/widgets/setupitem.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/gui/widgets/setupitem.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmanaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/setupitem.h')
-rw-r--r--src/gui/widgets/setupitem.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index ac25a298f..c7bea7af7 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -174,9 +174,9 @@ class SetupItemCheckBox final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
CheckBox *mCheckBox;
@@ -208,22 +208,22 @@ class SetupItemTextField final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
- void cancel(const std::string &eventName A_UNUSED) final;
+ void cancel(const std::string &eventName A_UNUSED) override final;
void externalUpdated(const std::string &eventName A_UNUSED)
- final;
+ override final;
- void rereadValue() final;
+ void rereadValue() override final;
- void save() final;
+ void save() override final;
void setUseBase64(const UseBase64 b)
{ mUseBase64 = b; }
@@ -263,13 +263,13 @@ class SetupItemIntTextField final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
protected:
HorizontContainer *mHorizont;
@@ -295,13 +295,13 @@ class SetupItemLabel final : public SetupItem
void createControls();
- void fromWidget() final A_CONST;
+ void fromWidget() override final A_CONST;
- void toWidget() final A_CONST;
+ void toWidget() override final A_CONST;
- void action(const ActionEvent &event) final A_CONST;
+ void action(const ActionEvent &event) override final A_CONST;
- void apply(const std::string &eventName) final A_CONST;
+ void apply(const std::string &eventName) override final A_CONST;
protected:
Label *mLabel;
@@ -336,9 +336,9 @@ class SetupItemDropDown final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
HorizontContainer *mHorizont;
@@ -382,13 +382,13 @@ class SetupItemSlider final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
void updateLabel();
@@ -439,13 +439,13 @@ class SetupItemSlider2 final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
void setInvertValue(const int v);
@@ -483,7 +483,7 @@ class SetupItemSliderList notfinal : public SetupItem
void action(const ActionEvent &event) override;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
virtual void addMoreControls() = 0;
@@ -532,9 +532,9 @@ class SetupItemSound final : public SetupItemSliderList
A_DELETE_COPY(SetupItemSound)
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void addMoreControls() final;
+ void addMoreControls() override final;
protected:
Button *mButton;
@@ -556,11 +556,11 @@ class SetupItemSliderInt final : public SetupItemSliderList
A_DELETE_COPY(SetupItemSliderInt)
- void addMoreControls() final;
+ void addMoreControls() override final;
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
int mMin;