From 86ecec8fd98eb7fa1326a58c0f97e6fc89d36ad6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 20:53:13 +0300 Subject: Remove simpletypes.h. --- src/CMakeLists.txt | 1 - src/Makefile.am | 1 - src/being/playerinfo.h | 1 - src/enums/simpletypes/simpletypes.h | 28 ---------------------------- src/gui/dialogsmanager.h | 1 - src/gui/widgets/dropdown.h | 1 - src/gui/widgets/inttextfield.h | 1 - src/gui/widgets/popuplist.h | 1 - src/gui/widgets/skillinfo.h | 1 - src/gui/widgets/window.h | 1 - src/inventory.h | 1 - src/item.h | 1 - src/net/ea/inventoryitem.h | 1 - src/net/homunculushandler.h | 1 - src/net/mercenaryhandler.h | 1 - src/statuseffect.h | 1 - src/utils/xml.h | 1 - 17 files changed, 44 deletions(-) delete mode 100644 src/enums/simpletypes/simpletypes.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 83d2061a8..89fe7f666 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1072,7 +1072,6 @@ SET(SRCS enums/simpletypes/sfx.h enums/simpletypes/showcenter.h enums/simpletypes/simpledefines.h - enums/simpletypes/simpletypes.h enums/simpletypes/skiperror.h enums/simpletypes/trading.h enums/simpletypes/useargs.h diff --git a/src/Makefile.am b/src/Makefile.am index 601c17dd5..b138ecf09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1200,7 +1200,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/sfx.h \ enums/simpletypes/showcenter.h \ enums/simpletypes/simpledefines.h \ - enums/simpletypes/simpletypes.h \ enums/simpletypes/skiperror.h \ enums/simpletypes/trading.h \ enums/simpletypes/useargs.h \ diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index 35436d694..00421918b 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -30,7 +30,6 @@ #include "enums/simpletypes/keep.h" #include "enums/simpletypes/notify.h" #include "enums/simpletypes/sfx.h" -#include "enums/simpletypes/simpletypes.h" #include "enums/simpletypes/trading.h" #include diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h deleted file mode 100644 index a34465232..000000000 --- a/src/enums/simpletypes/simpletypes.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef ENUMS_SIMPLETYPES_SIMPLETYPES_H -#define ENUMS_SIMPLETYPES_SIMPLETYPES_H - -#include "enums/simpletypes/simpledefines.h" - -#include "localconsts.h" - -#endif // ENUMS_SIMPLETYPES_SIMPLETYPES_H diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h index d7b68585f..34f8c8e40 100644 --- a/src/gui/dialogsmanager.h +++ b/src/gui/dialogsmanager.h @@ -25,7 +25,6 @@ #include "enums/simpletypes/modal.h" #include "enums/simpletypes/showcenter.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 2e5c32300..7f101e3e6 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -24,7 +24,6 @@ #define GUI_WIDGETS_DROPDOWN_H #include "enums/simpletypes/modal.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 6f7eeff89..89149c351 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -24,7 +24,6 @@ #define GUI_WIDGETS_INTTEXTFIELD_H #include "enums/simpletypes/enable.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 7158b1943..70faff0f8 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -22,7 +22,6 @@ #define GUI_WIDGETS_POPUPLIST_H #include "enums/simpletypes/modal.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 d97be7953..8919ed30a 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -24,7 +24,6 @@ #define GUI_WIDGETS_SKILLINFO_H #include "enums/simpletypes/modifiable.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 904a7914a..77eac4a5d 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -67,7 +67,6 @@ #define GUI_WIDGETS_WINDOW_H #include "enums/simpletypes/modal.h" -#include "enums/simpletypes/simpletypes.h" #include "listeners/mouselistener.h" #include "listeners/widgetlistener.h" diff --git a/src/inventory.h b/src/inventory.h index c54e001d3..4bde1a3da 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -30,7 +30,6 @@ #include "enums/simpletypes/equipped.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" -#include "enums/simpletypes/simpletypes.h" #include "enums/being/gender.h" diff --git a/src/item.h b/src/item.h index 5930360cb..f14258321 100644 --- a/src/item.h +++ b/src/item.h @@ -28,7 +28,6 @@ #include "enums/simpletypes/equipped.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.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 66abc1347..792de4391 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -23,7 +23,6 @@ #ifndef NET_EA_INVENTORYITEM_H #define NET_EA_INVENTORYITEM_H -#include "enums/simpletypes/simpletypes.h" #if defined(__GXX_EXPERIMENTAL_CXX0X__) #include diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h index 62e8615f3..c63ed8bba 100644 --- a/src/net/homunculushandler.h +++ b/src/net/homunculushandler.h @@ -24,7 +24,6 @@ #ifdef EATHENA_SUPPORT #include "enums/simpletypes/keep.h" -#include "enums/simpletypes/simpletypes.h" #include diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h index a61313c37..5c1517975 100644 --- a/src/net/mercenaryhandler.h +++ b/src/net/mercenaryhandler.h @@ -24,7 +24,6 @@ #ifdef EATHENA_SUPPORT #include "enums/simpletypes/keep.h" -#include "enums/simpletypes/simpletypes.h" #include diff --git a/src/statuseffect.h b/src/statuseffect.h index 4f1c57733..98ca18802 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -24,7 +24,6 @@ #define STATUSEFFECT_H #include "enums/simpletypes/enable.h" -#include "enums/simpletypes/simpletypes.h" #include diff --git a/src/utils/xml.h b/src/utils/xml.h index b96289b54..81d9bf2fa 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -23,7 +23,6 @@ #ifndef UTILS_XML_H #define UTILS_XML_H -#include "enums/simpletypes/simpletypes.h" #include "enums/simpletypes/skiperror.h" #include "enums/simpletypes/useresman.h" -- cgit v1.2.3-70-g09d2