summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 17:22:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 17:22:27 +0300
commitff7aeb6fb2b38d0a18defd06c2787a0784bc7d62 (patch)
treec741ac43ac6fdf3f7bc230f1b4d53f0fb62907e8
parent7e440636ffadd3e4288a23a91dcac3872f4ea310 (diff)
downloadplus-ff7aeb6fb2b38d0a18defd06c2787a0784bc7d62.tar.gz
plus-ff7aeb6fb2b38d0a18defd06c2787a0784bc7d62.tar.bz2
plus-ff7aeb6fb2b38d0a18defd06c2787a0784bc7d62.tar.xz
plus-ff7aeb6fb2b38d0a18defd06c2787a0784bc7d62.zip
Move type Notify into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/playerinfo.h1
-rw-r--r--src/enums/simpletypes/notify.h28
-rw-r--r--src/enums/simpletypes/simpletypes.h1
-rw-r--r--src/net/playerhandler.h2
6 files changed, 33 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f048649f..0e74b937a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1061,6 +1061,7 @@ SET(SRCS
enums/simpletypes/favorite.h
enums/simpletypes/identified.h
enums/simpletypes/modal.h
+ enums/simpletypes/notify.h
enums/simpletypes/showcenter.h
enums/simpletypes/simpledefines.h
enums/simpletypes/simpletypes.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 40436ce58..8f042476f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1189,6 +1189,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
enums/simpletypes/favorite.h \
enums/simpletypes/identified.h \
enums/simpletypes/modal.h \
+ enums/simpletypes/notify.h \
enums/simpletypes/showcenter.h \
enums/simpletypes/simpledefines.h \
enums/simpletypes/simpletypes.h \
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 65e999968..295df904b 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -27,6 +27,7 @@
#include "enums/guildpositionflags.h"
#include "enums/state.h"
+#include "enums/simpletypes/notify.h"
#include "enums/simpletypes/simpletypes.h"
#include <map>
diff --git a/src/enums/simpletypes/notify.h b/src/enums/simpletypes/notify.h
new file mode 100644
index 000000000..c72043b24
--- /dev/null
+++ b/src/enums/simpletypes/notify.h
@@ -0,0 +1,28 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 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_SIMPLETYPES_NOTIFY_H
+#define ENUMS_SIMPLETYPES_NOTIFY_H
+
+#include "enums/simpletypes/simpledefines.h"
+
+defBoolEnum(Notify);
+
+#endif // ENUMS_SIMPLETYPES_NOTIFY_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 8d5f3189b..6e8bebb3a 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -25,7 +25,6 @@
#include "localconsts.h"
-defBoolEnum(Notify);
defBoolEnum(Trading);
defBoolEnum(Sfx);
defBoolEnum(Keep);
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 85a159db5..657791340 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -27,6 +27,8 @@
#include "enums/being/beingaction.h"
+#include "enums/simpletypes/notify.h"
+
#include "net/messagein.h"
namespace Net