summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-14 18:31:14 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-14 18:31:14 +0300
commitfb433aae06cfd9ca64f8315385534857c77bfe5b (patch)
tree2613a716069be7d7909eab2e5f108767806f2320
parentb21d07cdcaa227f439e705feeb618948458163bc (diff)
downloadplus-fb433aae06cfd9ca64f8315385534857c77bfe5b.tar.gz
plus-fb433aae06cfd9ca64f8315385534857c77bfe5b.tar.bz2
plus-fb433aae06cfd9ca64f8315385534857c77bfe5b.tar.xz
plus-fb433aae06cfd9ca64f8315385534857c77bfe5b.zip
improve setupitem.
-rw-r--r--src/gui/widgets/setupitem.cpp174
-rw-r--r--src/gui/widgets/setupitem.h180
2 files changed, 202 insertions, 152 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 7439e564a..8be4696e1 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -46,9 +46,9 @@
#include "debug.h"
-SetupItem::SetupItem(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, const bool mainConfig) :
+SetupItem::SetupItem(const std::string &text, const std::string &description,
+ const std::string &keyName, SetupTabScroll *const parent,
+ const std::string &eventName, const bool mainConfig) :
gcn::ActionListener(),
Widget2(),
mText(text),
@@ -58,17 +58,17 @@ SetupItem::SetupItem(std::string text, std::string description,
mEventName(eventName),
mMainConfig(mainConfig),
mUseDefault(false),
- mValue(""),
- mDefault(""),
+ mValue(),
+ mDefault(),
mWidget(nullptr),
mTempWidgets(),
mValueType(VBOOL)
{
}
-SetupItem::SetupItem(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, std::string def,
+SetupItem::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) :
gcn::ActionListener(),
Widget2(),
@@ -79,7 +79,7 @@ SetupItem::SetupItem(std::string text, std::string description,
mEventName(eventName),
mMainConfig(mainConfig),
mUseDefault(true),
- mValue(""),
+ mValue(),
mDefault(def),
mWidget(nullptr),
mTempWidgets(),
@@ -138,7 +138,7 @@ void SetupItem::save() const
std::string SetupItem::getActionEventId() const
{
if (!mWidget)
- return "";
+ return std::string();
return mWidget->getActionEventId();
}
@@ -157,18 +157,18 @@ void SetupItem::action()
fromWidget();
}
-void SetupItem::apply(std::string eventName A_UNUSED)
+void SetupItem::apply(const std::string &eventName A_UNUSED)
{
save();
}
-void SetupItem::cancel(std::string eventName A_UNUSED)
+void SetupItem::cancel(const std::string &eventName A_UNUSED)
{
load();
toWidget();
}
-void SetupItem::externalUpdated(std::string eventName A_UNUSED)
+void SetupItem::externalUpdated(const std::string &eventName A_UNUSED)
{
load();
toWidget();
@@ -187,10 +187,11 @@ void SetupItem::rereadValue()
toWidget();
}
-SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
- std::string keyName,
+SetupItemCheckBox::SetupItemCheckBox(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, mainConfig),
mCheckBox(nullptr)
@@ -198,10 +199,12 @@ SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
createControls();
}
-SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
- std::string keyName,
+SetupItemCheckBox::SetupItemCheckBox(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName, std::string def,
+ const std::string &eventName,
+ const std::string &def,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
mCheckBox(nullptr)
@@ -245,11 +248,11 @@ void SetupItemCheckBox::toWidget()
}
-SetupItemTextField::SetupItemTextField(std::string text,
- std::string description,
- std::string keyName,
+SetupItemTextField::SetupItemTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, mainConfig),
mHorizont(nullptr),
@@ -262,11 +265,12 @@ SetupItemTextField::SetupItemTextField(std::string text,
createControls();
}
-SetupItemTextField::SetupItemTextField(std::string text,
- std::string description,
- std::string keyName,
+SetupItemTextField::SetupItemTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName, std::string def,
+ const std::string &eventName,
+ const std::string &def,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
mHorizont(nullptr),
@@ -352,7 +356,7 @@ void SetupItemTextField::action(const gcn::ActionEvent &event)
}
}
-void SetupItemTextField::apply(std::string eventName)
+void SetupItemTextField::apply(const std::string &eventName)
{
if (eventName != mEventName)
return;
@@ -361,11 +365,11 @@ void SetupItemTextField::apply(std::string eventName)
save();
}
-SetupItemIntTextField::SetupItemIntTextField(std::string text,
- std::string description,
- std::string keyName,
+SetupItemIntTextField::SetupItemIntTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, mainConfig),
@@ -381,13 +385,13 @@ SetupItemIntTextField::SetupItemIntTextField(std::string text,
createControls();
}
-SetupItemIntTextField::SetupItemIntTextField(std::string text,
- std::string description,
- std::string keyName,
+SetupItemIntTextField::SetupItemIntTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
- std::string def,
+ const std::string &def,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
mHorizont(nullptr),
@@ -479,7 +483,7 @@ void SetupItemIntTextField::action(const gcn::ActionEvent &event)
}
}
-void SetupItemIntTextField::apply(std::string eventName)
+void SetupItemIntTextField::apply(const std::string &eventName)
{
if (eventName != mEventName)
return;
@@ -489,7 +493,8 @@ void SetupItemIntTextField::apply(std::string eventName)
}
-SetupItemLabel::SetupItemLabel(std::string text, std::string description,
+SetupItemLabel::SetupItemLabel(const std::string &text,
+ const std::string &description,
SetupTabScroll *const parent,
const bool separator) :
SetupItem(text, description, "", parent, "", "", true),
@@ -538,18 +543,18 @@ void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED)
{
}
-void SetupItemLabel::apply(std::string eventName A_UNUSED)
+void SetupItemLabel::apply(const std::string &eventName A_UNUSED)
{
}
-SetupItemDropDown::SetupItemDropDown(std::string text,
- std::string description,
- std::string keyName,
+SetupItemDropDown::SetupItemDropDown(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
gcn::ListModel *const model,
- int width,
+ const int width,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, mainConfig),
mHorizont(nullptr),
@@ -562,14 +567,14 @@ SetupItemDropDown::SetupItemDropDown(std::string text,
createControls();
}
-SetupItemDropDown::SetupItemDropDown(std::string text,
- std::string description,
- std::string keyName,
+SetupItemDropDown::SetupItemDropDown(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
gcn::ListModel *const model,
- int width,
- std::string def,
+ const int width,
+ const std::string &def,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
mHorizont(nullptr),
@@ -604,7 +609,6 @@ void SetupItemDropDown::createControls()
mDropDown->setSelected(atoi(mValue.c_str()));
mWidget = mDropDown;
-// mTextField->setWidth(50);
fixFirstItemSize(mLabel);
mHorizont->add(mLabel);
mHorizont->add(mDropDown);
@@ -632,10 +636,11 @@ void SetupItemDropDown::toWidget()
}
-SetupItemSlider::SetupItemSlider(std::string text, std::string description,
- std::string keyName,
+SetupItemSlider::SetupItemSlider(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const double min, const double max,
const int width, const bool onTheFly,
const bool mainConfig) :
@@ -652,12 +657,13 @@ SetupItemSlider::SetupItemSlider(std::string text, std::string description,
createControls();
}
-SetupItemSlider::SetupItemSlider(std::string text, std::string description,
- std::string keyName,
+SetupItemSlider::SetupItemSlider(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const double min, const double max,
- std::string def, const int width,
+ const std::string &def, const int width,
const bool onTheFly,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
@@ -729,7 +735,7 @@ void SetupItemSlider::action(const gcn::ActionEvent &event A_UNUSED)
save();
}
-void SetupItemSlider::apply(std::string eventName)
+void SetupItemSlider::apply(const std::string &eventName)
{
if (eventName != mEventName)
return;
@@ -739,10 +745,11 @@ void SetupItemSlider::apply(std::string eventName)
}
-SetupItemSlider2::SetupItemSlider2(std::string text, std::string description,
- std::string keyName,
+SetupItemSlider2::SetupItemSlider2(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
SetupItemNames *const values,
const bool onTheFly,
@@ -765,13 +772,14 @@ SetupItemSlider2::SetupItemSlider2(std::string text, std::string description,
createControls();
}
-SetupItemSlider2::SetupItemSlider2(std::string text, std::string description,
- std::string keyName,
+SetupItemSlider2::SetupItemSlider2(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
SetupItemNames *const values,
- std::string def,
+ const std::string &def,
const bool onTheFly, const bool mainConfig,
const bool doNotAlign) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
@@ -894,7 +902,7 @@ void SetupItemSlider2::updateLabel()
mLabel2->setCaption(str);
}
-void SetupItemSlider2::apply(std::string eventName)
+void SetupItemSlider2::apply(const std::string &eventName)
{
if (eventName != mEventName)
return;
@@ -911,11 +919,11 @@ void SetupItemSlider2::setInvertValue(const int v)
}
-SetupItemSliderList::SetupItemSliderList(std::string text,
- std::string description,
- std::string keyName,
+SetupItemSliderList::SetupItemSliderList(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
gcn::ListModel *const model,
const int width, const bool onTheFly,
const bool mainConfig) :
@@ -928,16 +936,16 @@ SetupItemSliderList::SetupItemSliderList(std::string text,
mOnTheFly(onTheFly)
{
mValueType = VSTR;
-// createControls();
}
-SetupItemSliderList::SetupItemSliderList(std::string text,
- std::string description,
- std::string keyName,
+SetupItemSliderList::SetupItemSliderList(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
gcn::ListModel *const model,
- std::string def, const int width,
+ const std::string &def,
+ const int width,
const bool onTheFly,
const bool mainConfig) :
SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
@@ -949,7 +957,6 @@ SetupItemSliderList::SetupItemSliderList(std::string text,
mOnTheFly(onTheFly)
{
mValueType = VSTR;
-// createControls();
}
SetupItemSliderList::~SetupItemSliderList()
@@ -1006,7 +1013,7 @@ void SetupItemSliderList::action(const gcn::ActionEvent &event A_UNUSED)
save();
}
-void SetupItemSliderList::apply(std::string eventName)
+void SetupItemSliderList::apply(const std::string &eventName)
{
if (eventName != mEventName)
return;
@@ -1015,10 +1022,11 @@ void SetupItemSliderList::apply(std::string eventName)
save();
}
-SetupItemSound::SetupItemSound(std::string text, std::string description,
- std::string keyName,
+SetupItemSound::SetupItemSound(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
gcn::ListModel *const model,
const int width, const bool onTheFly,
const bool mainConfig) :
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 2acf8a422..b3c0554d3 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -61,13 +61,13 @@ class SetupItem : public gcn::ActionListener,
VNONE
};
- SetupItem(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- 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 bool mainConfig);
- SetupItem(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, std::string def,
+ 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)
@@ -96,11 +96,11 @@ class SetupItem : public gcn::ActionListener,
virtual void action();
- virtual void apply(std::string eventName);
+ virtual void apply(const std::string &eventName);
- virtual void cancel(std::string eventName);
+ virtual void cancel(const std::string &eventName);
- virtual void externalUpdated(std::string eventName);
+ virtual void externalUpdated(const std::string &eventName);
bool isMainConfig() const A_WARN_UNUSED
{ return mMainConfig; }
@@ -138,13 +138,19 @@ class SetupItem : public gcn::ActionListener,
class SetupItemCheckBox final : public SetupItem
{
public:
- SetupItemCheckBox(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, const bool mainConfig = true);
+ SetupItemCheckBox(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ const bool mainConfig = true);
- SetupItemCheckBox(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, std::string def,
+ SetupItemCheckBox(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 = true);
A_DELETE_COPY(SetupItemCheckBox)
@@ -164,14 +170,19 @@ class SetupItemCheckBox final : public SetupItem
class SetupItemTextField final : public SetupItem
{
public:
- SetupItemTextField(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName,
+ SetupItemTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
const bool mainConfig = true);
- SetupItemTextField(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, std::string def,
+ SetupItemTextField(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 = true);
A_DELETE_COPY(SetupItemTextField)
@@ -186,7 +197,7 @@ class SetupItemTextField final : public SetupItem
void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName) override;
+ void apply(const std::string &eventName) override;
protected:
HorizontContainer *mHorizont;
@@ -199,19 +210,22 @@ class SetupItemTextField final : public SetupItem
class SetupItemIntTextField final : public SetupItem
{
public:
- SetupItemIntTextField(std::string text, std::string description,
- std::string keyName,
+ SetupItemIntTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
const bool mainConfig = true);
- SetupItemIntTextField(std::string text, std::string description,
- std::string keyName,
+ SetupItemIntTextField(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
SetupTabScroll *const parent,
- std::string eventName,
+ const std::string &eventName,
const int min, const int max,
- std::string def, const bool mainConfig = true);
+ const std::string &def,
+ const bool mainConfig = true);
A_DELETE_COPY(SetupItemIntTextField)
@@ -225,7 +239,7 @@ class SetupItemIntTextField final : public SetupItem
void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName) override;
+ void apply(const std::string &eventName) override;
protected:
HorizontContainer *mHorizont;
@@ -240,7 +254,8 @@ class SetupItemIntTextField final : public SetupItem
class SetupItemLabel final : public SetupItem
{
public:
- SetupItemLabel(std::string text, std::string description,
+ SetupItemLabel(const std::string &text,
+ const std::string &description,
SetupTabScroll *const parent,
const bool separator = true);
@@ -256,7 +271,7 @@ class SetupItemLabel final : public SetupItem
void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName) override;
+ void apply(const std::string &eventName) override;
protected:
Label *mLabel;
@@ -266,15 +281,21 @@ class SetupItemLabel final : public SetupItem
class SetupItemDropDown final : public SetupItem
{
public:
- SetupItemDropDown(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, gcn::ListModel *const model,
- int width, const bool mainConfig = true);
-
- SetupItemDropDown(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, gcn::ListModel *const model,
- int width, std::string def,
+ SetupItemDropDown(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ gcn::ListModel *const model,
+ const int width, const bool mainConfig = true);
+
+ SetupItemDropDown(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ gcn::ListModel *const model,
+ const int width, const std::string &def,
const bool mainConfig = true);
A_DELETE_COPY(SetupItemDropDown)
@@ -298,18 +319,22 @@ class SetupItemDropDown final : public SetupItem
class SetupItemSlider final : public SetupItem
{
public:
- SetupItemSlider(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName,
+ SetupItemSlider(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
const double min, const double max,
const int width = 150, const bool onTheFly = false,
const bool mainConfig = true);
- SetupItemSlider(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName,
+ SetupItemSlider(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
const double min, const double max,
- std::string def, const int width = 150,
+ const std::string &def, const int width = 150,
const bool onTheFly = false,
const bool mainConfig = true);
@@ -325,7 +350,7 @@ class SetupItemSlider final : public SetupItem
void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName);
+ void apply(const std::string &eventName) override;
void updateLabel();
@@ -346,18 +371,25 @@ typedef SetupItemNames::const_iterator SetupItemNamesConstIter;
class SetupItemSlider2 final : public SetupItem
{
public:
- SetupItemSlider2(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, const int min, const int max,
+ SetupItemSlider2(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ const int min, const int max,
SetupItemNames *const values,
const bool onTheFly = false,
const bool mainConfig = true,
const bool doNotAlign = false);
- SetupItemSlider2(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, const int min, const int max,
- SetupItemNames *const values, std::string def,
+ SetupItemSlider2(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ const int min, const int max,
+ SetupItemNames *const values,
+ const std::string &def,
const bool onTheFly = false,
const bool mainConfig = true,
const bool doNotAlign = false);
@@ -374,7 +406,7 @@ class SetupItemSlider2 final : public SetupItem
void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName) override;
+ void apply(const std::string &eventName) override;
void setInvertValue(const int v);
@@ -399,16 +431,22 @@ class SetupItemSlider2 final : public SetupItem
class SetupItemSliderList : public SetupItem
{
public:
- SetupItemSliderList(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, gcn::ListModel *const model,
+ SetupItemSliderList(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ gcn::ListModel *const model,
const int width = 150, const bool onTheFly = false,
const bool mainConfig = true);
- SetupItemSliderList(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, gcn::ListModel *const model,
- std::string def, const int width = 150,
+ SetupItemSliderList(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ gcn::ListModel *const model,
+ const std::string &def, const int width = 150,
const bool onTheFly = false,
const bool mainConfig = true);
@@ -424,7 +462,7 @@ class SetupItemSliderList : public SetupItem
virtual void action(const gcn::ActionEvent &event) override;
- void apply(std::string eventName) override;
+ void apply(const std::string &eventName) override;
virtual void addMoreControls() = 0;
@@ -440,10 +478,14 @@ class SetupItemSliderList : public SetupItem
class SetupItemSound final : public SetupItemSliderList
{
public:
- SetupItemSound(std::string text, std::string description,
- std::string keyName, SetupTabScroll *const parent,
- std::string eventName, gcn::ListModel *const model,
- const int width = 150, const bool onTheFly = false,
+ SetupItemSound(const std::string &text,
+ const std::string &description,
+ const std::string &keyName,
+ SetupTabScroll *const parent,
+ const std::string &eventName,
+ gcn::ListModel *const model,
+ const int width = 150,
+ const bool onTheFly = false,
const bool mainConfig = true);
A_DELETE_COPY(SetupItemSound)