[Commits] [wesnoth/wesnoth] 66176b: Move everything in src/filesystem.hpp into its own...
GitHub
noreply at github.com
Tue Oct 14 15:19:13 UTC 2014
Branch: refs/heads/master
Home: https://github.com/wesnoth/wesnoth
Commit: 66176b1738c5d813959b4cd01536a7cc246831c3
https://github.com/wesnoth/wesnoth/commit/66176b1738c5d813959b4cd01536a7cc246831c3
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/addon/manager.cpp
M src/addon/manager_ui.cpp
M src/ai/configuration.cpp
M src/ai/formula/function_table.cpp
M src/campaign_server/campaign_server.cpp
M src/config_cache.cpp
M src/dialogs.cpp
M src/editor/editor_main.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/map_context.cpp
M src/editor/palette/editor_palettes.cpp
M src/filesystem.cpp
M src/filesystem.hpp
M src/font.cpp
M src/game.cpp
M src/game_config_manager.cpp
M src/game_config_manager.hpp
M src/game_controller.cpp
M src/game_preferences_display.cpp
M src/gamestatus.cpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/game_paths.cpp
M src/gui/dialogs/lobby/lobby_data.cpp
M src/gui/dialogs/mp_create_game.cpp
M src/gui/widgets/settings.cpp
M src/hotkeys.cpp
M src/image.cpp
M src/language.cpp
M src/menu_events.cpp
M src/multiplayer_create_engine.cpp
M src/multiplayer_lobby.cpp
M src/network.cpp
M src/network_worker.cpp
M src/persist_context.cpp
M src/playcampaign.cpp
M src/preferences.cpp
M src/savegame.cpp
M src/savegame.hpp
M src/scripting/lua.cpp
M src/serialization/preprocessor.cpp
M src/serialization/schema_validator.cpp
M src/server/ban.cpp
M src/server/game.cpp
M src/server/room_manager.cpp
M src/server/server.cpp
M src/sound.cpp
M src/sound_music_track.cpp
M src/tests/create_images.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/gui/test_save_dialog.cpp
M src/tests/main.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_network_worker.cpp
M src/tests/utils/game_config_manager.cpp
M src/tools/exploder_cutter.cpp
M src/tools/schema/schema_generator.cpp
M src/tools/validator/validator_tool.cpp
M src/widgets/button.cpp
M src/widgets/file_menu.cpp
Log Message:
-----------
Move everything in src/filesystem.hpp into its own namespace
Commit: e5db3c4091e79def7d9ba5b7a97c86e68e544797
https://github.com/wesnoth/wesnoth/commit/e5db3c4091e79def7d9ba5b7a97c86e68e544797
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/filesystem.cpp
M src/filesystem.hpp
M src/game_controller.cpp
M src/image.cpp
M src/serialization/preprocessor.cpp
M src/tools/exploder_cutter.cpp
M src/tools/schema/schema_generator.cpp
Log Message:
-----------
Rename filesystem::file_name to filesystem::base_name
Commit: 76cad9827146e156d9cce8fca98ff5ae7fffd91e
https://github.com/wesnoth/wesnoth/commit/76cad9827146e156d9cce8fca98ff5ae7fffd91e
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/ai/lua/core.cpp
M src/editor/map/editor_map.cpp
M src/gui/dialogs/lobby/lobby_info.cpp
M src/loadscreen.cpp
M src/network_ana.cpp
Log Message:
-----------
Remove some unneeded includes
Commit: 1cd8fbd8e97460ea56986ad3128e63553d0bd036
https://github.com/wesnoth/wesnoth/commit/1cd8fbd8e97460ea56986ad3128e63553d0bd036
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/filesystem.hpp
Log Message:
-----------
Make filesystem.hpp not depend on config.hpp being included first
Commit: db76fa3b522db2c68922ea0377b5a599fced8a91
https://github.com/wesnoth/wesnoth/commit/db76fa3b522db2c68922ea0377b5a599fced8a91
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/filesystem.cpp
M src/filesystem.hpp
M src/savegame.cpp
Log Message:
-----------
Rename file_create_time to file_modified_time, as that's what it does
Commit: a5ab4d73004d1b0367c50da57a810055e857b83c
https://github.com/wesnoth/wesnoth/commit/a5ab4d73004d1b0367c50da57a810055e857b83c
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/filesystem.hpp
Log Message:
-----------
Remove a comment that is no longer true
Commit: ad8636fc3a4363ea998dc107026c952d3fd7e126
https://github.com/wesnoth/wesnoth/commit/ad8636fc3a4363ea998dc107026c952d3fd7e126
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/image.cpp
Log Message:
-----------
Don't try to iterate over things that are not directories
Commit: 596c2461b83ab3587f98d4fc3a1d93c5d2f3f43d
https://github.com/wesnoth/wesnoth/commit/596c2461b83ab3587f98d4fc3a1d93c5d2f3f43d
Author: Alexander van Gessel <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/gui/dialogs/editor/custom_tod.cpp
Log Message:
-----------
file_name->base_name
Commit: ecf8f3d55cfd9ebc76e99941270500a5781d7819
https://github.com/wesnoth/wesnoth/commit/ecf8f3d55cfd9ebc76e99941270500a5781d7819
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M src/SConscript
M src/filesystem.cpp
A src/filesystem_common.cpp
Log Message:
-----------
Split the parts of filesystem.cpp that don't directly interface with the filesystem off into filesystem_common.cpp
Commit: e5cb79b8e9e4ca18d3bbf670ee1ded1459c2bcdc
https://github.com/wesnoth/wesnoth/commit/e5cb79b8e9e4ca18d3bbf670ee1ded1459c2bcdc
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/addon/manager.cpp
M src/addon/manager_ui.cpp
M src/ai/configuration.cpp
M src/ai/formula/function_table.cpp
M src/campaign_server/addon_utils.cpp
M src/campaign_server/campaign_server.cpp
M src/config_cache.cpp
M src/create_engine.cpp
M src/desktop/dbus_notification.cpp
M src/dialogs.cpp
M src/editor/editor_main.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/map_context.cpp
M src/editor/palette/editor_palettes.cpp
M src/filesystem.cpp
M src/filesystem.hpp
M src/font.cpp
M src/game_config_manager.cpp
M src/game_config_manager.hpp
M src/game_launcher.cpp
M src/game_preferences_display.cpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/game_cache_options.cpp
M src/gui/dialogs/game_paths.cpp
M src/gui/dialogs/lobby/lobby_data.cpp
M src/gui/dialogs/mp_create_game.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/gui/dialogs/wml_error.cpp
M src/gui/widgets/settings.cpp
M src/hotkey/command_executor.cpp
M src/hotkey/hotkey_preferences_display.cpp
M src/image.cpp
M src/language.cpp
M src/menu_events.cpp
M src/multiplayer_lobby.cpp
M src/network.cpp
M src/network_worker.cpp
M src/persist_context.cpp
M src/preferences.cpp
M src/save_index.cpp
M src/saved_game.cpp
M src/savegame.cpp
M src/savegame.hpp
M src/scripting/lua.cpp
M src/serialization/preprocessor.cpp
M src/serialization/schema_validator.cpp
M src/server/ban.cpp
M src/server/game.cpp
M src/server/room_manager.cpp
M src/server/server.cpp
M src/sound.cpp
M src/sound_music_track.cpp
M src/tests/create_images.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/gui/test_save_dialog.cpp
M src/tests/main.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_network_worker.cpp
M src/tests/utils/game_config_manager.cpp
M src/tools/exploder_cutter.cpp
M src/tools/schema/schema_generator.cpp
M src/tools/validator/validator_tool.cpp
M src/wesnoth.cpp
M src/widgets/button.cpp
M src/widgets/file_menu.cpp
Log Message:
-----------
Move everything in src/filesystem.hpp into its own namespace
This is a chearry pick by me (gfgtdf) of https://github.com/AI0867/wesnoth/commit/66176b1738c5d813959b4cd01536a7cc246831c3. It differes a lot from the original becasue since there were so much merging conflics i decided to do it mostly from scratch.
Conflicts:
src/addon/manager.cpp
src/addon/manager_ui.cpp
src/campaign_server/campaign_server.cpp
src/config_cache.cpp
src/create_engine.cpp
src/editor/map/context_manager.cpp
src/editor/map/map_context.cpp
src/font.cpp
src/game_config_manager.cpp
src/gamestatus.cpp
src/gui/dialogs/editor/custom_tod.cpp
src/gui/dialogs/lobby/lobby_data.cpp
src/gui/dialogs/mp_create_game.cpp
src/gui/widgets/settings.cpp
src/hotkeys.cpp
src/image.cpp
src/multiplayer_lobby.cpp
src/network.cpp
src/playcampaign.cpp
src/preferences.cpp
src/savegame.cpp
src/serialization/preprocessor.cpp
src/tests/main.cpp
src/wesnoth.cpp
src/widgets/button.cpp
Commit: bd76edfb16ac97cb87913f5fd8d31d7379d2d5b9
https://github.com/wesnoth/wesnoth/commit/bd76edfb16ac97cb87913f5fd8d31d7379d2d5b9
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/config_cache.cpp
M src/editor/map/map_context.cpp
M src/filesystem.cpp
M src/filesystem.hpp
M src/game_launcher.cpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/gui/dialogs/wml_error.cpp
M src/image.cpp
M src/serialization/preprocessor.cpp
M src/tools/exploder_cutter.cpp
M src/tools/schema/schema_generator.cpp
Log Message:
-----------
Rename filesystem::file_name to filesystem::base_name
Commit: 1ce6fab41916e4651ee7e1cfdcff57c042290d32
https://github.com/wesnoth/wesnoth/commit/1ce6fab41916e4651ee7e1cfdcff57c042290d32
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/ai/lua/core.cpp
M src/editor/map/editor_map.cpp
M src/gui/dialogs/lobby/lobby_info.cpp
M src/loadscreen.cpp
M src/network_ana.cpp
Log Message:
-----------
Remove some unneeded includes
Conflicts:
src/loadscreen.cpp
Commit: ff87c802302104615563b94def429f302e581649
https://github.com/wesnoth/wesnoth/commit/ff87c802302104615563b94def429f302e581649
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/filesystem.hpp
Log Message:
-----------
Make filesystem.hpp not depend on config.hpp being included first
Conflicts:
src/filesystem.hpp
Commit: bf42d2abe570b66405e485531ede4a583579e527
https://github.com/wesnoth/wesnoth/commit/bf42d2abe570b66405e485531ede4a583579e527
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/filesystem.cpp
M src/filesystem.hpp
M src/save_index.cpp
Log Message:
-----------
Rename file_create_time to file_modified_time, as that's what it does
Conflicts:
src/savegame.cpp
Commit: ff51c9a75cc4952d94e04f28897ebc135cd82fc8
https://github.com/wesnoth/wesnoth/commit/ff51c9a75cc4952d94e04f28897ebc135cd82fc8
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/filesystem.hpp
Log Message:
-----------
Remove a comment that is no longer true
Commit: 77b431e8b28ff6c246963acfe451358e722b1e37
https://github.com/wesnoth/wesnoth/commit/77b431e8b28ff6c246963acfe451358e722b1e37
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/SConscript
M src/filesystem.cpp
A src/filesystem_common.cpp
Log Message:
-----------
Split the parts of filesystem.cpp that don't directly interface with the filesystem off into filesystem_common.cpp
Conflicts:
src/filesystem.cpp
Commit: eb6302b731db7fb1d1228f299f7830fe4ca75ff8
https://github.com/wesnoth/wesnoth/commit/eb6302b731db7fb1d1228f299f7830fe4ca75ff8
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/CMakeLists.txt
Log Message:
-----------
add filesystem_common.cpp to cmake
Commit: 845c260505163b12059737062a6b12fa032eb6cb
https://github.com/wesnoth/wesnoth/commit/845c260505163b12059737062a6b12fa032eb6cb
Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths:
M src/image.cpp
Log Message:
-----------
Don't try to iterate over things that are not directories
Commit: fbfad1f48dfb512b46c28f73ab8fe152d08c1e77
https://github.com/wesnoth/wesnoth/commit/fbfad1f48dfb512b46c28f73ab8fe152d08c1e77
Author: gfgtdf <f492343 at rmqkr.net>
Date: 2014-10-13 (Mon, 13 Oct 2014)
Log Message:
-----------
Merge commit 'ecf8f3d55cfd9ebc76e99941270500a5781d7819' into AI-boost_filesystem
Commit: 3de9e1d6a1cfc0fc9aab66d1f092ea8f2136cd67
https://github.com/wesnoth/wesnoth/commit/3de9e1d6a1cfc0fc9aab66d1f092ea8f2136cd67
Author: gfgtdf <tischpapier at gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
Changed paths:
M src/CMakeLists.txt
M src/SConscript
M src/addon/manager.cpp
M src/addon/manager_ui.cpp
M src/ai/configuration.cpp
M src/ai/formula/function_table.cpp
M src/ai/lua/core.cpp
M src/campaign_server/addon_utils.cpp
M src/campaign_server/campaign_server.cpp
M src/config_cache.cpp
M src/create_engine.cpp
M src/desktop/dbus_notification.cpp
M src/dialogs.cpp
M src/editor/editor_main.cpp
M src/editor/map/context_manager.cpp
M src/editor/map/editor_map.cpp
M src/editor/map/map_context.cpp
M src/editor/palette/editor_palettes.cpp
M src/filesystem.cpp
M src/filesystem.hpp
A src/filesystem_common.cpp
M src/font.cpp
M src/game_config_manager.cpp
M src/game_config_manager.hpp
M src/game_launcher.cpp
M src/game_preferences_display.cpp
M src/gui/dialogs/editor/custom_tod.cpp
M src/gui/dialogs/game_cache_options.cpp
M src/gui/dialogs/game_paths.cpp
M src/gui/dialogs/lobby/lobby_data.cpp
M src/gui/dialogs/lobby/lobby_info.cpp
M src/gui/dialogs/mp_create_game.cpp
M src/gui/dialogs/screenshot_notification.cpp
M src/gui/dialogs/wml_error.cpp
M src/gui/widgets/settings.cpp
M src/hotkey/command_executor.cpp
M src/hotkey/hotkey_preferences_display.cpp
M src/image.cpp
M src/language.cpp
M src/loadscreen.cpp
M src/menu_events.cpp
M src/multiplayer_lobby.cpp
M src/network.cpp
M src/network_ana.cpp
M src/network_worker.cpp
M src/persist_context.cpp
M src/preferences.cpp
M src/save_index.cpp
M src/saved_game.cpp
M src/savegame.cpp
M src/savegame.hpp
M src/scripting/lua.cpp
M src/serialization/preprocessor.cpp
M src/serialization/schema_validator.cpp
M src/server/ban.cpp
M src/server/game.cpp
M src/server/room_manager.cpp
M src/server/server.cpp
M src/sound.cpp
M src/sound_music_track.cpp
M src/tests/create_images.cpp
M src/tests/gui/test_gui2.cpp
M src/tests/gui/test_save_dialog.cpp
M src/tests/main.cpp
M src/tests/test_image_modifications.cpp
M src/tests/test_network_worker.cpp
M src/tests/utils/game_config_manager.cpp
M src/tools/exploder_cutter.cpp
M src/tools/schema/schema_generator.cpp
M src/tools/validator/validator_tool.cpp
M src/wesnoth.cpp
M src/widgets/button.cpp
M src/widgets/file_menu.cpp
Log Message:
-----------
Merge pull request #296 from gfgtdf/AI-boost_filesystem
This are the first ~10 commits of AI s boost filesystem branch and mostly a strict refactor. which i cherrypicked to my fork in order to test the boost fileystem. Because there commits are quite hamless but still cause the most merging conflicts i decided to pull them into master so we don't have to resolve these merging conflicts again if we merge boost fileystem into master. (There will be still be merging conflicts but much less). A lot of these commits differ quite much from their originals so i merged the original into this branch again by using "merge -s ours" to make git know that we already have these commits.
Compare: https://github.com/wesnoth/wesnoth/compare/286bd28415d9...3de9e1d6a1cf
More information about the Commits
mailing list