From 1695d0bde1fcdb75fb321d8ee1ad729f176a3bbd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 20 Jun 2016 23:02:02 +0300 Subject: Remove useless includes. --- src/gui/widgets/browserbox.cpp | 2 -- src/itemcolormanager.cpp | 2 -- src/net/eathena/beingrecv.cpp | 2 -- src/net/eathena/itemrecv.cpp | 2 -- src/net/eathena/partyrecv.cpp | 2 -- src/resources/db/colordb.cpp | 1 - src/resources/db/emotedb.cpp | 1 - src/resources/db/homunculusdb.cpp | 2 -- src/resources/db/horsedb.cpp | 1 - src/resources/db/itemdb.cpp | 1 - src/resources/db/itemfielddb.cpp | 1 - src/resources/db/mercenarydb.cpp | 2 -- src/resources/db/monsterdb.cpp | 2 -- src/resources/db/npcdb.cpp | 1 - src/resources/db/npcdialogdb.cpp | 1 - src/resources/db/palettedb.cpp | 1 - src/resources/db/petdb.cpp | 1 - src/resources/db/skillunitdb.cpp | 1 - src/resources/db/statuseffectdb.cpp | 1 - src/resources/loaders/atlasloader.cpp | 2 -- src/resources/loaders/emptyatlasloader.cpp | 2 -- src/resources/loaders/imageloader.cpp | 2 -- src/resources/loaders/imagesetloader.cpp | 2 -- src/resources/loaders/musicloader.cpp | 2 -- src/resources/loaders/rescaledloader.cpp | 2 -- src/resources/loaders/shaderloader.cpp | 2 -- src/resources/loaders/shaderprogramloader.cpp | 2 -- src/resources/loaders/subimageloader.cpp | 2 -- src/resources/loaders/walklayerloader.cpp | 1 - src/resources/mapreader.cpp | 1 - src/resources/resourcemanager/resourcemanager.cpp | 1 - src/resources/sprite/spritedef.cpp | 1 - src/soundmanager.cpp | 1 - src/utils/checkutils.h | 1 + src/utils/checkutils_unittest.cc | 2 -- src/utils/xml/pugixml.cpp | 2 -- 36 files changed, 1 insertion(+), 54 deletions(-) diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index a6d83f4d5..fe45e9ea0 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -27,8 +27,6 @@ #include "main.h" #include "settings.h" -#include "const/resources/item/cards.h" - #include "input/inputmanager.h" #include "gui/gui.h" diff --git a/src/itemcolormanager.cpp b/src/itemcolormanager.cpp index dc8d65afb..e1518e0b5 100644 --- a/src/itemcolormanager.cpp +++ b/src/itemcolormanager.cpp @@ -20,8 +20,6 @@ #include "itemcolormanager.h" -#include "const/resources/item/cards.h" - #include "resources/iteminfo.h" #include "resources/db/itemdb.h" diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 4a05c44dc..8f04c586a 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -31,8 +31,6 @@ #include "being/mercenaryinfo.h" -#include "const/resources/item/cards.h" - #include "enums/resources/notifytypes.h" #include "particle/particleengine.h" diff --git a/src/net/eathena/itemrecv.cpp b/src/net/eathena/itemrecv.cpp index 321109290..77fe5cd0c 100644 --- a/src/net/eathena/itemrecv.cpp +++ b/src/net/eathena/itemrecv.cpp @@ -26,8 +26,6 @@ #include "itemcolormanager.h" #include "logger.h" -#include "const/resources/item/cards.h" - #include "net/messagein.h" #include "debug.h" diff --git a/src/net/eathena/partyrecv.cpp b/src/net/eathena/partyrecv.cpp index 30918e120..4fdb37ef2 100644 --- a/src/net/eathena/partyrecv.cpp +++ b/src/net/eathena/partyrecv.cpp @@ -26,8 +26,6 @@ #include "being/localplayer.h" -#include "const/resources/item/cards.h" - #include "enums/resources/notifytypes.h" #include "gui/windows/chatwindow.h" diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 7f699f419..77f419529 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -22,7 +22,6 @@ #include "resources/db/colordb.h" #include "configuration.h" -#include "logger.h" #include "utils/checkutils.h" diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 77176fea3..f04251afa 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -22,7 +22,6 @@ #include "resources/db/emotedb.h" #include "client.h" -#include "logger.h" #include "configuration.h" diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index 294d04655..c01c4c2bf 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -22,8 +22,6 @@ #include "resources/db/homunculusdb.h" -#include "logger.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index fc1fffca2..701bfd2f9 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -22,7 +22,6 @@ #include "resources/db/horsedb.h" #include "configuration.h" -#include "logger.h" #include "resources/beingcommon.h" #include "resources/horseinfo.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 935455c9c..0421d7d88 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -25,7 +25,6 @@ #include "const/resources/map/map.h" #include "configuration.h" -#include "logger.h" #include "enums/resources/spritedirection.h" diff --git a/src/resources/db/itemfielddb.cpp b/src/resources/db/itemfielddb.cpp index 9c9897c2f..a90821bc1 100644 --- a/src/resources/db/itemfielddb.cpp +++ b/src/resources/db/itemfielddb.cpp @@ -21,7 +21,6 @@ #include "resources/db/itemfielddb.h" #include "configuration.h" -#include "logger.h" #include "utils/checkutils.h" #include "utils/dtor.h" diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 4fbc7e36c..7d481403c 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -22,8 +22,6 @@ #include "resources/db/mercenarydb.h" -#include "logger.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 8d7455fa5..f4196ec08 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -22,8 +22,6 @@ #include "resources/db/monsterdb.h" -#include "logger.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index cfde3495f..041306df8 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -23,7 +23,6 @@ #include "resources/db/npcdb.h" #include "configuration.h" -#include "logger.h" #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp index 848721879..e8ff02c11 100644 --- a/src/resources/db/npcdialogdb.cpp +++ b/src/resources/db/npcdialogdb.cpp @@ -21,7 +21,6 @@ #include "resources/db/npcdialogdb.h" #include "configuration.h" -#include "logger.h" #include "resources/beingcommon.h" #include "resources/npcdialoginfo.h" diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 1b7f97029..5602b007f 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -21,7 +21,6 @@ #include "resources/db/palettedb.h" #include "configuration.h" -#include "logger.h" #include "utils/checkutils.h" #include "utils/files.h" diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index b0ed0b544..c89d1bf65 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -23,7 +23,6 @@ #include "resources/db/petdb.h" #include "configuration.h" -#include "logger.h" #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp index 30f088331..6a742e230 100644 --- a/src/resources/db/skillunitdb.cpp +++ b/src/resources/db/skillunitdb.cpp @@ -23,7 +23,6 @@ #include "resources/db/skillunitdb.h" #include "configuration.h" -#include "logger.h" #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp index a87c6fa1f..256fbaf88 100644 --- a/src/resources/db/statuseffectdb.cpp +++ b/src/resources/db/statuseffectdb.cpp @@ -23,7 +23,6 @@ #include "resources/db/statuseffectdb.h" #include "configuration.h" -#include "logger.h" #include "settings.h" #include "statuseffect.h" diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp index d641e3bd4..4a0991c21 100644 --- a/src/resources/loaders/atlasloader.cpp +++ b/src/resources/loaders/atlasloader.cpp @@ -20,8 +20,6 @@ #ifdef USE_OPENGL -#include "logger.h" - #include "resources/atlas/atlasmanager.h" #include "resources/atlas/atlasresource.h" diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp index 9951e9f57..ca798d681 100644 --- a/src/resources/loaders/emptyatlasloader.cpp +++ b/src/resources/loaders/emptyatlasloader.cpp @@ -20,8 +20,6 @@ #ifdef USE_OPENGL -#include "logger.h" - #include "resources/atlas/atlasmanager.h" #include "resources/atlas/atlasresource.h" diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index f2d0d045d..15eac006f 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/imagehelper.h" #include "resources/image/image.h" diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 86b0263cb..47c4dcb45 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/imageset.h" #include "resources/image/image.h" diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 2751dbfae..837befcf9 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/sdlmusic.h" #include "resources/soundeffect.h" diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index 8909209a4..80400d728 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/image/image.h" #include "resources/loaders/rescaledloader.h" diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp index bd5c35dee..22138b98b 100644 --- a/src/resources/loaders/shaderloader.cpp +++ b/src/resources/loaders/shaderloader.cpp @@ -22,8 +22,6 @@ #ifdef USE_OPENGL -#include "logger.h" - #include "utils/checkutils.h" #include "render/shaders/shader.h" diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp index eeeedc868..d495c659e 100644 --- a/src/resources/loaders/shaderprogramloader.cpp +++ b/src/resources/loaders/shaderprogramloader.cpp @@ -22,8 +22,6 @@ #ifdef USE_OPENGL -#include "logger.h" - #include "utils/checkutils.h" #include "render/shaders/shaderprogram.h" diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index 9b0459e88..0be91e942 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/image/image.h" #include "resources/loaders/subimageloader.h" diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp index eb2b49826..e7ffa2275 100644 --- a/src/resources/loaders/walklayerloader.cpp +++ b/src/resources/loaders/walklayerloader.cpp @@ -22,7 +22,6 @@ #include "resources/resourcemanager/resourcemanager.h" -#include "logger.h" #include "navigationmanager.h" #include "resources/map/walklayer.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index d538f9a3a..9ede3db7a 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -26,7 +26,6 @@ #ifdef USE_OPENGL #include "graphicsmanager.h" #endif -#include "logger.h" #include "main.h" #include "const/resources/map/map.h" diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 9d915e30e..1e8b3cdb7 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -23,7 +23,6 @@ #include "resources/resourcemanager/resourcemanager.h" #include "configuration.h" -#include "logger.h" #ifdef USE_OPENGL #include "resources/image/image.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 7fa53a105..f46eebfba 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -23,7 +23,6 @@ #include "resources/sprite/spritedef.h" #include "configuration.h" -#include "logger.h" #include "settings.h" #include "const/resources/spriteaction.h" diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index c2f522d3e..88b2db2d0 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -23,7 +23,6 @@ #include "soundmanager.h" #include "configuration.h" -#include "logger.h" #ifndef DYECMD #include "being/localplayer.h" diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h index b780af587..a63b41762 100644 --- a/src/utils/checkutils.h +++ b/src/utils/checkutils.h @@ -22,6 +22,7 @@ #define UTILS_CHECKUTILS_H #include "logger.h" +LOGGER_H #ifdef ENABLE_ASSERTS diff --git a/src/utils/checkutils_unittest.cc b/src/utils/checkutils_unittest.cc index 39bb2a737..965891423 100644 --- a/src/utils/checkutils_unittest.cc +++ b/src/utils/checkutils_unittest.cc @@ -20,8 +20,6 @@ #include "catch.hpp" -#include "logger.h" - #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index fe1564f2b..d8795dd72 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -24,8 +24,6 @@ #include "utils/xml/pugixml.h" -#include "logger.h" - #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/fuzzer.h" -- cgit v1.2.3-70-g09d2