diff options
author | Fedja Beader <fedja@protonmail.ch> | 2025-06-25 15:10:14 +0000 |
---|---|---|
committer | Fedja Beader <fedja@protonmail.ch> | 2025-06-25 15:10:14 +0000 |
commit | a42f7cbc8ae25a91f510351c54752b0b41562f82 (patch) | |
tree | 8bebbd4eeca7b586b25e9bd67c1054398f641c33 | |
parent | fd617a8f12964e9f7ef0e5c0d078f539019a3d9a (diff) | |
download | manaplus-a42f7cbc8ae25a91f510351c54752b0b41562f82.tar.gz manaplus-a42f7cbc8ae25a91f510351c54752b0b41562f82.tar.bz2 manaplus-a42f7cbc8ae25a91f510351c54752b0b41562f82.tar.xz manaplus-a42f7cbc8ae25a91f510351c54752b0b41562f82.zip |
Split #include "utils/performance.h" out of localconsts.h
only about 160 out of 1500 files that include localconsts.h need
to include performance.h
Saves 12% from compile times (with profiler ON) and 0.1% with profiler OFF.
****
mana/plus!189
144 files changed, 179 insertions, 14 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index b1ed604d5..db5e8313f 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -48,6 +48,7 @@ #include "utils/foreach.h" #include "utils/mathutils.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "net/beinghandler.h" #include "net/charserverhandler.h" diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 18b93842c..6c79488a1 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -46,6 +46,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/timer.h" #include "debug.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index 7886f99d6..62bc77739 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -117,6 +117,7 @@ #include "utils/foreach.h" #include "utils/gettext.h" #include "utils/likely.h" +#include "utils/performance.h" #include "utils/stdmove.h" #include "utils/timer.h" diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp index 821980dfd..054da503c 100644 --- a/src/being/compoundsprite.cpp +++ b/src/being/compoundsprite.cpp @@ -39,6 +39,7 @@ #include "utils/dtor.h" #include "utils/foreach.h" #include "utils/likely.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #ifndef USE_SDL2 diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp index 31c331329..fbfcf2e83 100644 --- a/src/being/flooritem.cpp +++ b/src/being/flooritem.cpp @@ -43,6 +43,8 @@ #endif // TMWA_SUPPORT #include "net/serverfeatures.h" +#include "utils/performance.h" + #include "debug.h" extern volatile time_t cur_time; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index e5d3b408b..218a77ce2 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -91,6 +91,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/timer.h" #ifdef USE_MUMBLE diff --git a/src/configuration.cpp b/src/configuration.cpp index b4f71b94b..3ceab1d3e 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -35,6 +35,7 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #ifdef DEBUG_CONFIG #include "utils/stringmap.h" #endif // DEBUG_CONFIG diff --git a/src/dirs.cpp b/src/dirs.cpp index 4729b4d79..1a39f9e1e 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -42,6 +42,7 @@ #include "utils/cast.h" #include "utils/gettext.h" +#include "utils/performance.h" #ifdef ANDROID #ifdef USE_SDL2 diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 7ca1aa754..e88681c4a 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -29,6 +29,7 @@ #include "being/being.h" #include "utils/checkutils.h" +#include "utils/performance.h" #include "particle/particle.h" diff --git a/src/eventsmanager.cpp b/src/eventsmanager.cpp index b62301400..c6d72b44a 100644 --- a/src/eventsmanager.cpp +++ b/src/eventsmanager.cpp @@ -44,6 +44,7 @@ #include "logger.h" #endif // USE_SDL2 +#include "utils/performance.h" #include "utils/process.h" #include "utils/sdlhelper.h" #ifdef USE_X11 diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index f4984b547..d710dc1d7 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -52,6 +52,7 @@ #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") diff --git a/src/game.cpp b/src/game.cpp index ee22dc5c4..bd90937f0 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -128,6 +128,7 @@ #include "utils/gettext.h" #include "utils/perfstat.h" #include "utils/pnglib.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/timer.h" diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index c39b74f16..acf6ec95d 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -85,6 +85,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/stringutils.h" #include "utils/timer.h" diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp index 0256315c1..d88e175f8 100644 --- a/src/gui/fonts/textchunk.cpp +++ b/src/gui/fonts/textchunk.cpp @@ -33,6 +33,7 @@ #include "resources/image/image.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/stringutils.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 5b767048c..85d2d47a7 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -101,6 +101,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/langs.h" +#include "utils/performance.h" #include "utils/sdlsharedhelper.h" #include "utils/timer.h" diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 735b0d9a7..639871ba9 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -40,6 +40,7 @@ #include "utils/gettext.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 7eb0746ea..0f176258f 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -90,6 +90,8 @@ PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_timer.h> PRAGMA48(GCC diagnostic pop) +#include "utils/performance.h" + #include "debug.h" #ifdef __SWITCH__ diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index c3c1dfd7f..95890c36b 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -48,6 +48,8 @@ #include "resources/map/map.h" +#include "utils/performance.h" + #include "debug.h" int AvatarListBox::instances = 0; diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp index a3e140d5f..ec4c5c2d6 100644 --- a/src/gui/widgets/basiccontainer.cpp +++ b/src/gui/widgets/basiccontainer.cpp @@ -66,6 +66,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "render/graphics.h" diff --git a/src/gui/widgets/basiccontainer2.cpp b/src/gui/widgets/basiccontainer2.cpp index 63c98b42a..ab1457744 100644 --- a/src/gui/widgets/basiccontainer2.cpp +++ b/src/gui/widgets/basiccontainer2.cpp @@ -70,6 +70,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" BasicContainer2::BasicContainer2(const Widget2 *const widget) : diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 8503bda75..9b402bb89 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -47,6 +47,7 @@ #include "utils/browserboxtools.h" #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "utils/timer.h" #include "utils/translation/podict.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 7642a122f..62d615dc9 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -83,6 +83,7 @@ #include "render/vertexes/imagecollection.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index ce5ac28b0..d1bee3665 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -79,6 +79,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" int CheckBox::instances = 0; diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index 5ed2fb8a0..dfa8b8258 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -29,6 +29,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" ColorPage::ColorPage(const Widget2 *const widget, diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 4d21c9983..c68b3bea2 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -44,6 +44,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" Desktop *desktop = nullptr; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index e66bdafbe..48433320a 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -39,6 +39,8 @@ #include "resources/imagerect.h" +#include "utils/performance.h" + #include "debug.h" int DropDown::instances = 0; diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp index 33cc1cdc3..ea461356f 100644 --- a/src/gui/widgets/emotepage.cpp +++ b/src/gui/widgets/emotepage.cpp @@ -31,6 +31,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 789a3bed5..c086c828a 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -45,6 +45,7 @@ #include "resources/sprite/animatedsprite.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 20c13e519..6f6c01fce 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -29,6 +29,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" ExtendedListBox::ExtendedListBox(const Widget2 *const widget, diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index d3aff69f7..47e00ccc1 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -35,6 +35,7 @@ #include "utils/delete2.h" #include "utils/dtor.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index f5430a69c..5fd16af1b 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -31,6 +31,8 @@ #include "resources/loaders/imageloader.h" +#include "utils/performance.h" + #include "debug.h" Icon::Icon(const Widget2 *const widget, diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 3b8f349e4..0092221c7 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -57,6 +57,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "render/vertexes/imagecollection.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 774cb92e6..888cb7e61 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -51,6 +51,7 @@ #include "const/resources/skill.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 9ab506ac0..4e10d8819 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -70,6 +70,8 @@ #include "gui/fonts/font.h" +#include "utils/performance.h" + #include "debug.h" Skin *Label::mSkin = nullptr; diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 04c02f1ca..6b08174ce 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -79,6 +79,7 @@ #include "listeners/selectionlistener.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "render/graphics.h" diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index c24c1c41c..893a830c0 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -25,6 +25,8 @@ #include "gui/skin.h" +#include "utils/performance.h" + #include "debug.h" PasswordField::PasswordField(const Widget2 *const widget, diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index b02798a1b..75060e9be 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -34,6 +34,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" PlayerBox::PlayerBox(Widget2 *const widget, diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index c217bd0b7..2bd8f922e 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -30,6 +30,7 @@ #include "gui/widgets/windowcontainer.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "render/graphics.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 8c7afe1cc..070488bf9 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -31,6 +31,7 @@ #include "gui/fonts/font.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "render/graphics.h" diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 8dbe2b3b1..1fa579665 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -30,6 +30,7 @@ #include "resources/animation/simpleanimation.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index d313d9035..586695665 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -79,6 +79,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" int RadioButton::instances = 0; diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index e054d461d..9e3b60466 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -72,6 +72,7 @@ #include "gui/skin.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "render/graphics.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 043b1b5bb..95ba47175 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -45,6 +45,8 @@ #include "resources/item/shopitem.h" +#include "utils/performance.h" + #include "debug.h" const int ITEM_ICON_SIZE = 32; diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 8ff7ac5c7..674be268e 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -73,6 +73,7 @@ #include "gui/gui.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "resources/imagerect.h" diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp index a1b76cd28..178996d6c 100644 --- a/src/gui/widgets/sliderlist.cpp +++ b/src/gui/widgets/sliderlist.cpp @@ -30,6 +30,8 @@ #include "gui/widgets/button.h" #include "gui/widgets/label.h" +#include "utils/performance.h" + #include "debug.h" static const int buttonWidth = 27; diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 14ac43597..1e3b02796 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -39,6 +39,8 @@ #include "gui/windows/shortcutwindow.h" +#include "utils/performance.h" + #include "debug.h" SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget, diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp index 070cd5947..4501a4e70 100644 --- a/src/gui/widgets/staticbrowserbox.cpp +++ b/src/gui/widgets/staticbrowserbox.cpp @@ -47,6 +47,7 @@ #include "utils/browserboxtools.h" #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/stdmove.h" #include "utils/stringutils.h" #include "utils/translation/podict.h" diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index c56e114c1..3f053de39 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -74,6 +74,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/mapdebugtab.cpp b/src/gui/widgets/tabs/mapdebugtab.cpp index 4084115e5..6589f1a39 100644 --- a/src/gui/widgets/tabs/mapdebugtab.cpp +++ b/src/gui/widgets/tabs/mapdebugtab.cpp @@ -42,6 +42,7 @@ #include "resources/map/map.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "utils/timer.h" diff --git a/src/gui/widgets/tabs/netdebugtab.cpp b/src/gui/widgets/tabs/netdebugtab.cpp index 3f14f1cdd..bbee16d1e 100644 --- a/src/gui/widgets/tabs/netdebugtab.cpp +++ b/src/gui/widgets/tabs/netdebugtab.cpp @@ -30,6 +30,7 @@ #include "net/packetcounters.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 029a24746..c3f9b4f1c 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -33,6 +33,7 @@ #include "utils/gettext.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "localconsts.h" diff --git a/src/gui/widgets/tabs/statdebugtab.cpp b/src/gui/widgets/tabs/statdebugtab.cpp index 63ce8aee8..f6d741a3f 100644 --- a/src/gui/widgets/tabs/statdebugtab.cpp +++ b/src/gui/widgets/tabs/statdebugtab.cpp @@ -31,6 +31,7 @@ #include "gui/windows/chatwindow.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/perfstat.h" #include "utils/stringutils.h" #include "utils/timer.h" diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index 6e750b2cb..70e348b4c 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -81,6 +81,7 @@ #include "resources/image/image.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/targetdebugtab.cpp b/src/gui/widgets/tabs/targetdebugtab.cpp index 4c43d2b29..5db850d5d 100644 --- a/src/gui/widgets/tabs/targetdebugtab.cpp +++ b/src/gui/widgets/tabs/targetdebugtab.cpp @@ -28,6 +28,7 @@ #include "gui/widgets/layouthelper.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index e1f41855c..9a949a8b1 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -72,6 +72,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include <sstream> #include "debug.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 4fd7403d2..d8e9b0268 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -85,6 +85,7 @@ #include "input/inputmanager.h" #include "utils/copynpaste.h" +#include "utils/performance.h" #include "utils/stringutils.h" #ifndef USE_SDL2 diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index c1fec888d..4b1187205 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -32,6 +32,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" int TextPreview::instances = 0; diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index a78feae65..fbc18976c 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -39,6 +39,7 @@ #include "gui/windows/inventorywindow.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 46bb313e0..003044fcc 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -98,6 +98,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index feb0745db..ac3bf67d6 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -28,6 +28,7 @@ #include "utils/checkutils.h" #include "utils/dtor.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 1f0d71096..fa64a34e3 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -43,6 +43,7 @@ #include "utils/dtor.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "resources/imageset.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index f35eb0874..9dd872bd7 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -51,6 +51,7 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 8c445adb4..d584de593 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -77,6 +77,7 @@ #include "utils/copynpaste.h" #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/translation/podict.h" diff --git a/src/gui/windows/clanwindow.cpp b/src/gui/windows/clanwindow.cpp index 3cd88b0c2..c64c81bb8 100644 --- a/src/gui/windows/clanwindow.cpp +++ b/src/gui/windows/clanwindow.cpp @@ -32,6 +32,7 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index df13c6cc9..61392d914 100644 --- a/src/gui/windows/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -29,6 +29,7 @@ #include "gui/widgets/progressindicator.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "client.h" diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index f750f5500..7a875efa5 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -37,6 +37,7 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 7aabce1db..f6c3cc643 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -51,6 +51,7 @@ #include "utils/dtor.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "net/inventoryhandler.h" diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index cfe6886be..09a39b6ea 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -36,6 +36,7 @@ #include "being/playerinfo.h" #include "utils/gettext.h" +#include "utils/performance.h" #ifdef WIN32 #include <sys/time.h> diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 40f650807..85e2c9dbf 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -54,6 +54,7 @@ #include "utils/gettext.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/stdmove.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 7e12aac0c..8b5159333 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -50,6 +50,7 @@ #include "utils/dtor.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 2d4b58593..2061439af 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -76,6 +76,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include <sstream> diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 42d689802..0f9761a92 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -48,6 +48,7 @@ #include "gui/widgets/layout.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "resources/inventory/inventory.h" diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 1b6f3ae73..b5be96164 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -49,6 +49,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/langs.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 43c5c2b29..cc48d4806 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -82,6 +82,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #ifdef TMWA_SUPPORT #include "resources/iteminfo.h" diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 5a0e83755..93afda6ad 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -38,6 +38,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index c7556e58f..0c9f16f5c 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -44,6 +44,8 @@ #include "net/tmwa/guildmanager.h" #endif // TMWA_SUPPORT +#include "utils/performance.h" + #include "debug.h" SocialWindow *socialWindow = nullptr; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 55d0ba2b0..87a2b1894 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -53,6 +53,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include <sys/stat.h> diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index ca939df47..8417e5dc8 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -62,6 +62,7 @@ #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/sdlhelper.h" #ifdef TMWA_SUPPORT diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index cf5d522e8..fd850637c 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -57,6 +57,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stdmove.h" #include "utils/timer.h" diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 923288d35..b6bfe9a74 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -31,6 +31,7 @@ #include "input/inputmanager.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/timer.h" PRAGMA48(GCC diagnostic push) diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp index 83a240cb6..a530e81ef 100644 --- a/src/input/keyboardconfig.cpp +++ b/src/input/keyboardconfig.cpp @@ -32,6 +32,7 @@ #include "utils/foreach.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/localconsts.h b/src/localconsts.h index 8de67449d..174e3442d 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -401,8 +401,7 @@ PRAGMA45(GCC diagnostic pop) #ifdef DYECMD #undef USE_FUZZER #endif // DYECMD -#include "utils/performance.h" -UTILS_PERFORMANCE_H // guard for protect previous include + #ifdef HAVE_CONFIG_H #include "config.h" #endif // HAVE_CONFIG_H diff --git a/src/net/download.cpp b/src/net/download.cpp index eb6d0baac..fe3fda202 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -29,6 +29,7 @@ #include "fs/files.h" #include "utils/cast.h" +#include "utils/performance.h" #include "utils/sdlhelper.h" #include <zlib.h> diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp index c2cae22fe..0add2550b 100644 --- a/src/net/ea/beingrecv.cpp +++ b/src/net/ea/beingrecv.cpp @@ -42,6 +42,7 @@ #include "gui/windows/socialwindow.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "resources/map/map.h" diff --git a/src/net/ea/charserverrecv.cpp b/src/net/ea/charserverrecv.cpp index b80416287..44f67af91 100644 --- a/src/net/ea/charserverrecv.cpp +++ b/src/net/ea/charserverrecv.cpp @@ -35,6 +35,7 @@ #include "net/messagein.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp index 0a7f7d60f..d30cc767a 100644 --- a/src/net/ea/chatrecv.cpp +++ b/src/net/ea/chatrecv.cpp @@ -38,6 +38,7 @@ #include "net/messagein.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 947c1d795..7de5c5578 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -27,6 +27,7 @@ #include "net/ea/inventoryrecv.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 412f3cfda..8de2c23ab 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -40,6 +40,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "listeners/arrowslistener.h" diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index 0c6203540..183facf00 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -31,6 +31,7 @@ #include "utils/cast.h" #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/sdlhelper.h" #include <sstream> diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp index dc22c5204..ab588e95d 100644 --- a/src/net/ea/playerrecv.cpp +++ b/src/net/ea/playerrecv.cpp @@ -45,6 +45,7 @@ #include "net/playerhandler.h" +#include "utils/performance.h" #include "utils/stdmove.h" #include "utils/stringutils.h" diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 314a89edd..2dbefbee5 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -69,6 +69,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/timer.h" #include "debug.h" diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 28805f51d..d6f66e739 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -53,6 +53,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp index 2945c61ae..6c32dd46d 100644 --- a/src/net/eathena/chatrecv.cpp +++ b/src/net/eathena/chatrecv.cpp @@ -47,6 +47,7 @@ #include "resources/chatobject.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp index e6b105f49..aa3979e81 100644 --- a/src/net/eathena/inventoryrecv.cpp +++ b/src/net/eathena/inventoryrecv.cpp @@ -61,6 +61,7 @@ #include "utils/checkutils.h" #include "utils/gettext.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp index 8af8d85f4..f84b8cf2f 100644 --- a/src/net/eathena/playerrecv.cpp +++ b/src/net/eathena/playerrecv.cpp @@ -47,6 +47,7 @@ #include "net/playerhandler.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/net.cpp b/src/net/net.cpp index 377da5426..fbfb2dd12 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -34,6 +34,7 @@ #include "net/eathena/generalhandler.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/packetcounters.cpp b/src/net/packetcounters.cpp index 809e42bb7..2cc601871 100644 --- a/src/net/packetcounters.cpp +++ b/src/net/packetcounters.cpp @@ -24,6 +24,7 @@ #include "net/packetcounters.h" #include "utils/cast.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 04c2562d5..bb26e4612 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -53,6 +53,7 @@ #include "resources/db/itemdb.h" #include "utils/timer.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 8f80deec4..d67f76870 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -50,6 +50,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp index 47f38a1fa..0a546666f 100644 --- a/src/net/tmwa/chatrecv.cpp +++ b/src/net/tmwa/chatrecv.cpp @@ -46,6 +46,7 @@ #include "net/tmwa/guildmanager.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index 215793e44..aeed2c04d 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -36,6 +36,8 @@ #include "net/tmwa/network.h" #include "net/tmwa/protocolout.h" +#include "utils/performance.h" + #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index f41963011..5662357d4 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -75,6 +75,7 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp index da7f59c84..0ce7be70d 100644 --- a/src/net/tmwa/inventoryrecv.cpp +++ b/src/net/tmwa/inventoryrecv.cpp @@ -41,6 +41,8 @@ #include "net/ea/equipbackend.h" #include "net/ea/inventoryrecv.h" +#include "utils/performance.h" + #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index edeef2102..48b808592 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -61,6 +61,7 @@ #include "net/tmwa/messagein.h" #include "utils/cast.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/net/tmwa/playerrecv.cpp b/src/net/tmwa/playerrecv.cpp index ecdfcc8bc..dd0e64ec1 100644 --- a/src/net/tmwa/playerrecv.cpp +++ b/src/net/tmwa/playerrecv.cpp @@ -36,6 +36,8 @@ #include "net/messagein.h" +#include "utils/performance.h" + #include "debug.h" extern unsigned int tmwServerVersion; diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp index 5dde7a622..cf2411e9a 100644 --- a/src/particle/imageparticle.cpp +++ b/src/particle/imageparticle.cpp @@ -27,6 +27,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" StringIntMap ImageParticle::imageParticleCountByName; diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp index 1d699cc0f..15517e018 100644 --- a/src/particle/textparticle.cpp +++ b/src/particle/textparticle.cpp @@ -29,6 +29,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" TextParticle::TextParticle(const std::string &restrict text, diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp index 860022fad..40eaa71cd 100644 --- a/src/progs/dyecmd/client.cpp +++ b/src/progs/dyecmd/client.cpp @@ -65,6 +65,7 @@ #include "utils/gettext.h" #include "utils/gettexthelper.h" #include "utils/mrand.h" +#include "utils/performance.h" #ifdef ANDROID #include "fs/paths.h" #endif // ANDROID diff --git a/src/progs/dyecmd/gui/viewport.cpp b/src/progs/dyecmd/gui/viewport.cpp index 7c6594ccc..574f0b19e 100644 --- a/src/progs/dyecmd/gui/viewport.cpp +++ b/src/progs/dyecmd/gui/viewport.cpp @@ -31,6 +31,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" Viewport *viewport = nullptr; diff --git a/src/progs/manaverse/client.cpp b/src/progs/manaverse/client.cpp index 91439d589..9430bcf5d 100644 --- a/src/progs/manaverse/client.cpp +++ b/src/progs/manaverse/client.cpp @@ -128,6 +128,7 @@ #ifdef ANDROID #include "fs/paths.h" #endif // ANDROID +#include "utils/performance.h" #include "utils/perfstat.h" #include "utils/sdlcheckutils.h" #include "utils/sdlhelper.h" diff --git a/src/progs/manaverse/gui/viewport.cpp b/src/progs/manaverse/gui/viewport.cpp index 4902b7175..654559967 100644 --- a/src/progs/manaverse/gui/viewport.cpp +++ b/src/progs/manaverse/gui/viewport.cpp @@ -53,6 +53,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "resources/map/map.h" #include "resources/map/mapitem.h" diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 199e547aa..df4814bc1 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -43,6 +43,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index d99f8b2a3..23163247c 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -41,6 +41,7 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index e5b8a7bce..a1237e130 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -45,6 +45,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/sdlhelper.h" diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 06a765580..9fff18311 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -41,6 +41,7 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index e09f13b6b..470d35b83 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -36,6 +36,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" GLuint NullOpenGLGraphics::mTextureBinded = 0; diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index 4605a4e95..2c3d1f2bb 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -33,6 +33,7 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index f44901469..f25a5ef74 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -77,6 +77,7 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index 35b7b7539..4f5e275f4 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -34,8 +34,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" - #include "utils/sdlpixel.h" #include "debug.h" diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 558fbc734..910c511ee 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -27,16 +27,16 @@ #include "graphicsmanager.h" -#include "utils/sdlcheckutils.h" - -#include "utils/sdlpixel.h" - #include "render/vertexes/imagecollection.h" #include "resources/imagerect.h" #include "resources/image/image.h" +#include "utils/performance.h" +#include "utils/sdlcheckutils.h" +#include "utils/sdlpixel.h" + #include "debug.h" #ifndef SDL_BIG_ENDIAN diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp index 87676a37c..de539ffe8 100644 --- a/src/render/surfacegraphics.cpp +++ b/src/render/surfacegraphics.cpp @@ -29,6 +29,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" SurfaceGraphics::SurfaceGraphics() : diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp index 818830383..98f8dbfab 100644 --- a/src/resources/animation/simpleanimation.cpp +++ b/src/resources/animation/simpleanimation.cpp @@ -37,6 +37,7 @@ #include "utils/checkutils.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index a2a4b112f..c9ea324dd 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -31,9 +31,6 @@ #include "fs/virtfs/rwops.h" -#include "utils/mathutils.h" -#include "utils/sdlcheckutils.h" - #include "resources/openglimagehelper.h" #include "resources/atlas/atlasresource.h" @@ -51,6 +48,9 @@ PRAGMA48(GCC diagnostic ignored "-Wshadow") PRAGMA48(GCC diagnostic pop) #include "utils/checkutils.h" +#include "utils/mathutils.h" +#include "utils/performance.h" +#include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/resources/delayedmanager.cpp b/src/resources/delayedmanager.cpp index 6276665bb..997715dd8 100644 --- a/src/resources/delayedmanager.cpp +++ b/src/resources/delayedmanager.cpp @@ -24,6 +24,7 @@ #include "resources/sprite/animationdelayload.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/timer.h" #include "debug.h" diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index b400dd1f9..5109d1b93 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -28,6 +28,7 @@ #include "resources/dye/dye.h" #include "resources/dye/dyepalette.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" PRAGMA48(GCC diagnostic push) diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index a24e63e36..48100dce6 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -34,6 +34,7 @@ #include "resources/dye/dye.h" #include "utils/checkutils.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index bfc7c7534..8b4196092 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -70,6 +70,7 @@ #include "utils/delete2.h" #include "utils/dtor.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/timer.h" #include <sys/stat.h> diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 5041165c3..27c3617db 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -34,6 +34,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" MapItem::MapItem() : diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 44c71b0c9..d910edd1d 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -35,6 +35,7 @@ #ifdef USE_OPENGL #include "utils/foreach.h" #endif // USE_OPENGL +#include "utils/performance.h" #include "render/graphics.h" diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp index 597d53141..b42302099 100644 --- a/src/resources/map/speciallayer.cpp +++ b/src/resources/map/speciallayer.cpp @@ -29,6 +29,7 @@ #include "utils/delete2.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 88bd312d8..5b0dbc080 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -61,8 +61,8 @@ #include "utils/base64.h" #include "utils/checkutils.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "utils/stringmap.h" - #include "utils/translation/podict.h" #include <zlib.h> diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 9f3b1fcd4..3168a75c6 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -45,6 +45,7 @@ #include "resources/image/image.h" #include "utils/checkutils.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index ea3bb9133..45a17565e 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -36,6 +36,7 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "utils/stringutils.h" #if !defined(DEBUG_DUMP_LEAKS) && !defined(UNITTESTS) diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index 7c273829e..d50f44fd0 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -41,6 +41,7 @@ #include "resources/image/image.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 60a42e6ef..b443fcedb 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -43,6 +43,7 @@ #include "utils/delete2.h" #include "utils/likely.h" #include "utils/mrand.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/resources/sprite/imagesprite.cpp b/src/resources/sprite/imagesprite.cpp index 3e866ea9c..bbee6dba0 100644 --- a/src/resources/sprite/imagesprite.cpp +++ b/src/resources/sprite/imagesprite.cpp @@ -24,6 +24,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" ImageSprite::ImageSprite(Image *const image) : diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 2bf1cf0a9..b317465dd 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -32,6 +32,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/performance.h" #include "resources/action.h" #include "resources/imageset.h" diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 47122b266..6a66010e2 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -43,6 +43,7 @@ #include "utils/cast.h" #endif #include "utils/checkutils.h" +#include "utils/performance.h" #include "utils/sdlmusichelper.h" PRAGMA48(GCC diagnostic push) diff --git a/src/text.cpp b/src/text.cpp index 9446c7f34..9ab8cb1e5 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -37,6 +37,7 @@ #include "resources/image/image.h" #include "utils/delete2.h" +#include "utils/performance.h" #include "debug.h" diff --git a/src/textmanager.cpp b/src/textmanager.cpp index 80a861d3e..21334dc38 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -25,6 +25,7 @@ #include "text.h" #include "utils/foreach.h" +#include "utils/performance.h" #include <cstring> diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc index c536a7186..984c25103 100644 --- a/src/unittests/resources/resourcemanager/resourcemanager.cc +++ b/src/unittests/resources/resourcemanager/resourcemanager.cc @@ -40,6 +40,7 @@ #include "utils/env.h" #include "utils/delete2.h" +#include "utils/performance.h" #include <unistd.h> diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index bb414aa06..9bff3f877 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -30,8 +30,8 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index c67f3c195..ebad1548a 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -31,8 +31,8 @@ #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index 9f044e69b..6646f136c 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -30,8 +30,8 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> |