From bb156df11431e3eb286ddd3311adf1ac710945e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 19:39:06 +0300 Subject: Remove some unneeded includes. --- src/actorspritemanager.cpp | 2 -- src/being.cpp | 1 - src/being.h | 1 - src/client.cpp | 2 -- src/compoundsprite.cpp | 3 ++- src/flooritem.cpp | 2 +- src/graphics.cpp | 1 - src/gui/ministatuswindow.h | 1 - src/guichanfwd.h | 6 ------ src/itemshortcut.cpp | 1 - src/localplayer.cpp | 5 ----- src/net/charhandler.h | 2 -- src/net/ea/playerhandler.cpp | 1 + src/net/playerhandler.h | 1 - src/net/tmwa/playerhandler.cpp | 1 + src/utils/stringutils.cpp | 2 -- 16 files changed, 5 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 89a592005..803a30e7e 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -31,8 +31,6 @@ #include "gui/chatwindow.h" #include "gui/equipmentwindow.h" -#include "gui/killstats.h" -#include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/viewport.h" diff --git a/src/being.cpp b/src/being.cpp index 92d01097b..47a74c7b2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -40,7 +40,6 @@ #include "sound.h" #include "sprite.h" #include "text.h" -#include "statuseffect.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/being.h b/src/being.h index a52963746..0b9257e83 100644 --- a/src/being.h +++ b/src/being.h @@ -27,7 +27,6 @@ #include "configlistener.h" #include "equipment.h" #include "map.h" -#include "particlecontainer.h" #include "position.h" #include "vector.h" diff --git a/src/client.cpp b/src/client.cpp index 023eb5353..a7825a835 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -69,7 +69,6 @@ #include "gui/worldselectdialog.h" #include "gui/widgets/button.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/desktop.h" #include "net/charhandler.h" @@ -80,7 +79,6 @@ #include "net/loginhandler.h" #include "net/net.h" #include "net/npchandler.h" -#include "net/packetcounters.h" #include "net/partyhandler.h" #include "net/worldinfo.h" diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 61fb3d4e0..62ef2d01c 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -24,11 +24,12 @@ #include "configuration.h" #include "game.h" #include "graphics.h" + #ifdef USE_OPENGL #include "openglgraphics.h" #include "opengl1graphics.h" #endif -#include "localplayer.h" + #include "map.h" #include "resources/image.h" diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 111019546..f126f336b 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -31,7 +31,7 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "net/net.h" +//#include "net/net.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/graphics.cpp b/src/graphics.cpp index 635cc6ab9..e98b1a283 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -24,7 +24,6 @@ #include "graphicsvertexes.h" #include "logger.h" -#include "map.h" #include "resources/image.h" #include "resources/imageloader.h" diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index ba2cf7b2d..eb6ded7dd 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -27,7 +27,6 @@ #include "listener.h" #include "gui/widgets/popup.h" -#include "gui/widgets/window.h" #include diff --git a/src/guichanfwd.h b/src/guichanfwd.h index b3808d8ba..7ccc221b4 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -27,11 +27,6 @@ namespace gcn { class ActionEvent; class ActionListener; - class AllegroFont; - class AllegroGraphics; - class AllegroImage; - class AllegroImageLoader; - class AllegroInput; class BasicContainer; class Button; class CheckBox; @@ -70,7 +65,6 @@ namespace gcn class MouseEvent; class MouseInput; class MouseListener; - class OpenGLAllegroImageLoader; class OpenGLGraphics; class OpenGLImage; class OpenGLSDLImageLoader; diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index f267dd755..fedb92257 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -24,7 +24,6 @@ #include "inventory.h" #include "item.h" #include "itemshortcut.h" -#include "localplayer.h" #include "playerinfo.h" #include "spellmanager.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01e8c1ae8..99108bd3a 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -41,21 +41,16 @@ #include "simpleanimation.h" #include "sound.h" #include "statuseffect.h" -#include "text.h" #include "dropshortcut.h" #include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" -#include "gui/killstats.h" #include "gui/ministatuswindow.h" #include "gui/okdialog.h" #include "gui/outfitwindow.h" -#include "gui/palette.h" #include "gui/shopwindow.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" -#include "gui/statuswindow.h" #include "gui/theme.h" #include "gui/userpalette.h" #include "gui/viewport.h" diff --git a/src/net/charhandler.h b/src/net/charhandler.h index 492e27e55..cee319719 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -26,8 +26,6 @@ #include "localplayer.h" #include "playerinfo.h" -#include "net/logindata.h" - #include #include diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 76a7b0dbc..27aa4da80 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,6 +22,7 @@ #include "net/ea/playerhandler.h" +#include "localplayer.h" #include "logger.h" #include "party.h" #include "playerinfo.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 6ae912102..aa5d2b793 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -25,7 +25,6 @@ #include "being.h" #include "flooritem.h" -#include "localplayer.h" namespace Net { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 16e833ec9..bfe9eea42 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -23,6 +23,7 @@ #include "net/tmwa/playerhandler.h" #include "configuration.h" +#include "client.h" #include "logger.h" #include "net/messagein.h" diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 5e7bf19a0..798690602 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -22,8 +22,6 @@ #include "utils/stringutils.h" -#include "configuration.h" - #include #include #include -- cgit v1.2.3-60-g2f50