Remove extra headers.

16 files changed, 0 insertions, 211 deletions

diff --git a/src/unittests/fs/virtfs/virtfs1_basic.cc b/src/unittests/fs/virtfs/virtfs1_basic.cc
index 3d8b21877..73153df37 100644
--- a/src/unittests/fs/virtfs/virtfs1_basic.cc
+++ b/src/unittests/fs/virtfs/virtfs1_basic.cc
@@ -20,22 +20,9 @@
 
 #include "unittests/unittests.h"
 
-#include "fs/files.h"
-
-#include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
-#include "utils/delete2.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
diff --git a/src/unittests/fs/virtfs/virtfs1_enumerate.cc b/src/unittests/fs/virtfs/virtfs1_enumerate.cc
index f2caa0171..1cbc5239b 100644
--- a/src/unittests/fs/virtfs/virtfs1_enumerate.cc
+++ b/src/unittests/fs/virtfs/virtfs1_enumerate.cc
@@ -22,20 +22,12 @@
 
 #include "fs/files.h"
 
-#include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
 #include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
@@ -80,30 +72,6 @@ static bool inList(const VirtFs::List *const list,
     return false;
 }
 
-static bool inList(StringVect list,
-                   const std::string &name)
-{
-    FOR_EACH (StringVectCIter, it, list)
-    {
-        if (*it == name)
-            return true;
-    }
-    return false;
-}
-
-static bool inList(StringVect list,
-                   const std::string &dir,
-                   const std::string &name)
-{
-    const std::string path = pathJoin(dir, name);
-    FOR_EACH (StringVectCIter, it, list)
-    {
-        if (*it == path)
-            return true;
-    }
-    return false;
-}
-
 TEST_CASE("VirtFs1 enumerateFiles1", "")
 {
     VirtFs::init(".");
diff --git a/src/unittests/fs/virtfs/virtfs1_exists.cc b/src/unittests/fs/virtfs/virtfs1_exists.cc
index 310cb28ae..977572677 100644
--- a/src/unittests/fs/virtfs/virtfs1_exists.cc
+++ b/src/unittests/fs/virtfs/virtfs1_exists.cc
@@ -20,22 +20,10 @@
 
 #include "unittests/unittests.h"
 
-#include "fs/files.h"
-
-#include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
diff --git a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc b/src/unittests/fs/virtfs/virtfs1_getrealdir.cc
index 7b2f7915c..ea0d3ccb0 100644
--- a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc
+++ b/src/unittests/fs/virtfs/virtfs1_getrealdir.cc
@@ -22,20 +22,10 @@
 
 #include "fs/files.h"
 
-#include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
diff --git a/src/unittests/fs/virtfs/virtfs1_mount.cc b/src/unittests/fs/virtfs/virtfs1_mount.cc
index 1174fe1a9..6b3a50e80 100644
--- a/src/unittests/fs/virtfs/virtfs1_mount.cc
+++ b/src/unittests/fs/virtfs/virtfs1_mount.cc
@@ -24,18 +24,9 @@
 
 #include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
diff --git a/src/unittests/fs/virtfs/virtfs1_unmount.cc b/src/unittests/fs/virtfs/virtfs1_unmount.cc
index 549061f25..5e6815d5c 100644
--- a/src/unittests/fs/virtfs/virtfs1_unmount.cc
+++ b/src/unittests/fs/virtfs/virtfs1_unmount.cc
@@ -24,18 +24,9 @@
 
 #include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
-#include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/foreach.h"
-#include "utils/stringutils.h"
-
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_rwops.h>
-PRAGMA48(GCC diagnostic pop)
 
 #ifndef UNITTESTS_CATCH
 #include <algorithm>
diff --git a/src/unittests/fs/virtfs/virtfs2_unittest.cc b/src/unittests/fs/virtfs/virtfs2_unittest.cc
index 86d932655..8e578cc71 100644
--- a/src/unittests/fs/virtfs/virtfs2_unittest.cc
+++ b/src/unittests/fs/virtfs/virtfs2_unittest.cc
@@ -22,10 +22,8 @@
 
 #include "fs/files.h"
 
-#include "fs/virtfs/direntry.h"
 #include "fs/virtfs/fs.h"
 #include "fs/virtfs/rwops.h"
-#include "fs/virtfs/list.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
@@ -43,17 +41,6 @@ PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
-static bool inList(const VirtFs::List *const list,
-                   const std::string &name)
-{
-    FOR_EACH (StringVectCIter, it, list->names)
-    {
-        if (*it == name)
-            return true;
-    }
-    return false;
-}
-
 static bool inList(StringVect list,
                    const std::string &name)
 {
diff --git a/src/unittests/resources/map/maplayer/draw.cc b/src/unittests/resources/map/maplayer/draw.cc
index d679ff948..e7410e22e 100644
--- a/src/unittests/resources/map/maplayer/draw.cc
+++ b/src/unittests/resources/map/maplayer/draw.cc
@@ -20,29 +20,12 @@
 
 #include "unittests/unittests.h"
 
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
 #include "unittests/render/mockgraphics.h"
 
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
-
 #include "resources/image/image.h"
 
 #include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"
 
diff --git a/src/unittests/resources/map/maplayer/drawfringenormal.cc b/src/unittests/resources/map/maplayer/drawfringenormal.cc
index a15e3d243..84564ae64 100644
--- a/src/unittests/resources/map/maplayer/drawfringenormal.cc
+++ b/src/unittests/resources/map/maplayer/drawfringenormal.cc
@@ -24,7 +24,6 @@
 
 #include "being/localplayer.h"
 
-#include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
 #include "fs/virtfs/fs.h"
diff --git a/src/unittests/resources/map/maplayer/drawfringesimple.cc b/src/unittests/resources/map/maplayer/drawfringesimple.cc
index c0f86ebd5..fa24d3b94 100644
--- a/src/unittests/resources/map/maplayer/drawfringesimple.cc
+++ b/src/unittests/resources/map/maplayer/drawfringesimple.cc
@@ -24,9 +24,6 @@
 
 #include "being/localplayer.h"
 
-#include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
 #include "fs/virtfs/fs.h"
 
 #include "gui/theme.h"
@@ -42,7 +39,6 @@
 
 #include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"
 
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
index f4f3872f3..79cd056bb 100644
--- a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
+++ b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
@@ -22,15 +22,10 @@
 
 #include "graphicsmanager.h"
 
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
 #include "fs/virtfs/fs.h"
 
-#include "gui/theme.h"
-
 #include "unittests/render/mockgraphics.h"
 
 #include "utils/delete2.h"
@@ -38,8 +33,6 @@
 
 #include "resources/sdlimagehelper.h"
 
-#include "resources/image/image.h"
-
 #include "resources/map/map.h"
 #include "resources/map/maplayer.h"
 #include "resources/map/speciallayer.h"
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
index ac9022362..e47ccdb97 100644
--- a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
+++ b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
@@ -22,15 +22,10 @@
 
 #include "graphicsmanager.h"
 
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
 #include "fs/virtfs/fs.h"
 
-#include "gui/theme.h"
-
 #include "unittests/render/mockgraphics.h"
 
 #include "utils/delete2.h"
@@ -38,8 +33,6 @@
 
 #include "resources/sdlimagehelper.h"
 
-#include "resources/image/image.h"
-
 #include "resources/map/map.h"
 #include "resources/map/maplayer.h"
 #include "resources/map/speciallayer.h"
diff --git a/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc b/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc
index a624b819b..f4d65a0ab 100644
--- a/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc
+++ b/src/unittests/resources/map/maplayer/getemptytiledrawwidth.cc
@@ -20,29 +20,9 @@
 
 #include "unittests/unittests.h"
 
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
-
 #include "resources/image/image.h"
 
-#include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"
 
diff --git a/src/unittests/resources/map/maplayer/gettiledrawwidth.cc b/src/unittests/resources/map/maplayer/gettiledrawwidth.cc
index 0b72e310b..c7cbf2a8e 100644
--- a/src/unittests/resources/map/maplayer/gettiledrawwidth.cc
+++ b/src/unittests/resources/map/maplayer/gettiledrawwidth.cc
@@ -20,29 +20,9 @@
 
 #include "unittests/unittests.h"
 
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
-
 #include "resources/image/image.h"
 
-#include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"
 
diff --git a/src/unittests/resources/map/maplayer/updatecache.cc b/src/unittests/resources/map/maplayer/updatecache.cc
index 8f8db979c..472291b48 100644
--- a/src/unittests/resources/map/maplayer/updatecache.cc
+++ b/src/unittests/resources/map/maplayer/updatecache.cc
@@ -20,29 +20,9 @@
 
 #include "unittests/unittests.h"
 
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
-#include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
-
 #include "resources/image/image.h"
 
-#include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"
 
diff --git a/src/unittests/resources/map/maplayer/updateconditiontiles.cc b/src/unittests/resources/map/maplayer/updateconditiontiles.cc
index b0711b3ee..62535d351 100644
--- a/src/unittests/resources/map/maplayer/updateconditiontiles.cc
+++ b/src/unittests/resources/map/maplayer/updateconditiontiles.cc
@@ -20,29 +20,12 @@
 
 #include "unittests/unittests.h"
 
-#include "graphicsmanager.h"
-
-#include "being/localplayer.h"
-
 #include "enums/resources/map/blockmask.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "fs/virtfs/fs.h"
-
-#include "gui/theme.h"
-
-#include "unittests/render/mockgraphics.h"
-
-#include "utils/delete2.h"
-#include "utils/env.h"
-
-#include "resources/sdlimagehelper.h"
 
 #include "resources/image/image.h"
 
 #include "resources/map/map.h"
 #include "resources/map/maplayer.h"
-#include "resources/map/speciallayer.h"
 
 #include "debug.h"