summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-03 17:31:18 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-03 17:31:18 +0300
commitbcd76117e26e72ed74f9b8c2856a7128e1c27441 (patch)
tree0275b1652c31ca4ac3d013f4f11a2de0cd5b587e /src
parent0bdaa773a4ee5a678c400a1b097190e3856ee5a6 (diff)
downloadmv-bcd76117e26e72ed74f9b8c2856a7128e1c27441.tar.gz
mv-bcd76117e26e72ed74f9b8c2856a7128e1c27441.tar.bz2
mv-bcd76117e26e72ed74f9b8c2856a7128e1c27441.tar.xz
mv-bcd76117e26e72ed74f9b8c2856a7128e1c27441.zip
Convert NotifyFlags enum into strong typed enum.
Diffstat (limited to 'src')
-rw-r--r--src/enums/resources/notifyflags.h27
-rw-r--r--src/resources/notificationinfo.h4
2 files changed, 15 insertions, 16 deletions
diff --git a/src/enums/resources/notifyflags.h b/src/enums/resources/notifyflags.h
index e86ee8741..ea2ddd41a 100644
--- a/src/enums/resources/notifyflags.h
+++ b/src/enums/resources/notifyflags.h
@@ -21,20 +21,19 @@
#ifndef ENUMS_RESOURCES_NOTIFYFLAGS_H
#define ENUMS_RESOURCES_NOTIFYFLAGS_H
-#include "localconsts.h"
+#include "enums/simpletypes/enumdefines.h"
-namespace NotifyFlags
+enumStart(NotifyFlags)
{
- enum Type
- {
- EMPTY = 0,
- INT,
- STRING,
- GUILD,
- GUILD_STRING,
- PARTY,
- PARTY_STRING,
- SPEECH
- };
-} // namespace NotifyFlags
+ EMPTY = 0,
+ INT,
+ STRING,
+ GUILD,
+ GUILD_STRING,
+ PARTY,
+ PARTY_STRING,
+ SPEECH
+}
+enumEnd(NotifyFlags);
+
#endif // ENUMS_RESOURCES_NOTIFYFLAGS_H
diff --git a/src/resources/notificationinfo.h b/src/resources/notificationinfo.h
index 4ea05b1ca..b7bb8b8a4 100644
--- a/src/resources/notificationinfo.h
+++ b/src/resources/notificationinfo.h
@@ -30,7 +30,7 @@ struct NotificationInfo final
#ifdef ADVGCC
NotificationInfo(const char *const sound0,
const char *const text0,
- const NotifyFlags::Type flags0) :
+ const NotifyFlagsT flags0) :
sound(sound0),
text(text0),
flags(flags0)
@@ -41,7 +41,7 @@ struct NotificationInfo final
const char *sound;
const char *text;
- const NotifyFlags::Type flags;
+ const NotifyFlagsT flags;
};
#endif // RESOURCES_NOTIFICATIONINFO_H