From dfa1c7026facc34fb9e153790c9f1522c7e5c816 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 13 Jan 2015 23:13:29 +0300
Subject: Move notifyflags.h into enums directory.
---
src/CMakeLists.txt | 2 +-
src/Makefile.am | 2 +-
src/enums/resources/notifyflags.h | 40 +++++++++++++++++++++++++++++++++++++++
src/resources/notificationinfo.h | 2 +-
src/resources/notifications.h | 3 ++-
src/resources/notifyflags.h | 40 ---------------------------------------
6 files changed, 45 insertions(+), 44 deletions(-)
create mode 100644 src/enums/resources/notifyflags.h
delete mode 100644 src/resources/notifyflags.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2c7568ba..7fa11260f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -663,7 +663,7 @@ SET(SRCS
resources/modinfo.h
resources/notificationinfo.h
resources/notifications.h
- resources/notifyflags.h
+ enums/resources/notifyflags.h
resources/notifytypes.h
resources/db/monsterdb.cpp
resources/db/monsterdb.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 439ef8a06..14903e063 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -790,7 +790,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/modinfo.h \
resources/notificationinfo.h \
resources/notifications.h \
- resources/notifyflags.h \
+ enums/resources/notifyflags.h \
resources/notifytypes.h \
resources/db/monsterdb.cpp \
resources/db/monsterdb.h \
diff --git a/src/enums/resources/notifyflags.h b/src/enums/resources/notifyflags.h
new file mode 100644
index 000000000..e86ee8741
--- /dev/null
+++ b/src/enums/resources/notifyflags.h
@@ -0,0 +1,40 @@
+/*
+ * 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 ENUMS_RESOURCES_NOTIFYFLAGS_H
+#define ENUMS_RESOURCES_NOTIFYFLAGS_H
+
+#include "localconsts.h"
+
+namespace NotifyFlags
+{
+ enum Type
+ {
+ EMPTY = 0,
+ INT,
+ STRING,
+ GUILD,
+ GUILD_STRING,
+ PARTY,
+ PARTY_STRING,
+ SPEECH
+ };
+} // namespace NotifyFlags
+#endif // ENUMS_RESOURCES_NOTIFYFLAGS_H
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
--
cgit v1.2.3-70-g09d2