diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 01:19:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 01:19:10 +0300 |
| commit | f57b683f8f9909ba7787c33a4953869a2ce04a5c (patch) | |
| tree | f48cbefcebeebd4820e1aed4bed3b9f520486ba5 | |
| parent | b42cc5c01d3bdd274d9b9e90aad574d865c4e67a (diff) | |
| download | mv-f57b683f8f9909ba7787c33a4953869a2ce04a5c.tar.gz mv-f57b683f8f9909ba7787c33a4953869a2ce04a5c.tar.bz2 mv-f57b683f8f9909ba7787c33a4953869a2ce04a5c.tar.xz mv-f57b683f8f9909ba7787c33a4953869a2ce04a5c.zip | |
Convert DialogType enum into strong typed enum.
| -rw-r--r-- | src/enums/gui/dialogtype.h | 14 | ||||
| -rw-r--r-- | src/gui/windows/okdialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/okdialog.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/enums/gui/dialogtype.h b/src/enums/gui/dialogtype.h index 3a801c8eb..08e1a7ded 100644 --- a/src/enums/gui/dialogtype.h +++ b/src/enums/gui/dialogtype.h @@ -23,16 +23,16 @@ #ifndef ENUMS_GUI_DIALOGTYPE_H #define ENUMS_GUI_DIALOGTYPE_H +#include "enums/simpletypes/enumdefines.h" + #undef ERROR -namespace DialogType +enumStart(DialogType) { - enum Type - { - OK = 0, - ERROR, - SILENCE - }; + OK = 0, + ERROR, + SILENCE } +enumEnd(DialogType); #endif // ENUMS_GUI_DIALOGTYPE_H diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index cdd73acc6..25a440b85 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -25,8 +25,6 @@ #include "soundconsts.h" #include "soundmanager.h" -#include "enums/gui/dialogtype.h" - #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" @@ -37,7 +35,7 @@ OkDialog::OkDialog(const std::string &restrict title, const std::string &restrict msg, const std::string &restrict button, - const int soundEvent, + const DialogTypeT soundEvent, const Modal modal, const ShowCenter showCenter, Window *const parent, diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 32c3c3131..6f16cc345 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -25,6 +25,8 @@ #include "gui/widgets/window.h" +#include "enums/gui/dialogtype.h" + #include "enums/simpletypes/showcenter.h" #include "listeners/actionlistener.h" @@ -50,7 +52,7 @@ class OkDialog final : public Window, OkDialog(const std::string &restrict title, const std::string &restrict msg, const std::string &restrict button, - const int soundEvent, + const DialogTypeT soundEvent, const Modal modal, const ShowCenter showCenter, Window *const parent, |