diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94ee0c1dc..dbbcb9e25 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/app.cpp b/src/app.cpp index 6aa95390d..efd14f22f 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -27,11 +27,7 @@ #include #include -#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" diff --git a/src/app.h b/src/app.h index de74a770e..bc294912b 100644 --- a/src/app.h +++ b/src/app.h @@ -20,7 +20,7 @@ #define APP_H_INCLUDED #include "base/signal.h" -#include "jinete/jbase.h" +#include "gui/jbase.h" #include diff --git a/src/ase_exception.h b/src/ase_exception.h index 7b83d205d..ee6a1c525 100644 --- a/src/ase_exception.h +++ b/src/ase_exception.h @@ -21,7 +21,7 @@ #include #include -#include "jinete/jbase.h" +#include "gui/jbase.h" class TiXmlDocument; diff --git a/src/commands/cmd_about.cpp b/src/commands/cmd_about.cpp index 71704c134..0c9830a41 100644 --- a/src/commands/cmd_about.cpp +++ b/src/commands/cmd_about.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "modules/gui.h" diff --git a/src/commands/cmd_advanced_mode.cpp b/src/commands/cmd_advanced_mode.cpp index 5634e0a12..35bd637aa 100644 --- a/src/commands/cmd_advanced_mode.cpp +++ b/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" diff --git a/src/commands/cmd_canvas_size.cpp b/src/commands/cmd_canvas_size.cpp index ecf354b60..a0abae2f2 100644 --- a/src/commands/cmd_canvas_size.cpp +++ b/src/commands/cmd_canvas_size.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "modules/gui.h" diff --git a/src/commands/cmd_cel_properties.cpp b/src/commands/cmd_cel_properties.cpp index 2791ee077..8cedbc978 100644 --- a/src/commands/cmd_cel_properties.cpp +++ b/src/commands/cmd_cel_properties.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_close_file.cpp b/src/commands/cmd_close_file.cpp index b35cf5187..15d0f32f6 100644 --- a/src/commands/cmd_close_file.cpp +++ b/src/commands/cmd_close_file.cpp @@ -20,7 +20,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "commands/commands.h" diff --git a/src/commands/cmd_configure_screen.cpp b/src/commands/cmd_configure_screen.cpp index ac83dbfa9..b92499860 100644 --- a/src/commands/cmd_configure_screen.cpp +++ b/src/commands/cmd_configure_screen.cpp @@ -22,7 +22,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_configure_tools.cpp b/src/commands/cmd_configure_tools.cpp index 50bfbe289..e230e039a 100644 --- a/src/commands/cmd_configure_tools.cpp +++ b/src/commands/cmd_configure_tools.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_copy.cpp b/src/commands/cmd_copy.cpp index f7e3fb6cd..932db574f 100644 --- a/src/commands/cmd_copy.cpp +++ b/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" diff --git a/src/commands/cmd_copy_cel.cpp b/src/commands/cmd_copy_cel.cpp index f5f51d2f9..794d66753 100644 --- a/src/commands/cmd_copy_cel.cpp +++ b/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" diff --git a/src/commands/cmd_cut.cpp b/src/commands/cmd_cut.cpp index 34779d14f..3647e4164 100644 --- a/src/commands/cmd_cut.cpp +++ b/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" diff --git a/src/commands/cmd_duplicate_layer.cpp b/src/commands/cmd_duplicate_layer.cpp index f1571ed80..6b655db9f 100644 --- a/src/commands/cmd_duplicate_layer.cpp +++ b/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" diff --git a/src/commands/cmd_duplicate_sprite.cpp b/src/commands/cmd_duplicate_sprite.cpp index 4080da157..7db793c64 100644 --- a/src/commands/cmd_duplicate_sprite.cpp +++ b/src/commands/cmd_duplicate_sprite.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "ui_context.h" #include "commands/command.h" diff --git a/src/commands/cmd_exit.cpp b/src/commands/cmd_exit.cpp index 07de68afc..63cd6c167 100644 --- a/src/commands/cmd_exit.cpp +++ b/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" diff --git a/src/commands/cmd_eyedropper.cpp b/src/commands/cmd_eyedropper.cpp index d796e70b8..31bc5920e 100644 --- a/src/commands/cmd_eyedropper.cpp +++ b/src/commands/cmd_eyedropper.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "commands/params.h" diff --git a/src/commands/cmd_film_editor.cpp b/src/commands/cmd_film_editor.cpp index 1ba444c75..cad4d7ee7 100644 --- a/src/commands/cmd_film_editor.cpp +++ b/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" diff --git a/src/commands/cmd_flip.cpp b/src/commands/cmd_flip.cpp index ff9debaec..d8e196080 100644 --- a/src/commands/cmd_flip.cpp +++ b/src/commands/cmd_flip.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "commands/command.h" #include "commands/params.h" diff --git a/src/commands/cmd_frame_properties.cpp b/src/commands/cmd_frame_properties.cpp index 60b75512c..6e02183ba 100644 --- a/src/commands/cmd_frame_properties.cpp +++ b/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" diff --git a/src/commands/cmd_grid.cpp b/src/commands/cmd_grid.cpp index e5b8eeae4..d85e80389 100644 --- a/src/commands/cmd_grid.cpp +++ b/src/commands/cmd_grid.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jwindow.h" +#include "gui/jwindow.h" #include "commands/command.h" #include "context.h" diff --git a/src/commands/cmd_layer_from_background.cpp b/src/commands/cmd_layer_from_background.cpp index 9f8def0d0..994030fc8 100644 --- a/src/commands/cmd_layer_from_background.cpp +++ b/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" diff --git a/src/commands/cmd_layer_properties.cpp b/src/commands/cmd_layer_properties.cpp index 8d42338d1..0fcff38c6 100644 --- a/src/commands/cmd_layer_properties.cpp +++ b/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" diff --git a/src/commands/cmd_load_mask.cpp b/src/commands/cmd_load_mask.cpp index c0e776461..78d303927 100644 --- a/src/commands/cmd_load_mask.cpp +++ b/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" diff --git a/src/commands/cmd_mask_by_color.cpp b/src/commands/cmd_mask_by_color.cpp index ba02f3513..719265178 100644 --- a/src/commands/cmd_mask_by_color.cpp +++ b/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" diff --git a/src/commands/cmd_merge_down_layer.cpp b/src/commands/cmd_merge_down_layer.cpp index 9e6d0c44a..1c83eaaeb 100644 --- a/src/commands/cmd_merge_down_layer.cpp +++ b/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" diff --git a/src/commands/cmd_move_cel.cpp b/src/commands/cmd_move_cel.cpp index 7f13770cf..944415c45 100644 --- a/src/commands/cmd_move_cel.cpp +++ b/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" diff --git a/src/commands/cmd_new_cel.cpp b/src/commands/cmd_new_cel.cpp index 5994f5c1e..0ed1d0150 100644 --- a/src/commands/cmd_new_cel.cpp +++ b/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" diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp index 607dc7073..35eb6979a 100644 --- a/src/commands/cmd_new_file.cpp +++ b/src/commands/cmd_new_file.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "ui_context.h" #include "commands/command.h" diff --git a/src/commands/cmd_new_frame.cpp b/src/commands/cmd_new_frame.cpp index 9db73cf70..1968968f1 100644 --- a/src/commands/cmd_new_frame.cpp +++ b/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" diff --git a/src/commands/cmd_new_layer.cpp b/src/commands/cmd_new_layer.cpp index 28506748b..26ccd79e9 100644 --- a/src/commands/cmd_new_layer.cpp +++ b/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" diff --git a/src/commands/cmd_new_layer_set.cpp b/src/commands/cmd_new_layer_set.cpp index a8c975afa..4827e8742 100644 --- a/src/commands/cmd_new_layer_set.cpp +++ b/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" diff --git a/src/commands/cmd_open_file.cpp b/src/commands/cmd_open_file.cpp index bc2a3edbe..e39be8e36 100644 --- a/src/commands/cmd_open_file.cpp +++ b/src/commands/cmd_open_file.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "ui_context.h" #include "commands/command.h" diff --git a/src/commands/cmd_options.cpp b/src/commands/cmd_options.cpp index 1cbdf96c6..1b604fd4a 100644 --- a/src/commands/cmd_options.cpp +++ b/src/commands/cmd_options.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp index 7befe91e2..ece2cc5b9 100644 --- a/src/commands/cmd_palette_editor.cpp +++ b/src/commands/cmd_palette_editor.cpp @@ -24,7 +24,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "app/color.h" diff --git a/src/commands/cmd_play_animation.cpp b/src/commands/cmd_play_animation.cpp index a47e445e6..34b7e6ea8 100644 --- a/src/commands/cmd_play_animation.cpp +++ b/src/commands/cmd_play_animation.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "modules/editors.h" diff --git a/src/commands/cmd_preview.cpp b/src/commands/cmd_preview.cpp index 030c5da6a..792df9a82 100644 --- a/src/commands/cmd_preview.cpp +++ b/src/commands/cmd_preview.cpp @@ -21,7 +21,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "commands/commands.h" diff --git a/src/commands/cmd_refresh.cpp b/src/commands/cmd_refresh.cpp index 21bf2b397..8ee6e95f3 100644 --- a/src/commands/cmd_refresh.cpp +++ b/src/commands/cmd_refresh.cpp @@ -25,8 +25,8 @@ #include #endif -#include "jinete/jtheme.h" -#include "jinete/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jsystem.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_remove_frame.cpp b/src/commands/cmd_remove_frame.cpp index e1f0cb167..3e27c0ef0 100644 --- a/src/commands/cmd_remove_frame.cpp +++ b/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" diff --git a/src/commands/cmd_remove_layer.cpp b/src/commands/cmd_remove_layer.cpp index a8d4bb0a5..8da199f8c 100644 --- a/src/commands/cmd_remove_layer.cpp +++ b/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" diff --git a/src/commands/cmd_rotate_canvas.cpp b/src/commands/cmd_rotate_canvas.cpp index 29484ebd8..8419697a5 100644 --- a/src/commands/cmd_rotate_canvas.cpp +++ b/src/commands/cmd_rotate_canvas.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/commands/cmd_save_file.cpp b/src/commands/cmd_save_file.cpp index c1e778ec1..15510d34d 100644 --- a/src/commands/cmd_save_file.cpp +++ b/src/commands/cmd_save_file.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "app.h" diff --git a/src/commands/cmd_save_mask.cpp b/src/commands/cmd_save_mask.cpp index 43a8462ef..f9ac68f08 100644 --- a/src/commands/cmd_save_mask.cpp +++ b/src/commands/cmd_save_mask.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jalert.h" +#include "gui/jalert.h" #include "commands/command.h" #include "dialogs/filesel.h" diff --git a/src/commands/cmd_screen_shot.cpp b/src/commands/cmd_screen_shot.cpp index 905147185..ca3342a5e 100644 --- a/src/commands/cmd_screen_shot.cpp +++ b/src/commands/cmd_screen_shot.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jsystem.h" +#include "gui/jsystem.h" #include "commands/command.h" #include "file/file.h" diff --git a/src/commands/cmd_select_file.cpp b/src/commands/cmd_select_file.cpp index 184ac5ccb..0e4e28c52 100644 --- a/src/commands/cmd_select_file.cpp +++ b/src/commands/cmd_select_file.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "ui_context.h" #include "commands/command.h" diff --git a/src/commands/cmd_sprite_properties.cpp b/src/commands/cmd_sprite_properties.cpp index 85d2604aa..acf05b9c2 100644 --- a/src/commands/cmd_sprite_properties.cpp +++ b/src/commands/cmd_sprite_properties.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app/color.h" #include "base/mem_utils.h" diff --git a/src/commands/cmd_sprite_size.cpp b/src/commands/cmd_sprite_size.cpp index b85bc1035..0b0007d38 100644 --- a/src/commands/cmd_sprite_size.cpp +++ b/src/commands/cmd_sprite_size.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "commands/command.h" #include "core/cfg.h" diff --git a/src/commands/cmd_switch_colors.cpp b/src/commands/cmd_switch_colors.cpp index c54363fd7..64b002229 100644 --- a/src/commands/cmd_switch_colors.cpp +++ b/src/commands/cmd_switch_colors.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "commands/command.h" #include "app.h" diff --git a/src/commands/commands.cpp b/src/commands/commands.cpp index 64b127189..771a031dc 100644 --- a/src/commands/commands.cpp +++ b/src/commands/commands.cpp @@ -23,7 +23,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "console.h" #include "commands/command.h" diff --git a/src/commands/commands.h b/src/commands/commands.h index 871fd87fa..8bba78b74 100644 --- a/src/commands/commands.h +++ b/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 { diff --git a/src/commands/fx/cmd_color_curve.cpp b/src/commands/fx/cmd_color_curve.cpp index 16c00969f..aab97c253 100644 --- a/src/commands/fx/cmd_color_curve.cpp +++ b/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" diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp index 8096db043..95377e568 100644 --- a/src/commands/fx/cmd_convolution_matrix.cpp +++ b/src/commands/fx/cmd_convolution_matrix.cpp @@ -21,16 +21,16 @@ #include #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" diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp index c2b25d478..edfb9131a 100644 --- a/src/commands/fx/cmd_despeckle.cpp +++ b/src/commands/fx/cmd_despeckle.cpp @@ -21,12 +21,12 @@ #include #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" diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp index 69616da42..146d09997 100644 --- a/src/commands/fx/cmd_invert_color.cpp +++ b/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" diff --git a/src/commands/fx/cmd_replace_color.cpp b/src/commands/fx/cmd_replace_color.cpp index 06a93c557..c03f0b188 100644 --- a/src/commands/fx/cmd_replace_color.cpp +++ b/src/commands/fx/cmd_replace_color.cpp @@ -21,7 +21,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "app/color.h" diff --git a/src/commands/fx/effectbg.cpp b/src/commands/fx/effectbg.cpp index e61077df8..4a90f648f 100644 --- a/src/commands/fx/effectbg.cpp +++ b/src/commands/fx/effectbg.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "base/mutex.h" diff --git a/src/console.cpp b/src/console.cpp index 1329aa8af..e1591e872 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -23,7 +23,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "console.h" diff --git a/src/core/cfg.cpp b/src/core/cfg.cpp index 564e52985..d176d168b 100644 --- a/src/core/cfg.cpp +++ b/src/core/cfg.cpp @@ -22,7 +22,7 @@ #include #include -#include "jinete/jrect.h" +#include "gui/jrect.h" #include "core/cfg.h" #include "resource_finder.h" diff --git a/src/core/drop_files.cpp b/src/core/drop_files.cpp index 929bbfecf..139fa0a3b 100644 --- a/src/core/drop_files.cpp +++ b/src/core/drop_files.cpp @@ -21,8 +21,8 @@ #include #include -#include "jinete/jstring.h" -#include "jinete/jwindow.h" +#include "gui/jstring.h" +#include "gui/jwindow.h" #include "app.h" #include "base/mutex.h" diff --git a/src/core/file_system.cpp b/src/core/file_system.cpp index e289f182a..e626e843b 100644 --- a/src/core/file_system.cpp +++ b/src/core/file_system.cpp @@ -55,7 +55,7 @@ #include #endif -#include "jinete/jstring.h" +#include "gui/jstring.h" #include "core/file_system.h" diff --git a/src/core/file_system.h b/src/core/file_system.h index e0f22b7d3..97f5635c5 100644 --- a/src/core/file_system.h +++ b/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 diff --git a/src/core/modules.h b/src/core/modules.h index 525dae9df..4a77c439a 100644 --- a/src/core/modules.h +++ b/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 diff --git a/src/dialogs/aniedit.cpp b/src/dialogs/aniedit.cpp index 4a514ec3c..47a37b092 100644 --- a/src/dialogs/aniedit.cpp +++ b/src/dialogs/aniedit.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "gfx/rect.h" #include "gfx/point.h" diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp index fb0e85a2b..20c6c159e 100644 --- a/src/dialogs/drawtext.cpp +++ b/src/dialogs/drawtext.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "console.h" diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp index d72804e21..9d884304c 100644 --- a/src/dialogs/filesel.cpp +++ b/src/dialogs/filesel.cpp @@ -30,7 +30,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "core/cfg.h" diff --git a/src/dialogs/filesel.h b/src/dialogs/filesel.h index 76f68179c..79e239a4d 100644 --- a/src/dialogs/filesel.h +++ b/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, diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp index 85241cd67..85d1d7ec2 100644 --- a/src/dialogs/maskcol.cpp +++ b/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" diff --git a/src/dialogs/playfli.cpp b/src/dialogs/playfli.cpp index 406bcf467..9a12742a1 100644 --- a/src/dialogs/playfli.cpp +++ b/src/dialogs/playfli.cpp @@ -22,8 +22,8 @@ #include #include -#include "jinete/jmanager.h" -#include "jinete/jsystem.h" +#include "gui/jmanager.h" +#include "gui/jsystem.h" #include "app.h" #include "file/fli/fli.h" diff --git a/src/dialogs/playfli.h b/src/dialogs/playfli.h index 28228803a..989f93f4d 100644 --- a/src/dialogs/playfli.h +++ b/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); diff --git a/src/dialogs/repo.cpp b/src/dialogs/repo.cpp index 393828019..abe297bd5 100644 --- a/src/dialogs/repo.cpp +++ b/src/dialogs/repo.cpp @@ -22,7 +22,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "core/cfg.h" #include "dialogs/repo.h" diff --git a/src/dialogs/repo.h b/src/dialogs/repo.h index c49c780b2..340b9a222 100644 --- a/src/dialogs/repo.h +++ b/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; diff --git a/src/effect/colcurve.cpp b/src/effect/colcurve.cpp index 5f16ae08a..f6aa28a0a 100644 --- a/src/effect/colcurve.cpp +++ b/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" diff --git a/src/effect/colcurve.h b/src/effect/colcurve.h index 9a62ac0e6..37ecaac50 100644 --- a/src/effect/colcurve.h +++ b/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; diff --git a/src/effect/convmatr.cpp b/src/effect/convmatr.cpp index dcb18c77c..da950734d 100644 --- a/src/effect/convmatr.cpp +++ b/src/effect/convmatr.cpp @@ -22,7 +22,7 @@ #include #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "core/cfg.h" #include "effect/convmatr.h" diff --git a/src/effect/convmatr.h b/src/effect/convmatr.h index 252554a42..0277502d3 100644 --- a/src/effect/convmatr.h +++ b/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; diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp index 1a1e10897..8aee83110 100644 --- a/src/effect/effect.cpp +++ b/src/effect/effect.cpp @@ -21,11 +21,11 @@ #include #include -#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" diff --git a/src/effect/effect.h b/src/effect/effect.h index f3433bf5a..b9acb9cbf 100644 --- a/src/effect/effect.h +++ b/src/effect/effect.h @@ -22,7 +22,7 @@ #include #include #include "sprite_wrappers.h" -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "tiled_mode.h" class Image; diff --git a/src/effect/images_ref.cpp b/src/effect/images_ref.cpp index 1e615a78f..0d9787439 100644 --- a/src/effect/images_ref.cpp +++ b/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" diff --git a/src/errno_unittest.cpp b/src/errno_unittest.cpp index 6a16c2b9c..6ef0cef1f 100644 --- a/src/errno_unittest.cpp +++ b/src/errno_unittest.cpp @@ -19,7 +19,7 @@ #include "tests/test.h" #include -#include "jinete/jthread.h" +#include "gui/jthread.h" static JThread thread; diff --git a/src/file/ase_format.cpp b/src/file/ase_format.cpp index 5b95128ad..c393e4765 100644 --- a/src/file/ase_format.cpp +++ b/src/file/ase_format.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "zlib.h" #include "file/file.h" diff --git a/src/file/file.cpp b/src/file/file.cpp index 450df4a7b..eec468c69 100644 --- a/src/file/file.cpp +++ b/src/file/file.cpp @@ -21,8 +21,8 @@ #include #include -#include "jinete/jalert.h" -#include "jinete/jlist.h" +#include "gui/jalert.h" +#include "gui/jlist.h" #include "app.h" #include "base/mutex.h" diff --git a/src/file/file.h b/src/file/file.h index a2f09ed86..ac3cb10ae 100644 --- a/src/file/file.h +++ b/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 #define FILE_SUPPORT_RGB (1<<0) diff --git a/src/file/format_options.cpp b/src/file/format_options.cpp index 09a1afb7d..bdac8010f 100644 --- a/src/file/format_options.cpp +++ b/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" diff --git a/src/file/gif_format.cpp b/src/file/gif_format.cpp index 127528d44..eb4d6292a 100644 --- a/src/file/gif_format.cpp +++ b/src/file/gif_format.cpp @@ -27,7 +27,7 @@ #include #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "file/file.h" #include "file/gif/format.h" diff --git a/src/file/jpeg_format.cpp b/src/file/jpeg_format.cpp index 444e66adf..c21012079 100644 --- a/src/file/jpeg_format.cpp +++ b/src/file/jpeg_format.cpp @@ -22,7 +22,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "core/cfg.h" diff --git a/src/file/tga_format.cpp b/src/file/tga_format.cpp index adba01a86..754995519 100644 --- a/src/file/tga_format.cpp +++ b/src/file/tga_format.cpp @@ -23,7 +23,7 @@ #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "file/file.h" #include "raster/raster.h" diff --git a/src/gfxmode.cpp b/src/gfxmode.cpp index c11a67dee..f14e5c0d3 100644 --- a/src/gfxmode.cpp +++ b/src/gfxmode.cpp @@ -20,8 +20,8 @@ #include -#include "jinete/jmanager.h" -#include "jinete/jwindow.h" +#include "gui/jmanager.h" +#include "gui/jwindow.h" #include "app.h" #include "gfxmode.h" diff --git a/src/jinete/jaccel.cpp b/src/gui/jaccel.cpp similarity index 99% rename from src/jinete/jaccel.cpp rename to src/gui/jaccel.cpp index ff7bcc219..d945d56dd 100644 --- a/src/jinete/jaccel.cpp +++ b/src/gui/jaccel.cpp @@ -35,8 +35,8 @@ #include #include -#include "jinete/jaccel.h" -#include "jinete/jlist.h" +#include "gui/jaccel.h" +#include "gui/jlist.h" /* #define REPORT_KEYS */ #define PREPROCESS_KEYS diff --git a/src/jinete/jaccel.h b/src/gui/jaccel.h similarity index 98% rename from src/jinete/jaccel.h rename to src/gui/jaccel.h index bf9010343..40fff90f6 100644 --- a/src/jinete/jaccel.h +++ b/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); diff --git a/src/jinete/jalert.cpp b/src/gui/jalert.cpp similarity index 99% rename from src/jinete/jalert.cpp rename to src/gui/jalert.cpp index 3449cd6ee..2c911d3d7 100644 --- a/src/jinete/jalert.cpp +++ b/src/gui/jalert.cpp @@ -60,7 +60,7 @@ #include #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" static Frame* create_alert(char *buf, JList *labels, JList *buttons); diff --git a/src/jinete/jalert.h b/src/gui/jalert.h similarity index 100% rename from src/jinete/jalert.h rename to src/gui/jalert.h diff --git a/src/jinete/jbase.h b/src/gui/jbase.h similarity index 100% rename from src/jinete/jbase.h rename to src/gui/jbase.h diff --git a/src/jinete/jbox.cpp b/src/gui/jbox.cpp similarity index 97% rename from src/jinete/jbox.cpp rename to src/gui/jbox.cpp index 0804b7508..7e9bd8ef5 100644 --- a/src/jinete/jbox.cpp +++ b/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; diff --git a/src/jinete/jbox.h b/src/gui/jbox.h similarity index 98% rename from src/jinete/jbox.h rename to src/gui/jbox.h index 25785fba0..417a6c5ff 100644 --- a/src/jinete/jbox.h +++ b/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); diff --git a/src/jinete/jbutton.cpp b/src/gui/jbutton.cpp similarity index 97% rename from src/jinete/jbutton.cpp rename to src/gui/jbutton.cpp index db6183a2d..35dad6cc2 100644 --- a/src/jinete/jbutton.cpp +++ b/src/gui/jbutton.cpp @@ -37,14 +37,14 @@ #include #include -#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) diff --git a/src/jinete/jbutton.h b/src/gui/jbutton.h similarity index 99% rename from src/jinete/jbutton.h rename to src/gui/jbutton.h index 22c425701..0ac34f924 100644 --- a/src/jinete/jbutton.h +++ b/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 diff --git a/src/jinete/jclipboard.cpp b/src/gui/jclipboard.cpp similarity index 99% rename from src/jinete/jclipboard.cpp rename to src/gui/jclipboard.cpp index 23ef99bf7..ba037a924 100644 --- a/src/jinete/jclipboard.cpp +++ b/src/gui/jclipboard.cpp @@ -36,7 +36,7 @@ #include #endif -#include "jinete/jbase.h" +#include "gui/jbase.h" static char *clipboard_text = NULL; diff --git a/src/jinete/jclipboard.h b/src/gui/jclipboard.h similarity index 98% rename from src/jinete/jclipboard.h rename to src/gui/jclipboard.h index 51eb9789b..141794008 100644 --- a/src/jinete/jclipboard.h +++ b/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); diff --git a/src/jinete/jcombobox.cpp b/src/gui/jcombobox.cpp similarity index 99% rename from src/jinete/jcombobox.cpp rename to src/gui/jcombobox.cpp index a3f539ee9..afad2bc68 100644 --- a/src/jinete/jcombobox.cpp +++ b/src/gui/jcombobox.cpp @@ -33,7 +33,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "gfx/size.h" #include "Vaca/PreferredSizeEvent.h" diff --git a/src/jinete/jcombobox.h b/src/gui/jcombobox.h similarity index 99% rename from src/jinete/jcombobox.h rename to src/gui/jcombobox.h index b82f03f9f..1fc12d763 100644 --- a/src/jinete/jcombobox.h +++ b/src/gui/jcombobox.h @@ -32,7 +32,7 @@ #ifndef JINETE_JCOMBOBOX_H_INCLUDED #define JINETE_JCOMBOBOX_H_INCLUDED -#include "jinete/jwidget.h" +#include "gui/jwidget.h" #include #include diff --git a/src/jinete/jcustom_label.cpp b/src/gui/jcustom_label.cpp similarity index 98% rename from src/jinete/jcustom_label.cpp rename to src/gui/jcustom_label.cpp index bad293ee7..fe9f65e4f 100644 --- a/src/jinete/jcustom_label.cpp +++ b/src/gui/jcustom_label.cpp @@ -32,7 +32,7 @@ #include "config.h" -#include "jinete/jcustom_label.h" +#include "gui/jcustom_label.h" CustomLabel::CustomLabel(const char *text) : Label(text) diff --git a/src/jinete/jcustom_label.h b/src/gui/jcustom_label.h similarity index 98% rename from src/jinete/jcustom_label.h rename to src/gui/jcustom_label.h index 86a1f3124..de2701e23 100644 --- a/src/jinete/jcustom_label.h +++ b/src/gui/jcustom_label.h @@ -32,7 +32,7 @@ #ifndef JINETE_JCUSTOM_LABEL_H_INCLUDED #define JINETE_JCUSTOM_LABEL_H_INCLUDED -#include "jinete/jlabel.h" +#include "gui/jlabel.h" class CustomLabel : public Label { diff --git a/src/jinete/jdraw.cpp b/src/gui/jdraw.cpp similarity index 97% rename from src/jinete/jdraw.cpp rename to src/gui/jdraw.cpp index 5e07fbeb9..64c926468 100644 --- a/src/jinete/jdraw.cpp +++ b/src/gui/jdraw.cpp @@ -34,14 +34,14 @@ #include #include -#include "jinete/jdraw.h" -#include "jinete/jfont.h" -#include "jinete/jintern.h" -#include "jinete/jlist.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" -#include "jinete/jsystem.h" -#include "jinete/jwidget.h" +#include "gui/jdraw.h" +#include "gui/jfont.h" +#include "gui/jintern.h" +#include "gui/jlist.h" +#include "gui/jrect.h" +#include "gui/jregion.h" +#include "gui/jsystem.h" +#include "gui/jwidget.h" using namespace gfx; diff --git a/src/jinete/jdraw.h b/src/gui/jdraw.h similarity index 99% rename from src/jinete/jdraw.h rename to src/gui/jdraw.h index f37b73c56..5578d68ea 100644 --- a/src/jinete/jdraw.h +++ b/src/gui/jdraw.h @@ -32,7 +32,7 @@ #ifndef JINETE_JDRAW_H_INCLUDED #define JINETE_JDRAW_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" namespace gfx { class Rect; } diff --git a/src/jinete/jentry.cpp b/src/gui/jentry.cpp similarity index 98% rename from src/jinete/jentry.cpp rename to src/gui/jentry.cpp index 47af4d170..8fde590ac 100644 --- a/src/jinete/jentry.cpp +++ b/src/gui/jentry.cpp @@ -36,15 +36,15 @@ #include #include -#include "jinete/jclipboard.h" -#include "jinete/jfont.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jstring.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jclipboard.h" +#include "gui/jfont.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jstring.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #define CHARACTER_LENGTH(f, c) ((f)->vtable->char_length((f), (c))) diff --git a/src/jinete/jentry.h b/src/gui/jentry.h similarity index 98% rename from src/jinete/jentry.h rename to src/gui/jentry.h index 6ba1d8b3b..379a21f94 100644 --- a/src/jinete/jentry.h +++ b/src/gui/jentry.h @@ -32,7 +32,7 @@ #ifndef JINETE_JENTRY_H_INCLUDED #define JINETE_JENTRY_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jentry_new(size_t maxsize, const char *format, ...); diff --git a/src/jinete/jfont.cpp b/src/gui/jfont.cpp similarity index 99% rename from src/jinete/jfont.cpp rename to src/gui/jfont.cpp index c69dfe95a..b307b0aac 100644 --- a/src/jinete/jfont.cpp +++ b/src/gui/jfont.cpp @@ -38,9 +38,9 @@ #include #include -#include "jinete/jfont.h" -#include "jinete/jintern.h" -#include "jinete/jtheme.h" +#include "gui/jfont.h" +#include "gui/jintern.h" +#include "gui/jtheme.h" FONT* ji_font_load(const char* filepathname) { diff --git a/src/jinete/jfont.h b/src/gui/jfont.h similarity index 98% rename from src/jinete/jfont.h rename to src/gui/jfont.h index 480ea93c4..ed8dcecb7 100644 --- a/src/jinete/jfont.h +++ b/src/gui/jfont.h @@ -32,7 +32,7 @@ #ifndef JINETE_JFONT_H_INCLUDED #define JINETE_JFONT_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct BITMAP; struct FONT; diff --git a/src/jinete/jfontbmp.cpp b/src/gui/jfontbmp.cpp similarity index 100% rename from src/jinete/jfontbmp.cpp rename to src/gui/jfontbmp.cpp diff --git a/src/jinete/jgrid.cpp b/src/gui/jgrid.cpp similarity index 99% rename from src/jinete/jgrid.cpp rename to src/gui/jgrid.cpp index bf9113cba..647c7ba1e 100644 --- a/src/jinete/jgrid.cpp +++ b/src/gui/jgrid.cpp @@ -35,11 +35,11 @@ #include #include -#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; diff --git a/src/jinete/jgrid.h b/src/gui/jgrid.h similarity index 98% rename from src/jinete/jgrid.h rename to src/gui/jgrid.h index aedd1fb0f..3cf82e7c0 100644 --- a/src/jinete/jgrid.h +++ b/src/gui/jgrid.h @@ -32,7 +32,7 @@ #ifndef JINETE_JGRID_H_INCLUDED #define JINETE_JGRID_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jgrid_new(int columns, bool same_width_columns); diff --git a/src/jinete/jgrid_unittest.cpp b/src/gui/jgrid_unittest.cpp similarity index 100% rename from src/jinete/jgrid_unittest.cpp rename to src/gui/jgrid_unittest.cpp diff --git a/src/jinete/jhook.cpp b/src/gui/jhook.cpp similarity index 98% rename from src/jinete/jhook.cpp rename to src/gui/jhook.cpp index 950013333..ccb6b50ac 100644 --- a/src/jinete/jhook.cpp +++ b/src/gui/jhook.cpp @@ -31,7 +31,7 @@ #include "config.h" -#include "jinete/jhook.h" +#include "gui/jhook.h" /** * Creates a new empty hook. diff --git a/src/jinete/jhook.h b/src/gui/jhook.h similarity index 98% rename from src/jinete/jhook.h rename to src/gui/jhook.h index 94d7a2cc0..29d526946 100644 --- a/src/jinete/jhook.h +++ b/src/gui/jhook.h @@ -32,7 +32,7 @@ #ifndef JINETE_JHOOK_H_INCLUDED #define JINETE_JHOOK_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" /** * A hook is a way to intercept messages which are sent to a @ref jwidget. diff --git a/src/jinete/jimage.cpp b/src/gui/jimage.cpp similarity index 94% rename from src/jinete/jimage.cpp rename to src/gui/jimage.cpp index b3b286d8e..c671f53fc 100644 --- a/src/jinete/jimage.cpp +++ b/src/gui/jimage.cpp @@ -34,12 +34,12 @@ #include #include -#include "jinete/jdraw.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jdraw.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" static bool image_msg_proc(JWidget widget, JMessage msg); diff --git a/src/jinete/jimage.h b/src/gui/jimage.h similarity index 98% rename from src/jinete/jimage.h rename to src/gui/jimage.h index 8055a61ba..88657cb13 100644 --- a/src/jinete/jimage.h +++ b/src/gui/jimage.h @@ -32,7 +32,7 @@ #ifndef JINETE_JIMAGE_H_INCLUDED #define JINETE_JIMAGE_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct BITMAP; diff --git a/src/jinete/jinete.cpp b/src/gui/jinete.cpp similarity index 96% rename from src/jinete/jinete.cpp rename to src/gui/jinete.cpp index 75bbd7115..c07edc12e 100644 --- a/src/jinete/jinete.cpp +++ b/src/gui/jinete.cpp @@ -31,9 +31,9 @@ #include "config.h" -#include "jinete/jbase.h" -#include "jinete/jtheme.h" -#include "jinete/jclipboard.h" +#include "gui/jbase.h" +#include "gui/jtheme.h" +#include "gui/jclipboard.h" #ifdef MEMLEAK void _jmemleak_init(); diff --git a/src/jinete/jinete.h b/src/gui/jinete.h similarity index 61% rename from src/jinete/jinete.h rename to src/gui/jinete.h index d9ed78a13..aed6afcba 100644 --- a/src/jinete/jinete.h +++ b/src/gui/jinete.h @@ -32,43 +32,43 @@ #ifndef JINETE_JINETE_H_INCLUDED #define JINETE_JINETE_H_INCLUDED -#include "jinete/jaccel.h" -#include "jinete/jalert.h" -#include "jinete/jbase.h" -#include "jinete/jbox.h" -#include "jinete/jbutton.h" -#include "jinete/jclipboard.h" -#include "jinete/jcombobox.h" -#include "jinete/jcustom_label.h" -#include "jinete/jdraw.h" -#include "jinete/jentry.h" -#include "jinete/jfont.h" -#include "jinete/jgrid.h" -#include "jinete/jhook.h" -#include "jinete/jimage.h" -#include "jinete/jlabel.h" -#include "jinete/jlink_label.h" -#include "jinete/jlist.h" -#include "jinete/jlistbox.h" -#include "jinete/jmanager.h" -#include "jinete/jmenu.h" -#include "jinete/jmessage.h" -#include "jinete/jpanel.h" -#include "jinete/jpopup_window.h" -#include "jinete/jquickmenu.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" -#include "jinete/jsep.h" -#include "jinete/jslider.h" -#include "jinete/jstream.h" -#include "jinete/jstring.h" -#include "jinete/jsystem.h" -#include "jinete/jtextbox.h" -#include "jinete/jtheme.h" -#include "jinete/jthread.h" -#include "jinete/jtooltips.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" -#include "jinete/jwindow.h" +#include "gui/jaccel.h" +#include "gui/jalert.h" +#include "gui/jbase.h" +#include "gui/jbox.h" +#include "gui/jbutton.h" +#include "gui/jclipboard.h" +#include "gui/jcombobox.h" +#include "gui/jcustom_label.h" +#include "gui/jdraw.h" +#include "gui/jentry.h" +#include "gui/jfont.h" +#include "gui/jgrid.h" +#include "gui/jhook.h" +#include "gui/jimage.h" +#include "gui/jlabel.h" +#include "gui/jlink_label.h" +#include "gui/jlist.h" +#include "gui/jlistbox.h" +#include "gui/jmanager.h" +#include "gui/jmenu.h" +#include "gui/jmessage.h" +#include "gui/jpanel.h" +#include "gui/jpopup_window.h" +#include "gui/jquickmenu.h" +#include "gui/jrect.h" +#include "gui/jregion.h" +#include "gui/jsep.h" +#include "gui/jslider.h" +#include "gui/jstream.h" +#include "gui/jstring.h" +#include "gui/jsystem.h" +#include "gui/jtextbox.h" +#include "gui/jtheme.h" +#include "gui/jthread.h" +#include "gui/jtooltips.h" +#include "gui/jview.h" +#include "gui/jwidget.h" +#include "gui/jwindow.h" #endif diff --git a/src/jinete/jintern.cpp b/src/gui/jintern.cpp similarity index 97% rename from src/jinete/jintern.cpp rename to src/gui/jintern.cpp index 47cfd25e3..fff9eff82 100644 --- a/src/jinete/jintern.cpp +++ b/src/gui/jintern.cpp @@ -33,10 +33,10 @@ #include -#include "jinete/jmanager.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" -#include "jinete/jwindow.h" +#include "gui/jmanager.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" +#include "gui/jwindow.h" static std::vector* widgets; diff --git a/src/jinete/jintern.h b/src/gui/jintern.h similarity index 99% rename from src/jinete/jintern.h rename to src/gui/jintern.h index 0151fb12b..927df10fb 100644 --- a/src/jinete/jintern.h +++ b/src/gui/jintern.h @@ -32,7 +32,7 @@ #ifndef JINETE_JINTERN_H_INCLUDED #define JINETE_JINTERN_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct FONT; struct BITMAP; diff --git a/src/jinete/jlabel.cpp b/src/gui/jlabel.cpp similarity index 96% rename from src/jinete/jlabel.cpp rename to src/gui/jlabel.cpp index 5b677df7d..064a2edcf 100644 --- a/src/jinete/jlabel.cpp +++ b/src/gui/jlabel.cpp @@ -31,9 +31,9 @@ #include "config.h" -#include "jinete/jlabel.h" -#include "jinete/jmessage.h" -#include "jinete/jtheme.h" +#include "gui/jlabel.h" +#include "gui/jmessage.h" +#include "gui/jtheme.h" Label::Label(const char *text) : Widget(JI_LABEL) diff --git a/src/jinete/jlabel.h b/src/gui/jlabel.h similarity index 98% rename from src/jinete/jlabel.h rename to src/gui/jlabel.h index 0378c27e5..1375f44c4 100644 --- a/src/jinete/jlabel.h +++ b/src/gui/jlabel.h @@ -32,7 +32,7 @@ #ifndef JINETE_JLABEL_H_INCLUDED #define JINETE_JLABEL_H_INCLUDED -#include "jinete/jwidget.h" +#include "gui/jwidget.h" class Label : public Widget { diff --git a/src/jinete/jlink_label.cpp b/src/gui/jlink_label.cpp similarity index 95% rename from src/jinete/jlink_label.cpp rename to src/gui/jlink_label.cpp index e9dcc88ee..4bd62ff93 100644 --- a/src/jinete/jlink_label.cpp +++ b/src/gui/jlink_label.cpp @@ -32,10 +32,10 @@ #include "config.h" -#include "jinete/jlink_label.h" -#include "jinete/jmessage.h" -#include "jinete/jtheme.h" -#include "jinete/jsystem.h" +#include "gui/jlink_label.h" +#include "gui/jmessage.h" +#include "gui/jtheme.h" +#include "gui/jsystem.h" #include "launcher.h" LinkLabel::LinkLabel(const char* urlOrText) diff --git a/src/jinete/jlink_label.h b/src/gui/jlink_label.h similarity index 98% rename from src/jinete/jlink_label.h rename to src/gui/jlink_label.h index 68dc2113d..8a912e8b6 100644 --- a/src/jinete/jlink_label.h +++ b/src/gui/jlink_label.h @@ -33,7 +33,7 @@ #define JINETE_JLINK_LABEL_H_INCLUDED #include "base/signal.h" -#include "jinete/jcustom_label.h" +#include "gui/jcustom_label.h" #include class LinkLabel : public CustomLabel diff --git a/src/jinete/jlist.cpp b/src/gui/jlist.cpp similarity index 99% rename from src/jinete/jlist.cpp rename to src/gui/jlist.cpp index 10848673b..fd9bbbff9 100644 --- a/src/jinete/jlist.cpp +++ b/src/gui/jlist.cpp @@ -33,7 +33,7 @@ #include "config.h" -#include "jinete/jlist.h" +#include "gui/jlist.h" #ifdef USE_JUNKLIST /* TODO warning not thread safe */ static JList junklist = NULL; diff --git a/src/jinete/jlist.h b/src/gui/jlist.h similarity index 99% rename from src/jinete/jlist.h rename to src/gui/jlist.h index 3f4f5ceb8..803ac4ec7 100644 --- a/src/jinete/jlist.h +++ b/src/gui/jlist.h @@ -32,7 +32,7 @@ #ifndef JINETE_JLIST_H_INCLUDED #define JINETE_JLIST_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct jlink { diff --git a/src/jinete/jlist_unittest.cpp b/src/gui/jlist_unittest.cpp similarity index 95% rename from src/jinete/jlist_unittest.cpp rename to src/gui/jlist_unittest.cpp index 69c0365f7..2abec611d 100644 --- a/src/jinete/jlist_unittest.cpp +++ b/src/gui/jlist_unittest.cpp @@ -17,7 +17,7 @@ */ #include "tests/test.h" -#include "jinete/jlist.h" +#include "gui/jlist.h" TEST(JList, AppendAndClear) { diff --git a/src/jinete/jlistbox.cpp b/src/gui/jlistbox.cpp similarity index 98% rename from src/jinete/jlistbox.cpp rename to src/gui/jlistbox.cpp index b47af5f64..e9b508ce4 100644 --- a/src/jinete/jlistbox.cpp +++ b/src/gui/jlistbox.cpp @@ -33,14 +33,14 @@ #include -#include "jinete/jlist.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" +#include "gui/jlist.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jview.h" +#include "gui/jwidget.h" #include "gfx/size.h" using namespace gfx; diff --git a/src/jinete/jlistbox.h b/src/gui/jlistbox.h similarity index 98% rename from src/jinete/jlistbox.h rename to src/gui/jlistbox.h index d39866d82..5b1b91feb 100644 --- a/src/jinete/jlistbox.h +++ b/src/gui/jlistbox.h @@ -32,7 +32,7 @@ #ifndef JINETE_JLISTBOX_H_INCLUDED #define JINETE_JLISTBOX_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jlistbox_new(); JWidget jlistitem_new(const char *text); diff --git a/src/jinete/jmanager.cpp b/src/gui/jmanager.cpp similarity index 99% rename from src/jinete/jmanager.cpp rename to src/gui/jmanager.cpp index 4722a7363..18bbc1c8a 100644 --- a/src/jinete/jmanager.cpp +++ b/src/gui/jmanager.cpp @@ -40,8 +40,8 @@ #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #define TOPWND(manager) reinterpret_cast(jlist_first_data((manager)->children)) diff --git a/src/jinete/jmanager.h b/src/gui/jmanager.h similarity index 99% rename from src/jinete/jmanager.h rename to src/gui/jmanager.h index ff796b790..5425f5ee2 100644 --- a/src/jinete/jmanager.h +++ b/src/gui/jmanager.h @@ -32,7 +32,7 @@ #ifndef JINETE_JMANAGER_H_INCLUDED #define JINETE_JMANAGER_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget ji_get_default_manager(); diff --git a/src/jinete/jmem.cpp b/src/gui/jmem.cpp similarity index 100% rename from src/jinete/jmem.cpp rename to src/gui/jmem.cpp diff --git a/src/jinete/jmenu.cpp b/src/gui/jmenu.cpp similarity index 99% rename from src/jinete/jmenu.cpp rename to src/gui/jmenu.cpp index 86e755e36..84ca35aa5 100644 --- a/src/jinete/jmenu.cpp +++ b/src/gui/jmenu.cpp @@ -35,8 +35,8 @@ #include #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "gfx/size.h" #define TIMEOUT_TO_OPEN_SUBMENU 250 diff --git a/src/jinete/jmenu.h b/src/gui/jmenu.h similarity index 98% rename from src/jinete/jmenu.h rename to src/gui/jmenu.h index 8a1001940..1ed8c87a2 100644 --- a/src/jinete/jmenu.h +++ b/src/gui/jmenu.h @@ -32,7 +32,7 @@ #ifndef JINETE_JMENU_H_INCLUDED #define JINETE_JMENU_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jmenu_new(); JWidget jmenubar_new(); diff --git a/src/jinete/jmessage.cpp b/src/gui/jmessage.cpp similarity index 96% rename from src/jinete/jmessage.cpp rename to src/gui/jmessage.cpp index aac932044..73816492c 100644 --- a/src/jinete/jmessage.cpp +++ b/src/gui/jmessage.cpp @@ -34,11 +34,11 @@ #include #include -#include "jinete/jlist.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jwidget.h" +#include "gui/jlist.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jwidget.h" static int registered_messages = JM_REGISTERED_MESSAGES; diff --git a/src/jinete/jmessage.h b/src/gui/jmessage.h similarity index 98% rename from src/jinete/jmessage.h rename to src/gui/jmessage.h index 520924711..c79b2c211 100644 --- a/src/jinete/jmessage.h +++ b/src/gui/jmessage.h @@ -32,8 +32,8 @@ #ifndef JINETE_JMESSAGE_H_INCLUDED #define JINETE_JMESSAGE_H_INCLUDED -#include "jinete/jbase.h" -#include "jinete/jrect.h" +#include "gui/jbase.h" +#include "gui/jrect.h" /* TODO add mutexes */ #define JM_MESSAGE(name) \ diff --git a/src/jinete/jpanel.cpp b/src/gui/jpanel.cpp similarity index 98% rename from src/jinete/jpanel.cpp rename to src/gui/jpanel.cpp index 258a00ae6..60ca625ca 100644 --- a/src/jinete/jpanel.cpp +++ b/src/gui/jpanel.cpp @@ -31,12 +31,12 @@ #include "config.h" -#include "jinete/jlist.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jlist.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #include "gfx/size.h" typedef struct Panel diff --git a/src/jinete/jpanel.h b/src/gui/jpanel.h similarity index 98% rename from src/jinete/jpanel.h rename to src/gui/jpanel.h index 753218cf8..244960809 100644 --- a/src/jinete/jpanel.h +++ b/src/gui/jpanel.h @@ -32,7 +32,7 @@ #ifndef JINETE_JPANEL_H_INCLUDED #define JINETE_JPANEL_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jpanel_new(int align); diff --git a/src/jinete/jpopup_window.cpp b/src/gui/jpopup_window.cpp similarity index 99% rename from src/jinete/jpopup_window.cpp rename to src/gui/jpopup_window.cpp index c61ec7bd0..3968434a5 100644 --- a/src/jinete/jpopup_window.cpp +++ b/src/gui/jpopup_window.cpp @@ -33,8 +33,8 @@ #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "gfx/size.h" #include "Vaca/PreferredSizeEvent.h" diff --git a/src/jinete/jpopup_window.h b/src/gui/jpopup_window.h similarity index 98% rename from src/jinete/jpopup_window.h rename to src/gui/jpopup_window.h index 1e6f1cfd1..a349d4fba 100644 --- a/src/jinete/jpopup_window.h +++ b/src/gui/jpopup_window.h @@ -32,7 +32,7 @@ #ifndef JINETE_JPOPUP_WINDOW_H_INCLUDED #define JINETE_JPOPUP_WINDOW_H_INCLUDED -#include "jinete/jwindow.h" +#include "gui/jwindow.h" class PopupWindow : public Frame { diff --git a/src/jinete/jquickmenu.cpp b/src/gui/jquickmenu.cpp similarity index 95% rename from src/jinete/jquickmenu.cpp rename to src/gui/jquickmenu.cpp index a9fc634f0..a6687e5b0 100644 --- a/src/jinete/jquickmenu.cpp +++ b/src/gui/jquickmenu.cpp @@ -31,13 +31,13 @@ #include "config.h" -#include "jinete/jaccel.h" -#include "jinete/jlist.h" -#include "jinete/jmenu.h" -#include "jinete/jmessage.h" -#include "jinete/jquickmenu.h" -#include "jinete/jsep.h" -#include "jinete/jwidget.h" +#include "gui/jaccel.h" +#include "gui/jlist.h" +#include "gui/jmenu.h" +#include "gui/jmessage.h" +#include "gui/jquickmenu.h" +#include "gui/jsep.h" +#include "gui/jwidget.h" typedef struct QuickData { diff --git a/src/jinete/jquickmenu.h b/src/gui/jquickmenu.h similarity index 98% rename from src/jinete/jquickmenu.h rename to src/gui/jquickmenu.h index 2496524ce..d7f10b17a 100644 --- a/src/jinete/jquickmenu.h +++ b/src/gui/jquickmenu.h @@ -32,7 +32,7 @@ #ifndef JINETE_JQUICKMENU_H_INCLUDED #define JINETE_JQUICKMENU_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct jquickmenu { diff --git a/src/jinete/jrect.cpp b/src/gui/jrect.cpp similarity index 99% rename from src/jinete/jrect.cpp rename to src/gui/jrect.cpp index b125af1ed..2acf6eed3 100644 --- a/src/jinete/jrect.cpp +++ b/src/gui/jrect.cpp @@ -31,7 +31,7 @@ #include "config.h" -#include "jinete/jrect.h" +#include "gui/jrect.h" JRect jrect_new(int x1, int y1, int x2, int y2) { diff --git a/src/jinete/jrect.h b/src/gui/jrect.h similarity index 98% rename from src/jinete/jrect.h rename to src/gui/jrect.h index 1a1f9870f..664b41434 100644 --- a/src/jinete/jrect.h +++ b/src/gui/jrect.h @@ -32,7 +32,7 @@ #ifndef JINETE_JRECT_H_INCLUDED #define JINETE_JRECT_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" #define jrect_w(r) (((JRect)(r))->x2-((JRect)(r))->x1) #define jrect_h(r) (((JRect)(r))->y2-((JRect)(r))->y1) diff --git a/src/jinete/jregion.cpp b/src/gui/jregion.cpp similarity index 98% rename from src/jinete/jregion.cpp rename to src/gui/jregion.cpp index 3e1887fb4..cdd28eb22 100644 --- a/src/jinete/jregion.cpp +++ b/src/gui/jregion.cpp @@ -40,9 +40,9 @@ #define xfree jfree #define xrealloc jrealloc -#include "jinete/jbase.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" +#include "gui/jbase.h" +#include "gui/jrect.h" +#include "gui/jregion.h" #define Bool bool #define BoxRec struct jrect diff --git a/src/jinete/jregion.h b/src/gui/jregion.h similarity index 99% rename from src/jinete/jregion.h rename to src/gui/jregion.h index a2362d139..fdf332957 100644 --- a/src/jinete/jregion.h +++ b/src/gui/jregion.h @@ -32,7 +32,7 @@ #ifndef JINETE_JREGION_H_INCLUDED #define JINETE_JREGION_H_INCLUDED -#include "jinete/jrect.h" +#include "gui/jrect.h" #define JI_REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects) /* not a region */ diff --git a/src/jinete/jsep.cpp b/src/gui/jsep.cpp similarity index 95% rename from src/jinete/jsep.cpp rename to src/gui/jsep.cpp index ecc0e5527..a99d7d021 100644 --- a/src/jinete/jsep.cpp +++ b/src/gui/jsep.cpp @@ -31,11 +31,11 @@ #include "config.h" -#include "jinete/jlist.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jlist.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #include "gfx/size.h" using namespace gfx; diff --git a/src/jinete/jsep.h b/src/gui/jsep.h similarity index 98% rename from src/jinete/jsep.h rename to src/gui/jsep.h index 1ce8e5957..1301f2d98 100644 --- a/src/jinete/jsep.h +++ b/src/gui/jsep.h @@ -32,7 +32,7 @@ #ifndef JINETE_JSEP_H_INCLUDED #define JINETE_JSEP_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget ji_separator_new(const char *text, int align); diff --git a/src/jinete/jslider.cpp b/src/gui/jslider.cpp similarity index 97% rename from src/jinete/jslider.cpp rename to src/gui/jslider.cpp index 239dd8638..5c38ae46d 100644 --- a/src/jinete/jslider.cpp +++ b/src/gui/jslider.cpp @@ -33,13 +33,13 @@ #include -#include "jinete/jfont.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jfont.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" typedef struct Slider { diff --git a/src/jinete/jslider.h b/src/gui/jslider.h similarity index 98% rename from src/jinete/jslider.h rename to src/gui/jslider.h index f8ca377ce..2afd26caf 100644 --- a/src/jinete/jslider.h +++ b/src/gui/jslider.h @@ -32,7 +32,7 @@ #ifndef JINETE_JSLIDER_H_INCLUDED #define JINETE_JSLIDER_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jslider_new(int min, int max, int value); diff --git a/src/jinete/jstream.cpp b/src/gui/jstream.cpp similarity index 99% rename from src/jinete/jstream.cpp rename to src/gui/jstream.cpp index fe8fcad41..a58448c91 100644 --- a/src/jinete/jstream.cpp +++ b/src/gui/jstream.cpp @@ -37,7 +37,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" /* jinete stream file/string */ #define JSF ((struct jstream_file *)(stream)) diff --git a/src/jinete/jstream.h b/src/gui/jstream.h similarity index 99% rename from src/jinete/jstream.h rename to src/gui/jstream.h index 9ac45c9b2..9e406bb8c 100644 --- a/src/jinete/jstream.h +++ b/src/gui/jstream.h @@ -32,7 +32,7 @@ #ifndef JINETE_JSTREAM_H_INCLUDED #define JINETE_JSTREAM_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" #include diff --git a/src/jinete/jstring.cpp b/src/gui/jstring.cpp similarity index 95% rename from src/jinete/jstring.cpp rename to src/gui/jstring.cpp index 75c31ed90..ff0fd5740 100644 --- a/src/jinete/jstring.cpp +++ b/src/gui/jstring.cpp @@ -37,7 +37,7 @@ #include "allegro/base.h" -#include "jinete/jstring.h" +#include "gui/jstring.h" #if defined ALLEGRO_WINDOWS const char jstring::separator = '\\'; diff --git a/src/jinete/jstring.h b/src/gui/jstring.h similarity index 100% rename from src/jinete/jstring.h rename to src/gui/jstring.h diff --git a/src/jinete/jstring_unittest.cpp b/src/gui/jstring_unittest.cpp similarity index 95% rename from src/jinete/jstring_unittest.cpp rename to src/gui/jstring_unittest.cpp index 52e15b71a..59f4cf492 100644 --- a/src/jinete/jstring_unittest.cpp +++ b/src/gui/jstring_unittest.cpp @@ -18,7 +18,7 @@ #include "tests/test.h" -#include "jinete/jstring.h" +#include "gui/jstring.h" TEST(JString, has_extension) { diff --git a/src/jinete/jsystem.cpp b/src/gui/jsystem.cpp similarity index 98% rename from src/jinete/jsystem.cpp rename to src/gui/jsystem.cpp index a44f90ec8..83b6683e3 100644 --- a/src/jinete/jsystem.cpp +++ b/src/gui/jsystem.cpp @@ -36,13 +36,13 @@ #include #endif -#include "jinete/jintern.h" -#include "jinete/jmanager.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" +#include "gui/jintern.h" +#include "gui/jmanager.h" +#include "gui/jrect.h" +#include "gui/jregion.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" /* Global output bitmap. */ diff --git a/src/jinete/jsystem.h b/src/gui/jsystem.h similarity index 99% rename from src/jinete/jsystem.h rename to src/gui/jsystem.h index ad9697208..915ad349d 100644 --- a/src/jinete/jsystem.h +++ b/src/gui/jsystem.h @@ -32,7 +32,7 @@ #ifndef JINETE_JSYSTEM_H_INCLUDED #define JINETE_JSYSTEM_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct BITMAP; diff --git a/src/jinete/jtextbox.cpp b/src/gui/jtextbox.cpp similarity index 95% rename from src/jinete/jtextbox.cpp rename to src/gui/jtextbox.cpp index 50b34255c..a3a18d0ea 100644 --- a/src/jinete/jtextbox.cpp +++ b/src/gui/jtextbox.cpp @@ -34,15 +34,15 @@ #include #include -#include "jinete/jhook.h" -#include "jinete/jintern.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" +#include "gui/jhook.h" +#include "gui/jintern.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jview.h" +#include "gui/jwidget.h" static bool textbox_msg_proc(JWidget widget, JMessage msg); static void textbox_request_size(JWidget widget, int *w, int *h); diff --git a/src/jinete/jtextbox.h b/src/gui/jtextbox.h similarity index 98% rename from src/jinete/jtextbox.h rename to src/gui/jtextbox.h index 46c25dddf..08aa4cf35 100644 --- a/src/jinete/jtextbox.h +++ b/src/gui/jtextbox.h @@ -32,7 +32,7 @@ #ifndef JINETE_JTEXTBOX_H_INCLUDED #define JINETE_JTEXTBOX_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jtextbox_new(const char *text, int align); diff --git a/src/jinete/jtheme.cpp b/src/gui/jtheme.cpp similarity index 97% rename from src/jinete/jtheme.cpp rename to src/gui/jtheme.cpp index 2a17553b5..25c824e36 100644 --- a/src/jinete/jtheme.cpp +++ b/src/gui/jtheme.cpp @@ -34,14 +34,14 @@ #include #include -#include "jinete/jdraw.h" -#include "jinete/jfont.h" -#include "jinete/jmanager.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" +#include "gui/jdraw.h" +#include "gui/jfont.h" +#include "gui/jmanager.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jview.h" +#include "gui/jwidget.h" static JTheme ji_current_theme = NULL; static JTheme ji_standard_theme = NULL; diff --git a/src/jinete/jtheme.h b/src/gui/jtheme.h similarity index 99% rename from src/jinete/jtheme.h rename to src/gui/jtheme.h index 8a4981c36..7e10f9bad 100644 --- a/src/jinete/jtheme.h +++ b/src/gui/jtheme.h @@ -32,7 +32,7 @@ #ifndef JINETE_JTHEME_H_INCLUDED #define JINETE_JTHEME_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct FONT; struct BITMAP; diff --git a/src/jinete/jthread.cpp b/src/gui/jthread.cpp similarity index 99% rename from src/jinete/jthread.cpp rename to src/gui/jthread.cpp index c383150a0..1fc48bfe6 100644 --- a/src/jinete/jthread.cpp +++ b/src/gui/jthread.cpp @@ -33,7 +33,7 @@ #include -#include "jinete/jthread.h" +#include "gui/jthread.h" #if defined ALLEGRO_WINDOWS #include diff --git a/src/jinete/jthread.h b/src/gui/jthread.h similarity index 98% rename from src/jinete/jthread.h rename to src/gui/jthread.h index 578107030..63d846413 100644 --- a/src/jinete/jthread.h +++ b/src/gui/jthread.h @@ -32,7 +32,7 @@ #ifndef JINETE_JTHREAD_H_INCLUDED #define JINETE_JTHREAD_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JThread jthread_new(void (*proc)(void *data), void *data); void jthread_join(JThread thread); diff --git a/src/jinete/jtooltips.cpp b/src/gui/jtooltips.cpp similarity index 99% rename from src/jinete/jtooltips.cpp rename to src/gui/jtooltips.cpp index 8d41cfa40..692c28202 100644 --- a/src/jinete/jtooltips.cpp +++ b/src/gui/jtooltips.cpp @@ -20,8 +20,8 @@ #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "gfx/size.h" #include "Vaca/PreferredSizeEvent.h" diff --git a/src/jinete/jtooltips.h b/src/gui/jtooltips.h similarity index 97% rename from src/jinete/jtooltips.h rename to src/gui/jtooltips.h index ff3983c8e..61c80230d 100644 --- a/src/jinete/jtooltips.h +++ b/src/gui/jtooltips.h @@ -32,8 +32,8 @@ #ifndef JINETE_JTOOLTIPS_H_INCLUDED #define JINETE_JTOOLTIPS_H_INCLUDED -#include "jinete/jbase.h" -#include "jinete/jwindow.h" +#include "gui/jbase.h" +#include "gui/jwindow.h" class TipWindow : public Frame { diff --git a/src/jinete/jview.cpp b/src/gui/jview.cpp similarity index 98% rename from src/jinete/jview.cpp rename to src/gui/jview.cpp index 1bb282273..088c20c74 100644 --- a/src/jinete/jview.cpp +++ b/src/gui/jview.cpp @@ -31,15 +31,15 @@ #include "config.h" -#include "jinete/jintern.h" -#include "jinete/jlist.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" +#include "gui/jintern.h" +#include "gui/jlist.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jregion.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jview.h" +#include "gui/jwidget.h" #include "gfx/size.h" #define BAR_SIZE widget->theme->scrollbar_size diff --git a/src/jinete/jview.h b/src/gui/jview.h similarity index 98% rename from src/jinete/jview.h rename to src/gui/jview.h index 17847bf7e..708ecc138 100644 --- a/src/jinete/jview.h +++ b/src/gui/jview.h @@ -32,7 +32,7 @@ #ifndef JINETE_JVIEW_H_INCLUDED #define JINETE_JVIEW_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget jview_new(); diff --git a/src/jinete/jwidget.cpp b/src/gui/jwidget.cpp similarity index 99% rename from src/jinete/jwidget.cpp rename to src/gui/jwidget.cpp index 6f169ebce..cac6a90d2 100644 --- a/src/jinete/jwidget.cpp +++ b/src/gui/jwidget.cpp @@ -46,8 +46,8 @@ #include #endif -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "Vaca/PreferredSizeEvent.h" using namespace gfx; diff --git a/src/jinete/jwidget.h b/src/gui/jwidget.h similarity index 99% rename from src/jinete/jwidget.h rename to src/gui/jwidget.h index b6d48eed1..95c1bb706 100644 --- a/src/jinete/jwidget.h +++ b/src/gui/jwidget.h @@ -34,15 +34,15 @@ #include -#include "jinete/jbase.h" -#include "jinete/jrect.h" +#include "gui/jbase.h" +#include "gui/jrect.h" #include "gfx/rect.h" #include "Vaca/Widget.h" namespace Vaca { class PreferredSizeEvent; } #ifndef NDEBUG -#include "jinete/jintern.h" +#include "gui/jintern.h" #define ASSERT_VALID_WIDGET(widget) ASSERT((widget) != NULL && \ _ji_is_valid_widget((widget))) #else diff --git a/src/jinete/jwindow.cpp b/src/gui/jwindow.cpp similarity index 99% rename from src/jinete/jwindow.cpp rename to src/gui/jwindow.cpp index 43bab5f42..001515efe 100644 --- a/src/jinete/jwindow.cpp +++ b/src/gui/jwindow.cpp @@ -36,8 +36,8 @@ #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "gfx/size.h" #include "Vaca/PreferredSizeEvent.h" diff --git a/src/jinete/jwindow.h b/src/gui/jwindow.h similarity index 99% rename from src/jinete/jwindow.h rename to src/gui/jwindow.h index 5993266eb..955c0d37b 100644 --- a/src/jinete/jwindow.h +++ b/src/gui/jwindow.h @@ -33,7 +33,7 @@ #define JINETE_JWINDOW_H_INCLUDED #include "base/signal.h" -#include "jinete/jwidget.h" +#include "gui/jwidget.h" namespace Vaca { class CloseEvent { }; // TODO diff --git a/src/jinete/miregion.cpp b/src/gui/miregion.cpp similarity index 100% rename from src/jinete/miregion.cpp rename to src/gui/miregion.cpp diff --git a/src/jinete/themes/Makefile.icons b/src/gui/themes/Makefile.icons similarity index 100% rename from src/jinete/themes/Makefile.icons rename to src/gui/themes/Makefile.icons diff --git a/src/jinete/themes/jstandard_theme.cpp b/src/gui/themes/jstandard_theme.cpp similarity index 99% rename from src/jinete/themes/jstandard_theme.cpp rename to src/gui/themes/jstandard_theme.cpp index 92f9adca5..bf6b5489c 100644 --- a/src/jinete/themes/jstandard_theme.cpp +++ b/src/gui/themes/jstandard_theme.cpp @@ -32,8 +32,8 @@ #include #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" /* data related */ #include "jstandard_theme_icons.h" diff --git a/src/jinete/themes/jstandard_theme_icons.h b/src/gui/themes/jstandard_theme_icons.h similarity index 100% rename from src/jinete/themes/jstandard_theme_icons.h rename to src/gui/themes/jstandard_theme_icons.h diff --git a/src/jinete/themes/pcx2data.cpp b/src/gui/themes/pcx2data.cpp similarity index 100% rename from src/jinete/themes/pcx2data.cpp rename to src/gui/themes/pcx2data.cpp diff --git a/src/jinete/themes/stand/ceyedropper.pcx b/src/gui/themes/stand/ceyedropper.pcx similarity index 100% rename from src/jinete/themes/stand/ceyedropper.pcx rename to src/gui/themes/stand/ceyedropper.pcx diff --git a/src/jinete/themes/stand/cforbidden.pcx b/src/gui/themes/stand/cforbidden.pcx similarity index 100% rename from src/jinete/themes/stand/cforbidden.pcx rename to src/gui/themes/stand/cforbidden.pcx diff --git a/src/jinete/themes/stand/chand.pcx b/src/gui/themes/stand/chand.pcx similarity index 100% rename from src/jinete/themes/stand/chand.pcx rename to src/gui/themes/stand/chand.pcx diff --git a/src/jinete/themes/stand/cmove.pcx b/src/gui/themes/stand/cmove.pcx similarity index 100% rename from src/jinete/themes/stand/cmove.pcx rename to src/gui/themes/stand/cmove.pcx diff --git a/src/jinete/themes/stand/cnoradd.pcx b/src/gui/themes/stand/cnoradd.pcx similarity index 100% rename from src/jinete/themes/stand/cnoradd.pcx rename to src/gui/themes/stand/cnoradd.pcx diff --git a/src/jinete/themes/stand/cnormal.pcx b/src/gui/themes/stand/cnormal.pcx similarity index 100% rename from src/jinete/themes/stand/cnormal.pcx rename to src/gui/themes/stand/cnormal.pcx diff --git a/src/jinete/themes/stand/cscroll.pcx b/src/gui/themes/stand/cscroll.pcx similarity index 100% rename from src/jinete/themes/stand/cscroll.pcx rename to src/gui/themes/stand/cscroll.pcx diff --git a/src/jinete/themes/stand/csizeb.pcx b/src/gui/themes/stand/csizeb.pcx similarity index 100% rename from src/jinete/themes/stand/csizeb.pcx rename to src/gui/themes/stand/csizeb.pcx diff --git a/src/jinete/themes/stand/csizebl.pcx b/src/gui/themes/stand/csizebl.pcx similarity index 100% rename from src/jinete/themes/stand/csizebl.pcx rename to src/gui/themes/stand/csizebl.pcx diff --git a/src/jinete/themes/stand/csizebr.pcx b/src/gui/themes/stand/csizebr.pcx similarity index 100% rename from src/jinete/themes/stand/csizebr.pcx rename to src/gui/themes/stand/csizebr.pcx diff --git a/src/jinete/themes/stand/csizel.pcx b/src/gui/themes/stand/csizel.pcx similarity index 100% rename from src/jinete/themes/stand/csizel.pcx rename to src/gui/themes/stand/csizel.pcx diff --git a/src/jinete/themes/stand/csizer.pcx b/src/gui/themes/stand/csizer.pcx similarity index 100% rename from src/jinete/themes/stand/csizer.pcx rename to src/gui/themes/stand/csizer.pcx diff --git a/src/jinete/themes/stand/csizet.pcx b/src/gui/themes/stand/csizet.pcx similarity index 100% rename from src/jinete/themes/stand/csizet.pcx rename to src/gui/themes/stand/csizet.pcx diff --git a/src/jinete/themes/stand/csizetl.pcx b/src/gui/themes/stand/csizetl.pcx similarity index 100% rename from src/jinete/themes/stand/csizetl.pcx rename to src/gui/themes/stand/csizetl.pcx diff --git a/src/jinete/themes/stand/csizetr.pcx b/src/gui/themes/stand/csizetr.pcx similarity index 100% rename from src/jinete/themes/stand/csizetr.pcx rename to src/gui/themes/stand/csizetr.pcx diff --git a/src/jinete/themes/stand/ichecke.pcx b/src/gui/themes/stand/ichecke.pcx similarity index 100% rename from src/jinete/themes/stand/ichecke.pcx rename to src/gui/themes/stand/ichecke.pcx diff --git a/src/jinete/themes/stand/icheckm.pcx b/src/gui/themes/stand/icheckm.pcx similarity index 100% rename from src/jinete/themes/stand/icheckm.pcx rename to src/gui/themes/stand/icheckm.pcx diff --git a/src/jinete/themes/stand/iclose.pcx b/src/gui/themes/stand/iclose.pcx similarity index 100% rename from src/jinete/themes/stand/iclose.pcx rename to src/gui/themes/stand/iclose.pcx diff --git a/src/jinete/themes/stand/icombobox.pcx b/src/gui/themes/stand/icombobox.pcx similarity index 100% rename from src/jinete/themes/stand/icombobox.pcx rename to src/gui/themes/stand/icombobox.pcx diff --git a/src/jinete/themes/stand/imenum.pcx b/src/gui/themes/stand/imenum.pcx similarity index 100% rename from src/jinete/themes/stand/imenum.pcx rename to src/gui/themes/stand/imenum.pcx diff --git a/src/jinete/themes/stand/iradioe.pcx b/src/gui/themes/stand/iradioe.pcx similarity index 100% rename from src/jinete/themes/stand/iradioe.pcx rename to src/gui/themes/stand/iradioe.pcx diff --git a/src/jinete/themes/stand/iradiom.pcx b/src/gui/themes/stand/iradiom.pcx similarity index 100% rename from src/jinete/themes/stand/iradiom.pcx rename to src/gui/themes/stand/iradiom.pcx diff --git a/src/job.cpp b/src/job.cpp index b23f1b0c7..59fb11d12 100644 --- a/src/job.cpp +++ b/src/job.cpp @@ -18,10 +18,10 @@ #include "config.h" -#include "jinete/jalert.h" -#include "jinete/jthread.h" -#include "jinete/jwidget.h" -#include "jinete/jwindow.h" +#include "gui/jalert.h" +#include "gui/jthread.h" +#include "gui/jwidget.h" +#include "gui/jwindow.h" #include "app.h" #include "base/mutex.h" diff --git a/src/job.h b/src/job.h index eb6c3445e..732ab531c 100644 --- a/src/job.h +++ b/src/job.h @@ -19,7 +19,7 @@ #ifndef CORE_JOB_H_INCLUDED #define CORE_JOB_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" class Frame; class Mutex; diff --git a/src/launcher.cpp b/src/launcher.cpp index 5ccaa943c..69cc9d9a2 100644 --- a/src/launcher.cpp +++ b/src/launcher.cpp @@ -18,7 +18,7 @@ #include "config.h" -#include "jinete/jalert.h" +#include "gui/jalert.h" #include "launcher.h" #if defined ALLEGRO_WINDOWS diff --git a/src/log.cpp b/src/log.cpp index 13af3541d..cd0507480 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -25,7 +25,7 @@ #include #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "app.h" #include "log.h" diff --git a/src/modules/editors.cpp b/src/modules/editors.cpp index 030bba736..5837bd7e4 100644 --- a/src/modules/editors.cpp +++ b/src/modules/editors.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "sprite_wrappers.h" #include "ui_context.h" diff --git a/src/modules/editors.h b/src/modules/editors.h index 78a1c32f6..bff1d1afb 100644 --- a/src/modules/editors.h +++ b/src/modules/editors.h @@ -19,7 +19,7 @@ #ifndef MODULES_EDITORS_H_INCLUDED #define MODULES_EDITORS_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "app/color.h" class Editor; diff --git a/src/modules/gfx.cpp b/src/modules/gfx.cpp index 6c0c91d37..1a7885ff3 100644 --- a/src/modules/gfx.cpp +++ b/src/modules/gfx.cpp @@ -21,10 +21,10 @@ #include #include -#include "jinete/jintern.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" +#include "gui/jintern.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" #include "app.h" #include "app/color_utils.h" diff --git a/src/modules/gfx.h b/src/modules/gfx.h index 87536abe9..afcac0c85 100644 --- a/src/modules/gfx.h +++ b/src/modules/gfx.h @@ -20,7 +20,7 @@ #define MODULES_GFX_H_INCLUDED #include "app/color.h" -#include "jinete/jbase.h" +#include "gui/jbase.h" namespace gfx { class Rect; } diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp index d49e776b1..5b1bdf80f 100644 --- a/src/modules/gui.cpp +++ b/src/modules/gui.cpp @@ -29,8 +29,8 @@ #endif #include "Vaca/SharedPtr.h" -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "app.h" #include "commands/command.h" diff --git a/src/modules/gui.h b/src/modules/gui.h index 302afa545..15009cc31 100644 --- a/src/modules/gui.h +++ b/src/modules/gui.h @@ -22,8 +22,8 @@ #include #include #include "ase_exception.h" -#include "jinete/jbase.h" -#include "jinete/jaccel.h" +#include "gui/jbase.h" +#include "gui/jaccel.h" class Command; class Params; diff --git a/src/modules/palettes.cpp b/src/modules/palettes.cpp index f97601148..2a11b2d37 100644 --- a/src/modules/palettes.cpp +++ b/src/modules/palettes.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "app.h" #include "modules/palettes.h" diff --git a/src/modules/rootmenu.cpp b/src/modules/rootmenu.cpp index 2ce46d43c..f086a91b1 100644 --- a/src/modules/rootmenu.cpp +++ b/src/modules/rootmenu.cpp @@ -23,7 +23,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "app.h" #include "commands/command.h" diff --git a/src/modules/rootmenu.h b/src/modules/rootmenu.h index 33737afee..568ce39c5 100644 --- a/src/modules/rootmenu.h +++ b/src/modules/rootmenu.h @@ -19,7 +19,7 @@ #ifndef MODULES_ROOTMENU_H_INCLUDED #define MODULES_ROOTMENU_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" enum { ACCEL_FOR_UNDO, diff --git a/src/modules/skinneable_theme.cpp b/src/modules/skinneable_theme.cpp index ca5a80011..a350453f1 100644 --- a/src/modules/skinneable_theme.cpp +++ b/src/modules/skinneable_theme.cpp @@ -23,8 +23,8 @@ #include "Vaca/SharedPtr.h" #include "base/bind.h" -#include "jinete/jinete.h" -#include "jinete/jintern.h" +#include "gui/jinete.h" +#include "gui/jintern.h" #include "ase_exception.h" #include "loadpng.h" diff --git a/src/modules/skinneable_theme.h b/src/modules/skinneable_theme.h index 611619b90..e5e5019ae 100644 --- a/src/modules/skinneable_theme.h +++ b/src/modules/skinneable_theme.h @@ -22,8 +22,8 @@ #include #include #include -#include "jinete/jtheme.h" -#include "jinete/jrect.h" +#include "gui/jtheme.h" +#include "gui/jrect.h" #include "Vaca/Property.h" #include "gfx/rect.h" diff --git a/src/raster/gfxobj.h b/src/raster/gfxobj.h index 15def2c94..91cdbbfbe 100644 --- a/src/raster/gfxobj.h +++ b/src/raster/gfxobj.h @@ -19,7 +19,7 @@ #ifndef RASTER_GFXOBJ_H_INCLUDED #define RASTER_GFXOBJ_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" #include enum GfxObjType { diff --git a/src/raster/layer.cpp b/src/raster/layer.cpp index f78682516..bcff2427e 100644 --- a/src/raster/layer.cpp +++ b/src/raster/layer.cpp @@ -22,7 +22,7 @@ #include #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "raster/blend.h" #include "raster/cel.h" diff --git a/src/raster/layer.h b/src/raster/layer.h index 38f3f86eb..9f4675c66 100644 --- a/src/raster/layer.h +++ b/src/raster/layer.h @@ -20,7 +20,7 @@ #define RASTER_LAYER_H_INCLUDED #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "raster/gfxobj.h" class Cel; diff --git a/src/raster/pen.cpp b/src/raster/pen.cpp index 169e812bc..80783d632 100644 --- a/src/raster/pen.cpp +++ b/src/raster/pen.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "raster/algo.h" #include "raster/pen.h" diff --git a/src/raster/sprite.cpp b/src/raster/sprite.cpp index 1bee30a31..e76cf4c7f 100644 --- a/src/raster/sprite.cpp +++ b/src/raster/sprite.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "base/mutex.h" #include "base/scoped_lock.h" diff --git a/src/raster/sprite.h b/src/raster/sprite.h index ed41e8073..f6bb7a099 100644 --- a/src/raster/sprite.h +++ b/src/raster/sprite.h @@ -19,7 +19,7 @@ #ifndef RASTER_SPRITE_H_INCLUDED #define RASTER_SPRITE_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "raster/gfxobj.h" #include diff --git a/src/raster/undo.cpp b/src/raster/undo.cpp index da36d07be..f0ef84352 100644 --- a/src/raster/undo.cpp +++ b/src/raster/undo.cpp @@ -24,7 +24,7 @@ #include #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "raster/cel.h" #include "raster/dirty.h" diff --git a/src/tests/jinete/00hello.cpp b/src/tests/jinete/00hello.cpp index 1e04e50ec..0cdcdf6c0 100644 --- a/src/tests/jinete/00hello.cpp +++ b/src/tests/jinete/00hello.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main(int argc, char *argv[]) { diff --git a/src/tests/jinete/01simple.cpp b/src/tests/jinete/01simple.cpp index 97bed42f9..1ad2aa2d5 100644 --- a/src/tests/jinete/01simple.cpp +++ b/src/tests/jinete/01simple.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/02label.cpp b/src/tests/jinete/02label.cpp index ad1e8dd2b..31e0f73d5 100644 --- a/src/tests/jinete/02label.cpp +++ b/src/tests/jinete/02label.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/03slider.cpp b/src/tests/jinete/03slider.cpp index 84117571e..f8c079f5b 100644 --- a/src/tests/jinete/03slider.cpp +++ b/src/tests/jinete/03slider.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main(int argc, char *argv[]) { diff --git a/src/tests/jinete/04alert.cpp b/src/tests/jinete/04alert.cpp index 962e8a84f..eec3c2179 100644 --- a/src/tests/jinete/04alert.cpp +++ b/src/tests/jinete/04alert.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/06entry.cpp b/src/tests/jinete/06entry.cpp index a6da1cf75..7a5371dc9 100644 --- a/src/tests/jinete/06entry.cpp +++ b/src/tests/jinete/06entry.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/07panel.cpp b/src/tests/jinete/07panel.cpp index 8ee860fac..8be21c317 100644 --- a/src/tests/jinete/07panel.cpp +++ b/src/tests/jinete/07panel.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/08txtbox.cpp b/src/tests/jinete/08txtbox.cpp index 12bdb8658..2a9aedc5a 100644 --- a/src/tests/jinete/08txtbox.cpp +++ b/src/tests/jinete/08txtbox.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" void do_text(const char *title, int align) { diff --git a/src/tests/jinete/09lists.cpp b/src/tests/jinete/09lists.cpp index 2d6833c1b..45ced14d4 100644 --- a/src/tests/jinete/09lists.cpp +++ b/src/tests/jinete/09lists.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" JRect test1(); void test2(JRect pos); diff --git a/src/tests/jinete/10chcks.cpp b/src/tests/jinete/10chcks.cpp index 13c14ff40..0614f3749 100644 --- a/src/tests/jinete/10chcks.cpp +++ b/src/tests/jinete/10chcks.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static JWidget check, radio[12]; diff --git a/src/tests/jinete/11file.cpp b/src/tests/jinete/11file.cpp index e91017db1..9503a6bb7 100644 --- a/src/tests/jinete/11file.cpp +++ b/src/tests/jinete/11file.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static void poll_button (JWidget widget); diff --git a/src/tests/jinete/12qckmnu.cpp b/src/tests/jinete/12qckmnu.cpp index a75aa99c7..46f09401c 100644 --- a/src/tests/jinete/12qckmnu.cpp +++ b/src/tests/jinete/12qckmnu.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static void handle_menuitem_selected (JWidget widget, int user_data); diff --git a/src/tests/jinete/13menu.cpp b/src/tests/jinete/13menu.cpp index b9e5a50ee..204e8e1a3 100644 --- a/src/tests/jinete/13menu.cpp +++ b/src/tests/jinete/13menu.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static JWidget new_menuitem(const char *text, const char *accel_string); static bool hooked_menuitem_msg_proc(JWidget widget, JMessage msg); diff --git a/src/tests/jinete/14win.cpp b/src/tests/jinete/14win.cpp index e74b6ab0d..2043e50f8 100644 --- a/src/tests/jinete/14win.cpp +++ b/src/tests/jinete/14win.cpp @@ -30,7 +30,7 @@ */ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/15colbut.cpp b/src/tests/jinete/15colbut.cpp index 4782f1e84..543110dbf 100644 --- a/src/tests/jinete/15colbut.cpp +++ b/src/tests/jinete/15colbut.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static JList windows; diff --git a/src/tests/jinete/16theme.cpp b/src/tests/jinete/16theme.cpp index 5639b5e2f..798753239 100644 --- a/src/tests/jinete/16theme.cpp +++ b/src/tests/jinete/16theme.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" void set_my_palette(); JTheme my_theme_new(); diff --git a/src/tests/jinete/17theme.cpp b/src/tests/jinete/17theme.cpp index 4393ca64b..54d15aecc 100644 --- a/src/tests/jinete/17theme.cpp +++ b/src/tests/jinete/17theme.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" FONT *my_font = NULL; diff --git a/src/tests/jinete/18tips.cpp b/src/tests/jinete/18tips.cpp index 88205c96c..21bd84734 100644 --- a/src/tests/jinete/18tips.cpp +++ b/src/tests/jinete/18tips.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" void jwidget_add_tip (JWidget widget, const char *text); diff --git a/src/tests/jinete/19game.cpp b/src/tests/jinete/19game.cpp index 9f0e60b70..b0549109c 100644 --- a/src/tests/jinete/19game.cpp +++ b/src/tests/jinete/19game.cpp @@ -32,7 +32,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" /* GUI */ void init_gui(); diff --git a/src/tests/jinete/20combo.cpp b/src/tests/jinete/20combo.cpp index 860ba9920..63874155f 100644 --- a/src/tests/jinete/20combo.cpp +++ b/src/tests/jinete/20combo.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/21manage.cpp b/src/tests/jinete/21manage.cpp index 38e52379b..50e2f31c7 100644 --- a/src/tests/jinete/21manage.cpp +++ b/src/tests/jinete/21manage.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main (int argc, char *argv[]) { diff --git a/src/tests/jinete/22xml.cpp b/src/tests/jinete/22xml.cpp index 5fac6bee5..656e1c833 100644 --- a/src/tests/jinete/22xml.cpp +++ b/src/tests/jinete/22xml.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" static const char *xml_src = "" "\n" diff --git a/src/tests/jinete/23grid.cpp b/src/tests/jinete/23grid.cpp index 48f77533b..3ce8fd21b 100644 --- a/src/tests/jinete/23grid.cpp +++ b/src/tests/jinete/23grid.cpp @@ -31,7 +31,7 @@ #include -#include "jinete/jinete.h" +#include "gui/jinete.h" int main(int argc, char *argv[]) { diff --git a/src/tests/raster/02path.cpp b/src/tests/raster/02path.cpp index 875c43309..3cd2ea0d7 100644 --- a/src/tests/raster/02path.cpp +++ b/src/tests/raster/02path.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "raster/algo.h" #include "raster/image.h" diff --git a/src/tests/test.h b/src/tests/test.h index 7c0317c29..1bd24e6a0 100644 --- a/src/tests/test.h +++ b/src/tests/test.h @@ -25,7 +25,7 @@ #include #ifdef TEST_GUI - #include "jinete/jinete.h" + #include "gui/jinete.h" #endif // Allegro-friendly main() routine diff --git a/src/tools/tool.h b/src/tools/tool.h index b5a96e6be..398c6eb1e 100644 --- a/src/tools/tool.h +++ b/src/tools/tool.h @@ -25,8 +25,8 @@ #include "gfx/point.h" #include "gfx/rect.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" #include "tiled_mode.h" diff --git a/src/undoable.cpp b/src/undoable.cpp index 723d500e1..dc0157d87 100644 --- a/src/undoable.cpp +++ b/src/undoable.cpp @@ -20,7 +20,7 @@ #include -#include "jinete/jlist.h" +#include "gui/jlist.h" #include "sprite_wrappers.h" #include "raster/blend.h" diff --git a/src/util/boundary.cpp b/src/util/boundary.cpp index 37fb285d8..5752ac2dd 100644 --- a/src/util/boundary.cpp +++ b/src/util/boundary.cpp @@ -29,7 +29,7 @@ /**********************************************************************/ /* for ASE */ #include -#include "jinete/jbase.h" +#include "gui/jbase.h" #include "raster/image.h" #include "util/boundary.h" diff --git a/src/util/celmove.cpp b/src/util/celmove.cpp index df4ecbbd4..f6df3a62b 100644 --- a/src/util/celmove.cpp +++ b/src/util/celmove.cpp @@ -18,7 +18,7 @@ #include "config.h" -#include +#include #include "sprite_wrappers.h" #include "console.h" diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp index 48af56833..480cf242c 100644 --- a/src/util/clipboard.cpp +++ b/src/util/clipboard.cpp @@ -21,7 +21,7 @@ #include #include -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "console.h" #include "app.h" diff --git a/src/util/clipboard.h b/src/util/clipboard.h index 3094dafc1..7db091d40 100644 --- a/src/util/clipboard.h +++ b/src/util/clipboard.h @@ -19,7 +19,7 @@ #ifndef UTIL_CLIPBOARD_H_INCLUDED #define UTIL_CLIPBOARD_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" class Image; class SpriteReader; diff --git a/src/util/misc.cpp b/src/util/misc.cpp index 1107107c6..d595673fa 100644 --- a/src/util/misc.cpp +++ b/src/util/misc.cpp @@ -21,14 +21,13 @@ #include #include -#include "jinete/jlist.h" -#include "jinete/jmanager.h" -#include "jinete/jsystem.h" -#include "jinete/jwidget.h" - #include "app.h" -#include "core/cfg.h" #include "app/color.h" +#include "core/cfg.h" +#include "gui/jlist.h" +#include "gui/jmanager.h" +#include "gui/jsystem.h" +#include "gui/jwidget.h" #include "modules/editors.h" #include "modules/gui.h" #include "modules/palettes.h" diff --git a/src/util/render.cpp b/src/util/render.cpp index 4996b5041..e97f61e8d 100644 --- a/src/util/render.cpp +++ b/src/util/render.cpp @@ -18,15 +18,14 @@ #include "config.h" -#include "jinete/jlist.h" - +#include "app/color_utils.h" #include "core/cfg.h" +#include "gui/jlist.h" #include "raster/image.h" #include "raster/raster.h" -#include "util/render.h" #include "settings/settings.h" #include "ui_context.h" -#include "app/color_utils.h" +#include "util/render.h" ////////////////////////////////////////////////////////////////////// // Zoomed merge diff --git a/src/util/thmbnail.cpp b/src/util/thmbnail.cpp index eba075fd3..af1e2e140 100644 --- a/src/util/thmbnail.cpp +++ b/src/util/thmbnail.cpp @@ -22,8 +22,7 @@ #include #include -#include "jinete/jlist.h" - +#include "gui/jlist.h" #include "modules/gfx.h" #include "raster/blend.h" #include "raster/cel.h" diff --git a/src/widgets/color_bar.cpp b/src/widgets/color_bar.cpp index ca734c848..035662751 100644 --- a/src/widgets/color_bar.cpp +++ b/src/widgets/color_bar.cpp @@ -21,8 +21,6 @@ #include #include -#include "jinete/jinete.h" - #include "app.h" #include "app/color.h" #include "commands/commands.h" @@ -31,6 +29,7 @@ #include "core/cfg.h" #include "gfx/point.h" #include "gfx/rect.h" +#include "gui/jinete.h" #include "modules/editors.h" #include "modules/gfx.h" #include "modules/gui.h" diff --git a/src/widgets/color_bar.h b/src/widgets/color_bar.h index c236d8498..6a1585e83 100644 --- a/src/widgets/color_bar.h +++ b/src/widgets/color_bar.h @@ -19,10 +19,9 @@ #ifndef WIDGETS_COLOR_BAR_H_INCLUDED #define WIDGETS_COLOR_BAR_H_INCLUDED -#include "base/signal.h" -#include "jinete/jwidget.h" - #include "app/color.h" +#include "base/signal.h" +#include "gui/jwidget.h" class ColorBar : public Widget { diff --git a/src/widgets/color_button.cpp b/src/widgets/color_button.cpp index 533ab6f79..30247380e 100644 --- a/src/widgets/color_button.cpp +++ b/src/widgets/color_button.cpp @@ -20,11 +20,10 @@ #include -#include "jinete/jinete.h" #include "Vaca/PreferredSizeEvent.h" - -#include "app/color_utils.h" #include "app/color.h" +#include "app/color_utils.h" +#include "gui/jinete.h" #include "modules/gfx.h" #include "modules/gui.h" #include "raster/sprite.h" diff --git a/src/widgets/color_button.h b/src/widgets/color_button.h index 8d2472e23..c797d80f8 100644 --- a/src/widgets/color_button.h +++ b/src/widgets/color_button.h @@ -20,7 +20,7 @@ #define WIDGETS_COLOR_BUTTON_H_INCLUDED #include "app/color.h" -#include "jinete/jbutton.h" +#include "gui/jbutton.h" class Frame; diff --git a/src/widgets/color_selector.cpp b/src/widgets/color_selector.cpp index 0b749f73f..21477fcbc 100644 --- a/src/widgets/color_selector.cpp +++ b/src/widgets/color_selector.cpp @@ -21,11 +21,10 @@ #include #include -#include "base/bind.h" -#include "jinete/jinete.h" - #include "app.h" #include "app/color.h" +#include "base/bind.h" +#include "gui/jinete.h" #include "modules/gfx.h" #include "modules/gui.h" #include "modules/palettes.h" diff --git a/src/widgets/color_selector.h b/src/widgets/color_selector.h index 3c69f68e5..b99f0bc88 100644 --- a/src/widgets/color_selector.h +++ b/src/widgets/color_selector.h @@ -19,9 +19,8 @@ #ifndef WIDGETS_COLOR_SELECTOR_H_INCLUDED #define WIDGETS_COLOR_SELECTOR_H_INCLUDED -#include "jinete/jbase.h" - #include "app/color.h" +#include "gui/jbase.h" class Frame; diff --git a/src/widgets/colview.cpp b/src/widgets/colview.cpp index 49174afed..ee8e596d0 100644 --- a/src/widgets/colview.cpp +++ b/src/widgets/colview.cpp @@ -21,14 +21,13 @@ #include #include -#include "jinete/jdraw.h" -#include "jinete/jfont.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" - +#include "gui/jdraw.h" +#include "gui/jfont.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #include "modules/gfx.h" #include "modules/gui.h" #include "widgets/colview.h" diff --git a/src/widgets/colview.h b/src/widgets/colview.h index 3af2fd220..cd06e06dd 100644 --- a/src/widgets/colview.h +++ b/src/widgets/colview.h @@ -19,9 +19,8 @@ #ifndef WIDGETS_COLVIEW_H_INCLUDED #define WIDGETS_COLVIEW_H_INCLUDED -#include "jinete/jbase.h" - #include "app/color.h" +#include "gui/jbase.h" // TODO use some JI_SIGNAL_USER #define SIGNAL_COLORVIEWER_SELECT 0x10002 diff --git a/src/widgets/curvedit.cpp b/src/widgets/curvedit.cpp index 3ac9798ec..d89512f42 100644 --- a/src/widgets/curvedit.cpp +++ b/src/widgets/curvedit.cpp @@ -23,18 +23,17 @@ #include #include -#include "jinete/jalert.h" -#include "jinete/jentry.h" -#include "jinete/jlist.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" -#include "jinete/jwindow.h" - #include "effect/colcurve.h" +#include "gui/jalert.h" +#include "gui/jentry.h" +#include "gui/jlist.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jview.h" +#include "gui/jwidget.h" +#include "gui/jwindow.h" #include "modules/gui.h" #include "widgets/curvedit.h" diff --git a/src/widgets/curvedit.h b/src/widgets/curvedit.h index 1aeae99f8..3ac9ccbfb 100644 --- a/src/widgets/curvedit.h +++ b/src/widgets/curvedit.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_CURVEDIT_H_INCLUDED #define WIDGETS_CURVEDIT_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" // TODO use some JI_SIGNAL_USER #define SIGNAL_CURVE_EDITOR_CHANGE 0x10004 diff --git a/src/widgets/editor.h b/src/widgets/editor.h index b1b087de2..07efea807 100644 --- a/src/widgets/editor.h +++ b/src/widgets/editor.h @@ -21,8 +21,8 @@ #include "app/color.h" #include "base/signal.h" -#include "jinete/jbase.h" -#include "jinete/jwidget.h" +#include "gui/jbase.h" +#include "gui/jwidget.h" #define MIN_ZOOM 0 #define MAX_ZOOM 5 diff --git a/src/widgets/editor/click.cpp b/src/widgets/editor/click.cpp index f4f3044cc..11da23929 100644 --- a/src/widgets/editor/click.cpp +++ b/src/widgets/editor/click.cpp @@ -20,14 +20,12 @@ #include -#include "jinete/jrect.h" - -#include "jinete/jmanager.h" -#include "jinete/jsystem.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" - #include "core/cfg.h" +#include "gui/jmanager.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jview.h" +#include "gui/jwidget.h" #include "modules/gui.h" #include "widgets/editor.h" diff --git a/src/widgets/editor/cursor.cpp b/src/widgets/editor/cursor.cpp index 3dc29aec8..96aa0726e 100644 --- a/src/widgets/editor/cursor.cpp +++ b/src/widgets/editor/cursor.cpp @@ -20,17 +20,16 @@ #include -#include "jinete/jbase.h" -#include "jinete/jlist.h" -#include "jinete/jrect.h" -#include "jinete/jregion.h" -#include "jinete/jsystem.h" -#include "jinete/jwidget.h" - #include "app.h" +#include "app/color.h" #include "app/color_utils.h" #include "core/cfg.h" -#include "app/color.h" +#include "gui/jbase.h" +#include "gui/jlist.h" +#include "gui/jrect.h" +#include "gui/jregion.h" +#include "gui/jsystem.h" +#include "gui/jwidget.h" #include "modules/editors.h" #include "raster/image.h" #include "raster/layer.h" diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp index db19782f2..665e3e023 100644 --- a/src/widgets/editor/editor.cpp +++ b/src/widgets/editor/editor.cpp @@ -20,26 +20,25 @@ #include "config.h" -#include #include +#include -#include "jinete/jinete.h" - -#include "ui_context.h" +#include "app.h" +#include "app/color.h" +#include "app/color_utils.h" #include "commands/commands.h" #include "commands/params.h" -#include "app.h" -#include "app/color_utils.h" #include "core/cfg.h" -#include "app/color.h" +#include "gui/jinete.h" #include "modules/editors.h" #include "modules/gfx.h" #include "modules/gui.h" -#include "modules/skinneable_theme.h" #include "modules/palettes.h" +#include "modules/skinneable_theme.h" #include "raster/raster.h" -#include "tools/tool.h" #include "settings/settings.h" +#include "tools/tool.h" +#include "ui_context.h" #include "util/boundary.h" #include "util/misc.h" #include "util/render.h" diff --git a/src/widgets/editor/keys.cpp b/src/widgets/editor/keys.cpp index ac7ab7bc5..cd1078be2 100644 --- a/src/widgets/editor/keys.cpp +++ b/src/widgets/editor/keys.cpp @@ -20,13 +20,12 @@ #include -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" - #include "app.h" #include "app/color.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jview.h" +#include "gui/jwidget.h" #include "modules/editors.h" #include "modules/gui.h" #include "raster/image.h" diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp index f80fbbb66..f13e3f39d 100644 --- a/src/widgets/fileview.cpp +++ b/src/widgets/fileview.cpp @@ -18,16 +18,15 @@ #include "config.h" -#include #include +#include -#include "jinete/jinete.h" - +#include "app.h" #include "commands/commands.h" #include "console.h" -#include "app.h" #include "dialogs/filesel.h" #include "file/file.h" +#include "gui/jinete.h" #include "modules/editors.h" #include "modules/gfx.h" #include "modules/gui.h" diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h index d038f0593..e2ac08d14 100644 --- a/src/widgets/fileview.h +++ b/src/widgets/fileview.h @@ -19,9 +19,8 @@ #ifndef WIDGETS_FILEVIEW_H_INCLUDED #define WIDGETS_FILEVIEW_H_INCLUDED -#include "jinete/jbase.h" -#include "jinete/jstring.h" - +#include "gui/jbase.h" +#include "gui/jstring.h" #include "core/file_system.h" /* TODO use some JI_SIGNAL_USER */ diff --git a/src/widgets/groupbut.cpp b/src/widgets/groupbut.cpp index 75f52245e..34f6fa1a3 100644 --- a/src/widgets/groupbut.cpp +++ b/src/widgets/groupbut.cpp @@ -22,14 +22,13 @@ #include #include "base/bind.h" -#include "jinete/jbox.h" -#include "jinete/jbutton.h" -#include "jinete/jhook.h" -#include "jinete/jlist.h" -#include "jinete/jsystem.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" - +#include "gui/jbox.h" +#include "gui/jbutton.h" +#include "gui/jhook.h" +#include "gui/jlist.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #include "modules/gui.h" #include "widgets/groupbut.h" diff --git a/src/widgets/menuitem.cpp b/src/widgets/menuitem.cpp index 15fa4430e..1228b187e 100644 --- a/src/widgets/menuitem.cpp +++ b/src/widgets/menuitem.cpp @@ -22,15 +22,14 @@ #include #include -#include "jinete/jhook.h" -#include "jinete/jmenu.h" -#include "jinete/jmessage.h" -#include "jinete/jwidget.h" - -#include "ui_context.h" #include "commands/command.h" #include "commands/params.h" +#include "gui/jhook.h" +#include "gui/jmenu.h" +#include "gui/jmessage.h" +#include "gui/jwidget.h" #include "modules/gui.h" +#include "ui_context.h" struct MenuItem { diff --git a/src/widgets/menuitem.h b/src/widgets/menuitem.h index 5e9d5d715..ccfb6da9d 100644 --- a/src/widgets/menuitem.h +++ b/src/widgets/menuitem.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_MENUITEM_H_INCLUDED #define WIDGETS_MENUITEM_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" class Command; class Params; diff --git a/src/widgets/paledit.cpp b/src/widgets/paledit.cpp index 0b6cf2f3a..e5734f97b 100644 --- a/src/widgets/paledit.cpp +++ b/src/widgets/paledit.cpp @@ -22,15 +22,14 @@ #include #include -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jrect.h" -#include "jinete/jsystem.h" -#include "jinete/jview.h" -#include "jinete/jwidget.h" -#include "jinete/jtheme.h" - #include "app/color.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jrect.h" +#include "gui/jsystem.h" +#include "gui/jtheme.h" +#include "gui/jview.h" +#include "gui/jwidget.h" #include "modules/gui.h" #include "modules/palettes.h" #include "raster/blend.h" diff --git a/src/widgets/paledit.h b/src/widgets/paledit.h index 16348b228..bc50c1971 100644 --- a/src/widgets/paledit.h +++ b/src/widgets/paledit.h @@ -21,7 +21,7 @@ #include -#include "jinete/jwidget.h" +#include "gui/jwidget.h" // TODO use some JI_SIGNAL_USER #define SIGNAL_PALETTE_EDITOR_CHANGE 0x10005 diff --git a/src/widgets/preview.cpp b/src/widgets/preview.cpp index f77f5a4ad..1529adf86 100644 --- a/src/widgets/preview.cpp +++ b/src/widgets/preview.cpp @@ -18,11 +18,10 @@ #include "config.h" -#include "jinete/jmanager.h" -#include "jinete/jmessage.h" -#include "jinete/jwidget.h" - #include "effect/effect.h" +#include "gui/jmanager.h" +#include "gui/jmessage.h" +#include "gui/jwidget.h" #include "raster/sprite.h" #include "util/render.h" #include "widgets/preview.h" diff --git a/src/widgets/preview.h b/src/widgets/preview.h index 1812bed44..f9dd1b666 100644 --- a/src/widgets/preview.h +++ b/src/widgets/preview.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_PREVIEW_H_INCLUDED #define WIDGETS_PREVIEW_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" struct Effect; diff --git a/src/widgets/statebar.cpp b/src/widgets/statebar.cpp index 853c01907..c05fa39eb 100644 --- a/src/widgets/statebar.cpp +++ b/src/widgets/statebar.cpp @@ -23,13 +23,12 @@ #include #include -#include "base/bind.h" -#include "gfx/size.h" -#include "jinete/jinete.h" - #include "app.h" +#include "base/bind.h" #include "commands/commands.h" #include "commands/params.h" +#include "gfx/size.h" +#include "gui/jinete.h" #include "modules/editors.h" #include "modules/gfx.h" #include "modules/gui.h" diff --git a/src/widgets/statebar.h b/src/widgets/statebar.h index 3dfd83ae2..d335238fe 100644 --- a/src/widgets/statebar.h +++ b/src/widgets/statebar.h @@ -19,10 +19,9 @@ #ifndef WIDGETS_STATEBAR_H_INCLUDED #define WIDGETS_STATEBAR_H_INCLUDED -#include "jinete/jbase.h" -#include "jinete/jwidget.h" - #include "app/color.h" +#include "gui/jbase.h" +#include "gui/jwidget.h" class Frame; class StatusBar; diff --git a/src/widgets/tabs.cpp b/src/widgets/tabs.cpp index 43180f711..6551f808f 100644 --- a/src/widgets/tabs.cpp +++ b/src/widgets/tabs.cpp @@ -18,13 +18,12 @@ #include "config.h" -#include #include +#include #include -#include "jinete/jinete.h" -#include "jinete/jintern.h" - +#include "gui/jinete.h" +#include "gui/jintern.h" #include "modules/gfx.h" #include "modules/gui.h" #include "modules/skinneable_theme.h" diff --git a/src/widgets/tabs.h b/src/widgets/tabs.h index dc7f97ec7..4d112b183 100644 --- a/src/widgets/tabs.h +++ b/src/widgets/tabs.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_TABS_H_INCLUDED #define WIDGETS_TABS_H_INCLUDED -#include "jinete/jwidget.h" +#include "gui/jwidget.h" #include class Tabs; diff --git a/src/widgets/target.cpp b/src/widgets/target.cpp index 2a5a0975f..ec726fff9 100644 --- a/src/widgets/target.cpp +++ b/src/widgets/target.cpp @@ -22,14 +22,13 @@ #include #include "base/bind.h" -#include "jinete/jbox.h" -#include "jinete/jbutton.h" -#include "jinete/jhook.h" -#include "jinete/jtheme.h" -#include "jinete/jwidget.h" - #include "core/cfg.h" #include "effect/effect.h" +#include "gui/jbox.h" +#include "gui/jbutton.h" +#include "gui/jhook.h" +#include "gui/jtheme.h" +#include "gui/jwidget.h" #include "modules/gfx.h" #include "modules/gui.h" #include "raster/image.h" diff --git a/src/widgets/target.h b/src/widgets/target.h index 5146aa005..acd3781f9 100644 --- a/src/widgets/target.h +++ b/src/widgets/target.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_TARGET_H_INCLUDED #define WIDGETS_TARGET_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" /* TODO use some JI_SIGNAL_USER */ #define SIGNAL_TARGET_BUTTON_CHANGE 0x10003 diff --git a/src/widgets/toolbar.cpp b/src/widgets/toolbar.cpp index 091776868..60a87d113 100644 --- a/src/widgets/toolbar.cpp +++ b/src/widgets/toolbar.cpp @@ -22,14 +22,13 @@ #include #include +#include "app.h" #include "base/bind.h" #include "base/signal.h" -#include "gfx/size.h" -#include "jinete/jinete.h" - -#include "app.h" #include "commands/command.h" #include "commands/commands.h" +#include "gfx/size.h" +#include "gui/jinete.h" #include "modules/gfx.h" #include "modules/gui.h" #include "modules/skinneable_theme.h" diff --git a/src/widgets/toolbar.h b/src/widgets/toolbar.h index 69110206f..24044e69b 100644 --- a/src/widgets/toolbar.h +++ b/src/widgets/toolbar.h @@ -19,7 +19,7 @@ #ifndef WIDGETS_TOOLBAR_H_INCLUDED #define WIDGETS_TOOLBAR_H_INCLUDED -#include "jinete/jbase.h" +#include "gui/jbase.h" JWidget toolbar_new(); diff --git a/src/xml_widgets.cpp b/src/xml_widgets.cpp index 2c95b3ff4..31d2e2a2c 100644 --- a/src/xml_widgets.cpp +++ b/src/xml_widgets.cpp @@ -26,7 +26,7 @@ #include "ase_exception.h" #include "base/bind.h" -#include "jinete/jinete.h" +#include "gui/jinete.h" #include "modules/gui.h" #include "tinyxml.h"