From 20ac8001a989426d919f24fe663319f1b0bd1625 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 30 Jun 2017 12:54:31 +0300 Subject: Remove extra includes again. --- src/actions/actions.cpp | 1 + src/game.cpp | 1 + src/gui/models/extendedlistmodel.h | 2 -- src/gui/models/extendednamesmodel.cpp | 1 + src/gui/popups/popupmenu.cpp | 1 + src/gui/widgets/itemcontainer.cpp | 1 + src/gui/windows/inventorywindow.cpp | 1 + src/gui/windows/mailwindow.cpp | 1 + src/gui/windows/npcdialog.cpp | 1 + src/input/inputmanager.cpp | 1 + src/input/keyboardconfig.h | 2 ++ src/integrity_unittest.cc | 1 - src/net/tmwa/generalhandler.cpp | 1 - src/render/mockgraphics.cc | 1 - src/resources/db/colordb.cpp | 1 - src/resources/db/emotedb.cpp | 1 - src/resources/db/horsedb.cpp | 1 - src/resources/db/itemoptiondb.cpp | 1 - src/resources/db/mapdb.cpp | 2 -- src/resources/db/npcdialogdb.cpp | 1 - src/utils/mathutils_unittest.cc | 1 - src/utils/stringutils_unittest.cc | 1 - 22 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index c5bbf075b..cd7949b85 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -104,6 +104,7 @@ #include "utils/chatutils.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/mathutils.h" #include "utils/parameters.h" diff --git a/src/game.cpp b/src/game.cpp index b28738113..21701e02d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -123,6 +123,7 @@ #include "resources/sprite/animatedsprite.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/sdlcheckutils.h" #include "utils/timer.h" diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h index 307b4af80..981a96897 100644 --- a/src/gui/models/extendedlistmodel.h +++ b/src/gui/models/extendedlistmodel.h @@ -23,8 +23,6 @@ #include "gui/models/listmodel.h" -#include "utils/foreach.h" - #include "resources/image/image.h" class ExtendedListModel notfinal : public ListModel diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp index 74b52beae..146473a91 100644 --- a/src/gui/models/extendednamesmodel.cpp +++ b/src/gui/models/extendednamesmodel.cpp @@ -21,6 +21,7 @@ #include "gui/models/extendednamesmodel.h" #include "utils/cast.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index bcbadf8e4..2f2df70c3 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -88,6 +88,7 @@ #include "resources/skill/skillinfo.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 450379392..7193ce0f1 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -51,6 +51,7 @@ #include "net/tradehandler.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index a39e648b4..8a3a70bdc 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -69,6 +69,7 @@ #include "resources/item/item.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "debug.h" diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 98570340f..52f91af06 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -41,6 +41,7 @@ #include "utils/delete2.h" #include "utils/dtor.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 3e1240c2c..25c1899a0 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -73,6 +73,7 @@ #include "utils/copynpaste.h" #include "utils/delete2.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index fa42ffe32..ab0505285 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -54,6 +54,7 @@ #include "gui/windows/tradewindow.h" #include "utils/checkutils.h" +#include "utils/foreach.h" #include "utils/gettext.h" #include "utils/stdmove.h" #include "utils/timer.h" diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h index b5e8dc796..1759e4bb9 100644 --- a/src/input/keyboardconfig.h +++ b/src/input/keyboardconfig.h @@ -25,7 +25,9 @@ #include "localconsts.h" +#ifndef USE_SDL2 #include "utils/cast.h" +#endif // USE_SDL2 PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 55c78220f..130716ce6 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -46,7 +46,6 @@ #include "resources/resourcemanager/resourcemanager.h" -#include "utils/cast.h" #include "utils/env.h" #include "utils/delete2.h" #include "utils/foreach.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 1e0019219..577d384b7 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -67,7 +67,6 @@ #include "net/tmwa/searchstorehandler.h" #include "net/tmwa/vendinghandler.h" -#include "utils/cast.h" #include "utils/delete2.h" #include "utils/gettext.h" diff --git a/src/render/mockgraphics.cc b/src/render/mockgraphics.cc index f3cadee1d..d36a6b1f5 100644 --- a/src/render/mockgraphics.cc +++ b/src/render/mockgraphics.cc @@ -24,7 +24,6 @@ #include "graphicsmanager.h" -#include "utils/cast.h" #include "utils/sdlcheckutils.h" #include "render/vertexes/imagecollection.h" diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 0fe990fed..96af379a4 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -25,7 +25,6 @@ #include "utils/cast.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 38da40f07..72b7f0092 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -26,7 +26,6 @@ #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 0339339ed..c9f363246 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -30,7 +30,6 @@ #include "utils/checkutils.h" #include "utils/dtor.h" -#include "utils/foreach.h" #include "debug.h" diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp index 80e149b6f..bd78f95c5 100644 --- a/src/resources/db/itemoptiondb.cpp +++ b/src/resources/db/itemoptiondb.cpp @@ -23,7 +23,6 @@ #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 6b9a66f3b..7ae90815e 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -24,8 +24,6 @@ #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 bdf2c7841..0e4ab5ffc 100644 --- a/src/resources/db/npcdialogdb.cpp +++ b/src/resources/db/npcdialogdb.cpp @@ -27,7 +27,6 @@ #include "utils/checkutils.h" #include "utils/dtor.h" -#include "utils/foreach.h" #include "debug.h" diff --git a/src/utils/mathutils_unittest.cc b/src/utils/mathutils_unittest.cc index c7a545f87..187accf74 100644 --- a/src/utils/mathutils_unittest.cc +++ b/src/utils/mathutils_unittest.cc @@ -20,7 +20,6 @@ #include "test/unittests.h" -#include "utils/cast.h" #include "utils/mathutils.h" #include "debug.h" diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc index 19670db99..354232965 100644 --- a/src/utils/stringutils_unittest.cc +++ b/src/utils/stringutils_unittest.cc @@ -27,7 +27,6 @@ #include "fs/virtfs/fs.h" -#include "utils/cast.h" #include "utils/delete2.h" #include "utils/dtor.h" -- cgit v1.2.3-60-g2f50