Merge lp:~klaus-halfmann/widelands/bug-1395278-wui into lp:widelands

[Klaus Halfmann]

Migration from m_... to ..._ mostly in wui

[bunnybot (widelandsofficial)]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~klaus-halfmann/widelands/bug-1395278-wui mirrored to https://github.com/widelands/widelands/tree/_klaus_halfmann_widelands_bug_1395278_wui

You can give me commands by starting a line with @bunnybot <command>. I understand:
 merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 381. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/104490091.
Appveyor build 288. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_klaus_halfmann_widelands_bug_1395278_wui-288.

[SirVer (sirver)]

Travis fails, because you have to fix one CMakeTarget: /home/travis/build/widelands/widelands/src/ai/CMakeLists.txt:1: ai misses DEPENDS on base_time_string, because it includes base/time_string.h

you can get these warnings locally by running 'make codecheck'

otherwise lgtm.

review: Approve

[GunChleoc (gunchleoc)]

Another way to run codecheck that works better for me is:

cmake/codecheck/CodeCheck.py src/* | grep -v "src/third_party"

More on CodeCheck and regression tests: https://wl.widelands.org/wiki/RegressionTests/

[SirVer (sirver)]

What gun posted will only check .cc and .h files though, not the cmake files.

> Am 25.01.2016 um 08:15 schrieb GunChleoc <email address hidden>:
>
> Another way to run codecheck that works better for me is:
>
> cmake/codecheck/CodeCheck.py src/* | grep -v "src/third_party"
>
> More on CodeCheck and regression tests: https://wl.widelands.org/wiki/RegressionTests/
> --
> https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-wui/+merge/283747
> You are reviewing the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-wui into lp:widelands.

[SirVer (sirver)]

This bug was actually already in trunk. I fixed it in 7739.

Since release compiled, I think this is save to go in.

@bunnybot merge.

Fingers crossed :)

review: Approve

[GunChleoc (gunchleoc)]

The reason I never tun "make codecheck is that I get a screenful of

[ 15%] Built target see_if_codecheck_needs_to_run_425808b46d62349edb2afc756e74770b1a35a46d

And it's pretty impossible to find the actual codecheck messages among them.

[SirVer (sirver)]

ninja is not printing that. You can throttle ninja by using ninja -j1

=== modified file 'src/ai/computer_player.cc'
--- src/ai/computer_player.cc	2015-12-06 12:37:51 +0000
+++ src/ai/computer_player.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009 by the Widelands Development Team
+ * Copyright (C) 2004-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 
 ComputerPlayer::ComputerPlayer
 	(Widelands::Game & g, Widelands::PlayerNumber const pid)
-	: m_game(g), m_player_number(pid)
+	: game_(g), player_number_(pid)
 {
 }
 
 
=== modified file 'src/ai/computer_player.h'
--- src/ai/computer_player.h	2015-12-06 11:15:52 +0000
+++ src/ai/computer_player.h	2016-01-24 20:25:45 +0000
@@ -42,8 +42,8 @@
 
 	virtual void think () = 0;
 
-	Widelands::Game & game() const {return m_game;}
-	Widelands::PlayerNumber player_number() {return m_player_number;}
+	Widelands::Game & game() const {return game_;}
+	Widelands::PlayerNumber player_number() {return player_number_;}
 
 	/**
 	 * Interface to a concrete implementation, used to instantiate AIs.
@@ -71,8 +71,8 @@
 	static const Implementation * get_implementation(const std::string & name);
 
 private:
-	Widelands::Game & m_game;
-	Widelands::PlayerNumber const m_player_number;
+	Widelands::Game & game_;
+	Widelands::PlayerNumber const player_number_;
 
 	DISALLOW_COPY_AND_ASSIGN(ComputerPlayer);
 };
 
=== modified file 'src/logic/map_objects/tribes/tribe_descr.h'
--- src/logic/map_objects/tribes/tribe_descr.h	2016-01-23 19:36:55 +0000
+++ src/logic/map_objects/tribes/tribe_descr.h	2016-01-24 20:25:45 +0000
@@ -143,7 +143,7 @@
 
 	void resize_ware_orders(size_t maxLength);
 
-	const std::vector<std::string>& get_ship_names() const {return ship_names_;};
+	const std::vector<std::string>& get_ship_names() const {return ship_names_;}
 
 private:
 	// Helper function for adding a special worker type (carriers etc.)
 
=== modified file 'src/logic/player.h'
--- src/logic/player.h	2016-01-22 19:53:32 +0000
+++ src/logic/player.h	2016-01-24 20:25:45 +0000
@@ -138,7 +138,7 @@
 
 	/// Data that are used and managed by AI. They are here to have it saved as a port of player's data
 	struct AiPersistentState {
-		AiPersistentState() : initialized(0){};
+		AiPersistentState() : initialized(0){}
 
 		//was initialized
 		uint8_t initialized;
@@ -159,7 +159,7 @@
 
 	AiPersistentState* get_mutable_ai_persistent_state(){
 		return &ai_data;
-	};
+	}
 
 	/// Per-player field information.
 	struct Field {
 
=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2016-01-17 09:55:27 +0000
+++ src/wlapplication.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2015 by the Widelands Development Team
+ * Copyright (C) 2006-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -179,12 +179,12 @@
 
 void WLApplication::setup_homedir() {
 	//If we don't have a home directory don't do anything
-	if (m_homedir.size()) {
+	if (homedir_.size()) {
 		//assume some dir exists
 		try {
-			log ("Set home directory: %s\n", m_homedir.c_str());
+			log ("Set home directory: %s\n", homedir_.c_str());
 
-			std::unique_ptr<FileSystem> home(new RealFSImpl(m_homedir));
+			std::unique_ptr<FileSystem> home(new RealFSImpl(homedir_));
 			home->ensure_directory_exists(".");
 			g_fs->set_home_file_system(home.release());
 		} catch (const std::exception & e) {
@@ -232,40 +232,40 @@
  * \param argv Array of command line arguments
  */
 WLApplication::WLApplication(int const argc, char const * const * const argv) :
-m_commandline          (std::map<std::string, std::string>()),
-m_game_type            (NONE),
-m_mouse_swapped        (false),
-m_faking_middle_mouse_button(false),
-m_mouse_position       (0, 0),
-m_mouse_locked         (0),
-m_mouse_compensate_warp(0, 0),
-m_should_die           (false),
+commandline_          (std::map<std::string, std::string>()),
+game_type_            (NONE),
+mouse_swapped_        (false),
+faking_middle_mouse_button_(false),
+mouse_position_       (0, 0),
+mouse_locked_         (0),
+mouse_compensate_warp_(0, 0),
+should_die_           (false),
 #ifdef _WIN32
-m_homedir(FileSystem::get_homedir() + "\\.widelands"),
+homedir_(FileSystem::get_homedir() + "\\.widelands"),
 #else
-m_homedir(FileSystem::get_homedir() + "/.widelands"),
+homedir_(FileSystem::get_homedir() + "/.widelands"),
 #endif
-m_redirected_stdio(false)
+redirected_stdio_(false)
 {
 	g_fs = new LayeredFileSystem();
 
 	parse_commandline(argc, argv); //throws ParameterError, handled by main.cc
 
-	if (m_commandline.count("homedir")) {
-		log ("Adding home directory: %s\n", m_commandline["homedir"].c_str());
-		m_homedir = m_commandline["homedir"];
-		m_commandline.erase("homedir");
+	if (commandline_.count("homedir")) {
+		log ("Adding home directory: %s\n", commandline_["homedir"].c_str());
+		homedir_ = commandline_["homedir"];
+		commandline_.erase("homedir");
 	}
 #ifdef REDIRECT_OUTPUT
 	if (!redirect_output())
-		redirect_output(m_homedir);
+		redirect_output(homedir_);
 #endif
 
 	setup_homedir();
 	init_settings();
 
-	log("Adding directory: %s\n", m_datadir.c_str());
-	g_fs->add_file_system(&FileSystem::create(m_datadir));
+	log("Adding directory: %s\n", datadir_.c_str());
+	g_fs->add_file_system(&FileSystem::create(datadir_));
 
 	init_language(); // search paths must already be set up
 	changedir_on_mac();
@@ -334,7 +334,7 @@
 	delete g_fs;
 	g_fs = nullptr;
 
-	if (m_redirected_stdio)
+	if (redirected_stdio_)
 	{
 		std::cout.flush();
 		fclose(stdout);
@@ -356,15 +356,15 @@
 	// This also grabs the mouse cursor if so desired.
 	refresh_graphics();
 
-	if (m_game_type == EDITOR) {
+	if (game_type_ == EDITOR) {
 		g_sound_handler.start_music("ingame");
-		EditorInteractive::run_editor(m_filename, m_script_to_run);
-	} else if (m_game_type == REPLAY)   {
+		EditorInteractive::run_editor(filename_, script_to_run_);
+	} else if (game_type_ == REPLAY)   {
 		replay();
-	} else if (m_game_type == LOADGAME) {
+	} else if (game_type_ == LOADGAME) {
 		Widelands::Game game;
 		try {
-			game.run_load_game(m_filename.c_str(), m_script_to_run);
+			game.run_load_game(filename_.c_str(), script_to_run_);
 		} catch (const Widelands::GameDataError & e) {
 			log("Game not loaded: Game data error: %s\n", e.what());
 		} catch (const std::exception & e) {
@@ -372,10 +372,10 @@
 			emergency_save(game);
 			throw;
 		}
-	} else if (m_game_type == SCENARIO) {
+	} else if (game_type_ == SCENARIO) {
 		Widelands::Game game;
 		try {
-			game.run_splayer_scenario_direct(m_filename.c_str(), m_script_to_run);
+			game.run_splayer_scenario_direct(filename_.c_str(), script_to_run_);
 		} catch (const Widelands::GameDataError & e) {
 			log("Scenario not started: Game data error: %s\n", e.what());
 		} catch (const std::exception & e) {
@@ -383,7 +383,7 @@
 			emergency_save(game);
 			throw;
 		}
-	} else if (m_game_type == INTERNET) {
+	} else if (game_type_ == INTERNET) {
 		Widelands::Game game;
 		try {
 			// disable sound completely
@@ -421,13 +421,13 @@
 
 				// Load the requested map
 				Widelands::Map map;
-				map.set_filename(m_filename);
-				std::unique_ptr<Widelands::MapLoader> ml = map.get_correct_loader(m_filename);
+				map.set_filename(filename_);
+				std::unique_ptr<Widelands::MapLoader> ml = map.get_correct_loader(filename_);
 				if (!ml) {
 					throw WLWarning
 						("Unsupported format",
 						 "Widelands could not load the file \"%s\". The file format seems to be incompatible.",
-						 m_filename.c_str());
+						 filename_.c_str());
 				}
 				ml->preload_map(true);
 
@@ -479,15 +479,15 @@
 	// settings are invisible to the rest of the code
 	switch (ev.type) {
 	case SDL_MOUSEMOTION:
-		ev.motion.xrel += m_mouse_compensate_warp.x;
-		ev.motion.yrel += m_mouse_compensate_warp.y;
-		m_mouse_compensate_warp = Point(0, 0);
-
-		if (m_mouse_locked) {
-			warp_mouse(m_mouse_position);
-
-			ev.motion.x = m_mouse_position.x;
-			ev.motion.y = m_mouse_position.y;
+		ev.motion.xrel += mouse_compensate_warp_.x;
+		ev.motion.yrel += mouse_compensate_warp_.y;
+		mouse_compensate_warp_ = Point(0, 0);
+
+		if (mouse_locked_) {
+			warp_mouse(mouse_position_);
+
+			ev.motion.x = mouse_position_.x;
+			ev.motion.y = mouse_position_.y;
 		}
 		break;
 
@@ -509,7 +509,7 @@
 		case SDLK_F10:
 			// exits the game.
 			if (ctrl) {
-				m_should_die = true;
+				should_die_ = true;
 			}
 			return true;
 
@@ -579,7 +579,7 @@
 			}
 			break;
 		case SDL_MOUSEMOTION:
-			m_mouse_position = Point(ev.motion.x, ev.motion.y);
+			mouse_position_ = Point(ev.motion.x, ev.motion.y);
 
 			if ((ev.motion.xrel || ev.motion.yrel) && cb && cb->mouse_move)
 				cb->mouse_move
@@ -588,7 +588,7 @@
 					 ev.motion.xrel, ev.motion.yrel);
 			break;
 		case SDL_QUIT:
-			m_should_die = true;
+			should_die_ = true;
 			break;
 		default:;
 		}
@@ -601,7 +601,7 @@
 void WLApplication::_handle_mousebutton
 	(SDL_Event & ev, InputCallback const * cb)
 {
-		if (m_mouse_swapped) {
+		if (mouse_swapped_) {
 			switch (ev.button.button) {
 				case SDL_BUTTON_LEFT:
 					ev.button.button = SDL_BUTTON_RIGHT;
@@ -625,7 +625,7 @@
 			 (get_key_state(SDL_SCANCODE_LALT) || get_key_state(SDL_SCANCODE_RALT)))
 		{
 			ev.button.button = SDL_BUTTON_LEFT;
-			m_faking_middle_mouse_button = true;
+			faking_middle_mouse_button_ = true;
 		}
 #endif
 
@@ -633,9 +633,9 @@
 			cb->mouse_press(ev.button.button, ev.button.x, ev.button.y);
 		else if (ev.type == SDL_MOUSEBUTTONUP) {
 			if (cb && cb->mouse_release) {
-				if (ev.button.button == SDL_BUTTON_MIDDLE && m_faking_middle_mouse_button) {
+				if (ev.button.button == SDL_BUTTON_MIDDLE && faking_middle_mouse_button_) {
 					cb->mouse_release(SDL_BUTTON_LEFT, ev.button.x, ev.button.y);
-					m_faking_middle_mouse_button = false;
+					faking_middle_mouse_button_ = false;
 				}
 				cb->mouse_release(ev.button.button, ev.button.x, ev.button.y);
 			}
@@ -646,18 +646,18 @@
 /// Instantaneously move the mouse cursor without creating a motion event.
 ///
 /// SDL_WarpMouseInWindow() *will* create a mousemotion event, which we do not want.
-/// As a workaround, we store the delta in m_mouse_compensate_warp and use that to
+/// As a workaround, we store the delta in mouse_compensate_warp_ and use that to
 /// eliminate the motion event in poll_event()
 ///
 /// \param position The new mouse position
 void WLApplication::warp_mouse(const Point position)
 {
-	m_mouse_position = position;
+	mouse_position_ = position;
 
 	Point cur_position;
 	SDL_GetMouseState(&cur_position.x, &cur_position.y);
 	if (cur_position != position) {
-		m_mouse_compensate_warp += cur_position - position;
+		mouse_compensate_warp_ += cur_position - position;
 		SDL_Window* sdl_window = g_gr->get_sdlwindow();
 		if (sdl_window) {
 			SDL_WarpMouseInWindow(sdl_window, position.x, position.y);
@@ -688,7 +688,7 @@
 		if (sdl_window) {
 			SDL_SetWindowGrab(sdl_window, SDL_FALSE);
 		}
-		warp_mouse(m_mouse_position); //TODO(unknown): is this redundant?
+		warp_mouse(mouse_position_); //TODO(unknown): is this redundant?
 	}
 }
 
@@ -767,7 +767,7 @@
 	// Initialize locale and grab "widelands" textdomain
 	i18n::init_locale();
 
-	i18n::set_localedir(m_datadir + "/locale");
+	i18n::set_localedir(datadir_ + "/locale");
 	i18n::grab_textdomain("widelands");
 
 	// Set locale corresponding to selected language
@@ -852,12 +852,12 @@
 			opt.erase(pos, opt.size() - pos);
 		}
 
-		m_commandline[opt] = value;
+		commandline_[opt] = value;
 	}
 }
 
 /**
- * Parse the command line given in m_commandline
+ * Parse the command line given in commandline_
  *
  * \return false if there were errors during parsing \e or if "--help"
  * was given,
@@ -865,105 +865,105 @@
 */
 void WLApplication::handle_commandline_parameters()
 {
-	if (m_commandline.count("logfile")) {
-		m_logfile = m_commandline["logfile"];
-		std::cerr << "Redirecting log target to: " <<  m_logfile << std::endl;
-		if (m_logfile.size() != 0) {
+	if (commandline_.count("logfile")) {
+		logfile_ = commandline_["logfile"];
+		std::cerr << "Redirecting log target to: " <<  logfile_ << std::endl;
+		if (logfile_.size() != 0) {
 			//TODO(unknown): (very small) memory leak of 1 ofstream;
 			//swaw the buffers (internally) of the file and wout
-			std::ofstream * widelands_out = new std::ofstream(m_logfile.c_str());
+			std::ofstream * widelands_out = new std::ofstream(logfile_.c_str());
 			std::streambuf * logbuf = widelands_out->rdbuf();
 			wout.rdbuf(logbuf);
 		}
-		m_commandline.erase("logfile");
+		commandline_.erase("logfile");
 	}
-	if (m_commandline.count("nosound")) {
+	if (commandline_.count("nosound")) {
 		g_sound_handler.nosound_ = true;
-		m_commandline.erase("nosound");
+		commandline_.erase("nosound");
 	}
-	if (m_commandline.count("nozip")) {
+	if (commandline_.count("nozip")) {
 		g_options.pull_section("global").create_val("nozip", "true");
-		m_commandline.erase("nozip");
+		commandline_.erase("nozip");
 	}
 
-	if (m_commandline.count("datadir")) {
-		m_datadir = m_commandline["datadir"];
-		m_commandline.erase("datadir");
+	if (commandline_.count("datadir")) {
+		datadir_ = commandline_["datadir"];
+		commandline_.erase("datadir");
 	} else {
-		m_datadir = is_absolute_path(INSTALL_DATADIR) ?
+		datadir_ = is_absolute_path(INSTALL_DATADIR) ?
 		               INSTALL_DATADIR :
 		               get_executable_directory() + INSTALL_DATADIR;
 	}
-	if (!is_absolute_path(m_datadir)) {
-		m_datadir = absolute_path_if_not_windows(FileSystem::get_working_directory() +
-		                                         FileSystem::file_separator() + m_datadir);
+	if (!is_absolute_path(datadir_)) {
+		datadir_ = absolute_path_if_not_windows(FileSystem::get_working_directory() +
+		                                         FileSystem::file_separator() + datadir_);
 	}
 
-	if (m_commandline.count("verbose")) {
+	if (commandline_.count("verbose")) {
 		g_verbose = true;
 
-		m_commandline.erase("verbose");
-	}
-
-	if (m_commandline.count("editor")) {
-		m_filename = m_commandline["editor"];
-		if (m_filename.size() && *m_filename.rbegin() == '/')
-			m_filename.erase(m_filename.size() - 1);
-		m_game_type = EDITOR;
-		m_commandline.erase("editor");
-	}
-
-	if (m_commandline.count("replay")) {
-		if (m_game_type != NONE)
+		commandline_.erase("verbose");
+	}
+
+	if (commandline_.count("editor")) {
+		filename_ = commandline_["editor"];
+		if (filename_.size() && *filename_.rbegin() == '/')
+			filename_.erase(filename_.size() - 1);
+		game_type_ = EDITOR;
+		commandline_.erase("editor");
+	}
+
+	if (commandline_.count("replay")) {
+		if (game_type_ != NONE)
 			throw wexception("replay can not be combined with other actions");
-		m_filename = m_commandline["replay"];
-		if (m_filename.size() && *m_filename.rbegin() == '/')
-			m_filename.erase(m_filename.size() - 1);
-		m_game_type = REPLAY;
-		m_commandline.erase("replay");
+		filename_ = commandline_["replay"];
+		if (filename_.size() && *filename_.rbegin() == '/')
+			filename_.erase(filename_.size() - 1);
+		game_type_ = REPLAY;
+		commandline_.erase("replay");
 	}
 
-	if (m_commandline.count("loadgame")) {
-		if (m_game_type != NONE)
+	if (commandline_.count("loadgame")) {
+		if (game_type_ != NONE)
 			throw wexception("loadgame can not be combined with other actions");
-		m_filename = m_commandline["loadgame"];
-		if (m_filename.empty())
+		filename_ = commandline_["loadgame"];
+		if (filename_.empty())
 			throw wexception("empty value of command line parameter --loadgame");
-		if (*m_filename.rbegin() == '/')
-			m_filename.erase(m_filename.size() - 1);
-		m_game_type = LOADGAME;
-		m_commandline.erase("loadgame");
+		if (*filename_.rbegin() == '/')
+			filename_.erase(filename_.size() - 1);
+		game_type_ = LOADGAME;
+		commandline_.erase("loadgame");
 	}
 
-	if (m_commandline.count("scenario")) {
-		if (m_game_type != NONE)
+	if (commandline_.count("scenario")) {
+		if (game_type_ != NONE)
 			throw wexception("scenario can not be combined with other actions");
-		m_filename = m_commandline["scenario"];
-		if (m_filename.empty())
+		filename_ = commandline_["scenario"];
+		if (filename_.empty())
 			throw wexception("empty value of command line parameter --scenario");
-		if (*m_filename.rbegin() == '/')
-			m_filename.erase(m_filename.size() - 1);
-		m_game_type = SCENARIO;
-		m_commandline.erase("scenario");
+		if (*filename_.rbegin() == '/')
+			filename_.erase(filename_.size() - 1);
+		game_type_ = SCENARIO;
+		commandline_.erase("scenario");
 	}
-	if (m_commandline.count("dedicated")) {
-		if (m_game_type != NONE)
+	if (commandline_.count("dedicated")) {
+		if (game_type_ != NONE)
 			throw wexception("dedicated can not be combined with other actions");
-		m_filename = m_commandline["dedicated"];
-		if (m_filename.empty())
+		filename_ = commandline_["dedicated"];
+		if (filename_.empty())
 			throw wexception("empty value of commandline parameter --dedicated");
-		if (*m_filename.rbegin() == '/')
-			m_filename.erase(m_filename.size() - 1);
-		m_game_type = INTERNET;
-		m_commandline.erase("dedicated");
+		if (*filename_.rbegin() == '/')
+			filename_.erase(filename_.size() - 1);
+		game_type_ = INTERNET;
+		commandline_.erase("dedicated");
 	}
-	if (m_commandline.count("script")) {
-		m_script_to_run = m_commandline["script"];
-		if (m_script_to_run.empty())
+	if (commandline_.count("script")) {
+		script_to_run_ = commandline_["script"];
+		if (script_to_run_.empty())
 			throw wexception("empty value of command line parameter --script");
-		if (*m_script_to_run.rbegin() == '/')
-			m_script_to_run.erase(m_script_to_run.size() - 1);
-		m_commandline.erase("script");
+		if (*script_to_run_.rbegin() == '/')
+			script_to_run_.erase(script_to_run_.size() - 1);
+		commandline_.erase("script");
 	}
 
 	//If it hasn't been handled yet it's probably an attempt to
@@ -972,10 +972,10 @@
 	//will be taken care of (==ignored) when saving the options
 
 	const std::map<std::string, std::string>::const_iterator commandline_end =
-		m_commandline.end();
+		commandline_.end();
 	for
 		(std::map<std::string, std::string>::const_iterator it =
-		 	m_commandline.begin();
+		 	commandline_.begin();
 		 it != commandline_end;
 		 ++it)
 	{
@@ -986,7 +986,7 @@
 			(it->first.c_str(), it->second.c_str());
 	}
 
-	if (m_commandline.count("help") || m_commandline.count("version")) {
+	if (commandline_.count("help") || commandline_.count("version")) {
 		init_language();
 		throw ParameterError(); //no message on purpose
 	}
@@ -1057,7 +1057,7 @@
 				break;
 			}
 			case FullscreenMenuBase::MenuTarget::kEditor:
-				EditorInteractive::run_editor(m_filename, m_script_to_run);
+				EditorInteractive::run_editor(filename_, script_to_run_);
 				break;
 			default:
 			case FullscreenMenuBase::MenuTarget::kExit:
@@ -1376,13 +1376,13 @@
 void WLApplication::replay()
 {
 	Widelands::Game game;
-	if (m_filename.empty()) {
+	if (filename_.empty()) {
 		SinglePlayerGameSettingsProvider sp;
 		FullscreenMenuLoadGame rm(game, &sp, nullptr, true);
 		if (rm.run<FullscreenMenuBase::MenuTarget>() == FullscreenMenuBase::MenuTarget::kBack)
 			return;
 
-		m_filename = rm.filename();
+		filename_ = rm.filename();
 	}
 
 	try {
@@ -1396,7 +1396,7 @@
 		game.set_ibase
 			(new InteractiveSpectator(game, g_options.pull_section("global")));
 		game.set_write_replay(false);
-		ReplayGameController rgc(game, m_filename);
+		ReplayGameController rgc(game, filename_);
 
 		game.save_handler().set_allow_saving(false);
 
@@ -1404,10 +1404,10 @@
 	} catch (const std::exception & e) {
 		log("Fatal Exception: %s\n", e.what());
 		emergency_save(game);
-		m_filename.clear();
+		filename_.clear();
 		throw;
 	}
-	m_filename.clear();
+	filename_.clear();
 }
 
 
@@ -1483,7 +1483,7 @@
 			memset(&tfile, 0, sizeof(tm));
 
 			tfile.tm_mday = atoi(timestr.substr(8, 2).c_str());
-			tfile.tm_mon = atoi(timestr.substr(5, 2).c_str()) - 1;
+			tfile.tm_mon  = atoi(timestr.substr(5, 2).c_str()) - 1;
 			tfile.tm_year = atoi(timestr.substr(0, 4).c_str()) - 1900;
 
 			double tdiff = std::difftime(tnow, mktime(&tfile)) / 86400;
@@ -1527,6 +1527,6 @@
 	/* No buffering */
 	setbuf(stderr, nullptr);
 
-	m_redirected_stdio = true;
+	redirected_stdio_ = true;
 	return true;
 }
 
=== modified file 'src/wlapplication.h'
--- src/wlapplication.h	2016-01-09 15:27:05 +0000
+++ src/wlapplication.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012, 2015 by the Widelands Development Team
+ * Copyright (C) 2006-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -140,7 +140,7 @@
 	void run();
 
 	/// \warning true if an external entity wants us to quit
-	bool should_die() const {return m_should_die;}
+	bool should_die() const {return should_die_;}
 
 	/// Get the state of the current KeyBoard Button
 	/// \warning This function doesn't check for dumbness
@@ -151,16 +151,16 @@
 	void set_input_grab(bool grab);
 
 	/// The mouse's current coordinates
-	Point get_mouse_position() const {return m_mouse_position;}
+	Point get_mouse_position() const {return mouse_position_;}
 	//
 	/// Find out whether the mouse is currently pressed
 	bool is_mouse_pressed() const {return SDL_GetMouseState(nullptr, nullptr); }
 
 	/// Swap left and right mouse key?
-	void set_mouse_swap(const bool swap) {m_mouse_swapped = swap;}
+	void set_mouse_swap(const bool swap) {mouse_swapped_ = swap;}
 
 	/// Lock the mouse cursor into place (e.g., for scrolling the map)
-	void set_mouse_lock(const bool locked) {m_mouse_locked = locked;}
+	void set_mouse_lock(const bool locked) {mouse_locked_ = locked;}
 	//@}
 
 
@@ -209,47 +209,47 @@
 	/**
 	 * The commandline, conveniently repackaged.
 	 */
-	std::map<std::string, std::string> m_commandline;
+	std::map<std::string, std::string> commandline_;
 
-	std::string m_filename;
+	std::string filename_;
 
 	/// Script to be run after the game was started with --editor,
 	/// --scenario or --loadgame.
-	std::string m_script_to_run;
+	std::string script_to_run_;
 
 	//Log all output to this file if set, otherwise use cout
-	std::string m_logfile;
+	std::string logfile_;
 
-	GameType m_game_type;
+	GameType game_type_;
 
 	///True if left and right mouse button should be swapped
-	bool  m_mouse_swapped;
+	bool  mouse_swapped_;
 
 	/// When apple is involved, the middle mouse button is sometimes send, even
 	/// if it wasn't pressed. We try to revert this and this helps.
-	bool  m_faking_middle_mouse_button;
+	bool  faking_middle_mouse_button_;
 
 	///The current position of the mouse pointer
-	Point m_mouse_position;
+	Point mouse_position_;
 
 	///If true, the mouse cursor will \e not move with a mousemotion event:
 	///instead, the map will be scrolled
-	bool  m_mouse_locked;
+	bool  mouse_locked_;
 
 	///If the mouse needs to be moved in warp_mouse(), this Point is
 	///used to cancel the resulting SDL_MouseMotionEvent.
-	Point m_mouse_compensate_warp;
+	Point mouse_compensate_warp_;
 
 	///true if an external entity wants us to quit
-	bool   m_should_die;
+	bool   should_die_;
 
-	std::string m_homedir;
+	std::string homedir_;
 
 	/// flag indicating if stdout and stderr have been redirected
-	bool m_redirected_stdio;
+	bool redirected_stdio_;
 
 	/// Absolute path to the data directory.
-	std::string m_datadir;
+	std::string datadir_;
 
 	///Holds this process' one and only instance of WLApplication, if it was
 	///created already. nullptr otherwise.
 
=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2016-01-10 11:36:05 +0000
+++ src/wui/buildingwindow.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -55,27 +55,27 @@
 		(&parent, "building_window",
 		 0, 0, Width, 0,
 		 b.descr().descname()),
-	m_registry(registry),
-	m_building       (b),
-	m_workarea_overlay_id(0),
-	m_avoid_fastclick(false)
+	registry_(registry),
+	building_       (b),
+	workarea_overlay_id_(0),
+	avoid_fastclick_(false)
 {
-	delete m_registry;
-	m_registry = this;
+	delete registry_;
+	registry_ = this;
 
-	m_capscache_player_number = 0;
-	m_capsbuttons = nullptr;
-	m_capscache = 0;
-	m_caps_setup = false;
-	m_toggle_workarea = nullptr;
+	capscache_player_number_ = 0;
+	capsbuttons_ = nullptr;
+	capscache_ = 0;
+	caps_setup_ = false;
+	toggle_workarea_ = nullptr;
 
 	UI::Box * vbox = new UI::Box(this, 0, 0, UI::Box::Vertical);
 
-	m_tabs = new UI::TabPanel(vbox, 0, 0, nullptr);
-	vbox->add(m_tabs, UI::Box::AlignLeft, true);
+	tabs_ = new UI::TabPanel(vbox, 0, 0, nullptr);
+	vbox->add(tabs_, UI::Box::AlignLeft, true);
 
-	m_capsbuttons = new UI::Box(vbox, 0, 0, UI::Box::Horizontal);
-	vbox->add(m_capsbuttons, UI::Box::AlignLeft, true);
+	capsbuttons_ = new UI::Box(vbox, 0, 0, UI::Box::Horizontal);
+	vbox->add(capsbuttons_, UI::Box::AlignLeft, true);
 	// actually create buttons on the first call to think(),
 	// so that overriding create_capsbuttons() works
 
@@ -86,7 +86,7 @@
 	show_workarea();
 
 	// Title for construction site
-	if (upcast(Widelands::ConstructionSite, csite, &m_building)) {
+	if (upcast(Widelands::ConstructionSite, csite, &building_)) {
 		// Show name in parenthesis as it may take all width already
 		const std::string title = (boost::format("(%s)") % csite->building().descname()).str();
 		set_title(title);
@@ -96,10 +96,10 @@
 
 BuildingWindow::~BuildingWindow()
 {
-	if (m_workarea_overlay_id) {
-		igbase().mutable_field_overlay_manager()->remove_overlay(m_workarea_overlay_id);
+	if (workarea_overlay_id_) {
+		igbase().mutable_field_overlay_manager()->remove_overlay(workarea_overlay_id_);
 	}
-	m_registry = nullptr;
+	registry_ = nullptr;
 }
 
 namespace Widelands {class BuildingDescr;}
@@ -138,18 +138,18 @@
 		die();
 
 	if
-		(!m_caps_setup
-		 ||
-		 m_capscache_player_number != igbase().player_number()
-		 ||
-		 building().get_playercaps() != m_capscache)
+		(!caps_setup_
+		 ||
+		 capscache_player_number_ != igbase().player_number()
+		 ||
+		 building().get_playercaps() != capscache_)
 	{
-		m_capsbuttons->free_children();
-		create_capsbuttons(m_capsbuttons);
+		capsbuttons_->free_children();
+		create_capsbuttons(capsbuttons_);
 		move_out_of_the_way();
-		if (!m_avoid_fastclick)
+		if (!avoid_fastclick_)
 			warp_mouse_to_fastclick_panel();
-		m_caps_setup = true;
+		caps_setup_ = true;
 	}
 
 
@@ -165,8 +165,8 @@
  */
 void BuildingWindow::create_capsbuttons(UI::Box * capsbuttons)
 {
-	m_capscache = building().get_playercaps();
-	m_capscache_player_number = igbase().player_number();
+	capscache_ = building().get_playercaps();
+	capscache_player_number_ = igbase().player_number();
 
 	const Widelands::Player & owner = building().owner();
 	const Widelands::PlayerNumber owner_number = owner.player_number();
@@ -176,7 +176,7 @@
 	bool requires_destruction_separator = false;
 	if (can_act) {
 		// Check if this is a port building and if yes show expedition button
-		if (upcast(Widelands::Warehouse const, warehouse, &m_building)) {
+		if (upcast(Widelands::Warehouse const, warehouse, &building_)) {
 			if (Widelands::PortDock * pd = warehouse->get_portdock()) {
 				if (pd->expedition_started()) {
 					UI::Button * expeditionbtn =
@@ -202,7 +202,7 @@
 			}
 		}
 		else
-		if (upcast(const Widelands::ProductionSite, productionsite, &m_building)) {
+		if (upcast(const Widelands::ProductionSite, productionsite, &building_)) {
 			if (!is_a(Widelands::MilitarySite, productionsite)) {
 				const bool is_stopped = productionsite->is_stopped();
 				UI::Button * stopbtn =
@@ -227,9 +227,9 @@
 			}
 		} // upcast to productionsite
 
-		if (m_capscache & Widelands::Building::PCap_Enhancable) {
+		if (capscache_ & Widelands::Building::PCap_Enhancable) {
 			const Widelands::DescriptionIndex & enhancement =
-				m_building.descr().enhancement();
+				building_.descr().enhancement();
 			const Widelands::TribeDescr & tribe  = owner.tribe();
 			if (owner.is_building_type_allowed(enhancement)) {
 					const Widelands::BuildingDescr & building_descr =
@@ -256,7 +256,7 @@
 				}
 		}
 
-		if (m_capscache & Widelands::Building::PCap_Bulldoze) {
+		if (capscache_ & Widelands::Building::PCap_Bulldoze) {
 			UI::Button * destroybtn =
 				new UI::Button
 					(capsbuttons, "destroy", 0, 0, 34, 34,
@@ -272,9 +272,9 @@
 			requires_destruction_separator = true;
 		}
 
-		if (m_capscache & Widelands::Building::PCap_Dismantle) {
+		if (capscache_ & Widelands::Building::PCap_Dismantle) {
 			std::map<Widelands::DescriptionIndex, uint8_t> wares;
-			Widelands::DismantleSite::count_returned_wares(&m_building, wares);
+			Widelands::DismantleSite::count_returned_wares(&building_, wares);
 			UI::Button * dismantlebtn =
 				new UI::Button
 					(capsbuttons, "dismantle", 0, 0, 34, 34,
@@ -301,24 +301,24 @@
 
 	if (can_see) {
 		WorkareaInfo wa_info;
-		if (upcast(Widelands::ConstructionSite, csite, &m_building)) {
+		if (upcast(Widelands::ConstructionSite, csite, &building_)) {
 			wa_info = csite->building().m_workarea_info;
 		} else {
-			wa_info = m_building.descr().m_workarea_info;
+			wa_info = building_.descr().m_workarea_info;
 		}
 		if (!wa_info.empty()) {
-			m_toggle_workarea = new UI::Button
+			toggle_workarea_ = new UI::Button
 				(capsbuttons, "workarea",
 				 0, 0, 34, 34,
 				 g_gr->images().get("pics/but4.png"),
 				 g_gr->images().get("pics/workarea123.png"),
 				 _("Hide work area"));
-			m_toggle_workarea->sigclicked.connect
+			toggle_workarea_->sigclicked.connect
 				(boost::bind(&BuildingWindow::toggle_workarea, boost::ref(*this)));
 
-			capsbuttons->add(m_toggle_workarea, UI::Box::AlignCenter);
+			capsbuttons->add(toggle_workarea_, UI::Box::AlignCenter);
 			configure_workarea_button();
-			set_fastclick_panel(m_toggle_workarea);
+			set_fastclick_panel(toggle_workarea_);
 		}
 
 		if (igbase().get_display_flag(InteractiveBase::dfDebug)) {
@@ -358,10 +358,10 @@
 				 _("Help"));
 
 		UI::UniqueWindow::Registry& registry =
-			igbase().unique_windows().get_registry(m_building.descr().name() + "_help");
+			igbase().unique_windows().get_registry(building_.descr().name() + "_help");
 		registry.open_window = [this, &registry] {
 			new UI::BuildingHelpWindow(
-				&igbase(), registry, m_building.descr(), m_building.owner().tribe(), &igbase().egbase().lua());
+				&igbase(), registry, building_.descr(), building_.owner().tribe(), &igbase().egbase().lua());
 		};
 
 		helpbtn->sigclicked.connect(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(registry)));
@@ -377,11 +377,11 @@
 void BuildingWindow::act_bulldoze()
 {
 	if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
-		if (m_building.get_playercaps() & Widelands::Building::PCap_Bulldoze)
-			igbase().game().send_player_bulldoze(m_building);
+		if (building_.get_playercaps() & Widelands::Building::PCap_Bulldoze)
+			igbase().game().send_player_bulldoze(building_);
 	}
 	else {
-		show_bulldoze_confirm(dynamic_cast<InteractivePlayer&>(igbase()), m_building);
+		show_bulldoze_confirm(dynamic_cast<InteractivePlayer&>(igbase()), building_);
 	}
 }
 
@@ -393,11 +393,11 @@
 void BuildingWindow::act_dismantle()
 {
 	if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
-		if (m_building.get_playercaps() & Widelands::Building::PCap_Dismantle)
-			igbase().game().send_player_dismantle(m_building);
+		if (building_.get_playercaps() & Widelands::Building::PCap_Dismantle)
+			igbase().game().send_player_dismantle(building_);
 	}
 	else {
-		show_dismantle_confirm(dynamic_cast<InteractivePlayer&>(igbase()), m_building);
+		show_dismantle_confirm(dynamic_cast<InteractivePlayer&>(igbase()), building_);
 	}
 }
 
@@ -407,8 +407,8 @@
 ===============
 */
 void BuildingWindow::act_start_stop() {
-	if (dynamic_cast<const Widelands::ProductionSite *>(&m_building))
-		igbase().game().send_player_start_stop_building (m_building);
+	if (dynamic_cast<const Widelands::ProductionSite *>(&building_))
+		igbase().game().send_player_start_stop_building (building_);
 
 	die();
 }
@@ -420,9 +420,9 @@
 ===============
 */
 void BuildingWindow::act_start_or_cancel_expedition() {
-	if (upcast(Widelands::Warehouse const, warehouse, &m_building))
+	if (upcast(Widelands::Warehouse const, warehouse, &building_))
 		if (warehouse->get_portdock())
-			igbase().game().send_player_start_or_cancel_expedition(m_building);
+			igbase().game().send_player_start_or_cancel_expedition(building_);
 
 	// No need to die here - as soon as the request is handled, the UI will get updated by the portdock
 	//die();
@@ -436,13 +436,13 @@
 void BuildingWindow::act_enhance(Widelands::DescriptionIndex id)
 {
 	if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
-		if (m_building.get_playercaps() & Widelands::Building::PCap_Enhancable)
-			igbase().game().send_player_enhance_building(m_building, id);
+		if (building_.get_playercaps() & Widelands::Building::PCap_Enhancable)
+			igbase().game().send_player_enhance_building(building_, id);
 	}
 	else {
 		show_enhance_confirm
 			(dynamic_cast<InteractivePlayer&>(igbase()),
-			 m_building,
+			 building_,
 			 id);
 	}
 }
@@ -456,7 +456,7 @@
 {
 	show_field_debug
 		(igbase(),
-		 igbase().game().map().get_fcoords(m_building.get_position()));
+		 igbase().game().map().get_fcoords(building_.get_position()));
 }
 
 /**
@@ -464,19 +464,19 @@
  */
 void BuildingWindow::show_workarea()
 {
-	if (m_workarea_overlay_id) {
+	if (workarea_overlay_id_) {
 		return; // already shown, nothing to be done
 	}
 	WorkareaInfo workarea_info;
-	if (upcast(Widelands::ConstructionSite, csite, &m_building)) {
+	if (upcast(Widelands::ConstructionSite, csite, &building_)) {
 		workarea_info = csite->building().m_workarea_info;
 	} else {
-		workarea_info = m_building.descr().m_workarea_info;
+		workarea_info = building_.descr().m_workarea_info;
 	}
 	if (workarea_info.empty()) {
 		return;
 	}
-	m_workarea_overlay_id = igbase().show_work_area(workarea_info, m_building.get_position());
+	workarea_overlay_id_ = igbase().show_work_area(workarea_info, building_.get_position());
 
 	configure_workarea_button();
 }
@@ -486,33 +486,33 @@
  */
 void BuildingWindow::hide_workarea()
 {
-	if (m_workarea_overlay_id) {
-		igbase().hide_work_area(m_workarea_overlay_id);
-		m_workarea_overlay_id = 0;
+	if (workarea_overlay_id_) {
+		igbase().hide_work_area(workarea_overlay_id_);
+		workarea_overlay_id_ = 0;
 
 		configure_workarea_button();
 	}
 }
 
 /**
- * Sets the perm_pressed state and the tooltip.
+ * Sets the perpressed_ state and the tooltip.
  */
 void BuildingWindow::configure_workarea_button()
 {
-	if (m_toggle_workarea) {
-		if (m_workarea_overlay_id) {
-			m_toggle_workarea->set_tooltip(_("Hide work area"));
-			m_toggle_workarea->set_perm_pressed(true);
+	if (toggle_workarea_) {
+		if (workarea_overlay_id_) {
+			toggle_workarea_->set_tooltip(_("Hide work area"));
+			toggle_workarea_->set_perm_pressed(true);
 		} else {
-			m_toggle_workarea->set_tooltip(_("Show work area"));
-			m_toggle_workarea->set_perm_pressed(false);
+			toggle_workarea_->set_tooltip(_("Show work area"));
+			toggle_workarea_->set_perm_pressed(false);
 		}
 	}
 }
 
 
 void BuildingWindow::toggle_workarea() {
-	if (m_workarea_overlay_id) {
+	if (workarea_overlay_id_) {
 		hide_workarea();
 	} else {
 		show_workarea();
 
=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h	2016-01-07 12:47:17 +0000
+++ src/wui/buildingwindow.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2010, 2012 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -45,7 +45,7 @@
 
 	virtual ~BuildingWindow();
 
-	Widelands::Building & building() {return m_building;}
+	Widelands::Building & building() {return building_;}
 
 	InteractiveGameBase & igbase() const {
 		return dynamic_cast<InteractiveGameBase&>(*get_parent());
@@ -53,10 +53,10 @@
 
 	void draw(RenderTarget &) override;
 	void think() override;
-	void set_avoid_fastclick(bool afc) {m_avoid_fastclick = afc;}
+	void set_avoid_fastclick(bool afc) {avoid_fastclick_ = afc;}
 
 protected:
-	UI::TabPanel * get_tabs() {return m_tabs;}
+	UI::TabPanel * get_tabs() {return tabs_;}
 
 	void act_bulldoze();
 	void act_dismantle();
@@ -75,23 +75,23 @@
 
 	virtual void create_capsbuttons(UI::Box * buttons);
 
-	UI::Window * & m_registry;
+	UI::Window * & registry_;
 
 private:
-	Widelands::Building& m_building;
-
-	UI::TabPanel * m_tabs;
-
-	UI::Box * m_capsbuttons; ///< \ref UI::Box that contains capabilities buttons
-	UI::Button * m_toggle_workarea;
+	Widelands::Building& building_;
+
+	UI::TabPanel * tabs_;
+
+	UI::Box * capsbuttons_; ///< \ref UI::Box that contains capabilities buttons
+	UI::Button * toggle_workarea_;
 
 	//  capabilities that were last used in setting up the caps panel
-	uint32_t m_capscache;
-	Widelands::PlayerNumber m_capscache_player_number;
-	bool m_caps_setup;
+	uint32_t capscache_;
+	Widelands::PlayerNumber capscache_player_number_;
+	bool caps_setup_;
 
-	FieldOverlayManager::OverlayId m_workarea_overlay_id;
-	bool m_avoid_fastclick;
+	FieldOverlayManager::OverlayId workarea_overlay_id_;
+	bool avoid_fastclick_;
 };
 
 #endif  // end of include guard: WL_WUI_BUILDINGWINDOW_H
 
=== modified file 'src/wui/debugconsole.cc'
--- src/wui/debugconsole.cc	2014-09-20 09:37:47 +0000
+++ src/wui/debugconsole.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2008-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -136,7 +136,7 @@
 	// This check is an evil hack to account for the singleton-nature
 	// of the Console
 	if (this != &g_console) {
-		for (const auto& command : m_commands) {
+		for (const auto& command : commands_) {
 			g_console.commands.erase(command);
 		}
 	}
@@ -145,7 +145,7 @@
 void Handler::addCommand(const std::string & cmd, const HandlerFn & fun)
 {
 	g_console.commands[cmd] = fun;
-	m_commands.push_back(cmd);
+	commands_.push_back(cmd);
 }
 
 void Handler::setDefaultCommand(const HandlerFn & fun)
 
=== modified file 'src/wui/debugconsole.h'
--- src/wui/debugconsole.h	2014-09-19 09:07:14 +0000
+++ src/wui/debugconsole.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2010 by the Widelands Development Team
+ * Copyright (C) 2008-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -60,7 +60,7 @@
 	void setDefaultCommand(const HandlerFn &);
 
 private:
-	std::vector<std::string> m_commands;
+	std::vector<std::string> commands_;
 };
 
 /**
 
=== modified file 'src/wui/edge_overlay_manager.cc'
--- src/wui/edge_overlay_manager.cc	2015-03-29 18:07:45 +0000
+++ src/wui/edge_overlay_manager.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2015 by the Widelands Development Team
+ * Copyright (C) 2006-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,21 +19,21 @@
 
 #include "wui/edge_overlay_manager.h"
 
-EdgeOverlayManager::EdgeOverlayManager() : m_current_overlay_id(0) {
+EdgeOverlayManager::EdgeOverlayManager() : current_overlay_id_(0) {
 }
 
 EdgeOverlayManager::OverlayId EdgeOverlayManager::next_overlay_id() {
-	++m_current_overlay_id;
-	return m_current_overlay_id;
+	++current_overlay_id_;
+	return current_overlay_id_;
 }
 
 void EdgeOverlayManager::register_overlay
 	(Widelands::Coords const c, uint8_t const where, OverlayId const overlay_id)
 {
 	const RegisteredRoadOverlays overlay = {overlay_id, where};
-	RegisteredRoadOverlaysMap::iterator it = m_overlays.find(c);
-	if (it == m_overlays.end())
-		m_overlays.insert
+	RegisteredRoadOverlaysMap::iterator it = overlays_.find(c);
+	if (it == overlays_.end())
+		overlays_.insert
 			(std::pair<const Widelands::Coords,
 			 RegisteredRoadOverlays>(c, overlay));
 	else
@@ -41,25 +41,25 @@
 }
 
 void EdgeOverlayManager::remove_overlay(const Widelands::Coords c) {
-	const RegisteredRoadOverlaysMap::iterator it = m_overlays.find(c);
-	if (it != m_overlays.end())
-		m_overlays.erase(it);
+	const RegisteredRoadOverlaysMap::iterator it = overlays_.find(c);
+	if (it != overlays_.end())
+		overlays_.erase(it);
 }
 
 void EdgeOverlayManager::remove_overlay(OverlayId const overlay_id) {
-	RegisteredRoadOverlaysMap::iterator it = m_overlays.begin();
+	RegisteredRoadOverlaysMap::iterator it = overlays_.begin();
 	const RegisteredRoadOverlaysMap::const_iterator end =
-		m_overlays.end();
+		overlays_.end();
 	while (it != end)
 		if (it->second.overlay_id == overlay_id)
-			m_overlays.erase(it++); //  Necessary!
+			overlays_.erase(it++); //  Necessary!
 		else
 			++it;
 }
 
 uint8_t EdgeOverlayManager::get_overlay(const Widelands::Coords c) const {
-	RegisteredRoadOverlaysMap::const_iterator const it = m_overlays.find(c);
-	if (it != m_overlays.end())
+	RegisteredRoadOverlaysMap::const_iterator const it = overlays_.find(c);
+	if (it != overlays_.end())
 		return it->second.where;
 	return 0;
 }
 
=== modified file 'src/wui/edge_overlay_manager.h'
--- src/wui/edge_overlay_manager.h	2015-03-29 18:07:45 +0000
+++ src/wui/edge_overlay_manager.h	2016-01-24 20:25:45 +0000
@@ -54,8 +54,8 @@
 	using RegisteredRoadOverlaysMap =
 	   std::map<const Widelands::Coords, RegisteredRoadOverlays, Widelands::Coords::OrderingFunctor>;
 
-	OverlayId m_current_overlay_id;
-	RegisteredRoadOverlaysMap m_overlays;
+	OverlayId current_overlay_id_;
+	RegisteredRoadOverlaysMap overlays_;
 
 	DISALLOW_COPY_AND_ASSIGN(EdgeOverlayManager);
 };
 
=== modified file 'src/wui/field_overlay_manager.cc'
--- src/wui/field_overlay_manager.cc	2016-01-15 19:48:47 +0000
+++ src/wui/field_overlay_manager.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008, 2010-2011, 2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,8 +26,8 @@
 #include "graphic/graphic.h"
 #include "logic/field.h"
 
-FieldOverlayManager::FieldOverlayManager() : m_current_overlay_id(0) {
-	OverlayInfo * buildhelp_info = m_buildhelp_infos;
+FieldOverlayManager::FieldOverlayManager() : current_overlay_id_(0) {
+	OverlayInfo * buildhelp_info = buildhelp_infos_;
 	const char * filenames[] = {
 		"pics/set_flag.png",
 		"pics/small.png",
@@ -55,16 +55,16 @@
 }
 
 bool FieldOverlayManager::buildhelp() const {
-	return m_buildhelp;
+	return buildhelp_;
 }
 
 void FieldOverlayManager::show_buildhelp(const bool value) {
-	m_buildhelp = value;
+	buildhelp_ = value;
 }
 
 void FieldOverlayManager::get_overlays(Widelands::FCoords const c,
                                           std::vector<OverlayInfo>* result) const {
-	const RegisteredOverlaysMap & overlay_map = m_overlays[Widelands::TCoords<>::None];
+	const RegisteredOverlaysMap & overlay_map = overlays_[Widelands::TCoords<>::None];
 	RegisteredOverlaysMap::const_iterator it = overlay_map.lower_bound(c);
 
 	while (it != overlay_map.end() && it->first == c && it->second.level <= kLevelForBuildHelp) {
@@ -72,10 +72,10 @@
 		++it;
 	}
 
-	if (m_buildhelp) {
+	if (buildhelp_) {
 		int buildhelp_overlay_index = get_buildhelp_overlay(c);
 		if (buildhelp_overlay_index < Widelands::Field::Buildhelp_None) {
-		   result->emplace_back(m_buildhelp_infos[buildhelp_overlay_index]);
+		   result->emplace_back(buildhelp_infos_[buildhelp_overlay_index]);
 	   }
 	}
 
@@ -90,7 +90,7 @@
 	assert(c.t == Widelands::TCoords<>::D || c.t == Widelands::TCoords<>::R);
 
 
-	const RegisteredOverlaysMap & overlay_map = m_overlays[c.t];
+	const RegisteredOverlaysMap & overlay_map = overlays_[c.t];
 	RegisteredOverlaysMap::const_iterator it = overlay_map.lower_bound(c);
 	while (it != overlay_map.end() && it->first == c) {
 		result->emplace_back(it->second.pic, it->second.hotspot);
@@ -100,7 +100,7 @@
 
 int FieldOverlayManager::get_buildhelp_overlay(const Widelands::FCoords& fc) const {
 	Widelands::NodeCaps const caps =
-	   m_callback ? static_cast<Widelands::NodeCaps>(m_callback(fc)) : fc.field->nodecaps();
+	   callback_ ? static_cast<Widelands::NodeCaps>(callback_(fc)) : fc.field->nodecaps();
 
 	const int value = caps & Widelands::BUILDCAPS_MINE ?
 	               Widelands::Field::Buildhelp_Mine :
@@ -130,7 +130,7 @@
 		hotspot = Point(pic->width() / 2, pic->height() / 2);
 	}
 
-	RegisteredOverlaysMap & overlay_map = m_overlays[c.t];
+	RegisteredOverlaysMap & overlay_map = overlays_[c.t];
 	for
 		(RegisteredOverlaysMap::iterator it = overlay_map.find(c);
 		 it != overlay_map.end() && it->first == c;
@@ -180,7 +180,7 @@
 void FieldOverlayManager::remove_overlay(Widelands::TCoords<> const c, const Image* pic) {
 	assert(c.t <= 2);
 
-	RegisteredOverlaysMap & overlay_map = m_overlays[c.t];
+	RegisteredOverlaysMap & overlay_map = overlays_[c.t];
 
 	if (overlay_map.count(c)) {
 		RegisteredOverlaysMap::iterator it = overlay_map.lower_bound(c);
@@ -196,8 +196,8 @@
 }
 
 void FieldOverlayManager::remove_overlay(const OverlayId overlay_id) {
-	const RegisteredOverlaysMap * const overlays_end = m_overlays + 3;
-	for (RegisteredOverlaysMap * j = m_overlays; j != overlays_end; ++j)
+	const RegisteredOverlaysMap * const overlays_end = overlays_ + 3;
+	for (RegisteredOverlaysMap * j = overlays_; j != overlays_end; ++j)
 		for (RegisteredOverlaysMap::iterator it = j->begin(); it != j->end();) {
 			it->second.overlay_ids.erase(overlay_id);
 			if (it->second.overlay_ids.empty())
@@ -208,16 +208,16 @@
 }
 
 void FieldOverlayManager::remove_all_overlays() {
-	m_overlays[0].clear();
-	m_overlays[1].clear();
-	m_overlays[2].clear();
+	overlays_[0].clear();
+	overlays_[1].clear();
+	overlays_[2].clear();
 }
 
 void FieldOverlayManager::register_overlay_callback_function(CallbackFn function) {
-	m_callback = function;
+	callback_ = function;
 }
 
 FieldOverlayManager::OverlayId FieldOverlayManager::next_overlay_id() {
-	++m_current_overlay_id;
-	return m_current_overlay_id;
+	++current_overlay_id_;
+	return current_overlay_id_;
 }
 
=== modified file 'src/wui/field_overlay_manager.h'
--- src/wui/field_overlay_manager.h	2016-01-15 19:48:47 +0000
+++ src/wui/field_overlay_manager.h	2016-01-24 20:25:45 +0000
@@ -126,19 +126,19 @@
 	                                                      RegisteredOverlays,
 	                                                      Widelands::Coords::OrderingFunctor>;
 
-	// Returns the index into m_buildhelp_infos for the correct fieldcaps for
-	// 'fc' according to the current 'm_callback'.
+	// Returns the index into buildhelp_infos_ for the correct fieldcaps for
+	// 'fc' according to the current 'callback_'.
 	int get_buildhelp_overlay(const Widelands::FCoords& fc) const;
 
 	//  indexed by TCoords<>::TriangleIndex
-	RegisteredOverlaysMap m_overlays[3];
+	RegisteredOverlaysMap overlays_[3];
 
-	OverlayInfo m_buildhelp_infos[Widelands::Field::Buildhelp_None];
-	bool m_buildhelp;
+	OverlayInfo buildhelp_infos_[Widelands::Field::Buildhelp_None];
+	bool buildhelp_;
 
 	// this callback is used to define where overlays are drawn.
-	CallbackFn m_callback;
-	OverlayId m_current_overlay_id;
+	CallbackFn callback_;
+	OverlayId current_overlay_id_;
 };
 
 #endif  // end of include guard: WL_WUI_FIELD_OVERLAY_MANAGER_H
 
=== modified file 'src/wui/game_chat_menu.cc'
--- src/wui/game_chat_menu.cc	2014-09-20 09:37:47 +0000
+++ src/wui/game_chat_menu.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008, 2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,17 +36,17 @@
 	 const std::string          & title)
 :
 UI::UniqueWindow(parent, "chat", &registry, 440, 235, title),
-m_chat(this, 5, 5, get_inner_w() - 10, get_inner_h() - 10, chat)
+chat_(this, 5, 5, get_inner_w() - 10, get_inner_h() - 10, chat)
 {
 	if (get_usedefaultpos())
 		center_to_parent();
 
-	m_close_on_send = false;
-
-	m_chat.sent.connect(boost::bind(&GameChatMenu::acknowledge, this));
-	m_chat.aborted.connect(boost::bind(&GameChatMenu::acknowledge, this));
-
-	enter_chat_message(m_close_on_send);
+	close_on_send_ = false;
+
+	chat_.sent.connect(boost::bind(&GameChatMenu::acknowledge, this));
+	chat_.aborted.connect(boost::bind(&GameChatMenu::acknowledge, this));
+
+	enter_chat_message(close_on_send_);
 }
 
 GameChatMenu* GameChatMenu::create_chat_console(
@@ -67,13 +67,13 @@
 
 void GameChatMenu::enter_chat_message(bool close_on_send)
 {
-	m_chat.focus_edit();
-	m_close_on_send = close_on_send;
+	chat_.focus_edit();
+	close_on_send_ = close_on_send;
 }
 
 
 void GameChatMenu::acknowledge()
 {
-	if (m_close_on_send)
+	if (close_on_send_)
 		die();
 }
 
=== modified file 'src/wui/game_chat_menu.h'
--- src/wui/game_chat_menu.h	2014-07-05 16:41:51 +0000
+++ src/wui/game_chat_menu.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008 by the Widelands Development Team
+ * Copyright (C) 2002-2016, 2008 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -50,8 +50,8 @@
 private:
 	GameChatMenu(UI::Panel *, UI::UniqueWindow::Registry &, ChatProvider &, const std::string & title);
 	void acknowledge();
-	GameChatPanel m_chat;
-	bool m_close_on_send;
+	GameChatPanel chat_;
+	bool close_on_send_;
 };
 
 #endif  // end of include guard: WL_WUI_GAME_CHAT_MENU_H
 
=== modified file 'src/wui/game_main_menu.cc'
--- src/wui/game_main_menu.cc	2014-10-11 09:11:29 +0000
+++ src/wui/game_main_menu.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,8 +37,8 @@
 	 InteractivePlayer::GameMainMenuWindows & windows)
 :
 UI::UniqueWindow(&plr, "main_menu", &registry, 180, 55, _("Statistics Menu")),
-m_player      (plr),
-m_windows     (windows),
+player_      (plr),
+windows_     (windows),
 general_stats
 	(this, "general_stats",
 	 posx(0, 4), posy(0, 3), buttonw(4), buttonh(1),
@@ -65,13 +65,13 @@
 	 _("Stock"))
 {
 	general_stats.sigclicked.connect
-		(boost::bind(&GeneralStatisticsMenu::Registry::toggle, boost::ref(m_windows.general_stats)));
+		(boost::bind(&GeneralStatisticsMenu::Registry::toggle, boost::ref(windows_.general_stats)));
 	ware_stats.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_windows.ware_stats)));
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(windows_.ware_stats)));
 	building_stats.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_windows.building_stats)));
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(windows_.building_stats)));
 	stock.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_windows.stock)));
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(windows_.stock)));
 
 #define INIT_BTN_HOOKS(registry, btn)                                        \
  assert (!registry.on_create);                                             \
@@ -80,19 +80,19 @@
  registry.on_delete = std::bind(&UI::Button::set_perm_pressed, &btn, false); \
  if (registry.window) btn.set_perm_pressed(true);                            \
 
-	INIT_BTN_HOOKS(m_windows.general_stats, general_stats)
-	INIT_BTN_HOOKS(m_windows.ware_stats, ware_stats)
-	INIT_BTN_HOOKS(m_windows.building_stats, building_stats)
-	INIT_BTN_HOOKS(m_windows.stock, stock)
+	INIT_BTN_HOOKS(windows_.general_stats, general_stats)
+	INIT_BTN_HOOKS(windows_.ware_stats, ware_stats)
+	INIT_BTN_HOOKS(windows_.building_stats, building_stats)
+	INIT_BTN_HOOKS(windows_.stock, stock)
 
-	m_windows.general_stats.open_window = [this] {
-		new GeneralStatisticsMenu(m_player, m_windows.general_stats);
-	};
-	m_windows.ware_stats.open_window = [this] {
-		new WareStatisticsMenu(m_player, m_windows.ware_stats);
-	};
-	m_windows.building_stats.open_window = [this] {
-		new BuildingStatisticsMenu(m_player, m_windows.building_stats);
+	windows_.general_stats.open_window = [this] {
+		new GeneralStatisticsMenu(player_, windows_.general_stats);
+	};
+	windows_.ware_stats.open_window = [this] {
+		new WareStatisticsMenu(player_, windows_.ware_stats);
+	};
+	windows_.building_stats.open_window = [this] {
+		new BuildingStatisticsMenu(player_, windows_.building_stats);
 	};
 
 	if (get_usedefaultpos())
@@ -109,8 +109,8 @@
 	registry.on_create = 0;                                                                         \
 	registry.on_delete = 0;
 
-	DEINIT_BTN_HOOKS(m_windows.general_stats, general_stats)
-	DEINIT_BTN_HOOKS(m_windows.ware_stats, ware_stats)
-	DEINIT_BTN_HOOKS(m_windows.building_stats, building_stats)
-	DEINIT_BTN_HOOKS(m_windows.stock, stock)
+	DEINIT_BTN_HOOKS(windows_.general_stats, general_stats)
+	DEINIT_BTN_HOOKS(windows_.ware_stats, ware_stats)
+	DEINIT_BTN_HOOKS(windows_.building_stats, building_stats)
+	DEINIT_BTN_HOOKS(windows_.stock, stock)
 }
 
=== modified file 'src/wui/game_main_menu.h'
--- src/wui/game_main_menu.h	2014-09-10 16:57:31 +0000
+++ src/wui/game_main_menu.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,8 +33,8 @@
 	~GameMainMenu();
 
 private:
-	InteractivePlayer                         & m_player;
-	InteractivePlayer::GameMainMenuWindows & m_windows;
+	InteractivePlayer                      & player_;
+	InteractivePlayer::GameMainMenuWindows & windows_;
 	UI::Button general_stats;
 	UI::Button ware_stats;
 	UI::Button building_stats;
 
=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2015-11-01 10:11:56 +0000
+++ src/wui/game_main_menu_save_game.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008, 2010-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -59,31 +59,31 @@
 	UI::UniqueWindow
 		(&parent, "save_game", &registry,
 		 WINDOW_WIDTH, WINDOW_HEIGHT, _("Save Game")),
-	m_ls     (this, HSPACING, VSPACING,  LIST_WIDTH, LIST_HEIGHT),
-	m_name_label
+	ls_     (this, HSPACING, VSPACING,  LIST_WIDTH, LIST_HEIGHT),
+	name_label_
 		(this, DESCRIPTION_X,  5, 0, 20, _("Map Name:"),  UI::Align_CenterLeft),
-	m_mapname
+	mapname_
 		(this, DESCRIPTION_X, 20, 0, 20, " ",              UI::Align_CenterLeft),
-	m_gametime_label
+	gametime_label_
 		(this, DESCRIPTION_X, 45, 0, 20, _("Game Time:"), UI::Align_CenterLeft),
-	m_gametime
+	gametime_
 		(this, DESCRIPTION_X, 60, 0, 20, " ",              UI::Align_CenterLeft),
-	m_players_label
+	players_label_
 		(this, DESCRIPTION_X, 85, 0, 20, " ",              UI::Align_CenterLeft),
-	m_win_condition_label
+	win_condition_label_
 		(this, DESCRIPTION_X, 110, 0, 20, _("Win condition:"), UI::Align_CenterLeft),
-	m_win_condition
+	win_condition_
 		(this, DESCRIPTION_X, 125, 0, 20, " ",             UI::Align_CenterLeft),
-	m_curdir(SaveHandler::get_base_dir())
+	curdir_(SaveHandler::get_base_dir())
 {
-	m_editbox =
+	editbox_ =
 		new UI::EditBox
 			(this, HSPACING, EDITBOX_Y, LIST_WIDTH, EDITBOX_HEIGHT,
 			 g_gr->images().get("pics/but1.png"));
-	m_editbox->changed.connect(boost::bind(&GameMainMenuSaveGame::edit_box_changed, this));
-	m_editbox->ok.connect(boost::bind(&GameMainMenuSaveGame::ok, this));
+	editbox_->changed.connect(boost::bind(&GameMainMenuSaveGame::edit_box_changed, this));
+	editbox_->ok.connect(boost::bind(&GameMainMenuSaveGame::ok, this));
 
-	m_button_ok =
+	button_ok_ =
 		new UI::Button
 			(this, "ok",
 			 DESCRIPTION_X, OK_Y, DESCRIPTION_WIDTH, BUTTON_HEIGHT,
@@ -91,7 +91,7 @@
 			 _("OK"),
 			 std::string(),
 			 false);
-	m_button_ok->sigclicked.connect(boost::bind(&GameMainMenuSaveGame::ok, this));
+	button_ok_->sigclicked.connect(boost::bind(&GameMainMenuSaveGame::ok, this));
 
 	UI::Button * cancelbtn =
 		new UI::Button
@@ -109,8 +109,8 @@
 			 _("Delete"));
 	deletebtn->sigclicked.connect(boost::bind(&GameMainMenuSaveGame::delete_clicked, this));
 
-	m_ls.selected.connect(boost::bind(&GameMainMenuSaveGame::selected, this, _1));
-	m_ls.double_clicked.connect(boost::bind(&GameMainMenuSaveGame::double_clicked, this, _1));
+	ls_.selected.connect(boost::bind(&GameMainMenuSaveGame::selected, this, _1));
+	ls_.double_clicked.connect(boost::bind(&GameMainMenuSaveGame::double_clicked, this, _1));
 
 	fill_list();
 
@@ -125,21 +125,21 @@
 		{
 			//Try to translate the map name.
 			i18n::Textdomain td("maps");
-			m_mapname.set_text(_(parent.game().get_map()->get_name()));
+			mapname_.set_text(_(parent.game().get_map()->get_name()));
 		}
 		uint32_t gametime = parent.game().get_gametime();
-		m_gametime.set_text(gametimestring(gametime));
+		gametime_.set_text(gametimestring(gametime));
 
 		int player_nr = parent.game().player_manager()->get_number_of_players();
-		m_players_label.set_text(
+		players_label_.set_text(
 		   (boost::format(ngettext("%i player", "%i players", player_nr)) % player_nr).str());
 		{
 			i18n::Textdomain td("win_conditions");
-			m_win_condition.set_text(_(parent.game().get_win_condition_displayname()));
+			win_condition_.set_text(_(parent.game().get_win_condition_displayname()));
 		}
 	}
 
-	m_editbox->focus();
+	editbox_->focus();
 	pause_game(true);
 }
 
@@ -148,35 +148,35 @@
  * called when a item is selected
  */
 void GameMainMenuSaveGame::selected(uint32_t) {
-	const std::string & name = m_ls.get_selected();
+	const std::string & name = ls_.get_selected();
 
 	Widelands::GameLoader gl(name, igbase().game());
 	Widelands::GamePreloadPacket gpdp;
 	gl.preload_game(gpdp); //  This has worked before, no problem
 	{
-		m_editbox->set_text(FileSystem::filename_without_ext(name.c_str()));
+		editbox_->set_text(FileSystem::filename_without_ext(name.c_str()));
 	}
-	m_button_ok->set_enabled(true);
+	button_ok_->set_enabled(true);
 
 	//Try to translate the map name.
 	{
 		i18n::Textdomain td("maps");
-		m_mapname.set_text(_(gpdp.get_mapname()));
+		mapname_.set_text(_(gpdp.get_mapname()));
 	}
 
 	uint32_t gametime = gpdp.get_gametime();
-	m_gametime.set_text(gametimestring(gametime));
+	gametime_.set_text(gametimestring(gametime));
 
 	if (gpdp.get_number_of_players() > 0) {
 		const std::string text =
 				(boost::format(ngettext("%u Player", "%u Players", gpdp.get_number_of_players()))
 				 % static_cast<unsigned int>(gpdp.get_number_of_players())).str();
-		m_players_label.set_text(text);
+		players_label_.set_text(text);
 	} else {
 		// Keep label empty
-		m_players_label.set_text("");
+		players_label_.set_text("");
 	}
-	m_win_condition.set_text(gpdp.get_win_condition());
+	win_condition_.set_text(gpdp.get_win_condition());
 }
 
 /**
@@ -190,11 +190,11 @@
  * fill the file list
  */
 void GameMainMenuSaveGame::fill_list() {
-	m_ls.clear();
+	ls_.clear();
 	FilenameSet gamefiles;
 
 	//  Fill it with all files we find.
-	gamefiles = g_fs->list_directory(m_curdir);
+	gamefiles = g_fs->list_directory(curdir_);
 
 	Widelands::GamePreloadPacket gpdp;
 
@@ -208,17 +208,17 @@
 		try {
 			Widelands::GameLoader gl(name, igbase().game());
 			gl.preload_game(gpdp);
-			m_ls.add(FileSystem::filename_without_ext(name), name);
+			ls_.add(FileSystem::filename_without_ext(name), name);
 		} catch (const WException &) {} //  we simply skip illegal entries
 	}
 }
 
 void GameMainMenuSaveGame::select_by_name(std::string name)
 {
-	for (uint32_t idx = 0; idx < m_ls.size(); idx++) {
-		const std::string val = m_ls[idx];
+	for (uint32_t idx = 0; idx < ls_.size(); idx++) {
+		const std::string val = ls_[idx];
 		if (name == val) {
-			m_ls.select(idx);
+			ls_.select(idx);
 			return;
 		}
 	}
@@ -228,7 +228,7 @@
  * The editbox was changed. Enable ok button
  */
 void GameMainMenuSaveGame::edit_box_changed() {
-	m_button_ok->set_enabled(m_editbox->text().size());
+	button_ok_->set_enabled(editbox_->text().size());
 }
 
 static void dosave
@@ -260,7 +260,7 @@
 			(boost::format(_("A file with the name ‘%s’ already exists. Overwrite?"))
 				% FileSystem::fs_filename(filename.c_str())).str(),
 			 MBoxType::kOkCancel),
-		m_filename(filename)
+		filename_(filename)
 	{}
 
 	GameMainMenuSaveGame & menu_save_game() {
@@ -270,8 +270,8 @@
 
 	void clicked_ok() override
 	{
-		g_fs->fs_unlink(m_filename);
-		dosave(menu_save_game().igbase(), m_filename);
+		g_fs->fs_unlink(filename_);
+		dosave(menu_save_game().igbase(), filename_);
 		menu_save_game().die();
 	}
 
@@ -281,7 +281,7 @@
 	}
 
 private:
-	std::string const m_filename;
+	std::string const filename_;
 };
 
 /**
@@ -289,12 +289,12 @@
  */
 void GameMainMenuSaveGame::ok()
 {
-	if (m_editbox->text().empty())
+	if (editbox_->text().empty())
 		return;
 
 	std::string const complete_filename =
 		igbase().game().save_handler().create_file_name
-			(m_curdir, m_editbox->text());
+			(curdir_, editbox_->text());
 
 	//  Check if file exists. If it does, show a warning.
 	if (g_fs->file_exists(complete_filename)) {
@@ -324,12 +324,12 @@
 				 (boost::format(_("Do you really want to delete the file %s?")) %
 				  FileSystem::fs_filename(filename.c_str())),
 			 MBoxType::kOkCancel),
-		m_filename(filename)
+		filename_(filename)
 	{}
 
 	void clicked_ok() override
 	{
-		g_fs->fs_unlink(m_filename);
+		g_fs->fs_unlink(filename_);
 		dynamic_cast<GameMainMenuSaveGame&>(*get_parent()).fill_list();
 		die();
 	}
@@ -340,7 +340,7 @@
 	}
 
 private:
-	std::string const m_filename;
+	std::string const filename_;
 };
 
 
@@ -351,7 +351,7 @@
 {
 	std::string const complete_filename =
 		igbase().game().save_handler().create_file_name
-			(m_curdir, m_editbox->text());
+			(curdir_, editbox_->text());
 
 	//  Check if file exists. If it does, let the user confirm the deletion.
 	if (g_fs->file_exists(complete_filename))
 
=== modified file 'src/wui/game_main_menu_save_game.h'
--- src/wui/game_main_menu_save_game.h	2014-11-28 16:40:55 +0000
+++ src/wui/game_main_menu_save_game.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -51,15 +51,15 @@
 	bool save_game(std::string);
 	void pause_game(bool paused);
 
-	UI::Listselect<std::string> m_ls;
-	UI::EditBox * m_editbox;
-	UI::Textarea m_name_label, m_mapname, m_gametime_label, m_gametime, m_players_label,
-		m_win_condition_label, m_win_condition;
-	UI::Button * m_button_ok;
-	std::string m_curdir;
-	std::string m_parentdir;
-	std::string m_filename;
-	bool m_overwrite;
+	UI::Listselect<std::string> ls_;
+	UI::EditBox * editbox_;
+	UI::Textarea name_label_, mapname_, gametime_label_, gametime_, players_label_,
+		win_condition_label_, win_condition_;
+	UI::Button * button_ok_;
+	std::string curdir_;
+	std::string parentdir_;
+	std::string filename_;
+	bool overwrite_;
 };
 
 #endif  // end of include guard: WL_WUI_GAME_MAIN_MENU_SAVE_GAME_H
 
=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc	2016-01-18 19:35:25 +0000
+++ src/wui/game_message_menu.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -79,7 +79,7 @@
 	list->focus();
 
 	// Buttons for message types
-	m_geologistsbtn =
+	geologistsbtn_ =
 			new UI::Button
 				(this, "filter_geologists_messages",
 				 kPadding, kPadding, kButtonSize, kButtonSize,
@@ -87,10 +87,10 @@
 				 g_gr->images().get("pics/menu_geologist.png"),
 				 "",
 				 true);
-	m_geologistsbtn->sigclicked.connect
+	geologistsbtn_->sigclicked.connect
 			(boost::bind(&GameMessageMenu::filter_messages, this, Widelands::Message::Type::kGeologists));
 
-	m_economybtn =
+	economybtn_ =
 			new UI::Button
 				(this, "filter_economy_messages",
 				 2 * kPadding + kButtonSize, kPadding, kButtonSize, kButtonSize,
@@ -98,10 +98,10 @@
 				 g_gr->images().get("pics/genstats_nrwares.png"),
 				 "",
 				 true);
-	m_economybtn->sigclicked.connect
+	economybtn_->sigclicked.connect
 			(boost::bind(&GameMessageMenu::filter_messages, this, Widelands::Message::Type::kEconomy));
 
-	m_seafaringbtn =
+	seafaringbtn_ =
 			new UI::Button
 				(this, "filter_seafaring_messages",
 				 3 * kPadding + 2 * kButtonSize, kPadding, kButtonSize, kButtonSize,
@@ -109,10 +109,10 @@
 				 g_gr->images().get("pics/start_expedition.png"),
 				 "",
 				 true);
-	m_seafaringbtn->sigclicked.connect
+	seafaringbtn_->sigclicked.connect
 			(boost::bind(&GameMessageMenu::filter_messages, this, Widelands::Message::Type::kSeafaring));
 
-	m_warfarebtn =
+	warfarebtn_ =
 			new UI::Button
 				(this, "filter_warfare_messages",
 				 4 * kPadding + 3 * kButtonSize, kPadding, kButtonSize, kButtonSize,
@@ -120,10 +120,10 @@
 				 g_gr->images().get("pics/messages_warfare.png"),
 				 "",
 				 true);
-	m_warfarebtn->sigclicked.connect
+	warfarebtn_->sigclicked.connect
 			(boost::bind(&GameMessageMenu::filter_messages, this, Widelands::Message::Type::kWarfare));
 
-	m_scenariobtn =
+	scenariobtn_ =
 			new UI::Button
 				(this, "filter_scenario_messages",
 				 5 * kPadding + 4 * kButtonSize, kPadding, kButtonSize, kButtonSize,
@@ -131,14 +131,14 @@
 				 g_gr->images().get("pics/menu_objectives.png"),
 				 "",
 				 true);
-	m_scenariobtn->sigclicked.connect
+	scenariobtn_->sigclicked.connect
 			(boost::bind(&GameMessageMenu::filter_messages, this, Widelands::Message::Type::kScenario));
 
-	m_message_filter = Widelands::Message::Type::kAllMessages;
+	message_filter_ = Widelands::Message::Type::kAllMessages;
 	set_filter_messages_tooltips();
 	// End: Buttons for message types
 
-	m_archivebtn =
+	archivebtn_ =
 		new UI::Button
 			(this, "archive_or_restore_selected_messages",
 			 kPadding, kWindowHeight - kPadding - kButtonSize, kButtonSize, kButtonSize,
@@ -148,26 +148,26 @@
 			 (boost::format(_("Del: %s"))
 			  /** TRANSLATORS: Tooltip in the messages window */
 			  % _("Archive selected message")).str());
-	m_archivebtn->sigclicked.connect
+	archivebtn_->sigclicked.connect
 		(boost::bind(&GameMessageMenu::archive_or_restore, this));
 
-	m_togglemodebtn =
+	togglemodebtn_ =
 		new UI::Button
 			(this, "toggle_between_inbox_or_archive",
-			 m_archivebtn->get_x() + m_archivebtn->get_w() + kPadding,
-			 m_archivebtn->get_y(),
+			 archivebtn_->get_x() + archivebtn_->get_w() + kPadding,
+			 archivebtn_->get_y(),
 			 kButtonSize,
 			 kButtonSize,
 			 g_gr->images().get("pics/but2.png"),
 			 g_gr->images().get("pics/message_archived.png"),
 			 _("Show Archive"));
-	m_togglemodebtn->sigclicked.connect
+	togglemodebtn_->sigclicked.connect
 		(boost::bind(&GameMessageMenu::toggle_mode, this));
 
-	m_centerviewbtn =
+	centerviewbtn_ =
 		new UI::Button
 			(this, "center_main_mapview_on_location",
-			 kWindowWidth - kPadding - kButtonSize, m_archivebtn->get_y(), kButtonSize, kButtonSize,
+			 kWindowWidth - kPadding - kButtonSize, archivebtn_->get_y(), kButtonSize, kButtonSize,
 			 g_gr->images().get("pics/but2.png"),
 			 g_gr->images().get("pics/menu_goto.png"),
 			 /** TRANSLATORS: %s is a tooltip, G is the corresponding hotkey */
@@ -175,7 +175,7 @@
 			  /** TRANSLATORS: Tooltip in the messages window */
 			  % _("Center main mapview on location")).str(),
 			 false);
-	m_centerviewbtn->sigclicked.connect(boost::bind(&GameMessageMenu::center_view, this));
+	centerviewbtn_->sigclicked.connect(boost::bind(&GameMessageMenu::center_view, this));
 
 	if (get_usedefaultpos())
 		center_to_parent();
@@ -298,8 +298,8 @@
 	// Update messages in the list and remove messages
 	// that should no longer be shown
 	for (uint32_t j = list->size(); j; --j) {
-		MessageId m_id((*list)[j - 1]);
-		if (Message const * const message = mq[m_id]) {
+		MessageId id_((*list)[j - 1]);
+		if (Message const * const message = mq[id_]) {
 			if ((mode == Archive) != (message->status() == Message::Status::kArchived)) {
 				list->remove(j - 1);
 			} else {
@@ -325,11 +325,11 @@
 	}
 
 	// Filter message type
-	if (m_message_filter != Message::Type::kAllMessages) {
+	if (message_filter_ != Message::Type::kAllMessages) {
 		for (uint32_t j = list->size(); j; --j) {
-			MessageId m_id((*list)[j - 1]);
-			if (Message const * const message = mq[m_id]) {
-				if (message->message_type_category() != m_message_filter) {
+			MessageId id_((*list)[j - 1]);
+			if (Message const * const message = mq[id_]) {
+				if (message->message_type_category() != message_filter_) {
 					list->remove(j - 1);
 				}
 			}
@@ -343,7 +343,7 @@
 			// be a solution without this extra update().
 			list->update();
 	} else {
-		m_centerviewbtn->set_enabled(false);
+		centerviewbtn_->set_enabled(false);
 		message_body.set_text(std::string());
 	}
 }
@@ -376,7 +376,7 @@
 					(*new Widelands::CmdMessageSetStatusRead
 					 	(game.get_gametime(), player.player_number(), id));
 			}
-			m_centerviewbtn->set_enabled(message->position());
+			centerviewbtn_->set_enabled(message->position());
 
 			message_body.set_text(
 						(boost::format("<rt><p font-size=18 font-weight=bold font-color=D1D1D1>%s<br></p>"
@@ -386,7 +386,7 @@
 			return;
 		}
 	}
-	m_centerviewbtn->set_enabled(false);
+	centerviewbtn_->set_enabled(false);
 	message_body.set_text(std::string());
 }
 
@@ -394,7 +394,7 @@
  * a message was double clicked
  */
 void GameMessageMenu::double_clicked(uint32_t const /* t */) {
-	if (m_centerviewbtn->enabled()) center_view();
+	if (centerviewbtn_->enabled()) center_view();
 }
 
 /**
@@ -406,7 +406,7 @@
 		switch (code.sym) {
 		// Don't forget to change the tooltips if any of these get reassigned
 		case SDLK_g:
-			if (m_centerviewbtn->enabled())
+			if (centerviewbtn_->enabled())
 				center_view();
 			return true;
 		case SDLK_0:
@@ -495,19 +495,19 @@
 void GameMessageMenu::filter_messages(Widelands::Message::Type const msgtype) {
 	switch (msgtype) {
 		case Widelands::Message::Type::kGeologists:
-			toggle_filter_messages_button(*m_geologistsbtn, msgtype);
+			toggle_filter_messages_button(*geologistsbtn_, msgtype);
 			break;
 		case Widelands::Message::Type::kEconomy:
-			toggle_filter_messages_button(*m_economybtn, msgtype);
+			toggle_filter_messages_button(*economybtn_, msgtype);
 			break;
 		case Widelands::Message::Type::kSeafaring:
-			toggle_filter_messages_button(*m_seafaringbtn, msgtype);
+			toggle_filter_messages_button(*seafaringbtn_, msgtype);
 			break;
 		case Widelands::Message::Type::kWarfare:
-			toggle_filter_messages_button(*m_warfarebtn, msgtype);
+			toggle_filter_messages_button(*warfarebtn_, msgtype);
 			break;
 		case Widelands::Message::Type::kScenario:
-			toggle_filter_messages_button(*m_scenariobtn, msgtype);
+			toggle_filter_messages_button(*scenariobtn_, msgtype);
 			break;
 
 		case Widelands::Message::Type::kNoMessages:
@@ -523,12 +523,12 @@
 		case Widelands::Message::Type::kWarfareSiteLost:
 		case Widelands::Message::Type::kWarfareUnderAttack:
 			set_filter_messages_tooltips();
-			m_message_filter = Widelands::Message::Type::kAllMessages;
-			m_geologistsbtn->set_perm_pressed(false);
-			m_economybtn->set_perm_pressed(false);
-			m_seafaringbtn->set_perm_pressed(false);
-			m_warfarebtn->set_perm_pressed(false);
-			m_scenariobtn->set_perm_pressed(false);
+			message_filter_ = Widelands::Message::Type::kAllMessages;
+			geologistsbtn_->set_perm_pressed(false);
+			economybtn_   ->set_perm_pressed(false);
+			seafaringbtn_ ->set_perm_pressed(false);
+			warfarebtn_   ->set_perm_pressed(false);
+			scenariobtn_  ->set_perm_pressed(false);
 			break;
 	}
 	think();
@@ -541,15 +541,15 @@
 	set_filter_messages_tooltips();
 	if (button.get_perm_pressed()) {
 		button.set_perm_pressed(false);
-		m_message_filter = Widelands::Message::Type::kAllMessages;
+		message_filter_ = Widelands::Message::Type::kAllMessages;
 	} else {
-		m_geologistsbtn->set_perm_pressed(false);
-		m_economybtn->set_perm_pressed(false);
-		m_seafaringbtn->set_perm_pressed(false);
-		m_warfarebtn->set_perm_pressed(false);
-		m_scenariobtn->set_perm_pressed(false);
+		geologistsbtn_->set_perm_pressed(false);
+		economybtn_->set_perm_pressed(false);
+		seafaringbtn_->set_perm_pressed(false);
+		warfarebtn_->set_perm_pressed(false);
+		scenariobtn_->set_perm_pressed(false);
 		button.set_perm_pressed(true);
-		m_message_filter = msgtype;
+		message_filter_ = msgtype;
 		/** TRANSLATORS: %1% is a tooltip, %2% is the corresponding hotkey */
 		button.set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 								  /** TRANSLATORS: Tooltip in the messages window */
@@ -562,23 +562,23 @@
  * Helper for filter_messages
  */
 void GameMessageMenu::set_filter_messages_tooltips() {
-	m_geologistsbtn->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
+	geologistsbtn_->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 											/** TRANSLATORS: Tooltip in the messages window */
 											% _("Show geologists' messages only")
 											% "1").str());
-	m_economybtn->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
+	economybtn_->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 										/** TRANSLATORS: Tooltip in the messages window */
 										% _("Show economy messages only")
 										% "2").str());
-	m_seafaringbtn->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
+	seafaringbtn_->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 										  /** TRANSLATORS: Tooltip in the messages window */
 										  % _("Show seafaring messages only")
 										  % "3").str());
-	m_warfarebtn->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
+	warfarebtn_->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 										/** TRANSLATORS: Tooltip in the messages window */
 										% _("Show warfare messages only")
 										% "4").str());
-	m_scenariobtn->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
+	scenariobtn_->set_tooltip((boost::format(_("%1% (Hotkey: %2%)"))
 										 /** TRANSLATORS: Tooltip in the messages window */
 										 % _("Show scenario messages only")
 										 % "5").str());
@@ -626,24 +626,24 @@
 	case Inbox:
 		mode = Archive;
 		set_title(_("Messages: Archive"));
-		m_archivebtn->set_pic(g_gr->images().get("pics/message_restore.png"));
+		archivebtn_->set_pic(g_gr->images().get("pics/message_restore.png"));
 		/** TRANSLATORS: %s is a tooltip, Del is the corresponding hotkey */
-		m_archivebtn->set_tooltip((boost::format(_("Del: %s"))
+		archivebtn_->set_tooltip((boost::format(_("Del: %s"))
 											/** TRANSLATORS: Tooltip in the messages window */
 											% _("Restore selected message")).str());
-		m_togglemodebtn->set_pic(g_gr->images().get("pics/message_new.png"));
-		m_togglemodebtn->set_tooltip(_("Show Inbox"));
+		togglemodebtn_->set_pic(g_gr->images().get("pics/message_new.png"));
+		togglemodebtn_->set_tooltip(_("Show Inbox"));
 		break;
 	case Archive:
 		mode = Inbox;
 		set_title(_("Messages: Inbox"));
-		m_archivebtn->set_pic(g_gr->images().get("pics/message_archive.png"));
+		archivebtn_->set_pic(g_gr->images().get("pics/message_archive.png"));
 		/** TRANSLATORS: %s is a tooltip, Del is the corresponding hotkey */
-		m_archivebtn->set_tooltip((boost::format(_("Del: %s"))
+		archivebtn_->set_tooltip((boost::format(_("Del: %s"))
 											/** TRANSLATORS: Tooltip in the messages window */
 											% _("Archive selected message")).str());
-		m_togglemodebtn->set_pic(g_gr->images().get("pics/message_archived.png"));
-		m_togglemodebtn->set_tooltip(_("Show Archive"));
+		togglemodebtn_->set_pic(g_gr->images().get("pics/message_archived.png"));
+		togglemodebtn_->set_tooltip(_("Show Archive"));
 		break;
 	}
 }
 
=== modified file 'src/wui/game_message_menu.h'
--- src/wui/game_message_menu.h	2015-09-11 06:24:02 +0000
+++ src/wui/game_message_menu.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -70,17 +70,17 @@
 
 	UI::Table<uintptr_t> * list;
 	UI::MultilineTextarea message_body;
-	UI::Button * m_archivebtn;
-	UI::Button * m_togglemodebtn;
-	UI::Button * m_centerviewbtn;
+	UI::Button * archivebtn_;
+	UI::Button * togglemodebtn_;
+	UI::Button * centerviewbtn_;
 	Mode mode;
 	// Buttons for message types
-	UI::Button * m_geologistsbtn;
-	UI::Button * m_economybtn;
-	UI::Button * m_seafaringbtn;
-	UI::Button * m_warfarebtn;
-	UI::Button * m_scenariobtn;
-	Widelands::Message::Type m_message_filter;
+	UI::Button * geologistsbtn_;
+	UI::Button * economybtn_;
+	UI::Button * seafaringbtn_;
+	UI::Button * warfarebtn_;
+	UI::Button * scenariobtn_;
+	Widelands::Message::Type message_filter_;
 };
 
 #endif  // end of include guard: WL_WUI_GAME_MESSAGE_MENU_H
 
=== modified file 'src/wui/game_summary.cc'
--- src/wui/game_summary.cc	2016-01-17 08:29:59 +0000
+++ src/wui/game_summary.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -41,82 +41,82 @@
 GameSummaryScreen::GameSummaryScreen
 	(InteractiveGameBase * parent, UI::UniqueWindow::Registry * r)
 : UI::UniqueWindow(parent, "game_summary", r, 0, 0, _("Game over")),
-m_game(parent->game())
+game_(parent->game())
 {
 	// Init boxes
 	UI::Box * vbox = new UI::Box(this, 0, 0, UI::Box::Vertical, 0, 0, PADDING);
-	m_title_area = new UI::Textarea(vbox, "", UI::Align_HCenter);
-	vbox->add(m_title_area, UI::Box::AlignCenter);
+	title_area_ = new UI::Textarea(vbox, "", UI::Align_HCenter);
+	vbox->add(title_area_, UI::Box::AlignCenter);
 	vbox->add_space(PADDING);
 
 	UI::Box * hbox1 = new UI::Box(this, 0, 0, UI::Box::Horizontal);
-	m_players_table = new UI::Table<uintptr_t const>(hbox1, 0, 0, 0, 0);
-	m_players_table->fit_height(m_game.player_manager()->get_players_end_status().size());
+	players_table_ = new UI::Table<uintptr_t const>(hbox1, 0, 0, 0, 0);
+	players_table_->fit_height(game_.player_manager()->get_players_end_status().size());
 	hbox1->add_space(PADDING);
-	hbox1->add(m_players_table, UI::Box::AlignTop);
+	hbox1->add(players_table_, UI::Box::AlignTop);
 	hbox1->add_space(PADDING);
 
 	UI::Box * info_box = new UI::Box(hbox1, 0, 0, UI::Box::Vertical, 0, 0);
-	m_info_area_label = new UI::Textarea(info_box, _("Player info:"));
-	info_box->add(m_info_area_label, UI::Box::AlignLeft);
-	m_info_area = new UI::MultilineTextarea(
+	info_area_label_ = new UI::Textarea(info_box, _("Player info:"));
+	info_box->add(info_area_label_, UI::Box::AlignLeft);
+	info_area_ = new UI::MultilineTextarea(
 						  info_box, 0, 0, 130,
-						  std::max(130, m_players_table->get_h() - m_info_area_label->get_h() - PADDING),
+						  std::max(130, players_table_->get_h() - info_area_label_->get_h() - PADDING),
 						  "");
-	info_box->add(m_info_area, UI::Box::AlignLeft, true);
+	info_box->add(info_area_, UI::Box::AlignLeft, true);
 	info_box->add_space(PADDING);
 	hbox1->add(info_box, UI::Box::AlignTop);
 	hbox1->add_space(PADDING);
 	vbox->add(hbox1, UI::Box::AlignLeft);
 
-	UI::Box * bottom_box = new UI::Box(this, 0, 0, UI::Box::Horizontal);
-
-	bottom_box->add_space(PADDING);
-
-	m_gametime_label = new UI::Textarea(bottom_box, _("Elapsed time:"));
-	bottom_box->add(m_gametime_label, UI::Box::AlignCenter);
-	bottom_box->add_space(PADDING);
-	m_gametime_value = new UI::Textarea(bottom_box, gametimestring(m_game.get_gametime()));
-	bottom_box->add(m_gametime_value, UI::Box::AlignCenter);
-
-	bottom_box->add_inf_space();
-
-	m_continue_button = new UI::Button
-		(bottom_box, "continue_button",
+	UI::Box * bottobox_ = new UI::Box(this, 0, 0, UI::Box::Horizontal);
+
+	bottobox_->add_space(PADDING);
+
+	gametime_label_ = new UI::Textarea(bottobox_, _("Elapsed time:"));
+	bottobox_->add(gametime_label_, UI::Box::AlignCenter);
+	bottobox_->add_space(PADDING);
+	gametime_value_ = new UI::Textarea(bottobox_, gametimestring(game_.get_gametime()));
+	bottobox_->add(gametime_value_, UI::Box::AlignCenter);
+
+	bottobox_->add_inf_space();
+
+	continue_button_ = new UI::Button
+		(bottobox_, "continue_button",
 		 0, 0, 35, 35,
 		 g_gr->images().get("pics/but4.png"),
 		 g_gr->images().get("pics/continue.png"),
 		 _("Continue playing"));
-	bottom_box->add(m_continue_button, UI::Box::AlignCenter);
-	bottom_box->add_space(PADDING);
-	m_stop_button = new UI::Button
-		(bottom_box, "stop_button",
+	bottobox_->add(continue_button_, UI::Box::AlignCenter);
+	bottobox_->add_space(PADDING);
+	stop_button_ = new UI::Button
+		(bottobox_, "stop_button",
 		 0, 0, 35, 35,
 		 g_gr->images().get("pics/but4.png"),
 		 g_gr->images().get("pics/menu_exit_game.png"),
 		_("Exit Game"));
-	bottom_box->add(m_stop_button, UI::Box::AlignCenter);
-	bottom_box->add_space(PADDING);
+	bottobox_->add(stop_button_, UI::Box::AlignCenter);
+	bottobox_->add_space(PADDING);
 
-	vbox->add(bottom_box, UI::Box::AlignLeft, true);
+	vbox->add(bottobox_, UI::Box::AlignLeft, true);
 	vbox->add_space(PADDING);
 	set_center_panel(vbox);
 
 	// Prepare table
-	m_players_table->add_column(150, _("Player"));
-	m_players_table->add_column(80, _("Team"), "", UI::Align_HCenter);
-	m_players_table->add_column(100, _("Status"), "", UI::Align_HCenter);
-	m_players_table->add_column(100, _("Time"));
+	players_table_->add_column(150, _("Player"));
+	players_table_->add_column(80, _("Team"), "", UI::Align_HCenter);
+	players_table_->add_column(100, _("Status"), "", UI::Align_HCenter);
+	players_table_->add_column(100, _("Time"));
 
 	// Prepare Elements
-	m_title_area->set_textstyle(UI::TextStyle::ui_big());
+	title_area_->set_textstyle(UI::TextStyle::ui_big());
 
 	// Connections
-	m_continue_button->sigclicked.connect
+	continue_button_->sigclicked.connect
 		(boost::bind(&GameSummaryScreen::continue_clicked, this));
-	m_stop_button->sigclicked.connect
+	stop_button_->sigclicked.connect
 		(boost::bind(&GameSummaryScreen::stop_clicked, this));
-	m_players_table->selected.connect
+	players_table_->selected.connect
 		(boost::bind(&GameSummaryScreen::player_selected, this, _1));
 
 	// Window
@@ -140,12 +140,12 @@
 void GameSummaryScreen::fill_data()
 {
 	std::vector<Widelands::PlayerEndStatus> players_status
-		= m_game.player_manager()->get_players_end_status();
+		= game_.player_manager()->get_players_end_status();
 	bool local_in_game = false;
 	bool local_won = false;
 	Widelands::Player* single_won = nullptr;
-	uint8_t team_won = 0;
-	InteractivePlayer* ipl = m_game.get_ipl();
+	uint8_t teawon_ = 0;
+	InteractivePlayer* ipl = game_.get_ipl();
 	//this defines a row to be selected, current player,
 	//if not then the first line
 	uint32_t current_player_position = 0;
@@ -157,8 +157,8 @@
 			local_won = pes.result == Widelands::PlayerEndResult::PLAYER_WON;
 			current_player_position = i;
 		}
-		Widelands::Player* p = m_game.get_player(pes.player);
-		UI::Table<uintptr_t const>::EntryRecord & te = m_players_table->add(i);
+		Widelands::Player* p = game_.get_player(pes.player);
+		UI::Table<uintptr_t const>::EntryRecord & te = players_table_->add(i);
 		// Player name & pic
 		std::string pic_path =
 			(boost::format("pics/genstats_enable_plr_0%|1$u|.png")
@@ -166,10 +166,10 @@
 		const Image* pic = g_gr->images().get(pic_path);
 		te.set_picture(0, pic, p->get_name());
 		// Team
-		std::string team_str =
+		std::string teastr_ =
 			(boost::format("%|1$u|")
 			 % static_cast<unsigned int>(p->team_number())).str();
-		te.set_string(1, team_str);
+		te.set_string(1, teastr_);
 		// Status
 		std::string stat_str;
 		switch (pes.result) {
@@ -183,7 +183,7 @@
 				if (!single_won) {
 					single_won = p;
 				} else {
-					team_won = p->team_number();
+					teawon_ = p->team_number();
 				}
 				break;
 			case Widelands::PlayerEndResult::PLAYER_RESIGNED:
@@ -203,24 +203,24 @@
 
 	if (local_in_game) {
 		if (local_won) {
-			m_title_area->set_text(_("You won!"));
+			title_area_->set_text(_("You won!"));
 		} else {
-			m_title_area->set_text(_("You lost."));
+			title_area_->set_text(_("You lost."));
 		}
 	} else {
-		if (team_won <= 0) {
+		if (teawon_ <= 0) {
 			assert(single_won);
-			m_title_area->set_text
+			title_area_->set_text
 				((boost::format(_("%s won!")) % single_won->get_name()).str());
 		} else {
-			m_title_area->set_text
+			title_area_->set_text
 				((boost::format(_("Team %|1$u| won!"))
-				  % static_cast<unsigned int>(team_won)).str());
+				  % static_cast<unsigned int>(teawon_)).str());
 		}
 	}
-	m_players_table->update();
+	players_table_->update();
 	if (!players_status.empty()) {
-		m_players_table->select(current_player_position);
+		players_table_->select(current_player_position);
 	}
 }
 
@@ -231,17 +231,17 @@
 
 void GameSummaryScreen::stop_clicked()
 {
-	m_game.get_ibase()->end_modal<UI::Panel::Returncodes>(UI::Panel::Returncodes::kBack);
+	game_.get_ibase()->end_modal<UI::Panel::Returncodes>(UI::Panel::Returncodes::kBack);
 }
 
 void GameSummaryScreen::player_selected(uint32_t entry_index)
 {
-	const uintptr_t selected_player_index = (*m_players_table)[entry_index];
+	const uintptr_t selected_player_index = (*players_table_)[entry_index];
 	const Widelands::PlayerEndStatus& player_status =
-	   m_game.player_manager()->get_players_end_status()[selected_player_index];
+	   game_.player_manager()->get_players_end_status()[selected_player_index];
 
 	std::string info_str = parse_player_info(player_status.info);
-	m_info_area->set_text(info_str);
+	info_area_->set_text(info_str);
 	layout();
 }
 
 
=== modified file 'src/wui/game_summary.h'
--- src/wui/game_summary.h	2015-03-21 14:11:39 +0000
+++ src/wui/game_summary.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -47,15 +47,15 @@
 	void player_selected(uint32_t idx);
 	std::string parse_player_info(std::string info);
 
-	Widelands::Game & m_game;
-	UI::Textarea *  m_title_area;
-	UI::Textarea *  m_gametime_label;
-	UI::Textarea *  m_gametime_value;
-	UI::Textarea *  m_info_area_label;
-	UI::MultilineTextarea *  m_info_area;
-	UI::Button *    m_continue_button;
-	UI::Button *    m_stop_button;
-	UI::Table<uintptr_t const> *     m_players_table;
+	Widelands::Game & game_;
+	UI::Textarea *  title_area_;
+	UI::Textarea *  gametime_label_;
+	UI::Textarea *  gametime_value_;
+	UI::Textarea *  info_area_label_;
+	UI::MultilineTextarea *  info_area_;
+	UI::Button *    continue_button_;
+	UI::Button *    stop_button_;
+	UI::Table<uintptr_t const> *     players_table_;
 };
 
 #endif  // end of include guard: WL_WUI_GAME_SUMMARY_H
 
=== modified file 'src/wui/game_tips.cc'
--- src/wui/game_tips.cc	2014-11-27 12:02:08 +0000
+++ src/wui/game_tips.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008, 2010 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,11 +33,11 @@
 GameTips::GameTips
 	(UI::ProgressWindow & progressWindow, const std::vector<std::string>& names)
 :
-m_lastUpdated   (0),
-m_updateAfter   (0),
-m_progressWindow(progressWindow),
-m_registered    (false),
-m_lastTip       (0)
+lastUpdated_   (0),
+updateAfter_   (0),
+progressWindow_(progressWindow),
+registered_    (false),
+lastTip_       (0)
 {
 	// Loading texts-locals, for translating the tips
 	i18n::Textdomain textdomain("texts");
@@ -45,11 +45,11 @@
 	for (uint8_t i = 0; i < names.size(); ++i)
 		load_tips(names[i]);
 
-	if (!m_tips.empty()) {
+	if (!tips_.empty()) {
 		// add visualization only if any tips are loaded
-		m_progressWindow.add_visualization(this);
-		m_registered = true;
-		m_lastTip = m_tips.size();
+		progressWindow_.add_visualization(this);
+		registered_ = true;
+		lastTip_ = tips_.size();
 	}
 }
 
@@ -71,7 +71,7 @@
 			Tip tip;
 			tip.text = text;
 			tip.interval = s->get_int("sec", DEFAULT_INTERVAL);
-			m_tips.push_back (tip);
+			tips_.push_back (tip);
 		}
 	} catch (std::exception &) {
 		// just ignore - tips do not impact game
@@ -81,24 +81,24 @@
 
 void GameTips::update(bool repaint) {
 	uint8_t ticks = SDL_GetTicks();
-	if (ticks >= (m_lastUpdated + m_updateAfter)) {
-		const uint32_t next = rand() % m_tips.size();
-		if (next == m_lastTip)
-			m_lastTip = (next + 1) % m_tips.size();
+	if (ticks >= (lastUpdated_ + updateAfter_)) {
+		const uint32_t next = rand() % tips_.size();
+		if (next == lastTip_)
+			lastTip_ = (next + 1) % tips_.size();
 		else
-			m_lastTip = next;
+			lastTip_ = next;
 		show_tip(next);
-		m_lastUpdated = SDL_GetTicks();
-		m_updateAfter = m_tips[next].interval * 1000;
+		lastUpdated_ = SDL_GetTicks();
+		updateAfter_ = tips_[next].interval * 1000;
 	} else if (repaint) {
-		show_tip(m_lastTip);
+		show_tip(lastTip_);
 	}
 }
 
 void GameTips::stop() {
-	if (m_registered) {
-		m_progressWindow.remove_visualization(this);
-		m_registered = false;
+	if (registered_) {
+		progressWindow_.remove_visualization(this);
+		registered_ = false;
 	}
 }
 
@@ -117,7 +117,7 @@
 	rt.blit(pt, pic_background);
 
 	Point center(tips_area.x + tips_area.w / 2, tips_area.y + tips_area.h / 2);
-	const Image* rendered_text = UI::g_fh1->render(as_game_tip(m_tips[index].text), tips_area.w);
+	const Image* rendered_text = UI::g_fh1->render(as_game_tip(tips_[index].text), tips_area.w);
 	rt.blit(center - Point(rendered_text->width() / 2, rendered_text->height() / 2), rendered_text);
 
 	g_gr->update();
 
=== modified file 'src/wui/game_tips.h'
--- src/wui/game_tips.h	2014-07-26 10:43:23 +0000
+++ src/wui/game_tips.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -43,13 +43,13 @@
 	void load_tips(std::string);
 	void show_tip(int32_t index);
 
-	uint32_t             m_lastUpdated;
-	uint32_t             m_updateAfter;
-	UI::ProgressWindow & m_progressWindow;
-	bool                 m_registered;
-	uint32_t             m_lastTip;
+	uint32_t             lastUpdated_;
+	uint32_t             updateAfter_;
+	UI::ProgressWindow & progressWindow_;
+	bool                 registered_;
+	uint32_t             lastTip_;
 
-	std::vector<Tip>     m_tips;
+	std::vector<Tip>     tips_;
 };
 
 #endif  // end of include guard: WL_WUI_GAME_TIPS_H
 
=== modified file 'src/wui/gamechatpanel.cc'
--- src/wui/gamechatpanel.cc	2014-09-20 09:37:47 +0000
+++ src/wui/gamechatpanel.cc	2016-01-24 20:25:45 +0000
@@ -33,7 +33,7 @@
 	 ChatProvider & chat)
 	:
 	UI::Panel(parent, x, y, w, h),
-	m_chat   (chat),
+	chat_   (chat),
 	chatbox  (this, 0, 0, w, h - 25, "", UI::Align_Left, 1),
 	editbox  (this, 0, h - 20, w,  20),
 	chat_message_counter(std::numeric_limits<uint32_t>::max())
@@ -57,7 +57,7 @@
  */
 void GameChatPanel::recalculate()
 {
-	const std::vector<ChatMessage> msgs = m_chat.get_messages();
+	const std::vector<ChatMessage> msgs = chat_.get_messages();
 
 	std::string str = "<rt>";
 	for (uint32_t i = 0; i < msgs.size(); ++i) {
@@ -75,7 +75,7 @@
 		// Note: if many messages arrive simultaneously,
 		// the latest is a system message and some others
 		// are not, then this act wrong!
-		if (!msgs.back().sender.empty() && !m_chat.sound_off())
+		if (!msgs.back().sender.empty() && !chat_.sound_off())
 		{
 			// The latest message is not a system message
 			if (std::string::npos == msgs.back().sender.find("(IRC)") && chat_message_counter < msgs.size())
@@ -104,7 +104,7 @@
 	const std::string & str = editbox.text();
 
 	if (str.size())
-		m_chat.send(str);
+		chat_.send(str);
 
 	editbox.set_text("");
 	sent();
 
=== modified file 'src/wui/gamechatpanel.h'
--- src/wui/gamechatpanel.h	2014-09-20 09:37:47 +0000
+++ src/wui/gamechatpanel.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 by the Widelands Development Team
+ * Copyright (C) 2008-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@
 	void key_enter();
 	void key_escape();
 
-	ChatProvider & m_chat;
+	ChatProvider & chat_;
 	UI::MultilineTextarea chatbox;
 	UI::EditBox editbox;
 	uint32_t chat_message_counter;
 
=== modified file 'src/wui/general_statistics_menu.cc'
--- src/wui/general_statistics_menu.cc	2015-11-28 22:29:26 +0000
+++ src/wui/general_statistics_menu.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -52,21 +52,21 @@
 UI::UniqueWindow
 	(&parent, "statistics_menu", &registry,
 	 440, 400, _("General Statistics")),
-m_my_registry      (&registry),
-m_box           (this, 0, 0, UI::Box::Vertical, 0, 0, 5),
-m_plot          (&m_box, 0, 0, 430, PLOT_HEIGHT),
-m_selected_information(0)
+         my_registry_   (&registry),
+         box_           (this, 0, 0, UI::Box::Vertical, 0, 0, 5),
+         plot_          (&box_, 0, 0, 430, PLOT_HEIGHT),
+         selected_information_(0)
 {
-	assert (m_my_registry);
-
-	m_selected_information = m_my_registry->selected_information;
-
-	set_center_panel(&m_box);
-	m_box.set_border(5, 5, 5, 5);
+	assert (my_registry_);
+
+	selected_information_ = my_registry_->selected_information;
+
+	set_center_panel(&box_);
+	box_.set_border(5, 5, 5, 5);
 
 	// Setup plot data
-	m_plot.set_sample_rate(STATISTICS_SAMPLE_TIME);
-	m_plot.set_plotmode(WuiPlotArea::PLOTMODE_ABSOLUTE);
+	plot_.set_sample_rate(STATISTICS_SAMPLE_TIME);
+	plot_.set_plotmode(WuiPlotArea::PLOTMODE_ABSOLUTE);
 	Game & game = *parent.get_game();
 	const Game::GeneralStatsVector & genstats =
 		game.get_general_statistics();
@@ -74,14 +74,14 @@
 		general_statistics_size = genstats.size();
 
 	// Is there a hook dataset?
-	m_ndatasets = NR_BASE_DATASETS;
+	ndatasets_ = NR_BASE_DATASETS;
 	std::unique_ptr<LuaTable> hook = game.lua().get_hook("custom_statistic");
 	std::string cs_name, cs_pic;
 	if (hook) {
 		hook->do_not_warn_about_unaccessed_keys();
 		cs_name = hook->get_string("name");
 		cs_pic = hook->get_string("pic");
-		m_ndatasets++;
+		ndatasets_++;
 	}
 
 	for
@@ -90,56 +90,56 @@
 		 ++i)
 	{
 		const RGBColor & color = Player::Colors[i];
-		m_plot.register_plot_data
-			(i * m_ndatasets +  0, &genstats[i].land_size,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  1, &genstats[i].nr_workers,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  2, &genstats[i].nr_buildings,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  3, &genstats[i].nr_wares,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  4, &genstats[i].productivity,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  5, &genstats[i].nr_casualties,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  6, &genstats[i].nr_kills,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  7, &genstats[i].nr_msites_lost,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  8, &genstats[i].nr_msites_defeated,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets +  9, &genstats[i].nr_civil_blds_lost,
-			 color);
-		m_plot.register_plot_data
-			(i * m_ndatasets + 10, &genstats[i].miltary_strength,
+		plot_.register_plot_data
+			(i * ndatasets_ +  0, &genstats[i].land_size,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  1, &genstats[i].nr_workers,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  2, &genstats[i].nr_buildings,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  3, &genstats[i].nr_wares,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  4, &genstats[i].productivity,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  5, &genstats[i].nr_casualties,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  6, &genstats[i].nr_kills,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  7, &genstats[i].nr_msites_lost,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  8, &genstats[i].nr_msites_defeated,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ +  9, &genstats[i].nr_civil_blds_lost,
+			 color);
+		plot_.register_plot_data
+			(i * ndatasets_ + 10, &genstats[i].miltary_strength,
 			 color);
 		if (hook) {
-			m_plot.register_plot_data
-				(i * m_ndatasets + 11, &genstats[i].custom_statistic,
+			plot_.register_plot_data
+				(i * ndatasets_ + 11, &genstats[i].custom_statistic,
 				 color);
 		}
 		if (game.get_player(i + 1)) // Show area plot
-			m_plot.show_plot
-				(i * m_ndatasets + m_selected_information,
-				 m_my_registry->selected_players[i]);
+			plot_.show_plot
+				(i * ndatasets_ + selected_information_,
+				 my_registry_->selected_players[i]);
 	}
 
-	m_plot.set_time(m_my_registry->time);
+	plot_.set_time(my_registry_->time);
 
 	// Setup Widgets
-	m_box.add(&m_plot, UI::Box::AlignTop);
+	box_.add(&plot_, UI::Box::AlignTop);
 
-	UI::Box * hbox1 = new UI::Box(&m_box, 0, 0, UI::Box::Horizontal, 0, 0, 1);
+	UI::Box * hbox1 = new UI::Box(&box_, 0, 0, UI::Box::Horizontal, 0, 0, 1);
 
 	uint32_t plr_in_game = 0;
 	PlayerNumber const nr_players = game.map().get_nrplayers();
@@ -157,21 +157,21 @@
 				 player->get_name().c_str());
 		cb.sigclicked.connect
 			(boost::bind(&GeneralStatisticsMenu::cb_changed_to, this, p));
-		cb.set_perm_pressed(m_my_registry->selected_players[p - 1]);
+		cb.set_perm_pressed(my_registry_->selected_players[p - 1]);
 
-		m_cbs[p - 1] = &cb;
+		cbs_[p - 1] = &cb;
 
 		hbox1->add(&cb, UI::Box::AlignLeft, false, true);
 	} else //  player nr p does not exist
-		m_cbs[p - 1] = nullptr;
-
-	m_box.add(hbox1, UI::Box::AlignTop, true);
-
-	UI::Box * hbox2 = new UI::Box(&m_box, 0, 0, UI::Box::Horizontal, 0, 0, 1);
+		cbs_[p - 1] = nullptr;
+
+	box_.add(hbox1, UI::Box::AlignTop, true);
+
+	UI::Box * hbox2 = new UI::Box(&box_, 0, 0, UI::Box::Horizontal, 0, 0, 1);
 
 	UI::Radiobutton * btn;
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_landsize.png"),
@@ -179,7 +179,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_nrworkers.png"),
@@ -187,7 +187,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_nrbuildings.png"),
@@ -195,7 +195,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_nrwares.png"),
@@ -203,7 +203,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_productivity.png"),
@@ -211,7 +211,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_casualties.png"),
@@ -219,7 +219,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_kills.png"),
@@ -227,7 +227,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_msites_lost.png"),
@@ -235,7 +235,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_msites_defeated.png"),
@@ -243,7 +243,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_civil_blds_lost.png"),
@@ -251,7 +251,7 @@
 		 &btn);
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
-	m_radiogroup.add_button
+	radiogroup_.add_button
 		(hbox2,
 		 Point(0, 0),
 		 g_gr->images().get("pics/genstats_militarystrength.png"),
@@ -260,7 +260,7 @@
 	hbox2->add(btn, UI::Box::AlignLeft, false, true);
 
 	if (hook) {
-		m_radiogroup.add_button
+		radiogroup_.add_button
 			(hbox2,
 			 Point(0, 0),
 			 g_gr->images().get(cs_pic),
@@ -269,15 +269,15 @@
 		hbox2->add(btn, UI::Box::AlignLeft, false, true);
 	}
 
-	m_radiogroup.set_state(m_selected_information);
-	m_radiogroup.changedto.connect
+	radiogroup_.set_state(selected_information_);
+	radiogroup_.changedto.connect
 		(boost::bind(&GeneralStatisticsMenu::radiogroup_changed, this, _1));
 
-	m_box.add(hbox2, UI::Box::AlignTop, true);
+	box_.add(hbox2, UI::Box::AlignTop, true);
 
-	m_box.add
+	box_.add
 		(new WuiPlotAreaSlider
-			(&m_box, m_plot, 0, 0, 100, 45,
+			(&box_, plot_, 0, 0, 100, 45,
 			 g_gr->images().get("pics/but1.png"))
 		, UI::Box::AlignTop
 		, true);
@@ -288,11 +288,11 @@
 	Game & game = dynamic_cast<InteractiveGameBase&>(*get_parent()).game();
 	if (game.is_loaded()) {
 		// Save informations for recreation, if window is reopened
-		m_my_registry->selected_information = m_selected_information;
-		m_my_registry->time = m_plot.get_time();
+		my_registry_->selected_information = selected_information_;
+		my_registry_->time = plot_.get_time();
 		PlayerNumber const nr_players = game.map().get_nrplayers();
 		iterate_players_existing_novar(p, nr_players, game) {
-			m_my_registry->selected_players[p - 1] = m_cbs[p - 1]->get_perm_pressed();
+			my_registry_->selected_players[p - 1] = cbs_[p - 1]->get_perm_pressed();
 		}
 	}
 }
@@ -310,11 +310,11 @@
 void GeneralStatisticsMenu::cb_changed_to(int32_t const id)
 {
 	// This represents our player number
-	m_cbs[id - 1]->set_perm_pressed(!m_cbs[id - 1]->get_perm_pressed());
+	cbs_[id - 1]->set_perm_pressed(!cbs_[id - 1]->get_perm_pressed());
 
-	m_plot.show_plot
-		((id - 1) * m_ndatasets + m_selected_information,
-		 m_cbs[id - 1]->get_perm_pressed());
+	plot_.show_plot
+		((id - 1) * ndatasets_ + selected_information_,
+		 cbs_[id - 1]->get_perm_pressed());
 }
 
 /*
@@ -325,11 +325,11 @@
 		dynamic_cast<InteractiveGameBase&>(*get_parent()).game()
 		.get_general_statistics().size();
 	for (uint32_t i = 0; i < statistics_size; ++i)
-		if (m_cbs[i]) {
-			m_plot.show_plot
-				(i * m_ndatasets + id, m_cbs[i]->get_perm_pressed());
-			m_plot.show_plot
-				(i * m_ndatasets + m_selected_information, false);
+		if (cbs_[i]) {
+			plot_.show_plot
+				(i * ndatasets_ + id, cbs_[i]->get_perm_pressed());
+			plot_.show_plot
+				(i * ndatasets_ + selected_information_, false);
 		}
-	m_selected_information = id;
+	selected_information_ = id;
 }
 
=== modified file 'src/wui/general_statistics_menu.h'
--- src/wui/general_statistics_menu.h	2014-09-10 13:03:40 +0000
+++ src/wui/general_statistics_menu.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -53,13 +53,13 @@
 	virtual ~GeneralStatisticsMenu();
 
 private:
-	Registry           * m_my_registry;
-	UI::Box              m_box;
-	WuiPlotArea         m_plot;
-	UI::Radiogroup       m_radiogroup;
-	int32_t              m_selected_information;
-	UI::Button         * m_cbs[MAX_PLAYERS];
-	uint32_t             m_ndatasets;
+	Registry           * my_registry_;
+	UI::Box              box_;
+	WuiPlotArea         plot_;
+	UI::Radiogroup       radiogroup_;
+	int32_t              selected_information_;
+	UI::Button         * cbs_[MAX_PLAYERS];
+	uint32_t             ndatasets_;
 
 	void clicked_help();
 	void cb_changed_to(int32_t);
 
=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2016-01-16 15:57:31 +0000
+++ src/wui/interactive_gamebase.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -52,25 +52,25 @@
 	:
 	InteractiveBase(_game, global_s),
 	chat_provider_(nullptr),
-	m_building_census_format
+	building_census_format_
 		(global_s.get_string("building_census_format",       "%N")),
-	m_building_statistics_format
+	building_statistics_format_
 		(global_s.get_string("building_statistics_format",   "%t")),
-	m_building_tooltip_format
+	building_tooltip_format_
 		(global_s.get_string("building_tooltip_format",      "%r")),
-	m_chatenabled(chatenabled),
-	m_multiplayer(multiplayer),
-	m_playertype(pt),
+	chatenabled_(chatenabled),
+	multiplayer_(multiplayer),
+	playertype_(pt),
 
 #define INIT_BTN(picture, name, tooltip)                            \
  TOOLBAR_BUTTON_COMMON_PARAMETERS(name),                                      \
  g_gr->images().get("pics/" picture ".png"),                      \
  tooltip                                                                      \
 
-	m_toggle_buildhelp
+	toggle_buildhelp_
 		(INIT_BTN("menu_toggle_buildhelp", "buildhelp", _("Show Building Spaces (on/off)")))
 {
-	m_toggle_buildhelp.sigclicked.connect(boost::bind(&InteractiveGameBase::toggle_buildhelp, this));
+	toggle_buildhelp_.sigclicked.connect(boost::bind(&InteractiveGameBase::toggle_buildhelp, this));
 }
 
 /// \return a pointer to the running \ref Game instance.
@@ -90,7 +90,7 @@
 	chat_provider_ = &chat;
 	chat_overlay_->set_chat_provider(chat);
 
-	m_chatenabled = true;
+	chatenabled_ = true;
 }
 
 ChatProvider * InteractiveGameBase::get_chat_provider()
@@ -137,7 +137,7 @@
 	Widelands::Map & map = egbase().map();
 	auto* overlay_manager = mutable_field_overlay_manager();
 	show_buildhelp(false);
-	m_toggle_buildhelp.set_perm_pressed(buildhelp());
+	toggle_buildhelp_.set_perm_pressed(buildhelp());
 
 	overlay_manager->register_overlay_callback_function
 			(boost::bind(&InteractiveGameBase::calculate_buildcaps, this, _1));
@@ -147,14 +147,14 @@
 	map.recalc_whole_map(egbase().world());
 
 	// Close game-relevant UI windows (but keep main menu open)
-	delete m_fieldaction.window;
-	m_fieldaction.window = nullptr;
+	delete fieldaction_.window;
+	fieldaction_.window = nullptr;
 
 	hide_minimap();
 }
 
 void InteractiveGameBase::on_buildhelp_changed(const bool value) {
-	m_toggle_buildhelp.set_perm_pressed(value);
+	toggle_buildhelp_.set_perm_pressed(value);
 }
 
 /**
@@ -188,10 +188,10 @@
 void InteractiveGameBase::show_game_summary()
 {
 	game().game_controller()->set_desired_speed(0);
-	if (m_game_summary.window) {
-		m_game_summary.window->set_visible(true);
-		m_game_summary.window->think();
+	if (game_summary_.window) {
+		game_summary_.window->set_visible(true);
+		game_summary_.window->think();
 		return;
 	}
-	new GameSummaryScreen(this, &m_game_summary);
+	new GameSummaryScreen(this, &game_summary_);
 }
 
=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2016-01-16 15:57:31 +0000
+++ src/wui/interactive_gamebase.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003, 2006-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -62,13 +62,13 @@
 
 	// TODO(sirver): Remove the use of these methods as the strings are no longer configurable.
 	const std::string & building_census_format      () const {
-		return m_building_census_format;
+		return building_census_format_;
 	}
 	const std::string & building_statistics_format  () const {
-		return m_building_statistics_format;
+		return building_statistics_format_;
 	}
 	const std::string & building_tooltip_format     () const {
-		return m_building_tooltip_format;
+		return building_tooltip_format_;
 	}
 
 	virtual bool can_see(Widelands::PlayerNumber) const = 0;
@@ -76,11 +76,11 @@
 	virtual Widelands::PlayerNumber player_number() const = 0;
 
 	virtual void node_action() = 0;
-	const PlayerType & get_playertype()const {return m_playertype;}
-	void set_playertype(const PlayerType & pt) {m_playertype = pt;}
+	const PlayerType & get_playertype()const {return playertype_;}
+	void set_playertype(const PlayerType & pt) {playertype_ = pt;}
 
 	bool try_show_ship_window();
-	bool is_multiplayer() {return m_multiplayer;}
+	bool is_multiplayer() {return multiplayer_;}
 
 	void show_game_summary();
 	void postload() override;
@@ -90,18 +90,18 @@
 	void draw_overlay(RenderTarget &) override;
 	virtual int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) = 0;
 
-	GameMainMenuWindows m_mainm_windows;
+	GameMainMenuWindows      main_windows_;
 	ChatProvider           * chat_provider_;
-	std::string              m_building_census_format;
-	std::string              m_building_statistics_format;
-	std::string              m_building_tooltip_format;
-	bool                     m_chatenabled;
-	bool                     m_multiplayer;
-	PlayerType m_playertype;
-	UI::UniqueWindow::Registry m_fieldaction;
-	UI::UniqueWindow::Registry m_game_summary;
+	std::string              building_census_format_;
+	std::string              building_statistics_format_;
+	std::string              building_tooltip_format_;
+	bool                     chatenabled_;
+	bool                     multiplayer_;
+	PlayerType playertype_;
+	UI::UniqueWindow::Registry fieldaction_;
+	UI::UniqueWindow::Registry game_summary_;
 
-	UI::Button m_toggle_buildhelp;
+	UI::Button toggle_buildhelp_;
 
 private:
 	void on_buildhelp_changed(const bool value) override;
 
=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2016-01-16 15:57:31 +0000
+++ src/wui/interactive_player.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -66,8 +66,8 @@
 	 bool                     const multiplayer)
 	:
 	InteractiveGameBase (_game, global_s, NONE, multiplayer, multiplayer),
-	m_auto_roadbuild_mode(global_s.get_bool("auto_roadbuild_mode", true)),
-	m_flag_to_connect(Widelands::Coords::null()),
+	auto_roadbuild_mode_(global_s.get_bool("auto_roadbuild_mode", true)),
+	flag_to_connect_(Widelands::Coords::null()),
 
 // Chat is different, as chat_provider_ needs to be checked when toggling
 // Minimap is different as it warps and stuff
@@ -84,59 +84,59 @@
  tooltip                                                                      \
 
 
-m_toggle_chat
+toggle_chat_
 	(INIT_BTN_this
 	 ("menu_chat", "chat", _("Chat"))),
-m_toggle_options_menu
+toggle_options_menu_
 	(INIT_BTN
 	 ("menu_options_menu", "options_menu", _("Options"))),
-m_toggle_statistics_menu
+toggle_statistics_menu_
 	(INIT_BTN
 	 ("menu_toggle_menu", "statistics_menu", _("Statistics"))),
-m_toggle_objectives
+toggle_objectives_
 	(INIT_BTN
 	 ("menu_objectives", "objectives", _("Objectives"))),
-m_toggle_minimap
+toggle_minimap_
 	(INIT_BTN_this
 	 ("menu_toggle_minimap", "minimap", _("Minimap"))),
-m_toggle_message_menu
+toggle_message_menu_
 	(INIT_BTN
 	 ("menu_toggle_oldmessage_menu", "messages", _("Messages"))),
-m_toggle_help
+toggle_help_
 	(INIT_BTN
 	 ("menu_help", "help", _("Tribal Encyclopedia")))
 
 {
-	m_toggle_chat.sigclicked.connect
+	toggle_chat_.sigclicked.connect
 		(boost::bind(&InteractivePlayer::toggle_chat, this));
-	m_toggle_options_menu.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_options)));
-	m_toggle_statistics_menu.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_statisticsmenu)));
-	m_toggle_objectives.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_objectives)));
-	m_toggle_minimap.sigclicked.connect
+	toggle_options_menu_.sigclicked.connect
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(options_)));
+	toggle_statistics_menu_.sigclicked.connect
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(statisticsmenu_)));
+	toggle_objectives_.sigclicked.connect
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(objectives_)));
+	toggle_minimap_.sigclicked.connect
 		(boost::bind(&InteractivePlayer::toggle_minimap, this));
-	m_toggle_message_menu.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_message_menu)));
-	m_toggle_help.sigclicked.connect
-		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(m_encyclopedia)));
+	toggle_message_menu_.sigclicked.connect
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(message_menu_)));
+	toggle_help_.sigclicked.connect
+		(boost::bind(&UI::UniqueWindow::Registry::toggle, boost::ref(encyclopedia_)));
 
 	// TODO(unknown): instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI
-	toolbar_.add(&m_toggle_options_menu,    UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_statistics_menu, UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_minimap,         UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
+	toolbar_.add(&toggle_options_menu_,    UI::Box::AlignLeft);
+	toolbar_.add(&toggle_statistics_menu_, UI::Box::AlignLeft);
+	toolbar_.add(&toggle_minimap_,         UI::Box::AlignLeft);
+	toolbar_.add(&toggle_buildhelp_,       UI::Box::AlignLeft);
 	if (multiplayer) {
-		toolbar_.add(&m_toggle_chat,            UI::Box::AlignLeft);
-		m_toggle_chat.set_visible(false);
-		m_toggle_chat.set_enabled(false);
+		toolbar_.add(&toggle_chat_,            UI::Box::AlignLeft);
+		toggle_chat_.set_visible(false);
+		toggle_chat_.set_enabled(false);
 	}
 
-	toolbar_.add(&m_toggle_help,            UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_objectives,      UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_message_menu,    UI::Box::AlignLeft);
+	toolbar_.add(&toggle_help_,            UI::Box::AlignLeft);
+	toolbar_.add(&toggle_objectives_,      UI::Box::AlignLeft);
+	toolbar_.add(&toggle_message_menu_,    UI::Box::AlignLeft);
 
 	set_player_number(plyn);
 	fieldclicked.connect(boost::bind(&InteractivePlayer::node_action, this));
@@ -148,22 +148,22 @@
  registry.on_delete = std::bind(&UI::Button::set_perm_pressed, &btn, false); \
  if (registry.window) btn.set_perm_pressed(true);                            \
 
-	INIT_BTN_HOOKS(m_chat, m_toggle_chat)
-	INIT_BTN_HOOKS(m_options, m_toggle_options_menu)
-	INIT_BTN_HOOKS(m_statisticsmenu, m_toggle_statistics_menu)
-	INIT_BTN_HOOKS(minimap_registry(), m_toggle_minimap)
-	INIT_BTN_HOOKS(m_objectives, m_toggle_objectives)
-	INIT_BTN_HOOKS(m_encyclopedia, m_toggle_help)
-	INIT_BTN_HOOKS(m_message_menu, m_toggle_message_menu)
+	INIT_BTN_HOOKS(chat_, toggle_chat_)
+	INIT_BTN_HOOKS(options_, toggle_options_menu_)
+	INIT_BTN_HOOKS(statisticsmenu_, toggle_statistics_menu_)
+	INIT_BTN_HOOKS(minimap_registry(), toggle_minimap_)
+	INIT_BTN_HOOKS(objectives_, toggle_objectives_)
+	INIT_BTN_HOOKS(encyclopedia_, toggle_help_)
+	INIT_BTN_HOOKS(message_menu_, toggle_message_menu_)
 
-	m_encyclopedia.open_window = [this] {new EncyclopediaWindow(*this, m_encyclopedia);};
-	m_options.open_window = [this] {new GameOptionsMenu(*this, m_options, m_mainm_windows);};
-	m_statisticsmenu.open_window = [this] {
-		new GameMainMenu(*this, m_statisticsmenu, m_mainm_windows);
+	encyclopedia_.open_window = [this] {new EncyclopediaWindow(*this, encyclopedia_);};
+	options_.open_window = [this] {new GameOptionsMenu(*this, options_, main_windows_);};
+	statisticsmenu_.open_window = [this] {
+		new GameMainMenu(*this, statisticsmenu_, main_windows_);
 	};
-	m_objectives.open_window = [this] {new GameObjectivesMenu(this, m_objectives);};
-	m_message_menu.open_window = [this] {new GameMessageMenu(*this, m_message_menu);};
-	m_mainm_windows.stock.open_window = [this] {new StockMenu(*this, m_mainm_windows.stock);};
+	objectives_.open_window = [this] {new GameObjectivesMenu(this, objectives_);};
+	message_menu_.open_window = [this] {new GameMessageMenu(*this, message_menu_);};
+	main_windows_.stock.open_window = [this] {new StockMenu(*this, main_windows_.stock);};
 
 #ifndef NDEBUG //  only in debug builds
 	addCommand
@@ -177,46 +177,46 @@
 	registry.on_create = 0;                                                                         \
 	registry.on_delete = 0;
 
-	DEINIT_BTN_HOOKS(m_chat, m_toggle_chat)
-	DEINIT_BTN_HOOKS(m_options, m_toggle_options_menu)
-	DEINIT_BTN_HOOKS(m_statisticsmenu, m_toggle_statistics_menu)
-	DEINIT_BTN_HOOKS(minimap_registry(), m_toggle_minimap)
-	DEINIT_BTN_HOOKS(m_objectives, m_toggle_objectives)
-	DEINIT_BTN_HOOKS(m_encyclopedia, m_toggle_help)
-	DEINIT_BTN_HOOKS(m_message_menu, m_toggle_message_menu)
+	DEINIT_BTN_HOOKS(chat_, toggle_chat_)
+	DEINIT_BTN_HOOKS(options_, toggle_options_menu_)
+	DEINIT_BTN_HOOKS(statisticsmenu_, toggle_statistics_menu_)
+	DEINIT_BTN_HOOKS(minimap_registry(), toggle_minimap_)
+	DEINIT_BTN_HOOKS(objectives_, toggle_objectives_)
+	DEINIT_BTN_HOOKS(encyclopedia_, toggle_help_)
+	DEINIT_BTN_HOOKS(message_menu_, toggle_message_menu_)
 }
 
 void InteractivePlayer::think()
 {
 	InteractiveBase::think();
 
-	if (m_flag_to_connect) {
-		Widelands::Field & field = egbase().map()[m_flag_to_connect];
+	if (flag_to_connect_) {
+		Widelands::Field & field = egbase().map()[flag_to_connect_];
 		if (upcast(Widelands::Flag const, flag, field.get_immovable())) {
 			if (!flag->has_road() && !is_building_road())
-				if (m_auto_roadbuild_mode) {
+				if (auto_roadbuild_mode_) {
 					//  There might be a fieldaction window open, showing a button
 					//  for roadbuilding. If that dialog remains open so that the
 					//  button is clicked, we would enter roadbuilding mode while
 					//  we are already in roadbuilding mode from the call below.
 					//  That is not allowed. Therefore we must delete the
 					//  fieldaction window before entering roadbuilding mode here.
-					delete m_fieldaction.window;
-					m_fieldaction.window = nullptr;
-					warp_mouse_to_node(m_flag_to_connect);
+					delete fieldaction_.window;
+					fieldaction_.window = nullptr;
+					warp_mouse_to_node(flag_to_connect_);
 					set_sel_pos
 						(Widelands::NodeAndTriangle<>
-						 	(m_flag_to_connect,
+						 	(flag_to_connect_,
 						 	 Widelands::TCoords<>
-						 	 	(m_flag_to_connect, Widelands::TCoords<>::D)));
-					start_build_road(m_flag_to_connect, field.get_owned_by());
+						 	 	(flag_to_connect_, Widelands::TCoords<>::D)));
+					start_build_road(flag_to_connect_, field.get_owned_by());
 				}
-			m_flag_to_connect = Widelands::Coords::null();
+			flag_to_connect_ = Widelands::Coords::null();
 		}
 	}
 	if (is_multiplayer()) {
-		m_toggle_chat.set_visible(m_chatenabled);
-		m_toggle_chat.set_enabled(m_chatenabled);
+		toggle_chat_.set_visible(chatenabled_);
+		toggle_chat_.set_enabled(chatenabled_);
 	}
 	{
 		char const * msg_icon = "pics/menu_toggle_oldmessage_menu.png";
@@ -230,8 +230,8 @@
 			   (boost::format(ngettext("%u new message", "%u new messages", nr_new_messages)) %
 			    nr_new_messages).str();
 		}
-		m_toggle_message_menu.set_pic(g_gr->images().get(msg_icon));
-		m_toggle_message_menu.set_tooltip(msg_tooltip);
+		toggle_message_menu_.set_pic(g_gr->images().get(msg_icon));
+		toggle_message_menu_.set_tooltip(msg_tooltip);
 	}
 }
 
@@ -239,18 +239,18 @@
 void InteractivePlayer::popup_message
 	(Widelands::MessageId const id, const Widelands::Message & message)
 {
-	m_message_menu.create();
-	dynamic_cast<GameMessageMenu&>(*m_message_menu.window)
+	message_menu_.create();
+	dynamic_cast<GameMessageMenu&>(*message_menu_.window)
 	.show_new_message(id, message);
 }
 
 
 //  Toolbar button callback functions.
 void InteractivePlayer::toggle_chat() {
-	if (m_chat.window)
-		delete m_chat.window;
+	if (chat_.window)
+		delete chat_.window;
 	else if (chat_provider_)
-		GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
+		GameChatMenu::create_chat_console(this, chat_, *chat_provider_);
 }
 
 bool InteractivePlayer::can_see(Widelands::PlayerNumber const p) const
@@ -263,7 +263,7 @@
 }
 Widelands::PlayerNumber InteractivePlayer::player_number() const
 {
-	return m_player_number;
+	return player_number_;
 }
 
 int32_t InteractivePlayer::calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) {
@@ -289,7 +289,7 @@
 		}
 
 		// everything else can bring up the temporary dialog
-		show_field_action(this, get_player(), &m_fieldaction);
+		show_field_action(this, get_player(), &fieldaction_);
 	}
 }
 
@@ -315,7 +315,7 @@
 			return true;
 
 		case SDLK_i:
-			m_mainm_windows.stock.toggle();
+			main_windows_.stock.toggle();
 			return true;
 
 		case SDLK_m:
@@ -323,11 +323,11 @@
 			return true;
 
 		case SDLK_n:
-			m_message_menu.toggle();
+			message_menu_.toggle();
 			return true;
 
 		case SDLK_o:
-			m_objectives.toggle();
+			objectives_.toggle();
 			return true;
 
 		case SDLK_c:
@@ -335,16 +335,16 @@
 			return true;
 
 		case SDLK_b:
-			if (m_mainm_windows.building_stats.window == nullptr) {
-				new BuildingStatisticsMenu(*this, m_mainm_windows.building_stats);
+			if (main_windows_.building_stats.window == nullptr) {
+				new BuildingStatisticsMenu(*this, main_windows_.building_stats);
 			} else {
-				m_mainm_windows.building_stats.toggle();
+				main_windows_.building_stats.toggle();
 			}
 			return true;
 
 		case SDLK_s:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				new GameMainMenuSaveGame(*this, m_mainm_windows.savegame);
+				new GameMainMenuSaveGame(*this, main_windows_.savegame);
 			else
 				set_display_flag
 					(dfShowStatistics, !get_display_flag(dfShowStatistics));
@@ -355,16 +355,16 @@
 				break;
 			/* no break */
 		case SDLK_HOME:
-			move_view_to(game().map().get_starting_pos(m_player_number));
+			move_view_to(game().map().get_starting_pos(player_number_));
 			return true;
 
 		case SDLK_KP_ENTER:
 		case SDLK_RETURN:
-			if (!chat_provider_ | !m_chatenabled || !is_multiplayer())
+			if (!chat_provider_ | !chatenabled_ || !is_multiplayer())
 				break;
 
-			if (!m_chat.window)
-				GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
+			if (!chat_.window)
+				GameChatMenu::create_chat_console(this, chat_, *chat_provider_);
 
 			return true;
 		default:
@@ -380,7 +380,7 @@
  * player
  */
 void InteractivePlayer::set_player_number(uint32_t const n) {
-	m_player_number = n;
+	player_number_ = n;
 }
 
 
@@ -404,10 +404,10 @@
 	}
 
 	DebugConsole::write(
-	   str(boost::format("Switching from #%1% to #%2%.") % static_cast<int>(m_player_number) % n));
-	m_player_number = n;
+	   str(boost::format("Switching from #%1% to #%2%.") % static_cast<int>(player_number_) % n));
+	player_number_ = n;
 
-	if (UI::UniqueWindow* const building_statistics_window = m_mainm_windows.building_stats.window) {
+	if (UI::UniqueWindow* const building_statistics_window = main_windows_.building_stats.window) {
 		dynamic_cast<BuildingStatisticsMenu&>(*building_statistics_window).update();
 	}
 }
 
=== modified file 'src/wui/interactive_player.h'
--- src/wui/interactive_player.h	2015-11-01 10:11:56 +0000
+++ src/wui/interactive_player.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003, 2006-2010 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -63,11 +63,11 @@
 	bool handle_key(bool down, SDL_Keysym) override;
 
 	Widelands::Player & player() const {
-		return game().player(m_player_number);
+		return game().player(player_number_);
 	}
 	Widelands::Player * get_player() const override {
 		assert(&game());
-		return game().get_player(m_player_number);
+		return game().get_player(player_number_);
 	}
 
 	// for savegames
@@ -78,7 +78,7 @@
 	void think() override;
 
 	void set_flag_to_connect(Widelands::Coords const location) {
-		m_flag_to_connect = location;
+		flag_to_connect_ = location;
 	}
 
 	void popup_message(Widelands::MessageId, const Widelands::Message &);
@@ -87,24 +87,24 @@
 private:
 	void cmdSwitchPlayer(const std::vector<std::string> & args);
 
-	Widelands::PlayerNumber m_player_number;
-	bool                     m_auto_roadbuild_mode;
-	Widelands::Coords        m_flag_to_connect;
-
-	UI::Button m_toggle_chat;
-	UI::Button m_toggle_options_menu;
-	UI::Button m_toggle_statistics_menu;
-	UI::Button m_toggle_objectives;
-	UI::Button m_toggle_minimap;
-	UI::Button m_toggle_message_menu;
-	UI::Button m_toggle_help;
-
-	UI::UniqueWindow::Registry m_chat;
-	UI::UniqueWindow::Registry m_options;
-	UI::UniqueWindow::Registry m_statisticsmenu;
-	UI::UniqueWindow::Registry m_objectives;
-	UI::UniqueWindow::Registry m_encyclopedia;
-	UI::UniqueWindow::Registry m_message_menu;
+	Widelands::PlayerNumber player_number_;
+	bool                     auto_roadbuild_mode_;
+	Widelands::Coords        flag_to_connect_;
+
+	UI::Button toggle_chat_;
+	UI::Button toggle_options_menu_;
+	UI::Button toggle_statistics_menu_;
+	UI::Button toggle_objectives_;
+	UI::Button toggle_minimap_;
+	UI::Button toggle_message_menu_;
+	UI::Button toggle_help_;
+
+	UI::UniqueWindow::Registry chat_;
+	UI::UniqueWindow::Registry options_;
+	UI::UniqueWindow::Registry statisticsmenu_;
+	UI::UniqueWindow::Registry objectives_;
+	UI::UniqueWindow::Registry encyclopedia_;
+	UI::UniqueWindow::Registry message_menu_;
 };
 
 
 
=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2016-01-16 15:57:31 +0000
+++ src/wui/interactive_spectator.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 by the Widelands Development Team
+ * Copyright (C) 2007-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -49,49 +49,49 @@
  g_gr->images().get("pics/" picture ".png"),                      \
  tooltip                                                                      \
 
-	m_toggle_chat
+	toggle_chat_
 		(INIT_BTN("menu_chat", "chat", _("Chat"))),
-	m_exit
+	exit_
 		(INIT_BTN("menu_exit_game", "exit_replay", _("Exit Replay"))),
-	m_save
+	save_
 		(INIT_BTN("menu_save_game", "save_game", _("Save Game"))),
-	m_toggle_options_menu
+	toggle_options_menu_
 		(INIT_BTN("menu_options_menu", "options_menu", _("Options"))),
-	m_toggle_statistics
+	toggle_statistics_
 		(INIT_BTN("menu_general_stats", "general_stats", _("Statistics"))),
-	m_toggle_minimap
+	toggle_minimap_
 		(INIT_BTN("menu_toggle_minimap", "minimap", _("Minimap")))
 {
-	m_toggle_chat.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_chat, this));
-	m_exit.sigclicked.connect(boost::bind(&InteractiveSpectator::exit_btn, this));
-	m_save.sigclicked.connect(boost::bind(&InteractiveSpectator::save_btn, this));
-	m_toggle_options_menu.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_options_menu, this));
-	m_toggle_statistics.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_statistics, this));
-	m_toggle_minimap.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_minimap, this));
+	toggle_chat_.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_chat, this));
+	exit_.sigclicked.connect(boost::bind(&InteractiveSpectator::exit_btn, this));
+	save_.sigclicked.connect(boost::bind(&InteractiveSpectator::save_btn, this));
+	toggle_options_menu_.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_options_menu, this));
+	toggle_statistics_.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_statistics, this));
+	toggle_minimap_.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_minimap, this));
 
 	toolbar_.set_layout_toplevel(true);
 	if (!is_multiplayer()) {
-		toolbar_.add(&m_exit,                UI::Box::AlignLeft);
-		toolbar_.add(&m_save,                UI::Box::AlignLeft);
+		toolbar_.add(&exit_,                UI::Box::AlignLeft);
+		toolbar_.add(&save_,                UI::Box::AlignLeft);
 	} else
-		toolbar_.add(&m_toggle_options_menu, UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_statistics,      UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_minimap,         UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
-	toolbar_.add(&m_toggle_chat,            UI::Box::AlignLeft);
+		toolbar_.add(&toggle_options_menu_, UI::Box::AlignLeft);
+	toolbar_.add(&toggle_statistics_,      UI::Box::AlignLeft);
+	toolbar_.add(&toggle_minimap_,         UI::Box::AlignLeft);
+	toolbar_.add(&toggle_buildhelp_,       UI::Box::AlignLeft);
+	toolbar_.add(&toggle_chat_,            UI::Box::AlignLeft);
 
 	// TODO(unknown): instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI
 	if (is_multiplayer()) {
-		m_exit.set_visible(false);
-		m_exit.set_enabled(false);
-		m_save.set_visible(false);
-		m_save.set_enabled(false);
+		exit_.set_visible(false);
+		exit_.set_enabled(false);
+		save_.set_visible(false);
+		save_.set_enabled(false);
 	} else {
-		m_toggle_chat.set_visible(false);
-		m_toggle_chat.set_enabled(false);
-		m_toggle_options_menu.set_visible(false);
-		m_toggle_options_menu.set_enabled(false);
+		toggle_chat_.set_visible(false);
+		toggle_chat_.set_enabled(false);
+		toggle_options_menu_.set_visible(false);
+		toggle_options_menu_.set_enabled(false);
 	}
 
 	adjust_toolbar_position();
@@ -99,17 +99,17 @@
 	// Setup all screen elements
 	fieldclicked.connect(boost::bind(&InteractiveSpectator::node_action, this));
 
-#define INIT_BTN_HOOKS(registry, btn)                                                              \
-	registry.on_create = std::bind(&UI::Button::set_perm_pressed, &btn, true);                      \
-	registry.on_delete = std::bind(&UI::Button::set_perm_pressed, &btn, false);                     \
-	if (registry.window)                                                                            \
+#define INIT_BTN_HOOKS(registry, btn)                                                  \
+	registry.on_create = std::bind(&UI::Button::set_perm_pressed, &btn, true);     \
+	registry.on_delete = std::bind(&UI::Button::set_perm_pressed, &btn, false);    \
+	if (registry.window)                                                           \
 		btn.set_perm_pressed(true);
 
-	INIT_BTN_HOOKS(m_chat, m_toggle_chat)
-	INIT_BTN_HOOKS(m_options, m_toggle_options_menu)
-	INIT_BTN_HOOKS(m_mainm_windows.general_stats, m_toggle_statistics)
-	INIT_BTN_HOOKS(m_mainm_windows.savegame, m_save)
-	INIT_BTN_HOOKS(minimap_registry(), m_toggle_minimap)
+	INIT_BTN_HOOKS(chat_, toggle_chat_)
+	INIT_BTN_HOOKS(options_, toggle_options_menu_)
+	INIT_BTN_HOOKS(main_windows_.general_stats, toggle_statistics_)
+	INIT_BTN_HOOKS(main_windows_.savegame, save_)
+	INIT_BTN_HOOKS(minimap_registry(), toggle_minimap_)
 
 }
 
@@ -119,15 +119,15 @@
         // buttons. The assertions are safeguards in case somewhere else in the
         // code someone would overwrite our hooks.
 
-#define DEINIT_BTN_HOOKS(registry, btn)                                                            \
-	registry.on_create = 0;                                                                         \
+#define DEINIT_BTN_HOOKS(registry, btn)                                               \
+	registry.on_create = 0;                                                       \
 	registry.on_delete = 0;
 
-	DEINIT_BTN_HOOKS(m_chat, m_toggle_chat)
-	DEINIT_BTN_HOOKS(m_options, m_toggle_options_menu)
-	DEINIT_BTN_HOOKS(m_mainm_windows.general_stats, m_toggle_statistics)
-	DEINIT_BTN_HOOKS(m_mainm_windows.savegame, m_save)
-	DEINIT_BTN_HOOKS(minimap_registry(), m_toggle_minimap)
+	DEINIT_BTN_HOOKS(chat_, toggle_chat_)
+	DEINIT_BTN_HOOKS(options_, toggle_options_menu_)
+	DEINIT_BTN_HOOKS(main_windows_.general_stats, toggle_statistics_)
+	DEINIT_BTN_HOOKS(main_windows_.savegame, save_)
+	DEINIT_BTN_HOOKS(minimap_registry(), toggle_minimap_)
 }
 
 
@@ -160,10 +160,10 @@
 // Toolbar button callback functions.
 void InteractiveSpectator::toggle_chat()
 {
-	if (m_chat.window)
-		delete m_chat.window;
+	if (chat_.window)
+		delete chat_.window;
 	else if (chat_provider_)
-		GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
+		GameChatMenu::create_chat_console(this, chat_, *chat_provider_);
 }
 
 
@@ -181,10 +181,10 @@
 	if (is_multiplayer()) {
 		return;
 	}
-	if (m_mainm_windows.savegame.window)
-		delete m_mainm_windows.savegame.window;
+	if (main_windows_.savegame.window)
+		delete main_windows_.savegame.window;
 	else {
-		new GameMainMenuSaveGame(*this, m_mainm_windows.savegame);
+		new GameMainMenuSaveGame(*this, main_windows_.savegame);
 	}
 }
 
@@ -193,18 +193,18 @@
 	if (!is_multiplayer()) {
 		return;
 	}
-	if (m_options.window)
-		delete m_options.window;
+	if (options_.window)
+		delete options_.window;
 	else
-		new GameOptionsMenu(*this, m_options, m_mainm_windows);
+		new GameOptionsMenu(*this, options_, main_windows_);
 }
 
 
 void InteractiveSpectator::toggle_statistics() {
-	if (m_mainm_windows.general_stats.window)
-		delete m_mainm_windows.general_stats.window;
+	if (main_windows_.general_stats.window)
+		delete main_windows_.general_stats.window;
 	else
-		new GeneralStatisticsMenu(*this, m_mainm_windows.general_stats);
+		new GeneralStatisticsMenu(*this, main_windows_.general_stats);
 }
 
 
@@ -237,7 +237,7 @@
 		return;
 
 	//  everything else can bring up the temporary dialog
-	show_field_action(this, nullptr, &m_fieldaction);
+	show_field_action(this, nullptr, &fieldaction_);
 }
 
 
@@ -262,7 +262,7 @@
 
 		case SDLK_s:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
-				new GameMainMenuSaveGame(*this, m_mainm_windows.savegame);
+				new GameMainMenuSaveGame(*this, main_windows_.savegame);
 			} else
 				set_display_flag
 					(dfShowStatistics, !get_display_flag(dfShowStatistics));
@@ -270,13 +270,13 @@
 
 		case SDLK_RETURN:
 		case SDLK_KP_ENTER:
-			if (!chat_provider_ | !m_chatenabled)
+			if (!chat_provider_ | !chatenabled_)
 				break;
 
-			if (!m_chat.window)
-				GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
+			if (!chat_.window)
+				GameChatMenu::create_chat_console(this, chat_, *chat_provider_);
 
-			dynamic_cast<GameChatMenu*>(m_chat.window)->enter_chat_message();
+			dynamic_cast<GameChatMenu*>(chat_.window)->enter_chat_message();
 			return true;
 
 		default:
 
=== modified file 'src/wui/interactive_spectator.h'
--- src/wui/interactive_spectator.h	2015-11-01 10:11:56 +0000
+++ src/wui/interactive_spectator.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -58,16 +58,16 @@
 	void node_action() override;
 
 private:
-	UI::Button m_toggle_chat;
-	UI::Button m_exit;
-	UI::Button m_save;
-	UI::Button m_toggle_options_menu;
-	UI::Button m_toggle_statistics;
-	UI::Button m_toggle_minimap;
-
-
-	UI::UniqueWindow::Registry m_chat;
-	UI::UniqueWindow::Registry m_options;
+	UI::Button toggle_chat_;
+	UI::Button exit_;
+	UI::Button save_;
+	UI::Button toggle_options_menu_;
+	UI::Button toggle_statistics_;
+	UI::Button toggle_minimap_;
+
+
+	UI::UniqueWindow::Registry chat_;
+	UI::UniqueWindow::Registry options_;
 };
 
 
 
=== modified file 'src/wui/itemwaresdisplay.cc'
--- src/wui/itemwaresdisplay.cc	2016-01-17 19:54:32 +0000
+++ src/wui/itemwaresdisplay.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013 by the Widelands Development Team
+ * Copyright (C) 2011-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -40,9 +40,9 @@
  */
 ItemWaresDisplay::ItemWaresDisplay(Panel * parent, const Widelands::Player & gplayer) :
 	Panel(parent, 0, 0, 0, 0),
-	m_player(gplayer),
-	m_capacity(0),
-	m_items_per_row(IWD_DefaultItemsPerRow)
+	player_(gplayer),
+	capacity_(0),
+	items_per_row_(IWD_DefaultItemsPerRow)
 {
 	set_desired_size(2 * IWD_HBorder, 2 * IWD_VBorder);
 }
@@ -52,8 +52,8 @@
  */
 void ItemWaresDisplay::clear()
 {
-	if (!m_items.empty()) {
-		m_items.clear();
+	if (!items_.empty()) {
+		items_.clear();
 		update();
 	}
 }
@@ -66,8 +66,8 @@
  */
 void ItemWaresDisplay::set_capacity(uint32_t cap)
 {
-	if (cap != m_capacity) {
-		m_capacity = cap;
+	if (cap != capacity_) {
+		capacity_ = cap;
 		recalc_desired_size();
 	}
 }
@@ -77,16 +77,16 @@
  */
 void ItemWaresDisplay::set_items_per_row(uint32_t nr)
 {
-	if (nr != m_items_per_row) {
-		m_items_per_row = nr;
+	if (nr != items_per_row_) {
+		items_per_row_ = nr;
 		recalc_desired_size();
 	}
 }
 
 void ItemWaresDisplay::recalc_desired_size()
 {
-	uint32_t nrrows = (m_capacity + m_items_per_row - 1) / m_items_per_row;
-	uint32_t rowitems = m_capacity >= m_items_per_row ? m_items_per_row : m_capacity;
+	uint32_t nrrows = (capacity_ + items_per_row_ - 1) / items_per_row_;
+	uint32_t rowitems = capacity_ >= items_per_row_ ? items_per_row_ : capacity_;
 
 	set_desired_size(2 * IWD_HBorder + rowitems * IWD_ItemWidth, 2 * IWD_VBorder + nrrows * IWD_ItemHeight);
 }
@@ -99,7 +99,7 @@
 	Item it;
 	it.worker = worker;
 	it.index = index;
-	m_items.push_back(it);
+	items_.push_back(it);
 	update();
 }
 
@@ -109,10 +109,10 @@
 
 	dst.fill_rect(Rect(Point(0, 0), get_w(), get_h()), RGBAColor(0, 0, 0, 0));
 
-	for (uint32_t idx = 0; idx < m_items.size(); ++idx) {
-		const Item & it = m_items[idx];
-		uint32_t row = idx / m_items_per_row;
-		uint32_t col = idx % m_items_per_row;
+	for (uint32_t idx = 0; idx < items_.size(); ++idx) {
+		const Item & it = items_[idx];
+		uint32_t row = idx / items_per_row_;
+		uint32_t col = idx % items_per_row_;
 
 		uint32_t x = IWD_HBorder / 2 + col * IWD_ItemWidth;
 		uint32_t y = IWD_VBorder + row * IWD_ItemHeight;
 
=== modified file 'src/wui/itemwaresdisplay.h'
--- src/wui/itemwaresdisplay.h	2015-11-11 09:52:55 +0000
+++ src/wui/itemwaresdisplay.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 by the Widelands Development Team
+ * Copyright (C) 2011-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,12 +36,12 @@
 struct ItemWaresDisplay : UI::Panel {
 	ItemWaresDisplay(UI::Panel * parent, const Widelands::Player & player);
 
-	const Widelands::Player & player() const {return m_player;}
+	const Widelands::Player & player() const {return player_;}
 
-	uint32_t capacity() const {return m_capacity;}
+	uint32_t capacity() const {return capacity_;}
 	void set_capacity(uint32_t cap);
 
-	uint32_t items_per_row() const {return m_items_per_row;}
+	uint32_t items_per_row() const {return items_per_row_;}
 	void set_items_per_row(uint32_t nr);
 
 	void clear();
@@ -57,10 +57,10 @@
 
 	void recalc_desired_size();
 
-	const Widelands::Player & m_player;
-	uint32_t m_capacity;
-	uint32_t m_items_per_row;
-	std::vector<Item> m_items;
+	const Widelands::Player & player_;
+	uint32_t capacity_;
+	uint32_t items_per_row_;
+	std::vector<Item> items_;
 };
 
 #endif  // end of include guard: WL_WUI_ITEMWARESDISPLAY_H
 
=== modified file 'src/wui/mapdata.h'
--- src/wui/mapdata.h	2016-01-17 08:29:59 +0000
+++ src/wui/mapdata.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006-2009, 2011, 2014-2015 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,8 +36,8 @@
  * Author data for a map or scenario.
  */
 struct MapAuthorData {
-	const std::string& get_names() const {return m_names;}
-	size_t get_number()            const {return m_number;}
+	const std::string& get_names() const {return names_;}
+	size_t get_number()            const {return number_;}
 
 	// Parses author list string into localized contatenated list
 	// string. Use , as list separator and no whitespaces between
@@ -45,13 +45,13 @@
 	MapAuthorData(const std::string& author_list) {
 		std::vector<std::string> authors;
 		boost::split(authors, author_list, boost::is_any_of(","));
-		m_names = i18n::localize_list(authors, i18n::ConcatenateWith::AMPERSAND);
-		m_number = authors.size();
+		names_ = i18n::localize_list(authors, i18n::ConcatenateWith::AMPERSAND);
+		number_ = authors.size();
 	}
 
 private:
-	std::string m_names;
-	size_t      m_number;
+	std::string names_;
+	size_t      number_;
 };
 
 /**
 
=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2015-03-29 18:07:45 +0000
+++ src/wui/mapview.cc	2016-01-24 20:25:45 +0000
@@ -33,10 +33,10 @@
 MapView::MapView(
    UI::Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, InteractiveBase& player)
    : UI::Panel(parent, x, y, w, h),
-     m_renderer(new GameRenderer()),
-     m_intbase(player),
-     m_viewpoint(Point(0, 0)),
-     m_dragging(false) {
+     renderer_(new GameRenderer()),
+     intbase_(player),
+     viewpoint_(Point(0, 0)),
+     dragging_(false) {
 }
 
 MapView::~MapView()
@@ -50,7 +50,7 @@
 	const Widelands::Map & map = intbase().egbase().map();
 	Point p;
 	MapviewPixelFunctions::get_save_pix(map, c, p.x, p.y);
-	p -= m_viewpoint;
+	p -= viewpoint_;
 
 	//  If the user has scrolled the node outside the viewable area, he most
 	//  surely doesn't want to jump there.
@@ -86,15 +86,15 @@
 	}
 
 	if (upcast(InteractivePlayer const, interactive_player, &intbase())) {
-		m_renderer->rendermap(dst, egbase, m_viewpoint, interactive_player->player());
+		renderer_->rendermap(dst, egbase, viewpoint_, interactive_player->player());
 	} else {
-		m_renderer->rendermap(dst, egbase, m_viewpoint);
+		renderer_->rendermap(dst, egbase, viewpoint_);
 	}
 }
 
 void MapView::set_changeview(const MapView::ChangeViewFn & fn)
 {
-	m_changeview = fn;
+	changeview_ = fn;
 }
 
 /*
@@ -104,22 +104,22 @@
 */
 void MapView::set_viewpoint(Point vp, bool jump)
 {
-	if (vp == m_viewpoint)
+	if (vp == viewpoint_)
 		return;
 
 	MapviewPixelFunctions::normalize_pix(intbase().egbase().map(), vp);
-	m_viewpoint = vp;
+	viewpoint_ = vp;
 
-	if (m_changeview)
-		m_changeview(vp, jump);
-	changeview(m_viewpoint.x, m_viewpoint.y);
+	if (changeview_)
+		changeview_(vp, jump);
+	changeview(viewpoint_.x, viewpoint_.y);
 }
 
 
 void MapView::stop_dragging() {
 	WLApplication::get()->set_mouse_lock(false);
 	grab_mouse(false);
-	m_dragging = false;
+	dragging_ = false;
 }
 
 /**
@@ -138,7 +138,7 @@
 
 		fieldclicked();
 	} else if (btn == SDL_BUTTON_RIGHT) {
-		m_dragging = true;
+		dragging_ = true;
 		grab_mouse(true);
 		WLApplication::get()->set_mouse_lock(true);
 	}
@@ -146,7 +146,7 @@
 }
 bool MapView::handle_mouserelease(const uint8_t btn, int32_t, int32_t)
 {
-	if (btn == SDL_BUTTON_RIGHT && m_dragging)
+	if (btn == SDL_BUTTON_RIGHT && dragging_)
 		stop_dragging();
 	return true;
 }
@@ -160,7 +160,7 @@
 bool MapView::handle_mousemove
 	(uint8_t const state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff)
 {
-	if (m_dragging) {
+	if (dragging_) {
 		if (state & SDL_BUTTON(SDL_BUTTON_RIGHT))
 			set_rel_viewpoint(Point(xdiff, ydiff), false);
 		else stop_dragging();
@@ -183,8 +183,8 @@
 ===============
 */
 void MapView::track_sel(Point m) {
-	m += m_viewpoint;
-	m_intbase.set_sel_pos
+	m += viewpoint_;
+	intbase_.set_sel_pos
 		(MapviewPixelFunctions::calc_node_and_triangle
 		 	(intbase().egbase().map(), m.x, m.y));
 }
 
=== modified file 'src/wui/mapview.h'
--- src/wui/mapview.h	2014-11-13 08:25:45 +0000
+++ src/wui/mapview.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -63,10 +63,10 @@
 	void warp_mouse_to_node(Widelands::Coords);
 
 	void set_viewpoint(Point vp, bool jump);
-	void set_rel_viewpoint(Point r, bool jump) {set_viewpoint(m_viewpoint + r, jump);}
+	void set_rel_viewpoint(Point r, bool jump) {set_viewpoint(viewpoint_ + r, jump);}
 
-	Point get_viewpoint() const {return m_viewpoint;}
-	bool is_dragging() const {return m_dragging;}
+	Point get_viewpoint() const {return viewpoint_;}
+	bool is_dragging() const {return dragging_;}
 
 	// Drawing
 	void draw(RenderTarget &) override;
@@ -80,16 +80,16 @@
 	void track_sel(Point m);
 
 protected:
-	InteractiveBase & intbase() const {return m_intbase;}
+	InteractiveBase & intbase() const {return intbase_;}
 
 private:
 	void stop_dragging();
 
-	std::unique_ptr<GameRenderer> m_renderer;
-	InteractiveBase & m_intbase;
-	ChangeViewFn m_changeview;
-	Point              m_viewpoint;
-	bool               m_dragging;
+	std::unique_ptr<GameRenderer> renderer_;
+	InteractiveBase & intbase_;
+	ChangeViewFn changeview_;
+	Point              viewpoint_;
+	bool               dragging_;
 };
 
 
 
=== modified file 'src/wui/minimap.cc'
--- src/wui/minimap.cc	2015-11-28 11:04:12 +0000
+++ src/wui/minimap.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,11 +36,11 @@
 	 InteractiveBase & ibase)
 :
 	UI::Panel       (&parent, x, y, 10, 10),
-	m_ibase       (ibase),
-	m_viewx       (0),
-	m_viewy       (0),
-	m_pic_map_spot(g_gr->images().get("pics/map_spot.png")),
-	m_flags       (flags)
+	ibase_       (ibase),
+	viewx_       (0),
+	viewy_       (0),
+	pic_map_spot_(g_gr->images().get("pics/map_spot.png")),
+	flags_       (flags)
 {}
 
 
@@ -52,8 +52,8 @@
  */
 void MiniMap::View::set_view_pos(const int32_t x, const int32_t y)
 {
-	m_viewx = x / TRIANGLE_WIDTH;
-	m_viewy = y / TRIANGLE_HEIGHT;
+	viewx_ = x / TRIANGLE_WIDTH;
+	viewy_ = y / TRIANGLE_HEIGHT;
 
 	update();
 }
@@ -62,12 +62,12 @@
 void MiniMap::View::draw(RenderTarget & dst)
 {
 	minimap_image_ =
-	   draw_minimap(m_ibase.egbase(),
-	                m_ibase.get_player(),
-	                (*m_flags) & (MiniMapLayer::Zoom2) ?
-	                   Point((m_viewx - get_w() / 4), (m_viewy - get_h() / 4)) :
-	                   Point((m_viewx - get_w() / 2), (m_viewy - get_h() / 2)),
-	                *m_flags | MiniMapLayer::ViewWindow);
+	   draw_minimap(ibase_.egbase(),
+	                ibase_.get_player(),
+	                (*flags_) & (MiniMapLayer::Zoom2) ?
+	                   Point((viewx_ - get_w() / 4), (viewy_ - get_h() / 4)) :
+	                   Point((viewx_ - get_w() / 2), (viewy_ - get_h() / 2)),
+	                *flags_ | MiniMapLayer::ViewWindow);
 	dst.blit(Point(), minimap_image_.get());
 }
 
@@ -83,15 +83,15 @@
 
 	//  calculates the coordinates corresponding to the mouse position
 	Widelands::Coords c;
-	if (*m_flags & MiniMapLayer::Zoom2)
+	if (*flags_ & MiniMapLayer::Zoom2)
 		c = Widelands::Coords
-			(m_viewx + 1 - (get_w() / 2 - x) / 2,
-			 m_viewy + 1 - (get_h() / 2 - y) / 2);
+			(viewx_ + 1 - (get_w() / 2 - x) / 2,
+			 viewy_ + 1 - (get_h() / 2 - y) / 2);
 	else
 		c = Widelands::Coords
-			(m_viewx + 1 - get_w() / 2 + x, m_viewy + 1 - get_h() / 2 + y);
+			(viewx_ + 1 - get_w() / 2 + x, viewy_ + 1 - get_h() / 2 + y);
 
-	m_ibase.egbase().map().normalize_coords(c);
+	ibase_.egbase().map().normalize_coords(c);
 
 	dynamic_cast<MiniMap&>(*get_parent()).warpview(c.x * TRIANGLE_WIDTH, c.y * TRIANGLE_HEIGHT);
 
@@ -102,7 +102,7 @@
 }
 
 void MiniMap::View::set_zoom(int32_t z) {
-	const Widelands::Map & map = m_ibase.egbase().map();
+	const Widelands::Map & map = ibase_.egbase().map();
 	set_size((map.get_width() * z), (map.get_height()) * z);
 }
 
@@ -129,52 +129,52 @@
 inline uint32_t MiniMap::number_of_buttons_per_row() const {return 3;}
 inline uint32_t MiniMap::number_of_button_rows    () const {return 2;}
 inline uint32_t MiniMap::but_w                    () const {
-	return m_view.get_w() / number_of_buttons_per_row();
+	return view_.get_w() / number_of_buttons_per_row();
 }
 inline uint32_t MiniMap::but_h                    () const {return 20;}
 MiniMap::MiniMap(InteractiveBase & ibase, Registry * const registry)
 :
 	UI::UniqueWindow(&ibase, "minimap", registry, 0, 0, _("Map")),
-	m_view(*this, &registry->flags, 0, 0, 0, 0, ibase),
+	view_(*this, &registry->flags, 0, 0, 0, 0, ibase),
 
 	button_terrn
 		(this, "terrain",
-		 but_w() * 0, m_view.get_h() + but_h() * 0, but_w(), but_h(),
+		 but_w() * 0, view_.get_h() + but_h() * 0, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_terrn.png"),
 		 _("Terrain"),
 		 true, false, true),
 	button_owner
 		(this, "owner",
-		 but_w() * 1, m_view.get_h() + but_h() * 0, but_w(), but_h(),
+		 but_w() * 1, view_.get_h() + but_h() * 0, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_owner.png"),
 		 _("Owner"),
 		 true, false, true),
 	button_flags
 		(this, "flags",
-		 but_w() * 2, m_view.get_h() + but_h() * 0, but_w(), but_h(),
+		 but_w() * 2, view_.get_h() + but_h() * 0, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_flags.png"),
 		 _("Flags"),
 		 true, false, true),
 	button_roads
 		(this, "roads",
-		 but_w() * 0, m_view.get_h() + but_h() * 1, but_w(), but_h(),
+		 but_w() * 0, view_.get_h() + but_h() * 1, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_roads.png"),
 		 _("Roads"),
 		 true, false, true),
 	button_bldns
 		(this, "buildings",
-		 but_w() * 1, m_view.get_h() + but_h() * 1, but_w(), but_h(),
+		 but_w() * 1, view_.get_h() + but_h() * 1, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_bldns.png"),
 		 _("Buildings"),
 		 true, false, true),
 	button_zoom
 		(this, "zoom",
-		 but_w() * 2, m_view.get_h() + but_h() * 1, but_w(), but_h(),
+		 but_w() * 2, view_.get_h() + but_h() * 1, but_w(), but_h(),
 		 g_gr->images().get("pics/but0.png"),
 		 g_gr->images().get("pics/button_zoom.png"),
 		 _("Zoom"),
@@ -198,37 +198,37 @@
 
 
 void MiniMap::toggle(MiniMapLayer const button) {
-	*m_view.m_flags = MiniMapLayer(*m_view.m_flags ^ button);
+	*view_.flags_ = MiniMapLayer(*view_.flags_ ^ button);
 	if (button == MiniMapLayer::Zoom2)
 		resize();
 	update_button_permpressed();
 }
 
 void MiniMap::resize() {
-	m_view.set_zoom(*m_view.m_flags & MiniMapLayer::Zoom2 ? 2 : 1);
+	view_.set_zoom(*view_.flags_ & MiniMapLayer::Zoom2 ? 2 : 1);
 	set_inner_size
-		(m_view.get_w(), m_view.get_h() + number_of_button_rows() * but_h());
-	button_terrn.set_pos(Point(but_w() * 0, m_view.get_h() + but_h() * 0));
+		(view_.get_w(), view_.get_h() + number_of_button_rows() * but_h());
+	button_terrn.set_pos(Point(but_w() * 0, view_.get_h() + but_h() * 0));
 	button_terrn.set_size(but_w(), but_h());
-	button_owner.set_pos(Point(but_w() * 1, m_view.get_h() + but_h() * 0));
+	button_owner.set_pos(Point(but_w() * 1, view_.get_h() + but_h() * 0));
 	button_owner.set_size(but_w(), but_h());
-	button_flags.set_pos(Point(but_w() * 2, m_view.get_h() + but_h() * 0));
+	button_flags.set_pos(Point(but_w() * 2, view_.get_h() + but_h() * 0));
 	button_flags.set_size(but_w(), but_h());
-	button_roads.set_pos(Point(but_w() * 0, m_view.get_h() + but_h() * 1));
+	button_roads.set_pos(Point(but_w() * 0, view_.get_h() + but_h() * 1));
 	button_roads.set_size(but_w(), but_h());
-	button_bldns.set_pos(Point(but_w() * 1, m_view.get_h() + but_h() * 1));
+	button_bldns.set_pos(Point(but_w() * 1, view_.get_h() + but_h() * 1));
 	button_bldns.set_size(but_w(), but_h());
-	button_zoom .set_pos(Point(but_w() * 2, m_view.get_h() + but_h() * 1));
+	button_zoom .set_pos(Point(but_w() * 2, view_.get_h() + but_h() * 1));
 	button_zoom .set_size(but_w(), but_h());
 	move_inside_parent();
 }
 
 // Makes the buttons reflect the selected layers
 void MiniMap::update_button_permpressed() {
-	button_terrn.set_perm_pressed(*m_view.m_flags & MiniMapLayer::Terrain);
-	button_owner.set_perm_pressed(*m_view.m_flags & MiniMapLayer::Owner);
-	button_flags.set_perm_pressed(*m_view.m_flags & MiniMapLayer::Flag);
-	button_roads.set_perm_pressed(*m_view.m_flags & MiniMapLayer::Road);
-	button_bldns.set_perm_pressed(*m_view.m_flags & MiniMapLayer::Building);
-	button_zoom .set_perm_pressed(*m_view.m_flags & MiniMapLayer::Zoom2);
+	button_terrn.set_perm_pressed(*view_.flags_ & MiniMapLayer::Terrain);
+	button_owner.set_perm_pressed(*view_.flags_ & MiniMapLayer::Owner);
+	button_flags.set_perm_pressed(*view_.flags_ & MiniMapLayer::Flag);
+	button_roads.set_perm_pressed(*view_.flags_ & MiniMapLayer::Road);
+	button_bldns.set_perm_pressed(*view_.flags_ & MiniMapLayer::Building);
+	button_zoom .set_perm_pressed(*view_.flags_ & MiniMapLayer::Zoom2);
 }
 
=== modified file 'src/wui/minimap.h'
--- src/wui/minimap.h	2015-02-20 07:45:49 +0000
+++ src/wui/minimap.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006, 2008-2011 by the Widelands Development Team
+ * Copyright (C) 2002-20116 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@
 	boost::signals2::signal<void (int32_t, int32_t)> warpview;
 
 	void set_view_pos(int32_t const x, int32_t const y) {
-		m_view.set_view_pos(x, y);
+		view_.set_view_pos(x, y);
 	}
 
 private:
@@ -79,16 +79,16 @@
 		void set_zoom(int32_t z);
 
 	private:
-		InteractiveBase & m_ibase;
-		int32_t                m_viewx, m_viewy;
-		const Image* m_pic_map_spot;
+		InteractiveBase & ibase_;
+		int32_t                viewx_, viewy_;
+		const Image* pic_map_spot_;
 
 		// This needs to be owned since it will be rendered by the RenderQueue
 		// later, so it must be valid for the whole frame.
 		std::unique_ptr<Texture> minimap_image_;
 
 	public:
-		MiniMapLayer* m_flags;
+		MiniMapLayer* flags_;
 	};
 
 	uint32_t number_of_buttons_per_row() const;
@@ -96,7 +96,7 @@
 	uint32_t but_w                    () const;
 	uint32_t but_h                    () const;
 
-	View     m_view;
+	View     view_;
 	UI::Button button_terrn;
 	UI::Button button_owner;
 	UI::Button button_flags;
 
=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc	2015-12-11 19:06:50 +0000
+++ src/wui/multiplayersetupgroup.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 by the Widelands Development Team
+ * Copyright (C) 2010-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -51,8 +51,8 @@
 		 type_icon(nullptr),
 		 type(nullptr),
 		 s(settings),
-		 m_id(id),
-		 m_save(-2)
+		 id_(id),
+		 save_(-2)
 	{
 		set_size(w, h);
 		name = new UI::Textarea
@@ -81,7 +81,7 @@
 
 	/// Switch human players and spectator
 	void toggle_type() {
-		UserSettings us = s->settings().users.at(m_id);
+		UserSettings us = s->settings().users.at(id_);
 		int16_t p = us.position;
 		if (p == UserSettings::none())
 			p = -1;
@@ -101,7 +101,7 @@
 
 	/// Care about visibility and current values
 	void refresh() {
-		UserSettings us = s->settings().users.at(m_id);
+		UserSettings us = s->settings().users.at(id_);
 		if (us.position == UserSettings::not_connected()) {
 			std::string free_i18n = _("free");
 			std::string free_text =
@@ -113,7 +113,7 @@
 				type_icon->set_visible(false);
 		} else {
 			name->set_text(us.name);
-			if (m_save != us.position) {
+			if (save_ != us.position) {
 				std::string pic;
 				std::string temp_tooltip;
 				if (us.position < UserSettings::highest_playernum()) {
@@ -127,7 +127,7 @@
 				}
 
 				// Either Button if changeable OR text if not
-				if (m_id == s->settings().usernum) {
+				if (id_ == s->settings().usernum) {
 					type->set_pic(g_gr->images().get(pic));
 					type->set_tooltip(temp_tooltip);
 					type->set_visible(true);
@@ -136,7 +136,7 @@
 					type_icon->set_tooltip(temp_tooltip);
 					type_icon->set_visible(true);
 				}
-				m_save = us.position;
+				save_ = us.position;
 			}
 		}
 	}
@@ -145,8 +145,8 @@
 	UI::Icon               * type_icon;
 	UI::Button             * type;
 	GameSettingsProvider   * const s;
-	uint8_t                  const m_id;
-	int16_t                  m_save; // saved position to check rewrite need.
+	uint8_t                  const id_;
+	int16_t                  save_; // saved position to check rewrite need.
 };
 
 struct MultiPlayerPlayerGroup : public UI::Box {
@@ -165,9 +165,9 @@
 		 init(nullptr),
 		 s(settings),
 		 n(npsb),
-		 m_id(id),
-		 m_tribepics(tp),
-		 m_tribenames(tn)
+		 id_(id),
+		 tribepics_(tp),
+		 tribenames_(tn)
 	{
 		set_size(w, h);
 
@@ -217,42 +217,42 @@
 
 	/// Toggle through the types
 	void toggle_type() {
-		n->toggle_type(m_id);
+		n->toggle_type(id_);
 	}
 
 	/// Toggle through the tribes + handle shared in players
 	void toggle_tribe() {
-		n->toggle_tribe(m_id);
+		n->toggle_tribe(id_);
 	}
 
 	/// Toggle through the initializations
 	void toggle_init() {
-		n->toggle_init(m_id);
+		n->toggle_init(id_);
 	}
 
 	/// Toggle through the teams
 	void toggle_team() {
-		n->toggle_team(m_id);
+		n->toggle_team(id_);
 	}
 
 	/// Refresh all user interfaces
 	void refresh() {
 		const GameSettings & settings = s->settings();
 
-		if (m_id >= settings.players.size()) {
+		if (id_ >= settings.players.size()) {
 			set_visible(false);
 			return;
 		}
 
-		n->refresh(m_id);
+		n->refresh(id_);
 
 		set_visible(true);
 
-		const PlayerSettings & player_setting = settings.players[m_id];
-		bool typeaccess       = s->can_change_player_state(m_id);
-		bool tribeaccess      = s->can_change_player_tribe(m_id);
-		bool const initaccess = s->can_change_player_init(m_id);
-		bool teamaccess       = s->can_change_player_team(m_id);
+		const PlayerSettings & player_setting = settings.players[id_];
+		bool typeaccess       = s->can_change_player_state(id_);
+		bool tribeaccess      = s->can_change_player_tribe(id_);
+		bool const initaccess = s->can_change_player_init(id_);
+		bool teamaccess       = s->can_change_player_team(id_);
 
 		type->set_enabled(typeaccess);
 		if (player_setting.state == PlayerSettings::stateClosed) {
@@ -320,21 +320,21 @@
 			type->set_pic(g_gr->images().get(pic));
 			if (player_setting.random_tribe) {
 				std::string random = pgettext("tribe", "Random");
-				if (!m_tribenames["random"].size())
-					m_tribepics[random] = g_gr->images().get("pics/random.png");
+				if (!tribenames_["random"].size())
+					tribepics_[random] = g_gr->images().get("pics/random.png");
 				tribe->set_tooltip(random.c_str());
-				tribe->set_pic(m_tribepics[random]);
+				tribe->set_pic(tribepics_[random]);
 			} else {
-				if (!m_tribenames[player_setting.tribe].size()) {
+				if (!tribenames_[player_setting.tribe].size()) {
 					// get tribes name and picture
 					i18n::Textdomain td("tribes");
 					for (const TribeBasicInfo& tribeinfo : settings.tribes) {
-						m_tribenames[tribeinfo.name] = _(tribeinfo.descname);
-						m_tribepics[tribeinfo.name] = g_gr->images().get(tribeinfo.icon);
+						tribenames_[tribeinfo.name] = _(tribeinfo.descname);
+						tribepics_[tribeinfo.name] = g_gr->images().get(tribeinfo.icon);
 					}
 				}
-				tribe->set_tooltip(m_tribenames[player_setting.tribe].c_str());
-				tribe->set_pic(m_tribepics[player_setting.tribe]);
+				tribe->set_tooltip(tribenames_[player_setting.tribe].c_str());
+				tribe->set_pic(tribepics_[player_setting.tribe]);
 			}
 			tribe->set_flat(false);
 
@@ -375,9 +375,9 @@
 	UI::Button                   *       team;
 	GameSettingsProvider         * const s;
 	NetworkPlayerSettingsBackend * const n;
-	uint8_t                        const m_id;
-	std::map<std::string, const Image* >   & m_tribepics;
-	std::map<std::string, std::string> & m_tribenames;
+	uint8_t                        const id_;
+	std::map<std::string, const Image* >   & tribepics_;
+	std::map<std::string, std::string> & tribenames_;
 };
 
 MultiPlayerSetupGroup::MultiPlayerSetupGroup
@@ -392,9 +392,9 @@
 npsb(new NetworkPlayerSettingsBackend(s)),
 clientbox(this, 0, buth, UI::Box::Vertical, w / 3, h - buth),
 playerbox(this, w * 6 / 15, buth, UI::Box::Vertical, w * 9 / 15, h - buth),
-m_buth(buth),
-m_fsize(fsize),
-m_fname(fname)
+buth_(buth),
+fsize_(fsize),
+fname_(fname)
 {
 	UI::TextStyle tsmaller(UI::TextStyle::makebold(UI::Font::get(fname, fsize * 3 / 4), UI_FONT_CLR_FG));
 
@@ -462,7 +462,7 @@
 			(&playerbox, i,
 			 0, 0, playerbox.get_w(), buth,
 			 s, npsb.get(),
-			 m_tribepics, m_tribenames);
+			 tribepics_, tribenames_);
 		playerbox.add(multi_player_player_groups.at(i), 1);
 	}
 	refresh();
@@ -488,7 +488,7 @@
 	for (uint32_t i = 0; i < settings.users.size(); ++i) {
 		if (!multi_player_client_groups.at(i)) {
 			multi_player_client_groups.at(i) = new MultiPlayerClientGroup(
-			   &clientbox, i, 0, 0, clientbox.get_w(), m_buth, s, UI::Font::get(m_fname, m_fsize));
+			   &clientbox, i, 0, 0, clientbox.get_w(), buth_, s, UI::Font::get(fname_, fsize_));
 			clientbox.add(&*multi_player_client_groups.at(i), 1);
 		}
 		multi_player_client_groups.at(i)->refresh();
 
=== modified file 'src/wui/multiplayersetupgroup.h'
--- src/wui/multiplayersetupgroup.h	2015-01-21 21:21:46 +0000
+++ src/wui/multiplayersetupgroup.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 by the Widelands Development Team
+ * Copyright (C) 2010-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -64,11 +64,11 @@
 	UI::Box                  clientbox, playerbox;
 	std::vector<UI::Textarea *> labels;
 
-	uint32_t    m_buth, m_fsize;
-	std::string m_fname;
+	uint32_t    buth_, fsize_;
+	std::string fname_;
 
-	std::map<std::string, const Image* > m_tribepics;
-	std::map<std::string, std::string> m_tribenames;
+	std::map<std::string, const Image* > tribepics_;
+	std::map<std::string, std::string> tribenames_;
 };
 
 
 
=== modified file 'src/wui/playerdescrgroup.cc'
--- src/wui/playerdescrgroup.cc	2016-01-17 09:54:31 +0000
+++ src/wui/playerdescrgroup.cc	2016-01-24 20:25:45 +0000
@@ -180,16 +180,16 @@
 			d->btnPlayerType->set_title(title);
 
 			TribeBasicInfo info = Widelands::Tribes::tribeinfo(player.tribe);
-			if (!m_tribenames[player.tribe].size()) {
+			if (!tribenames_[player.tribe].size()) {
 				// Tribe's localized name
-				m_tribenames[player.tribe] = info.descname;
+				tribenames_[player.tribe] = info.descname;
 			}
 			if (player.random_tribe) {
 				d->btnPlayerTribe->set_title(pgettext("tribe", "Random"));
 				d->btnPlayerTribe->set_tooltip(_("The tribe will be set at random."));
 			} else {
 				i18n::Textdomain td("tribes");
-				d->btnPlayerTribe->set_title(_(m_tribenames[player.tribe]));
+				d->btnPlayerTribe->set_title(_(tribenames_[player.tribe]));
 				d->btnPlayerTribe->set_tooltip(info.tooltip);
 			}
 
 
=== modified file 'src/wui/playerdescrgroup.h'
--- src/wui/playerdescrgroup.h	2014-12-06 12:22:35 +0000
+++ src/wui/playerdescrgroup.h	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2006, 2008, 2010 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -55,7 +55,7 @@
 	void toggle_playerteam();
 
 	PlayerDescriptionGroupImpl * d;
-	std::map<std::string, std::string> m_tribenames;
+	std::map<std::string, std::string> tribenames_;
 };
 
 
 
=== modified file 'src/wui/plot_area.cc'
--- src/wui/plot_area.cc	2016-01-18 19:35:25 +0000
+++ src/wui/plot_area.cc	2016-01-24 20:25:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2008-2013 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -247,10 +247,10 @@
 	 int32_t const x, int32_t const y, int32_t const w, int32_t const h)
 :
 UI::Panel (parent, x, y, w, h),
-m_plotmode(PLOTMODE_ABSOLUTE),
-m_sample_rate(0),
-m_time    (TIME_GAME),
-m_game_time_id(0)
+plotmode_(PLOTMODE_ABSOLUTE),
+sample_rate_(0),
+time_    (TIME_GAME),
+game_time_id_(0)
 {}
 
 
@@ -258,15 +258,15 @@
 	uint32_t game_time = 0;
 
 	// Find running time of the game, based on the plot data
-	for (uint32_t plot = 0; plot < m_plotdata.size(); ++plot)
-		if (game_time < m_plotdata[plot].dataset->size() * m_sample_rate)
-			game_time = m_plotdata[plot].dataset->size() * m_sample_rate;
+	for (uint32_t plot = 0; plot < plotdata_.size(); ++plot)
+		if (game_time < plotdata_[plot].dataset->size() * sample_rate_)
+			game_time = plotdata_[plot].dataset->size() * sample_rate_;
 	return game_time;
 }
 
 std::vector<std::string> WuiPlotArea::get_labels() {
 	std::vector<std::string> labels;
-	for (int32_t i = 0; i < m_game_time_id; i++) {
+	for (int32_t i = 0; i < game_time_id_; i++) {
 		UNIT unit = get_suggested_unit(time_in_ms[i]);
 		uint32_t val = ms_to_unit(unit, time_in_ms[i]);
 		labels.push_back((boost::format(get_unit_name(unit)) % boost::lexical_cast<std::string>(val)).str());
@@ -276,7 +276,7 @@
 }
 
 uint32_t WuiPlotArea::get_plot_time() {
-	if (m_time == TIME_GAME) {
+	if (time_ == TIME_GAME) {
 		// Start with the game time
 		uint32_t time_ms = get_game_time();
 
@@ -297,7 +297,7 @@
 		}
 		return time_ms;
 	} else {
-		return time_in_ms[m_time];
+		return time_in_ms[time_];
 	}
 }
 
@@ -316,8 +316,8 @@
 	uint32_t i;
 	for (i = 1; i < 7 && time_in_ms[i] <= game_time; i++) {
 	}
-	m_game_time_id = i;
-	return m_game_time_id;
+	game_time_id_ = i;
+	return game_time_id_;
 }
 
 /*
@@ -331,22 +331,22 @@
 	draw_diagram(time_ms, get_inner_w(), get_inner_h(), xline_length, dst);
 
 	// How many do we take together when relative ploting
-	const int32_t how_many = calc_how_many(time_ms, m_sample_rate);
+	const int32_t how_many = calc_how_many(time_ms, sample_rate_);
 
 	uint32_t max = 0;
 	//  Find the maximum value.
-	if (m_plotmode == PLOTMODE_ABSOLUTE)  {
-		for (uint32_t i = 0; i < m_plotdata.size(); ++i)
-			if (m_plotdata[i].showplot) {
-				for (uint32_t l = 0; l < m_plotdata[i].dataset->size(); ++l)
-					if (max < (*m_plotdata[i].dataset)[l])
-						max = (*m_plotdata[i].dataset)[l];
+	if (plotmode_ == PLOTMODE_ABSOLUTE)  {
+		for (uint32_t i = 0; i < plotdata_.size(); ++i)
+			if (plotdata_[i].showplot) {