From b40a20e8aaae1131747eadabb08da43c39822540 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sun, 27 Mar 2011 14:54:37 -0300 Subject: [PATCH] Move src/widgets/editor.h to src/widgets/editor/editor.h. --- src/app.cpp | 2 +- src/commands/cmd_configure_tools.cpp | 2 +- src/commands/cmd_eyedropper.cpp | 2 +- src/commands/cmd_goto_frame.cpp | 2 +- src/commands/cmd_goto_layer.cpp | 2 +- src/commands/cmd_options.cpp | 2 +- src/commands/cmd_palette_editor.cpp | 2 +- src/commands/cmd_play_animation.cpp | 2 +- src/commands/cmd_preview.cpp | 2 +- src/commands/filters/filter_manager_impl.cpp | 2 +- src/commands/filters/filter_worker.cpp | 2 +- src/modules/editors.cpp | 2 +- src/modules/gfx.cpp | 2 +- src/modules/gui.cpp | 2 +- src/util/misc.cpp | 2 +- src/util/misc.h | 2 +- src/widgets/color_button.cpp | 2 +- src/widgets/editor/click.cpp | 2 +- src/widgets/editor/cursor.cpp | 2 +- src/widgets/editor/editor.cpp | 2 +- src/widgets/{ => editor}/editor.h | 0 src/widgets/editor/keys.cpp | 2 +- src/widgets/statebar.cpp | 2 +- 23 files changed, 22 insertions(+), 22 deletions(-) rename src/widgets/{ => editor}/editor.h (100%) diff --git a/src/app.cpp b/src/app.cpp index 5c25cb8f4..6a03b1ae8 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -52,7 +52,7 @@ #include "util/boundary.h" #include "util/render.h" #include "widgets/color_bar.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/menuitem.h" #include "widgets/statebar.h" #include "widgets/tabs.h" diff --git a/src/commands/cmd_configure_tools.cpp b/src/commands/cmd_configure_tools.cpp index b8855ad0e..19c8ac73e 100644 --- a/src/commands/cmd_configure_tools.cpp +++ b/src/commands/cmd_configure_tools.cpp @@ -41,7 +41,7 @@ #include "tools/tool.h" #include "ui_context.h" #include "widgets/color_button.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/groupbut.h" #include "widgets/statebar.h" diff --git a/src/commands/cmd_eyedropper.cpp b/src/commands/cmd_eyedropper.cpp index 2bafdda35..bef564be8 100644 --- a/src/commands/cmd_eyedropper.cpp +++ b/src/commands/cmd_eyedropper.cpp @@ -29,7 +29,7 @@ #include "raster/sprite.h" #include "raster/image.h" #include "widgets/color_bar.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" ////////////////////////////////////////////////////////////////////// // eyedropper diff --git a/src/commands/cmd_goto_frame.cpp b/src/commands/cmd_goto_frame.cpp index 854b89166..0ba17e0e0 100644 --- a/src/commands/cmd_goto_frame.cpp +++ b/src/commands/cmd_goto_frame.cpp @@ -22,7 +22,7 @@ #include "modules/gui.h" #include "modules/editors.h" #include "raster/sprite.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "document_wrappers.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/commands/cmd_goto_layer.cpp b/src/commands/cmd_goto_layer.cpp index 6cf28ce6b..852b0b623 100644 --- a/src/commands/cmd_goto_layer.cpp +++ b/src/commands/cmd_goto_layer.cpp @@ -24,7 +24,7 @@ #include "modules/editors.h" #include "raster/layer.h" #include "raster/sprite.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" #include "document_wrappers.h" diff --git a/src/commands/cmd_options.cpp b/src/commands/cmd_options.cpp index 3a1992166..b2b96f2dd 100644 --- a/src/commands/cmd_options.cpp +++ b/src/commands/cmd_options.cpp @@ -32,7 +32,7 @@ #include "raster/image.h" #include "util/render.h" #include "widgets/color_button.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" ////////////////////////////////////////////////////////////////////// // options diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp index c29c590c9..6fffbb439 100644 --- a/src/commands/cmd_palette_editor.cpp +++ b/src/commands/cmd_palette_editor.cpp @@ -46,7 +46,7 @@ #include "undo/undo_history.h" #include "widgets/color_bar.h" #include "widgets/color_sliders.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/hex_color_entry.h" #include "widgets/palette_view.h" #include "widgets/statebar.h" diff --git a/src/commands/cmd_play_animation.cpp b/src/commands/cmd_play_animation.cpp index 24b657a70..b82685c3c 100644 --- a/src/commands/cmd_play_animation.cpp +++ b/src/commands/cmd_play_animation.cpp @@ -29,7 +29,7 @@ #include "raster/image.h" #include "raster/palette.h" #include "raster/sprite.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "document_wrappers.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/commands/cmd_preview.cpp b/src/commands/cmd_preview.cpp index 5e0d16db8..4b07e4ec5 100644 --- a/src/commands/cmd_preview.cpp +++ b/src/commands/cmd_preview.cpp @@ -33,7 +33,7 @@ #include "raster/palette.h" #include "raster/sprite.h" #include "util/render.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" #include "document_wrappers.h" diff --git a/src/commands/filters/filter_manager_impl.cpp b/src/commands/filters/filter_manager_impl.cpp index b9c737a5e..dce4e1096 100644 --- a/src/commands/filters/filter_manager_impl.cpp +++ b/src/commands/filters/filter_manager_impl.cpp @@ -36,7 +36,7 @@ #include "raster/sprite.h" #include "raster/stock.h" #include "undo/undo_history.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include #include diff --git a/src/commands/filters/filter_worker.cpp b/src/commands/filters/filter_worker.cpp index 7497a08d9..ee227afc8 100644 --- a/src/commands/filters/filter_worker.cpp +++ b/src/commands/filters/filter_worker.cpp @@ -31,7 +31,7 @@ #include "modules/editors.h" #include "modules/gui.h" #include "raster/sprite.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" // Applies filters in two threads: a background worker thread to diff --git a/src/modules/editors.cpp b/src/modules/editors.cpp index 3ec3934df..ac2e7e1c7 100644 --- a/src/modules/editors.cpp +++ b/src/modules/editors.cpp @@ -32,7 +32,7 @@ #include "raster/image.h" #include "raster/sprite.h" #include "util/misc.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #define FIXUP_TOP_WINDOW() \ app_get_top_window()->remap_window(); \ diff --git a/src/modules/gfx.cpp b/src/modules/gfx.cpp index 3289e3679..f39e666b9 100644 --- a/src/modules/gfx.cpp +++ b/src/modules/gfx.cpp @@ -39,7 +39,7 @@ #include "raster/image.h" #include "raster/palette.h" #include "skin/skin_theme.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" using namespace gfx; diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp index 3803df005..c6cd9395c 100644 --- a/src/modules/gui.cpp +++ b/src/modules/gui.cpp @@ -52,7 +52,7 @@ #include "document_wrappers.h" #include "tools/toolbox.h" #include "ui_context.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" #include "widgets/toolbar.h" #include "xml_widgets.h" diff --git a/src/util/misc.cpp b/src/util/misc.cpp index ea357b0e9..b01c038f7 100644 --- a/src/util/misc.cpp +++ b/src/util/misc.cpp @@ -34,7 +34,7 @@ #include "raster/raster.h" #include "undo/undo_history.h" #include "util/misc.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" Image* NewImageFromMask(const Document* srcDocument) diff --git a/src/util/misc.h b/src/util/misc.h index e54b802bf..bca2e570d 100644 --- a/src/util/misc.h +++ b/src/util/misc.h @@ -20,7 +20,7 @@ #define UTIL_MISC_H_INCLUDED #include "app/color.h" -#include "widgets/editor.h" // For movement modes +#include "widgets/editor/editor.h" // For movement modes class Image; class Document; diff --git a/src/widgets/color_button.cpp b/src/widgets/color_button.cpp index a52cb6dcc..794808458 100644 --- a/src/widgets/color_button.cpp +++ b/src/widgets/color_button.cpp @@ -31,7 +31,7 @@ #include "widgets/color_bar.h" #include "widgets/color_button.h" #include "widgets/color_selector.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" static int colorbutton_type() diff --git a/src/widgets/editor/click.cpp b/src/widgets/editor/click.cpp index 577bec2f7..4dd42aea3 100644 --- a/src/widgets/editor/click.cpp +++ b/src/widgets/editor/click.cpp @@ -27,7 +27,7 @@ #include "gui/view.h" #include "gui/widget.h" #include "modules/gui.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" /**********************************************************************/ /* editor-click interface */ diff --git a/src/widgets/editor/cursor.cpp b/src/widgets/editor/cursor.cpp index 31ed45e8e..3bbd4c238 100644 --- a/src/widgets/editor/cursor.cpp +++ b/src/widgets/editor/cursor.cpp @@ -40,7 +40,7 @@ #include "tools/tool.h" #include "ui_context.h" #include "util/boundary.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #ifdef WIN32 #undef max diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp index ce0db843a..96a67a1b0 100644 --- a/src/widgets/editor/editor.cpp +++ b/src/widgets/editor/editor.cpp @@ -45,7 +45,7 @@ #include "util/misc.h" #include "util/render.h" #include "widgets/color_bar.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/editor/pixels_movement.h" #include "widgets/statebar.h" diff --git a/src/widgets/editor.h b/src/widgets/editor/editor.h similarity index 100% rename from src/widgets/editor.h rename to src/widgets/editor/editor.h diff --git a/src/widgets/editor/keys.cpp b/src/widgets/editor/keys.cpp index d0bb94242..3414cb70f 100644 --- a/src/widgets/editor/keys.cpp +++ b/src/widgets/editor/keys.cpp @@ -33,7 +33,7 @@ #include "settings/settings.h" #include "ui_context.h" #include "widgets/color_bar.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" bool Editor::editor_keys_toset_zoom(int scancode) { diff --git a/src/widgets/statebar.cpp b/src/widgets/statebar.cpp index b950e7060..9424959a4 100644 --- a/src/widgets/statebar.cpp +++ b/src/widgets/statebar.cpp @@ -39,7 +39,7 @@ #include "undo/undo_history.h" #include "util/misc.h" #include "widgets/color_button.h" -#include "widgets/editor.h" +#include "widgets/editor/editor.h" #include "widgets/statebar.h" #include