summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-14 17:44:37 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-14 17:44:37 +0300
commit9f8266d3e302a04cc862b649b2e85b7d4ccfa0a4 (patch)
tree6c40f5f489177f7a4e18b2f23b23cf70bd5f62a6 /src/resources
parent9b05ab35e04fa37725f8c757e76e7d1e2ad0a3f3 (diff)
downloadmanaverse-9f8266d3e302a04cc862b649b2e85b7d4ccfa0a4.tar.gz
manaverse-9f8266d3e302a04cc862b649b2e85b7d4ccfa0a4.tar.bz2
manaverse-9f8266d3e302a04cc862b649b2e85b7d4ccfa0a4.tar.xz
manaverse-9f8266d3e302a04cc862b649b2e85b7d4ccfa0a4.zip
Remove some useless includes.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlas/atlasitem.h2
-rw-r--r--src/resources/dye/dyepalette_unittest.cc2
-rw-r--r--src/resources/fboinfo.h2
-rw-r--r--src/resources/sdl2imagehelper.cpp10
-rw-r--r--src/resources/sdl2softwareimagehelper.cpp9
-rw-r--r--src/resources/sdl2softwarescreenshothelper.cpp1
-rw-r--r--src/resources/sprite/animatedsprite_unittest.cc2
-rw-r--r--src/resources/surfaceimagehelper.cpp9
-rw-r--r--src/resources/wallpaper.cpp1
9 files changed, 2 insertions, 36 deletions
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