diff options
31 files changed, 16 insertions, 111 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index 19be0d8f8..45b743b79 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -25,6 +25,7 @@ #include "client.h" #include "configuration.h" #include "logger.h" +#include "main.h" #include "settings.h" #include "utils/base64.h" @@ -47,8 +48,6 @@ #endif #ifdef __APPLE__ -#include "main.h" - #include <CoreFoundation/CFBundle.h> #endif diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index cb01c12a3..e28aae7e2 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -24,9 +24,7 @@ #ifdef USE_SDL2 #include "enums/input/keyvalue.h" - -#include "gui/sdlinput.h" -#endif +#endif // USE_SDL2 #include "utils/stringutils.h" diff --git a/src/input/touch/multitouchmanager.cpp b/src/input/touch/multitouchmanager.cpp index 842021d79..b608b0085 100644 --- a/src/input/touch/multitouchmanager.cpp +++ b/src/input/touch/multitouchmanager.cpp @@ -23,7 +23,6 @@ #ifdef USE_SDL2 #include "render/graphics.h" -#include "gui/gui.h" #include "gui/sdlinput.h" #endif #include "debug.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 08306afbe..bf2203847 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -34,8 +34,6 @@ #include "utils/env.h" #include "utils/physfstools.h" -#include <SDL.h> - #include "debug.h" namespace diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index eced8fd0e..07efc1e99 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -26,12 +26,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> -#else -#include <cstdint> -#endif -#else -#include <stdint.h> -#endif +#endif // defined(__APPLE__) +#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <string> #include <queue> diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index 212ee98dc..749c51ac2 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -33,12 +33,6 @@ #include "enums/simpletypes/identified.h" #include "enums/simpletypes/itemcolor.h" -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <cstdint> -#else -#include <stdint.h> -#endif - #include <vector> #include "localconsts.h" diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h index 470366f99..c4ded8aa7 100644 --- a/src/net/ea/traderecv.h +++ b/src/net/ea/traderecv.h @@ -23,12 +23,6 @@ #ifndef NET_EA_TRADERECV_H #define NET_EA_TRADERECV_H -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <cstdint> -#else -#include <stdint.h> -#endif - #include <string> namespace Net diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h index f84895a7d..692ecb441 100644 --- a/src/net/eathena/beingrecv.h +++ b/src/net/eathena/beingrecv.h @@ -30,12 +30,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> -#else -#include <cstdint> -#endif -#else -#include <stdint.h> -#endif +#endif // defined(__APPLE__) +#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/net/eathena/maptypeproperty2.h b/src/net/eathena/maptypeproperty2.h index e8602ffbe..87e7cacba 100644 --- a/src/net/eathena/maptypeproperty2.h +++ b/src/net/eathena/maptypeproperty2.h @@ -23,12 +23,6 @@ #include "localconsts.h" -#if defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <cstdint> -#else -#include <stdint.h> -#endif - namespace EAthena { struct MapTypeProperty2Bits final diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h index dce980da5..06d70c36d 100644 --- a/src/net/tmwa/beingrecv.h +++ b/src/net/tmwa/beingrecv.h @@ -26,12 +26,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> -#else -#include <cstdint> -#endif -#else -#include <stdint.h> -#endif +#endif // defined(__APPLE__) +#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index 7a626668c..15b7e89a1 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -26,12 +26,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> -#else -#include <cstdint> -#endif -#else -#include <stdint.h> -#endif +#endif // defined(__APPLE__) +#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <string> #include <vector> diff --git a/src/options.h b/src/options.h index bcdd7519f..62fbcce66 100644 --- a/src/options.h +++ b/src/options.h @@ -28,12 +28,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> -#else -#include <cstdint> -#endif -#else -#include <stdint.h> -#endif +#endif // defined(__APPLE__) +#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/render/opengl/mgl.h b/src/render/opengl/mgl.h index 9c67687c8..8f0e55e52 100644 --- a/src/render/opengl/mgl.h +++ b/src/render/opengl/mgl.h @@ -24,7 +24,6 @@ #ifdef USE_OPENGL #include "render/opengl/mgltypes.h" -#include "render/opengl/mgldefines.h" #define defName(name) extern name##_t m##name diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index 6d034973e..6fd448c71 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -38,7 +38,8 @@ #if defined(__APPLE__) #include <OpenGL/glext.h> #else // defined(__APPLE__) -#include <GL/glext.h> +// probably this include need for some os / libs +//#include <GL/glext.h> #ifndef __glext_h_ #error missing include <GL/glext.h> #endif // __glext_h_ diff --git a/src/render/openglx/mglxinit.cpp b/src/render/openglx/mglxinit.cpp index ce40a6534..78a20ebf0 100644 --- a/src/render/openglx/mglxinit.cpp +++ b/src/render/openglx/mglxinit.cpp @@ -25,7 +25,6 @@ #include "render/opengl/mglfunctions.h" #include "render/openglx/mglx.h" -#include "render/openglx/mglxtypes.h" #include "debug.h" diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index f00846563..ce6250c7b 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -67,15 +67,10 @@ #include "render/sdl2graphics.h" -#include "main.h" - -#include "configuration.h" #include "graphicsmanager.h" -#include "logger.h" #include "render/vertexes/imagecollection.h" -#include "resources/imagehelper.h" #include "resources/imagerect.h" #include "resources/sdl2imagehelper.h" @@ -83,8 +78,6 @@ #include "utils/sdlcheckutils.h" -#include "utils/sdlpixel.h" - #include "debug.h" #ifdef DEBUG_SDL_SURFACES diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h index d6037f056..9b2a3042b 100644 --- a/src/resources/atlas/atlasitem.h +++ b/src/resources/atlas/atlasitem.h @@ -25,8 +25,6 @@ #include "resources/image/image.h" -#include <string> - struct AtlasItem final : public MemoryCounter { explicit AtlasItem(Image *const image0) : diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 20419a470..3de2b1c3b 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -36,8 +36,6 @@ #include "utils/env.h" #include "utils/physfstools.h" -#include <SDL.h> - #include "debug.h" TEST_CASE("DyePalette tests") diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h index 612077188..95d800bda 100644 --- a/src/resources/fboinfo.h +++ b/src/resources/fboinfo.h @@ -35,6 +35,8 @@ #endif // defined(__APPLE__) #endif +#include "localconsts.h" + struct FBOInfo final { FBOInfo() : diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 5f8f95e6b..7d2c3d8ef 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -24,20 +24,10 @@ #include "resources/sdl2imagehelper.h" -#include "logger.h" -#include "main.h" - -#include "resources/dye/dye.h" -#include "resources/dye/dyepalette.h" - #include "resources/image/image.h" -#include "resources/resourcemanager/resourcemanager.h" - #include "utils/sdlcheckutils.h" -#include <SDL_image.h> - #include "debug.h" bool SDLImageHelper::mEnableAlphaCache = false; diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp index 3c50531d0..e39a6be3a 100644 --- a/src/resources/sdl2softwareimagehelper.cpp +++ b/src/resources/sdl2softwareimagehelper.cpp @@ -24,19 +24,10 @@ #include "resources/sdl2softwareimagehelper.h" -#include "logger.h" -#include "main.h" - -#include "resources/dye/dye.h" - #include "resources/image/image.h" -#include "resources/resourcemanager/resourcemanager.h" - #include "utils/sdlcheckutils.h" -#include <SDL_image.h> - #include "debug.h" bool SDL2SoftwareImageHelper::mEnableAlphaCache = false; diff --git a/src/resources/sdl2softwarescreenshothelper.cpp b/src/resources/sdl2softwarescreenshothelper.cpp index 9b76c9472..e36745b82 100644 --- a/src/resources/sdl2softwarescreenshothelper.cpp +++ b/src/resources/sdl2softwarescreenshothelper.cpp @@ -24,7 +24,6 @@ #include "resources/sdl2softwarescreenshothelper.h" -#include "render/graphics.h" #include "render/sdl2softwaregraphics.h" #include "utils/sdlcheckutils.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index 794ce543a..1a77ea38f 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -40,8 +40,6 @@ #include "utils/mrand.h" #include "utils/physfstools.h" -#include <SDL.h> - #include "debug.h" TEST_CASE("AnimatedSprite tests", "animatedsprite") diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp index b8c3bf6ac..e74c34477 100644 --- a/src/resources/surfaceimagehelper.cpp +++ b/src/resources/surfaceimagehelper.cpp @@ -24,19 +24,10 @@ #include "resources/surfaceimagehelper.h" -#include "logger.h" -#include "main.h" - -#include "resources/dye/dye.h" - #include "resources/image/image.h" -#include "resources/resourcemanager/resourcemanager.h" - #include "utils/sdlcheckutils.h" -#include <SDL_image.h> - #include "debug.h" bool SurfaceImageHelper::mEnableAlphaCache = false; diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 1f33c70ae..5d4a854e3 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -30,7 +30,6 @@ #include <algorithm> -#include <sys/time.h> #ifdef __clang__ #include <time.h> #endif diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index 089489684..109b661da 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -24,7 +24,6 @@ #ifdef USE_OPENGL #include <fstream> -#include <string> #ifdef WIN32 #include <sys/time.h> diff --git a/src/test/testmain.h b/src/test/testmain.h index 02b5fd2a5..9cc81702d 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -27,8 +27,6 @@ #include "render/renderers.h" -#include <string> - class Logger; class TestMain final diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index cf19de80d..af4cb388a 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -37,8 +37,6 @@ #include "resources/resourcemanager/resourcemanager.h" -#include <SDL.h> - #include "debug.h" TEST_CASE("chatutils replaceVars") diff --git a/src/utils/files.cpp b/src/utils/files.cpp index f5bd8c557..463031493 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -35,7 +35,6 @@ #include <algorithm> #include <dirent.h> -#include <fstream> #include <sstream> #include "debug.h" diff --git a/src/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp index 6505b70f0..e9db1fb61 100644 --- a/src/utils/sdl2helper.cpp +++ b/src/utils/sdl2helper.cpp @@ -27,7 +27,6 @@ #include "utils/stringutils.h" #include <SDL_syswm.h> -#include <SDL_video.h> #include "debug.h" diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h index 1f5233ea0..e808bc3e2 100644 --- a/src/utils/xml/libxml.h +++ b/src/utils/xml/libxml.h @@ -32,8 +32,6 @@ #include "utils/xml/libxml.inc" -#include <libxml/tree.h> - #include <string> #include "localconsts.h" |