summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 18:31:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 18:31:37 +0300
commit3839572c35941ef829ba1be6b70bc1a584a67a36 (patch)
treef1158c59f8c36001dcc4efc335235fe6f3b50bbc
parent1db4d18ed1c04548ce8414adfb4e7cf830b39279 (diff)
downloadManaVerse-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.gz
ManaVerse-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.bz2
ManaVerse-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.xz
ManaVerse-3839572c35941ef829ba1be6b70bc1a584a67a36.zip
Move beingaction.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/being.h8
-rw-r--r--src/enums/being/beingaction.h (renamed from src/being/beingaction.h)6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b47099ec9..a4ac5159d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -832,7 +832,7 @@ SET(SRCS
avatar.h
being/being.cpp
being/being.h
- being/beingaction.h
+ enums/being/beingaction.h
being/beingcacheentry.h
being/beingdirection.h
being/beingflag.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bcd74d67..eed8cadd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -954,7 +954,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
avatar.h \
being/being.cpp \
being/being.h \
- being/beingaction.h \
+ enums/being/beingaction.h \
being/beingcacheentry.h \
being/beingdirection.h \
being/beingflag.h \
diff --git a/src/being/being.h b/src/being/being.h
index 63bce313e..c99f5824d 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -27,13 +27,13 @@
#include "position.h"
-#include "listeners/configlistener.h"
-
-#include "being/beingaction.h"
+#include "being/actorsprite.h"
#include "being/beingdirection.h"
#include "being/gender.h"
-#include "being/actorsprite.h"
+#include "enums/being/beingaction.h"
+
+#include "listeners/configlistener.h"
#include <map>
diff --git a/src/being/beingaction.h b/src/enums/being/beingaction.h
index b800762a9..aa09ff68c 100644
--- a/src/being/beingaction.h
+++ b/src/enums/being/beingaction.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_BEINGACTION_H
-#define BEING_BEINGACTION_H
+#ifndef ENUMS_BEING_BEINGACTION_H
+#define ENUMS_BEING_BEINGACTION_H
namespace BeingAction
{
@@ -42,4 +42,4 @@ namespace BeingAction
};
} // namespace BeingAction
-#endif // BEING_BEINGACTION_H
+#endif // ENUMS_BEING_BEINGACTION_H