diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj index 042c66b9626e..692f33a0d7cc 100644 --- a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj +++ b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj @@ -161,6 +161,7 @@ 91DCA6901C9360610030F8D0 /* test_formula_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91DCA68F1C9360610030F8D0 /* test_formula_core.cpp */; }; 91ECD5D21BA11A5200B25CF1 /* unit_creator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91ECD5D01BA11A5200B25CF1 /* unit_creator.cpp */; }; 91ECD5D51BA11A6400B25CF1 /* mp_replay_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91ECD5D31BA11A6400B25CF1 /* mp_replay_controller.cpp */; }; + 91EF6C051C9E22EA00E2A733 /* sha1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91EF6C011C9E22E400E2A733 /* sha1.cpp */; }; 91F462841C71139C0050A9C9 /* preferences_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462821C71139B0050A9C9 /* preferences_dialog.cpp */; }; 91F462851C71139C0050A9C9 /* preferences_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462821C71139B0050A9C9 /* preferences_dialog.cpp */; }; 91F462881C7115C50050A9C9 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F462861C7115C50050A9C9 /* combobox.cpp */; }; @@ -1450,7 +1451,7 @@ 91B621D11B76B4DE00B00E0F /* default_map_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = default_map_generator.hpp; sourceTree = ""; }; 91B621D21B76B4DE00B00E0F /* lua_map_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lua_map_generator.hpp; sourceTree = ""; }; 91B621D31B76B4DE00B00E0F /* map_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = map_generator.hpp; sourceTree = ""; }; - 91B621D41B76B51600B00E0F /* find_widget.tpp */ = {isa = PBXFileReference; lastKnownFileType = text; path = find_widget.tpp; sourceTree = ""; }; + 91B621D41B76B51600B00E0F /* find_widget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = find_widget.hpp; sourceTree = ""; }; 91B621D51B76B57F00B00E0F /* drawing.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = drawing.hpp; sourceTree = ""; }; 91B621D61B76B5BC00B00E0F /* advanced_graphics_options.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = advanced_graphics_options.hpp; sourceTree = ""; }; 91B621D71B76B5C500B00E0F /* campaign_settings.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = campaign_settings.hpp; sourceTree = ""; }; @@ -1462,7 +1463,7 @@ 91B621DD1B76B72500B00E0F /* mp_alerts_options.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_alerts_options.hpp; sourceTree = ""; }; 91B621DE1B76B72900B00E0F /* mp_change_control.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_change_control.hpp; sourceTree = ""; }; 91B621DF1B76B7DA00B00E0F /* mp_join_game_password_prompt.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_join_game_password_prompt.hpp; sourceTree = ""; }; - 91B621E01B76B90700B00E0F /* register.tpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = register.tpp; path = detail/register.tpp; sourceTree = ""; }; + 91B621E01B76B90700B00E0F /* register.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = register.hpp; path = detail/register.hpp; sourceTree = ""; }; 91B621E11B76BAB300B00E0F /* application_lua_kernel.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = application_lua_kernel.hpp; sourceTree = ""; }; 91B621E21B76BAF300B00E0F /* context.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = context.hpp; path = plugins/context.hpp; sourceTree = ""; }; 91B621E31B76BAF600B00E0F /* manager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = manager.hpp; path = plugins/manager.hpp; sourceTree = ""; }; @@ -1499,6 +1500,16 @@ 91ECD5D11BA11A5200B25CF1 /* unit_creator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_creator.hpp; sourceTree = ""; }; 91ECD5D31BA11A6400B25CF1 /* mp_replay_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp_replay_controller.cpp; sourceTree = ""; }; 91ECD5D41BA11A6400B25CF1 /* mp_replay_controller.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mp_replay_controller.hpp; sourceTree = ""; }; + 91EF6BFB1C9E22E400E2A733 /* boost_function_guarded.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = boost_function_guarded.hpp; sourceTree = ""; }; + 91EF6BFC1C9E22E400E2A733 /* const_clone.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = const_clone.hpp; sourceTree = ""; }; + 91EF6BFD1C9E22E400E2A733 /* enumerate.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = enumerate.hpp; sourceTree = ""; }; + 91EF6BFE1C9E22E400E2A733 /* foreach.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = foreach.hpp; sourceTree = ""; }; + 91EF6BFF1C9E22E400E2A733 /* iterator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = iterator.hpp; sourceTree = ""; }; + 91EF6C001C9E22E400E2A733 /* reference_counter.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = reference_counter.hpp; sourceTree = ""; }; + 91EF6C011C9E22E400E2A733 /* sha1.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = sha1.cpp; sourceTree = ""; }; + 91EF6C021C9E22E400E2A733 /* sha1.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = sha1.hpp; sourceTree = ""; }; + 91EF6C031C9E22E400E2A733 /* shared_object.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = shared_object.hpp; sourceTree = ""; }; + 91EF6C041C9E22E400E2A733 /* smart_list.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = smart_list.hpp; sourceTree = ""; }; 91F462821C71139B0050A9C9 /* preferences_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preferences_dialog.cpp; sourceTree = ""; }; 91F462831C71139B0050A9C9 /* preferences_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferences_dialog.hpp; sourceTree = ""; }; 91F462861C7115C50050A9C9 /* combobox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = combobox.cpp; sourceTree = ""; }; @@ -2465,7 +2476,7 @@ ECD5D7BE1A22DC8600114175 /* lua_cpp_function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cpp_function.cpp; sourceTree = ""; }; ECDEAF6D194FE84000DB2F47 /* fake_unit_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_unit_manager.cpp; sourceTree = ""; }; ECDEAF6E194FE84000DB2F47 /* fake_unit_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_unit_manager.hpp; sourceTree = ""; }; - ECDEAF74194FE86C00DB2F47 /* animated.tpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = animated.tpp; sourceTree = ""; }; + ECDEAF74194FE86C00DB2F47 /* animated.tpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = animated.tpp; sourceTree = ""; }; ECDEAF76194FEA8400DB2F47 /* syncmp_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = syncmp_handler.cpp; sourceTree = ""; }; ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_classification.cpp; sourceTree = ""; }; ECDF181E1A3FE0DE00D157A6 /* manager_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manager_impl.cpp; sourceTree = ""; }; @@ -3066,6 +3077,7 @@ B55999700EC62181008DD061 /* unit_types.hpp */, B559996D0EC62181008DD061 /* util.cpp */, B559996C0EC62181008DD061 /* util.hpp */, + 91EF6BF01C9E217C00E2A733 /* utils */, B559996B0EC62181008DD061 /* variable.cpp */, B559996A0EC62181008DD061 /* variable.hpp */, EC2864311967990500168DFF /* variable_info.cpp */, @@ -3504,6 +3516,23 @@ path = xBRZ; sourceTree = ""; }; + 91EF6BF01C9E217C00E2A733 /* utils */ = { + isa = PBXGroup; + children = ( + 91EF6BFB1C9E22E400E2A733 /* boost_function_guarded.hpp */, + 91EF6BFC1C9E22E400E2A733 /* const_clone.hpp */, + 91EF6BFD1C9E22E400E2A733 /* enumerate.hpp */, + 91EF6BFE1C9E22E400E2A733 /* foreach.hpp */, + 91EF6BFF1C9E22E400E2A733 /* iterator.hpp */, + 91EF6C001C9E22E400E2A733 /* reference_counter.hpp */, + 91EF6C011C9E22E400E2A733 /* sha1.cpp */, + 91EF6C021C9E22E400E2A733 /* sha1.hpp */, + 91EF6C031C9E22E400E2A733 /* shared_object.hpp */, + 91EF6C041C9E22E400E2A733 /* smart_list.hpp */, + ); + path = utils; + sourceTree = ""; + }; B52EE8FD12135AC300CFBDAB /* whiteboard */ = { isa = PBXGroup; children = ( @@ -3993,7 +4022,7 @@ B597EC520FC08E0100CE81F5 /* canvas.hpp */, B5B46932107118C400327599 /* event */, 62579C6D1573E4E3003089D5 /* filter.hpp */, - 91B621D41B76B51600B00E0F /* find_widget.tpp */, + 91B621D41B76B51600B00E0F /* find_widget.hpp */, B597EC530FC08E0100CE81F5 /* formula.hpp */, 49DA0D3113550EB2000AFEBD /* iterator */, B597EC540FC08E0100CE81F5 /* layout_exception.hpp */, @@ -4278,7 +4307,7 @@ B59915260F20EA1400BAD4C1 /* password_box.hpp */, B52EE89B1213590500CFBDAB /* progress_bar.cpp */, B52EE89C1213590500CFBDAB /* progress_bar.hpp */, - 91B621E01B76B90700B00E0F /* register.tpp */, + 91B621E01B76B90700B00E0F /* register.hpp */, B59271F910E9577800A13911 /* repeating_button.cpp */, B59271FA10E9577800A13911 /* repeating_button.hpp */, B5A9BD070ECA805A002BE442 /* scroll_label.cpp */, @@ -5559,6 +5588,7 @@ 91DCA68A1C9066CC0030F8D0 /* unit_preview_pane.cpp in Sources */, 91DCA68E1C9066EC0030F8D0 /* unit_recruit.cpp in Sources */, 91DCA6901C9360610030F8D0 /* test_formula_core.cpp in Sources */, + 91EF6C051C9E22EA00E2A733 /* sha1.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/animated.hpp b/src/animated.hpp index 02cf010e1be4..fee802217e51 100644 --- a/src/animated.hpp +++ b/src/animated.hpp @@ -133,5 +133,7 @@ friend class unit_animation; }; +#include "animated.tpp" + #endif diff --git a/src/animated.tpp b/src/animated.tpp index 2497b0257c56..61c5ec0c60f6 100644 --- a/src/animated.tpp +++ b/src/animated.tpp @@ -28,12 +28,12 @@ namespace { int current_ticks = 0; } -void new_animation_frame() +inline void new_animation_frame() { current_ticks = SDL_GetTicks(); } -int get_current_animation_tick() +inline int get_current_animation_tick() { return current_ticks; } @@ -42,7 +42,7 @@ template const T animated::void_value_ = T_void_value()(); template -animated::animated(int start_time) : +inline animated::animated(int start_time) : starting_frame_time_(start_time), does_not_change_(true), started_(false), @@ -57,7 +57,7 @@ animated::animated(int start_time) : } template -animated::animated(const std::vector > &cfg, int start_time, bool force_change ): +inline animated::animated(const std::vector > &cfg, int start_time, bool force_change ): starting_frame_time_(start_time), does_not_change_(true), started_(false), @@ -80,7 +80,7 @@ animated::animated(const std::vector > &cfg, in template -void animated::add_frame(int duration, const T& value,bool force_change) +inline void animated::add_frame(int duration, const T& value,bool force_change) { if(frames_.empty() ) { does_not_change_=!force_change; @@ -92,7 +92,7 @@ void animated::add_frame(int duration, const T& value,bool force } template -void animated::start_animation(int start_time, bool cycles) +inline void animated::start_animation(int start_time, bool cycles) { started_ = true; last_update_tick_ = current_ticks; @@ -108,7 +108,7 @@ void animated::start_animation(int start_time, bool cycles) template -void animated::update_last_draw_time(double acceleration) +inline void animated::update_last_draw_time(double acceleration) { if (acceleration > 0 && acceleration_ != acceleration) { int tmp = tick_to_time(last_update_tick_); @@ -150,7 +150,7 @@ void animated::update_last_draw_time(double acceleration) } template -bool animated::need_update() const +inline bool animated::need_update() const { if(force_next_update_) { return true; @@ -174,7 +174,7 @@ bool animated::need_update() const } template -bool animated::animation_finished_potential() const +inline bool animated::animation_finished_potential() const { if(frames_.empty()) return true; @@ -188,7 +188,7 @@ bool animated::animation_finished_potential() const return false; } template -bool animated::animation_finished() const +inline bool animated::animation_finished() const { if(frames_.empty()) return true; @@ -203,14 +203,14 @@ bool animated::animation_finished() const } template -int animated::get_animation_time_potential() const +inline int animated::get_animation_time_potential() const { if(!started_ && start_tick_ == 0 ) return starting_frame_time_; return tick_to_time(current_ticks); } template -int animated::get_animation_time() const +inline int animated::get_animation_time() const { if(!started_ && start_tick_ == 0 ) return starting_frame_time_; @@ -218,7 +218,7 @@ int animated::get_animation_time() const } template -void animated::set_animation_time(int time) +inline void animated::set_animation_time(int time) { start_tick_ = last_update_tick_ + static_cast(( starting_frame_time_ - time)/acceleration_); @@ -228,13 +228,13 @@ void animated::set_animation_time(int time) } template -int animated::get_animation_duration() const +inline int animated::get_animation_duration() const { return get_end_time() - get_begin_time(); } template -const T& animated::get_current_frame() const +inline const T& animated::get_current_frame() const { if(frames_.empty() ) return void_value_; @@ -242,7 +242,7 @@ const T& animated::get_current_frame() const } template -int animated::get_current_frame_begin_time() const +inline int animated::get_current_frame_begin_time() const { if(frames_.empty() ) return starting_frame_time_; @@ -250,7 +250,7 @@ int animated::get_current_frame_begin_time() const } template -int animated::get_current_frame_end_time() const +inline int animated::get_current_frame_end_time() const { if(frames_.empty() ) return starting_frame_time_; @@ -258,7 +258,7 @@ int animated::get_current_frame_end_time() const } template -int animated::get_current_frame_duration() const +inline int animated::get_current_frame_duration() const { if(frames_.empty() ) return 0; @@ -266,7 +266,7 @@ int animated::get_current_frame_duration() const } template -int animated::get_current_frame_time() const +inline int animated::get_current_frame_time() const { if(frames_.empty() ) return 0; @@ -275,7 +275,7 @@ int animated::get_current_frame_time() const } template -const T& animated::get_first_frame() const +inline const T& animated::get_first_frame() const { if(frames_.empty() ) return void_value_; @@ -283,7 +283,7 @@ const T& animated::get_first_frame() const } template -const T& animated::get_frame(size_t n) const +inline const T& animated::get_frame(size_t n) const { if(n >= frames_.size()) return void_value_; @@ -291,7 +291,7 @@ const T& animated::get_frame(size_t n) const } template -const T& animated::get_last_frame() const +inline const T& animated::get_last_frame() const { if(frames_.empty() ) return void_value_; @@ -299,25 +299,25 @@ const T& animated::get_last_frame() const } template -size_t animated::get_frames_count() const +inline size_t animated::get_frames_count() const { return frames_.size(); } template -int animated::get_begin_time() const +inline int animated::get_begin_time() const { return starting_frame_time_; } template -int animated::time_to_tick(int animation_time) const +inline int animated::time_to_tick(int animation_time) const { if(!started_ && start_tick_ == 0) return 0; return start_tick_ + static_cast((animation_time-starting_frame_time_)/acceleration_); } template -int animated::tick_to_time(int animation_tick) const +inline int animated::tick_to_time(int animation_tick) const { if(!started_ && start_tick_ == 0) return 0; return static_cast( @@ -325,7 +325,7 @@ int animated::tick_to_time(int animation_tick) const acceleration_) + starting_frame_time_); } template -int animated::get_end_time() const +inline int animated::get_end_time() const { if(frames_.empty()) return starting_frame_time_; @@ -341,7 +341,7 @@ void animated::remove_frames_until(int new_starting_time) } template -void animated::set_end_time(int new_ending_time) +inline void animated::set_end_time(int new_ending_time) { int last_start_time = starting_frame_time_; typename std::vector::iterator current_frame = frames_.begin(); @@ -358,7 +358,7 @@ typename std::vector::iterator current_frame = frames_.begin(); template -void animated::set_begin_time(int new_begin_time) +inline void animated::set_begin_time(int new_begin_time) { const int variation = new_begin_time - starting_frame_time_; starting_frame_time_ += variation; diff --git a/src/animated_game.cpp b/src/animated_game.cpp index 786fc098d4e9..5b1a564b9df3 100644 --- a/src/animated_game.cpp +++ b/src/animated_game.cpp @@ -17,7 +17,7 @@ * Template instantiations for wesnoth-game. */ -#include "animated.tpp" +#include "animated.hpp" // Force compilation of the following template instantiations #include "unit_frame.hpp" diff --git a/src/config.cpp b/src/config.cpp index bc79c0f9cb5c..f58db7e921e4 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -24,7 +24,7 @@ #include "log.hpp" #include "util.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" #include #include diff --git a/src/game_board.cpp b/src/game_board.cpp index accd8aa641ce..002917c4a759 100644 --- a/src/game_board.cpp +++ b/src/game_board.cpp @@ -21,7 +21,7 @@ #include "terrain_type_data.hpp" #include "unit.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/game_initialization/mp_options.cpp b/src/game_initialization/mp_options.cpp index 3d494d9decc7..5e5c318f99e2 100644 --- a/src/game_initialization/mp_options.cpp +++ b/src/game_initialization/mp_options.cpp @@ -14,7 +14,7 @@ #include "mp_options.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/window_builder.hpp" #include "gui/dialogs/transient_message.hpp" #include "gui/widgets/button.hpp" diff --git a/src/gui/auxiliary/canvas.cpp b/src/gui/auxiliary/canvas.cpp index 5244f3cfb487..56f46f454ea4 100644 --- a/src/gui/auxiliary/canvas.cpp +++ b/src/gui/auxiliary/canvas.cpp @@ -30,7 +30,7 @@ #include "gui/widgets/helper.hpp" #include "sdl/rect.hpp" #include "text.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "video.hpp" #include "wml_exception.hpp" diff --git a/src/gui/auxiliary/event/handler.cpp b/src/gui/auxiliary/event/handler.cpp index fac1b6be6fea..165556d6c45c 100644 --- a/src/gui/auxiliary/event/handler.cpp +++ b/src/gui/auxiliary/event/handler.cpp @@ -23,7 +23,7 @@ #include "gui/widgets/widget.hpp" #include "gui/widgets/window.hpp" #include "hotkey/hotkey_item.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "video.hpp" #include "serialization/unicode_cast.hpp" diff --git a/src/gui/auxiliary/find_widget.tpp b/src/gui/auxiliary/find_widget.hpp similarity index 98% rename from src/gui/auxiliary/find_widget.tpp rename to src/gui/auxiliary/find_widget.hpp index 31d30b4ba6e6..2585ddad8822 100644 --- a/src/gui/auxiliary/find_widget.tpp +++ b/src/gui/auxiliary/find_widget.hpp @@ -17,7 +17,7 @@ #include "gui/widgets/helper.hpp" #include "gui/widgets/widget.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/notifier.hpp b/src/gui/auxiliary/notifier.hpp index db7b3ee33ef0..bb064ad9d35f 100644 --- a/src/gui/auxiliary/notifier.hpp +++ b/src/gui/auxiliary/notifier.hpp @@ -16,7 +16,7 @@ #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED #include "gui/auxiliary/notifiee.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/gui/auxiliary/placer.hpp b/src/gui/auxiliary/placer.hpp index 20726272a6fd..0542871c6257 100644 --- a/src/gui/auxiliary/placer.hpp +++ b/src/gui/auxiliary/placer.hpp @@ -121,7 +121,7 @@ class tplacer_ } // namespace gui2 -#include "utils/enumerate.tpp" +#include "utils/enumerate.hpp" namespace gui2 { diff --git a/src/gui/auxiliary/tips.cpp b/src/gui/auxiliary/tips.cpp index e3e1fcda4400..a9b794245bf0 100644 --- a/src/gui/auxiliary/tips.cpp +++ b/src/gui/auxiliary/tips.cpp @@ -18,7 +18,7 @@ #include "config.hpp" #include "game_preferences.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/string_utils.hpp" namespace gui2 diff --git a/src/gui/auxiliary/widget_definition.hpp b/src/gui/auxiliary/widget_definition.hpp index 7e589677cddb..800145763327 100644 --- a/src/gui/auxiliary/widget_definition.hpp +++ b/src/gui/auxiliary/widget_definition.hpp @@ -18,7 +18,7 @@ #include "config.hpp" #include "font_options.hpp" #include "gui/auxiliary/canvas.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/auxiliary/window_builder.cpp b/src/gui/auxiliary/window_builder.cpp index 28709953f4c7..3b5b3a445ca9 100644 --- a/src/gui/auxiliary/window_builder.cpp +++ b/src/gui/auxiliary/window_builder.cpp @@ -45,7 +45,7 @@ #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "formula_string_utils.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" #include diff --git a/src/gui/auxiliary/window_builder/combobox.cpp b/src/gui/auxiliary/window_builder/combobox.cpp index c09624b245a1..323f46f78c9e 100644 --- a/src/gui/auxiliary/window_builder/combobox.cpp +++ b/src/gui/auxiliary/window_builder/combobox.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/window_builder/helper.hpp" #include "gui/widgets/combobox.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/auxiliary/window_builder/helper.cpp b/src/gui/auxiliary/window_builder/helper.cpp index 6b35a0e974bd..7364083d67e2 100644 --- a/src/gui/auxiliary/window_builder/helper.cpp +++ b/src/gui/auxiliary/window_builder/helper.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/widgets/grid.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/auxiliary/window_builder/horizontal_listbox.cpp b/src/gui/auxiliary/window_builder/horizontal_listbox.cpp index 3350a7a439df..297627e64a92 100644 --- a/src/gui/auxiliary/window_builder/horizontal_listbox.cpp +++ b/src/gui/auxiliary/window_builder/horizontal_listbox.cpp @@ -25,7 +25,7 @@ #else #include "gui/widgets/listbox.hpp" #endif -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/window_builder/listbox.cpp b/src/gui/auxiliary/window_builder/listbox.cpp index 2be1ea850722..2dfdd6d3a442 100644 --- a/src/gui/auxiliary/window_builder/listbox.cpp +++ b/src/gui/auxiliary/window_builder/listbox.cpp @@ -29,7 +29,7 @@ #include "gui/widgets/pane.hpp" #include "gui/widgets/viewport.hpp" #include "gui/widgets/settings.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/window_builder/multi_page.cpp b/src/gui/auxiliary/window_builder/multi_page.cpp index 875d9cc17028..bd1e940677f5 100644 --- a/src/gui/auxiliary/window_builder/multi_page.cpp +++ b/src/gui/auxiliary/window_builder/multi_page.cpp @@ -21,7 +21,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/multi_page.hpp" #include "gui/widgets/multi_page.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/window_builder/slider.cpp b/src/gui/auxiliary/window_builder/slider.cpp index b4926119d60b..0bda78f10127 100644 --- a/src/gui/auxiliary/window_builder/slider.cpp +++ b/src/gui/auxiliary/window_builder/slider.cpp @@ -20,7 +20,7 @@ #include "gettext.hpp" #include "gui/auxiliary/log.hpp" #include "gui/widgets/slider.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/window_builder/stacked_widget.cpp b/src/gui/auxiliary/window_builder/stacked_widget.cpp index aaf9969c97bf..60e45b8c7058 100644 --- a/src/gui/auxiliary/window_builder/stacked_widget.cpp +++ b/src/gui/auxiliary/window_builder/stacked_widget.cpp @@ -21,7 +21,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/stacked_widget.hpp" #include "gui/widgets/stacked_widget.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/auxiliary/window_builder/tree_view.cpp b/src/gui/auxiliary/window_builder/tree_view.cpp index f46517972db2..6e158825df31 100644 --- a/src/gui/auxiliary/window_builder/tree_view.cpp +++ b/src/gui/auxiliary/window_builder/tree_view.cpp @@ -21,7 +21,7 @@ #include "gui/auxiliary/widget_definition/tree_view.hpp" #include "gui/auxiliary/window_builder/helper.hpp" #include "gui/widgets/tree_view.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/dialogs/addon/description.cpp b/src/gui/dialogs/addon/description.cpp index 12247a68988d..306607e0e346 100644 --- a/src/gui/dialogs/addon/description.cpp +++ b/src/gui/dialogs/addon/description.cpp @@ -20,7 +20,7 @@ #include "desktop/open.hpp" #include "formula_string_utils.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/text_box.hpp" @@ -28,7 +28,7 @@ #include "language.hpp" #include "preferences.hpp" #include "strftime.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/addon/uninstall_list.cpp b/src/gui/dialogs/addon/uninstall_list.cpp index 9e7f94c407b9..b82ff0362d49 100644 --- a/src/gui/dialogs/addon/uninstall_list.cpp +++ b/src/gui/dialogs/addon/uninstall_list.cpp @@ -14,7 +14,7 @@ #include "gui/dialogs/addon/uninstall_list.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/grid.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" @@ -24,7 +24,7 @@ #include "gui/widgets/settings.hpp" #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/addon_connect.cpp b/src/gui/dialogs/addon_connect.cpp index 7b5954bbe713..95dd59939ab8 100644 --- a/src/gui/dialogs/addon_connect.cpp +++ b/src/gui/dialogs/addon_connect.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/addon_connect.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/window.hpp" #include "gui/widgets/settings.hpp" diff --git a/src/gui/dialogs/addon_list.cpp b/src/gui/dialogs/addon_list.cpp index d47c968f46c1..58585a3bf1d1 100644 --- a/src/gui/dialogs/addon_list.cpp +++ b/src/gui/dialogs/addon_list.cpp @@ -24,7 +24,7 @@ #include "gettext.hpp" #include "gui/auxiliary/filter.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" @@ -41,7 +41,7 @@ #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/text_box.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/string_utils.hpp" #include "formula_string_utils.hpp" #include "marked-up_text.hpp" diff --git a/src/gui/dialogs/advanced_graphics_options.cpp b/src/gui/dialogs/advanced_graphics_options.cpp index 8261a8008fff..9f1a34ba85ff 100644 --- a/src/gui/dialogs/advanced_graphics_options.cpp +++ b/src/gui/dialogs/advanced_graphics_options.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/advanced_graphics_options.hpp" #include "desktop/notifications.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/message.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" diff --git a/src/gui/dialogs/campaign_difficulty.cpp b/src/gui/dialogs/campaign_difficulty.cpp index d2fdfbd33ac4..b19aa72d5b9e 100644 --- a/src/gui/dialogs/campaign_difficulty.cpp +++ b/src/gui/dialogs/campaign_difficulty.cpp @@ -20,7 +20,7 @@ #include "gui/dialogs/campaign_difficulty.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/old_markup.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" @@ -29,7 +29,7 @@ #endif #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "log.hpp" diff --git a/src/gui/dialogs/campaign_selection.cpp b/src/gui/dialogs/campaign_selection.cpp index 96ec74f942d7..ef20528db20a 100644 --- a/src/gui/dialogs/campaign_selection.cpp +++ b/src/gui/dialogs/campaign_selection.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/campaign_selection.hpp" #include "game_preferences.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/dialogs/campaign_settings.hpp" #include "gui/widgets/button.hpp" @@ -34,7 +34,7 @@ #include "gui/widgets/tree_view_node.hpp" #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/string_utils.hpp" #include diff --git a/src/gui/dialogs/campaign_settings.cpp b/src/gui/dialogs/campaign_settings.cpp index a90592b14eb0..7b2292853f3a 100644 --- a/src/gui/dialogs/campaign_settings.cpp +++ b/src/gui/dialogs/campaign_settings.cpp @@ -16,7 +16,7 @@ #include "saved_game.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/campaign_settings.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" diff --git a/src/gui/dialogs/chat_log.cpp b/src/gui/dialogs/chat_log.cpp index 8a7e8b673bb0..86ca2e4dcfbe 100644 --- a/src/gui/dialogs/chat_log.cpp +++ b/src/gui/dialogs/chat_log.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/chat_log.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX @@ -28,7 +28,7 @@ #include "gui/widgets/text_box.hpp" #include "gui/widgets/window.hpp" #include "gui/widgets/slider.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "desktop/clipboard.hpp" #include "serialization/unicode.hpp" diff --git a/src/gui/dialogs/core_selection.cpp b/src/gui/dialogs/core_selection.cpp index 34bf5fb8ecda..8d79b1caf21b 100644 --- a/src/gui/dialogs/core_selection.cpp +++ b/src/gui/dialogs/core_selection.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/core_selection.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/image.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX @@ -28,7 +28,7 @@ #include "gui/widgets/scroll_label.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/string_utils.hpp" #include diff --git a/src/gui/dialogs/data_manage.cpp b/src/gui/dialogs/data_manage.cpp index ee29d7798afa..5fc46236e466 100644 --- a/src/gui/dialogs/data_manage.cpp +++ b/src/gui/dialogs/data_manage.cpp @@ -39,7 +39,7 @@ #include "language.hpp" #include "preferences_display.hpp" #include "savegame.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/gui/dialogs/debug_clock.cpp b/src/gui/dialogs/debug_clock.cpp index 68acc17ca6d1..5b208947829a 100644 --- a/src/gui/dialogs/debug_clock.cpp +++ b/src/gui/dialogs/debug_clock.cpp @@ -16,14 +16,14 @@ #include "gui/dialogs/debug_clock.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/dialog.hpp" #include "gui/widgets/integer_selector.hpp" #include "gui/widgets/window.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/pane.hpp" #include "gui/widgets/progress_bar.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/depcheck_select_new.cpp b/src/gui/dialogs/depcheck_select_new.cpp index a7af398a11cd..799f8ee2212b 100644 --- a/src/gui/dialogs/depcheck_select_new.cpp +++ b/src/gui/dialogs/depcheck_select_new.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/depcheck_select_new.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX diff --git a/src/gui/dialogs/dialog.cpp b/src/gui/dialogs/dialog.cpp index aea1905432bf..c39c8d1e3168 100644 --- a/src/gui/dialogs/dialog.cpp +++ b/src/gui/dialogs/dialog.cpp @@ -18,7 +18,7 @@ #include "gui/dialogs/field.hpp" #include "gui/widgets/integer_selector.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "video.hpp" namespace gui2 diff --git a/src/gui/dialogs/drop_down_list.cpp b/src/gui/dialogs/drop_down_list.cpp index 20b726295bb9..794166769053 100644 --- a/src/gui/dialogs/drop_down_list.cpp +++ b/src/gui/dialogs/drop_down_list.cpp @@ -16,12 +16,12 @@ #include "gui/dialogs/drop_down_list.hpp" #include "gui/widgets/listbox.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/dialog.hpp" #include "gui/widgets/integer_selector.hpp" #include "gui/widgets/window.hpp" #include "gui/widgets/settings.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/gui/dialogs/editor_generate_map.cpp b/src/gui/dialogs/editor_generate_map.cpp index 768957a61206..474e210d1334 100644 --- a/src/gui/dialogs/editor_generate_map.cpp +++ b/src/gui/dialogs/editor_generate_map.cpp @@ -15,7 +15,7 @@ #include "gui/dialogs/editor_generate_map.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" @@ -28,7 +28,7 @@ #include "gui/widgets/settings.hpp" #include "gui/widgets/text_box.hpp" #include "generators/map_generator.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/editor_set_starting_position.cpp b/src/gui/dialogs/editor_set_starting_position.cpp index 347bdbebaf77..6852ee6fe55c 100644 --- a/src/gui/dialogs/editor_set_starting_position.cpp +++ b/src/gui/dialogs/editor_set_starting_position.cpp @@ -20,7 +20,7 @@ #include "formatter.hpp" #include "formula_string_utils.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" #else diff --git a/src/gui/dialogs/field.hpp b/src/gui/dialogs/field.hpp index 87f36c093bc1..6b949932cbea 100644 --- a/src/gui/dialogs/field.hpp +++ b/src/gui/dialogs/field.hpp @@ -23,7 +23,7 @@ #ifndef GUI_DIALOGS_FIELD_HPP_INCLUDED #define GUI_DIALOGS_FIELD_HPP_INCLUDED -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/field-fwd.hpp" #include "gui/widgets/control.hpp" #include "gui/widgets/selectable.hpp" diff --git a/src/gui/dialogs/formula_debugger.cpp b/src/gui/dialogs/formula_debugger.cpp index bc8b0fc4eb94..6d7a57e101ad 100644 --- a/src/gui/dialogs/formula_debugger.cpp +++ b/src/gui/dialogs/formula_debugger.cpp @@ -16,13 +16,13 @@ #include "gui/dialogs/formula_debugger.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "../../formula_debugger.hpp" // We want the file in src/ -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/game_cache_options.cpp b/src/gui/dialogs/game_cache_options.cpp index a86812dc8105..5cfac566a72e 100644 --- a/src/gui/dialogs/game_cache_options.cpp +++ b/src/gui/dialogs/game_cache_options.cpp @@ -21,7 +21,7 @@ #include "cursor.hpp" #include "desktop/open.hpp" #include "filesystem.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/message.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" diff --git a/src/gui/dialogs/game_load.cpp b/src/gui/dialogs/game_load.cpp index ac49f9b8eb75..75d79cfcd1d5 100644 --- a/src/gui/dialogs/game_load.cpp +++ b/src/gui/dialogs/game_load.cpp @@ -41,7 +41,7 @@ #include "language.hpp" #include "preferences_display.hpp" #include "savegame.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/string_utils.hpp" #include diff --git a/src/gui/dialogs/game_version.cpp b/src/gui/dialogs/game_version.cpp index c9d730db3558..d57ab0b4f6ae 100644 --- a/src/gui/dialogs/game_version.cpp +++ b/src/gui/dialogs/game_version.cpp @@ -24,7 +24,7 @@ #include "formula_string_utils.hpp" #include "game_config.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/control.hpp" diff --git a/src/gui/dialogs/gamestate_inspector.cpp b/src/gui/dialogs/gamestate_inspector.cpp index 91db78dc0e3b..b17dda59662a 100644 --- a/src/gui/dialogs/gamestate_inspector.cpp +++ b/src/gui/dialogs/gamestate_inspector.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/gamestate_inspector.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/dialogs/lua_interpreter.hpp" #include "gui/widgets/button.hpp" @@ -31,7 +31,7 @@ #include "desktop/clipboard.hpp" #include "game_events/manager.hpp" #include "serialization/parser.hpp" // for write() -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "game_data.hpp" #include "recall_list_manager.hpp" diff --git a/src/gui/dialogs/label_settings.cpp b/src/gui/dialogs/label_settings.cpp index a0528689a0c7..e13e5fccd551 100644 --- a/src/gui/dialogs/label_settings.cpp +++ b/src/gui/dialogs/label_settings.cpp @@ -21,7 +21,7 @@ #include "game_display.hpp" #include "map_label.hpp" #include "resources.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/control.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" diff --git a/src/gui/dialogs/language_selection.cpp b/src/gui/dialogs/language_selection.cpp index 8b38bbba26c3..da2e7b376015 100644 --- a/src/gui/dialogs/language_selection.cpp +++ b/src/gui/dialogs/language_selection.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/language_selection.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" #else @@ -26,7 +26,7 @@ #include "gui/widgets/window.hpp" #include "language.hpp" #include "preferences.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/dialogs/lobby/lobby_data.cpp b/src/gui/dialogs/lobby/lobby_data.cpp index ddbcb47d970a..c33c2392bcb9 100644 --- a/src/gui/dialogs/lobby/lobby_data.cpp +++ b/src/gui/dialogs/lobby/lobby_data.cpp @@ -24,7 +24,7 @@ #include "map.hpp" #include "map_exception.hpp" #include "terrain_type_data.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" #include diff --git a/src/gui/dialogs/lobby/lobby_info.cpp b/src/gui/dialogs/lobby/lobby_info.cpp index 2211e80d8325..22e7ac7af7e0 100644 --- a/src/gui/dialogs/lobby/lobby_info.cpp +++ b/src/gui/dialogs/lobby/lobby_info.cpp @@ -19,7 +19,7 @@ #include "formula_string_utils.hpp" #include "gettext.hpp" #include "network.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "log.hpp" #include "map.hpp" #include "map_exception.hpp" diff --git a/src/gui/dialogs/lobby_player_info.cpp b/src/gui/dialogs/lobby_player_info.cpp index 78bdedb15a44..d1505b6c69cb 100644 --- a/src/gui/dialogs/lobby_player_info.cpp +++ b/src/gui/dialogs/lobby_player_info.cpp @@ -12,7 +12,7 @@ See the COPYING file for more details. */ -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/dialogs/lobby_player_info.hpp" #include "gui/widgets/button.hpp" diff --git a/src/gui/dialogs/lua_interpreter.cpp b/src/gui/dialogs/lua_interpreter.cpp index 35c31b0a0e2d..6bd1720d5350 100644 --- a/src/gui/dialogs/lua_interpreter.cpp +++ b/src/gui/dialogs/lua_interpreter.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/lua_interpreter.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/window_builder.hpp" #include "gui/dialogs/field.hpp" #include "gui/dialogs/helper.hpp" diff --git a/src/gui/dialogs/message.cpp b/src/gui/dialogs/message.cpp index 020c9ed2a43a..e22a5b0cf5f5 100644 --- a/src/gui/dialogs/message.cpp +++ b/src/gui/dialogs/message.cpp @@ -17,14 +17,14 @@ #include "gui/dialogs/message.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/image.hpp" #include "gui/widgets/label.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "log.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/dialogs/mp_alerts_options.cpp b/src/gui/dialogs/mp_alerts_options.cpp index 8a70b3210a47..508dd8d1423f 100644 --- a/src/gui/dialogs/mp_alerts_options.cpp +++ b/src/gui/dialogs/mp_alerts_options.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/mp_alerts_options.hpp" #include "desktop/notifications.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/message.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" diff --git a/src/gui/dialogs/mp_change_control.cpp b/src/gui/dialogs/mp_change_control.cpp index 82c640fcbfaa..cc58772d4867 100644 --- a/src/gui/dialogs/mp_change_control.cpp +++ b/src/gui/dialogs/mp_change_control.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/mp_change_control.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/widgets/button.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX @@ -35,7 +35,7 @@ #include "marked-up_text.hpp" #include "resources.hpp" #include "team.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/gui/dialogs/mp_connect.cpp b/src/gui/dialogs/mp_connect.cpp index 48a7a178f5d9..f6727900b8c1 100644 --- a/src/gui/dialogs/mp_connect.cpp +++ b/src/gui/dialogs/mp_connect.cpp @@ -26,7 +26,7 @@ #include "gui/widgets/listbox.hpp" #endif #include "gui/widgets/settings.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/mp_create_game.cpp b/src/gui/dialogs/mp_create_game.cpp index a911706b3d8b..ac689b02d07c 100644 --- a/src/gui/dialogs/mp_create_game.cpp +++ b/src/gui/dialogs/mp_create_game.cpp @@ -32,7 +32,7 @@ #include "gui/widgets/minimap.hpp" #include "gui/widgets/settings.hpp" #include "settings.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include diff --git a/src/gui/dialogs/mp_login.cpp b/src/gui/dialogs/mp_login.cpp index 6d0b3437c317..07bb012557cd 100644 --- a/src/gui/dialogs/mp_login.cpp +++ b/src/gui/dialogs/mp_login.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/mp_login.hpp" #include "game_preferences.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/password_box.hpp" #include "gui/widgets/settings.hpp" diff --git a/src/gui/dialogs/mp_method_selection.cpp b/src/gui/dialogs/mp_method_selection.cpp index dd9d8e36a190..e62f64da5055 100644 --- a/src/gui/dialogs/mp_method_selection.cpp +++ b/src/gui/dialogs/mp_method_selection.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/mp_method_selection.hpp" #include "game_preferences.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" #else diff --git a/src/gui/dialogs/network_transmission.cpp b/src/gui/dialogs/network_transmission.cpp index 3b01e09bfe6b..917aa134a8aa 100644 --- a/src/gui/dialogs/network_transmission.cpp +++ b/src/gui/dialogs/network_transmission.cpp @@ -18,7 +18,7 @@ #include "formula_string_utils.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/progress_bar.hpp" #include "gui/widgets/label.hpp" diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp index d55c681889d2..80c88bea3942 100644 --- a/src/gui/dialogs/preferences_dialog.cpp +++ b/src/gui/dialogs/preferences_dialog.cpp @@ -28,7 +28,7 @@ #include "formula_string_utils.hpp" #include "filesystem.hpp" #include "gui/dialogs/message.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" // Sub-dialog includes #include "gui/dialogs/advanced_graphics_options.hpp" @@ -56,7 +56,7 @@ #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/window.hpp" #include "util.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "gettext.hpp" diff --git a/src/gui/dialogs/screenshot_notification.cpp b/src/gui/dialogs/screenshot_notification.cpp index 3d495deb971e..bc0e643b9e54 100644 --- a/src/gui/dialogs/screenshot_notification.cpp +++ b/src/gui/dialogs/screenshot_notification.cpp @@ -19,7 +19,7 @@ #include "desktop/clipboard.hpp" #include "desktop/open.hpp" #include "filesystem.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/text_box.hpp" diff --git a/src/gui/dialogs/select_orb_colors.cpp b/src/gui/dialogs/select_orb_colors.cpp index b5dcccf3e85e..8b063263198f 100644 --- a/src/gui/dialogs/select_orb_colors.cpp +++ b/src/gui/dialogs/select_orb_colors.cpp @@ -16,7 +16,7 @@ #include "select_orb_colors.hpp" #include "gui/auxiliary/event/dispatcher.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/iterator/walker.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/grid.hpp" diff --git a/src/gui/dialogs/simple_item_selector.cpp b/src/gui/dialogs/simple_item_selector.cpp index 4bd0cf496ff2..2a6f533d381b 100644 --- a/src/gui/dialogs/simple_item_selector.cpp +++ b/src/gui/dialogs/simple_item_selector.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/simple_item_selector.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX @@ -26,7 +26,7 @@ #endif #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/dialogs/synced_choice_wait.cpp b/src/gui/dialogs/synced_choice_wait.cpp index a3186d0438ac..1d94fdeb95a0 100644 --- a/src/gui/dialogs/synced_choice_wait.cpp +++ b/src/gui/dialogs/synced_choice_wait.cpp @@ -14,7 +14,7 @@ #include "gui/dialogs/synced_choice_wait.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/label.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/settings.hpp" diff --git a/src/gui/dialogs/theme_list.cpp b/src/gui/dialogs/theme_list.cpp index 88a87985f9ea..1342e248f88f 100644 --- a/src/gui/dialogs/theme_list.cpp +++ b/src/gui/dialogs/theme_list.cpp @@ -14,7 +14,7 @@ #include "gui/dialogs/theme_list.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX #include "gui/widgets/list.hpp" #else @@ -23,7 +23,7 @@ #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "theme.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/dialogs/tip.cpp b/src/gui/dialogs/tip.cpp index 164eda20f099..cbd6b7fffdaf 100644 --- a/src/gui/dialogs/tip.cpp +++ b/src/gui/dialogs/tip.cpp @@ -17,7 +17,7 @@ #include "gui/dialogs/tip.hpp" #include "gui/dialogs/dialog.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/popup.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" diff --git a/src/gui/dialogs/title_screen.cpp b/src/gui/dialogs/title_screen.cpp index 5d3d599d032a..e409ef6bfdb2 100644 --- a/src/gui/dialogs/title_screen.cpp +++ b/src/gui/dialogs/title_screen.cpp @@ -20,7 +20,7 @@ #include "game_preferences.hpp" #include "gettext.hpp" #include "log.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/timer.hpp" #include "gui/auxiliary/tips.hpp" #include "gui/dialogs/debug_clock.hpp" @@ -37,7 +37,7 @@ #include "gui/widgets/multi_page.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "video.hpp" #include diff --git a/src/gui/dialogs/transient_message.cpp b/src/gui/dialogs/transient_message.cpp index dbf51dd3fda3..6241437fde11 100644 --- a/src/gui/dialogs/transient_message.cpp +++ b/src/gui/dialogs/transient_message.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/transient_message.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "log.hpp" diff --git a/src/gui/dialogs/unit_attack.cpp b/src/gui/dialogs/unit_attack.cpp index 2df619c00fc4..2a59da471063 100644 --- a/src/gui/dialogs/unit_attack.cpp +++ b/src/gui/dialogs/unit_attack.cpp @@ -18,7 +18,7 @@ #include "gui/dialogs/unit_attack.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" #include "gui/widgets/image.hpp" @@ -39,7 +39,7 @@ #include "unit.hpp" #include "unit_types.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/unit_create.cpp b/src/gui/dialogs/unit_create.cpp index fb2f0fdf695b..a3bbd85a50c2 100644 --- a/src/gui/dialogs/unit_create.cpp +++ b/src/gui/dialogs/unit_create.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/unit_create.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/dialogs/helper.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX @@ -42,7 +42,7 @@ #include "team.hpp" #include "unit_types.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/unit_recruit.cpp b/src/gui/dialogs/unit_recruit.cpp index 15e547231017..89f853562ac6 100644 --- a/src/gui/dialogs/unit_recruit.cpp +++ b/src/gui/dialogs/unit_recruit.cpp @@ -13,7 +13,7 @@ #define GETTEXT_DOMAIN "wesnoth-lib" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/dialogs/helper.hpp" #include "gui/dialogs/unit_recruit.hpp" #include "gui/widgets/button.hpp" @@ -36,7 +36,7 @@ #include "unit_types.hpp" #include "whiteboard/manager.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/dialogs/wml_error.cpp b/src/gui/dialogs/wml_error.cpp index 7c462e4d964d..0e7bc00e7d17 100644 --- a/src/gui/dialogs/wml_error.cpp +++ b/src/gui/dialogs/wml_error.cpp @@ -20,7 +20,7 @@ #include "addon/manager.hpp" #include "desktop/clipboard.hpp" #include "filesystem.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/control.hpp" #include "gui/widgets/settings.hpp" diff --git a/src/gui/dialogs/wml_message.cpp b/src/gui/dialogs/wml_message.cpp index bb2401ad64f5..2fe69cbb20d8 100644 --- a/src/gui/dialogs/wml_message.cpp +++ b/src/gui/dialogs/wml_message.cpp @@ -16,7 +16,7 @@ #include "gui/dialogs/wml_message.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/label.hpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index d2aa1f545417..f4d714610a35 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/button.hpp" #include "gui/auxiliary/window_builder/button.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "sound.hpp" diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp index e41b35a3788a..2a8f0fdc078c 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/combobox.cpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/combobox.hpp" #include "gui/auxiliary/window_builder/combobox.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "gui/dialogs/drop_down_list.hpp" diff --git a/src/gui/widgets/control.cpp b/src/gui/widgets/control.cpp index ab591ee0992d..fe5ad8562357 100644 --- a/src/gui/widgets/control.cpp +++ b/src/gui/widgets/control.cpp @@ -26,7 +26,7 @@ #include "gui/widgets/window.hpp" #include "gui/auxiliary/window_builder/control.hpp" #include "marked-up_text.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "hotkey/hotkey_item.hpp" #include diff --git a/src/gui/widgets/detail/register.tpp b/src/gui/widgets/detail/register.hpp similarity index 100% rename from src/gui/widgets/detail/register.tpp rename to src/gui/widgets/detail/register.hpp diff --git a/src/gui/widgets/drawing.cpp b/src/gui/widgets/drawing.cpp index 7c1c89fac880..4b218f80e35e 100644 --- a/src/gui/widgets/drawing.cpp +++ b/src/gui/widgets/drawing.cpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/widget_definition/drawing.hpp" #include "gui/auxiliary/window_builder/drawing.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/generator.cpp b/src/gui/widgets/generator.cpp index 072c81b59b77..7a136862f887 100644 --- a/src/gui/widgets/generator.cpp +++ b/src/gui/widgets/generator.cpp @@ -17,7 +17,7 @@ #include "gui/widgets/generator_private.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/widgets/generator_private.hpp b/src/gui/widgets/generator_private.hpp index 4267c680f134..8a75314439b6 100644 --- a/src/gui/widgets/generator_private.hpp +++ b/src/gui/widgets/generator_private.hpp @@ -22,7 +22,7 @@ #include "gui/widgets/selectable.hpp" #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/toggle_panel.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" namespace gui2 { diff --git a/src/gui/widgets/grid.cpp b/src/gui/widgets/grid.cpp index 26a12fe2ccce..470a31a29107 100644 --- a/src/gui/widgets/grid.cpp +++ b/src/gui/widgets/grid.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/layout_exception.hpp" #include "gui/widgets/control.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/grid_private.hpp b/src/gui/widgets/grid_private.hpp index cbea9b19c879..72fabbc9fb8e 100644 --- a/src/gui/widgets/grid_private.hpp +++ b/src/gui/widgets/grid_private.hpp @@ -32,7 +32,7 @@ #include "gui/widgets/grid.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" #include diff --git a/src/gui/widgets/group.hpp b/src/gui/widgets/group.hpp index 5ffffbb51ba0..0b3b85720621 100644 --- a/src/gui/widgets/group.hpp +++ b/src/gui/widgets/group.hpp @@ -17,7 +17,7 @@ #include "gui/auxiliary/event/dispatcher.hpp" #include "gui/widgets/selectable.hpp" #include "gui/widgets/widget.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/gui/widgets/horizontal_scrollbar.cpp b/src/gui/widgets/horizontal_scrollbar.cpp index 6d6496f54482..27b4ee0a1585 100644 --- a/src/gui/widgets/horizontal_scrollbar.cpp +++ b/src/gui/widgets/horizontal_scrollbar.cpp @@ -16,7 +16,7 @@ #include "gui/widgets/horizontal_scrollbar.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/auxiliary/widget_definition/horizontal_scrollbar.hpp" #include "gui/auxiliary/window_builder/horizontal_scrollbar.hpp" diff --git a/src/gui/widgets/image.cpp b/src/gui/widgets/image.cpp index 89d654a2d025..d4acc1493513 100644 --- a/src/gui/widgets/image.cpp +++ b/src/gui/widgets/image.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/widget_definition/image.hpp" #include "gui/auxiliary/window_builder/image.hpp" #include "gui/auxiliary/log.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index a67aec235a61..6eb6708bcee7 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/widget_definition/label.hpp" #include "gui/auxiliary/window_builder/label.hpp" #include "gui/dialogs/message.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" diff --git a/src/gui/widgets/list.cpp b/src/gui/widgets/list.cpp index 800b319b0d69..16df9d6dab66 100644 --- a/src/gui/widgets/list.cpp +++ b/src/gui/widgets/list.cpp @@ -18,11 +18,11 @@ #include "gui/widgets/list.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/listbox.hpp" #include "gui/auxiliary/window_builder/listbox.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/selectable.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 2f1dc1ee57f6..be4455e54672 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -18,13 +18,13 @@ #include "gui/widgets/listbox.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/layout_exception.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/listbox.hpp" #include "gui/auxiliary/window_builder/listbox.hpp" #include "gui/auxiliary/window_builder/horizontal_listbox.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/selectable.hpp" #include "gui/widgets/window.hpp" diff --git a/src/gui/widgets/matrix.cpp b/src/gui/widgets/matrix.cpp index 0f07a02b0f00..1bb1ab6cfe7b 100644 --- a/src/gui/widgets/matrix.cpp +++ b/src/gui/widgets/matrix.cpp @@ -16,11 +16,11 @@ #include "gui/widgets/matrix.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/matrix.hpp" #include "gui/auxiliary/window_builder/matrix.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/minimap.cpp b/src/gui/widgets/minimap.cpp index dd3640e376e7..40457fdd8a5d 100644 --- a/src/gui/widgets/minimap.cpp +++ b/src/gui/widgets/minimap.cpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/minimap.hpp" #include "gui/auxiliary/window_builder/minimap.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "map.hpp" #include "map_exception.hpp" diff --git a/src/gui/widgets/multi_page.cpp b/src/gui/widgets/multi_page.cpp index 3d799655a1b8..6c18b0859e39 100644 --- a/src/gui/widgets/multi_page.cpp +++ b/src/gui/widgets/multi_page.cpp @@ -16,10 +16,10 @@ #include "gui/widgets/multi_page.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/widget_definition/multi_page.hpp" #include "gui/auxiliary/window_builder/multi_page.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/generator.hpp" diff --git a/src/gui/widgets/pane.cpp b/src/gui/widgets/pane.cpp index 30fbd49d3dac..d98befa28b68 100644 --- a/src/gui/widgets/pane.cpp +++ b/src/gui/widgets/pane.cpp @@ -16,11 +16,11 @@ #include "gui/widgets/pane.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/widgets/grid.hpp" #include "gui/widgets/window.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" #include "gui/auxiliary/window_builder/pane.hpp" #include "gui/auxiliary/event/message.hpp" diff --git a/src/gui/widgets/panel.cpp b/src/gui/widgets/panel.cpp index ad04e13aadf3..cb6ffbb6690c 100644 --- a/src/gui/widgets/panel.cpp +++ b/src/gui/widgets/panel.cpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/panel.hpp" #include "gui/auxiliary/window_builder/panel.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/password_box.cpp b/src/gui/widgets/password_box.cpp index 78ac10641a71..2cf2ad860045 100644 --- a/src/gui/widgets/password_box.cpp +++ b/src/gui/widgets/password_box.cpp @@ -21,7 +21,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/text_box.hpp" #include "gui/auxiliary/window_builder/password_box.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "serialization/string_utils.hpp" #include "serialization/unicode.hpp" diff --git a/src/gui/widgets/progress_bar.cpp b/src/gui/widgets/progress_bar.cpp index b76815d11a81..90a3d9246ec5 100644 --- a/src/gui/widgets/progress_bar.cpp +++ b/src/gui/widgets/progress_bar.cpp @@ -19,9 +19,9 @@ #include "gui/auxiliary/widget_definition/progress_bar.hpp" #include "gui/auxiliary/window_builder/progress_bar.hpp" #include "gui/auxiliary/log.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/repeating_button.cpp b/src/gui/widgets/repeating_button.cpp index a52ffbde806e..d886dcb9f4d2 100644 --- a/src/gui/widgets/repeating_button.cpp +++ b/src/gui/widgets/repeating_button.cpp @@ -20,7 +20,7 @@ #include "gui/auxiliary/timer.hpp" #include "gui/auxiliary/widget_definition/repeating_button.hpp" #include "gui/auxiliary/window_builder/repeating_button.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "sound.hpp" diff --git a/src/gui/widgets/scroll_label.cpp b/src/gui/widgets/scroll_label.cpp index 8cb7b4182506..46f02ac0785a 100644 --- a/src/gui/widgets/scroll_label.cpp +++ b/src/gui/widgets/scroll_label.cpp @@ -17,11 +17,11 @@ #include "gui/widgets/scroll_label.hpp" #include "gui/widgets/label.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/scroll_label.hpp" #include "gui/auxiliary/window_builder/scroll_label.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/scrollbar.hpp" #include "gui/widgets/spacer.hpp" diff --git a/src/gui/widgets/scrollbar.cpp b/src/gui/widgets/scrollbar.cpp index ce514cf414d7..c3524650ca06 100644 --- a/src/gui/widgets/scrollbar.cpp +++ b/src/gui/widgets/scrollbar.cpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/widgets/window.hpp" // Needed for invalidate_layout() -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/scrollbar_container.cpp b/src/gui/widgets/scrollbar_container.cpp index d3729118634a..dbe80966668d 100644 --- a/src/gui/widgets/scrollbar_container.cpp +++ b/src/gui/widgets/scrollbar_container.cpp @@ -16,13 +16,13 @@ #include "gui/widgets/scrollbar_container_private.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/layout_exception.hpp" #include "gui/widgets/clickable.hpp" #include "gui/widgets/spacer.hpp" #include "gui/widgets/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "sdl/rect.hpp" #include diff --git a/src/gui/widgets/scrollbar_container_private.hpp b/src/gui/widgets/scrollbar_container_private.hpp index c6293b44ffbc..472c24bf502b 100644 --- a/src/gui/widgets/scrollbar_container_private.hpp +++ b/src/gui/widgets/scrollbar_container_private.hpp @@ -17,7 +17,7 @@ #include "gui/widgets/scrollbar_container.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" /** * @file diff --git a/src/gui/widgets/scrollbar_panel.cpp b/src/gui/widgets/scrollbar_panel.cpp index c89af95982fb..36d963e91d0a 100644 --- a/src/gui/widgets/scrollbar_panel.cpp +++ b/src/gui/widgets/scrollbar_panel.cpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/widget_definition/scrollbar_panel.hpp" #include "gui/auxiliary/window_builder/scrollbar_panel.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/settings.cpp b/src/gui/widgets/settings.cpp index 3eec3c9b221f..7a6f1ce851fc 100644 --- a/src/gui/widgets/settings.cpp +++ b/src/gui/widgets/settings.cpp @@ -32,7 +32,7 @@ #include "serialization/preprocessor.hpp" #include "serialization/schema_validator.hpp" #include "formula_string_utils.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" namespace gui2 diff --git a/src/gui/widgets/settings.hpp b/src/gui/widgets/settings.hpp index 96c65ac81b27..0b27a55858c3 100644 --- a/src/gui/widgets/settings.hpp +++ b/src/gui/widgets/settings.hpp @@ -22,7 +22,7 @@ #include "gui/auxiliary/widget_definition/window.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "utils/boost_function_guarded.hpp" diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 0b659d31bea5..929e436a6793 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -21,10 +21,10 @@ #include "gui/auxiliary/widget_definition/slider.hpp" #include "gui/auxiliary/window_builder/slider.hpp" #include "gui/widgets/window.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "sound.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/spacer.cpp b/src/gui/widgets/spacer.cpp index b2d21ac65414..3d38aae9994f 100644 --- a/src/gui/widgets/spacer.cpp +++ b/src/gui/widgets/spacer.cpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/widget_definition/spacer.hpp" #include "gui/auxiliary/window_builder/spacer.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/stacked_widget.cpp b/src/gui/widgets/stacked_widget.cpp index d60ada1abbee..5d20f25958f5 100644 --- a/src/gui/widgets/stacked_widget.cpp +++ b/src/gui/widgets/stacked_widget.cpp @@ -16,13 +16,13 @@ #include "gui/widgets/stacked_widget.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/widget_definition/stacked_widget.hpp" #include "gui/auxiliary/window_builder/stacked_widget.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/generator.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/text_box.cpp b/src/gui/widgets/text_box.cpp index 5bfcd7534673..2ef71204f7a6 100644 --- a/src/gui/widgets/text_box.cpp +++ b/src/gui/widgets/text_box.cpp @@ -20,11 +20,11 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/text_box.hpp" #include "gui/auxiliary/window_builder/text_box.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "game_preferences.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "serialization/unicode.hpp" #include diff --git a/src/gui/widgets/toggle_button.cpp b/src/gui/widgets/toggle_button.cpp index 93c9b412d916..aae4ac3b097d 100644 --- a/src/gui/widgets/toggle_button.cpp +++ b/src/gui/widgets/toggle_button.cpp @@ -19,11 +19,11 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/toggle_button.hpp" #include "gui/auxiliary/window_builder/toggle_button.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "sound.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/toggle_panel.cpp b/src/gui/widgets/toggle_panel.cpp index 15b5522d82f9..e79cb27c0529 100644 --- a/src/gui/widgets/toggle_panel.cpp +++ b/src/gui/widgets/toggle_panel.cpp @@ -19,11 +19,11 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/toggle_panel.hpp" #include "gui/auxiliary/window_builder/toggle_panel.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" #include "sound.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/tree_view.cpp b/src/gui/widgets/tree_view.cpp index 2a84894208b8..caf100cd2048 100644 --- a/src/gui/widgets/tree_view.cpp +++ b/src/gui/widgets/tree_view.cpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/widget_definition/tree_view.hpp" #include "gui/auxiliary/window_builder/tree_view.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/tree_view_node.hpp" #include "gui/widgets/window.hpp" diff --git a/src/gui/widgets/tree_view_node.cpp b/src/gui/widgets/tree_view_node.cpp index f8f17ced60df..9437743384fd 100644 --- a/src/gui/widgets/tree_view_node.cpp +++ b/src/gui/widgets/tree_view_node.cpp @@ -17,12 +17,12 @@ #include "gui/widgets/tree_view_node.hpp" #include "gettext.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/toggle_panel.hpp" #include "gui/widgets/tree_view.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/unit_preview_pane.cpp b/src/gui/widgets/unit_preview_pane.cpp index ed9f0c82b740..8fe4fdd4906c 100644 --- a/src/gui/widgets/unit_preview_pane.cpp +++ b/src/gui/widgets/unit_preview_pane.cpp @@ -15,11 +15,11 @@ #include "gui/widgets/unit_preview_pane.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/widget_definition/unit_preview_pane.hpp" #include "gui/auxiliary/window_builder/unit_preview_pane.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/image.hpp" #include "gui/widgets/label.hpp" @@ -35,7 +35,7 @@ #include "resources.hpp" #include "team.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include diff --git a/src/gui/widgets/vertical_scrollbar.cpp b/src/gui/widgets/vertical_scrollbar.cpp index d72b3477ed4b..280431317e4f 100644 --- a/src/gui/widgets/vertical_scrollbar.cpp +++ b/src/gui/widgets/vertical_scrollbar.cpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/widget_definition/vertical_scrollbar.hpp" #include "gui/auxiliary/window_builder/vertical_scrollbar.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/settings.hpp" #include diff --git a/src/gui/widgets/viewport.cpp b/src/gui/widgets/viewport.cpp index 42d738b58608..a73cda9a70f1 100644 --- a/src/gui/widgets/viewport.cpp +++ b/src/gui/widgets/viewport.cpp @@ -17,7 +17,7 @@ #include "gui/widgets/viewport.hpp" #include "gui/auxiliary/log.hpp" -#include "utils/const_clone.tpp" +#include "utils/const_clone.hpp" #include "gui/auxiliary/window_builder/viewport.hpp" #define LOG_SCOPE_HEADER "tviewport [" + id() + "] " + __func__ diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 56fb456d62e2..fa769ab89653 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -34,7 +34,7 @@ #include "gui/auxiliary/event/handler.hpp" #include "gui/auxiliary/event/message.hpp" #include "gui/auxiliary/formula.hpp" -#include "gui/auxiliary/find_widget.tpp" +#include "gui/auxiliary/find_widget.hpp" #include "gui/auxiliary/log.hpp" #include "gui/auxiliary/layout_exception.hpp" #include "gui/auxiliary/widget_definition/window.hpp" @@ -45,7 +45,7 @@ #include "gui/lib/types/point.hpp" #include "gui/widgets/button.hpp" #include "gui/widgets/container.hpp" -#include "gui/widgets/detail/register.tpp" +#include "gui/widgets/detail/register.hpp" #include "gui/widgets/grid.hpp" #include "gui/widgets/helper.hpp" #include "gui/widgets/panel.hpp" @@ -61,7 +61,7 @@ #include "sdl/rect.hpp" #include "sdl/utils.hpp" #include "tstring.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "variant.hpp" #include "video.hpp" #include "wml_exception.hpp" diff --git a/src/map.cpp b/src/map.cpp index 4431fc262e79..cb38b4e0fb33 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -37,7 +37,7 @@ #include #include -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" static lg::log_domain log_config("config"); #define ERR_CF LOG_STREAM(err, log_config) diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index f97b3c44d27b..0ee5e114d381 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -43,7 +43,7 @@ #include "chat_events.hpp" // for chat_handler, etc #include "config.hpp" // for config, etc #include "display_chat_manager.hpp" // for clear_chat_messages -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "formatter.hpp" #include "game_board.hpp" // for game_board #include "game_classification.hpp" // for game_classification, etc diff --git a/src/server/game.cpp b/src/server/game.cpp index 5f4e645b431e..7a9cc2382495 100644 --- a/src/server/game.cpp +++ b/src/server/game.cpp @@ -22,7 +22,7 @@ #include "player_network.hpp" #include "serialization/string_utils.hpp" #include "util.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include #include diff --git a/src/theme.cpp b/src/theme.cpp index b1dd4a9bdd19..bb2a7afec1d2 100644 --- a/src/theme.cpp +++ b/src/theme.cpp @@ -23,7 +23,7 @@ #include "log.hpp" #include "serialization/string_utils.hpp" #include "theme.hpp" -#include "utils/foreach.tpp" +#include "utils/foreach.hpp" #include "wml_exception.hpp" #include "sdl/rect.hpp" diff --git a/src/utils/const_clone.tpp b/src/utils/const_clone.hpp similarity index 100% rename from src/utils/const_clone.tpp rename to src/utils/const_clone.hpp diff --git a/src/utils/enumerate.tpp b/src/utils/enumerate.hpp similarity index 100% rename from src/utils/enumerate.tpp rename to src/utils/enumerate.hpp diff --git a/src/utils/foreach.tpp b/src/utils/foreach.hpp similarity index 100% rename from src/utils/foreach.tpp rename to src/utils/foreach.hpp