Strip trailing whitespace.

src/actions/attack.hpp

@@ -211,14 +211,14 @@ void attack_unit_and_advance(const map_location &attacker, const map_location &d
 
 	this method is currently not used by unstore_unit, if we want to do that we'd need to allow more arguments (animate, fire_events).
 */
-struct advance_unit_params 
+struct advance_unit_params
 {
 	advance_unit_params(const map_location& loc) : loc_(loc), ai_advancements_(NULL), force_dialog_(false), fire_events_(true), animate_(true) {}
 	advance_unit_params& ai_advancements(const ai::unit_advancements_aspect& value) {ai_advancements_ = &value; return *this;}
 	advance_unit_params& force_dialog(bool value) {force_dialog_ = value; return *this;}
 	advance_unit_params& fire_events(bool value) {fire_events_ = value; return *this;}
 	advance_unit_params& animate(bool value) {animate_ = value; return *this;}
-	friend void advance_unit_at(const advance_unit_params&); 
+	friend void advance_unit_at(const advance_unit_params&);
 private:
 	const map_location& loc_;
 	const ai::unit_advancements_aspect* ai_advancements_;

src/actions/create.cpp

@@ -337,7 +337,7 @@ bool can_recruit_on(const map_location& leader_loc, const map_location& recruit_
 
 bool can_recruit_on(const unit& leader, const map_location& recruit_loc)
 {
-	return can_recruit_on(leader.get_location(), recruit_loc, leader.side()); 
+	return can_recruit_on(leader.get_location(), recruit_loc, leader.side());
 }
 
 

src/carryover.cpp

@@ -236,8 +236,8 @@ void carryover_info::transfer_all_to(config& side_cfg){
 		side_cfg["save_id"] = side_cfg["id"];
 	}
 	std::vector<carryover>::iterator iside = std::find_if(
-		carryover_sides_.begin(), 
-		carryover_sides_.end(), 
+		carryover_sides_.begin(),
+		carryover_sides_.end(),
 		save_id_equals(side_cfg["save_id"])
 	);
 	if(iside != carryover_sides_.end())
@@ -335,8 +335,8 @@ void carryover_info::merge_old_carryover(const carryover_info& old_carryover)
 	BOOST_FOREACH(const carryover & old_side, old_carryover.carryover_sides_)
 	{
 		std::vector<carryover>::iterator iside = std::find_if(
-			carryover_sides_.begin(), 
-			carryover_sides_.end(), 
+			carryover_sides_.begin(),
+			carryover_sides_.end(),
 			save_id_equals(old_side.get_save_id())
 			);
 		//add the side if don't already have it.

src/display.cpp

@@ -473,7 +473,7 @@ void display::reload_map()
 	builder_->reload_map();
 }
 
-void display::change_display_context(const display_context * dc) 
+void display::change_display_context(const display_context * dc)
 {
 	dc_ = dc;
  	builder_->change_map(&dc_->map()); //TODO: Should display_context own and initalize the builder object?

src/display_chat_manager.cpp

@@ -42,7 +42,7 @@ namespace {
 	const SDL_Color chat_message_bg     = {0,0,0,140};
 }
 
-display_chat_manager::chat_message::chat_message(int speaker, int h) 
+display_chat_manager::chat_message::chat_message(int speaker, int h)
 	: speaker_handle(speaker), handle(h), created_at(SDL_GetTicks())
 {}
 

src/editor/editor_display.cpp

@@ -28,7 +28,7 @@ namespace editor {
 
 // Define dummy display context;
 
-class dummy_editor_display_context : public display_context 
+class dummy_editor_display_context : public display_context
 {
 	config dummy_cfg1;
 
@@ -42,7 +42,7 @@ class dummy_editor_display_context : public display_context
 
 	virtual const gamemap & map() const { return em; }
 	virtual const unit_map & units() const { return u; }
-	virtual const std::vector<team> & teams() const { return t; }	
+	virtual const std::vector<team> & teams() const { return t; }
 };
 
 const display_context * get_dummy_display_context() {

src/editor/map/map_context.hpp

@@ -127,14 +127,14 @@ class map_context : public display_context, private boost::noncopyable
 	/**
 	 * Const accessor names needed to implement "display_context" interface
 	 */
-	virtual const unit_map & units() const { 
-		return units_; 
+	virtual const unit_map & units() const {
+		return units_;
 	}
-	virtual const std::vector<team>& teams() const { 
-		return teams_; 
+	virtual const std::vector<team>& teams() const {
+		return teams_;
 	}
-	virtual const gamemap & map() const { 
-		return map_; 
+	virtual const gamemap & map() const {
+		return map_;
 	}
 
 	/**
@@ -158,7 +158,7 @@ class map_context : public display_context, private boost::noncopyable
 	tod_manager* get_time_manager() {
 		return tod_manager_.get();
 	}
-	
+
 	mp_game_settings & get_mp_settings() {
 		return mp_settings_;
 	}

src/fake_unit_ptr.hpp

@@ -35,7 +35,7 @@ class fake_unit_ptr {
 	typedef unit_ptr internal_ptr;
 	typedef unit_const_ptr internal_const_ptr;
 
-	fake_unit_ptr(); 
+	fake_unit_ptr();
 	explicit fake_unit_ptr(const internal_ptr & u); //!< Construct a fake unit pointer wrapping a normal unit pointer, marking it as a fake unit.
 	fake_unit_ptr(const internal_ptr & u, fake_unit_manager * mgr); //!< Construct a fake unit pointer, and simultaenously register with a manager.
 	fake_unit_ptr(const fake_unit_ptr & ptr); //!< Copy construct a fake unit pointer. Does not reallocate the underlying unit.

src/game_board.hpp

@@ -121,7 +121,7 @@ class game_board : public display_context {
 	boost::optional<std::string> replace_map (const gamemap & r);
 	void overlay_map (const gamemap & o, const config & cfg, map_location loc, bool border);
 
-	bool change_terrain(const map_location &loc, const std::string &t, 
+	bool change_terrain(const map_location &loc, const std::string &t,
                     const std::string & mode, bool replace_if_failed); //used only by lua
 
 	// Global accessor from unit.hpp

src/game_data.cpp

@@ -244,7 +244,7 @@ namespace {
 
 void game_data::activate_scope_variable(std::string var_name) const
 {
-	
+
 	if(recursive_activation)
 		return;
 	const std::string::iterator itor = std::find(var_name.begin(),var_name.end(),'.');
@@ -253,8 +253,8 @@ void game_data::activate_scope_variable(std::string var_name) const
 	}
 	std::vector<scoped_wml_variable*>::const_reverse_iterator rit;
 	for(
-		rit = scoped_variables.rbegin(); 
-		rit != scoped_variables.rend(); 
+		rit = scoped_variables.rbegin();
+		rit != scoped_variables.rend();
 	++rit) {
 		if((**rit).name() == var_name) {
 			recursive_activation = true;

src/game_data.hpp

@@ -97,7 +97,7 @@ class game_data  : public variable_set  {
 	void set_phase(PHASE phase) { phase_ = phase; }
 
 	//create an object responsible for creating and populating a team from a config
-	team_builder_ptr create_team_builder(const config& side_cfg, std::vector<team>& teams, 
+	team_builder_ptr create_team_builder(const config& side_cfg, std::vector<team>& teams,
 		const config& level, gamemap& map);
 
 	//do first stage of team initialization (everything except unit placement)
@@ -123,7 +123,7 @@ class game_data  : public variable_set  {
 
 private:
 
-	
+
 	///Used to delete variables.
 	variable_access_throw get_variable_access_throw(const std::string& varname)
 	{

src/game_events/action_wml.cpp

@@ -2263,7 +2263,7 @@ WML_HANDLER_FUNCTION(store_rotate_map_location, /*event_info*/, cfg)
 
 	std::string variable = cfg["variable"];
 	int angle = cfg["angle"].to_int(1);
-	
+
 	try
 	{
 		variable_access_create store = resources::gamedata->get_variable_access_write(variable);
@@ -2598,7 +2598,7 @@ WML_HANDLER_FUNCTION(unstore_unit, /*event_info*/, cfg)
 			(*resources::teams)[u->side() - 1].have_leader();
 		}
 
-	} 
+	}
 	catch (const invalid_variablename_exception&)
 	{
 		ERR_NG << "invlid variable name in unstore_unit" << std::endl;

src/game_events/menu_item.hpp

@@ -42,7 +42,7 @@ class wml_menu_item
 	              const wml_menu_item & original);
 
 	/// The id of this item.
-	const std::string & id() const { return item_id_; }	
+	const std::string & id() const { return item_id_; }
 	/// The image associated with this menu item.
 	const std::string & image() const;
 	/// If true, allow using the menu to trigger this item.

src/halo.cpp

@@ -466,7 +466,7 @@ manager::manager(display& screen) : impl_(new halo_impl(screen))
 {}
 
 handle manager::add(int x, int y, const std::string& image, const map_location& loc,
-		ORIENTATION orientation, bool infinite) 
+		ORIENTATION orientation, bool infinite)
 {
 	int new_halo = impl_->add(x,y,image, loc, orientation, infinite);
 	return handle(new halo_record(new_halo, impl_));

src/hotkey/hotkey_item.cpp

@@ -234,7 +234,7 @@ bool has_hotkey_item(const std::string& command)
 }
 
 void add_hotkey(const hotkey_item& item) {
-	
+
 	scope_changer scope_ch;
 	set_active_scopes(hotkey::get_hotkey_command(item.get_command()).scope);
 

src/hotkey/hotkey_preferences_display.cpp

@@ -288,7 +288,7 @@ hotkey_preferences_dialog::hotkey_preferences_dialog(display& disp) :
 		}
 		// We move hotkeys in all categories thet they belog to, except for hotkeys that
 		// belong to all 3 scoped that we put in a seperate HOTKEY_GENERAL category.
-		if(command.scope.count() == 1) //Not all 
+		if(command.scope.count() == 1) //Not all
 		{
 			if(command.scope[hotkey::SCOPE_GAME])
 			{

src/mp_game_utils.cpp

@@ -88,7 +88,7 @@ config initial_level_config(saved_game& state)
 
 		scenario["experience_modifier"] = params.xp_modifier;
 	}
-	
+
 	if (scenario["objectives"].empty()) {
 		scenario["objectives"] = "<big>" + t_string(N_("Victory:"), "wesnoth") +
 			"</big>\n<span foreground=\"#00ff00\">&#8226; " +
@@ -136,9 +136,9 @@ config initial_level_config(saved_game& state)
 				game_config().find_child("modification", "id", mods[i]));
 	}
 
-	
+
 #if 0
-	// we have this alredy in [multiplayer]. If removing this causes a bug than that's most likley bacause some is searchin for this information at the wrng place (not in [multiplayer]) 
+	// we have this alredy in [multiplayer]. If removing this causes a bug than that's most likley bacause some is searchin for this information at the wrng place (not in [multiplayer])
 	// If game was reloaded, params won't contain all required information and so we
 	// need to take it from the actual level config.
 	if (params.saved_game) {
@@ -149,7 +149,7 @@ config initial_level_config(saved_game& state)
 		level["shuffle_sides"] = params.shuffle_sides;
 	}
 #endif
-	
+
 	// This will force connecting clients to be using the same version number as us.
 	level["version"] = game_config::version;
 	return level;
@@ -161,7 +161,7 @@ void level_to_gamestate(const config& level, saved_game& state)
 	state.classification().campaign_type = game_classification::MULTIPLAYER;
 	// Any replay data is only temporary and should be removed from
 	// the level data in case we want to save the game later.
-	if (const config& replay_data = level.child("replay")) 
+	if (const config& replay_data = level.child("replay"))
 	{
 		LOG_NW << "setting replay\n";
 		recorder = replay(replay_data);
@@ -171,11 +171,11 @@ void level_to_gamestate(const config& level, saved_game& state)
 		}
 	}
 
-	
+
 	//save id setting  was moved to play_controller.
-	
+
 	// Adds the starting pos to the level.
-	
+
 	// This is important, if it does not happen, the starting position is
 	// missing and will be drawn from the snapshot instead
 	// (which is not what we want since we have

src/multiplayer.cpp

@@ -523,7 +523,7 @@ static bool enter_connect_mode(game_display& disp, const config& game_config,
 }
 
 static bool enter_configure_mode(game_display& disp, const config& game_config,
-	saved_game& state, 
+	saved_game& state,
 	bool local_players_only = false);
 
 static void enter_create_mode(game_display& disp, const config& game_config,
@@ -765,7 +765,7 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 
 	// Set the default parameters
 	state = saved_game(); // This creates these parameters with default values defined in mp_game_settings.cpp
-	mp_game_settings& parameters = state.mp_settings();  
+	mp_game_settings& parameters = state.mp_settings();
 	// Hardcoded default values
 	parameters.mp_era = "era_default";
 	parameters.name = "multiplayer_The_Freelands";
@@ -812,8 +812,8 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 		classification.era_define = era_cfg_preload["define"].str();
 		resources::config_manager->load_game_config_for_game(classification);
 	}
-	
-	const config& era_cfg = resources::config_manager->game_config().find_child("era", "id", parameters.mp_era);	
+
+	const config& era_cfg = resources::config_manager->game_config().find_child("era", "id", parameters.mp_era);
 	const config& level = resources::config_manager->game_config().find_child("multiplayer", "id", parameters.name);
 
 	if (cmdline_opts.multiplayer_side) {

src/multiplayer_connect_engine.cpp

@@ -139,7 +139,7 @@ connect_engine::connect_engine(saved_game& state,
 			if (name_itor == original_team_names.end()) {
 				original_team_names.push_back(team_name);
 
-				team_name = "Team " + 
+				team_name = "Team " +
 					lexical_cast<std::string>(original_team_names.size());
 			} else {
 				team_name = lexical_cast<std::string>(

src/multiplayer_connect_engine.hpp

@@ -90,7 +90,7 @@ class connect_engine
 			return scenario;
 		else if(config& snapshot = level_.child("snapshot"))
 			return snapshot;
-		else 
+		else
 			throw "No scenariodata found";
 	}
 	const std::set<std::string>& connected_users() const

src/multiplayer_create.cpp

@@ -254,7 +254,7 @@ void create::process_event()
 	}
 
 	if (load_game_.pressed()) {
-		try 
+		try
 		{
 			savegame::loadgame load(disp_,
 				resources::config_manager->game_config(), engine_.get_state());
@@ -268,8 +268,8 @@ void create::process_event()
 		}
 		catch (load_game_cancelled_exception)
 		{
-		} 
-		catch(config::error&) 
+		}
+		catch(config::error&)
 		{
 		}
 

src/multiplayer_create_engine.cpp

@@ -430,7 +430,7 @@ void create_engine::prepare_for_scenario()
 
 	state_.classification().scenario_define =
 		current_level().data()["define"].str();
-	
+
 	resources::config_manager->
 		load_game_config_for_game(state_.classification());
 

src/multiplayer_lobby.cpp

@@ -538,7 +538,7 @@ void gamebrowser::set_game_items(const config& cfg, const config& game_config)
 				std::vector<std::string> difficulty_options =
 					utils::split(difficulty_descriptions, ';');
 				int index = 0;
-				//TODO: use difficulties instead of difficulty_descriptions if 
+				//TODO: use difficulties instead of difficulty_descriptions if
 				//difficulty_descriptions is not available
 				assert(difficulties.size() == difficulty_options.size());
 				BOOST_FOREACH(const std::string& difficulty, difficulties) {

src/multiplayer_wait.cpp

@@ -671,17 +671,17 @@ config& wait::get_scenario()
 		return scenario;
 	else if(config& snapshot = level_.child("snapshot"))
 		return snapshot;
-	else 
+	else
 		return level_;
 }
 
-const config& wait::get_scenario() const 
+const config& wait::get_scenario() const
 {
 	if(const config& scenario = level_.child("scenario"))
 		return scenario;
 	else if(const config& snapshot = level_.child("snapshot"))
 		return snapshot;
-	else 
+	else
 		return level_;
 }
 

src/play_controller.cpp

@@ -153,7 +153,7 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
 
 	persist_.start_transaction();
 	n_unit::id_manager::instance().set_save_id(level_["next_underlying_unit_id"]);
-	
+
 	// Setup victory and defeat music
 	set_victory_music_list(level_["victory_music"]);
 	set_defeat_music_list(level_["defeat_music"]);