From f167bd4dfb7fb5160ce062bdba1576468be0c2b0 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 27 Jun 2021 01:45:49 +0200 Subject: [PATCH] Clang-tidy: llvm-include-order --- Source/DiabloUI/credits.cpp | 4 ++-- Source/DiabloUI/diabloui.cpp | 2 +- Source/DiabloUI/dialogs.cpp | 2 +- Source/DiabloUI/fonts.cpp | 2 +- Source/DiabloUI/ttf_render_wrapped.cpp | 2 +- Source/appfat.cpp | 2 +- Source/capture.cpp | 2 +- Source/controls/devices/game_controller.cpp | 2 +- Source/controls/devices/joystick.cpp | 2 +- Source/controls/plrctrls.cpp | 2 +- Source/cursor.cpp | 2 +- Source/diablo.cpp | 3 +-- Source/drlg_l1.cpp | 2 +- Source/dvlnet/loopback.cpp | 2 +- Source/dvlnet/zerotier_native.cpp | 2 +- Source/encrypt.cpp | 2 +- Source/items.cpp | 2 +- Source/miniwin/misc_msg.cpp | 2 +- Source/movie.cpp | 2 +- Source/options.cpp | 4 ++-- Source/qol/itemlabels.cpp | 2 +- Source/sound.cpp | 6 +++--- Source/storm/storm.cpp | 2 +- Source/storm/storm_net.cpp | 2 +- Source/storm/storm_svid.cpp | 4 ++-- Source/utils/paths.cpp | 2 +- Source/utils/soundsample.cpp | 4 ++-- Source/utils/thread.cpp | 2 +- 28 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Source/DiabloUI/credits.cpp b/Source/DiabloUI/credits.cpp index 5b9ab4afa..022eca04e 100644 --- a/Source/DiabloUI/credits.cpp +++ b/Source/DiabloUI/credits.cpp @@ -12,10 +12,10 @@ #include "controls/menu_controls.h" #include "hwcursor.hpp" #include "utils/display.h" +#include "utils/language.h" +#include "utils/log.hpp" #include "utils/sdl_compat.h" #include "utils/sdl_ptrs.h" -#include "utils/log.hpp" -#include "utils/language.h" namespace devilution { diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp index 1270e8119..ec9370ebd 100644 --- a/Source/DiabloUI/diabloui.cpp +++ b/Source/DiabloUI/diabloui.cpp @@ -16,11 +16,11 @@ #include "palette.h" #include "storm/storm.h" #include "utils/display.h" +#include "utils/log.hpp" #include "utils/sdl_compat.h" #include "utils/sdl_ptrs.h" #include "utils/stubs.h" #include "utils/utf8.h" -#include "utils/log.hpp" #ifdef __SWITCH__ // for virtual keyboard on Switch diff --git a/Source/DiabloUI/dialogs.cpp b/Source/DiabloUI/dialogs.cpp index 200058550..862869cbf 100644 --- a/Source/DiabloUI/dialogs.cpp +++ b/Source/DiabloUI/dialogs.cpp @@ -12,8 +12,8 @@ #include "hwcursor.hpp" #include "palette.h" #include "utils/display.h" -#include "utils/log.hpp" #include "utils/language.h" +#include "utils/log.hpp" namespace devilution { diff --git a/Source/DiabloUI/fonts.cpp b/Source/DiabloUI/fonts.cpp index 81fa2b73f..88dbc324c 100644 --- a/Source/DiabloUI/fonts.cpp +++ b/Source/DiabloUI/fonts.cpp @@ -3,8 +3,8 @@ #include "diablo.h" #include "engine/load_file.hpp" #include "utils/file_util.h" -#include "utils/paths.h" #include "utils/log.hpp" +#include "utils/paths.h" namespace devilution { diff --git a/Source/DiabloUI/ttf_render_wrapped.cpp b/Source/DiabloUI/ttf_render_wrapped.cpp index 2195109f2..aa531614f 100644 --- a/Source/DiabloUI/ttf_render_wrapped.cpp +++ b/Source/DiabloUI/ttf_render_wrapped.cpp @@ -10,8 +10,8 @@ #include "utils/sdl2_backports.h" #endif -#include "utils/sdl_compat.h" #include "utils/log.hpp" +#include "utils/sdl_compat.h" namespace devilution { diff --git a/Source/appfat.cpp b/Source/appfat.cpp index 4c9f08a68..bbb691d44 100644 --- a/Source/appfat.cpp +++ b/Source/appfat.cpp @@ -10,8 +10,8 @@ #include "diablo.h" #include "storm/storm.h" -#include "utils/ui_fwd.h" #include "utils/language.h" +#include "utils/ui_fwd.h" namespace devilution { diff --git a/Source/capture.cpp b/Source/capture.cpp index d221f4459..cd7fdc37c 100644 --- a/Source/capture.cpp +++ b/Source/capture.cpp @@ -10,9 +10,9 @@ #include "palette.h" #include "storm/storm.h" #include "utils/file_util.h" +#include "utils/log.hpp" #include "utils/paths.h" #include "utils/ui_fwd.h" -#include "utils/log.hpp" namespace devilution { diff --git a/Source/controls/devices/game_controller.cpp b/Source/controls/devices/game_controller.cpp index dd5cce545..51981cd94 100644 --- a/Source/controls/devices/game_controller.cpp +++ b/Source/controls/devices/game_controller.cpp @@ -6,9 +6,9 @@ #include "controls/controller_motion.h" #include "controls/devices/joystick.h" +#include "utils/log.hpp" #include "utils/sdl_ptrs.h" #include "utils/stubs.h" -#include "utils/log.hpp" namespace devilution { diff --git a/Source/controls/devices/joystick.cpp b/Source/controls/devices/joystick.cpp index 762686a53..d5961a580 100644 --- a/Source/controls/devices/joystick.cpp +++ b/Source/controls/devices/joystick.cpp @@ -3,8 +3,8 @@ #include #include "controls/controller_motion.h" -#include "utils/stubs.h" #include "utils/log.hpp" +#include "utils/stubs.h" namespace devilution { diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp index 97b239c67..6786c65fc 100644 --- a/Source/controls/plrctrls.cpp +++ b/Source/controls/plrctrls.cpp @@ -6,8 +6,8 @@ #include "automap.h" #include "control.h" -#include "controls/controller_motion.h" #include "controls/controller.h" +#include "controls/controller_motion.h" #include "controls/game_controls.h" #include "cursor.h" #include "doom.h" diff --git a/Source/cursor.cpp b/Source/cursor.cpp index a21494d13..63fcc0e4b 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -9,9 +9,9 @@ #include "control.h" #include "doom.h" +#include "engine.h" #include "engine/load_cel.hpp" #include "engine/point.hpp" -#include "engine.h" #include "engine/render/cel_render.hpp" #include "hwcursor.hpp" #include "inv.h" diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 18fa3fb92..be848cc9d 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -18,6 +18,7 @@ #include "debug.h" #endif #include "DiabloUI/diabloui.h" +#include "controls/keymapper.hpp" #include "doom.h" #include "drlg_l1.h" #include "drlg_l2.h" @@ -59,8 +60,6 @@ #include "utils/console.h" #include "utils/language.h" #include "utils/paths.h" -#include "utils/language.h" -#include "controls/keymapper.hpp" #ifndef NOSOUND #include "sound.h" diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp index 851e21227..55f558ae9 100644 --- a/Source/drlg_l1.cpp +++ b/Source/drlg_l1.cpp @@ -5,8 +5,8 @@ */ #include "drlg_l1.h" -#include "engine/point.hpp" #include "engine/load_file.hpp" +#include "engine/point.hpp" #include "gendung.h" #include "lighting.h" #include "player.h" diff --git a/Source/dvlnet/loopback.cpp b/Source/dvlnet/loopback.cpp index b8a4558a5..e64bfdae3 100644 --- a/Source/dvlnet/loopback.cpp +++ b/Source/dvlnet/loopback.cpp @@ -1,6 +1,6 @@ #include "dvlnet/loopback.h" -#include "utils/stubs.h" #include "utils/language.h" +#include "utils/stubs.h" namespace devilution { namespace net { diff --git a/Source/dvlnet/zerotier_native.cpp b/Source/dvlnet/zerotier_native.cpp index 17e3b6c24..57db32b42 100644 --- a/Source/dvlnet/zerotier_native.cpp +++ b/Source/dvlnet/zerotier_native.cpp @@ -12,8 +12,8 @@ #include #include -#include "utils/paths.h" #include "utils/log.hpp" +#include "utils/paths.h" #include "dvlnet/zerotier_lwip.h" diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp index f5dae0af9..8a23ee86e 100644 --- a/Source/encrypt.cpp +++ b/Source/encrypt.cpp @@ -3,8 +3,8 @@ * * Implementation of functions for compression and decompressing MPQ data. */ -#include #include +#include #include "encrypt.h" #include "pkware.h" diff --git a/Source/items.cpp b/Source/items.cpp index af5327cb1..76df1d1cd 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -6,9 +6,9 @@ #include "items.h" #include +#include #include #include -#include #include diff --git a/Source/miniwin/misc_msg.cpp b/Source/miniwin/misc_msg.cpp index 5f07ae8ee..ccbd43783 100644 --- a/Source/miniwin/misc_msg.cpp +++ b/Source/miniwin/misc_msg.cpp @@ -3,8 +3,8 @@ #include #include "control.h" -#include "controls/controller_motion.h" #include "controls/controller.h" +#include "controls/controller_motion.h" #include "controls/game_controls.h" #include "controls/plrctrls.h" #include "controls/remap_keyboard.h" diff --git a/Source/movie.cpp b/Source/movie.cpp index fcbdf8a43..1110db73a 100644 --- a/Source/movie.cpp +++ b/Source/movie.cpp @@ -5,8 +5,8 @@ */ #include "diablo.h" -#include "hwcursor.hpp" #include "effects.h" +#include "hwcursor.hpp" #include "storm/storm_svid.h" #include "utils/display.h" diff --git a/Source/options.cpp b/Source/options.cpp index 47ab17d26..4d7a31c91 100644 --- a/Source/options.cpp +++ b/Source/options.cpp @@ -4,14 +4,14 @@ * Load and save options from the diablo.ini file. */ -#include #include +#include #define SI_SUPPORT_IOSTREAMS #include -#include "options.h" #include "diablo.h" +#include "options.h" #include "utils/file_util.h" #include "utils/paths.h" diff --git a/Source/qol/itemlabels.cpp b/Source/qol/itemlabels.cpp index 76ac22881..7309abfc4 100644 --- a/Source/qol/itemlabels.cpp +++ b/Source/qol/itemlabels.cpp @@ -1,8 +1,8 @@ #include "itemlabels.h" -#include #include #include +#include #include "common.h" #include "control.h" diff --git a/Source/sound.cpp b/Source/sound.cpp index daca1e925..35649313e 100644 --- a/Source/sound.cpp +++ b/Source/sound.cpp @@ -10,16 +10,16 @@ #include #include -#include #include -#include #include +#include #include +#include #include "init.h" #include "options.h" -#include "storm/storm_sdl_rw.h" #include "storm/storm.h" +#include "storm/storm_sdl_rw.h" #include "utils/log.hpp" #include "utils/math.h" #include "utils/sdl_mutex.h" diff --git a/Source/storm/storm.cpp b/Source/storm/storm.cpp index 199edc42a..389062c18 100644 --- a/Source/storm/storm.cpp +++ b/Source/storm/storm.cpp @@ -5,9 +5,9 @@ #include #include -#include "storm/storm.h" #include "DiabloUI/diabloui.h" #include "options.h" +#include "storm/storm.h" #include "utils/file_util.h" #include "utils/log.hpp" #include "utils/paths.h" diff --git a/Source/storm/storm_net.cpp b/Source/storm/storm_net.cpp index 252cda961..a9cc0e815 100644 --- a/Source/storm/storm_net.cpp +++ b/Source/storm/storm_net.cpp @@ -1,9 +1,9 @@ #include #ifndef NONET +#include "utils/sdl_mutex.h" #include #include #include -#include "utils/sdl_mutex.h" #endif #include "dvlnet/abstract_net.h" diff --git a/Source/storm/storm_svid.cpp b/Source/storm/storm_svid.cpp index 6630548a9..a6556caee 100644 --- a/Source/storm/storm_svid.cpp +++ b/Source/storm/storm_svid.cpp @@ -8,8 +8,8 @@ #include #ifndef NOSOUND -#include #include +#include #include "utils/push_aulib_decoder.h" #endif @@ -17,8 +17,8 @@ #include "dx.h" #include "options.h" #include "palette.h" -#include "storm/storm_file_wrapper.h" #include "storm/storm.h" +#include "storm/storm_file_wrapper.h" #include "utils/display.h" #include "utils/log.hpp" #include "utils/sdl_compat.h" diff --git a/Source/utils/paths.cpp b/Source/utils/paths.cpp index ffad80c54..e060e3cb8 100644 --- a/Source/utils/paths.cpp +++ b/Source/utils/paths.cpp @@ -2,9 +2,9 @@ #include -#include "utils/stdcompat/optional.hpp" #include "utils/file_util.h" #include "utils/log.hpp" +#include "utils/stdcompat/optional.hpp" #ifdef USE_SDL1 #include "utils/sdl2_to_1_2_backports.h" diff --git a/Source/utils/soundsample.cpp b/Source/utils/soundsample.cpp index 0bc26d18b..c2ba0587d 100644 --- a/Source/utils/soundsample.cpp +++ b/Source/utils/soundsample.cpp @@ -1,7 +1,7 @@ #include "utils/soundsample.h" -#include #include +#include #include #include @@ -13,8 +13,8 @@ #endif #include "options.h" -#include "storm/storm_sdl_rw.h" #include "storm/storm.h" +#include "storm/storm_sdl_rw.h" #include "utils/log.hpp" #include "utils/math.h" #include "utils/stubs.h" diff --git a/Source/utils/thread.cpp b/Source/utils/thread.cpp index 110bef483..7d186c0af 100644 --- a/Source/utils/thread.cpp +++ b/Source/utils/thread.cpp @@ -4,8 +4,8 @@ #include #include "appfat.h" -#include "utils/stubs.h" #include "utils/log.hpp" +#include "utils/stubs.h" namespace devilution {