summaryrefslogtreecommitdiff
path: root/src/gui/widgets/setupitem.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-25 18:35:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-25 18:35:21 +0300
commit71f88c02f79a1164430eec1de3e15edec011a15e (patch)
tree6a0772ee943a41314b5abd92fed0ce269faced27 /src/gui/widgets/setupitem.h
parent6c05739c62484dae8d5ed9fb0dfdb6590aacfe88 (diff)
downloadmv-71f88c02f79a1164430eec1de3e15edec011a15e.tar.gz
mv-71f88c02f79a1164430eec1de3e15edec011a15e.tar.bz2
mv-71f88c02f79a1164430eec1de3e15edec011a15e.tar.xz
mv-71f88c02f79a1164430eec1de3e15edec011a15e.zip
improve construcors in abstract classes.
Also add some missing final to classes.
Diffstat (limited to 'src/gui/widgets/setupitem.h')
-rw-r--r--src/gui/widgets/setupitem.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 476a31ae4..9c5cc11e3 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -57,15 +57,6 @@ class SetupItem : public gcn::ActionListener,
VNONE
};
- SetupItem(const std::string &text, const std::string &description,
- const std::string &keyName, SetupTabScroll *const parent,
- const std::string &eventName, const bool mainConfig);
-
- SetupItem(const std::string &text, const std::string &description,
- const std::string &keyName, SetupTabScroll *const parent,
- const std::string &eventName, const std::string &def,
- const bool mainConfig);
-
A_DELETE_COPY(SetupItem)
~SetupItem();
@@ -106,6 +97,15 @@ class SetupItem : public gcn::ActionListener,
void rereadValue();
protected:
+ SetupItem(const std::string &text, const std::string &description,
+ const std::string &keyName, SetupTabScroll *const parent,
+ const std::string &eventName, const bool mainConfig);
+
+ SetupItem(const std::string &text, const std::string &description,
+ const std::string &keyName, SetupTabScroll *const parent,
+ const std::string &eventName, const std::string &def,
+ const bool mainConfig);
+
std::string mText;
std::string mDescription;
@@ -427,6 +427,23 @@ class SetupItemSlider2 final : public SetupItem
class SetupItemSliderList : public SetupItem
{
public:
+ A_DELETE_COPY(SetupItemSliderList)
+
+ ~SetupItemSliderList();
+
+ void createControls();
+
+ void fromWidget() override;
+
+ void toWidget() override;
+
+ virtual void action(const gcn::ActionEvent &event) override;
+
+ void apply(const std::string &eventName) override;
+
+ virtual void addMoreControls() = 0;
+
+ protected:
SetupItemSliderList(const std::string &text,
const std::string &description,
const std::string &keyName,
@@ -446,23 +463,6 @@ class SetupItemSliderList : public SetupItem
const bool onTheFly = false,
const bool mainConfig = true);
- A_DELETE_COPY(SetupItemSliderList)
-
- ~SetupItemSliderList();
-
- void createControls();
-
- void fromWidget() override;
-
- void toWidget() override;
-
- virtual void action(const gcn::ActionEvent &event) override;
-
- void apply(const std::string &eventName) override;
-
- virtual void addMoreControls() = 0;
-
- protected:
HorizontContainer *mHorizont;
Label *mLabel;
SliderList *mSlider;