Move UndoHistory from raster/ to undo/ directory.

src/CMakeLists.txt

@@ -213,7 +213,6 @@ add_library(aseprite-library
   raster/rotate.cpp
   raster/sprite.cpp
   raster/stock.cpp
-  raster/undo_history.cpp
   settings/ui_settings_impl.cpp
   skin/button_icon_impl.cpp
   skin/skin_theme.cpp
@@ -221,6 +220,7 @@ add_library(aseprite-library
   skin/skin_slider_property.cpp
   tools/tool.cpp
   tools/toolbox.cpp
+  undo/undo_history.cpp
   util/autocrop.cpp
   util/boundary.cpp
   util/celmove.cpp

src/commands/cmd_cel_properties.cpp

@@ -18,21 +18,20 @@
 
 #include "config.h"
 
-#include <allegro/unicode.h>
-
-#include "gui/gui.h"
-
 #include "app.h"
-#include "commands/command.h"
 #include "base/mem_utils.h"
+#include "commands/command.h"
+#include "document_wrappers.h"
+#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
+
+#include <allegro/unicode.h>
 
 class CelPropertiesCommand : public Command
 {

src/commands/cmd_clear.cpp

@@ -25,7 +25,7 @@
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "undo_transaction.h"
 #include "widgets/color_bar.h"
 

src/commands/cmd_duplicate_layer.cpp

@@ -18,16 +18,15 @@
 
 #include "config.h"
 
-#include "gui/gui.h"
-
+#include "app.h"
 #include "commands/command.h"
 #include "console.h"
-#include "app.h"
+#include "document_wrappers.h"
+#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 //////////////////////////////////////////////////////////////////////
 // Duplicate Layer command

src/commands/cmd_flip.cpp

@@ -29,7 +29,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "undo_transaction.h"
 #include "util/misc.h"
 

src/commands/cmd_invert_mask.cpp

@@ -20,12 +20,12 @@
 
 #include "commands/command.h"
 #include "commands/commands.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 //////////////////////////////////////////////////////////////////////
 // invert_mask

src/commands/cmd_load_mask.cpp

@@ -21,12 +21,12 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "dialogs/filesel.h"
+#include "document_wrappers.h"
 #include "gui/alert.h"
 #include "modules/gui.h" 
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 #include "util/msk_file.h"
 
 class LoadMaskCommand : public Command

src/commands/cmd_mask_all.cpp

@@ -19,11 +19,11 @@
 #include "config.h"
 
 #include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 //////////////////////////////////////////////////////////////////////
 // mask_all

src/commands/cmd_merge_down_layer.cpp

@@ -18,18 +18,17 @@
 
 #include "config.h"
 
-#include "gui/gui.h"
-
-#include "commands/command.h"
 #include "app.h"
+#include "commands/command.h"
+#include "document_wrappers.h"
+#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 //////////////////////////////////////////////////////////////////////
 // merge_down_layer

src/commands/cmd_palette_editor.cpp

@@ -18,11 +18,6 @@
 
 #include "config.h"
 
-#include <allegro.h>
-#include <stdio.h>
-#include <string.h>
-#include <vector>
-
 #include "app.h"
 #include "app/color.h"
 #include "app/color_utils.h"
@@ -32,11 +27,12 @@
 #include "console.h"
 #include "core/cfg.h"
 #include "dialogs/filesel.h"
+#include "document_wrappers.h"
 #include "gfx/hsv.h"
 #include "gfx/rgb.h"
 #include "gfx/size.h"
-#include "gui/gui.h"
 #include "gui/graphics.h"
+#include "gui/gui.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
@@ -45,17 +41,21 @@
 #include "raster/quantization.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
 #include "skin/skin_slider_property.h"
-#include "document_wrappers.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "widgets/color_bar.h"
 #include "widgets/color_sliders.h"
 #include "widgets/editor.h"
-#include "widgets/palette_view.h"
 #include "widgets/hex_color_entry.h"
+#include "widgets/palette_view.h"
 #include "widgets/statebar.h"
 
+#include <allegro.h>
+#include <stdio.h>
+#include <string.h>
+#include <vector>
+
 using namespace gfx;
 
 class PaletteEntryEditor : public Frame

src/commands/cmd_redo.cpp

@@ -18,13 +18,13 @@
 
 #include "config.h"
 
-#include "commands/command.h"
 #include "app.h"
+#include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "widgets/statebar.h"
-#include "document_wrappers.h"
 
 class RedoCommand : public Command
 {

src/commands/cmd_reselect_mask.cpp

@@ -19,11 +19,11 @@
 #include "config.h"
 
 #include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 //////////////////////////////////////////////////////////////////////
 // reselect_mask

src/commands/cmd_undo.cpp

@@ -18,13 +18,13 @@
 
 #include "config.h"
 
-#include "commands/command.h"
 #include "app.h"
+#include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "widgets/statebar.h"
-#include "document_wrappers.h"
 
 class UndoCommand : public Command
 {

src/commands/filters/filter_manager_impl.cpp

@@ -35,7 +35,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "widgets/editor.h"
 
 #include <cstdlib>

src/dialogs/aniedit.cpp

@@ -34,6 +34,7 @@
 #include "raster/raster.h"
 #include "skin/skin_theme.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "undo_transaction.h"
 #include "util/celmove.h"
 #include "util/thmbnail.h"

src/dialogs/maskcol.cpp

@@ -37,7 +37,7 @@
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "util/misc.h"
 #include "widgets/color_bar.h"
 #include "widgets/color_button.h"

src/document.cpp

@@ -31,7 +31,7 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 #include "util/boundary.h"
 
 Document::Document(Sprite* sprite)

src/documents.cpp

@@ -23,7 +23,7 @@
 #include "base/mutex.h"
 #include "document.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 
 #include <algorithm>
 

src/file/ase_format.cpp

@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include "base/exception.h"
 #include "document.h"
 #include "file/file.h"
 #include "file/file_format.h"

src/raster/layer.cpp

@@ -18,16 +18,16 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <string.h>
-
 #include "raster/blend.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
+
+#include <algorithm>
+#include <string.h>
 
 static bool has_cels(const Layer* layer, int frame);
 

src/raster/raster.h

@@ -34,6 +34,5 @@
 #include "raster/rotate.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
 
 #endif

src/tools/inks.h

@@ -22,7 +22,7 @@
 #include "app/color_utils.h"
 #include "context.h"
 #include "document.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 
 
 // Ink used for tools which paint with primary/secondary

src/ui_context.cpp

@@ -18,21 +18,21 @@
 
 #include "config.h"
 
-#include <allegro/file.h>
-#include <allegro/system.h>
-
 #include "app.h"
 #include "base/mutex.h"
 #include "base/path.h"
 #include "document.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
 #include "settings/ui_settings_impl.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "widgets/color_bar.h"
 #include "widgets/tabs.h"
 
+#include <allegro/file.h>
+#include <allegro/system.h>
+
 UIContext* UIContext::m_instance = NULL;
 
 UIContext::UIContext()

src/undo/undo_history.cpp

@@ -30,8 +30,8 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 
 #include <allegro/config.h>
 #include <errno.h>

src/undo/undo_history.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef RASTER_UNDO_H_INCLUDED
-#define RASTER_UNDO_H_INCLUDED
+#ifndef UNDO_UNDO_HISTORY_H_INCLUDED
+#define UNDO_UNDO_HISTORY_H_INCLUDED
 
 #include "base/exception.h"
 #include "raster/gfxobj.h"

src/undo/undo_stream.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef RASTER_UNDO_STREAM_H_INCLUDED
-#define RASTER_UNDO_STREAM_H_INCLUDED
+#ifndef UNDO_UNDO_STREAM_H_INCLUDED
+#define UNDO_UNDO_STREAM_H_INCLUDED
 
 class UndoStream
 {

src/undo_transaction.cpp

@@ -33,7 +33,7 @@
 #include "raster/quantization.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
+#include "undo/undo_history.h"
 
 UndoTransaction::UndoTransaction(Document* document, const char* label)
 {

src/util/celmove.cpp

@@ -23,6 +23,7 @@
 #include "app.h"
 #include "app/color.h"
 #include "console.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/blend.h"
 #include "raster/cel.h"
@@ -30,8 +31,7 @@
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
-#include "document_wrappers.h"
+#include "undo/undo_history.h"
 
 /* these variables indicate what cel to move (and the sprite's
    frame indicates where to move it) */

src/util/clipboard.cpp

@@ -34,11 +34,11 @@
 #include "raster/rotate.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "raster/undo_history.h"
 #include "settings/settings.h"
 #include "skin/skin_parts.h"
 #include "skin/skin_theme.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "undo_transaction.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
@@ -50,6 +50,7 @@
 
 #if defined ALLEGRO_WINDOWS
   #include <winalleg.h>
+
   #include "util/clipboard_win32.h"
 #endif
 

src/util/misc.cpp

@@ -32,6 +32,7 @@
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/raster.h"
+#include "undo/undo_history.h"
 #include "util/misc.h"
 #include "widgets/editor.h"
 #include "widgets/statebar.h"

src/widgets/editor/editor.cpp

@@ -29,6 +29,7 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "core/cfg.h"
+#include "document_wrappers.h"
 #include "gui/gui.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
@@ -37,9 +38,9 @@
 #include "raster/raster.h"
 #include "settings/settings.h"
 #include "skin/skin_theme.h"
-#include "document_wrappers.h"
 #include "tools/tool.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "util/boundary.h"
 #include "util/misc.h"
 #include "util/render.h"

src/widgets/statebar.cpp

@@ -18,16 +18,11 @@
 
 #include "config.h"
 
-#include <allegro.h>
-#include <cstdarg>
-#include <cstdio>
-#include <cstring>
-#include <algorithm>
-
 #include "app.h"
 #include "base/bind.h"
 #include "commands/commands.h"
 #include "commands/params.h"
+#include "document_wrappers.h"
 #include "gfx/size.h"
 #include "gui/gui.h"
 #include "modules/editors.h"
@@ -38,16 +33,21 @@
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
-#include "raster/undo_history.h"
 #include "skin/skin_theme.h"
-#include "document_wrappers.h"
 #include "tools/tool.h"
 #include "ui_context.h"
+#include "undo/undo_history.h"
 #include "util/misc.h"
 #include "widgets/color_button.h"
 #include "widgets/editor.h"
 #include "widgets/statebar.h"
 
+#include <algorithm>
+#include <allegro.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
+
 using namespace gfx;
 
 enum AniAction {