summaryrefslogtreecommitdiff
path: root/src
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
parente74f8dbf42c027cdd4c32cc66036e0f4758d28c3 (diff)
downloadplus-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.gz
plus-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.bz2
plus-dfa1c7026facc34fb9e153790c9f1522c7e5c816.tar.xz
plus-dfa1c7026facc34fb9e153790c9f1522c7e5c816.zip
Move notifyflags.h into enums directory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/resources/notifyflags.h (renamed from src/resources/notifyflags.h)6
-rw-r--r--src/resources/notificationinfo.h2
-rw-r--r--src/resources/notifications.h3
5 files changed, 8 insertions, 7 deletions
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/resources/notifyflags.h b/src/enums/resources/notifyflags.h
index cda588603..e86ee8741 100644
--- a/src/resources/notifyflags.h
+++ b/src/enums/resources/notifyflags.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_NOTIFYFLAGS_H
-#define RESOURCES_NOTIFYFLAGS_H
+#ifndef ENUMS_RESOURCES_NOTIFYFLAGS_H
+#define ENUMS_RESOURCES_NOTIFYFLAGS_H
#include "localconsts.h"
@@ -37,4 +37,4 @@ namespace NotifyFlags
SPEECH
};
} // namespace NotifyFlags
-#endif // RESOURCES_NOTIFYFLAGS_H
+#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"