From 864e023e0faeca5aa662023a54af7e4f9797fafa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 Jun 2017 19:05:52 +0300 Subject: Move foreach macroses into separate file. --- src/resources/action.cpp | 1 + src/resources/animation/animation.cpp | 2 ++ src/resources/atlas/textureatlas.h | 1 + src/resources/beingcommon.h | 2 ++ src/resources/db/badgesdb.cpp | 1 + src/resources/db/colordb.cpp | 1 + src/resources/db/emotedb.cpp | 1 + src/resources/db/horsedb.cpp | 1 + src/resources/db/itemdb.cpp | 1 + src/resources/db/itemoptiondb.cpp | 1 + src/resources/db/mapdb.cpp | 2 ++ src/resources/db/npcdialogdb.cpp | 1 + src/resources/delayedmanager.cpp | 1 + src/resources/dye/dyepalette.cpp | 1 + src/resources/inventory/inventory.cpp | 1 + src/resources/item/complexitem.cpp | 1 + src/resources/map/map.cpp | 1 + src/resources/map/maplayer.cpp | 2 ++ src/resources/map/speciallayer.cpp | 1 + src/resources/map/tileanimation.cpp | 1 + src/resources/resourcemanager/resourcemanager.cpp | 1 + src/resources/skill/skillinfo.cpp | 1 + src/resources/sprite/spritedef.cpp | 1 + src/resources/wallpaper.cpp | 2 ++ 24 files changed, 29 insertions(+) (limited to 'src/resources') diff --git a/src/resources/action.cpp b/src/resources/action.cpp index c059624c5..9b3dab3f4 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -25,6 +25,7 @@ #include "resources/animation/animation.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/animation/animation.cpp b/src/resources/animation/animation.cpp index 4f83161de..3b066da15 100644 --- a/src/resources/animation/animation.cpp +++ b/src/resources/animation/animation.cpp @@ -22,6 +22,8 @@ #include "resources/animation/animation.h" +#include "utils/foreach.h" + #include "debug.h" Animation::Animation() noexcept2 : diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h index f02eb6f35..a1fe4d145 100644 --- a/src/resources/atlas/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -23,6 +23,7 @@ #ifdef USE_OPENGL +#include "utils/foreach.h" #include "utils/stringvector.h" #include "resources/atlas/atlasitem.h" diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h index 4299d7707..c79e8a76c 100644 --- a/src/resources/beingcommon.h +++ b/src/resources/beingcommon.h @@ -23,10 +23,12 @@ #include "fs/virtfs/tools.h" +#include "utils/foreach.h" #include "utils/xml.h" #include "localconsts.h" +UTILS_FOREACH_H UTILS_VIRTFSTOOLS_H class BeingInfo; diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp index 48034e3a3..873149f41 100644 --- a/src/resources/db/badgesdb.cpp +++ b/src/resources/db/badgesdb.cpp @@ -24,6 +24,7 @@ #include "fs/virtfs/tools.h" +#include "utils/foreach.h" #include "utils/xmlutils.h" #include "debug.h" diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index f4cd0921b..92d06ce40 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -24,6 +24,7 @@ #include "configuration.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "resources/beingcommon.h" diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 72b7f0092..38da40f07 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "resources/beingcommon.h" #include "resources/emoteinfo.h" diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index c9f363246..0339339ed 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -30,6 +30,7 @@ #include "utils/checkutils.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 542fa6789..440b69d16 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -44,6 +44,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "utils/stringmap.h" #include "utils/translation/podict.h" diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp index bd78f95c5..80e149b6f 100644 --- a/src/resources/db/itemoptiondb.cpp +++ b/src/resources/db/itemoptiondb.cpp @@ -23,6 +23,7 @@ #include "configuration.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "resources/beingcommon.h" diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp index 7ae90815e..6b9a66f3b 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -24,6 +24,8 @@ #include "configuration.h" #include "logger.h" +#include "utils/foreach.h" + #include "resources/beingcommon.h" #include "debug.h" diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp index 0e4ab5ffc..bdf2c7841 100644 --- a/src/resources/db/npcdialogdb.cpp +++ b/src/resources/db/npcdialogdb.cpp @@ -27,6 +27,7 @@ #include "utils/checkutils.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/delayedmanager.cpp b/src/resources/delayedmanager.cpp index 73d31e1e8..1296095bb 100644 --- a/src/resources/delayedmanager.cpp +++ b/src/resources/delayedmanager.cpp @@ -22,6 +22,7 @@ #include "resources/sprite/animationdelayload.h" +#include "utils/foreach.h" #include "utils/timer.h" #include "debug.h" diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index 255175ee1..0e0784d63 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -44,6 +44,7 @@ PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED #include "utils/cpu.h" #endif // SIMD_SUPPORTED +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/inventory/inventory.cpp b/src/resources/inventory/inventory.cpp index df7104d03..b7aa39e91 100644 --- a/src/resources/inventory/inventory.cpp +++ b/src/resources/inventory/inventory.cpp @@ -34,6 +34,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/resources/item/complexitem.cpp b/src/resources/item/complexitem.cpp index 047c50614..b9de8dbe1 100644 --- a/src/resources/item/complexitem.cpp +++ b/src/resources/item/complexitem.cpp @@ -21,6 +21,7 @@ #include "resources/item/complexitem.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index f2c8f4636..8deea4b23 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -65,6 +65,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "utils/timer.h" #include diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 2598b029c..f9f154a64 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -31,6 +31,8 @@ #include "gui/userpalette.h" +#include "utils/foreach.h" + #include "render/graphics.h" #include "resources/image/image.h" diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp index 75b56be28..27713e074 100644 --- a/src/resources/map/speciallayer.cpp +++ b/src/resources/map/speciallayer.cpp @@ -27,6 +27,7 @@ #include "resources/map/mapitem.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/map/tileanimation.cpp b/src/resources/map/tileanimation.cpp index c8ce52a70..fee4ef150 100644 --- a/src/resources/map/tileanimation.cpp +++ b/src/resources/map/tileanimation.cpp @@ -27,6 +27,7 @@ #include "resources/map/maplayer.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index d90448e7b..c599dd165 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -35,6 +35,7 @@ #include "resources/sprite/spritedef.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #if !defined(DEBUG_DUMP_LEAKS) && !defined(UNITTESTS) #include "resources/resourcetypes.h" diff --git a/src/resources/skill/skillinfo.cpp b/src/resources/skill/skillinfo.cpp index 8c90fbd72..3c74fcaa9 100644 --- a/src/resources/skill/skillinfo.cpp +++ b/src/resources/skill/skillinfo.cpp @@ -26,6 +26,7 @@ #include "gui/models/skillmodel.h" +#include "utils/foreach.h" #include "utils/stringutils.h" #include "resources/skill/skilldata.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 8824a2ac1..ccb8af30c 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -30,6 +30,7 @@ #include "const/resources/map/map.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "resources/action.h" #include "resources/imageset.h" diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 09c1f3396..e474d2315 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -29,6 +29,8 @@ #include "resources/wallpaperdata.h" +#include "utils/foreach.h" + #include #ifdef WIN32 -- cgit v1.2.3-60-g2f50