summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:33:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:33:17 +0300
commit58141a0e9ee3c313507a37974e4cf8286b128608 (patch)
tree01f457961d58cae0efd8d1d0e9e5059bb7446332
parentbc563aeba29a9035ab55df0aeeb4032b1a555e71 (diff)
downloadplus-58141a0e9ee3c313507a37974e4cf8286b128608.tar.gz
plus-58141a0e9ee3c313507a37974e4cf8286b128608.tar.bz2
plus-58141a0e9ee3c313507a37974e4cf8286b128608.tar.xz
plus-58141a0e9ee3c313507a37974e4cf8286b128608.zip
Move beingdirection into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/being.h2
-rw-r--r--src/enums/being/beingdirection.h (renamed from src/being/beingdirection.h)6
-rw-r--r--src/gui/windows/chatwindow.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b2e18f87..7c47aa32c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -834,7 +834,7 @@ SET(SRCS
being/being.h
enums/being/beingaction.h
being/beingcacheentry.h
- being/beingdirection.h
+ enums/being/beingdirection.h
being/beingflag.h
being/beingspeech.h
beingequipbackend.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c9bf28c1..aadd758a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -956,7 +956,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/being.h \
enums/being/beingaction.h \
being/beingcacheentry.h \
- being/beingdirection.h \
+ enums/being/beingdirection.h \
being/beingflag.h \
being/beingspeech.h \
beingequipbackend.cpp \
diff --git a/src/being/being.h b/src/being/being.h
index 548381ae4..6b8a4dd52 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -28,9 +28,9 @@
#include "position.h"
#include "being/actorsprite.h"
-#include "being/beingdirection.h"
#include "enums/being/beingaction.h"
+#include "enums/being/beingdirection.h"
#include "enums/being/gender.h"
#include "listeners/configlistener.h"
diff --git a/src/being/beingdirection.h b/src/enums/being/beingdirection.h
index eda7e2abb..73c95d675 100644
--- a/src/being/beingdirection.h
+++ b/src/enums/being/beingdirection.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_BEINGDIRECTION_H
-#define BEING_BEINGDIRECTION_H
+#ifndef ENUMS_BEING_BEINGDIRECTION_H
+#define ENUMS_BEING_BEINGDIRECTION_H
namespace BeingDirection
{
@@ -37,4 +37,4 @@ namespace BeingDirection
};
} // namespace BeingDirection
-#endif // BEING_BEINGDIRECTION_H
+#endif // ENUMS_BEING_BEINGDIRECTION_H
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 7891a7292..7287410d9 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -23,7 +23,7 @@
#ifndef GUI_WINDOWS_CHATWINDOW_H
#define GUI_WINDOWS_CHATWINDOW_H
-#include "being/beingdirection.h"
+#include "enums/being/beingdirection.h"
#include "enums/gui/chatmsgtype.h"