Move Jinete library to src/gui directory (future gui-lib).

src/CMakeLists.txt

@@ -165,48 +165,48 @@ add_library(aseprite-library
   file/pcx_format.cpp
   file/png_format.cpp
   file/tga_format.cpp
-  jinete/jaccel.cpp
-  jinete/jalert.cpp
-  jinete/jbox.cpp
-  jinete/jbutton.cpp
-  jinete/jclipboard.cpp
-  jinete/jcombobox.cpp
-  jinete/jcustom_label.cpp
-  jinete/jdraw.cpp
-  jinete/jentry.cpp
-  jinete/jfont.cpp
-  jinete/jfontbmp.cpp
-  jinete/jgrid.cpp
-  jinete/jhook.cpp
-  jinete/jimage.cpp
-  jinete/jinete.cpp
-  jinete/jintern.cpp
-  jinete/jlabel.cpp
-  jinete/jlink_label.cpp
-  jinete/jlist.cpp
-  jinete/jlistbox.cpp
-  jinete/jmanager.cpp
-  jinete/jmem.cpp
-  jinete/jmenu.cpp
-  jinete/jmessage.cpp
-  jinete/jpanel.cpp
-  jinete/jpopup_window.cpp
-  jinete/jquickmenu.cpp
-  jinete/jrect.cpp
-  jinete/jregion.cpp
-  jinete/jsep.cpp
-  jinete/jslider.cpp
-  jinete/jstream.cpp
-  jinete/jstring.cpp
-  jinete/jsystem.cpp
-  jinete/jtextbox.cpp
-  jinete/jtheme.cpp
-  jinete/jthread.cpp
-  jinete/jtooltips.cpp
-  jinete/jview.cpp
-  jinete/jwidget.cpp
-  jinete/jwindow.cpp
-  jinete/themes/jstandard_theme.cpp
+  gui/jaccel.cpp
+  gui/jalert.cpp
+  gui/jbox.cpp
+  gui/jbutton.cpp
+  gui/jclipboard.cpp
+  gui/jcombobox.cpp
+  gui/jcustom_label.cpp
+  gui/jdraw.cpp
+  gui/jentry.cpp
+  gui/jfont.cpp
+  gui/jfontbmp.cpp
+  gui/jgrid.cpp
+  gui/jhook.cpp
+  gui/jimage.cpp
+  gui/jinete.cpp
+  gui/jintern.cpp
+  gui/jlabel.cpp
+  gui/jlink_label.cpp
+  gui/jlist.cpp
+  gui/jlistbox.cpp
+  gui/jmanager.cpp
+  gui/jmem.cpp
+  gui/jmenu.cpp
+  gui/jmessage.cpp
+  gui/jpanel.cpp
+  gui/jpopup_window.cpp
+  gui/jquickmenu.cpp
+  gui/jrect.cpp
+  gui/jregion.cpp
+  gui/jsep.cpp
+  gui/jslider.cpp
+  gui/jstream.cpp
+  gui/jstring.cpp
+  gui/jsystem.cpp
+  gui/jtextbox.cpp
+  gui/jtheme.cpp
+  gui/jthread.cpp
+  gui/jtooltips.cpp
+  gui/jview.cpp
+  gui/jwidget.cpp
+  gui/jwindow.cpp
+  gui/themes/jstandard_theme.cpp
   modules/editors.cpp
   modules/gfx.cpp
   modules/gui.cpp

src/app.cpp

@@ -27,11 +27,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "jinete/jinete.h"
-#include "jinete/jintern.h"
-
 #include "Vaca/String.h"
-
 #include "app.h"
 #include "app/color_utils.h"
 #include "ase_exception.h"
@@ -44,6 +40,8 @@
 #include "core/file_system.h"
 #include "core/modules.h"
 #include "file/file.h"
+#include "gui/jinete.h"
+#include "gui/jintern.h"
 #include "log.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"

src/app.h

@@ -20,7 +20,7 @@
 #define APP_H_INCLUDED
 
 #include "base/signal.h"
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include <vector>
 

src/ase_exception.h

@@ -21,7 +21,7 @@
 
 #include <exception>
 #include <string>
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 class TiXmlDocument;
 

src/commands/cmd_about.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_advanced_mode.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "app.h"

src/commands/cmd_canvas_size.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_cel_properties.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_close_file.cpp

@@ -20,7 +20,7 @@
 
 #include <memory>
 #include <allegro.h>
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "commands/commands.h"

src/commands/cmd_configure_screen.cpp

@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_configure_tools.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_copy.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "raster/layer.h"

src/commands/cmd_copy_cel.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "sprite_wrappers.h"

src/commands/cmd_cut.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "raster/layer.h"

src/commands/cmd_duplicate_layer.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "console.h"

src/commands/cmd_duplicate_sprite.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "ui_context.h"
 #include "commands/command.h"

src/commands/cmd_exit.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "context.h"

src/commands/cmd_eyedropper.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "commands/params.h"

src/commands/cmd_film_editor.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "dialogs/aniedit.h"

src/commands/cmd_flip.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jlist.h"
+#include "gui/jlist.h"
 
 #include "commands/command.h"
 #include "commands/params.h"

src/commands/cmd_frame_properties.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_grid.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jwindow.h"
+#include "gui/jwindow.h"
 
 #include "commands/command.h"
 #include "context.h"

src/commands/cmd_layer_from_background.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_layer_properties.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_load_mask.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jalert.h"
+#include "gui/jalert.h"
 
 #include "commands/command.h"
 #include "commands/params.h"

src/commands/cmd_mask_by_color.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "dialogs/maskcol.h"

src/commands/cmd_merge_down_layer.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "app.h"

src/commands/cmd_move_cel.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "dialogs/aniedit.h"

src/commands/cmd_new_cel.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "console.h"

src/commands/cmd_new_file.cpp

@@ -21,7 +21,7 @@
 #include <allegro/config.h>
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "ui_context.h"
 #include "commands/command.h"

src/commands/cmd_new_frame.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "console.h"

src/commands/cmd_new_layer.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "commands/params.h"

src/commands/cmd_new_layer_set.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "app.h"

src/commands/cmd_open_file.cpp

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "ui_context.h"
 #include "commands/command.h"

src/commands/cmd_options.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_palette_editor.cpp

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "app/color.h"

src/commands/cmd_play_animation.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/editors.h"

src/commands/cmd_preview.cpp

@@ -21,7 +21,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "commands/commands.h"

src/commands/cmd_refresh.cpp

@@ -25,8 +25,8 @@
 #include <psapi.h>
 #endif
 
-#include "jinete/jtheme.h"
-#include "jinete/jsystem.h"
+#include "gui/jtheme.h"
+#include "gui/jsystem.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_remove_frame.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_remove_layer.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jwidget.h"
+#include "gui/jwidget.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_rotate_canvas.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "commands/command.h"

src/commands/cmd_save_file.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "app.h"

src/commands/cmd_save_mask.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/file.h>
 
-#include "jinete/jalert.h"
+#include "gui/jalert.h"
 
 #include "commands/command.h"
 #include "dialogs/filesel.h"

src/commands/cmd_screen_shot.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jsystem.h"
+#include "gui/jsystem.h"
 
 #include "commands/command.h"
 #include "file/file.h"

src/commands/cmd_select_file.cpp

@@ -21,7 +21,7 @@
 #include <allegro/debug.h>
 #include <allegro/unicode.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "ui_context.h"
 #include "commands/command.h"

src/commands/cmd_sprite_properties.cpp

@@ -21,7 +21,7 @@
 #include <allegro/unicode.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app/color.h"
 #include "base/mem_utils.h"

src/commands/cmd_sprite_size.cpp

@@ -21,7 +21,7 @@
 #include <allegro/unicode.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "commands/command.h"
 #include "core/cfg.h"

src/commands/cmd_switch_colors.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "commands/command.h"
 #include "app.h"

src/commands/commands.cpp

@@ -23,7 +23,7 @@
 #include <allegro/unicode.h>
 #include <exception>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "console.h"
 #include "commands/command.h"

src/commands/commands.h

@@ -19,7 +19,7 @@
 #ifndef COMMANDS_COMMANDS_H_INCLUDED
 #define COMMANDS_COMMANDS_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 struct CommandId
 {

src/commands/fx/cmd_color_curve.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "app/color.h"

src/commands/fx/cmd_convolution_matrix.cpp

@@ -21,16 +21,16 @@
 #include <string.h>
 
 #include "base/bind.h"
-#include "jinete/jbox.h"
-#include "jinete/jbutton.h"
-#include "jinete/jhook.h"
-#include "jinete/jlabel.h"
-#include "jinete/jlist.h"
-#include "jinete/jlistbox.h"
-#include "jinete/jslider.h"
-#include "jinete/jview.h"
-#include "jinete/jwidget.h"
-#include "jinete/jwindow.h"
+#include "gui/jbox.h"
+#include "gui/jbutton.h"
+#include "gui/jhook.h"
+#include "gui/jlabel.h"
+#include "gui/jlist.h"
+#include "gui/jlistbox.h"
+#include "gui/jslider.h"
+#include "gui/jview.h"
+#include "gui/jwidget.h"
+#include "gui/jwindow.h"
 
 #include "app/color.h"
 #include "commands/command.h"

src/commands/fx/cmd_despeckle.cpp

@@ -21,12 +21,12 @@
 #include <stdio.h>
 
 #include "base/bind.h"
-#include "jinete/jbox.h"
-#include "jinete/jbutton.h"
-#include "jinete/jentry.h"
-#include "jinete/jhook.h"
-#include "jinete/jwidget.h"
-#include "jinete/jwindow.h"
+#include "gui/jbox.h"
+#include "gui/jbutton.h"
+#include "gui/jentry.h"
+#include "gui/jhook.h"
+#include "gui/jwidget.h"
+#include "gui/jwindow.h"
 
 #include "commands/command.h"
 #include "commands/fx/effectbg.h"

src/commands/fx/cmd_invert_color.cpp

@@ -19,13 +19,13 @@
 #include "config.h"
 
 #include "base/bind.h"
-#include "jinete/jbox.h"
-#include "jinete/jbutton.h"
-#include "jinete/jhook.h"
-#include "jinete/jlabel.h"
-#include "jinete/jslider.h"
-#include "jinete/jwidget.h"
-#include "jinete/jwindow.h"
+#include "gui/jbox.h"
+#include "gui/jbutton.h"
+#include "gui/jhook.h"
+#include "gui/jlabel.h"
+#include "gui/jslider.h"
+#include "gui/jwidget.h"
+#include "gui/jwindow.h"
 
 #include "app/color.h"
 #include "commands/command.h"

src/commands/fx/cmd_replace_color.cpp

@@ -21,7 +21,7 @@
 #include <stdio.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "app/color.h"

src/commands/fx/effectbg.cpp

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "base/mutex.h"

src/console.cpp

@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "console.h"

src/core/cfg.cpp

@@ -22,7 +22,7 @@
 #include <allegro/file.h>
 #include <allegro/unicode.h>
 
-#include "jinete/jrect.h"
+#include "gui/jrect.h"
 
 #include "core/cfg.h"
 #include "resource_finder.h"

src/core/drop_files.cpp

@@ -21,8 +21,8 @@
 #include <allegro.h>
 #include <vector>
 
-#include "jinete/jstring.h"
-#include "jinete/jwindow.h"
+#include "gui/jstring.h"
+#include "gui/jwindow.h"
 
 #include "app.h"
 #include "base/mutex.h"

src/core/file_system.cpp

@@ -55,7 +55,7 @@
   #include <shlwapi.h>
 #endif
 
-#include "jinete/jstring.h"
+#include "gui/jstring.h"
 
 #include "core/file_system.h"
 

src/core/file_system.h

@@ -19,8 +19,8 @@
 #ifndef CORE_FILE_SYSTEM_H_INCLUDED
 #define CORE_FILE_SYSTEM_H_INCLUDED
 
-#include "jinete/jbase.h"
-#include "jinete/jstring.h"
+#include "gui/jbase.h"
+#include "gui/jstring.h"
 
 #include <vector>
 

src/core/modules.h

@@ -19,7 +19,7 @@
 #ifndef CORE_MODULES_H_INCLUDED
 #define CORE_MODULES_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #define REQUIRE_INTERFACE    1
 

src/dialogs/aniedit.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "gfx/rect.h"
 #include "gfx/point.h"

src/dialogs/drawtext.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "console.h"

src/dialogs/filesel.cpp

@@ -30,7 +30,7 @@
 #include <errno.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "core/cfg.h"

src/dialogs/filesel.h

@@ -19,7 +19,7 @@
 #ifndef DIALOGS_FILESEL_H_INCLUDED
 #define DIALOGS_FILESEL_H_INCLUDED
 
-#include "jinete/jstring.h"
+#include "gui/jstring.h"
 
 jstring ase_file_selector(const jstring& message,
 			  const jstring& init_path,

src/dialogs/maskcol.cpp

@@ -19,13 +19,13 @@
 #include "config.h"
 
 #include "base/bind.h"
-#include "jinete/jbox.h"
-#include "jinete/jbutton.h"
-#include "jinete/jhook.h"
-#include "jinete/jlabel.h"
-#include "jinete/jslider.h"
-#include "jinete/jwidget.h"
-#include "jinete/jwindow.h"
+#include "gui/jbox.h"
+#include "gui/jbutton.h"
+#include "gui/jhook.h"
+#include "gui/jlabel.h"
+#include "gui/jslider.h"
+#include "gui/jwidget.h"
+#include "gui/jwindow.h"
 
 #include "app.h"
 #include "app/color.h"

src/dialogs/playfli.cpp

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "jinete/jmanager.h"
-#include "jinete/jsystem.h"
+#include "gui/jmanager.h"
+#include "gui/jsystem.h"
 
 #include "app.h"
 #include "file/fli/fli.h"

src/dialogs/playfli.h

@@ -19,7 +19,7 @@
 #ifndef DIALOGS_PLAYFLI_H_INCLUDED
 #define DIALOGS_PLAYFLI_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 void play_fli_animation(const char *filename, bool loop, bool fullscreen);
 

src/dialogs/repo.cpp

@@ -22,7 +22,7 @@
 #include <allegro/unicode.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "core/cfg.h"
 #include "dialogs/repo.h"

src/dialogs/repo.h

@@ -19,7 +19,7 @@
 #ifndef DIALOGS_REPO_H_INCLUDED
 #define DIALOGS_REPO_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 class Button;
 

src/effect/colcurve.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jlist.h"
+#include "gui/jlist.h"
 
 #include "effect/colcurve.h"
 #include "effect/effect.h"

src/effect/colcurve.h

@@ -19,7 +19,7 @@
 #ifndef EFFECT_COLCURVE_H_INCLUDED
 #define EFFECT_COLCURVE_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 struct Effect;
 

src/effect/convmatr.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "jinete/jlist.h"
+#include "gui/jlist.h"
 
 #include "core/cfg.h"
 #include "effect/convmatr.h"

src/effect/convmatr.h

@@ -19,7 +19,7 @@
 #ifndef EFFECT_CONVMATR_H_INCLUDED
 #define EFFECT_CONVMATR_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 #include "tiled_mode.h"
 
 struct Effect;

src/effect/effect.cpp

@@ -21,11 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "jinete/jmanager.h"
-#include "jinete/jrect.h"
-#include "jinete/jregion.h"
-#include "jinete/jview.h"
-#include "jinete/jwidget.h"
+#include "gui/jmanager.h"
+#include "gui/jrect.h"
+#include "gui/jregion.h"
+#include "gui/jview.h"
+#include "gui/jwidget.h"
 
 #include "console.h"
 #include "core/cfg.h"

src/effect/effect.h

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <cstring>
 #include "sprite_wrappers.h"
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 #include "tiled_mode.h"
 
 class Image;

src/effect/images_ref.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jlist.h"
+#include "gui/jlist.h"
 
 #include "effect/effect.h"
 #include "effect/images_ref.h"

src/errno_unittest.cpp

@@ -19,7 +19,7 @@
 #include "tests/test.h"
 
 #include <errno.h>
-#include "jinete/jthread.h"
+#include "gui/jthread.h"
 
 static JThread thread;
 

src/file/ase_format.cpp

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "jinete/jlist.h"
+#include "gui/jlist.h"
 #include "zlib.h"
 
 #include "file/file.h"

src/file/file.cpp

@@ -21,8 +21,8 @@
 #include <allegro.h>
 #include <string.h>
 
-#include "jinete/jalert.h"
-#include "jinete/jlist.h"
+#include "gui/jalert.h"
+#include "gui/jlist.h"
 
 #include "app.h"
 #include "base/mutex.h"

src/file/file.h

@@ -19,7 +19,7 @@
 #ifndef FILE_FILE_H_INCLUDED
 #define FILE_FILE_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 #include <stdio.h>
 
 #define FILE_SUPPORT_RGB		(1<<0)

src/file/format_options.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "file/format_options.h"
 

src/file/gif_format.cpp

@@ -27,7 +27,7 @@
 #include <allegro/color.h>
 #include <allegro/file.h>
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "file/file.h"
 #include "file/gif/format.h"

src/file/jpeg_format.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 #include "app.h"
 #include "core/cfg.h"

src/file/tga_format.cpp

@@ -23,7 +23,7 @@
 
 #include <allegro/color.h>
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 #include "file/file.h"
 #include "raster/raster.h"

src/gfxmode.cpp

@@ -20,8 +20,8 @@
 
 #include <allegro.h>
 
-#include "jinete/jmanager.h"
-#include "jinete/jwindow.h"
+#include "gui/jmanager.h"
+#include "gui/jwindow.h"
 
 #include "app.h"
 #include "gfxmode.h"

src/gui/jaccel.cpp

@@ -35,8 +35,8 @@
 #include <allegro/unicode.h>
 #include <ctype.h>
 
-#include "jinete/jaccel.h"
-#include "jinete/jlist.h"
+#include "gui/jaccel.h"
+#include "gui/jlist.h"
 
 /* #define REPORT_KEYS */
 #define PREPROCESS_KEYS

src/gui/jaccel.h

@@ -32,7 +32,7 @@
 #ifndef JINETE_JACCEL_H_INCLUDED
 #define JINETE_JACCEL_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 JAccel jaccel_new();
 JAccel jaccel_new_copy(JAccel accel);

src/gui/jalert.cpp

@@ -60,7 +60,7 @@
 #include <stdio.h>
 
 #include "base/bind.h"
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 
 static Frame* create_alert(char *buf, JList *labels, JList *buttons);
 

src/gui/jbox.cpp

@@ -33,11 +33,11 @@
 
 #include "config.h"
 
-#include "jinete/jlist.h"
-#include "jinete/jmessage.h"
-#include "jinete/jrect.h"
-#include "jinete/jwidget.h"
-#include "jinete/jtheme.h"
+#include "gui/jlist.h"
+#include "gui/jmessage.h"
+#include "gui/jrect.h"
+#include "gui/jwidget.h"
+#include "gui/jtheme.h"
 #include "gfx/size.h"
 
 using namespace gfx;

src/gui/jbox.h

@@ -32,7 +32,7 @@
 #ifndef JINETE_JBOX_H_INCLUDED
 #define JINETE_JBOX_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 JWidget jbox_new(int align);
 

src/gui/jbutton.cpp

@@ -37,14 +37,14 @@
 #include <string.h>
 #include <queue>
 
-#include "jinete/jbutton.h"
-#include "jinete/jlist.h"
-#include "jinete/jmanager.h"
-#include "jinete/jmessage.h"
-#include "jinete/jrect.h"
-#include "jinete/jtheme.h"
-#include "jinete/jwidget.h"
-#include "jinete/jwindow.h"
+#include "gui/jbutton.h"
+#include "gui/jlist.h"
+#include "gui/jmanager.h"
+#include "gui/jmessage.h"
+#include "gui/jrect.h"
+#include "gui/jtheme.h"
+#include "gui/jwidget.h"
+#include "gui/jwindow.h"
 #include "Vaca/PreferredSizeEvent.h"
 
 ButtonBase::ButtonBase(const char* text, int type, int behaviorType, int drawType)

src/gui/jbutton.h

@@ -33,7 +33,7 @@
 #define JINETE_JBUTTON_H_INCLUDED
 
 #include "base/signal.h"
-#include "jinete/jwidget.h"
+#include "gui/jwidget.h"
 #include "Vaca/NonCopyable.h"
 #include <vector>
 

src/gui/jclipboard.cpp

@@ -36,7 +36,7 @@
 #include <winalleg.h>
 #endif
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 static char *clipboard_text = NULL;
 

src/gui/jclipboard.h

@@ -32,7 +32,7 @@
 #ifndef JINETE_JCLIPBOARD_H_INCLUDED
 #define JINETE_JCLIPBOARD_H_INCLUDED
 
-#include "jinete/jbase.h"
+#include "gui/jbase.h"
 
 const char* jclipboard_get_text();
 void jclipboard_set_text(const char* text);

src/gui/jcombobox.cpp

@@ -33,7 +33,7 @@
 
 #include <allegro.h>
 
-#include "jinete/jinete.h"
+#include "gui/jinete.h"
 #include "gfx/size.h"
 #include "Vaca/PreferredSizeEvent.h"