diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-24 15:55:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-24 15:56:56 +0300 |
commit | 500bcec44d40ee72873cf16d09c5a0b268825a41 (patch) | |
tree | 5c3c34e1b87a1f63bb6c4c73dacac24008b7e013 /src | |
parent | 351e16d2f290a5b30981b7beae87d5d8a1a30662 (diff) | |
download | mv-500bcec44d40ee72873cf16d09c5a0b268825a41.tar.gz mv-500bcec44d40ee72873cf16d09c5a0b268825a41.tar.bz2 mv-500bcec44d40ee72873cf16d09c5a0b268825a41.tar.xz mv-500bcec44d40ee72873cf16d09c5a0b268825a41.zip |
Move simpletypes.h into directory simpletypes.
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/being/playerinfo.h | 3 | ||||
-rw-r--r-- | src/enums/simpletypes/simpletypes.h (renamed from src/enums/simpletypes.h) | 6 | ||||
-rw-r--r-- | src/gui/dialogsmanager.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/dropdown.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/inttextfield.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/popuplist.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/skillinfo.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/window.h | 2 | ||||
-rw-r--r-- | src/input/inputactiondata.h | 2 | ||||
-rw-r--r-- | src/inventory.h | 3 | ||||
-rw-r--r-- | src/item.h | 2 | ||||
-rw-r--r-- | src/net/ea/inventoryitem.h | 2 | ||||
-rw-r--r-- | src/net/homunculushandler.h | 2 | ||||
-rw-r--r-- | src/net/mercenaryhandler.h | 2 | ||||
-rw-r--r-- | src/statuseffect.h | 2 | ||||
-rw-r--r-- | src/utils/xml.h | 2 |
18 files changed, 22 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a354fc7e..bd9afc6a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1054,8 +1054,8 @@ SET(SRCS soundmanager.h sprite.h enums/screendensity.h - enums/simpletypes.h enums/state.h + enums/simpletypes/simpletypes.h statuseffect.cpp statuseffect.h render/surfacegraphics.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 16797e1a9..9101b90b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1182,8 +1182,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ soundmanager.h \ sprite.h \ enums/screendensity.h \ - enums/simpletypes.h \ enums/state.h \ + enums/simpletypes/simpletypes.h \ statuseffect.cpp \ statuseffect.h \ render/surfacegraphics.cpp \ diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index e405dbe06..65e999968 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -25,9 +25,10 @@ #include "equipment.h" #include "enums/guildpositionflags.h" -#include "enums/simpletypes.h" #include "enums/state.h" +#include "enums/simpletypes/simpletypes.h" + #include <map> #ifdef EATHENA_SUPPORT #include <string> diff --git a/src/enums/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 3a0488684..2d5514d11 100644 --- a/src/enums/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ENUMS_SIMPLETYPES_H -#define ENUMS_SIMPLETYPES_H +#ifndef ENUMS_SIMPLETYPES_SIMPLETYPES_H +#define ENUMS_SIMPLETYPES_SIMPLETYPES_H #include "localconsts.h" @@ -69,4 +69,4 @@ defBoolEnum(UseResman); defBoolEnum(SkipError); defBoolEnum(UseArgs); -#endif // ENUMS_SIMPLETYPES_H +#endif // ENUMS_SIMPLETYPES_SIMPLETYPES_H diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h index ec4ce12a1..4f8780cb4 100644 --- a/src/gui/dialogsmanager.h +++ b/src/gui/dialogsmanager.h @@ -23,7 +23,7 @@ #ifndef GUI_DIALOGSMANAGER_H #define GUI_DIALOGSMANAGER_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "listeners/attributelistener.h" #include "listeners/playerdeathlistener.h" diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 391a49873..979ba024c 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_DROPDOWN_H #define GUI_WIDGETS_DROPDOWN_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "gui/widgets/basiccontainer.h" diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index 04f34b393..91fe7957d 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_INTTEXTFIELD_H #define GUI_WIDGETS_INTTEXTFIELD_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "gui/widgets/textfield.h" diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h index a15701d57..fa59107af 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -21,7 +21,7 @@ #ifndef GUI_WIDGETS_POPUPLIST_H #define GUI_WIDGETS_POPUPLIST_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "gui/widgets/popup.h" diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index 9cec3aa49..cfe571f37 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_SKILLINFO_H #define GUI_WIDGETS_SKILLINFO_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "gui/color.h" diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 83f88f726..a812e135a 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -66,7 +66,7 @@ #ifndef GUI_WIDGETS_WINDOW_H #define GUI_WIDGETS_WINDOW_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "listeners/mouselistener.h" #include "listeners/widgetlistener.h" diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h index dc2ada642..f85b8aee2 100644 --- a/src/input/inputactiondata.h +++ b/src/input/inputactiondata.h @@ -25,7 +25,7 @@ #include "actions/actionfuncptr.h" -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" struct InputActionData final { diff --git a/src/inventory.h b/src/inventory.h index 575ee9f55..7e2f63727 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -24,7 +24,8 @@ #define INVENTORY_H #include "enums/inventorytype.h" -#include "enums/simpletypes.h" + +#include "enums/simpletypes/simpletypes.h" #include "enums/being/gender.h" diff --git a/src/item.h b/src/item.h index 2b624d6ea..94af1ccdc 100644 --- a/src/item.h +++ b/src/item.h @@ -23,7 +23,7 @@ #ifndef ITEM_H #define ITEM_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include "resources/db/itemdb.h" diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index bd2d115cd..66abc1347 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -23,7 +23,7 @@ #ifndef NET_EA_INVENTORYITEM_H #define NET_EA_INVENTORYITEM_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #if defined(__GXX_EXPERIMENTAL_CXX0X__) #include <cstdint> diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h index 1d27afd1a..d26fc7b5d 100644 --- a/src/net/homunculushandler.h +++ b/src/net/homunculushandler.h @@ -23,7 +23,7 @@ #ifdef EATHENA_SUPPORT -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include <string> diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h index 104d7e8d2..1abd48aec 100644 --- a/src/net/mercenaryhandler.h +++ b/src/net/mercenaryhandler.h @@ -23,7 +23,7 @@ #ifdef EATHENA_SUPPORT -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include <string> diff --git a/src/statuseffect.h b/src/statuseffect.h index 1e20953bc..4af6e039f 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -23,7 +23,7 @@ #ifndef STATUSEFFECT_H #define STATUSEFFECT_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include <string> diff --git a/src/utils/xml.h b/src/utils/xml.h index fdefc1682..105ff19e1 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -23,7 +23,7 @@ #ifndef UTILS_XML_H #define UTILS_XML_H -#include "enums/simpletypes.h" +#include "enums/simpletypes/simpletypes.h" #include <libxml/tree.h> #include <libxml/xmlwriter.h> |