summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 23:21:58 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 23:21:58 +0300
commit4dbd8c4f4b97a9d65e407151773f65ee1f9dbae7 (patch)
treea12a54012a467b427d44ee031f606d77471a4978
parent4672d4cbf51156d3225110aa9bf47703df68fe49 (diff)
downloadplus-4dbd8c4f4b97a9d65e407151773f65ee1f9dbae7.tar.gz
plus-4dbd8c4f4b97a9d65e407151773f65ee1f9dbae7.tar.bz2
plus-4dbd8c4f4b97a9d65e407151773f65ee1f9dbae7.tar.xz
plus-4dbd8c4f4b97a9d65e407151773f65ee1f9dbae7.zip
move bools in setupitem.
-rw-r--r--src/gui/widgets/setupitem.cpp24
-rw-r--r--src/gui/widgets/setupitem.h12
2 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 8be7dd520..b681824c8 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -56,13 +56,13 @@ SetupItem::SetupItem(const std::string &text, const std::string &description,
mKeyName(keyName),
mParent(parent),
mEventName(eventName),
- mMainConfig(mainConfig),
- mUseDefault(false),
mValue(),
mDefault(),
mWidget(nullptr),
mTempWidgets(),
- mValueType(VBOOL)
+ mValueType(VBOOL),
+ mMainConfig(mainConfig),
+ mUseDefault(false)
{
}
@@ -77,13 +77,13 @@ SetupItem::SetupItem(const std::string &text, const std::string &description,
mKeyName(keyName),
mParent(parent),
mEventName(eventName),
- mMainConfig(mainConfig),
- mUseDefault(true),
mValue(),
mDefault(def),
mWidget(nullptr),
mTempWidgets(),
- mValueType(VBOOL)
+ mValueType(VBOOL),
+ mMainConfig(mainConfig),
+ mUseDefault(true)
{
}
@@ -377,9 +377,9 @@ SetupItemIntTextField::SetupItemIntTextField(const std::string &text,
mLabel(nullptr),
mTextField(nullptr),
mButton(nullptr),
+ mEditDialog(nullptr),
mMin(min),
- mMax(max),
- mEditDialog(nullptr)
+ mMax(max)
{
mValueType = VSTR;
createControls();
@@ -398,9 +398,9 @@ SetupItemIntTextField::SetupItemIntTextField(const std::string &text,
mLabel(nullptr),
mTextField(nullptr),
mButton(nullptr),
+ mEditDialog(nullptr),
mMin(min),
- mMax(max),
- mEditDialog(nullptr)
+ mMax(max)
{
mValueType = VSTR;
createControls();
@@ -763,8 +763,8 @@ SetupItemSlider2::SetupItemSlider2(const std::string &text,
mValues(values),
mMin(min),
mMax(max),
- mInvert(false),
mInvertValue(0),
+ mInvert(false),
mOnTheFly(onTheFly),
mDoNotAlign(doNotAlign)
{
@@ -790,8 +790,8 @@ SetupItemSlider2::SetupItemSlider2(const std::string &text,
mValues(values),
mMin(min),
mMax(max),
- mInvert(false),
mInvertValue(0),
+ mInvert(false),
mOnTheFly(onTheFly),
mDoNotAlign(doNotAlign)
{
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index b3c0554d3..97c6006ce 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -120,10 +120,6 @@ class SetupItem : public gcn::ActionListener,
std::string mEventName;
- bool mMainConfig;
-
- bool mUseDefault;
-
std::string mValue;
std::string mDefault;
@@ -133,6 +129,10 @@ class SetupItem : public gcn::ActionListener,
std::list<gcn::Widget*> mTempWidgets;
int mValueType;
+
+ bool mMainConfig;
+
+ bool mUseDefault;
};
class SetupItemCheckBox final : public SetupItem
@@ -246,9 +246,9 @@ class SetupItemIntTextField final : public SetupItem
Label *mLabel;
IntTextField *mTextField;
Button *mButton;
+ EditDialog *mEditDialog;
int mMin;
int mMax;
- EditDialog *mEditDialog;
};
class SetupItemLabel final : public SetupItem
@@ -422,8 +422,8 @@ class SetupItemSlider2 final : public SetupItem
SetupItemNames *mValues;
int mMin;
int mMax;
- bool mInvert;
int mInvertValue;
+ bool mInvert;
bool mOnTheFly;
bool mDoNotAlign;
};