From ec9116cd7f52e61afc4267b21e35325f4e7fc705 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 31 Oct 2015 22:26:28 +0300 Subject: Add strong typed bool enum separator. --- src/gui/widgets/setupitem.cpp | 4 ++-- src/gui/widgets/setupitem.h | 5 +++-- src/gui/widgets/tabs/setup_mods.cpp | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 6e9e2bf96..94e6231f9 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -576,7 +576,7 @@ void SetupItemIntTextField::apply(const std::string &eventName) SetupItemLabel::SetupItemLabel(const std::string &restrict text, const std::string &restrict description, SetupTabScroll *restrict const parent, - const bool separator) : + const Separator separator) : SetupItem(text, description, "", parent, "", "", MainConfig_true), mLabel(nullptr), mIsSeparator(separator) @@ -593,7 +593,7 @@ SetupItemLabel::~SetupItemLabel() void SetupItemLabel::createControls() { - if (mIsSeparator) + if (mIsSeparator == Separator_true) { const std::string str(" \342\200\225\342\200\225\342\200\225" "\342\200\225\342\200\225 "); diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 80b7658ba..0d817a4b4 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -23,6 +23,7 @@ #include "enums/simpletypes/mainconfig.h" #include "enums/simpletypes/usebase64.h" +#include "enums/simpletypes/separator.h" #include "gui/widgets/widget2.h" @@ -284,7 +285,7 @@ class SetupItemLabel final : public SetupItem SetupItemLabel(const std::string &restrict text, const std::string &restrict description, SetupTabScroll *restrict const parent, - const bool separator = true); + const Separator separator = Separator_true); A_DELETE_COPY(SetupItemLabel) @@ -302,7 +303,7 @@ class SetupItemLabel final : public SetupItem protected: Label *mLabel; - bool mIsSeparator; + Separator mIsSeparator; }; class SetupItemDropDown final : public SetupItem diff --git a/src/gui/widgets/tabs/setup_mods.cpp b/src/gui/widgets/tabs/setup_mods.cpp index 71d1a865a..538555d04 100644 --- a/src/gui/widgets/tabs/setup_mods.cpp +++ b/src/gui/widgets/tabs/setup_mods.cpp @@ -74,7 +74,8 @@ void Setup_Mods::loadMods() if (mods.empty()) { // TRANSLATORS: settings label - new SetupItemLabel(_("No mods present"), "", this, false); + new SetupItemLabel(_("No mods present"), "", this, + Separator_false); return; } -- cgit v1.2.3-60-g2f50