widelands-dev team mailing list archive

[Martin Schmidt <launchpad@xxxxxxxxxxxxxxx>]

Martin Schmidt has proposed merging lp:~widelands-dev/widelands/observer_building_spaces_codecheck_errors into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/observer_building_spaces_codecheck_errors/+merge/249808

I finally figured out how to apply clang_format to only a part of a file and fixed all my errors.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/observer_building_spaces_codecheck_errors into lp:widelands.

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2015-02-14 21:48:59 +0000
+++ src/wui/interactive_gamebase.h	2015-02-16 12:50:09 +0000
@@ -86,7 +86,7 @@
 	void start() override {};
 protected:
 	void draw_overlay(RenderTarget &) override;
-	virtual int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) =0;
+	virtual int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) = 0;
 
 	GameMainMenuWindows m_mainm_windows;
 	ChatProvider           * m_chatProvider;

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2015-02-14 22:11:44 +0000
+++ src/wui/interactive_spectator.cc	2015-02-16 12:50:09 +0000
@@ -144,10 +144,10 @@
 
 int32_t InteractiveSpectator::calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) {
 	const Widelands::PlayerNumber nr_players = game().map().get_nrplayers();
-	
+
 	iterate_players_existing(p, nr_players, game(), player) {
 		const Widelands::NodeCaps nc = player->get_buildcaps(c);
-		if( nc > Widelands::NodeCaps::CAPS_NONE )	{
+		if (nc > Widelands::NodeCaps::CAPS_NONE) {
 			return nc;
 		}
 	}

=== modified file 'src/wui/interactive_spectator.h'
--- src/wui/interactive_spectator.h	2015-02-14 21:48:59 +0000
+++ src/wui/interactive_spectator.h	2015-02-16 12:50:09 +0000
@@ -50,7 +50,7 @@
 	void toggle_statistics();
 	void exit_btn();
 	void save_btn();
-	int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> ) override;
+	int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) override;
 	bool can_see(Widelands::PlayerNumber) const override;
 	bool can_act(Widelands::PlayerNumber) const override;
 	Widelands::PlayerNumber player_number() const override;