summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:05:59 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:05:59 +0300
commite27d9f9295df3e5508737493425273e6d2191138 (patch)
tree90f7c486cbae669b2e4c899e1232ea7ee86d4ce7 /src
parent287f1e930a70163b9e20a320a7d8a66e0908ce2f (diff)
downloadplus-e27d9f9295df3e5508737493425273e6d2191138.tar.gz
plus-e27d9f9295df3e5508737493425273e6d2191138.tar.bz2
plus-e27d9f9295df3e5508737493425273e6d2191138.tar.xz
plus-e27d9f9295df3e5508737493425273e6d2191138.zip
Move gender.h into enums directory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/avatar.h2
-rw-r--r--src/being/being.h2
-rw-r--r--src/enums/being/gender.h (renamed from src/being/gender.h)6
-rw-r--r--src/gui/windows/charcreatedialog.h2
-rw-r--r--src/inventory.h2
-rw-r--r--src/net/ea/token.h2
-rw-r--r--src/net/logindata.h2
-rw-r--r--src/resources/iteminfo.h2
10 files changed, 12 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 859fbcc28..fdc3f45fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -851,7 +851,7 @@ SET(SRCS
being/compoundsprite.cpp
being/compoundsprite.h
being/cookingtype.h
- being/gender.h
+ enums/being/gender.h
being/homunculusinfo.h
listeners/configlistener.h
configuration.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 6aff611d9..21862ee6e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -973,7 +973,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/compoundsprite.cpp \
being/compoundsprite.h \
being/cookingtype.h \
- being/gender.h \
+ enums/being/gender.h \
being/homunculusinfo.h \
listeners/configlistener.h \
configuration.cpp \
diff --git a/src/avatar.h b/src/avatar.h
index 46a43863c..a8e690b29 100644
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -23,7 +23,7 @@
#ifndef AVATAR_H
#define AVATAR_H
-#include "being/gender.h"
+#include "enums/being/gender.h"
#include <string>
diff --git a/src/being/being.h b/src/being/being.h
index c99f5824d..548381ae4 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -29,9 +29,9 @@
#include "being/actorsprite.h"
#include "being/beingdirection.h"
-#include "being/gender.h"
#include "enums/being/beingaction.h"
+#include "enums/being/gender.h"
#include "listeners/configlistener.h"
diff --git a/src/being/gender.h b/src/enums/being/gender.h
index 14961059f..59fd7e304 100644
--- a/src/being/gender.h
+++ b/src/enums/being/gender.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_GENDER_H
-#define BEING_GENDER_H
+#ifndef ENUMS_BEING_GENDER_H
+#define ENUMS_BEING_GENDER_H
namespace Gender
{
@@ -34,4 +34,4 @@ namespace Gender
};
} // nemespace Gender
-#endif // BEING_GENDER_H
+#endif // ENUMS_BEING_GENDER_H
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 606233276..45555f869 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -23,7 +23,7 @@
#ifndef GUI_WINDOWS_CHARCREATEDIALOG_H
#define GUI_WINDOWS_CHARCREATEDIALOG_H
-#include "being/gender.h"
+#include "enums/being/gender.h"
#include "gui/widgets/window.h"
diff --git a/src/inventory.h b/src/inventory.h
index 12f4b2f2a..42ec86882 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -23,7 +23,7 @@
#ifndef INVENTORY_H
#define INVENTORY_H
-#include "being/gender.h"
+#include "enums/being/gender.h"
#include <list>
#include <string>
diff --git a/src/net/ea/token.h b/src/net/ea/token.h
index 10a0fbcb0..65368b6e2 100644
--- a/src/net/ea/token.h
+++ b/src/net/ea/token.h
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "being/gender.h"
+#include "enums/being/gender.h"
#ifndef NET_EA_TOKEN_H
#define NET_EA_TOKEN_H
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 9806d69d0..514b8fd6e 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -23,7 +23,7 @@
#ifndef NET_LOGINDATA_H
#define NET_LOGINDATA_H
-#include "being/gender.h"
+#include "enums/being/gender.h"
#include "enums/net/updatetype.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 39c4e3da0..78ecf13d3 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -23,7 +23,7 @@
#ifndef RESOURCES_ITEMINFO_H
#define RESOURCES_ITEMINFO_H
-#include "being/gender.h"
+#include "enums/being/gender.h"
#include "resources/cursor.h"
#include "resources/itemtype.h"