summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-13 23:13:29 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-13 23:13:29 +0300
commitdfa1c7026facc34fb9e153790c9f1522c7e5c816 (patch)
tree874cee199ddc0dd124f7e85b37c16eeab2b2dadc /src/resources
parente74f8dbf42c027cdd4c32cc66036e0f4758d28c3 (diff)
downloadmv-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.gz
mv-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.bz2
mv-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.xz
mv-dfa1c7026facc34fb9e153790c9f1522c7e5c816.zip
Move notifyflags.h into enums directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/notificationinfo.h2
-rw-r--r--src/resources/notifications.h3
-rw-r--r--src/resources/notifyflags.h40
3 files changed, 3 insertions, 42 deletions
diff --git a/src/resources/notificationinfo.h b/src/resources/notificationinfo.h
index 9df5630f6..4ea05b1ca 100644
--- a/src/resources/notificationinfo.h
+++ b/src/resources/notificationinfo.h
@@ -23,7 +23,7 @@
#include "localconsts.h"
-#include "resources/notifyflags.h"
+#include "enums/resources/notifyflags.h"
struct NotificationInfo final
{
diff --git a/src/resources/notifications.h b/src/resources/notifications.h
index 447968bc7..c5f8a12be 100644
--- a/src/resources/notifications.h
+++ b/src/resources/notifications.h
@@ -23,8 +23,9 @@
#include "localconsts.h"
+#include "enums/resources/notifyflags.h"
+
#include "resources/notificationinfo.h"
-#include "resources/notifyflags.h"
#include "utils/gettext.h"
diff --git a/src/resources/notifyflags.h b/src/resources/notifyflags.h
deleted file mode 100644
index cda588603..000000000
--- a/src/resources/notifyflags.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2013-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_NOTIFYFLAGS_H
-#define RESOURCES_NOTIFYFLAGS_H
-
-#include "localconsts.h"
-
-namespace NotifyFlags
-{
- enum Type
- {
- EMPTY = 0,
- INT,
- STRING,
- GUILD,
- GUILD_STRING,
- PARTY,
- PARTY_STRING,
- SPEECH
- };
-} // namespace NotifyFlags
-#endif // RESOURCES_NOTIFYFLAGS_H