summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:39:38 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:39:38 +0300
commitb796051dc7ec88e1982ffbb2e488e908d839c1ef (patch)
treed45f18e40fa679d0218cfeef2ac373650680ce8f
parent265f242ad32e000907a3426bd1c3b9628acfab5e (diff)
downloadmv-b796051dc7ec88e1982ffbb2e488e908d839c1ef.tar.gz
mv-b796051dc7ec88e1982ffbb2e488e908d839c1ef.tar.bz2
mv-b796051dc7ec88e1982ffbb2e488e908d839c1ef.tar.xz
mv-b796051dc7ec88e1982ffbb2e488e908d839c1ef.zip
Move rank.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/being/rank.h (renamed from src/being/rank.h)6
-rw-r--r--src/net/beinghandler.h3
4 files changed, 7 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45241fac7..89bdd6b38 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1020,7 +1020,7 @@ SET(SRCS
being/playerrelation.h
being/playerrelations.cpp
being/playerrelations.h
- being/rank.h
+ enums/being/rank.h
enums/being/targetcursorsize.h
enums/being/targetcursortype.h
listeners/playerrelationslistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d6906b4f..0658cf8c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1140,7 +1140,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/playerrelation.h \
being/playerrelations.cpp \
being/playerrelations.h \
- being/rank.h \
+ enums/being/rank.h \
enums/being/targetcursorsize.h \
enums/being/targetcursortype.h \
listeners/playerrelationslistener.h \
diff --git a/src/being/rank.h b/src/enums/being/rank.h
index d05704d47..7e27ba473 100644
--- a/src/being/rank.h
+++ b/src/enums/being/rank.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_RANK_H
-#define BEING_RANK_H
+#ifndef ENUMS_BEING_RANK_H
+#define ENUMS_BEING_RANK_H
namespace Rank
{
@@ -32,4 +32,4 @@ namespace Rank
};
} // namespace Rank
-#endif // BEING_RANK_H
+#endif // ENUMS_BEING_RANK_H
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 9974a4d61..ffbe31176 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -23,7 +23,8 @@
#define NET_BEINGHANDLER_H
#include "being/being.h"
-#include "being/rank.h"
+
+#include "enums/being/rank.h"
#include "net/messagein.h"