widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07140
[Merge] lp:~widelands-dev/widelands/rename_editor_files into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/rename_editor_files into lp:widelands.
Commit message:
Removed "editor_" prefix from editor source files.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/rename_editor_files/+merge/291093
They don't add any information, and are a waste of valuable screen space and my time spent scrolling.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/rename_editor_files into lp:widelands.
=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt 2016-04-02 16:45:53 +0000
+++ src/editor/CMakeLists.txt 2016-04-06 09:34:03 +0000
@@ -4,87 +4,87 @@
editorinteractive.h
map_generator.cc
map_generator.h
- tools/editor_action_args.h
- tools/editor_decrease_height_tool.cc
- tools/editor_decrease_height_tool.h
- tools/editor_decrease_resources_tool.cc
- tools/editor_decrease_resources_tool.h
- tools/editor_delete_bob_tool.cc
- tools/editor_delete_bob_tool.h
- tools/editor_delete_immovable_tool.cc
- tools/editor_delete_immovable_tool.h
- tools/editor_draw_tool.cc
- tools/editor_draw_tool.h
- tools/editor_history.cc
- tools/editor_history.h
- tools/editor_increase_height_tool.cc
- tools/editor_increase_height_tool.h
- tools/editor_increase_resources_tool.cc
- tools/editor_increase_resources_tool.h
- tools/editor_info_tool.cc
- tools/editor_info_tool.h
- tools/editor_make_infrastructure_tool.cc
- tools/editor_make_infrastructure_tool.h
- tools/editor_noise_height_tool.cc
- tools/editor_noise_height_tool.h
- tools/editor_place_bob_tool.cc
- tools/editor_place_bob_tool.h
- tools/editor_place_immovable_tool.cc
- tools/editor_place_immovable_tool.h
- tools/editor_set_height_tool.cc
- tools/editor_set_height_tool.h
- tools/editor_set_origin_tool.cc
- tools/editor_set_origin_tool.h
- tools/editor_set_port_space_tool.cc
- tools/editor_set_port_space_tool.h
- tools/editor_set_resources_tool.cc
- tools/editor_set_resources_tool.h
- tools/editor_set_starting_pos_tool.cc
- tools/editor_set_starting_pos_tool.h
- tools/editor_set_terrain_tool.cc
- tools/editor_set_terrain_tool.h
- tools/editor_tool.h
- tools/editor_tool_action.h
+ tools/action_args.h
+ tools/decrease_height_tool.cc
+ tools/decrease_height_tool.h
+ tools/decrease_resources_tool.cc
+ tools/decrease_resources_tool.h
+ tools/delete_bob_tool.cc
+ tools/delete_bob_tool.h
+ tools/delete_immovable_tool.cc
+ tools/delete_immovable_tool.h
+ tools/draw_tool.cc
+ tools/draw_tool.h
+ tools/history.cc
+ tools/history.h
+ tools/increase_height_tool.cc
+ tools/increase_height_tool.h
+ tools/increase_resources_tool.cc
+ tools/increase_resources_tool.h
+ tools/info_tool.cc
+ tools/info_tool.h
+ tools/make_infrastructure_tool.cc
+ tools/make_infrastructure_tool.h
tools/multi_select.h
+ tools/noise_height_tool.cc
+ tools/noise_height_tool.h
+ tools/place_bob_tool.cc
+ tools/place_bob_tool.h
+ tools/place_immovable_tool.cc
+ tools/place_immovable_tool.h
+ tools/set_height_tool.cc
+ tools/set_height_tool.h
+ tools/set_origin_tool.cc
+ tools/set_origin_tool.h
+ tools/set_port_space_tool.cc
+ tools/set_port_space_tool.h
+ tools/set_resources_tool.cc
+ tools/set_resources_tool.h
+ tools/set_starting_pos_tool.cc
+ tools/set_starting_pos_tool.h
+ tools/set_terrain_tool.cc
+ tools/set_terrain_tool.h
+ tools/tool.h
+ tools/tool_action.h
ui_menus/categorized_item_selection_menu.h
- ui_menus/editor_help.cc
- ui_menus/editor_help.h
- ui_menus/editor_main_menu.cc
- ui_menus/editor_main_menu.h
- ui_menus/editor_main_menu_load_map.cc
- ui_menus/editor_main_menu_load_map.h
- ui_menus/editor_main_menu_load_or_save_map.cc
- ui_menus/editor_main_menu_load_or_save_map.h
- ui_menus/editor_main_menu_map_options.cc
- ui_menus/editor_main_menu_map_options.h
- ui_menus/editor_main_menu_new_map.cc
- ui_menus/editor_main_menu_new_map.h
- ui_menus/editor_main_menu_random_map.cc
- ui_menus/editor_main_menu_random_map.h
- ui_menus/editor_main_menu_save_map.cc
- ui_menus/editor_main_menu_save_map.h
- ui_menus/editor_main_menu_save_map_make_directory.cc
- ui_menus/editor_main_menu_save_map_make_directory.h
- ui_menus/editor_player_menu.cc
- ui_menus/editor_player_menu.h
- ui_menus/editor_tool_change_height_options_menu.cc
- ui_menus/editor_tool_change_height_options_menu.h
- ui_menus/editor_tool_change_resources_options_menu.cc
- ui_menus/editor_tool_change_resources_options_menu.h
- ui_menus/editor_tool_menu.cc
- ui_menus/editor_tool_menu.h
- ui_menus/editor_tool_noise_height_options_menu.cc
- ui_menus/editor_tool_noise_height_options_menu.h
- ui_menus/editor_tool_options_menu.cc
- ui_menus/editor_tool_options_menu.h
- ui_menus/editor_tool_place_bob_options_menu.cc
- ui_menus/editor_tool_place_bob_options_menu.h
- ui_menus/editor_tool_place_immovable_options_menu.cc
- ui_menus/editor_tool_place_immovable_options_menu.h
- ui_menus/editor_tool_set_terrain_options_menu.cc
- ui_menus/editor_tool_set_terrain_options_menu.h
- ui_menus/editor_toolsize_menu.cc
- ui_menus/editor_toolsize_menu.h
+ ui_menus/help.cc
+ ui_menus/help.h
+ ui_menus/main_menu.cc
+ ui_menus/main_menu.h
+ ui_menus/main_menu_load_map.cc
+ ui_menus/main_menu_load_map.h
+ ui_menus/main_menu_load_or_save_map.cc
+ ui_menus/main_menu_load_or_save_map.h
+ ui_menus/main_menu_map_options.cc
+ ui_menus/main_menu_map_options.h
+ ui_menus/main_menu_new_map.cc
+ ui_menus/main_menu_new_map.h
+ ui_menus/main_menu_random_map.cc
+ ui_menus/main_menu_random_map.h
+ ui_menus/main_menu_save_map.cc
+ ui_menus/main_menu_save_map.h
+ ui_menus/main_menu_save_map_make_directory.cc
+ ui_menus/main_menu_save_map_make_directory.h
+ ui_menus/player_menu.cc
+ ui_menus/player_menu.h
+ ui_menus/tool_change_height_options_menu.cc
+ ui_menus/tool_change_height_options_menu.h
+ ui_menus/tool_change_resources_options_menu.cc
+ ui_menus/tool_change_resources_options_menu.h
+ ui_menus/tool_menu.cc
+ ui_menus/tool_menu.h
+ ui_menus/tool_noise_height_options_menu.cc
+ ui_menus/tool_noise_height_options_menu.h
+ ui_menus/tool_options_menu.cc
+ ui_menus/tool_options_menu.h
+ ui_menus/tool_place_bob_options_menu.cc
+ ui_menus/tool_place_bob_options_menu.h
+ ui_menus/tool_place_immovable_options_menu.cc
+ ui_menus/tool_place_immovable_options_menu.h
+ ui_menus/tool_set_terrain_options_menu.cc
+ ui_menus/tool_set_terrain_options_menu.h
+ ui_menus/toolsize_menu.cc
+ ui_menus/toolsize_menu.h
USES_SDL2
DEPENDS
base_exceptions
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-04-02 16:26:33 +0000
+++ src/editor/editorinteractive.cc 2016-04-06 09:34:03 +0000
@@ -29,14 +29,14 @@
#include "base/i18n.h"
#include "base/scoped_timer.h"
#include "base/warning.h"
-#include "editor/tools/editor_delete_immovable_tool.h"
-#include "editor/ui_menus/editor_help.h"
-#include "editor/ui_menus/editor_main_menu.h"
-#include "editor/ui_menus/editor_main_menu_load_map.h"
-#include "editor/ui_menus/editor_main_menu_save_map.h"
-#include "editor/ui_menus/editor_player_menu.h"
-#include "editor/ui_menus/editor_tool_menu.h"
-#include "editor/ui_menus/editor_toolsize_menu.h"
+#include "editor/tools/delete_immovable_tool.h"
+#include "editor/ui_menus/help.h"
+#include "editor/ui_menus/main_menu.h"
+#include "editor/ui_menus/main_menu_load_map.h"
+#include "editor/ui_menus/main_menu_save_map.h"
+#include "editor/ui_menus/player_menu.h"
+#include "editor/ui_menus/tool_menu.h"
+#include "editor/ui_menus/toolsize_menu.h"
#include "graphic/graphic.h"
#include "logic/map.h"
#include "logic/map_objects/tribes/tribes.h"
=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h 2016-04-01 17:59:00 +0000
+++ src/editor/editorinteractive.h 2016-04-06 09:34:03 +0000
@@ -22,18 +22,18 @@
#include <memory>
-#include "editor/tools/editor_history.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_increase_resources_tool.h"
-#include "editor/tools/editor_info_tool.h"
-#include "editor/tools/editor_make_infrastructure_tool.h"
-#include "editor/tools/editor_noise_height_tool.h"
-#include "editor/tools/editor_place_bob_tool.h"
-#include "editor/tools/editor_place_immovable_tool.h"
-#include "editor/tools/editor_set_origin_tool.h"
-#include "editor/tools/editor_set_port_space_tool.h"
-#include "editor/tools/editor_set_starting_pos_tool.h"
-#include "editor/tools/editor_set_terrain_tool.h"
+#include "editor/tools/history.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/increase_resources_tool.h"
+#include "editor/tools/info_tool.h"
+#include "editor/tools/make_infrastructure_tool.h"
+#include "editor/tools/noise_height_tool.h"
+#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_immovable_tool.h"
+#include "editor/tools/set_origin_tool.h"
+#include "editor/tools/set_port_space_tool.h"
+#include "editor/tools/set_starting_pos_tool.h"
+#include "editor/tools/set_terrain_tool.h"
#include "logic/map.h"
#include "notifications/notifications.h"
#include "ui_basic/button.h"
=== modified file 'src/editor/map_generator.cc'
--- src/editor/map_generator.cc 2016-02-01 14:54:43 +0000
+++ src/editor/map_generator.cc 2016-04-06 09:34:03 +0000
@@ -24,7 +24,7 @@
#include <stdint.h>
#include "base/wexception.h"
-#include "editor/tools/editor_increase_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
#include "logic/editor_game_base.h"
#include "logic/findnode.h"
#include "logic/map.h"
=== renamed file 'src/editor/tools/editor_action_args.h' => 'src/editor/tools/action_args.h'
--- src/editor/tools/editor_action_args.h 2016-03-18 11:26:21 +0000
+++ src/editor/tools/action_args.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_ACTION_ARGS_H
-#define WL_EDITOR_TOOLS_EDITOR_ACTION_ARGS_H
+#ifndef WL_EDITOR_TOOLS_ACTION_ARGS_H
+#define WL_EDITOR_TOOLS_ACTION_ARGS_H
#include <list>
#include <string>
@@ -70,4 +70,4 @@
uint32_t refcount;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_ACTION_ARGS_H
+#endif // end of include guard: WL_EDITOR_TOOLS_ACTION_ARGS_H
=== renamed file 'src/editor/tools/editor_decrease_height_tool.cc' => 'src/editor/tools/decrease_height_tool.cc'
--- src/editor/tools/editor_decrease_height_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/decrease_height_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#include "editor/tools/editor_decrease_height_tool.h"
+#include "editor/tools/decrease_height_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/set_height_tool.h"
#include "logic/field.h"
#include "logic/map.h"
#include "logic/mapregion.h"
=== renamed file 'src/editor/tools/editor_decrease_height_tool.h' => 'src/editor/tools/decrease_height_tool.h'
--- src/editor/tools/editor_decrease_height_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/decrease_height_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_DECREASE_HEIGHT_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_DECREASE_HEIGHT_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DECREASE_HEIGHT_TOOL_H
+#define WL_EDITOR_TOOLS_DECREASE_HEIGHT_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
/// Decreases the height of a node by a value.
struct EditorDecreaseHeightTool : public EditorTool {
@@ -53,4 +53,4 @@
int32_t change_by_;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_DECREASE_HEIGHT_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_DECREASE_HEIGHT_TOOL_H
=== renamed file 'src/editor/tools/editor_decrease_resources_tool.cc' => 'src/editor/tools/decrease_resources_tool.cc'
--- src/editor/tools/editor_decrease_resources_tool.cc 2016-03-18 11:26:21 +0000
+++ src/editor/tools/decrease_resources_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#include "editor/tools/editor_decrease_resources_tool.h"
+#include "editor/tools/decrease_resources_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_increase_resources_tool.h"
-#include "editor/tools/editor_set_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
+#include "editor/tools/set_resources_tool.h"
#include "graphic/graphic.h"
#include "logic/field.h"
#include "logic/map_objects/world/resource_description.h"
=== renamed file 'src/editor/tools/editor_decrease_resources_tool.h' => 'src/editor/tools/decrease_resources_tool.h'
--- src/editor/tools/editor_decrease_resources_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/decrease_resources_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_DECREASE_RESOURCES_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_DECREASE_RESOURCES_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DECREASE_RESOURCES_TOOL_H
+#define WL_EDITOR_TOOLS_DECREASE_RESOURCES_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
/// Decreases the resources of a node by a value.
struct EditorDecreaseResourcesTool : public EditorTool {
@@ -58,4 +58,4 @@
int32_t change_by_;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_DECREASE_RESOURCES_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_DECREASE_RESOURCES_TOOL_H
=== renamed file 'src/editor/tools/editor_delete_bob_tool.cc' => 'src/editor/tools/delete_bob_tool.cc'
--- src/editor/tools/editor_delete_bob_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/delete_bob_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_delete_bob_tool.h"
+#include "editor/tools/delete_bob_tool.h"
#include "editor/editorinteractive.h"
#include "logic/field.h"
=== renamed file 'src/editor/tools/editor_delete_bob_tool.h' => 'src/editor/tools/delete_bob_tool.h'
--- src/editor/tools/editor_delete_bob_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/delete_bob_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_DELETE_BOB_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_DELETE_BOB_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
+#define WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
/// Deletes bob from the map.
struct EditorDeleteBobTool : public EditorTool {
@@ -45,4 +45,4 @@
}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_DELETE_BOB_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
=== renamed file 'src/editor/tools/editor_delete_immovable_tool.cc' => 'src/editor/tools/delete_immovable_tool.cc'
--- src/editor/tools/editor_delete_immovable_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/delete_immovable_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_delete_immovable_tool.h"
+#include "editor/tools/delete_immovable_tool.h"
#include "base/macros.h"
#include "editor/editorinteractive.h"
=== renamed file 'src/editor/tools/editor_delete_immovable_tool.h' => 'src/editor/tools/delete_immovable_tool.h'
--- src/editor/tools/editor_delete_immovable_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/delete_immovable_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_DELETE_IMMOVABLE_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_DELETE_IMMOVABLE_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DELETE_IMMOVABLE_TOOL_H
+#define WL_EDITOR_TOOLS_DELETE_IMMOVABLE_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
/// Deletes immovables from the map.
struct EditorDeleteImmovableTool : public EditorTool {
@@ -45,4 +45,4 @@
}
};
-#endif // end of include guard:
+#endif // end of include guard: WL_EDITOR_TOOLS_DELETE_IMMOVABLE_TOOL_H
=== renamed file 'src/editor/tools/editor_draw_tool.cc' => 'src/editor/tools/draw_tool.cc'
--- src/editor/tools/editor_draw_tool.cc 2016-01-04 20:50:19 +0000
+++ src/editor/tools/draw_tool.cc 2016-04-06 09:34:03 +0000
@@ -18,10 +18,10 @@
*/
-#include "editor/tools/editor_draw_tool.h"
+#include "editor/tools/draw_tool.h"
-#include "editor/tools/editor_action_args.h"
-#include "editor/tools/editor_history.h"
+#include "editor/tools/action_args.h"
+#include "editor/tools/history.h"
// TODO(unknown): Saving every action in a list isn't very efficient.
=== renamed file 'src/editor/tools/editor_draw_tool.h' => 'src/editor/tools/draw_tool.h'
--- src/editor/tools/editor_draw_tool.h 2016-02-20 10:39:29 +0000
+++ src/editor/tools/draw_tool.h 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_DRAW_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_DRAW_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DRAW_TOOL_H
+#define WL_EDITOR_TOOLS_DRAW_TOOL_H
-#include "editor/tools/editor_tool.h"
-#include "editor/tools/editor_tool_action.h"
+#include "editor/tools/tool.h"
+#include "editor/tools/tool_action.h"
/// This is not a real editor tool. It serves to combine 'hold down mouse and move'
/// tool actions in one class.
@@ -50,4 +50,4 @@
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_DRAW_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_DRAW_TOOL_H
=== renamed file 'src/editor/tools/editor_history.cc' => 'src/editor/tools/history.cc'
--- src/editor/tools/editor_history.cc 2016-03-18 11:26:21 +0000
+++ src/editor/tools/history.cc 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#include "editor/tools/editor_history.h"
+#include "editor/tools/history.h"
#include <string>
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_action_args.h"
-#include "editor/tools/editor_tool_action.h"
+#include "editor/tools/action_args.h"
+#include "editor/tools/tool_action.h"
// === EditorActionArgs === //
=== renamed file 'src/editor/tools/editor_history.h' => 'src/editor/tools/history.h'
--- src/editor/tools/editor_history.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/history.h 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_HISTORY_H
-#define WL_EDITOR_TOOLS_EDITOR_HISTORY_H
+#ifndef WL_EDITOR_TOOLS_HISTORY_H
+#define WL_EDITOR_TOOLS_HISTORY_H
#include <deque>
-#include "editor/tools/editor_draw_tool.h"
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/draw_tool.h"
+#include "editor/tools/tool.h"
class EditorInteractive;
namespace UI {struct Button;}
@@ -59,4 +59,4 @@
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_HISTORY_H
+#endif // end of include guard: WL_EDITOR_TOOLS_HISTORY_H
=== renamed file 'src/editor/tools/editor_increase_height_tool.cc' => 'src/editor/tools/increase_height_tool.cc'
--- src/editor/tools/editor_increase_height_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/increase_height_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_increase_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
#include "editor/editorinteractive.h"
#include "logic/field.h"
=== renamed file 'src/editor/tools/editor_increase_height_tool.h' => 'src/editor/tools/increase_height_tool.h'
--- src/editor/tools/editor_increase_height_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/increase_height_tool.h 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_INCREASE_HEIGHT_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_INCREASE_HEIGHT_TOOL_H
+#ifndef WL_EDITOR_TOOLS_INCREASE_HEIGHT_TOOL_H
+#define WL_EDITOR_TOOLS_INCREASE_HEIGHT_TOOL_H
-#include "editor/tools/editor_decrease_height_tool.h"
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/decrease_height_tool.h"
+#include "editor/tools/set_height_tool.h"
/// Increases the height of a field by a value.
struct EditorIncreaseHeightTool : public EditorTool {
@@ -66,4 +66,4 @@
int32_t change_by_;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_INCREASE_HEIGHT_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_INCREASE_HEIGHT_TOOL_H
=== renamed file 'src/editor/tools/editor_increase_resources_tool.cc' => 'src/editor/tools/increase_resources_tool.cc'
--- src/editor/tools/editor_increase_resources_tool.cc 2016-03-18 11:26:21 +0000
+++ src/editor/tools/increase_resources_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_increase_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
#include "editor/editorinteractive.h"
#include "graphic/graphic.h"
=== renamed file 'src/editor/tools/editor_increase_resources_tool.h' => 'src/editor/tools/increase_resources_tool.h'
--- src/editor/tools/editor_increase_resources_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/increase_resources_tool.h 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_INCREASE_RESOURCES_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_INCREASE_RESOURCES_TOOL_H
+#ifndef WL_EDITOR_TOOLS_INCREASE_RESOURCES_TOOL_H
+#define WL_EDITOR_TOOLS_INCREASE_RESOURCES_TOOL_H
-#include "editor/tools/editor_decrease_resources_tool.h"
-#include "editor/tools/editor_set_resources_tool.h"
+#include "editor/tools/decrease_resources_tool.h"
+#include "editor/tools/set_resources_tool.h"
#include "logic/widelands_geometry.h"
/// Increases the resources of a node by a value.
@@ -77,4 +77,4 @@
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_INCREASE_RESOURCES_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_INCREASE_RESOURCES_TOOL_H
=== renamed file 'src/editor/tools/editor_info_tool.cc' => 'src/editor/tools/info_tool.cc'
--- src/editor/tools/editor_info_tool.cc 2016-03-24 18:19:47 +0000
+++ src/editor/tools/info_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_info_tool.h"
+#include "editor/tools/info_tool.h"
#include <cstdio>
#include <vector>
=== renamed file 'src/editor/tools/editor_info_tool.h' => 'src/editor/tools/info_tool.h'
--- src/editor/tools/editor_info_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/info_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_INFO_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_INFO_TOOL_H
+#ifndef WL_EDITOR_TOOLS_INFO_TOOL_H
+#define WL_EDITOR_TOOLS_INFO_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
/// A simple tool to show information about the clicked node.
struct EditorInfoTool : public EditorTool {
@@ -40,4 +40,4 @@
bool has_size_one() const override {return true;}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_INFO_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_INFO_TOOL_H
=== renamed file 'src/editor/tools/editor_make_infrastructure_tool.cc' => 'src/editor/tools/make_infrastructure_tool.cc'
--- src/editor/tools/editor_make_infrastructure_tool.cc 2016-03-14 18:10:09 +0000
+++ src/editor/tools/make_infrastructure_tool.cc 2016-04-06 09:34:03 +0000
@@ -18,7 +18,7 @@
*/
-#include "editor/tools/editor_make_infrastructure_tool.h"
+#include "editor/tools/make_infrastructure_tool.h"
#include "editor/editorinteractive.h"
#include "logic/editor_game_base.h"
=== renamed file 'src/editor/tools/editor_make_infrastructure_tool.h' => 'src/editor/tools/make_infrastructure_tool.h'
--- src/editor/tools/editor_make_infrastructure_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/make_infrastructure_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_MAKE_INFRASTRUCTURE_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_MAKE_INFRASTRUCTURE_TOOL_H
+#ifndef WL_EDITOR_TOOLS_MAKE_INFRASTRUCTURE_TOOL_H
+#define WL_EDITOR_TOOLS_MAKE_INFRASTRUCTURE_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "ui_basic/unique_window.h"
namespace Widelands {
@@ -57,4 +57,4 @@
(const Widelands::TCoords<Widelands::FCoords>& c,
Widelands::EditorGameBase& egbase, int32_t const player);
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_MAKE_INFRASTRUCTURE_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_MAKE_INFRASTRUCTURE_TOOL_H
=== renamed file 'src/editor/tools/editor_noise_height_tool.cc' => 'src/editor/tools/noise_height_tool.cc'
--- src/editor/tools/editor_noise_height_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/noise_height_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,12 +17,12 @@
*
*/
-#include "editor/tools/editor_noise_height_tool.h"
+#include "editor/tools/noise_height_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_decrease_height_tool.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/decrease_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/set_height_tool.h"
#include "logic/field.h"
#include "logic/mapregion.h"
=== renamed file 'src/editor/tools/editor_noise_height_tool.h' => 'src/editor/tools/noise_height_tool.h'
--- src/editor/tools/editor_noise_height_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/noise_height_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_NOISE_HEIGHT_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_NOISE_HEIGHT_TOOL_H
+#ifndef WL_EDITOR_TOOLS_NOISE_HEIGHT_TOOL_H
+#define WL_EDITOR_TOOLS_NOISE_HEIGHT_TOOL_H
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/set_height_tool.h"
/// Set the height of a node to a random value within a defined interval.
struct EditorNoiseHeightTool : public EditorTool {
@@ -66,4 +66,4 @@
Widelands::HeightInterval interval_;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_NOISE_HEIGHT_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_NOISE_HEIGHT_TOOL_H
=== renamed file 'src/editor/tools/editor_place_bob_tool.cc' => 'src/editor/tools/place_bob_tool.cc'
--- src/editor/tools/editor_place_bob_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/place_bob_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_place_bob_tool.h"
+#include "editor/tools/place_bob_tool.h"
#include "editor/editorinteractive.h"
#include "logic/editor_game_base.h"
=== renamed file 'src/editor/tools/editor_place_bob_tool.h' => 'src/editor/tools/place_bob_tool.h'
--- src/editor/tools/editor_place_bob_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/place_bob_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_PLACE_BOB_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_PLACE_BOB_TOOL_H
+#ifndef WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
+#define WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
-#include "editor/tools/editor_delete_bob_tool.h"
+#include "editor/tools/delete_bob_tool.h"
#include "editor/tools/multi_select.h"
/// Places bobs on the map.
@@ -46,4 +46,4 @@
char const * get_sel_impl() const override {return "images/wui/editor/fsel_editor_place_bob.png";}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_PLACE_BOB_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
=== renamed file 'src/editor/tools/editor_place_immovable_tool.cc' => 'src/editor/tools/place_immovable_tool.cc'
--- src/editor/tools/editor_place_immovable_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/place_immovable_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_place_immovable_tool.h"
+#include "editor/tools/place_immovable_tool.h"
#include <string>
=== renamed file 'src/editor/tools/editor_place_immovable_tool.h' => 'src/editor/tools/place_immovable_tool.h'
--- src/editor/tools/editor_place_immovable_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/place_immovable_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_PLACE_IMMOVABLE_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_PLACE_IMMOVABLE_TOOL_H
+#ifndef WL_EDITOR_TOOLS_PLACE_IMMOVABLE_TOOL_H
+#define WL_EDITOR_TOOLS_PLACE_IMMOVABLE_TOOL_H
-#include "editor/tools/editor_delete_immovable_tool.h"
+#include "editor/tools/delete_immovable_tool.h"
#include "editor/tools/multi_select.h"
/**
@@ -50,4 +50,4 @@
}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_PLACE_IMMOVABLE_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_PLACE_IMMOVABLE_TOOL_H
=== renamed file 'src/editor/tools/editor_set_height_tool.cc' => 'src/editor/tools/set_height_tool.cc'
--- src/editor/tools/editor_set_height_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/set_height_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/set_height_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_decrease_height_tool.h"
-#include "editor/tools/editor_increase_height_tool.h"
+#include "editor/tools/decrease_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
#include "logic/field.h"
#include "logic/map.h"
#include "logic/mapregion.h"
=== renamed file 'src/editor/tools/editor_set_height_tool.h' => 'src/editor/tools/set_height_tool.h'
--- src/editor/tools/editor_set_height_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/set_height_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_HEIGHT_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_HEIGHT_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_HEIGHT_TOOL_H
+#define WL_EDITOR_TOOLS_SET_HEIGHT_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/widelands_geometry.h"
#include "logic/field.h"
@@ -59,4 +59,4 @@
Widelands::HeightInterval interval_;
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_HEIGHT_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_HEIGHT_TOOL_H
=== renamed file 'src/editor/tools/editor_set_origin_tool.cc' => 'src/editor/tools/set_origin_tool.cc'
--- src/editor/tools/editor_set_origin_tool.cc 2016-04-03 16:18:24 +0000
+++ src/editor/tools/set_origin_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/tools/editor_set_origin_tool.h"
+#include "editor/tools/set_origin_tool.h"
#include "editor/editorinteractive.h"
#include "logic/map.h"
=== renamed file 'src/editor/tools/editor_set_origin_tool.h' => 'src/editor/tools/set_origin_tool.h'
--- src/editor/tools/editor_set_origin_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/set_origin_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_ORIGIN_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_ORIGIN_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_ORIGIN_TOOL_H
+#define WL_EDITOR_TOOLS_SET_ORIGIN_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/widelands.h"
/// Sets the starting position of players.
@@ -46,4 +46,4 @@
bool has_size_one() const override {return true;}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_ORIGIN_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_ORIGIN_TOOL_H
=== renamed file 'src/editor/tools/editor_set_port_space_tool.cc' => 'src/editor/tools/set_port_space_tool.cc'
--- src/editor/tools/editor_set_port_space_tool.cc 2016-03-22 01:12:29 +0000
+++ src/editor/tools/set_port_space_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#include "editor/tools/editor_set_port_space_tool.h"
+#include "editor/tools/set_port_space_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/map.h"
#include "logic/map_objects/tribes/building.h"
#include "logic/mapfringeregion.h"
=== renamed file 'src/editor/tools/editor_set_port_space_tool.h' => 'src/editor/tools/set_port_space_tool.h'
--- src/editor/tools/editor_set_port_space_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/set_port_space_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_PORT_SPACE_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_PORT_SPACE_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_PORT_SPACE_TOOL_H
+#define WL_EDITOR_TOOLS_SET_PORT_SPACE_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/widelands.h"
#define FSEL_ESPS_FILENAME "images/wui/editor/fsel_editor_set_port_space.png"
@@ -70,4 +70,4 @@
int32_t editor_Tool_set_port_space_callback
(const Widelands::TCoords<Widelands::FCoords>& c, const Widelands::Map& map);
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_PORT_SPACE_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_PORT_SPACE_TOOL_H
=== renamed file 'src/editor/tools/editor_set_resources_tool.cc' => 'src/editor/tools/set_resources_tool.cc'
--- src/editor/tools/editor_set_resources_tool.cc 2016-03-18 11:26:21 +0000
+++ src/editor/tools/set_resources_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,11 +17,11 @@
*
*/
-#include "editor/tools/editor_set_resources_tool.h"
+#include "editor/tools/set_resources_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_decrease_resources_tool.h"
-#include "editor/tools/editor_increase_resources_tool.h"
+#include "editor/tools/decrease_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
#include "graphic/graphic.h"
#include "logic/field.h"
#include "logic/map_objects/world/resource_description.h"
=== renamed file 'src/editor/tools/editor_set_resources_tool.h' => 'src/editor/tools/set_resources_tool.h'
--- src/editor/tools/editor_set_resources_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/set_resources_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_RESOURCES_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_RESOURCES_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_RESOURCES_TOOL_H
+#define WL_EDITOR_TOOLS_SET_RESOURCES_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/mapregion.h"
#include "logic/widelands.h"
@@ -63,4 +63,4 @@
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_RESOURCES_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_RESOURCES_TOOL_H
=== renamed file 'src/editor/tools/editor_set_starting_pos_tool.cc' => 'src/editor/tools/set_starting_pos_tool.cc'
--- src/editor/tools/editor_set_starting_pos_tool.cc 2016-03-14 18:10:09 +0000
+++ src/editor/tools/set_starting_pos_tool.cc 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#include "editor/tools/editor_set_starting_pos_tool.h"
+#include "editor/tools/set_starting_pos_tool.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "graphic/graphic.h"
#include "logic/map.h"
#include "wui/field_overlay_manager.h"
=== renamed file 'src/editor/tools/editor_set_starting_pos_tool.h' => 'src/editor/tools/set_starting_pos_tool.h'
--- src/editor/tools/editor_set_starting_pos_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/set_starting_pos_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_STARTING_POS_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_STARTING_POS_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_STARTING_POS_TOOL_H
+#define WL_EDITOR_TOOLS_SET_STARTING_POS_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "logic/widelands.h"
// How much place should be left around a player position
@@ -52,4 +52,4 @@
int32_t editor_tool_set_starting_pos_callback
(const Widelands::TCoords<Widelands::FCoords>& c, Widelands::Map& map);
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_STARTING_POS_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_STARTING_POS_TOOL_H
=== renamed file 'src/editor/tools/editor_set_terrain_tool.cc' => 'src/editor/tools/set_terrain_tool.cc'
--- src/editor/tools/editor_set_terrain_tool.cc 2016-03-16 08:13:16 +0000
+++ src/editor/tools/set_terrain_tool.cc 2016-04-06 09:34:03 +0000
@@ -18,7 +18,7 @@
*/
-#include "editor/tools/editor_set_terrain_tool.h"
+#include "editor/tools/set_terrain_tool.h"
#include "editor/editorinteractive.h"
#include "logic/maptriangleregion.h"
=== renamed file 'src/editor/tools/editor_set_terrain_tool.h' => 'src/editor/tools/set_terrain_tool.h'
--- src/editor/tools/editor_set_terrain_tool.h 2016-01-28 05:24:34 +0000
+++ src/editor/tools/set_terrain_tool.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_SET_TERRAIN_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_SET_TERRAIN_TOOL_H
+#ifndef WL_EDITOR_TOOLS_SET_TERRAIN_TOOL_H
+#define WL_EDITOR_TOOLS_SET_TERRAIN_TOOL_H
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "editor/tools/multi_select.h"
struct EditorSetTerrainTool : public EditorTool, public MultiSelect {
@@ -44,4 +44,4 @@
bool operates_on_triangles() const override {return true;}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_SET_TERRAIN_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_SET_TERRAIN_TOOL_H
=== renamed file 'src/editor/tools/editor_tool.h' => 'src/editor/tools/tool.h'
--- src/editor/tools/editor_tool.h 2016-03-14 18:10:09 +0000
+++ src/editor/tools/tool.h 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_TOOL_H
-#define WL_EDITOR_TOOLS_EDITOR_TOOL_H
+#ifndef WL_EDITOR_TOOLS_TOOL_H
+#define WL_EDITOR_TOOLS_TOOL_H
#define MAX_TOOL_AREA 9
#include "base/macros.h"
-#include "editor/tools/editor_action_args.h"
+#include "editor/tools/action_args.h"
#include "logic/widelands_geometry.h"
class EditorInteractive;
@@ -106,4 +106,4 @@
DISALLOW_COPY_AND_ASSIGN(EditorTool);
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_TOOL_H
+#endif // end of include guard: WL_EDITOR_TOOLS_TOOL_H
=== renamed file 'src/editor/tools/editor_tool_action.h' => 'src/editor/tools/tool_action.h'
--- src/editor/tools/editor_tool_action.h 2016-01-16 12:55:14 +0000
+++ src/editor/tools/tool_action.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_TOOLS_EDITOR_TOOL_ACTION_H
-#define WL_EDITOR_TOOLS_EDITOR_TOOL_ACTION_H
+#ifndef WL_EDITOR_TOOLS_TOOL_ACTION_H
+#define WL_EDITOR_TOOLS_TOOL_ACTION_H
-#include "editor/tools/editor_action_args.h"
+#include "editor/tools/action_args.h"
#include "logic/widelands_geometry.h"
class EditorTool;
@@ -63,4 +63,4 @@
{args->refcount++;}
};
-#endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_TOOL_ACTION_H
+#endif // end of include guard: WL_EDITOR_TOOLS_TOOL_ACTION_H
=== renamed file 'src/editor/ui_menus/editor_help.cc' => 'src/editor/ui_menus/help.cc'
--- src/editor/ui_menus/editor_help.cc 2016-04-02 16:26:33 +0000
+++ src/editor/ui_menus/help.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_help.h"
+#include "editor/ui_menus/help.h"
#include <memory>
=== renamed file 'src/editor/ui_menus/editor_help.h' => 'src/editor/ui_menus/help.h'
--- src/editor/ui_menus/editor_help.h 2016-04-02 08:02:53 +0000
+++ src/editor/ui_menus/help.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_HELP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_HELP_H
+#ifndef WL_EDITOR_UI_MENUS_HELP_H
+#define WL_EDITOR_UI_MENUS_HELP_H
#include "scripting/lua_interface.h"
#include "ui_basic/unique_window.h"
@@ -30,4 +30,4 @@
EditorHelp(EditorInteractive&, UI::UniqueWindow::Registry&, LuaInterface* const lua);
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_HELP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_HELP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu.cc' => 'src/editor/ui_menus/main_menu.cc'
--- src/editor/ui_menus/editor_main_menu.cc 2016-04-02 07:33:57 +0000
+++ src/editor/ui_menus/main_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,15 +17,15 @@
*
*/
-#include "editor/ui_menus/editor_main_menu.h"
+#include "editor/ui_menus/main_menu.h"
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/ui_menus/editor_main_menu_load_map.h"
-#include "editor/ui_menus/editor_main_menu_map_options.h"
-#include "editor/ui_menus/editor_main_menu_new_map.h"
-#include "editor/ui_menus/editor_main_menu_random_map.h"
-#include "editor/ui_menus/editor_main_menu_save_map.h"
+#include "editor/ui_menus/main_menu_load_map.h"
+#include "editor/ui_menus/main_menu_map_options.h"
+#include "editor/ui_menus/main_menu_new_map.h"
+#include "editor/ui_menus/main_menu_random_map.h"
+#include "editor/ui_menus/main_menu_save_map.h"
// TODO(unknown): these should be defined globally for the whole UI
#define width 200
=== renamed file 'src/editor/ui_menus/editor_main_menu.h' => 'src/editor/ui_menus/main_menu.h'
--- src/editor/ui_menus/editor_main_menu.h 2016-04-02 07:33:57 +0000
+++ src/editor/ui_menus/main_menu.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_H
#include "ui_basic/box.h"
#include "ui_basic/button.h"
@@ -51,4 +51,4 @@
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_load_map.cc' => 'src/editor/ui_menus/main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc 2016-01-28 05:24:34 +0000
+++ src/editor/ui_menus/main_menu_load_map.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_load_map.h"
+#include "editor/ui_menus/main_menu_load_map.h"
#include "base/i18n.h"
#include "editor/editorinteractive.h"
=== renamed file 'src/editor/ui_menus/editor_main_menu_load_map.h' => 'src/editor/ui_menus/main_menu_load_map.h'
--- src/editor/ui_menus/editor_main_menu_load_map.h 2015-03-06 11:16:11 +0000
+++ src/editor/ui_menus/main_menu_load_map.h 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_MAP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_MAP_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_MAP_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_MAP_H
#include <string>
#include "editor/editorinteractive.h"
-#include "editor/ui_menus/editor_main_menu_load_or_save_map.h"
+#include "editor/ui_menus/main_menu_load_or_save_map.h"
/**
* Choose a filename and save your brand new created map
@@ -38,4 +38,4 @@
void entry_selected();
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_MAP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_MAP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_load_or_save_map.cc' => 'src/editor/ui_menus/main_menu_load_or_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_or_save_map.cc 2016-03-02 17:11:16 +0000
+++ src/editor/ui_menus/main_menu_load_or_save_map.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_load_or_save_map.h"
+#include "editor/ui_menus/main_menu_load_or_save_map.h"
#include <cstdio>
#include <memory>
=== renamed file 'src/editor/ui_menus/editor_main_menu_load_or_save_map.h' => 'src/editor/ui_menus/main_menu_load_or_save_map.h'
--- src/editor/ui_menus/editor_main_menu_load_or_save_map.h 2015-10-02 09:26:57 +0000
+++ src/editor/ui_menus/main_menu_load_or_save_map.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_OR_SAVE_MAP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_OR_SAVE_MAP_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_OR_SAVE_MAP_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_OR_SAVE_MAP_H
#include <string>
@@ -68,4 +68,4 @@
UI::Button* show_mapnames_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_OR_SAVE_MAP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_LOAD_OR_SAVE_MAP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_map_options.cc' => 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/editor_main_menu_map_options.cc 2016-03-10 12:40:49 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_map_options.h"
+#include "editor/ui_menus/main_menu_map_options.h"
#include <cstdio>
#include <string>
=== renamed file 'src/editor/ui_menus/editor_main_menu_map_options.h' => 'src/editor/ui_menus/main_menu_map_options.h'
--- src/editor/ui_menus/editor_main_menu_map_options.h 2016-02-03 22:42:34 +0000
+++ src/editor/ui_menus/main_menu_map_options.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_MAP_OPTIONS_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_MAP_OPTIONS_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_MAP_OPTIONS_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_MAP_OPTIONS_H
#include "ui_basic/box.h"
#include "ui_basic/button.h"
@@ -69,4 +69,4 @@
bool modal_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_MAP_OPTIONS_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_MAP_OPTIONS_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_new_map.cc' => 'src/editor/ui_menus/main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc 2016-03-26 18:42:32 +0000
+++ src/editor/ui_menus/main_menu_new_map.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_new_map.h"
+#include "editor/ui_menus/main_menu_new_map.h"
#include <memory>
#include <string>
=== renamed file 'src/editor/ui_menus/editor_main_menu_new_map.h' => 'src/editor/ui_menus/main_menu_new_map.h'
--- src/editor/ui_menus/editor_main_menu_new_map.h 2016-01-16 12:55:14 +0000
+++ src/editor/ui_menus/main_menu_new_map.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_NEW_MAP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_NEW_MAP_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_NEW_MAP_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_NEW_MAP_H
#include "logic/description_maintainer.h"
#include "ui_basic/box.h"
@@ -57,4 +57,4 @@
UI::Button ok_button_, cancel_button_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_NEW_MAP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_NEW_MAP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_random_map.cc' => 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc 2016-04-05 07:51:48 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_random_map.h"
+#include "editor/ui_menus/main_menu_random_map.h"
#include <cstring>
#include <sstream>
=== renamed file 'src/editor/ui_menus/editor_main_menu_random_map.h' => 'src/editor/ui_menus/main_menu_random_map.h'
--- src/editor/ui_menus/editor_main_menu_random_map.h 2016-01-16 12:55:14 +0000
+++ src/editor/ui_menus/main_menu_random_map.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_RANDOM_MAP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_RANDOM_MAP_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_RANDOM_MAP_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_RANDOM_MAP_H
#include <vector>
@@ -129,4 +129,4 @@
DISALLOW_COPY_AND_ASSIGN(MainMenuNewRandomMap);
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_RANDOM_MAP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_RANDOM_MAP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_save_map.cc' => 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc 2016-03-08 15:21:41 +0000
+++ src/editor/ui_menus/main_menu_save_map.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_save_map.h"
+#include "editor/ui_menus/main_menu_save_map.h"
#include <cstdio>
#include <cstring>
@@ -31,8 +31,8 @@
#include "base/macros.h"
#include "base/wexception.h"
#include "editor/editorinteractive.h"
-#include "editor/ui_menus/editor_main_menu_map_options.h"
-#include "editor/ui_menus/editor_main_menu_save_map_make_directory.h"
+#include "editor/ui_menus/main_menu_map_options.h"
+#include "editor/ui_menus/main_menu_save_map_make_directory.h"
#include "graphic/graphic.h"
#include "io/filesystem/filesystem.h"
#include "io/filesystem/layered_filesystem.h"
=== renamed file 'src/editor/ui_menus/editor_main_menu_save_map.h' => 'src/editor/ui_menus/main_menu_save_map.h'
--- src/editor/ui_menus/editor_main_menu_save_map.h 2015-10-02 07:02:00 +0000
+++ src/editor/ui_menus/main_menu_save_map.h 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_H
#include <string>
#include "editor/editorinteractive.h"
-#include "editor/ui_menus/editor_main_menu_load_or_save_map.h"
+#include "editor/ui_menus/main_menu_load_or_save_map.h"
#include "ui_basic/button.h"
#include "ui_basic/editbox.h"
#include "ui_basic/textarea.h"
@@ -51,4 +51,4 @@
UI::EditBox* editbox_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_H
=== renamed file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc' => 'src/editor/ui_menus/main_menu_save_map_make_directory.cc'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc 2016-02-09 21:14:53 +0000
+++ src/editor/ui_menus/main_menu_save_map_make_directory.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_main_menu_save_map_make_directory.h"
+#include "editor/ui_menus/main_menu_save_map_make_directory.h"
#include "base/i18n.h"
#include "graphic/font_handler1.h"
=== renamed file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.h' => 'src/editor/ui_menus/main_menu_save_map_make_directory.h'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.h 2015-02-28 08:08:35 +0000
+++ src/editor/ui_menus/main_menu_save_map_make_directory.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
-#define WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
+#ifndef WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
+#define WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
#include <string>
@@ -52,4 +52,4 @@
void edit_changed();
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_MAIN_MENU_SAVE_MAP_MAKE_DIRECTORY_H
=== renamed file 'src/editor/ui_menus/editor_player_menu.cc' => 'src/editor/ui_menus/player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc 2016-04-03 18:34:26 +0000
+++ src/editor/ui_menus/player_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,14 +17,14 @@
*
*/
-#include "editor/ui_menus/editor_player_menu.h"
+#include "editor/ui_menus/player_menu.h"
#include <boost/format.hpp>
#include "base/i18n.h"
#include "base/wexception.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_set_starting_pos_tool.h"
+#include "editor/tools/set_starting_pos_tool.h"
#include "graphic/graphic.h"
#include "logic/constants.h"
#include "logic/map.h"
=== renamed file 'src/editor/ui_menus/editor_player_menu.h' => 'src/editor/ui_menus/player_menu.h'
--- src/editor/ui_menus/editor_player_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/player_menu.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_PLAYER_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_PLAYER_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_PLAYER_MENU_H
+#define WL_EDITOR_UI_MENUS_PLAYER_MENU_H
#include <cstring>
#include <map>
@@ -72,4 +72,4 @@
void make_infrastructure_clicked(uint8_t);
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_PLAYER_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_PLAYER_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_change_height_options_menu.cc' => 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.cc 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,15 +17,15 @@
*
*/
-#include "editor/ui_menus/editor_tool_change_height_options_menu.h"
+#include "editor/ui_menus/tool_change_height_options_menu.h"
#include <cstdio>
#include <string>
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_set_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/set_height_tool.h"
#include "graphic/graphic.h"
#include "logic/widelands_geometry.h"
#include "ui_basic/button.h"
=== renamed file 'src/editor/ui_menus/editor_tool_change_height_options_menu.h' => 'src/editor/ui_menus/tool_change_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
#include "ui_basic/button.h"
#include "ui_basic/textarea.h"
@@ -51,4 +51,4 @@
void update();
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_CHANGE_HEIGHT_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc' => 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc 2016-04-01 09:29:17 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_tool_change_resources_options_menu.h"
+#include "editor/ui_menus/tool_change_resources_options_menu.h"
#include <cstdio>
#include <string>
@@ -25,8 +25,8 @@
#include "base/i18n.h"
#include "base/wexception.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_increase_resources_tool.h"
-#include "editor/tools/editor_set_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
+#include "editor/tools/set_resources_tool.h"
#include "graphic/graphic.h"
#include "logic/map.h"
#include "logic/map_objects/world/resource_description.h"
=== renamed file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.h' => 'src/editor/ui_menus/tool_change_resources_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
#include "ui_basic/button.h"
#include "ui_basic/radiobutton.h"
#include "ui_basic/textarea.h"
@@ -56,4 +56,4 @@
EditorIncreaseResourcesTool& increase_tool_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_menu.cc' => 'src/editor/ui_menus/tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc 2016-04-01 07:53:35 +0000
+++ src/editor/ui_menus/tool_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,26 +17,26 @@
*
*/
-#include "editor/ui_menus/editor_tool_menu.h"
+#include "editor/ui_menus/tool_menu.h"
#include "base/i18n.h"
#include "base/wexception.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_decrease_height_tool.h"
-#include "editor/tools/editor_decrease_resources_tool.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_increase_resources_tool.h"
-#include "editor/tools/editor_noise_height_tool.h"
-#include "editor/tools/editor_place_bob_tool.h"
-#include "editor/tools/editor_place_immovable_tool.h"
-#include "editor/tools/editor_set_port_space_tool.h"
-#include "editor/tools/editor_set_terrain_tool.h"
-#include "editor/ui_menus/editor_tool_change_height_options_menu.h"
-#include "editor/ui_menus/editor_tool_change_resources_options_menu.h"
-#include "editor/ui_menus/editor_tool_noise_height_options_menu.h"
-#include "editor/ui_menus/editor_tool_place_bob_options_menu.h"
-#include "editor/ui_menus/editor_tool_place_immovable_options_menu.h"
-#include "editor/ui_menus/editor_tool_set_terrain_options_menu.h"
+#include "editor/tools/decrease_height_tool.h"
+#include "editor/tools/decrease_resources_tool.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/increase_resources_tool.h"
+#include "editor/tools/noise_height_tool.h"
+#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_immovable_tool.h"
+#include "editor/tools/set_port_space_tool.h"
+#include "editor/tools/set_terrain_tool.h"
+#include "editor/ui_menus/tool_change_height_options_menu.h"
+#include "editor/ui_menus/tool_change_resources_options_menu.h"
+#include "editor/ui_menus/tool_noise_height_options_menu.h"
+#include "editor/ui_menus/tool_place_bob_options_menu.h"
+#include "editor/ui_menus/tool_place_immovable_options_menu.h"
+#include "editor/ui_menus/tool_set_terrain_options_menu.h"
#include "graphic/graphic.h"
#include "ui_basic/radiobutton.h"
#include "ui_basic/textarea.h"
=== renamed file 'src/editor/ui_menus/editor_tool_menu.h' => 'src/editor/ui_menus/tool_menu.h'
--- src/editor/ui_menus/editor_tool_menu.h 2016-01-16 15:57:31 +0000
+++ src/editor/ui_menus/tool_menu.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_MENU_H
#include "editor/editorinteractive.h"
#include "ui_basic/radiobutton.h"
@@ -34,4 +34,4 @@
void changed_to();
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.cc' => 'src/editor/ui_menus/tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.cc 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_tool_noise_height_options_menu.h"
+#include "editor/ui_menus/tool_noise_height_options_menu.h"
#include <cstdio>
@@ -25,9 +25,9 @@
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_decrease_height_tool.h"
-#include "editor/tools/editor_increase_height_tool.h"
-#include "editor/tools/editor_noise_height_tool.h"
+#include "editor/tools/decrease_height_tool.h"
+#include "editor/tools/increase_height_tool.h"
+#include "editor/tools/noise_height_tool.h"
#include "graphic/graphic.h"
#include "logic/widelands_geometry.h"
=== renamed file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.h' => 'src/editor/ui_menus/tool_noise_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,10 +17,10 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
#include "ui_basic/button.h"
#include "ui_basic/textarea.h"
@@ -49,4 +49,4 @@
void update();
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_NOISE_HEIGHT_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_options_menu.cc' => 'src/editor/ui_menus/tool_options_menu.cc'
--- src/editor/ui_menus/editor_tool_options_menu.cc 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
EditorToolOptionsMenu::EditorToolOptionsMenu
(EditorInteractive & parent,
=== renamed file 'src/editor/ui_menus/editor_tool_options_menu.h' => 'src/editor/ui_menus/tool_options_menu.h'
--- src/editor/ui_menus/editor_tool_options_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_OPTIONS_MENU_H
#include "editor/editorinteractive.h"
#include "ui_basic/unique_window.h"
@@ -46,4 +46,4 @@
EditorTool * current_pointer_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.cc' => 'src/editor/ui_menus/tool_place_bob_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.cc 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_place_bob_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,14 +17,14 @@
*
*/
-#include "editor/ui_menus/editor_tool_place_bob_options_menu.h"
+#include "editor/ui_menus/tool_place_bob_options_menu.h"
#include <SDL_keycode.h>
#include "base/i18n.h"
#include "base/macros.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_place_bob_tool.h"
+#include "editor/tools/place_bob_tool.h"
#include "graphic/graphic.h"
#include "logic/map.h"
#include "logic/map_objects/world/critter.h"
=== renamed file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.h' => 'src/editor/ui_menus/tool_place_bob_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/tool_place_bob_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,12 +17,12 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_BOB_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_BOB_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
#include <vector>
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
#include "ui_basic/tabpanel.h"
struct EditorPlaceBobTool;
@@ -43,4 +43,4 @@
bool click_recursion_protect_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_BOB_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc' => 'src/editor/ui_menus/tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc 2015-11-28 22:29:26 +0000
+++ src/editor/ui_menus/tool_place_immovable_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,13 +17,13 @@
*
*/
-#include "editor/ui_menus/editor_tool_place_immovable_options_menu.h"
+#include "editor/ui_menus/tool_place_immovable_options_menu.h"
#include <SDL_keycode.h>
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_place_immovable_tool.h"
+#include "editor/tools/place_immovable_tool.h"
#include "graphic/graphic.h"
#include "logic/map.h"
#include "logic/map_objects/world/world.h"
=== renamed file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.h' => 'src/editor/ui_menus/tool_place_immovable_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.h 2016-01-16 12:55:14 +0000
+++ src/editor/ui_menus/tool_place_immovable_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,15 +17,15 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
#include <memory>
#include <vector>
#include "editor/ui_menus/categorized_item_selection_menu.h"
-#include "editor/ui_menus/editor_tool_options_menu.h"
-#include "editor/tools/editor_place_immovable_tool.h"
+#include "editor/ui_menus/tool_options_menu.h"
+#include "editor/tools/place_immovable_tool.h"
class EditorInteractive;
@@ -40,4 +40,4 @@
multi_select_menu_;
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_PLACE_IMMOVABLE_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc' => 'src/editor/ui_menus/tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc 2016-03-29 10:04:48 +0000
+++ src/editor/ui_menus/tool_set_terrain_options_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_tool_set_terrain_options_menu.h"
+#include "editor/ui_menus/tool_set_terrain_options_menu.h"
#include <memory>
@@ -26,7 +26,7 @@
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_set_terrain_tool.h"
+#include "editor/tools/set_terrain_tool.h"
#include "graphic/graphic.h"
#include "graphic/rendertarget.h"
#include "graphic/texture.h"
=== renamed file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.h' => 'src/editor/ui_menus/tool_set_terrain_options_menu.h'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.h 2016-01-16 12:55:14 +0000
+++ src/editor/ui_menus/tool_set_terrain_options_menu.h 2016-04-06 09:34:03 +0000
@@ -17,15 +17,15 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOL_SET_TERRAIN_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOL_SET_TERRAIN_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_SET_TERRAIN_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_SET_TERRAIN_OPTIONS_MENU_H
#include <map>
#include <memory>
#include <vector>
#include "editor/ui_menus/categorized_item_selection_menu.h"
-#include "editor/ui_menus/editor_tool_options_menu.h"
+#include "editor/ui_menus/tool_options_menu.h"
#include "logic/map_objects/world/terrain_description.h"
#include "ui_basic/textarea.h"
@@ -45,4 +45,4 @@
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_SET_TERRAIN_OPTIONS_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOL_SET_TERRAIN_OPTIONS_MENU_H
=== renamed file 'src/editor/ui_menus/editor_toolsize_menu.cc' => 'src/editor/ui_menus/toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/toolsize_menu.cc 2016-04-06 09:34:03 +0000
@@ -17,7 +17,7 @@
*
*/
-#include "editor/ui_menus/editor_toolsize_menu.h"
+#include "editor/ui_menus/toolsize_menu.h"
#include <cstdio>
@@ -25,7 +25,7 @@
#include "base/i18n.h"
#include "editor/editorinteractive.h"
-#include "editor/tools/editor_tool.h"
+#include "editor/tools/tool.h"
#include "graphic/graphic.h"
inline EditorInteractive & EditorToolsizeMenu::eia() {
=== renamed file 'src/editor/ui_menus/editor_toolsize_menu.h' => 'src/editor/ui_menus/toolsize_menu.h'
--- src/editor/ui_menus/editor_toolsize_menu.h 2016-03-14 18:10:09 +0000
+++ src/editor/ui_menus/toolsize_menu.h 2016-04-06 09:34:03 +0000
@@ -17,8 +17,8 @@
*
*/
-#ifndef WL_EDITOR_UI_MENUS_EDITOR_TOOLSIZE_MENU_H
-#define WL_EDITOR_UI_MENUS_EDITOR_TOOLSIZE_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOLSIZE_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOLSIZE_MENU_H
#include "ui_basic/button.h"
#include "ui_basic/textarea.h"
@@ -46,4 +46,4 @@
};
-#endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOLSIZE_MENU_H
+#endif // end of include guard: WL_EDITOR_UI_MENUS_TOOLSIZE_MENU_H
=== modified file 'src/logic/map.cc'
--- src/logic/map.cc 2016-03-22 01:12:29 +0000
+++ src/logic/map.cc 2016-04-06 09:34:03 +0000
@@ -32,7 +32,7 @@
#include "build_info.h"
#include "economy/flag.h"
#include "economy/road.h"
-#include "editor/tools/editor_increase_resources_tool.h"
+#include "editor/tools/increase_resources_tool.h"
#include "io/filesystem/layered_filesystem.h"
#include "logic/findimmovable.h"
#include "logic/findnode.h"
Follow ups
