Merge branch 'master' into jgrpp

# Conflicts:
#	regression/regression/result.txt
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/console_cmds.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/hotkeys.cpp
#	src/network/core/tcp_connect.cpp
#	src/network/core/tcp_listen.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_engine.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_station.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/macosx/osx_main.cpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h
#	src/timer/timer_manager.h
#	src/timer/timer_window.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/vehicle_cmd.h
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_func.h
#	src/window_gui.h

src/ini.cpp

@@ -32,9 +32,9 @@
 
 /**
  * Create a new ini file with given group names.
- * @param list_group_names A \c nullptr terminated list with group names that should be loaded as lists instead of variables. @see IGT_LIST
+ * @param list_group_names A list with group names that should be loaded as lists instead of variables. @see IGT_LIST
  */
-IniFile::IniFile(const char * const *list_group_names) : IniLoadFile(list_group_names)
+IniFile::IniFile(const IniGroupNameList &list_group_names) : IniLoadFile(list_group_names)
 {
 }
 
@@ -56,20 +56,20 @@ bool IniFile::SaveToDisk(const std::string &filename)
 	std::ofstream os(OTTD2FS(file_new).c_str());
 	if (os.fail()) return false;
 
-	for (const IniGroup *group = this->group; group != nullptr; group = group->next) {
-		os << group->comment << "[" << group->name << "]\n";
-		for (const IniItem *item = group->item; item != nullptr; item = item->next) {
-			os << item->comment;
+	for (const IniGroup &group : this->groups) {
+		os << group.comment << "[" << group.name << "]\n";
+		for (const IniItem &item : group.items) {
+			os << item.comment;
 
 			/* protect item->name with quotes if needed */
-			if (item->name.find(' ') != std::string::npos ||
-				item->name[0] == '[') {
-				os << "\"" << item->name << "\"";
+			if (item.name.find(' ') != std::string::npos ||
+				item.name[0] == '[') {
+				os << "\"" << item.name << "\"";
 			} else {
-				os << item->name;
+				os << item.name;
 			}
 
-			os << " = " << item->value.value_or("") << "\n";
+			os << " = " << item.value.value_or("") << "\n";
 		}
 	}
 	os << this->comment;