Moved app.cpp from src/core/ to src/

makefile.lst

@@ -77,7 +77,6 @@ COMMON_SOURCES =					\
 	src/commands/fx/cmd_invert_color.cpp		\
 	src/commands/fx/cmd_replace_color.cpp		\
 	src/commands/fx/effectbg.cpp			\
-	src/core/app.cpp				\
 	src/core/cfg.cpp				\
 	src/core/color.cpp				\
 	src/core/config.cpp				\
@@ -231,6 +230,7 @@ COMMON_OBJS = $(addprefix $(OBJ_DIR)/,				\
 	          $(notdir $(basename $(COMMON_SOURCES)))))
 
 ASE_SOURCES = \
+	src/app.cpp						\
 	src/console.cpp						\
 	src/context.cpp						\
 	src/main.cpp						\

src/app.cpp

@@ -35,7 +35,7 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/core.h"
 #include "core/drop_files.h"

src/app.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_APP_H_INCLUDED
-#define CORE_APP_H_INCLUDED
+#ifndef APP_H_INCLUDED
+#define APP_H_INCLUDED
 
 #include "jinete/jbase.h"
 

src/commands/cmd_advanced_mode.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
 

src/commands/cmd_cel_properties.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "sprite_wrappers.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/core.h"
 #include "modules/gui.h"
 #include "raster/cel.h"

src/commands/cmd_change_color.cpp

@@ -22,7 +22,7 @@
 
 #include "commands/command.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "widgets/colbar.h"
 
 class ChangeColorCommand : public Command

src/commands/cmd_change_image_type.cpp

@@ -22,7 +22,7 @@
 
 #include "commands/command.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/image.h"

src/commands/cmd_clear.cpp

@@ -20,7 +20,7 @@
 
 #include "commands/command.h"
 #include "sprite_wrappers.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_close_file.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "commands/commands.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"

src/commands/cmd_configure_screen.cpp

@@ -26,7 +26,7 @@
 
 #include "commands/command.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/dirs.h"
 #include "intl/intl.h"
 #include "dialogs/options.h"

src/commands/cmd_configure_tools.cpp

@@ -23,7 +23,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "ui_context.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"

src/commands/cmd_crop.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_duplicate_layer.cpp

@@ -22,7 +22,7 @@
 
 #include "commands/command.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_duplicate_sprite.cpp

@@ -24,7 +24,7 @@
 
 #include "ui_context.h"
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "modules/editors.h"
 #include "modules/gui.h"

src/commands/cmd_exit.cpp

@@ -22,7 +22,7 @@
 
 #include "commands/command.h"
 #include "context.h"
-#include "core/app.h"
+#include "app.h"
 #include "raster/sprite.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_eyedropper.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "raster/image.h"

src/commands/cmd_flatten_layers.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "undoable.h"

src/commands/cmd_goto_layer.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "modules/editors.h"
 #include "raster/layer.h"

src/commands/cmd_grid.cpp

@@ -21,7 +21,7 @@
 #include <allegro/unicode.h>
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "modules/tools.h"
 #include "widgets/statebar.h"

src/commands/cmd_layer_properties.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/layer.h"

src/commands/cmd_merge_down_layer.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"

src/commands/cmd_new_file.cpp

@@ -27,7 +27,7 @@
 #include "ui_context.h"
 #include "commands/command.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "modules/editors.h"

src/commands/cmd_new_frame.cpp

@@ -24,7 +24,7 @@
 #include "commands/command.h"
 #include "console.h"
 #include "core/color.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"

src/commands/cmd_new_layer.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_new_layer_set.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"

src/commands/cmd_open_file.cpp

@@ -27,7 +27,7 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"
 #include "raster/sprite.h"

src/commands/cmd_preview.cpp

@@ -25,7 +25,7 @@
 
 #include "commands/command.h"
 #include "commands/commands.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"

src/commands/cmd_redo.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/cmd_refresh.cpp

@@ -28,7 +28,7 @@
 #include "jinete/jsystem.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "widgets/statebar.h"
 #include "sprite_wrappers.h"
 

src/commands/cmd_rotate_canvas.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/job.h"
 #include "modules/gui.h"
 #include "raster/cel.h"

src/commands/cmd_save_file.cpp

@@ -23,7 +23,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "console.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"

src/commands/cmd_select_file.cpp

@@ -27,7 +27,7 @@
 #include "ui_context.h"
 #include "commands/command.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"

src/commands/cmd_switch_colors.cpp

@@ -23,7 +23,7 @@
 #include "jinete/jbase.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "widgets/colbar.h"
 
 class SwitchColorsCommand : public Command

src/commands/cmd_undo.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"

src/commands/fx/cmd_color_curve.cpp

@@ -23,7 +23,7 @@
 #include "commands/command.h"
 #include "commands/fx/effectbg.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/commands/fx/cmd_replace_color.cpp

@@ -25,7 +25,7 @@
 #include "commands/command.h"
 #include "commands/fx/effectbg.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/commands/fx/effectbg.cpp

@@ -23,7 +23,7 @@
 
 #include "jinete/jinete.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "effect/effect.h"
 #include "modules/editors.h"

src/console.cpp

@@ -24,7 +24,8 @@
 
 #include "jinete/jinete.h"
 
-#include "core/app.h"
+#include "console.h"
+#include "app.h"
 #include "core/core.h"
 #include "modules/gui.h"
 #include "widgets/statebar.h"

src/core/color.cpp

@@ -23,7 +23,7 @@
 
 #include "jinete/jbase.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/color.h"
 #include "core/core.h"
 #include "modules/gfx.h"

src/core/drop_files.cpp

@@ -27,7 +27,7 @@
 
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "ui_context.h"
 
 #ifdef ALLEGRO_WINDOWS

src/core/job.cpp

@@ -24,7 +24,7 @@
 #include "jinete/jwidget.h"
 #include "jinete/jwindow.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/job.h"
 #include "modules/gui.h"
 #include "widgets/statebar.h"

src/dialogs/aniedit.cpp

@@ -26,7 +26,7 @@
 
 #include "commands/commands.h"
 #include "commands/command.h"
-/* #include "core/app.h" */
+/* #include "app.h" */
 /* #include "core/cfg.h" */
 /* #include "core/core.h" */
 #include "modules/gfx.h"

src/dialogs/drawtext.cpp

@@ -23,7 +23,7 @@
 #include "jinete/jinete.h"
 
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/dialogs/filesel.cpp

@@ -30,7 +30,7 @@
 
 #include "jinete/jinete.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/dirs.h"
 #include "file/file.h"

src/dialogs/maskcol.cpp

@@ -26,7 +26,7 @@
 #include "jinete/jwidget.h"
 #include "jinete/jwindow.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/file/file.cpp

@@ -27,7 +27,7 @@
 #include "jinete/jmutex.h"
 
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/core.h"
 #include "file/file.h"
 #include "file/format_options.h"

src/file/jpeg_format.cpp

@@ -24,7 +24,7 @@
 
 #include "jinete/jinete.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/core.h"
 #include "file/file.h"

src/file/png_format.cpp

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/core.h"
 #include "file/file.h"

src/main.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 #include "ase_exception.h"
-#include "core/app.h"
+#include "app.h"
 #include "loadpng.h"
 
 //////////////////////////////////////////////////////////////////////

src/modules/editors.cpp

@@ -22,7 +22,7 @@
 
 #include "sprite_wrappers.h"
 #include "ui_context.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"

src/modules/gfx.cpp

@@ -26,7 +26,7 @@
 #include "jinete/jtheme.h"
 
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/dirs.h"
 #include "modules/gfx.h"

src/modules/gui.cpp

@@ -36,7 +36,7 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/core.h"
 #include "core/dirs.h"

src/modules/palettes.cpp

@@ -24,7 +24,7 @@
 
 #include "jinete/jlist.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "modules/palettes.h"
 #include "raster/blend.h"
 #include "raster/image.h"

src/modules/recent.cpp

@@ -23,7 +23,7 @@
 
 #include "jinete/jlist.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
 #include "modules/recent.h"

src/modules/rootmenu.cpp

@@ -28,7 +28,7 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/core.h"
 #include "core/dirs.h"
 #include "intl/intl.h"

src/modules/tools.cpp

@@ -32,7 +32,7 @@
 #include "jinete/jview.h"
 #include "jinete/jwidget.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "effect/effect.h"

src/ui_context.cpp

@@ -22,7 +22,7 @@
 #include <allegro/file.h>
 
 #include "ui_context.h"
-#include "core/app.h"
+#include "app.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "widgets/tabs.h"

src/util/celmove.cpp

@@ -23,7 +23,7 @@
 
 #include "sprite_wrappers.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/color.h"
 #include "core/core.h"
 #include "modules/gui.h"

src/util/clipboard.cpp

@@ -26,7 +26,7 @@
 
 #include "sprite_wrappers.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/core.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"

src/util/misc.cpp

@@ -27,7 +27,7 @@
 #include "jinete/jsystem.h"
 #include "jinete/jwidget.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/dirs.h"

src/widgets/colbar.cpp

@@ -25,7 +25,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "modules/editors.h"

src/widgets/colsel.cpp

@@ -23,7 +23,7 @@
 
 #include "jinete/jinete.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/color.h"
 #include "modules/gui.h"
 #include "modules/gfx.h"

src/widgets/editor/editor.cpp

@@ -29,7 +29,7 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "core/app.h"
+#include "app.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "modules/editors.h"

src/widgets/editor/keys.cpp

@@ -24,7 +24,7 @@
 #include "jinete/jview.h"
 #include "jinete/jwidget.h"
 
-#include "core/app.h"
+#include "app.h"
 #include "core/color.h"
 #include "modules/editors.h"
 #include "modules/gui.h"

src/widgets/fileview.cpp

@@ -26,7 +26,7 @@
 
 #include "commands/commands.h"
 #include "console.h"
-#include "core/app.h"
+#include "app.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"
 #include "modules/editors.h"