Fix building with Xcode 10 - #3458

projectfiles/CodeBlocks-SCons/wesnoth.cbp

@@ -720,8 +720,8 @@
 		<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_preferences_display.cpp" />
-		<Unit filename="../../src/image.cpp" />
-		<Unit filename="../../src/image.hpp" />
+		<Unit filename="../../src/picture.cpp" />
+		<Unit filename="../../src/picture.hpp" />
 		<Unit filename="../../src/image_modifications.cpp" />
 		<Unit filename="../../src/image_modifications.hpp" />
 		<Unit filename="../../src/intro.cpp" />
@@ -919,8 +919,8 @@
 		<Unit filename="../../src/serialization/unicode.hpp" />
 		<Unit filename="../../src/serialization/validator.cpp" />
 		<Unit filename="../../src/serialization/validator.hpp" />
-		<Unit filename="../../src/settings.cpp" />
-		<Unit filename="../../src/settings.hpp" />
+		<Unit filename="../../src/map_settings.cpp" />
+		<Unit filename="../../src/map_settings.hpp" />
 		<Unit filename="../../src/sha1.cpp" />
 		<Unit filename="../../src/sha1.hpp" />
 		<Unit filename="../../src/shared_object.hpp" />
@@ -1017,8 +1017,8 @@
 		<Unit filename="../../src/variable.hpp" />
 		<Unit filename="../../src/variant.cpp" />
 		<Unit filename="../../src/variant.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/video.cpp" />
 		<Unit filename="../../src/video.hpp" />
 		<Unit filename="../../src/wesconfig.h" />

projectfiles/CodeBlocks-SCons/wesnothd.cbp

@@ -107,8 +107,8 @@
 		<Unit filename="../../src/tstring.hpp" />
 		<Unit filename="../../src/util.cpp" />
 		<Unit filename="../../src/util.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />

projectfiles/CodeBlocks/wesnoth.cbp

@@ -833,8 +833,8 @@
 		<Unit filename="../../src/hotkey/hotkey_item.hpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.cpp" />
 		<Unit filename="../../src/hotkey/hotkey_manager.hpp" />
-		<Unit filename="../../src/image.cpp" />
-		<Unit filename="../../src/image.hpp" />
+		<Unit filename="../../src/picture.cpp" />
+		<Unit filename="../../src/picture.hpp" />
 		<Unit filename="../../src/image_modifications.cpp" />
 		<Unit filename="../../src/image_modifications.hpp" />
 		<Unit filename="../../src/key.cpp" />
@@ -1047,8 +1047,8 @@
 		<Unit filename="../../src/serialization/unicode.hpp" />
 		<Unit filename="../../src/serialization/validator.cpp" />
 		<Unit filename="../../src/serialization/validator.hpp" />
-		<Unit filename="../../src/settings.cpp" />
-		<Unit filename="../../src/settings.hpp" />
+		<Unit filename="../../src/map_settings.cpp" />
+		<Unit filename="../../src/map_settings.hpp" />
 		<Unit filename="../../src/show_dialog.cpp" />
 		<Unit filename="../../src/show_dialog.hpp" />
 		<Unit filename="../../src/side_filter.cpp" />
@@ -1173,8 +1173,8 @@
 		<Unit filename="../../src/variable_info.cpp" />
 		<Unit filename="../../src/variable_info.hpp" />
 		<Unit filename="../../src/variable_info_private.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/video.cpp" />
 		<Unit filename="../../src/video.hpp" />
 		<Unit filename="../../src/wesconfig.h" />

projectfiles/CodeBlocks/wesnothd.cbp

@@ -139,8 +139,8 @@
 		<Unit filename="../../src/tstring.cpp" />
 		<Unit filename="../../src/tstring.hpp" />
 		<Unit filename="../../src/util.hpp" />
-		<Unit filename="../../src/version.cpp" />
-		<Unit filename="../../src/version.hpp" />
+		<Unit filename="../../src/game_version.cpp" />
+		<Unit filename="../../src/game_version.hpp" />
 		<Unit filename="../../src/wesconfig.h" />
 		<Extensions>
 			<code_completion />

source_lists/boost_unit_tests

@@ -26,4 +26,4 @@ tests/test_util.cpp
 tests/test_version.cpp
 tests/test_whiteboard_side_actions.cpp
 tests/utils/fake_display.cpp
-tests/utils/game_config_manager.cpp
+tests/utils/game_config_manager_tests.cpp

source_lists/libwesnoth

@@ -25,7 +25,7 @@ hotkey/command_executor.cpp
 hotkey/hotkey_command.cpp
 hotkey/hotkey_item.cpp
 hotkey/hotkey_manager.cpp
-image.cpp
+picture.cpp
 image_modifications.cpp
 preferences/credentials.cpp
 preferences/general.cpp

source_lists/libwesnoth_core

@@ -27,4 +27,4 @@ serialization/unicode.cpp
 serialization/validator.cpp
 terrain/type_data.cpp
 tstring.cpp
-version.cpp
+game_version.cpp

source_lists/wesnoth

@@ -332,7 +332,7 @@ scripting/mapgen_lua_kernel.cpp
 scripting/plugins/context.cpp
 scripting/plugins/manager.cpp
 sdl/point.cpp
-settings.cpp
+map_settings.cpp
 side_filter.cpp
 spritesheet_generator.cpp
 statistics.cpp

src/addon/info.cpp

@@ -18,7 +18,7 @@
 #include "config.hpp"
 #include "font/pango/escape.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 

src/addon/info.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include "addon/validation.hpp"
 

src/addon/manager.cpp

@@ -27,7 +27,7 @@
 #include "gui/widgets/retval.hpp"
 #include "log.hpp"
 #include "serialization/parser.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "serialization/string_utils.hpp"
 #include "addon/client.hpp"
 

src/ai/testing.cpp

@@ -25,7 +25,7 @@
 #include "team.hpp"
 #include "units/unit.hpp"
 #include "tod_manager.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 static lg::log_domain log_ai_testing("ai/testing");
 #define DBG_AI_TESTING LOG_STREAM(debug, log_ai_testing)

src/build_info.cpp

@@ -22,7 +22,7 @@
 #include "formatter.hpp"
 #include "gettext.hpp"
 #include "serialization/unicode.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include <algorithm>
 

src/campaign_server/campaign_server.cpp

@@ -35,7 +35,7 @@
 #include "campaign_server/blacklist.hpp"
 #include "campaign_server/control.hpp"
 #include "campaign_server/fs_commit.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "hash.hpp"
 
 #include <csignal>

src/config.cpp

@@ -26,7 +26,7 @@
 #include "utils/const_clone.hpp"
 #include "utils/functional.hpp"
 #include "deprecation.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "serialization/string_utils.hpp"
 
 #include <algorithm>

src/config_cache.cpp

@@ -23,7 +23,7 @@
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/string_utils.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/iostreams/filter/gzip.hpp>

src/cursor.cpp

@@ -19,7 +19,7 @@
 
 #include "cursor.hpp"
 
-#include "image.hpp"
+#include "picture.hpp"
 #include "preferences/game.hpp"
 #include "sdl/utils.hpp"
 

src/deprecation.cpp

@@ -17,7 +17,7 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "preferences/general.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 // Set the default severity with the second parameter.
 // -1 means the default is to never log on this domain.

src/desktop/apple_version.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include <string>
 

src/desktop/apple_version.mm

@@ -16,7 +16,7 @@
 
 #include "apple_version.hpp"
 
-#import "../version.hpp"
+#import "game_version.hpp"
 
 #if defined(__APPLE__) && defined(__MACH__) && defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
 #define __IPHONEOS__ (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000)

src/display.hpp

@@ -57,7 +57,7 @@ class manager;
 #include "events.hpp"
 #include "font/standard_colors.hpp"
 #include "game_config.hpp"
-#include "image.hpp" //only needed for enums (!)
+#include "picture.hpp" //only needed for enums (!)
 #include "key.hpp"
 #include "map/hex_rect.hpp"
 #include "sdl/rect.hpp"

src/editor/controller/editor_controller.cpp

@@ -45,7 +45,7 @@
 #include "help/help.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 #include "preferences/display.hpp"
 #include "sound.hpp"
 #include "units/unit.hpp"

src/editor/palette/tristate_button.cpp

@@ -16,7 +16,7 @@
 
 #include "editor/palette/tristate_button.hpp"
 
-#include "image.hpp"
+#include "picture.hpp"
 #include "log.hpp"
 #include "sdl/rect.hpp"
 #include "sound.hpp"

src/filesystem.cpp

@@ -24,7 +24,7 @@
 #include "log.hpp"
 #include "serialization/unicode.hpp"
 #include "serialization/unicode_cast.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>

src/game_classification.cpp

@@ -17,7 +17,7 @@
 #include "config.hpp"
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/game_config.cpp

@@ -20,7 +20,7 @@
 #include "log.hpp"
 #include "utils/general.hpp"
 #include "utils/math.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "wesconfig.h"
 #include "serialization/string_utils.hpp"
 

src/game_config_manager.cpp

@@ -33,9 +33,9 @@
 #include "terrain/builder.hpp"
 #include "terrain/type_data.hpp"
 #include "units/types.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "theme.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 
 static lg::log_domain log_config("config");
 #define ERR_CONFIG LOG_STREAM(err, log_config)

src/game_initialization/configure_engine.cpp

@@ -17,7 +17,7 @@
 #include "mp_game_settings.hpp"
 #include "preferences/credentials.hpp"
 #include "preferences/game.hpp"
-#include "settings.hpp"
+#include "map_settings.hpp"
 #include "tod_manager.hpp"
 
 #include <cassert>

src/game_initialization/lobby_data.cpp

@@ -30,7 +30,7 @@
 #include "map/exception.hpp"
 #include "terrain/type_data.hpp"
 #include "wml_exception.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include <iterator>
 

src/game_initialization/mp_game_utils.cpp

@@ -19,7 +19,7 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "saved_game.hpp"
-#include "version.hpp"
+#include "game_version.hpp"
 #include "wesnothd_connection_error.hpp"
 
 static lg::log_domain log_engine("engine");

src/game_initialization/multiplayer.cpp

@@ -33,7 +33,7 @@
 #include "hash.hpp"
 #include "log.hpp"
 #include "multiplayer_error_codes.hpp"
-#include "settings.hpp"
+#include "map_settings.hpp"
 #include "sound.hpp"
 #include "statistics.hpp"
 #include "wesnothd_connection.hpp"

src/game_launcher.hpp

@@ -19,7 +19,7 @@
 #include "font/font_config.hpp"         // for manager
 #include "preferences/game.hpp"         // for manager
 #include "hotkey/hotkey_manager.hpp"    // for manager
-#include "image.hpp"                    // for manager
+#include "picture.hpp"                    // for manager
 #include "saved_game.hpp"               // for saved_game
 #include "sound.hpp"                    // for music_thinker
 

src/version.cpp → src/game_version.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "version.hpp"
+#include "game_version.hpp"
 
 #include "lexical_cast.hpp"
 #include "serialization/string_utils.hpp"

src/gui/core/canvas.cpp

@@ -25,7 +25,7 @@
 #include "font/text.hpp"
 #include "formatter.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 
 #include "gui/auxiliary/typed_formula.hpp"
 #include "gui/core/log.hpp"

src/gui/dialogs/addon/manager.cpp

@@ -39,7 +39,7 @@
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
 #include "formula/string_utils.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 #include "language.hpp"
 #include "preferences/general.hpp"
 #include "utils/general.hpp"

src/gui/dialogs/game_load.cpp

@@ -34,7 +34,7 @@
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/window.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 #include "language.hpp"
 #include "utils/general.hpp"
 

src/gui/dialogs/multiplayer/mp_create_game.cpp

@@ -41,7 +41,7 @@
 #include "gui/widgets/toggle_panel.hpp"
 #include "log.hpp"
 #include "savegame.hpp"
-#include "settings.hpp"
+#include "map_settings.hpp"
 
 #include <boost/algorithm/string.hpp>
 

src/gui/dialogs/screenshot_notification.cpp

@@ -27,7 +27,7 @@
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/dialogs/terrain_layers.cpp

@@ -21,7 +21,7 @@
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/window.hpp"
-#include "image.hpp"
+#include "picture.hpp"
 
 namespace gui2
 {