0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename .tpp -> .hpp

Browse source 
Several header files used the .tpp extension, which means that they are not correctly detected as C++ (though this can be overridden and has been for one case in the XCode project). The .tpp extension is one of several intended for private template instantiations, but these headers were topleve headers included in many places.
This commit is contained in:
Celtic Minstrel 2016-03-19 21:10:23 -04:00
parent 8e588972f4
commit 8122039707
123 changed files with 223 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
91B621D21B76B4DE00B00E0F /* lua_map_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lua_map_generator.hpp; sourceTree = "<group>"; };
91B621D31B76B4DE00B00E0F /* map_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = map_generator.hpp; sourceTree = "<group>"; };
91B621D41B76B51600B00E0F /* find_widget.tpp */ = {isa = PBXFileReference; lastKnownFileType = text; path = find_widget.tpp; sourceTree = "<group>"; };
91B621D41B76B51600B00E0F /* find_widget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = find_widget.hpp; sourceTree = "<group>"; };
91B621D51B76B57F00B00E0F /* drawing.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = drawing.hpp; sourceTree = "<group>"; };
91B621D61B76B5BC00B00E0F /* advanced_graphics_options.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = advanced_graphics_options.hpp; sourceTree = "<group>"; };
91B621D71B76B5C500B00E0F /* campaign_settings.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = campaign_settings.hpp; sourceTree = "<group>"; };
@ -1462,7 +1463,7 @@
91B621DD1B76B72500B00E0F /* mp_alerts_options.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_alerts_options.hpp; sourceTree = "<group>"; };
91B621DE1B76B72900B00E0F /* mp_change_control.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_change_control.hpp; sourceTree = "<group>"; };
91B621DF1B76B7DA00B00E0F /* mp_join_game_password_prompt.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = mp_join_game_password_prompt.hpp; sourceTree = "<group>"; };
91B621E01B76B90700B00E0F /* register.tpp */ = {isa = PBXFileReference; lastKnownFileType = text; name = register.tpp; path = detail/register.tpp; sourceTree = "<group>"; };
91B621E01B76B90700B00E0F /* register.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = register.hpp; path = detail/register.hpp; sourceTree = "<group>"; };
91B621E11B76BAB300B00E0F /* application_lua_kernel.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = application_lua_kernel.hpp; sourceTree = "<group>"; };
91B621E21B76BAF300B00E0F /* context.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = context.hpp; path = plugins/context.hpp; sourceTree = "<group>"; };
91B621E31B76BAF600B00E0F /* manager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = manager.hpp; path = plugins/manager.hpp; sourceTree = "<group>"; };
@ -1499,6 +1500,16 @@
91ECD5D11BA11A5200B25CF1 /* unit_creator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_creator.hpp; sourceTree = "<group>"; };
91ECD5D31BA11A6400B25CF1 /* mp_replay_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp_replay_controller.cpp; sourceTree = "<group>"; };
91ECD5D41BA11A6400B25CF1 /* mp_replay_controller.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mp_replay_controller.hpp; sourceTree = "<group>"; };
91EF6BFB1C9E22E400E2A733 /* boost_function_guarded.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = boost_function_guarded.hpp; sourceTree = "<group>"; };
91EF6BFC1C9E22E400E2A733 /* const_clone.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = const_clone.hpp; sourceTree = "<group>"; };
91EF6BFD1C9E22E400E2A733 /* enumerate.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = enumerate.hpp; sourceTree = "<group>"; };
91EF6BFE1C9E22E400E2A733 /* foreach.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = foreach.hpp; sourceTree = "<group>"; };
91EF6BFF1C9E22E400E2A733 /* iterator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = iterator.hpp; sourceTree = "<group>"; };
91EF6C001C9E22E400E2A733 /* reference_counter.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = reference_counter.hpp; sourceTree = "<group>"; };
91EF6C011C9E22E400E2A733 /* sha1.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = sha1.cpp; sourceTree = "<group>"; };
91EF6C021C9E22E400E2A733 /* sha1.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = sha1.hpp; sourceTree = "<group>"; };
91EF6C031C9E22E400E2A733 /* shared_object.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = shared_object.hpp; sourceTree = "<group>"; };
91EF6C041C9E22E400E2A733 /* smart_list.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = smart_list.hpp; sourceTree = "<group>"; };
91F462821C71139B0050A9C9 /* preferences_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = preferences_dialog.cpp; sourceTree = "<group>"; };
91F462831C71139B0050A9C9 /* preferences_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = preferences_dialog.hpp; sourceTree = "<group>"; };
91F462861C7115C50050A9C9 /* combobox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = combobox.cpp; sourceTree = "<group>"; };
@ -2465,7 +2476,7 @@
ECD5D7BE1A22DC8600114175 /* lua_cpp_function.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cpp_function.cpp; sourceTree = "<group>"; };
ECDEAF6D194FE84000DB2F47 /* fake_unit_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_unit_manager.cpp; sourceTree = "<group>"; };
ECDEAF6E194FE84000DB2F47 /* fake_unit_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_unit_manager.hpp; sourceTree = "<group>"; };
ECDEAF74194FE86C00DB2F47 /* animated.tpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = animated.tpp; sourceTree = "<group>"; };
ECDEAF74194FE86C00DB2F47 /* animated.tpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = animated.tpp; sourceTree = "<group>"; };
ECDEAF76194FEA8400DB2F47 /* syncmp_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = syncmp_handler.cpp; sourceTree = "<group>"; };
ECDEAF78194FEA9D00DB2F47 /* game_classification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_classification.cpp; sourceTree = "<group>"; };
ECDF181E1A3FE0DE00D157A6 /* manager_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = manager_impl.cpp; sourceTree = "<group>"; };
@ -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 = "<group>";
};
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 = "<group>";
};
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;
};

2
src/animated.hpp
View file

@ -133,5 +133,7 @@ private:
};
#include "animated.tpp"
#endif

58
src/animated.tpp
View file

@ -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<typename T, typename T_void_value>
const T animated<T,T_void_value>::void_value_ = T_void_value()();
template<typename T, typename T_void_value>
animated<T,T_void_value>::animated(int start_time) :
inline animated<T,T_void_value>::animated(int start_time) :
starting_frame_time_(start_time),
does_not_change_(true),
started_(false),
@ -57,7 +57,7 @@ animated<T,T_void_value>::animated(int start_time) :
}
template<typename T, typename T_void_value>
animated<T,T_void_value>::animated(const std::vector<std::pair<int,T> > &cfg, int start_time, bool force_change ):
inline animated<T,T_void_value>::animated(const std::vector<std::pair<int,T> > &cfg, int start_time, bool force_change ):
starting_frame_time_(start_time),
does_not_change_(true),
started_(false),
@ -80,7 +80,7 @@ animated<T,T_void_value>::animated(const std::vector<std::pair<int,T> > &cfg, in
template<typename T, typename T_void_value>
void animated<T,T_void_value>::add_frame(int duration, const T& value,bool force_change)
inline void animated<T,T_void_value>::add_frame(int duration, const T& value,bool force_change)
{
if(frames_.empty() ) {
does_not_change_=!force_change;
@ -92,7 +92,7 @@ void animated<T,T_void_value>::add_frame(int duration, const T& value,bool force
}
template<typename T, typename T_void_value>
void animated<T,T_void_value>::start_animation(int start_time, bool cycles)
inline void animated<T,T_void_value>::start_animation(int start_time, bool cycles)
{
started_ = true;
last_update_tick_ = current_ticks;
@ -108,7 +108,7 @@ void animated<T,T_void_value>::start_animation(int start_time, bool cycles)
template<typename T, typename T_void_value>
void animated<T,T_void_value>::update_last_draw_time(double acceleration)
inline void animated<T,T_void_value>::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<T,T_void_value>::update_last_draw_time(double acceleration)
}
template<typename T, typename T_void_value>
bool animated<T,T_void_value>::need_update() const
inline bool animated<T,T_void_value>::need_update() const
{
if(force_next_update_) {
return true;
@ -174,7 +174,7 @@ bool animated<T,T_void_value>::need_update() const
}
template<typename T, typename T_void_value>
bool animated<T,T_void_value>::animation_finished_potential() const
inline bool animated<T,T_void_value>::animation_finished_potential() const
{
if(frames_.empty())
return true;
@ -188,7 +188,7 @@ bool animated<T,T_void_value>::animation_finished_potential() const
return false;
}
template<typename T, typename T_void_value>
bool animated<T,T_void_value>::animation_finished() const
inline bool animated<T,T_void_value>::animation_finished() const
{
if(frames_.empty())
return true;
@ -203,14 +203,14 @@ bool animated<T,T_void_value>::animation_finished() const
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_animation_time_potential() const
inline int animated<T,T_void_value>::get_animation_time_potential() const
{
if(!started_ && start_tick_ == 0 ) return starting_frame_time_;
return tick_to_time(current_ticks);
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_animation_time() const
inline int animated<T,T_void_value>::get_animation_time() const
{
if(!started_ && start_tick_ == 0 ) return starting_frame_time_;
@ -218,7 +218,7 @@ int animated<T,T_void_value>::get_animation_time() const
}
template<typename T, typename T_void_value>
void animated<T,T_void_value>::set_animation_time(int time)
inline void animated<T,T_void_value>::set_animation_time(int time)
{
start_tick_ = last_update_tick_ +
static_cast<int>(( starting_frame_time_ - time)/acceleration_);
@ -228,13 +228,13 @@ void animated<T,T_void_value>::set_animation_time(int time)
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_animation_duration() const
inline int animated<T,T_void_value>::get_animation_duration() const
{
return get_end_time() - get_begin_time();
}
template<typename T, typename T_void_value>
const T& animated<T,T_void_value>::get_current_frame() const
inline const T& animated<T,T_void_value>::get_current_frame() const
{
if(frames_.empty() )
return void_value_;
@ -242,7 +242,7 @@ const T& animated<T,T_void_value>::get_current_frame() const
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_current_frame_begin_time() const
inline int animated<T,T_void_value>::get_current_frame_begin_time() const
{
if(frames_.empty() )
return starting_frame_time_;
@ -250,7 +250,7 @@ int animated<T,T_void_value>::get_current_frame_begin_time() const
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_current_frame_end_time() const
inline int animated<T,T_void_value>::get_current_frame_end_time() const
{
if(frames_.empty() )
return starting_frame_time_;
@ -258,7 +258,7 @@ int animated<T,T_void_value>::get_current_frame_end_time() const
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_current_frame_duration() const
inline int animated<T,T_void_value>::get_current_frame_duration() const
{
if(frames_.empty() )
return 0;
@ -266,7 +266,7 @@ int animated<T,T_void_value>::get_current_frame_duration() const
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_current_frame_time() const
inline int animated<T,T_void_value>::get_current_frame_time() const
{
if(frames_.empty() )
return 0;
@ -275,7 +275,7 @@ int animated<T,T_void_value>::get_current_frame_time() const
}
template<typename T, typename T_void_value>
const T& animated<T,T_void_value>::get_first_frame() const
inline const T& animated<T,T_void_value>::get_first_frame() const
{
if(frames_.empty() )
return void_value_;
@ -283,7 +283,7 @@ const T& animated<T,T_void_value>::get_first_frame() const
}
template<typename T, typename T_void_value>
const T& animated<T,T_void_value>::get_frame(size_t n) const
inline const T& animated<T,T_void_value>::get_frame(size_t n) const
{
if(n >= frames_.size())
return void_value_;
@ -291,7 +291,7 @@ const T& animated<T,T_void_value>::get_frame(size_t n) const
}
template<typename T, typename T_void_value>
const T& animated<T,T_void_value>::get_last_frame() const
inline const T& animated<T,T_void_value>::get_last_frame() const
{
if(frames_.empty() )
return void_value_;
@ -299,25 +299,25 @@ const T& animated<T,T_void_value>::get_last_frame() const
}
template<typename T, typename T_void_value>
size_t animated<T,T_void_value>::get_frames_count() const
inline size_t animated<T,T_void_value>::get_frames_count() const
{
return frames_.size();
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_begin_time() const
inline int animated<T,T_void_value>::get_begin_time() const
{
return starting_frame_time_;
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::time_to_tick(int animation_time) const
inline int animated<T,T_void_value>::time_to_tick(int animation_time) const
{
if(!started_ && start_tick_ == 0) return 0;
return start_tick_ + static_cast<int>((animation_time-starting_frame_time_)/acceleration_);
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::tick_to_time(int animation_tick) const
inline int animated<T,T_void_value>::tick_to_time(int animation_tick) const
{
if(!started_ && start_tick_ == 0) return 0;
return static_cast<int>(
@ -325,7 +325,7 @@ int animated<T,T_void_value>::tick_to_time(int animation_tick) const
acceleration_) + starting_frame_time_);
}
template<typename T, typename T_void_value>
int animated<T,T_void_value>::get_end_time() const
inline int animated<T,T_void_value>::get_end_time() const
{
if(frames_.empty())
return starting_frame_time_;
@ -341,7 +341,7 @@ void animated<T,T_void_value>::remove_frames_until(int new_starting_time)
}
template<typename T, typename T_void_value>
void animated<T,T_void_value>::set_end_time(int new_ending_time)
inline void animated<T,T_void_value>::set_end_time(int new_ending_time)
{
int last_start_time = starting_frame_time_;
typename std::vector<frame>::iterator current_frame = frames_.begin();
@ -358,7 +358,7 @@ typename std::vector<frame>::iterator current_frame = frames_.begin();
template<typename T, typename T_void_value>
void animated<T,T_void_value>::set_begin_time(int new_begin_time)
inline void animated<T,T_void_value>::set_begin_time(int new_begin_time)
{
const int variation = new_begin_time - starting_frame_time_;
starting_frame_time_ += variation;

2
src/animated_game.cpp
View file

@ -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"

2
src/config.cpp
View file

@ -24,7 +24,7 @@
#include "log.hpp"
#include "util.hpp"
#include "utils/const_clone.tpp"
#include "utils/const_clone.hpp"
#include <cstdlib>
#include <cstring>

2
src/game_board.cpp
View file

@ -21,7 +21,7 @@
#include "terrain_type_data.hpp"
#include "unit.hpp"
#include "utils/foreach.tpp"
#include "utils/foreach.hpp"
#include <boost/foreach.hpp>
#include <set>

2
src/game_initialization/mp_options.cpp
View file

@ -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"

2
src/gui/auxiliary/canvas.cpp
View file

@ -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"

2
src/gui/auxiliary/event/handler.cpp
View file

@ -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"

2
src/gui/auxiliary/find_widget.tpp → src/gui/auxiliary/find_widget.hpp
View file

@ -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

2
src/gui/auxiliary/notifier.hpp
View file

@ -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 <cassert>
#include <map>

2
src/gui/auxiliary/placer.hpp
View file

@ -121,7 +121,7 @@ public:
} // namespace gui2
#include "utils/enumerate.tpp"
#include "utils/enumerate.hpp"
namespace gui2
{

2
src/gui/auxiliary/tips.cpp
View file

@ -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

2
src/gui/auxiliary/widget_definition.hpp
View file

@ -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
{

2
src/gui/auxiliary/window_builder.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/auxiliary/window_builder/combobox.cpp
View file

@ -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
{

2
src/gui/auxiliary/window_builder/helper.cpp
View file

@ -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
{

2
src/gui/auxiliary/window_builder/horizontal_listbox.cpp
View file

@ -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

2
src/gui/auxiliary/window_builder/listbox.cpp
View file

@ -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

2
src/gui/auxiliary/window_builder/multi_page.cpp
View file

@ -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

2
src/gui/auxiliary/window_builder/slider.cpp
View file

@ -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

2
src/gui/auxiliary/window_builder/stacked_widget.cpp
View file

@ -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

2
src/gui/auxiliary/window_builder/tree_view.cpp
View file

@ -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

4
src/gui/dialogs/addon/description.cpp
View file

@ -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 <boost/bind.hpp>

4
src/gui/dialogs/addon/uninstall_list.cpp
View file

@ -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 <algorithm>

2
src/gui/dialogs/addon_connect.cpp
View file

@ -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"

4
src/gui/dialogs/addon_list.cpp
View file

@ -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"

2
src/gui/dialogs/advanced_graphics_options.cpp
View file

@ -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"

4
src/gui/dialogs/campaign_difficulty.cpp
View file

@ -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"

4
src/gui/dialogs/campaign_selection.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/campaign_settings.cpp
View file

@ -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"

4
src/gui/dialogs/chat_log.cpp
View file

@ -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"

4
src/gui/dialogs/core_selection.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/data_manage.cpp
View file

@ -39,7 +39,7 @@
#include "language.hpp"
#include "preferences_display.hpp"
#include "savegame.hpp"
#include "utils/foreach.tpp"
#include "utils/foreach.hpp"
#include <cctype>
#include <boost/bind.hpp>

4
src/gui/dialogs/debug_clock.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/depcheck_select_new.cpp
View file

@ -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

2
src/gui/dialogs/dialog.cpp
View file

@ -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

4
src/gui/dialogs/drop_down_list.cpp
View file

@ -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 <boost/function.hpp>
#include <boost/bind.hpp>

4
src/gui/dialogs/editor_generate_map.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/editor_set_starting_position.cpp
View file

@ -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

2
src/gui/dialogs/field.hpp
View file

@ -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"

4
src/gui/dialogs/formula_debugger.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/game_cache_options.cpp
View file

@ -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"

2
src/gui/dialogs/game_load.cpp
View file

@ -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 <cctype>

2
src/gui/dialogs/game_version.cpp
View file

@ -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"

4
src/gui/dialogs/gamestate_inspector.cpp
View file

@ -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"

2
src/gui/dialogs/label_settings.cpp
View file

@ -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"

4
src/gui/dialogs/language_selection.cpp
View file

@ -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
{

2
src/gui/dialogs/lobby/lobby_data.cpp
View file

@ -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 <iterator>

2
src/gui/dialogs/lobby/lobby_info.cpp
View file

@ -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"

2
src/gui/dialogs/lobby_player_info.cpp
View file

@ -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"

2
src/gui/dialogs/lua_interpreter.cpp
View file

@ -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"

4
src/gui/dialogs/message.cpp
View file

@ -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
{

2
src/gui/dialogs/mp_alerts_options.cpp
View file

@ -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"

4
src/gui/dialogs/mp_change_control.cpp
View file

@ -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 <vector>
#include <boost/bind.hpp>

2
src/gui/dialogs/mp_connect.cpp
View file

@ -26,7 +26,7 @@
#include "gui/widgets/listbox.hpp"
#endif
#include "gui/widgets/settings.hpp"
#include "utils/foreach.tpp"
#include "utils/foreach.hpp"
#include <boost/bind.hpp>

2
src/gui/dialogs/mp_create_game.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/mp_login.cpp
View file

@ -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"

2
src/gui/dialogs/mp_method_selection.cpp
View file

@ -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

2
src/gui/dialogs/network_transmission.cpp
View file

@ -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"

4
src/gui/dialogs/preferences_dialog.cpp
View file

@ -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"

2
src/gui/dialogs/screenshot_notification.cpp
View file

@ -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"

2
src/gui/dialogs/select_orb_colors.cpp
View file

@ -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"

4
src/gui/dialogs/simple_item_selector.cpp
View file

@ -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
{

2
src/gui/dialogs/synced_choice_wait.cpp
View file

@ -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"

4
src/gui/dialogs/theme_list.cpp
View file

@ -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
{

2
src/gui/dialogs/tip.cpp
View file

@ -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"

4
src/gui/dialogs/title_screen.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/transient_message.cpp
View file

@ -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"

4
src/gui/dialogs/unit_attack.cpp
View file

@ -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 <boost/bind.hpp>

4
src/gui/dialogs/unit_create.cpp
View file

@ -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 <boost/bind.hpp>

4
src/gui/dialogs/unit_recruit.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/dialogs/wml_error.cpp
View file

@ -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"

2
src/gui/dialogs/wml_message.cpp
View file

@ -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

2
src/gui/widgets/button.cpp
View file

@ -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"

2
src/gui/widgets/combobox.cpp
View file

@ -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"

2
src/gui/widgets/control.cpp
View file

@ -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 <boost/bind.hpp>

0
src/gui/widgets/detail/register.tpp → src/gui/widgets/detail/register.hpp
View file

2
src/gui/widgets/drawing.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/widgets/generator.cpp
View file

@ -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

2
src/gui/widgets/generator_private.hpp
View file

@ -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
{

2
src/gui/widgets/grid.cpp
View file

@ -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 <numeric>

2
src/gui/widgets/grid_private.hpp
View file

@ -32,7 +32,7 @@
#include "gui/widgets/grid.hpp"
#include "utils/const_clone.tpp"
#include "utils/const_clone.hpp"
#include <boost/foreach.hpp>

2
src/gui/widgets/group.hpp
View file

@ -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 <vector>
#include <boost/bind.hpp>

2
src/gui/widgets/horizontal_scrollbar.cpp
View file

@ -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"

2
src/gui/widgets/image.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/widgets/label.cpp
View file

@ -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"

4
src/gui/widgets/list.cpp
View file

@ -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"

4
src/gui/widgets/listbox.cpp
View file

@ -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"

4
src/gui/widgets/matrix.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/widgets/minimap.cpp
View file

@ -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"

4
src/gui/widgets/multi_page.cpp
View file

@ -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"

4
src/gui/widgets/pane.cpp
View file

@ -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"

2
src/gui/widgets/panel.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/widgets/password_box.cpp
View file

@ -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"

4
src/gui/widgets/progress_bar.cpp
View file

@ -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 <boost/bind.hpp>

2
src/gui/widgets/repeating_button.cpp
View file

@ -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"

4
src/gui/widgets/scroll_label.cpp
View file

@ -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"

2
src/gui/widgets/scrollbar.cpp
View file

@ -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 <boost/bind.hpp>

4
src/gui/widgets/scrollbar_container.cpp
View file

@ -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 <boost/bind.hpp>

Some files were not shown because too many files have changed in this diff Show more