Merge lp:~widelands-dev/widelands/bug-986611-cppcheck-uninitialized-variables into lp:widelands

[GunChleoc]

Initialize a bunch of uninitialized member variables, adding constructors where necessary. Turned some enums into enum classes. Removed empty string initializations.

I'm on a code cleanup rampage today... this one needs a bit of looking at to make sure that I initialized everything correctly.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2356. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/246523458.
Appveyor build 2184. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_986611_cppcheck_uninitialized_variables-2184.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2391. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/247860909.
Appveyor build 2219. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_986611_cppcheck_uninitialized_variables-2219.

[Notabilis (notabilis27)]

Thanks for your efforts on cleaning up the code!

Most of this branch looks good to me, although I have a a few comments. The first two points should probably be fixed, the other ones are not so important.

Note that I haven't tried compiling or testing, I only looked at the code.

[Hans Joachim Desserud (hjd)]

I only checked a couple of the build logs, but the Travis errors seems to be due to packages failing to install. Is there an easy way to retrigger builds?

I haven't looked into the details of the changes, but it is great to see the amount of issues reduced. This seems to be the last branch in review now that should have a large impact on the cppcheck report. I'll keep an eye out for when it is merged, and upload a new report :)

[SirVer (sirver)]

review: Needs Fixing

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2391. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/247860909.
Appveyor build 2219. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_986611_cppcheck_uninitialized_variables-2219.

[GunChleoc (gunchleoc)]

Ready for the next round.

review: Needs Resubmitting

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2517. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/262810177.
Appveyor build 2341. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_986611_cppcheck_uninitialized_variables-2341.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2518. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/262995097.
Appveyor build 2342. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_986611_cppcheck_uninitialized_variables-2342.

[SirVer (sirver)]

3 nits about initializing std::string = "", otherwise lgtm. I think this can go in once you have a look at the nits.

review: Approve

[GunChleoc (gunchleoc)]

Well, it's just the same as initializing numbers to 0 - cppcheck is complaining, so I'm trying to get rid of that noise in the report.

The actual error message is:

src/game_io/game_preload_packet.h:38: (style) The struct 'GamePreloadPacket' does not have a constructor although it has private member variables. Member variables of builtin types are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior.

I then proceeded to create a constructor, and you then advised to directly initialize the variables.

The only way to test if this will shut up cppcheck is to run the full report again.

[SirVer (sirver)]

> Well, it's just the same as initializing numbers to 0 - cppcheck is complaining, so I'm trying to get rid of that noise in the report.

That would be wrong though - plain old datatypes (POD) are not initialized in cpp, so numbers are indeed a random value if not properly initialized. std::string is a class, not a POD though so its constructor is always run. If cppcheck complains about this it would be wrong. I wonder if it is worthwhile to clutter the code with unnecessary (and for std::string even slightly decremental) changes to appease the tool.

[GunChleoc (gunchleoc)]

I am currently running the report, which will probably take all day. I'll then run it again without the string init to see if it makes a difference.

I'll then revert any changes in this branch that won't fix the report.

[GunChleoc (gunchleoc)]

I have now gone through the code base and removed all empty string initializations. I also found a few more uninitialized variables in MapTriangleRegion.

If you agree with these changes, the branch will be ready.

review: Needs Resubmitting

[SirVer (sirver)]

lgtm.

@bunnybot merge

review: Approve

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2017-08-01 12:03:03 +0000
+++ src/ai/defaultai.cc	2017-08-16 05:11:06 +0000
@@ -6015,7 +6015,7 @@
 		}
 	}
 
-	std::string summary = "";
+	std::string summary;
 	for (const auto material : materials) {
 		uint32_t stock = calculate_stocklevel(material);
 		if (stock == 0) {
@@ -6109,7 +6109,7 @@
 		    persistent_data->least_military_score, persistent_data->ai_personality_mil_upper_limit,
 		    msites_in_constr(), static_cast<int8_t>(soldier_status_),
 		    player_statistics.get_modified_player_power(player_number()));
-	std::string wpolicy = "";
+	std::string wpolicy;
 	switch (wood_policy_) {
 	case WoodPolicy::kDismantleRangers:
 		wpolicy = "Dismantle rangers";

=== modified file 'src/ai/defaultai_warfare.cc'
--- src/ai/defaultai_warfare.cc	2017-07-05 00:26:07 +0000
+++ src/ai/defaultai_warfare.cc	2017-08-16 05:11:06 +0000
@@ -845,8 +845,8 @@
 			game().send_player_change_soldier_capacity(*ms, -1);
 			changed = true;
 		}
-		if (ms->get_soldier_preference() == MilitarySite::kPrefersRookies) {
-			game().send_player_militarysite_set_soldier_preference(*ms, MilitarySite::kPrefersHeroes);
+		if (ms->get_soldier_preference() == SoldierPreference::kRookies) {
+			game().send_player_militarysite_set_soldier_preference(*ms, SoldierPreference::kHeroes);
 			changed = true;
 		}
 	} else if (should_be_dismantled && can_be_dismantled) {
@@ -864,8 +864,8 @@
 			game().send_player_change_soldier_capacity(*ms, -1);
 			changed = true;
 		}
-		if (ms->get_soldier_preference() == MilitarySite::kPrefersHeroes) {
-			game().send_player_militarysite_set_soldier_preference(*ms, MilitarySite::kPrefersRookies);
+		if (ms->get_soldier_preference() == SoldierPreference::kHeroes) {
+			game().send_player_militarysite_set_soldier_preference(*ms, SoldierPreference::kRookies);
 			changed = true;
 		}
 	}

=== modified file 'src/base/i18n.cc'
--- src/base/i18n.cc	2017-06-24 11:18:12 +0000
+++ src/base/i18n.cc	2017-08-16 05:11:06 +0000
@@ -322,7 +322,7 @@
 }
 
 std::string localize_list(const std::vector<std::string>& items, ConcatenateWith listtype) {
-	std::string result = "";
+	std::string result;
 	for (std::vector<std::string>::const_iterator it = items.begin(); it != items.end(); ++it) {
 		if (it == items.begin()) {
 			result = *it;

=== modified file 'src/base/md5.h'
--- src/base/md5.h	2017-01-25 18:55:59 +0000
+++ src/base/md5.h	2017-08-16 05:11:06 +0000
@@ -75,14 +75,14 @@
 template <typename Base> class MD5Checksum : public Base {
 public:
 	MD5Checksum() {
-		Reset();
+		reset();
 	}
 	explicit MD5Checksum(const MD5Checksum& other)
 	   : Base(), can_handle_data(other.can_handle_data), sum(other.sum), ctx(other.ctx) {
 	}
 
 	/// Reset the checksumming machinery to its initial state.
-	void Reset() {
+	void reset() {
 		can_handle_data = 1;
 		ctx.A = 0x67452301;
 		ctx.B = 0xefcdab89;

=== modified file 'src/chat/CMakeLists.txt'
--- src/chat/CMakeLists.txt	2014-07-13 18:51:52 +0000
+++ src/chat/CMakeLists.txt	2017-08-16 05:11:06 +0000
@@ -3,5 +3,6 @@
     chat.h
     chat.cc
   DEPENDS
+    logic_constants
     notifications
 )

=== modified file 'src/chat/chat.h'
--- src/chat/chat.h	2017-01-25 18:55:59 +0000
+++ src/chat/chat.h	2017-08-16 05:11:06 +0000
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "logic/widelands.h"
 #include "notifications/note_ids.h"
 #include "notifications/notifications.h"
 
@@ -31,12 +32,15 @@
 struct ChatMessage {
 	CAN_BE_SENT_AS_NOTE(NoteId::ChatMessage)
 
+	ChatMessage(const std::string& message) : msg(message) {
+	}
+
 	// The (real-)time at which the message was received.
-	time_t time;
+	time_t time = std::time(nullptr);
 
 	// The playercolor. Used to colorize the senders name; negative numbers
 	// indicate system messages for which richtext is allowed.
-	int16_t playern;
+	int16_t playern = Widelands::neutral();
 
 	// A string identifying the sender of the message.
 	// This string is empty for system-generated messages.

=== modified file 'src/economy/shippingitem.h'
--- src/economy/shippingitem.h	2017-06-24 08:47:46 +0000
+++ src/economy/shippingitem.h	2017-08-16 05:11:06 +0000
@@ -63,7 +63,7 @@
 		ShippingItem get(MapObjectLoader& mol);
 
 	private:
-		uint32_t serial_;
+		uint32_t serial_ = 0U;
 	};
 
 	void save(EditorGameBase& egbase, MapObjectSaver& mos, FileWrite& fw);

=== modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h	2017-06-11 20:09:05 +0000
+++ src/editor/ui_menus/categorized_item_selection_menu.h	2017-08-16 05:11:06 +0000
@@ -175,7 +175,7 @@
 template <typename DescriptionType, typename ToolType>
 void CategorizedItemSelectionMenu<DescriptionType, ToolType>::update_label() {
 	current_selection_names_.set_size(tab_panel_.get_inner_w(), 20);
-	std::string buf = "";
+	std::string buf;
 	constexpr int max_string_size = 100;
 	int j = tool_->get_nr_enabled();
 	for (int i = 0; j && buf.size() < max_string_size; ++i) {

=== modified file 'src/game_io/game_preload_packet.h'
--- src/game_io/game_preload_packet.h	2017-01-25 18:55:59 +0000
+++ src/game_io/game_preload_packet.h	2017-08-16 05:11:06 +0000
@@ -78,12 +78,13 @@
 	std::string mapname_;
 	std::string background_;
 	std::string win_condition_;
-	uint32_t gametime_;
-	uint8_t player_nr_;  // The local player idx
-	uint8_t number_of_players_;
+	// Initializing everything to make cppcheck happy.
+	uint32_t gametime_ = 0U;
+	uint8_t player_nr_ = 0U;  // The local player idx
+	uint8_t number_of_players_ = 0U;
 	std::string version_;
-	time_t savetimestamp_;
-	GameController::GameType gametype_;
+	time_t savetimestamp_ = 0;
+	GameController::GameType gametype_ = GameController::GameType::kUndefined;
 };
 }
 

=== modified file 'src/graphic/gl/fields_to_draw.h'
--- src/graphic/gl/fields_to_draw.h	2017-05-13 18:48:26 +0000
+++ src/graphic/gl/fields_to_draw.h	2017-08-16 05:11:06 +0000
@@ -78,6 +78,8 @@
 	};
 
 	FieldsToDraw() {
+		// Initialize everything to make cppcheck happy.
+		reset(0, 0, 0, 0);
 	}
 
 	// Resize this fields to draw for reuse.

=== modified file 'src/graphic/graphic.h'
--- src/graphic/graphic.h	2017-05-10 09:43:20 +0000
+++ src/graphic/graphic.h	2017-08-16 05:11:06 +0000
@@ -99,8 +99,8 @@
 	void resolution_changed();
 
 	// The height & width of the window should we be in window mode.
-	int window_mode_width_;
-	int window_mode_height_;
+	int window_mode_width_ = 0;
+	int window_mode_height_ = 0;
 
 	/// This is the main screen Surface.
 	/// A RenderTarget for this can be retrieved with get_render_target()
@@ -109,11 +109,11 @@
 	/// This saves a copy of the screen SDL_Surface. This is needed for
 	/// opengl rendering as the SurfaceOpenGL does not use it. It allows
 	/// manipulation the screen context.
-	SDL_Window* sdl_window_;
+	SDL_Window* sdl_window_ = nullptr;
 	SDL_GLContext gl_context_;
 
 	/// The maximum width or height a texture can have.
-	int max_texture_size_;
+	int max_texture_size_ = kMinimumSizeForTextures;
 
 	/// A RenderTarget for screen_. This is initialized during init()
 	std::unique_ptr<RenderTarget> render_target_;

=== modified file 'src/graphic/render_queue.h'
--- src/graphic/render_queue.h	2017-01-25 18:55:59 +0000
+++ src/graphic/render_queue.h	2017-08-16 05:11:06 +0000
@@ -113,16 +113,14 @@
 	};
 
 	struct TerrainArguments {
-		TerrainArguments() {
-		}
-
-		int gametime;
-		int renderbuffer_width;
-		int renderbuffer_height;
-		const DescriptionMaintainer<Widelands::TerrainDescription>* terrains;
-		FieldsToDraw* fields_to_draw;
-		float scale;
-		Rectf destination_rect;
+		// Initialize everything to make cppcheck happy.
+		int gametime = 0;
+		int renderbuffer_width = 0;
+		int renderbuffer_height = 0;
+		const DescriptionMaintainer<Widelands::TerrainDescription>* terrains = nullptr;
+		FieldsToDraw* fields_to_draw = nullptr;
+		float scale = 1.f;
+		Rectf destination_rect = Rectf(0.f, 0.f, 0.f, 0.f);
 	};
 
 	// The union of all possible program arguments represents an Item that is

=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc	2017-06-25 21:55:39 +0000
+++ src/graphic/text/rt_render.cc	2017-08-16 05:11:06 +0000
@@ -702,7 +702,6 @@
 	     w_(w),
 	     h_(h),
 	     background_image_(nullptr),
-	     filename_(""),
 	     is_expanding_(expanding) {
 		check_size();
 	}
@@ -779,6 +778,8 @@
 	explicit DivTagRenderNode(NodeStyle& ns)
 	   : RenderNode(ns),
 	     desired_width_(),
+		  w_(0),
+		  h_(0),
 	     background_color_(0, 0, 0),
 	     is_background_color_set_(false),
 	     background_image_(nullptr) {
@@ -1262,7 +1263,6 @@
 	                 const UI::FontSets& fontsets)
 	   : TagHandler(tag, fc, ns, image_cache, init_renderer_style, fontsets),
 	     background_image_(nullptr),
-	     image_filename_(""),
 	     space_(0) {
 	}
 

=== modified file 'src/graphic/texture_atlas.h'
--- src/graphic/texture_atlas.h	2017-06-24 08:47:46 +0000
+++ src/graphic/texture_atlas.h	2017-08-16 05:11:06 +0000
@@ -81,7 +81,7 @@
 
 	struct Block {
 		Block(int init_index, const Image* init_texture)
-		   : index(init_index), texture(init_texture), done(false) {
+		   : index(init_index), texture(init_texture), node(nullptr), done(false) {
 		}
 
 		// The index in the order the blocks have been added.

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2017-01-25 18:55:59 +0000
+++ src/io/filesystem/filesystem.cc	2017-08-16 05:11:06 +0000
@@ -60,8 +60,6 @@
 #define PATH_MAX MAX_PATH
 #endif
 
-FileSystem::FileSystem() : root_("") {
-}
 
 /**
  * \param path A file or directory name

=== modified file 'src/io/filesystem/filesystem.h'
--- src/io/filesystem/filesystem.h	2017-07-02 19:21:56 +0000
+++ src/io/filesystem/filesystem.h	2017-08-16 05:11:06 +0000
@@ -132,7 +132,7 @@
 
 protected:
 	/// To get a filesystem, use the Create methods
-	FileSystem();
+	FileSystem() = default;
 
 	/// How to address the fs' topmost component (e.g. "" on Unix, "D:" on win32)
 	/// \warning This is should \e not contain filesep!

=== modified file 'src/logic/field.h'
--- src/logic/field.h	2017-01-25 18:55:59 +0000
+++ src/logic/field.h	2017-08-16 05:11:06 +0000
@@ -231,24 +231,24 @@
 	   Player_Number_Bitmask + Border_Bitmask;
 	static_assert(kMaxPlayers <= Player_Number_Bitmask, "Bitmask is too big.");
 
-	// Data Members
+	// Data Members. Initialize everything to make cppcheck happy.
 	/** linked list, \sa Bob::linknext_ */
-	Bob* bobs;
-	BaseImmovable* immovable;
-
-	uint8_t caps : 7;
-	uint8_t roads : 6;
-
-	Height height;
-	int8_t brightness;
-
-	OwnerInfoAndSelectionsType owner_info_and_selections;
-
-	DescriptionIndex resources;         ///< Resource type on this field, if any
-	ResourceAmount initial_res_amount;  ///< Initial amount of resources
-	ResourceAmount res_amount;          ///< Current amount of resources
-
-	Terrains terrains;
+	Bob* bobs = nullptr;
+	BaseImmovable* immovable = nullptr;
+
+	uint8_t caps = 0U;
+	uint8_t roads = 0U;
+
+	Height height = 0U;
+	int8_t brightness = 0;
+
+	OwnerInfoAndSelectionsType owner_info_and_selections = Widelands::neutral();
+
+	DescriptionIndex resources = INVALID_INDEX; ///< Resource type on this field, if any
+	ResourceAmount initial_res_amount = 0U;     ///< Initial amount of resources
+	ResourceAmount res_amount = 0U;             ///< Current amount of resources
+
+	Terrains terrains = Terrains{INVALID_INDEX, INVALID_INDEX};
 };
 #pragma pack(pop)
 

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2017-07-02 19:11:13 +0000
+++ src/logic/game.cc	2017-08-16 05:11:06 +0000
@@ -125,7 +125,8 @@
      state_(gs_notrunning),
      cmdqueue_(*this),
      /** TRANSLATORS: Win condition for this game has not been set. */
-     win_condition_displayname_(_("Not set")) {
+     win_condition_displayname_(_("Not set")),
+	  replay_(false) {
 }
 
 Game::~Game() {
@@ -134,7 +135,7 @@
 void Game::sync_reset() {
 	syncwrapper_.counter_ = 0;
 
-	synchash_.Reset();
+	synchash_.reset();
 	log("[sync] Reset\n");
 }
 
@@ -666,7 +667,7 @@
 }
 
 void Game::send_player_militarysite_set_soldier_preference(Building& building,
-                                                           uint8_t my_preference) {
+                                                           SoldierPreference my_preference) {
 	send_player_command(*new CmdMilitarySiteSetSoldierPreference(
 	   get_gametime(), building.owner().player_number(), building, my_preference));
 }

=== modified file 'src/logic/game.h'
--- src/logic/game.h	2017-06-23 17:23:04 +0000
+++ src/logic/game.h	2017-08-16 05:11:06 +0000
@@ -45,6 +45,7 @@
 struct PlayerImmovable;
 enum class IslandExploreDirection;
 enum class ScoutingDirection;
+enum class SoldierPreference : uint8_t;
 struct Ship;
 struct PlayerEndStatus;
 class TrainingSite;
@@ -183,7 +184,7 @@
 	void send_player_build_road(int32_t, Path&);
 	void send_player_flagaction(Flag&);
 	void send_player_start_stop_building(Building&);
-	void send_player_militarysite_set_soldier_preference(Building&, uint8_t preference);
+	void send_player_militarysite_set_soldier_preference(Building&, SoldierPreference preference);
 	void send_player_start_or_cancel_expedition(Building&);
 
 	void send_player_enhance_building(Building&, DescriptionIndex);

=== modified file 'src/logic/game_controller.h'
--- src/logic/game_controller.h	2017-06-05 07:33:18 +0000
+++ src/logic/game_controller.h	2017-08-16 05:11:06 +0000
@@ -42,10 +42,11 @@
 class GameController {
 public:
 	enum class GameType : uint8_t {
-		SINGLEPLAYER = 1,  // we don't want SINGLEPLAYER just because a value is empty
-		NETCLIENT,
-		NETHOST,
-		REPLAY
+		kUndefined = 0,
+		kSingleplayer,
+		kNetClient,
+		kNetHost,
+		kReplay
 	};
 
 	virtual ~GameController() {

=== modified file 'src/logic/game_settings.h'
--- src/logic/game_settings.h	2017-06-05 07:33:18 +0000
+++ src/logic/game_settings.h	2017-08-16 05:11:06 +0000
@@ -58,12 +58,12 @@
 	}
 
 	UserSettings(Widelands::PlayerEndResult init_result, bool init_ready)
-	   : position(0), name(""), result(init_result), win_condition_string(""), ready(init_ready) {
+	   : result(init_result), ready(init_ready) {
 	}
 	UserSettings() : UserSettings(Widelands::PlayerEndResult::kUndefined, false) {
 	}
 
-	uint8_t position;
+	uint8_t position = 0;
 	std::string name;
 	Widelands::PlayerEndResult result;
 	std::string win_condition_string;

=== modified file 'src/logic/map_objects/map_object.cc'
--- src/logic/map_objects/map_object.cc	2017-08-09 19:25:04 +0000
+++ src/logic/map_objects/map_object.cc	2017-08-16 05:11:06 +0000
@@ -218,9 +218,7 @@
                                const std::string& init_descname)
    : type_(init_type),
      name_(init_name),
-     descname_(init_descname),
-     representative_image_filename_(""),
-     icon_filename_("") {
+     descname_(init_descname) {
 }
 MapObjectDescr::MapObjectDescr(const MapObjectType init_type,
                                const std::string& init_name,

=== modified file 'src/logic/map_objects/tribes/battle.cc'
--- src/logic/map_objects/tribes/battle.cc	2017-06-02 08:14:40 +0000
+++ src/logic/map_objects/tribes/battle.cc	2017-08-16 05:11:06 +0000
@@ -57,9 +57,11 @@
    : MapObject(&g_battle_descr),
      first_(first_soldier),
      second_(second_soldier),
+	  creationtime_(0),
      readyflags_(0),
      damage_(0),
-     first_strikes_(true) {
+     first_strikes_(true),
+	  last_attack_hits_(false) {
 	assert(first_soldier->get_owner() != second_soldier->get_owner());
 	{
 		StreamWrite& ss = game.syncstream();

=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2017-07-05 19:21:57 +0000
+++ src/logic/map_objects/tribes/building.cc	2017-08-16 05:11:06 +0000
@@ -458,7 +458,7 @@
 }
 
 std::string Building::info_string(const InfoStringFormat& format) {
-	std::string result = "";
+	std::string result;
 	switch (format) {
 	case InfoStringFormat::kCensus:
 		if (upcast(ConstructionSite const, constructionsite, this)) {

=== modified file 'src/logic/map_objects/tribes/building.h'
--- src/logic/map_objects/tribes/building.h	2017-06-26 15:09:21 +0000
+++ src/logic/map_objects/tribes/building.h	2017-08-16 05:11:06 +0000
@@ -357,7 +357,6 @@
 	//  The player who has defeated this building.
 	PlayerNumber defeating_player_;
 
-	int32_t priority_;  // base priority
 	std::map<DescriptionIndex, int32_t> ware_priorities_;
 
 	/// Whether we see our vision_range area based on workers in the building

=== modified file 'src/logic/map_objects/tribes/militarysite.cc'
--- src/logic/map_objects/tribes/militarysite.cc	2017-06-24 20:22:19 +0000
+++ src/logic/map_objects/tribes/militarysite.cc	2017-08-16 05:11:06 +0000
@@ -343,7 +343,7 @@
      didconquer_(false),
      capacity_(ms_descr.get_max_number_of_soldiers()),
      nexthealtime_(0),
-     soldier_preference_(ms_descr.prefers_heroes_at_start_ ? kPrefersHeroes : kPrefersRookies),
+     soldier_preference_(ms_descr.prefers_heroes_at_start_ ? SoldierPreference::kHeroes : SoldierPreference::kRookies),
      soldier_upgrade_try_(false),
      doing_upgrade_request_(false) {
 	next_swap_soldiers_time_ = 0;
@@ -470,7 +470,7 @@
 
 Soldier* MilitarySite::find_least_suited_soldier() {
 	const std::vector<Soldier*> present = soldier_control_.present_soldiers();
-	const int32_t multiplier = kPrefersHeroes == soldier_preference_ ? -1 : 1;
+	const int32_t multiplier = SoldierPreference::kHeroes == soldier_preference_ ? -1 : 1;
 	int worst_soldier_level = INT_MIN;
 	Soldier* worst_soldier = nullptr;
 	for (Soldier* sld : present) {
@@ -509,9 +509,9 @@
 		if (nullptr != newguy && nullptr != kickoutCandidate) {
 			int32_t old_level = kickoutCandidate->get_level(TrainingAttribute::kTotal);
 			int32_t new_level = newguy->get_level(TrainingAttribute::kTotal);
-			if (kPrefersHeroes == soldier_preference_ && old_level >= new_level) {
+			if (SoldierPreference::kHeroes == soldier_preference_ && old_level >= new_level) {
 				return false;
-			} else if (kPrefersRookies == soldier_preference_ && old_level <= new_level) {
+			} else if (SoldierPreference::kRookies == soldier_preference_ && old_level <= new_level) {
 				return false;
 			}
 		}
@@ -833,7 +833,7 @@
 
 	// feature request 1247384 in launchpad bugs: Conquered buildings tend to
 	// be in a hostile area; typically players want heroes there.
-	set_soldier_preference(kPrefersHeroes);
+	set_soldier_preference(SoldierPreference::kHeroes);
 }
 
 /// Calculates whether the military presence is still kept and \returns true if.
@@ -935,13 +935,6 @@
 	int32_t soldier_upgrade_required_min = soldier_upgrade_requirements_.get_min();
 	int32_t soldier_upgrade_required_max = soldier_upgrade_requirements_.get_max();
 
-	if (kPrefersHeroes != soldier_preference_ && kPrefersRookies != soldier_preference_) {
-		log(
-		   "MilitarySite::swapSoldiers: error: Unknown player preference %d.\n", soldier_preference_);
-		soldier_upgrade_try_ = false;
-		return false;
-	}
-
 	// Find the level of the soldier that is currently least-suited.
 	Soldier* worst_guy = find_least_suited_soldier();
 	if (worst_guy == nullptr) {
@@ -953,7 +946,7 @@
 	// Micro-optimization: I assume that the majority of military sites have only level-zero
 	// soldiers and prefer rookies. Handle them separately.
 	soldier_upgrade_try_ = true;
-	if (kPrefersRookies == soldier_preference_) {
+	if (SoldierPreference::kRookies == soldier_preference_) {
 		if (0 == wg_level) {
 			soldier_upgrade_try_ = false;
 			return false;
@@ -961,8 +954,8 @@
 	}
 
 	// Now I actually build the new requirements.
-	int32_t reqmin = kPrefersHeroes == soldier_preference_ ? 1 + wg_level : 0;
-	int32_t reqmax = kPrefersHeroes == soldier_preference_ ? SHRT_MAX : wg_level - 1;
+	int32_t reqmin = SoldierPreference::kHeroes == soldier_preference_ ? 1 + wg_level : 0;
+	int32_t reqmax = SoldierPreference::kHeroes == soldier_preference_ ? SHRT_MAX : wg_level - 1;
 
 	bool maxchanged = reqmax != soldier_upgrade_required_max;
 	bool minchanged = reqmin != soldier_upgrade_required_min;
@@ -981,8 +974,7 @@
 
 // setters
 
-void MilitarySite::set_soldier_preference(MilitarySite::SoldierPreference p) {
-	assert(kPrefersHeroes == p || kPrefersRookies == p);
+void MilitarySite::set_soldier_preference(SoldierPreference p) {
 	soldier_preference_ = p;
 	next_swap_soldiers_time_ = 0;
 }

=== modified file 'src/logic/map_objects/tribes/militarysite.h'
--- src/logic/map_objects/tribes/militarysite.h	2017-06-25 19:12:30 +0000
+++ src/logic/map_objects/tribes/militarysite.h	2017-08-16 05:11:06 +0000
@@ -34,6 +34,13 @@
 class Soldier;
 class World;
 
+// I assume elsewhere, that enum SoldierPreference fits to uint8_t.
+enum class SoldierPreference : uint8_t {
+	kNotSet, // For savegame compatibility only.
+	kRookies,
+	kHeroes,
+};
+
 class MilitarySiteDescr : public BuildingDescr {
 public:
 	MilitarySiteDescr(const std::string& init_descname,
@@ -73,13 +80,6 @@
 	MO_DESCR(MilitarySiteDescr)
 
 public:
-	// I assume elsewhere, that enum SoldierPreference fits to uint8_t.
-	enum SoldierPreference : uint8_t {
-		kNoPreference,
-		kPrefersRookies,
-		kPrefersHeroes,
-	};
-
 	explicit MilitarySite(const MilitarySiteDescr&);
 	virtual ~MilitarySite();
 

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2017-06-24 20:22:19 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2017-08-16 05:11:06 +0000
@@ -537,7 +537,7 @@
 		std::string condition_string =
 		   i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 
-		std::string result_string = "";
+		std::string result_string;
 		if (result_ == Failed) {
 			/** TRANSLATORS: "Did not start working because the economy needs the ware ‘%s’" */
 			result_string = (boost::format(_("Did not start %1$s because %2$s")) %

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2017-06-23 16:16:28 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2017-08-16 05:11:06 +0000
@@ -65,10 +65,6 @@
                                          const LuaTable& table,
                                          const EditorGameBase& egbase)
    : BuildingDescr(init_descname, init_type, table, egbase),
-     out_of_resource_title_(""),
-     out_of_resource_heading_(""),
-     out_of_resource_message_(""),
-     resource_not_needed_message_(""),
      out_of_resource_productivity_threshold_(100) {
 	i18n::Textdomain td("tribes");
 	std::unique_ptr<LuaTable> items_table;
@@ -241,8 +237,7 @@
      last_stat_percent_(0),
      crude_percent_(0),
      is_stopped_(false),
-     default_anim_("idle"),
-     production_result_("") {
+     default_anim_("idle") {
 	calc_statistics();
 }
 

=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2017-08-09 19:25:04 +0000
+++ src/logic/map_objects/tribes/ship.cc	2017-08-16 05:11:06 +0000
@@ -967,7 +967,7 @@
 	Bob::draw(egbase, draw_text, field_on_dst, scale, dst);
 
 	// Show ship name and current activity
-	std::string statistics_string = "";
+	std::string statistics_string;
 	if (draw_text & TextToDraw::kStatistics) {
 		switch (ship_state_) {
 		case (ShipStates::kTransport):
@@ -1083,9 +1083,6 @@
 
 constexpr uint8_t kCurrentPacketVersion = 6;
 
-Ship::Loader::Loader() : lastdock_(0), destination_(0) {
-}
-
 const Bob::Task* Ship::Loader::get_task(const std::string& name) {
 	if (name == "shipidle" || name == "ship")
 		return &taskShip;

=== modified file 'src/logic/map_objects/tribes/ship.h'
--- src/logic/map_objects/tribes/ship.h	2017-06-24 08:47:46 +0000
+++ src/logic/map_objects/tribes/ship.h	2017-08-16 05:11:06 +0000
@@ -295,7 +295,6 @@
 	// saving and loading
 protected:
 	struct Loader : Bob::Loader {
-		Loader();
 
 		const Task* get_task(const std::string& name) override;
 
@@ -304,9 +303,10 @@
 		void load_finish() override;
 
 	private:
-		uint32_t lastdock_;
-		uint32_t destination_;
-		ShipStates ship_state_;
+		// Initialize everything to make cppcheck happy.
+		uint32_t lastdock_ = 0U;
+		uint32_t destination_ = 0U;
+		ShipStates ship_state_ = ShipStates::kTransport;
 		std::string shipname_;
 		std::unique_ptr<Expedition> expedition_;
 		std::vector<ShippingItem::Loader> items_;

=== modified file 'src/logic/map_objects/world/critter_program.h'
--- src/logic/map_objects/world/critter_program.h	2017-06-24 08:47:46 +0000
+++ src/logic/map_objects/world/critter_program.h	2017-08-16 05:11:06 +0000
@@ -33,8 +33,8 @@
 	};
 
 	CritterExecuteActionFn function;
-	int32_t iparam1;
-	int32_t iparam2;
+	int32_t iparam1 = 0;
+	int32_t iparam2 = 0;
 	std::string sparam1;
 
 	std::vector<std::string> sparamv;

=== modified file 'src/logic/map_objects/world/map_gen.cc'
--- src/logic/map_objects/world/map_gen.cc	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/world/map_gen.cc	2017-08-16 05:11:06 +0000
@@ -36,8 +36,8 @@
 }
 
 const MapGenBobCategory*
-MapGenLandResource::get_bob_category(MapGenAreaInfo::MapGenTerrainType terrType) const {
-	switch (terrType) {
+MapGenLandResource::get_bob_category(MapGenAreaInfo::MapGenTerrainType terrain_type) const {
+	switch (terrain_type) {
 	case MapGenAreaInfo::ttLandCoast:
 		return land_coast_bob_category_;
 	case MapGenAreaInfo::ttLandLand:
@@ -59,20 +59,20 @@
 	NEVER_HERE();
 }
 
-MapGenLandResource::MapGenLandResource(const LuaTable& table, MapGenInfo& mapGenInfo) {
+MapGenLandResource::MapGenLandResource(const LuaTable& table, MapGenInfo& map_gen_info) {
 	weight_ = get_uint(table, "weight");
 
 	immovable_density_ = static_cast<uint8_t>(get_uint(table, "immovable_density"));
 	critter_density_ = static_cast<uint8_t>(get_uint(table, "critter_density"));
 
-	const auto do_assign = [&table, &mapGenInfo](
+	const auto do_assign = [&table, &map_gen_info](
 	   const std::string& key, const MapGenBobCategory** our_pointer) {
 		const std::string value = table.get_string(key);
 		if (value.empty()) {
 			*our_pointer = nullptr;
 			return;
 		}
-		*our_pointer = mapGenInfo.get_bob_category(value);
+		*our_pointer = map_gen_info.get_bob_category(value);
 	};
 
 	do_assign("land_coast_bobs", &land_coast_bob_category_);
@@ -84,7 +84,7 @@
 
 MapGenAreaInfo::MapGenAreaInfo(const LuaTable& table,
                                const World& world,
-                               MapGenAreaType const areaType) {
+                               MapGenAreaType const area_type) {
 	weight_ = get_positive_int(table, "weight");
 
 	const auto read_terrains = [this, &table, &world](
@@ -97,7 +97,7 @@
 		}
 	};
 
-	switch (areaType) {
+	switch (area_type) {
 	case atWater:
 		read_terrains("ocean_terrains", &terrains1_);
 		read_terrains("shelf_terrains", &terrains2_);
@@ -120,8 +120,8 @@
 	}
 }
 
-size_t MapGenAreaInfo::get_num_terrains(MapGenTerrainType const terrType) const {
-	switch (terrType) {
+size_t MapGenAreaInfo::get_num_terrains(MapGenTerrainType const terrain_type) const {
+	switch (terrain_type) {
 	case ttWaterOcean:
 		return terrains1_.size();
 	case ttWaterShelf:
@@ -151,9 +151,9 @@
 	NEVER_HERE();
 }
 
-DescriptionIndex MapGenAreaInfo::get_terrain(MapGenTerrainType const terrType,
+DescriptionIndex MapGenAreaInfo::get_terrain(MapGenTerrainType const terrain_type,
                                              uint32_t const index) const {
-	switch (terrType) {
+	switch (terrain_type) {
 	case ttWaterOcean:
 		return terrains1_[index];
 	case ttWaterShelf:
@@ -217,8 +217,8 @@
 	return sum_bob_area_weights_;
 }
 
-size_t MapGenInfo::get_num_areas(MapGenAreaInfo::MapGenAreaType const areaType) const {
-	switch (areaType) {
+size_t MapGenInfo::get_num_areas(MapGenAreaInfo::MapGenAreaType const area_type) const {
+	switch (area_type) {
 	case MapGenAreaInfo::atWater:
 		return water_areas_.size();
 	case MapGenAreaInfo::atLand:
@@ -231,9 +231,9 @@
 	NEVER_HERE();
 }
 
-const MapGenAreaInfo& MapGenInfo::get_area(MapGenAreaInfo::MapGenAreaType const areaType,
+const MapGenAreaInfo& MapGenInfo::get_area(MapGenAreaInfo::MapGenAreaType const area_type,
                                            uint32_t const index) const {
-	switch (areaType) {
+	switch (area_type) {
 	case MapGenAreaInfo::atWater:
 		return water_areas_.at(index);
 	case MapGenAreaInfo::atLand:
@@ -246,12 +246,12 @@
 	NEVER_HERE();
 }
 
-const MapGenBobCategory* MapGenInfo::get_bob_category(const std::string& bobCategory) const {
-	if (bob_categories_.find(bobCategory) == bob_categories_.end())
-		throw wexception("invalid MapGenBobCategory %s", bobCategory.c_str());
+const MapGenBobCategory* MapGenInfo::get_bob_category(const std::string& bob_category) const {
+	if (bob_categories_.find(bob_category) == bob_categories_.end())
+		throw wexception("invalid MapGenBobCategory %s", bob_category.c_str());
 	// Ugly workaround because at is not defined for some systems
 	// and operator[] does not fare well with constants
-	return &bob_categories_.find(bobCategory)->second;
+	return &bob_categories_.find(bob_category)->second;
 }
 
 MapGenInfo::MapGenInfo(const LuaTable& table, const World& world) {

=== modified file 'src/logic/map_objects/world/map_gen.h'
--- src/logic/map_objects/world/map_gen.h	2017-06-24 08:47:46 +0000
+++ src/logic/map_objects/world/map_gen.h	2017-08-16 05:11:06 +0000
@@ -55,10 +55,10 @@
 		ttMountainsSnow
 	};
 
-	MapGenAreaInfo(const LuaTable& table, const World& world, MapGenAreaType areaType);
+	MapGenAreaInfo(const LuaTable& table, const World& world, MapGenAreaType area_type);
 
 	size_t get_num_terrains(MapGenTerrainType) const;
-	DescriptionIndex get_terrain(MapGenTerrainType terrType, uint32_t index) const;
+	DescriptionIndex get_terrain(MapGenTerrainType terrain_type, uint32_t index) const;
 	uint32_t get_weight() const {
 		return weight_;
 	}
@@ -69,7 +69,6 @@
 	std::vector<DescriptionIndex> terrains3_;  //  shallow, upper, snow
 
 	uint32_t weight_;
-	MapGenAreaType areaType_;
 };
 
 struct MapGenBobCategory {
@@ -95,12 +94,12 @@
 };
 
 struct MapGenLandResource {
-	MapGenLandResource(const LuaTable& table, MapGenInfo& mapGenInfo);
+	MapGenLandResource(const LuaTable& table, MapGenInfo& map_gen_info);
 
 	uint32_t get_weight() const {
 		return weight_;
 	}
-	const MapGenBobCategory* get_bob_category(MapGenAreaInfo::MapGenTerrainType terrType) const;
+	const MapGenBobCategory* get_bob_category(MapGenAreaInfo::MapGenTerrainType terrain_type) const;
 
 	uint8_t get_immovable_density() const {
 		return immovable_density_;
@@ -128,9 +127,9 @@
 struct MapGenInfo {
 	MapGenInfo(const LuaTable& table, const World& world);
 
-	size_t get_num_areas(MapGenAreaInfo::MapGenAreaType areaType) const;
-	const MapGenAreaInfo& get_area(MapGenAreaInfo::MapGenAreaType areaType, uint32_t index) const;
-	const MapGenBobCategory* get_bob_category(const std::string& bobCategory) const;
+	size_t get_num_areas(MapGenAreaInfo::MapGenAreaType area_type) const;
+	const MapGenAreaInfo& get_area(MapGenAreaInfo::MapGenAreaType area_type, uint32_t index) const;
+	const MapGenBobCategory* get_bob_category(const std::string& bob_category) const;
 
 	uint8_t get_water_ocean_height() const {
 		return ocean_height_;

=== modified file 'src/logic/maptriangleregion.h'
--- src/logic/maptriangleregion.h	2017-01-25 18:55:59 +0000
+++ src/logic/maptriangleregion.h	2017-08-16 05:11:06 +0000
@@ -103,9 +103,9 @@
 private:
 	Area<TCoords<FCoords>> area_;
 	FCoords left_;
-	uint16_t rowwidth_;
-	uint16_t remaining_in_row_;
-	uint16_t remaining_rows_;
+	uint16_t rowwidth_ = 0;
+	uint16_t remaining_in_row_ = 0;
+	uint16_t remaining_rows_ = 0;
 };
 template <typename CoordsType> struct MapTriangleRegion<TCoords<CoordsType>> {
 	MapTriangleRegion(const Map&, Area<TCoords<CoordsType>, uint16_t>);
@@ -117,11 +117,11 @@
 	bool advance(const Map&);
 
 private:
-	const bool radius_is_odd_;
-	enum { Top, Upper, Lower, Bottom } phase_;
-	uint16_t remaining_rows_in_upper_phase_;
-	uint16_t remaining_rows_in_lower_phase_;
-	uint16_t row_length_, remaining_in_row_;
+	const bool radius_is_odd_ = false;
+	enum { Top, Upper, Lower, Bottom } phase_ = Top;
+	uint16_t remaining_rows_in_upper_phase_ = 0U;
+	uint16_t remaining_rows_in_lower_phase_ = 0U;
+	uint16_t row_length_, remaining_in_row_ = 0U;
 	CoordsType left_;
 	TCoords<CoordsType> location_;
 };

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2017-07-02 21:00:58 +0000
+++ src/logic/player.cc	2017-08-16 05:11:06 +0000
@@ -136,7 +136,6 @@
      fields_(nullptr),
      allowed_worker_types_(the_egbase.tribes().nrworkers(), true),
      allowed_building_types_(the_egbase.tribes().nrbuildings(), true),
-     ai_(""),
      current_produced_statistics_(the_egbase.tribes().nrwares()),
      current_consumed_statistics_(the_egbase.tribes().nrwares()),
      ware_productions_(the_egbase.tribes().nrwares()),
@@ -653,11 +652,10 @@
 }
 
 void Player::military_site_set_soldier_preference(PlayerImmovable& imm,
-                                                  uint8_t soldier_preference) {
+                                                  SoldierPreference soldier_preference) {
 	if (&imm.owner() == this)
 		if (upcast(MilitarySite, milsite, &imm))
-			milsite->set_soldier_preference(
-			   static_cast<MilitarySite::SoldierPreference>(soldier_preference));
+			milsite->set_soldier_preference(soldier_preference);
 }
 
 /*

=== modified file 'src/logic/player.h'
--- src/logic/player.h	2017-07-05 19:21:57 +0000
+++ src/logic/player.h	2017-08-16 05:11:06 +0000
@@ -507,7 +507,7 @@
 	void bulldoze(PlayerImmovable&, bool recurse = false);
 	void flagaction(Flag&);
 	void start_stop_building(PlayerImmovable&);
-	void military_site_set_soldier_preference(PlayerImmovable&, uint8_t soldier_preference);
+	void military_site_set_soldier_preference(PlayerImmovable&, SoldierPreference soldier_preference);
 	void start_or_cancel_expedition(Warehouse&);
 	void enhance_building(Building*, DescriptionIndex index_of_new_building);
 	void dismantle_building(Building*);

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2017-06-24 08:18:11 +0000
+++ src/logic/playercommand.cc	2017-08-16 05:11:06 +0000
@@ -29,8 +29,6 @@
 #include "io/streamwrite.h"
 #include "logic/game.h"
 #include "logic/map_objects/map_object.h"
-#include "logic/map_objects/tribes/militarysite.h"
-#include "logic/map_objects/tribes/ship.h"
 #include "logic/map_objects/tribes/soldier.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/player.h"
@@ -506,14 +504,14 @@
 CmdMilitarySiteSetSoldierPreference::CmdMilitarySiteSetSoldierPreference(StreamRead& des)
    : PlayerCommand(0, des.unsigned_8()) {
 	serial = des.unsigned_32();
-	preference = des.unsigned_8();
+	preference = static_cast<Widelands::SoldierPreference>(des.unsigned_8());
 }
 
 void CmdMilitarySiteSetSoldierPreference::serialize(StreamWrite& ser) {
 	ser.unsigned_8(PLCMD_MILITARYSITESETSOLDIERPREFERENCE);
 	ser.unsigned_8(sender());
 	ser.unsigned_32(serial);
-	ser.unsigned_8(preference);
+	ser.unsigned_8(static_cast<uint8_t>(preference));
 }
 
 void CmdMilitarySiteSetSoldierPreference::execute(Game& game) {
@@ -531,7 +529,7 @@
 	// Write base classes
 	PlayerCommand::write(fw, egbase, mos);
 
-	fw.unsigned_8(preference);
+	fw.unsigned_8(static_cast<uint8_t>(preference));
 
 	// Now serial.
 	fw.unsigned_32(mos.get_object_file_index_or_zero(egbase.objects().get_object(serial)));
@@ -544,7 +542,7 @@
 		const uint16_t packet_version = fr.unsigned_16();
 		if (packet_version == kCurrentPacketVersionSoldierPreference) {
 			PlayerCommand::read(fr, egbase, mol);
-			preference = fr.unsigned_8();
+			preference = static_cast<Widelands::SoldierPreference>(fr.unsigned_8());
 			serial = get_object_serial_or_zero<MilitarySite>(fr.unsigned_32(), mol);
 		} else {
 			throw UnhandledVersionError("CmdMilitarySiteSetSoldierPreference", packet_version,

=== modified file 'src/logic/playercommand.h'
--- src/logic/playercommand.h	2017-07-02 19:11:13 +0000
+++ src/logic/playercommand.h	2017-08-16 05:11:06 +0000
@@ -24,6 +24,7 @@
 
 #include "economy/flag.h"
 #include "logic/cmd_queue.h"
+#include "logic/map_objects/tribes/militarysite.h"
 #include "logic/map_objects/tribes/ship.h"
 #include "logic/map_objects/tribes/trainingsite.h"
 #include "logic/map_objects/tribes/warehouse.h"
@@ -218,12 +219,12 @@
 };
 
 struct CmdMilitarySiteSetSoldierPreference : public PlayerCommand {
-	CmdMilitarySiteSetSoldierPreference() : PlayerCommand(), serial(0) {
+	CmdMilitarySiteSetSoldierPreference() : PlayerCommand(), serial(0), preference(SoldierPreference::kRookies) {
 	}  // For savegame loading
 	CmdMilitarySiteSetSoldierPreference(const uint32_t t,
 	                                    const PlayerNumber p,
 	                                    Building& b,
-	                                    uint8_t prefs)
+	                                    SoldierPreference prefs)
 	   : PlayerCommand(t, p), serial(b.serial()), preference(prefs) {
 	}
 
@@ -241,7 +242,7 @@
 
 private:
 	Serial serial;
-	uint8_t preference;
+	Widelands::SoldierPreference preference;
 };
 struct CmdStartOrCancelExpedition : public PlayerCommand {
 	CmdStartOrCancelExpedition() : PlayerCommand() {
@@ -343,7 +344,7 @@
 };
 
 struct CmdShipScoutDirection : public PlayerCommand {
-	CmdShipScoutDirection() : PlayerCommand(), serial(0) {
+	CmdShipScoutDirection() : PlayerCommand(), serial(0), dir(WalkingDir::IDLE) {
 	}  // For savegame loading
 	CmdShipScoutDirection(uint32_t const t, PlayerNumber const p, Serial s, WalkingDir direction)
 	   : PlayerCommand(t, p), serial(s), dir(direction) {
@@ -391,7 +392,7 @@
 };
 
 struct CmdShipExploreIsland : public PlayerCommand {
-	CmdShipExploreIsland() : PlayerCommand(), serial(0) {
+	CmdShipExploreIsland() : PlayerCommand(), serial(0), island_explore_direction(IslandExploreDirection::kNotSet) {
 	}  // For savegame loading
 	CmdShipExploreIsland(uint32_t const t,
 	                     PlayerNumber const p,

=== modified file 'src/logic/replay_game_controller.cc'
--- src/logic/replay_game_controller.cc	2017-05-14 18:17:16 +0000
+++ src/logic/replay_game_controller.cc	2017-08-16 05:11:06 +0000
@@ -72,7 +72,7 @@
 }
 
 GameController::GameType ReplayGameController::get_game_type() {
-	return GameController::GameType::REPLAY;
+	return GameController::GameType::kReplay;
 }
 
 uint32_t ReplayGameController::real_speed() {

=== modified file 'src/logic/save_handler.cc'
--- src/logic/save_handler.cc	2017-08-09 19:25:04 +0000
+++ src/logic/save_handler.cc	2017-08-16 05:11:06 +0000
@@ -46,7 +46,6 @@
      allow_saving_(true),
      save_requested_(false),
      saving_next_tick_(false),
-     save_filename_(""),
      autosave_filename_("wl_autosave"),
      fs_type_(FileSystem::ZIP),
      autosave_interval_in_ms_(kDefaultAutosaveInterval * 60 * 1000),

=== modified file 'src/logic/single_player_game_controller.cc'
--- src/logic/single_player_game_controller.cc	2017-03-03 11:19:16 +0000
+++ src/logic/single_player_game_controller.cc	2017-08-16 05:11:06 +0000
@@ -84,7 +84,7 @@
 }
 
 GameController::GameType SinglePlayerGameController::get_game_type() {
-	return GameController::GameType::SINGLEPLAYER;
+	return GameController::GameType::kSingleplayer;
 }
 
 uint32_t SinglePlayerGameController::real_speed() {

=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc	2017-06-25 13:18:49 +0000
+++ src/map_io/map_buildingdata_packet.cc	2017-08-16 05:11:06 +0000
@@ -63,7 +63,7 @@
 constexpr uint16_t kCurrentPacketPFBuilding = 1;
 // Responsible for warehouses and expedition bootstraps
 constexpr uint16_t kCurrentPacketVersionWarehouse = 7;
-constexpr uint16_t kCurrentPacketVersionMilitarysite = 5;
+constexpr uint16_t kCurrentPacketVersionMilitarysite = 6;
 constexpr uint16_t kCurrentPacketVersionProductionsite = 6;
 constexpr uint16_t kCurrentPacketVersionTrainingsite = 5;
 
@@ -464,7 +464,7 @@
                                               MapObjectLoader& mol) {
 	try {
 		uint16_t const packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersionMilitarysite) {
+		if (packet_version >= 5 && packet_version <= kCurrentPacketVersionMilitarysite) {
 			militarysite.normal_soldier_request_.reset();
 
 			if (fr.unsigned_8()) {
@@ -506,7 +506,11 @@
 			militarysite.soldier_upgrade_requirements_ =
 			   RequireAttribute(TrainingAttribute::kTotal, reqmin, reqmax);
 			militarysite.soldier_preference_ =
-			   static_cast<MilitarySite::SoldierPreference>(fr.unsigned_8());
+			   static_cast<SoldierPreference>(fr.unsigned_8());
+			// TODO(GunChleoc): Savegame compatibility, remove kNotSet after Build 20.
+			if (militarysite.soldier_preference_ == SoldierPreference::kNotSet) {
+				militarysite.soldier_preference_ = SoldierPreference::kRookies;
+			}
 			militarysite.next_swap_soldiers_time_ = fr.signed_32();
 			militarysite.soldier_upgrade_try_ = 0 != fr.unsigned_8() ? true : false;
 			militarysite.doing_upgrade_request_ = 0 != fr.unsigned_8() ? true : false;
@@ -1083,7 +1087,7 @@
 	}
 	fw.unsigned_16(militarysite.soldier_upgrade_requirements_.get_min());
 	fw.unsigned_16(militarysite.soldier_upgrade_requirements_.get_max());
-	fw.unsigned_8(militarysite.soldier_preference_);
+	fw.unsigned_8(static_cast<uint8_t>(militarysite.soldier_preference_));
 	fw.signed_32(militarysite.next_swap_soldiers_time_);
 	fw.unsigned_8(militarysite.soldier_upgrade_try_ ? 1 : 0);
 	fw.unsigned_8(militarysite.doing_upgrade_request_ ? 1 : 0);

=== modified file 'src/map_io/map_elemental_packet.cc'
--- src/map_io/map_elemental_packet.cc	2017-01-25 18:55:59 +0000
+++ src/map_io/map_elemental_packet.cc	2017-08-16 05:11:06 +0000
@@ -33,6 +33,7 @@
 constexpr int32_t kEightPlayersPacketVersion = 1;
 constexpr int32_t kSixteenPlayersPacketVersion = 2;
 
+
 void MapElementalPacket::pre_read(FileSystem& fs, Map* map) {
 	Profile prof;
 	prof.read("elemental", nullptr, fs);
@@ -147,7 +148,7 @@
 		   prof.create_section((boost::format("teams%02d") % counter++).str().c_str());
 		int lineup_counter = 0;
 		for (Widelands::Map::SuggestedTeam team : lineup) {
-			std::string section_contents = "";
+			std::string section_contents;
 			for (std::vector<PlayerNumber>::const_iterator it = team.begin(); it != team.end(); ++it) {
 				if (it == team.begin()) {
 					section_contents = (boost::format("%d") % static_cast<unsigned int>(*it)).str();

=== modified file 'src/map_io/map_elemental_packet.h'
--- src/map_io/map_elemental_packet.h	2017-01-25 18:55:59 +0000
+++ src/map_io/map_elemental_packet.h	2017-08-16 05:11:06 +0000
@@ -35,6 +35,8 @@
  * like number of players, map size, world name, magic bytes and so on
  */
 struct MapElementalPacket {
+	MapElementalPacket() = default;
+
 	void read(FileSystem&, EditorGameBase&, bool, MapObjectLoader&);
 	void write(FileSystem&, EditorGameBase&, MapObjectSaver&);
 
@@ -54,7 +56,7 @@
 
 private:
 	std::string old_world_name_;
-	uint32_t version_;
+	uint32_t version_ = 0;
 };
 }
 

=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2017-08-12 16:57:43 +0000
+++ src/map_io/s2map.cc	2017-08-16 05:11:06 +0000
@@ -212,11 +212,11 @@
 
 std::string get_world_name(S2MapLoader::WorldType world) {
 	switch (world) {
-	case S2MapLoader::GREENLAND:
+	case S2MapLoader::WorldType::kGreenland:
 		return "greenland";
-	case S2MapLoader::BLACKLAND:
+	case S2MapLoader::WorldType::kBlackland:
 		return "blackland";
-	case S2MapLoader::WINTERLAND:
+	case S2MapLoader::WorldType::kWinterland:
 		return "winterland";
 	}
 	NEVER_HERE();
@@ -244,18 +244,18 @@
    : world_legacy_lookup_table_(lookup_table),
      world_(world),
      table_{std::make_pair(
-               S2MapLoader::GREENLAND,
+               S2MapLoader::WorldType::kGreenland,
                std::vector<std::string>{
                   "summer_steppe", "summer_mountain1", "summer_snow", "summer_swamp",
                   "summer_beach", "summer_water", "summer_meadow1", "summer_meadow2",
                   "summer_meadow3", "summer_mountain2", "summer_mountain3", "summer_mountain4",
                   "summer_steppe_barren", "summer_meadow4", "lava", "summer_mountain_meadow"}),
-            std::make_pair(S2MapLoader::BLACKLAND,
+            std::make_pair(S2MapLoader::WorldType::kBlackland,
                            std::vector<std::string>{
                               "ashes", "mountain1", "lava-stone1", "lava-stone2", "strand", "water",
                               "hardground1", "hardground2", "hardground3", "mountain2", "mountain3",
                               "mountain4", "ashes2", "hardground4", "lava", "hardlava"}),
-            std::make_pair(S2MapLoader::WINTERLAND,
+            std::make_pair(S2MapLoader::WorldType::kWinterland,
                            std::vector<std::string>{
                               "tundra", "mountain1", "ice_flows", "ice_flows2", "ice", "water",
                               "tundra_taiga", "tundra2", "tundra3", "mountain2", "mountain3",
@@ -338,7 +338,7 @@
 }  // namespace
 
 S2MapLoader::S2MapLoader(const std::string& filename, Widelands::Map& M)
-   : Widelands::MapLoader(filename, M), filename_(filename) {
+   : Widelands::MapLoader(filename, M), filename_(filename), worldtype_(WorldType::kGreenland) {
 }
 
 /// Load the header. The map will then return valid information when
@@ -953,10 +953,10 @@
 				break;
 
 			case BOB_CACTUS1:
-				bobname = worldtype_ != S2MapLoader::WINTERLAND ? "cactus1" : "snowman";
+				bobname = worldtype_ != S2MapLoader::WorldType::kWinterland ? "cactus1" : "snowman";
 				break;
 			case BOB_CACTUS2:
-				bobname = worldtype_ != S2MapLoader::WINTERLAND ? "cactus2" : "track";
+				bobname = worldtype_ != S2MapLoader::WorldType::kWinterland ? "cactus2" : "track";
 				break;
 
 			case BOB_BUSH1:

=== modified file 'src/map_io/s2map.h'
--- src/map_io/s2map.h	2017-01-25 18:55:59 +0000
+++ src/map_io/s2map.h	2017-08-16 05:11:06 +0000
@@ -28,10 +28,10 @@
 class FileRead;
 
 struct S2MapLoader : public Widelands::MapLoader {
-	enum WorldType {
-		GREENLAND = 0,
-		BLACKLAND = 1,
-		WINTERLAND = 2,
+	enum class WorldType {
+		kGreenland = 0,
+		kBlackland = 1,
+		kWinterland = 2,
 	};
 
 	S2MapLoader(const std::string& filename, Widelands::Map& M);

=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2017-07-05 19:21:57 +0000
+++ src/network/gameclient.cc	2017-08-16 05:11:06 +0000
@@ -263,7 +263,7 @@
 }
 
 GameController::GameType GameClient::get_game_type() {
-	return GameController::GameType::NETCLIENT;
+	return GameController::GameType::kNetClient;
 }
 
 void GameClient::report_result(uint8_t player_nr,
@@ -820,8 +820,7 @@
 	}
 
 	case NETCMD_CHAT: {
-		ChatMessage c;
-		c.time = time(nullptr);
+		ChatMessage c("");
 		c.playern = packet.signed_16();
 		c.sender = packet.string();
 		c.msg = packet.string();
@@ -833,13 +832,11 @@
 	}
 
 	case NETCMD_SYSTEM_MESSAGE_CODE: {
-		ChatMessage c;
-		c.time = time(nullptr);
-		std::string code = packet.string();
-		std::string arg1 = packet.string();
-		std::string arg2 = packet.string();
-		std::string arg3 = packet.string();
-		c.msg = NetworkGamingMessages::get_message(code, arg1, arg2, arg3);
+		const std::string code = packet.string();
+		const std::string arg1 = packet.string();
+		const std::string arg2 = packet.string();
+		const std::string arg3 = packet.string();
+		ChatMessage c(NetworkGamingMessages::get_message(code, arg1, arg2, arg3));
 		c.playern = UserSettings::none();  //  == System message
 		// c.sender remains empty to indicate a system message
 		d->chatmessages.push_back(c);

=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc	2017-07-02 21:09:23 +0000
+++ src/network/gamehost.cc	2017-08-16 05:11:06 +0000
@@ -282,11 +282,9 @@
 	}
 
 	void send(const std::string& msg) override {
-		ChatMessage c;
-		c.time = time(nullptr);
+		ChatMessage c(msg);
 		c.playern = h->get_local_playerposition();
 		c.sender = h->get_local_playername();
-		c.msg = msg;
 		if (c.msg.size() && *c.msg.begin() == '@') {
 			// Personal message
 			std::string::size_type const space = c.msg.find(' ');
@@ -855,12 +853,8 @@
 
 				// is host the sender?
 				if (d->localplayername == msg.sender) {
-					ChatMessage err;
-					err.time = time(nullptr);
+					ChatMessage err(fail);
 					err.playern = -2;  // System message
-					err.sender = "";
-					err.msg = fail;
-					err.recipient = "";
 					d->chat.receive(err);
 					return;  // nothing left to do!
 				}
@@ -986,9 +980,7 @@
 	broadcast(s);
 
 	// Now add to our own chatbox
-	ChatMessage msg;
-	msg.time = time(nullptr);
-	msg.msg = NetworkGamingMessages::get_message(code, a, b, c);
+	ChatMessage msg(NetworkGamingMessages::get_message(code, a, b, c));
 	msg.playern = UserSettings::none();  //  == System message
 	// c.sender remains empty to indicate a system message
 	d->chat.receive(msg);
@@ -999,7 +991,7 @@
 }
 
 GameController::GameType GameHost::get_game_type() {
-	return GameController::GameType::NETHOST;
+	return GameController::GameType::kNetHost;
 }
 
 const GameSettings& GameHost::settings() {
@@ -2164,11 +2156,9 @@
 	}
 
 	case NETCMD_CHAT: {
-		ChatMessage c;
-		c.time = time(nullptr);
+		ChatMessage c(r.string());
 		c.playern = d->settings.users.at(client.usernum).position;
 		c.sender = d->settings.users.at(client.usernum).name;
-		c.msg = r.string();
 		if (c.msg.size() && *c.msg.begin() == '@') {
 			// Personal message
 			std::string::size_type const space = c.msg.find(' ');

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2017-07-23 08:46:00 +0000
+++ src/network/internet_gaming.cc	2017-08-16 05:11:06 +0000
@@ -629,7 +629,7 @@
 			// Client received an ERROR message - seems something went wrong
 			std::string subcmd(packet.string());
 			std::string reason(packet.string());
-			std::string message = "";
+			std::string message;
 
 			if (subcmd == IGPCMD_CHAT) {
 				// Something went wrong with the chat message the user sent.
@@ -873,16 +873,14 @@
                                          const std::string& to,
                                          bool system,
                                          const std::string& msg) {
-	ChatMessage c;
+	ChatMessage c(msg);
 	if (!system && from.empty()) {
 		std::string unkown_string = (boost::format("<%s>") % _("unknown")).str();
 		c.sender = unkown_string;
 	} else {
 		c.sender = from;
 	}
-	c.time = time(nullptr);
 	c.playern = system ? -1 : to.size() ? 3 : 7;
-	c.msg = msg;
 	c.recipient = to;
 
 	receive(c);

=== modified file 'src/network/network.h'
--- src/network/network.h	2017-07-02 21:09:23 +0000
+++ src/network/network.h	2017-08-16 05:11:06 +0000
@@ -172,7 +172,7 @@
 private:
 	friend class Deserializer;
 	std::vector<uint8_t> buffer;
-	size_t index_;
+	size_t index_ = 0U;
 };
 
 struct FilePart {

=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2017-07-02 18:58:30 +0000
+++ src/scripting/lua_game.cc	2017-08-16 05:11:06 +0000
@@ -422,7 +422,7 @@
 int LuaPlayer::message_box(lua_State* L) {
 	Game& game = get_game(L);
 	// don't show message boxes in replays, cause they crash the game
-	if (game.game_controller()->get_game_type() == GameController::GameType::REPLAY) {
+	if (game.game_controller()->get_game_type() == GameController::GameType::kReplay) {
 		return 1;
 	}
 
@@ -1322,7 +1322,7 @@
 */
 // TODO(sirver): this should be a method of wl.Game(). Fix for b19.
 static int L_report_result(lua_State* L) {
-	std::string info = "";
+	std::string info;
 	if (lua_gettop(L) >= 3)
 		info = luaL_checkstring(L, 3);
 

=== modified file 'src/scripting/lua_game.h'
--- src/scripting/lua_game.h	2017-06-24 08:47:46 +0000
+++ src/scripting/lua_game.h	2017-08-16 05:11:06 +0000
@@ -118,8 +118,7 @@
 	}
 
 	explicit LuaObjective(const Widelands::Objective& n);
-	LuaObjective() : name_("") {
-	}
+	LuaObjective() = default;
 	explicit LuaObjective(lua_State* L) {
 		report_error(L, "Cannot instantiate a '%s' directly!", className);
 	}

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2017-08-03 14:51:55 +0000
+++ src/scripting/lua_map.cc	2017-08-16 05:11:06 +0000
@@ -1206,7 +1206,7 @@
       :returns: The created immovable.
 */
 int LuaMap::place_immovable(lua_State* const L) {
-	std::string from_where = "";
+	std::string from_where;
 
 	const std::string objname = luaL_checkstring(L, 2);
 	LuaMaps::LuaField* c = *get_user_class<LuaMaps::LuaField>(L, 3);

=== modified file 'src/scripting/lua_ui.cc'
--- src/scripting/lua_ui.cc	2017-05-13 11:25:24 +0000
+++ src/scripting/lua_ui.cc	2017-08-16 05:11:06 +0000
@@ -649,7 +649,7 @@
 int LuaMapView::scroll_to_map_pixel(lua_State* L) {
 	Widelands::Game& game = get_game(L);
 	// don't move view in replays
-	if (game.game_controller()->get_game_type() == GameController::GameType::REPLAY) {
+	if (game.game_controller()->get_game_type() == GameController::GameType::kReplay) {
 		return 0;
 	}
 

=== modified file 'src/sound/sound_handler.cc'
--- src/sound/sound_handler.cc	2017-03-03 18:13:55 +0000
+++ src/sound/sound_handler.cc	2017-08-16 05:11:06 +0000
@@ -72,7 +72,6 @@
      music_volume_(MIX_MAX_VOLUME),
      fx_volume_(MIX_MAX_VOLUME),
      random_order_(true),
-     current_songset_(""),
      fx_lock_(nullptr) {
 }
 

=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc	2017-06-23 16:16:28 +0000
+++ src/ui_basic/checkbox.cc	2017-08-16 05:11:06 +0000
@@ -45,8 +45,7 @@
    : Panel(parent, p.x, p.y, kStateboxSize, kStateboxSize, tooltip_text),
      flags_(Is_Enabled),
      pic_graphics_(pic),
-     rendered_text_(nullptr),
-     label_text_("") {
+     rendered_text_(nullptr) {
 	uint16_t w = pic->width();
 	uint16_t h = pic->height();
 	set_desired_size(w, h);

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2017-06-23 17:23:04 +0000
+++ src/ui_basic/multilineeditbox.cc	2017-08-16 05:11:06 +0000
@@ -59,7 +59,7 @@
 	WordWrap ww;
 	/*@}*/
 
-	Data(MultilineEditbox&, const Image* button_background);
+	Data(MultilineEditbox&, const Image* init_background, const Image* button_background);
 	void refresh_ww();
 
 	void update();
@@ -89,8 +89,7 @@
                                    const std::string& text,
                                    const Image* background,
                                    const Image* button_background)
-   : Panel(parent, x, y, w, h), d_(new Data(*this, button_background)) {
-	d_->background = background;
+   : Panel(parent, x, y, w, h), d_(new Data(*this, background, button_background)) {
 	d_->lineheight = text_height();
 	set_handle_mouse(true);
 	set_can_focus(true);
@@ -100,8 +99,9 @@
 	set_text(text);
 }
 
-MultilineEditbox::Data::Data(MultilineEditbox& o, const Image* button_background)
+MultilineEditbox::Data::Data(MultilineEditbox& o, const Image* init_background, const Image* button_background)
    : scrollbar(&o, o.get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, o.get_h(), button_background),
+	  background(init_background),
      cursor_pos(0),
      maxbytes(std::min(g_gr->max_texture_size() / UI_FONT_SIZE_SMALL, 0xffff)),
      ww_valid(false),

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2017-07-02 19:21:56 +0000
+++ src/ui_basic/slider.cc	2017-08-16 05:11:06 +0000
@@ -66,6 +66,7 @@
      min_value_(min_value),
      max_value_(max_value),
      value_(value),
+	  relative_move_(0),
      highlighted_(false),
      pressed_(false),
      enabled_(enabled),

=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h	2017-06-24 08:47:46 +0000
+++ src/ui_basic/table.h	2017-08-16 05:11:06 +0000
@@ -156,6 +156,15 @@
 		std::vector<Data> data_;
 	};
 
+	Table(Panel* parent,
+	      int32_t x,
+	      int32_t y,
+	      uint32_t w,
+	      uint32_t h,
+	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      TableRows rowtype = TableRows::kSingle);
+	~Table();
+
 	/**
 	 * Compare the two items at the given indices in the list.
 	 *
@@ -163,15 +172,6 @@
 	 */
 	using CompareFn = boost::function<bool(uint32_t, uint32_t)>;
 
-	Table(Panel* parent,
-	      int32_t x,
-	      int32_t y,
-	      uint32_t w,
-	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
-	      TableRows rowtype = TableRows::kSingle);
-	~Table();
-
 	boost::signals2::signal<void(uint32_t)> selected;
 	boost::signals2::signal<void(uint32_t)> double_clicked;
 

=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2017-06-01 08:52:15 +0000
+++ src/ui_basic/window.cc	2017-08-16 05:11:06 +0000
@@ -78,6 +78,7 @@
                 w + VT_B_PIXMAP_THICKNESS * 2,
                 TP_B_PIXMAP_THICKNESS + h + BT_B_PIXMAP_THICKNESS),
      is_minimal_(false),
+	  oldh_(TP_B_PIXMAP_THICKNESS + h + BT_B_PIXMAP_THICKNESS),
      dragging_(false),
      docked_left_(false),
      docked_right_(false),

=== modified file 'src/ui_basic/window.h'
--- src/ui_basic/window.h	2017-01-25 18:55:59 +0000
+++ src/ui_basic/window.h	2017-08-16 05:11:06 +0000
@@ -104,7 +104,7 @@
 
 private:
 	bool is_minimal_;
-	uint32_t oldh_;  // if it is, this is the old height
+	uint32_t oldh_;  // if it is minimized, this is the old height
 	bool dragging_, docked_left_, docked_right_, docked_bottom_;
 	int32_t drag_start_win_x_, drag_start_win_y_;
 	int32_t drag_start_mouse_x_, drag_start_mouse_y_;

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2017-06-15 16:34:58 +0000
+++ src/ui_fsmenu/loadgame.cc	2017-08-16 05:11:06 +0000
@@ -531,10 +531,10 @@
 
 			if (!is_replay_) {
 				if (settings_->settings().multiplayer) {
-					if (gamedata.gametype == GameController::GameType::SINGLEPLAYER) {
+					if (gamedata.gametype == GameController::GameType::kSingleplayer) {
 						continue;
 					}
-				} else if (gamedata.gametype > GameController::GameType::SINGLEPLAYER) {
+				} else if (gamedata.gametype > GameController::GameType::kSingleplayer) {
 					continue;
 				}
 			}
@@ -601,14 +601,14 @@
 			if (is_replay_ || settings_->settings().multiplayer) {
 				std::string gametypestring;
 				switch (gamedata.gametype) {
-				case GameController::GameType::SINGLEPLAYER:
+				case GameController::GameType::kSingleplayer:
 					/** TRANSLATORS: "Single Player" entry in the Game Mode table column. */
 					/** TRANSLATORS: "Keep this to 6 letters maximum. */
 					/** TRANSLATORS: A tooltip will explain the abbreviation. */
 					/** TRANSLATORS: Make sure that this translation is consistent with the tooltip. */
 					gametypestring = _("SP");
 					break;
-				case GameController::GameType::NETHOST:
+				case GameController::GameType::kNetHost:
 					/** TRANSLATORS: "Multiplayer Host" entry in the Game Mode table column. */
 					/** TRANSLATORS: "Keep this to 2 letters maximum. */
 					/** TRANSLATORS: A tooltip will explain the abbreviation. */
@@ -618,7 +618,7 @@
 					   (boost::format(_("H (%1%)")) % static_cast<unsigned int>(gamedata.nrplayers))
 					      .str();
 					break;
-				case GameController::GameType::NETCLIENT:
+				case GameController::GameType::kNetClient:
 					/** TRANSLATORS: "Multiplayer" entry in the Game Mode table column. */
 					/** TRANSLATORS: "Keep this to 2 letters maximum. */
 					/** TRANSLATORS: A tooltip will explain the abbreviation. */
@@ -628,9 +628,11 @@
 					   (boost::format(_("MP (%1%)")) % static_cast<unsigned int>(gamedata.nrplayers))
 					      .str();
 					break;
-				case GameController::GameType::REPLAY:
+				case GameController::GameType::kReplay:
 					gametypestring = "";
 					break;
+				case GameController::GameType::kUndefined:
+					NEVER_HERE();
 				}
 				te.set_string(1, gametypestring);
 				te.set_string(2, map_filename(gamedata.filename, gamedata.mapname));

=== modified file 'src/ui_fsmenu/loadgame.h'
--- src/ui_fsmenu/loadgame.h	2017-01-26 09:28:40 +0000
+++ src/ui_fsmenu/loadgame.h	2017-08-16 05:11:06 +0000
@@ -65,7 +65,7 @@
 	   : gametime(0),
 	     nrplayers(0),
 	     savetimestamp(0),
-	     gametype(GameController::GameType::SINGLEPLAYER) {
+	     gametype(GameController::GameType::kSingleplayer) {
 	}
 };
 

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2017-06-28 07:17:12 +0000
+++ src/wui/building_statistics_menu.cc	2017-08-16 05:11:06 +0000
@@ -676,7 +676,7 @@
 			}
 		}
 
-		std::string owned_text = "";
+		std::string owned_text;
 		if (player.tribe().has_building(id) && (building.is_buildable() || building.is_enhanced())) {
 			/** TRANSLATORS Buildings: owned / under construction */
 			owned_text = (boost::format(_("%1%/%2%")) % nr_owned % nr_build).str();

=== modified file 'src/wui/debugconsole.cc'
--- src/wui/debugconsole.cc	2017-01-25 18:55:59 +0000
+++ src/wui/debugconsole.cc	2017-08-16 05:11:06 +0000
@@ -25,6 +25,7 @@
 
 #include "base/log.h"
 #include "chat/chat.h"
+#include "logic/widelands.h"
 
 namespace DebugConsole {
 
@@ -87,10 +88,7 @@
 	}
 
 	void write(const std::string& msg) {
-		ChatMessage cm;
-
-		cm.time = time(nullptr);
-		cm.msg = msg;
+		ChatMessage cm(msg);
 		messages.push_back(cm);
 
 		log("*** %s\n", msg.c_str());

=== modified file 'src/wui/field_overlay_manager.cc'
--- src/wui/field_overlay_manager.cc	2017-08-15 17:37:57 +0000
+++ src/wui/field_overlay_manager.cc	2017-08-16 05:11:06 +0000
@@ -26,7 +26,7 @@
 #include "graphic/graphic.h"
 #include "logic/field.h"
 
-FieldOverlayManager::FieldOverlayManager() : current_overlay_id_(0) {
+FieldOverlayManager::FieldOverlayManager() : buildhelp_(false), current_overlay_id_(0) {
 	OverlayInfo* buildhelp_info = buildhelp_infos_;
 	const char* filenames[] = {"images/wui/overlays/set_flag.png", "images/wui/overlays/small.png",
 	                           "images/wui/overlays/medium.png",   "images/wui/overlays/big.png",

=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc	2017-06-24 11:18:12 +0000
+++ src/wui/game_message_menu.cc	2017-08-16 05:11:06 +0000
@@ -613,7 +613,7 @@
 		return;
 	}
 	archivebtn_->set_enabled(true);
-	std::string button_tooltip = "";
+	std::string button_tooltip;
 	size_t no_selections = list->selections().size();
 	switch (mode) {
 	case Archive:

=== modified file 'src/wui/mapdata.cc'
--- src/wui/mapdata.cc	2017-01-25 18:55:59 +0000
+++ src/wui/mapdata.cc	2017-08-16 05:11:06 +0000
@@ -30,8 +30,6 @@
      name(init_localized_name),
      localized_name(init_localized_name),
      authors(init_author),
-     description(""),
-     hint(""),
      nrplayers(0),
      width(0),
      height(0),

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2017-08-09 19:25:04 +0000
+++ src/wui/soldierlist.cc	2017-08-16 05:11:06 +0000
@@ -144,6 +144,8 @@
 		icon.row = row;
 		icon.col = col;
 		icon.pos = calc_pos(row, col);
+		icon.cache_health = 0;
+		icon.cache_level = 0;
 		icons_.push_back(icon);
 
 		if (++col >= cols_) {
@@ -407,7 +409,7 @@
 		}
 
 		soldier_preference_.set_state(0);
-		if (ms->get_soldier_preference() == Widelands::MilitarySite::kPrefersHeroes) {
+		if (ms->get_soldier_preference() == Widelands::SoldierPreference::kHeroes) {
 			soldier_preference_.set_state(1);
 		}
 		if (can_act) {
@@ -433,15 +435,14 @@
 	}
 	if (upcast(Widelands::MilitarySite, ms, &building_)) {
 		switch (ms->get_soldier_preference()) {
-		case Widelands::MilitarySite::kPrefersRookies:
+		case Widelands::SoldierPreference::kRookies:
+			FALLS_THROUGH;
+		case Widelands::SoldierPreference::kNotSet:
 			soldier_preference_.set_state(0);
 			break;
-		case Widelands::MilitarySite::kPrefersHeroes:
+		case Widelands::SoldierPreference::kHeroes:
 			soldier_preference_.set_state(1);
 			break;
-		case Widelands::MilitarySite::kNoPreference:
-			soldier_preference_.set_state(-1);
-			break;
 		}
 	}
 }
@@ -476,8 +477,8 @@
 	assert(ms);
 #endif
 	igbase_.game().send_player_militarysite_set_soldier_preference(
-	   building_, changed_to == 0 ? Widelands::MilitarySite::kPrefersRookies :
-	                                Widelands::MilitarySite::kPrefersHeroes);
+	   building_, changed_to == 0 ? Widelands::SoldierPreference::kRookies :
+	                                Widelands::SoldierPreference::kHeroes);
 }
 
 UI::Panel*

=== modified file 'src/wui/tribal_encyclopedia.cc'
--- src/wui/tribal_encyclopedia.cc	2017-01-25 18:55:59 +0000
+++ src/wui/tribal_encyclopedia.cc	2017-08-16 05:11:06 +0000
@@ -43,7 +43,7 @@
 		std::unique_ptr<LuaCoroutine> cr(table->get_coroutine("func"));
 		cr->push_arg(tribe.name());
 		upcast(Widelands::Game, game, &parent.egbase());
-		if (game->game_controller()->get_game_type() == GameController::GameType::SINGLEPLAYER) {
+		if (game->game_controller()->get_game_type() == GameController::GameType::kSingleplayer) {
 			cr->push_arg("singleplayer");
 		} else {
 			cr->push_arg("multiplayer");