Move src/widgets/editor.h to src/widgets/editor/editor.h.

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"

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"
 

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

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"
 
 //////////////////////////////////////////////////////////////////////

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"
 

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

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"

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"
 
 //////////////////////////////////////////////////////////////////////

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"
 

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 <cstdlib>
 #include <cstring>

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

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();		\

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;
 

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"

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)

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;

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()

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 */

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

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"
 

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)
 {

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 <algorithm>