diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-29 20:13:40 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-29 20:53:57 +0300 |
commit | 36c45ae7d8d2577a900ec266b64448d4b488013d (patch) | |
tree | 419024ce46e507c2abb0578d15d787093556b246 /src/gui | |
parent | 864e023e0faeca5aa662023a54af7e4f9797fafa (diff) | |
download | plus-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.gz plus-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.bz2 plus-36c45ae7d8d2577a900ec266b64448d4b488013d.tar.xz plus-36c45ae7d8d2577a900ec266b64448d4b488013d.zip |
Move cast macroses into separate file.
Diffstat (limited to 'src/gui')
29 files changed, 41 insertions, 0 deletions
diff --git a/src/gui/color.h b/src/gui/color.h index 4b8e06eb3..c4a1aab01 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -64,6 +64,8 @@ #ifndef GUI_COLOR_H #define GUI_COLOR_H +#include "utils/cast.h" + #include "localconsts.h" /** diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h index c2b8def74..a50b20d8d 100644 --- a/src/gui/models/beingslistmodel.h +++ b/src/gui/models/beingslistmodel.h @@ -24,6 +24,7 @@ #include "gui/models/avatarlistmodel.h" +#include "utils/cast.h" #include "utils/dtor.h" #include <vector> diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp index 2c8d7167a..74b52beae 100644 --- a/src/gui/models/extendednamesmodel.cpp +++ b/src/gui/models/extendednamesmodel.cpp @@ -20,6 +20,8 @@ #include "gui/models/extendednamesmodel.h" +#include "utils/cast.h" + #include "debug.h" ExtendedNamesModel::ExtendedNamesModel() : diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h index 4028895fb..ce977fb5f 100644 --- a/src/gui/models/iconsmodel.h +++ b/src/gui/models/iconsmodel.h @@ -25,6 +25,7 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" #include "utils/foreach.h" #include "resources/iteminfo.h" diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h index ef537a5c7..6cd8bbe87 100644 --- a/src/gui/models/ignorechoiceslistmodel.h +++ b/src/gui/models/ignorechoiceslistmodel.h @@ -28,6 +28,8 @@ #include "being/playerignorestrategy.h" #include "being/playerrelations.h" +#include "utils/cast.h" + /** * Class for choosing one of the various `what to do when ignoring a player' options */ diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h index a49a7cfc5..3b4933ce2 100644 --- a/src/gui/models/itemsmodel.h +++ b/src/gui/models/itemsmodel.h @@ -29,6 +29,7 @@ #include "resources/db/itemdb.h" +#include "utils/cast.h" #include "utils/foreach.h" #include <list> diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h index abeb99f68..ed4d449d7 100644 --- a/src/gui/models/modelistmodel.h +++ b/src/gui/models/modelistmodel.h @@ -25,6 +25,7 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" #include "utils/stringvector.h" #include "localconsts.h" diff --git a/src/gui/models/namesmodel.cpp b/src/gui/models/namesmodel.cpp index 5a351f471..ee26dbdaa 100644 --- a/src/gui/models/namesmodel.cpp +++ b/src/gui/models/namesmodel.cpp @@ -20,6 +20,7 @@ #include "gui/models/namesmodel.h" +#include "utils/cast.h" #include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h index 206daa02a..8b558d17a 100644 --- a/src/gui/models/serverslistmodel.h +++ b/src/gui/models/serverslistmodel.h @@ -31,6 +31,7 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" #include "utils/gettext.h" /** diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h index 3b6d611cb..d162ce524 100644 --- a/src/gui/models/shopitems.h +++ b/src/gui/models/shopitems.h @@ -29,6 +29,8 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" + #include <vector> #include "localconsts.h" diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h index c3331ed30..6c7792508 100644 --- a/src/gui/models/skillmodel.h +++ b/src/gui/models/skillmodel.h @@ -25,6 +25,8 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" + #include "resources/skill/skillinfo.h" #include "localconsts.h" diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h index 74bd44af1..f50072112 100644 --- a/src/gui/models/updatelistmodel.h +++ b/src/gui/models/updatelistmodel.h @@ -27,6 +27,7 @@ #include "net/serverinfo.h" +#include "utils/cast.h" #include "utils/foreach.h" #include "localconsts.h" diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h index f22c808bb..9ae5a5e22 100644 --- a/src/gui/models/worldlistmodel.h +++ b/src/gui/models/worldlistmodel.h @@ -25,6 +25,7 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" #include "utils/stringutils.h" #include "net/worldinfo.h" diff --git a/src/gui/palette.h b/src/gui/palette.h index 00f295cc4..0905bf22a 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -28,6 +28,8 @@ #include "gui/color.h" +#include "utils/cast.h" + #include <map> #include <set> #include <string> diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 79a30758b..d2b7847df 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -82,6 +82,8 @@ #include "input/keyinput.h" +#include "utils/cast.h" + PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_events.h> diff --git a/src/gui/theme.h b/src/gui/theme.h index 9ef477452..b617002ad 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -34,6 +34,7 @@ #include "gui/palette.h" +#include "utils/cast.h" #include "utils/stringvector.h" #include "localconsts.h" diff --git a/src/gui/themecolorsidoperators.cpp b/src/gui/themecolorsidoperators.cpp index 37dc2e7ab..df3a7e65b 100644 --- a/src/gui/themecolorsidoperators.cpp +++ b/src/gui/themecolorsidoperators.cpp @@ -20,6 +20,8 @@ #include "gui/themecolorsidoperators.h" +#include "utils/cast.h" + #include "debug.h" ThemeColorIdT operator+(const ThemeColorIdT &id, const int& i) diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 4f7e0e941..712c1f90a 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -32,6 +32,8 @@ #include "gui/models/listmodel.h" +#include "utils/cast.h" + /** * Class controlling the game's color palette. */ diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h index 20d019f8d..16689d6a9 100644 --- a/src/gui/widgets/serverslistbox.h +++ b/src/gui/widgets/serverslistbox.h @@ -27,6 +27,8 @@ #include "gui/models/serverslistmodel.h" +#include "utils/cast.h" + #include "localconsts.h" class ServersListBox final : public ListBox diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index 93c702381..d611b7dce 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -39,6 +39,7 @@ #include "gui/popups/popupmenu.h" #include "gui/popups/skillpopup.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/skillrectanglelistbox.h b/src/gui/widgets/skillrectanglelistbox.h index 88698de1c..16fc610a4 100644 --- a/src/gui/widgets/skillrectanglelistbox.h +++ b/src/gui/widgets/skillrectanglelistbox.h @@ -36,6 +36,7 @@ #include "gui/popups/popupmenu.h" #include "gui/popups/skillpopup.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index 017f465c7..d023fa442 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -33,6 +33,7 @@ #include "gui/widgets/tabs/socialfriendsfunctor.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index 8652a54fe..9a23938ca 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -26,6 +26,7 @@ #include "being/localplayer.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index ff8544232..9f8a8ff67 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -28,6 +28,7 @@ #include "being/localplayer.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index 80b5910f3..b86799f6a 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -34,6 +34,7 @@ #include "input/keyboardconfig.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index d7f22c1f7..1287bfed1 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -30,6 +30,7 @@ #include "net/partyhandler.h" +#include "utils/cast.h" #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 87b0335c1..d8ce21df0 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -30,6 +30,7 @@ #include "gui/models/beingslistmodel.h" +#include "utils/cast.h" #include "utils/gettext.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index fefd862a0..bcde2e411 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -73,6 +73,8 @@ #include "listeners/keylistener.h" #include "listeners/mouselistener.h" +#include "utils/cast.h" + #include "localconsts.h" /** diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h index ed9110ba4..12f76e897 100644 --- a/src/gui/widgets/widget2.h +++ b/src/gui/widgets/widget2.h @@ -28,6 +28,8 @@ #include "gui/themecolorsidoperators.h" #include "gui/theme.h" +#include "utils/cast.h" + #include "localconsts.h" class Widget; |