summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 16:03:16 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 16:03:43 +0300
commit410b960d2e3ac19df78b0f5ce42d4cef18c0df25 (patch)
treec127d750f2af8a783dcb48a77012fca5a2385b99
parentb3fb470b1c14f2ca7832531df1f99c9fd730c317 (diff)
downloadmv-410b960d2e3ac19df78b0f5ce42d4cef18c0df25.tar.gz
mv-410b960d2e3ac19df78b0f5ce42d4cef18c0df25.tar.bz2
mv-410b960d2e3ac19df78b0f5ce42d4cef18c0df25.tar.xz
mv-410b960d2e3ac19df78b0f5ce42d4cef18c0df25.zip
Move guildpositionflags.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/playerinfo.h2
-rw-r--r--src/enums/guildpositionflags.h (renamed from src/guildpositionflags.h)6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 752bc9fe6..c11d34c4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -884,7 +884,7 @@ SET(SRCS
guild.h
guildmanager.cpp
guildmanager.h
- guildpositionflags.h
+ enums/guildpositionflags.h
particle/imageparticle.cpp
particle/imageparticle.h
imagesprite.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 82d94ac2d..d186aa9e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1008,7 +1008,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
guild.h \
guildmanager.cpp \
guildmanager.h \
- guildpositionflags.h \
+ enums/guildpositionflags.h \
particle/imageparticle.cpp \
particle/imageparticle.h \
imagesprite.cpp \
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 298005ed5..c49326bb4 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -23,8 +23,8 @@
#define BEING_PLAYERINFO_H
#include "equipment.h"
-#include "guildpositionflags.h"
+#include "enums/guildpositionflags.h"
#include "enums/state.h"
#include <map>
diff --git a/src/guildpositionflags.h b/src/enums/guildpositionflags.h
index d88e602ad..c1967f701 100644
--- a/src/guildpositionflags.h
+++ b/src/enums/guildpositionflags.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUILDPOSITIONFLAGS_H
-#define GUILDPOSITIONFLAGS_H
+#ifndef ENUMS_GUILDPOSITIONFLAGS_H
+#define ENUMS_GUILDPOSITIONFLAGS_H
class Guild;
@@ -35,4 +35,4 @@ namespace GuildPositionFlags
};
}
-#endif // GUILDPOSITIONFLAGS_H
+#endif // ENUMS_GUILDPOSITIONFLAGS_H