From d1022c34b6252fea587db874d652cf66a3e814c3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 9 May 2001 22:34:59 +0000 Subject: [PATCH] app/Makefile.am removed. 2001-05-10 Michael Natterer * app/Makefile.am * app/asupsample.[ch]: removed. * app/core/Makefile.am * app/core/core-types.h * app/tools/Makefile.am * app/tools/tools-types.h: new files. * app/tools/gimptoolinfo.[ch]: removed. * app/core/gimptoolinfo.[ch]: added here. * libgimp/Makefile.am * libgimp/gimp.h * libgimp/gimpadaptivesupersample.[ch] * libgimp/gimpbilinear.[ch]: removed here... * libgimpcolor/Makefile.am * libgimpcolor/gimpcolortypes.h * libgimpcolor/gimpadaptivesupersample.[ch] * libgimpcolor/gimpbilinear.[ch]: ..and added here. * tools/pdbgen/app.pl * tools/pdbgen/pdb/paths.pdb * app/*.c: changed tons of #include's --- ChangeLog | 28 ++ app/Makefile.am | 130 +++---- app/actions/channels-commands.c | 2 +- app/actions/help-commands.c | 5 +- app/actions/layers-commands.c | 2 +- app/actions/plug-in-commands.c | 10 +- app/actions/qmask-commands.c | 2 +- app/actions/quick-mask-commands.c | 2 +- app/app_procs.c | 2 +- app/apptypes.h | 72 ---- app/asupsample.c | 377 ------------------- app/asupsample.h | 51 --- app/base/gimphistogram.c | 2 +- app/base/lut-funcs.c | 2 +- app/base/pixel-surround.c | 2 +- app/base/temp-buf.c | 2 +- app/context_manager.c | 4 +- app/core/Makefile.am | 3 + app/core/core-types.h | 83 +++++ app/core/gimp-edit.c | 3 +- app/core/gimp-parasites.c | 2 +- app/core/gimp-transform-region.c | 4 +- app/core/gimpbrush-load.c | 2 +- app/core/gimpbrush.c | 2 +- app/core/gimpbrush.h | 3 + app/core/gimpbrushgenerated-load.c | 8 +- app/core/gimpbrushgenerated-save.c | 8 +- app/core/gimpbrushgenerated.c | 8 +- app/core/gimpbrushpipe-load.c | 3 +- app/core/gimpbrushpipe.c | 3 +- app/core/gimpchannel-combine.c | 2 +- app/core/gimpchannel.c | 2 +- app/core/gimpcontainer.c | 2 +- app/core/gimpcontext.c | 12 +- app/core/gimpdata.c | 6 +- app/core/gimpdatafactory.c | 12 +- app/core/gimpdatafiles.c | 20 +- app/core/gimpdatafiles.h | 24 +- app/core/gimpdatalist.c | 3 +- app/core/gimpdrawable-blend.c | 5 +- app/core/gimpdrawable-desaturate.c | 2 +- app/core/gimpdrawable-equalize.c | 2 +- app/core/gimpdrawable-invert.c | 2 +- app/core/gimpdrawable-offset.c | 2 +- app/core/gimpdrawable-preview.c | 2 +- app/core/gimpdrawable-transform.c | 4 +- app/core/gimpdrawable.c | 2 +- app/core/gimpedit.c | 3 +- app/core/gimpgradient.c | 2 +- app/core/gimpimage-convert.c | 2 +- app/core/gimpimage-duplicate.c | 5 +- app/core/gimpimage-guides.c | 5 +- app/core/gimpimage-mask.c | 8 +- app/core/gimpimage-merge.c | 5 +- app/core/gimpimage-pick-color.c | 2 +- app/core/gimpimage-projection.c | 5 +- app/core/gimpimage-qmask.c | 2 +- app/core/gimpimage-quick-mask.c | 2 +- app/core/gimpimage-resize.c | 5 +- app/core/gimpimage-scale.c | 5 +- app/core/gimpimage-undo-push.c | 3 +- app/core/gimpimage-undo.c | 2 +- app/core/gimpimage.c | 5 +- app/core/gimpimagemap.c | 2 +- app/core/gimplayer-floating-sel.c | 2 +- app/core/gimplayer.c | 2 +- app/core/gimplayermask.c | 2 +- app/core/gimplist.c | 3 +- app/core/gimpobject.c | 2 +- app/core/gimppalette-import.c | 3 +- app/core/gimppalette-load.c | 6 +- app/core/gimppalette-save.c | 6 +- app/core/gimppalette.c | 6 +- app/core/gimpparasite.c | 2 +- app/core/gimpparasitelist.c | 2 +- app/core/gimppattern-load.c | 3 +- app/core/gimppattern.c | 3 +- app/core/gimpprojection-construct.c | 5 +- app/core/gimpprojection.c | 3 +- app/core/gimpscanconvert.c | 2 +- app/core/gimptoolinfo.c | 10 +- app/core/gimpundo.c | 5 +- app/core/gimpundostack.c | 8 +- app/core/gimpviewable.c | 2 +- app/cursorutil.c | 2 +- app/datafiles.c | 20 +- app/datafiles.h | 24 +- app/devices.c | 2 +- app/dialogs/about-dialog.c | 4 +- app/dialogs/convert-dialog.c | 3 +- app/dialogs/dialogs-constructors.c | 2 +- app/dialogs/file-dialog-utils.c | 2 +- app/dialogs/file-open-dialog.c | 2 +- app/dialogs/file-save-dialog.c | 2 +- app/dialogs/image-new-dialog.c | 2 +- app/dialogs/info-window.c | 3 +- app/dialogs/module-dialog.c | 10 +- app/dialogs/offset-dialog.c | 2 +- app/dialogs/palette-import-dialog.c | 3 +- app/dialogs/preferences-dialog.c | 2 +- app/dialogs/resize-dialog.c | 2 +- app/dialogs/resolution-calibrate-dialog.c | 2 +- app/dialogs/user-install-dialog.c | 2 +- app/disp_callbacks.c | 5 +- app/display/gimpdisplay-callbacks.c | 5 +- app/display/gimpdisplay-ops.c | 2 +- app/display/gimpdisplay-render.c | 2 +- app/display/gimpdisplay-scale.c | 3 +- app/display/gimpdisplay-scroll.c | 3 +- app/display/gimpdisplay-selection.c | 2 +- app/display/gimpdisplay.c | 3 +- app/display/gimpdisplayshell-callbacks.c | 5 +- app/display/gimpdisplayshell-draw.c | 2 +- app/display/gimpdisplayshell-layer-select.c | 2 +- app/display/gimpdisplayshell-qmask.c | 2 +- app/display/gimpdisplayshell-render.c | 2 +- app/display/gimpdisplayshell-scale.c | 3 +- app/display/gimpdisplayshell-scroll.c | 3 +- app/display/gimpdisplayshell-selection.c | 2 +- app/display/gimpdisplayshell.c | 2 +- app/display/gimpnavigationeditor.c | 2 +- app/display/gimpnavigationview.c | 2 +- app/display/gimpprogress.c | 2 +- app/display/gximage.c | 4 +- app/docindex.c | 2 +- app/drawable.c | 2 +- app/file-open.c | 2 +- app/file-save.c | 8 +- app/file-utils.c | 2 +- app/file/file-open.c | 2 +- app/file/file-save.c | 8 +- app/file/file-utils.c | 2 +- app/floating_sel.c | 2 +- app/gdisplay.c | 3 +- app/gdisplay_ops.c | 2 +- app/gimage.c | 3 +- app/gimphistogram.c | 2 +- app/gimpparasite.c | 2 +- app/gimpprogress.c | 2 +- app/gimprc.c | 6 +- app/global_edit.c | 3 +- app/gui/about-dialog.c | 4 +- app/gui/brush-editor.c | 2 +- app/gui/channels-commands.c | 2 +- app/gui/color-area.c | 2 +- app/gui/color-select.c | 2 +- app/gui/colormap-dialog.c | 2 +- app/gui/commands.c | 5 +- app/gui/convert-dialog.c | 3 +- app/gui/device-status-dialog.c | 2 +- app/gui/dialogs-constructors.c | 2 +- app/gui/file-dialog-utils.c | 2 +- app/gui/file-new-dialog.c | 2 +- app/gui/file-open-dialog.c | 2 +- app/gui/file-save-dialog.c | 2 +- app/gui/gradient-editor.c | 2 +- app/gui/help-commands.c | 5 +- app/gui/info-window.c | 3 +- app/gui/input-dialog.c | 2 +- app/gui/layer-select.c | 2 +- app/gui/layers-commands.c | 2 +- app/gui/menus.c | 5 +- app/gui/module-browser.c | 10 +- app/gui/offset-dialog.c | 2 +- app/gui/palette-import-dialog.c | 3 +- app/gui/paths-dialog.c | 3 +- app/gui/plug-in-commands.c | 10 +- app/gui/plug-in-menus.c | 10 +- app/gui/preferences-dialog.c | 2 +- app/gui/qmask-commands.c | 2 +- app/gui/resize-dialog.c | 2 +- app/gui/resolution-calibrate-dialog.c | 2 +- app/gui/test-commands.c | 3 +- app/gui/tool-options-dialog.c | 4 +- app/gui/toolbox.c | 5 +- app/gui/user-install-dialog.c | 2 +- app/gximage.c | 4 +- app/image_map.c | 2 +- app/image_new.c | 2 +- app/image_render.c | 2 +- app/interface.c | 2 +- app/lc_dialog.c | 3 +- app/libgimp_glue.c | 2 +- app/lut_funcs.c | 2 +- app/menus/menus.c | 5 +- app/menus/plug-in-menus.c | 10 +- app/module_db.c | 10 +- app/nav_window.c | 2 +- app/paint-funcs/paint-funcs.c | 2 +- app/paint/gimpairbrush.c | 2 +- app/paint/gimpclone.c | 2 +- app/paint/gimpconvolve.c | 2 +- app/paint/gimpdodgeburn.c | 2 +- app/paint/gimperaser.c | 2 +- app/paint/gimpink.c | 2 +- app/paint/gimppaintbrush.c | 2 +- app/paint/gimppaintcore.c | 2 +- app/paint/gimppencil.c | 2 +- app/paint/gimpsmudge.c | 2 +- app/paint/gimpsourcecore.c | 2 +- app/parasitelist.c | 2 +- app/path.c | 3 +- app/path_bezier.c | 13 +- app/path_curves.c | 14 +- app/pdb/brush_select_cmds.c | 3 +- app/pdb/brushes_cmds.c | 3 +- app/pdb/channel_cmds.c | 3 +- app/pdb/color_cmds.c | 2 +- app/pdb/convert_cmds.c | 2 +- app/pdb/display_cmds.c | 2 +- app/pdb/drawable_cmds.c | 3 +- app/pdb/edit_cmds.c | 3 +- app/pdb/fileops_cmds.c | 2 +- app/pdb/floating_sel_cmds.c | 2 +- app/pdb/gimp-pdb.c | 2 +- app/pdb/gimppdb.c | 2 +- app/pdb/gimpprocedure.c | 2 +- app/pdb/gimprc_cmds.c | 2 +- app/pdb/gradient_select_cmds.c | 2 +- app/pdb/gradients_cmds.c | 2 +- app/pdb/guides_cmds.c | 3 +- app/pdb/help_cmds.c | 2 +- app/pdb/image_cmds.c | 3 +- app/pdb/layer_cmds.c | 3 +- app/pdb/message_cmds.c | 2 +- app/pdb/misc_cmds.c | 2 +- app/pdb/palette_cmds.c | 2 +- app/pdb/parasite_cmds.c | 2 +- app/pdb/paths_cmds.c | 3 +- app/pdb/pattern_select_cmds.c | 3 +- app/pdb/patterns_cmds.c | 3 +- app/pdb/plug_in_cmds.c | 3 +- app/pdb/procedural_db.c | 2 +- app/pdb/procedural_db_cmds.c | 4 +- app/pdb/selection_cmds.c | 4 +- app/pdb/text_tool_cmds.c | 3 +- app/pdb/tools_cmds.c | 4 +- app/pdb/undo_cmds.c | 3 +- app/pdb/unit_cmds.c | 3 +- app/pixel_surround.c | 2 +- app/plug-in/gimpplugin-message.c | 10 +- app/plug-in/gimpplugin-progress.c | 10 +- app/plug-in/gimpplugin.c | 10 +- app/plug-in/gimppluginmanager-call.c | 10 +- app/plug-in/gimppluginmanager-run.c | 10 +- app/plug-in/gimppluginmanager.c | 10 +- app/plug-in/gimppluginshm.c | 10 +- app/plug-in/plug-in-def.c | 10 +- app/plug-in/plug-in-message.c | 10 +- app/plug-in/plug-in-params.c | 10 +- app/plug-in/plug-in-progress.c | 10 +- app/plug-in/plug-in-run.c | 10 +- app/plug-in/plug-in-shm.c | 10 +- app/plug-in/plug-in.c | 10 +- app/plug-in/plug-ins.c | 10 +- app/plug_in.c | 10 +- app/qmask.c | 2 +- app/resize.c | 2 +- app/resolution_calibrate.c | 2 +- app/scale.c | 3 +- app/scan_convert.c | 2 +- app/scroll.c | 3 +- app/selection.c | 2 +- app/temp_buf.c | 2 +- app/tools/Makefile.am | 3 +- app/tools/gimpairbrushtool.c | 2 +- app/tools/gimpbezierselecttool.c | 3 +- app/tools/gimpblendtool.c | 5 +- app/tools/gimpbrushtool.c | 2 +- app/tools/gimpbucketfilltool.c | 2 +- app/tools/gimpclonetool.c | 2 +- app/tools/gimpcolorpickertool.c | 2 +- app/tools/gimpconvolvetool.c | 2 +- app/tools/gimpcroptool.c | 2 +- app/tools/gimpdodgeburntool.c | 2 +- app/tools/gimpdrawtool.c | 10 +- app/tools/gimpeditselectiontool.c | 2 +- app/tools/gimpellipseselecttool.c | 4 +- app/tools/gimperasertool.c | 2 +- app/tools/gimpfliptool.c | 2 +- app/tools/gimpfreeselecttool.c | 2 +- app/tools/gimpfuzzyselecttool.c | 2 +- app/tools/gimpinktool.c | 2 +- app/tools/gimpiscissorstool.c | 2 +- app/tools/gimpmagnifytool.c | 2 +- app/tools/gimpmeasuretool.c | 2 +- app/tools/gimpmovetool.c | 2 +- app/tools/gimppaintbrushtool.c | 2 +- app/tools/gimppaintoptions-gui.c | 4 +- app/tools/gimppainttool.c | 2 +- app/tools/gimppathtool.c | 2 +- app/tools/gimppenciltool.c | 2 +- app/tools/gimpperspectivetool.c | 2 +- app/tools/gimprectselecttool.c | 4 +- app/tools/gimpregionselecttool.c | 2 +- app/tools/gimprotatetool.c | 2 +- app/tools/gimpscaletool.c | 2 +- app/tools/gimpselectionoptions.c | 5 +- app/tools/gimpselectiontool.c | 8 +- app/tools/gimpsheartool.c | 2 +- app/tools/gimpsmudgetool.c | 2 +- app/tools/gimpsourcetool.c | 2 +- app/tools/gimptexttool.c | 2 +- app/tools/gimptool.c | 2 +- app/tools/gimptoolinfo.c | 259 ------------- app/tools/gimptoolinfo.h | 80 ---- app/tools/gimptransformoptions.c | 6 +- app/tools/gimptransformtool.c | 4 +- app/tools/paint_options.c | 4 +- app/tools/path_tool.c | 16 +- app/tools/selection_options.c | 5 +- app/tools/tool_manager.c | 4 +- app/tools/tool_options_dialog.c | 4 +- app/tools/tools-types.h | 43 +++ app/tools/tools.c | 2 +- app/tools/transform_options.c | 6 +- app/undo.c | 3 +- app/undo_history.c | 2 +- app/user_install.c | 2 +- app/widgets/gimpbrusheditor.c | 2 +- app/widgets/gimpcolormapeditor.c | 2 +- app/widgets/gimpcursor.c | 2 +- app/widgets/gimpdeviceinfo.c | 2 +- app/widgets/gimpdevices.c | 2 +- app/widgets/gimpdnd.c | 5 +- app/widgets/gimpgradienteditor.c | 2 +- app/widgets/gimpitemfactory.c | 5 +- app/widgets/gimppreview.c | 3 +- app/widgets/gimppreviewrenderer.c | 3 +- app/widgets/gimptoolbox-color-area.c | 2 +- app/widgets/gimptoolbox.c | 5 +- app/widgets/gimptoolinfopreview.c | 2 +- app/widgets/gimptooloptionseditor.c | 4 +- app/widgets/gimpview.c | 3 +- app/widgets/gimpviewrenderer.c | 3 +- app/widgets/widgets-types.h | 2 +- app/xcf.c | 3 +- app/xcf/xcf.c | 3 +- libgimp/Makefile.am | 6 - libgimp/gimp.h | 2 - libgimp/gimpadaptivesupersample.c | 381 -------------------- libgimp/gimpadaptivesupersample.h | 65 ---- libgimp/gimpbilinear.c | 223 ------------ libgimp/gimpbilinear.h | 57 --- libgimpbase/gimpdatafiles.c | 20 +- libgimpbase/gimpdatafiles.h | 24 +- libgimpcolor/Makefile.am | 28 +- libgimpcolor/gimpadaptivesupersample.c | 4 +- libgimpcolor/gimpadaptivesupersample.h | 14 - libgimpcolor/gimpbilinear.c | 3 +- libgimpcolor/gimpcolor.h | 2 + libgimpcolor/gimpcolortypes.h | 14 + libgimpwidgets/gimpcolorselect.c | 2 +- tools/pdbgen/pdb/paths.pdb | 2 +- 354 files changed, 953 insertions(+), 2258 deletions(-) delete mode 100644 app/asupsample.c delete mode 100644 app/asupsample.h create mode 100644 app/core/core-types.h delete mode 100644 app/tools/gimptoolinfo.c delete mode 100644 app/tools/gimptoolinfo.h create mode 100644 app/tools/tools-types.h delete mode 100644 libgimp/gimpadaptivesupersample.c delete mode 100644 libgimp/gimpadaptivesupersample.h delete mode 100644 libgimp/gimpbilinear.c delete mode 100644 libgimp/gimpbilinear.h diff --git a/ChangeLog b/ChangeLog index ca47d9a435..31090be15a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2001-05-10 Michael Natterer + + * app/Makefile.am + * app/asupsample.[ch]: removed. + + * app/core/Makefile.am + * app/core/core-types.h + * app/tools/Makefile.am + * app/tools/tools-types.h: new files. + + * app/tools/gimptoolinfo.[ch]: removed. + * app/core/gimptoolinfo.[ch]: added here. + + * libgimp/Makefile.am + * libgimp/gimp.h + * libgimp/gimpadaptivesupersample.[ch] + * libgimp/gimpbilinear.[ch]: removed here... + + * libgimpcolor/Makefile.am + * libgimpcolor/gimpcolortypes.h + * libgimpcolor/gimpadaptivesupersample.[ch] + * libgimpcolor/gimpbilinear.[ch]: ..and added here. + + * tools/pdbgen/app.pl + * tools/pdbgen/pdb/paths.pdb + + * app/*.c: changed tons of #include's + 2001-05-09 Michael Natterer * configure.in diff --git a/app/Makefile.am b/app/Makefile.am index feeb914f43..f20344343f 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -93,86 +93,38 @@ gimp_SOURCES = \ user_install.c \ user_install.h \ ## -## stuff that needs to be sorted into yet undecided subsystems, split up, -## removed or otherwise tortured +## stuff for core/ +## + datafiles.c \ + datafiles.h \ + floating_sel.c \ + floating_sel.h \ + fsdither.h \ + gimppreviewcache.h \ + gimppreviewcache.c \ + parasitelist.c \ + parasitelist.h \ + scan_convert.c \ + scan_convert.h \ +## +## lowlevel stuff for base/ ## - app_procs.c \ - app_procs.h \ - appenums.h \ - appenv.h \ - apptypes.h \ - asupsample.c \ - asupsample.h \ - authors.h \ - batch.c \ - batch.h \ boundary.c \ boundary.h \ brush_scale.c \ brush_scale.h \ - color_transfer.c \ - color_transfer.h \ - context_manager.c \ - context_manager.h \ - datafiles.c \ - datafiles.h \ - drawable.c \ - drawable.h \ - errors.c \ - errors.h \ - file-open.c \ - file-open.h \ - file-save.c \ - file-save.h \ - file-utils.h \ - file-utils.c \ - floating_sel.c \ - floating_sel.h \ - fsdither.h \ - general.c \ - general.h \ - gimage.c \ - gimage.h \ - gimphelp.c \ - gimphelp.h \ gimphistogram.c \ gimphistogram.h \ gimplut.c \ gimplut.h \ - gimpparasite.c \ - gimpparasite.h \ - gimppreviewcache.h \ - gimppreviewcache.c \ - gimprc.c \ - gimprc.h \ - gimpunit.c \ - image_new.c \ - image_new.h \ - libgimp_glue.c \ - libgimp_glue.h \ lut_funcs.c \ lut_funcs.h \ - main.c \ - parasitelist.c \ - parasitelist.h \ - path.c \ - path.h \ - pathP.h \ - path_transform.h \ - path_curves.h \ - path_curves.c \ - path_bezier.h \ - path_bezier.c \ pixel_processor.c \ pixel_processor.h \ pixel_region.c \ pixel_region.h \ pixel_surround.c \ pixel_surround.h \ - plug_in.c \ - plug_in.h \ - scan_convert.c \ - scan_convert.h \ temp_buf.c \ temp_buf.h \ tile.c \ @@ -185,6 +137,58 @@ gimp_SOURCES = \ tile_manager_pvt.h \ tile_swap.c \ tile_swap.h \ +## +## stuff that needs to be sorted into yet undecided subsystems, split up, +## removed or otherwise tortured +## + app_procs.c \ + app_procs.h \ + appenums.h \ + appenv.h \ + apptypes.h \ + authors.h \ + batch.c \ + batch.h \ + color_transfer.c \ + color_transfer.h \ + context_manager.c \ + context_manager.h \ + drawable.c \ + drawable.h \ + errors.c \ + errors.h \ + file-open.c \ + file-open.h \ + file-save.c \ + file-save.h \ + file-utils.h \ + file-utils.c \ + general.c \ + general.h \ + gimage.c \ + gimage.h \ + gimphelp.c \ + gimphelp.h \ + gimpparasite.c \ + gimpparasite.h \ + gimprc.c \ + gimprc.h \ + gimpunit.c \ + image_new.c \ + image_new.h \ + libgimp_glue.c \ + libgimp_glue.h \ + main.c \ + path.c \ + path.h \ + pathP.h \ + path_transform.h \ + path_curves.h \ + path_curves.c \ + path_bezier.h \ + path_bezier.c \ + plug_in.c \ + plug_in.h \ undo.c \ undo.h \ undo_types.h \ diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c index 73a964ad0f..477634b3b9 100644 --- a/app/actions/channels-commands.c +++ b/app/actions/channels-commands.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c index e2af214ced..0d7a8f2af8 100644 --- a/app/actions/help-commands.c +++ b/app/actions/help-commands.c @@ -27,7 +27,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" @@ -36,9 +37,9 @@ #include "core/gimpimage.h" #include "core/gimpimage-duplicate.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "commands.h" diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index 001b618163..40bb9bfb01 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -26,7 +26,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/app_procs.c b/app/app_procs.c index 0707bfad25..e490e42d7c 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -44,7 +44,7 @@ #include "libgimp/gimpfeatures.h" #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/apptypes.h b/app/apptypes.h index e1ccf0d0b3..9979ae4fd8 100644 --- a/app/apptypes.h +++ b/app/apptypes.h @@ -30,67 +30,6 @@ #include "appenums.h" -/* base objects */ - -typedef struct _GimpObject GimpObject; - -typedef struct _GimpContainer GimpContainer; -typedef struct _GimpList GimpList; -typedef struct _GimpDataList GimpDataList; - -typedef struct _GimpDataFactory GimpDataFactory; - -typedef struct _GimpContext GimpContext; - -typedef struct _GimpViewable GimpViewable; - - -/* drawable objects */ - -typedef struct _GimpDrawable GimpDrawable; - -typedef struct _GimpChannel GimpChannel; - -typedef struct _GimpLayer GimpLayer; -typedef struct _GimpLayerMask GimpLayerMask; - -typedef struct _GimpImage GimpImage; - - -/* data objects */ - -typedef struct _GimpData GimpData; - -typedef struct _GimpBrush GimpBrush; -typedef struct _GimpBrushGenerated GimpBrushGenerated; -typedef struct _GimpBrushPipe GimpBrushPipe; - -typedef struct _GimpGradient GimpGradient; - -typedef struct _GimpPattern GimpPattern; - -typedef struct _GimpPalette GimpPalette; - - -/* tools */ - -typedef struct _GimpToolInfo GimpToolInfo; - -typedef struct _GimpTool GimpTool; -typedef struct _GimpPaintTool GimpPaintTool; -typedef struct _GimpDrawTool GimpDrawTool; -typedef struct _GimpPathTool GimpPathTool; -typedef struct _GimpTransformTool GimpTransformTool; - -typedef struct _GimpBezierSelectPoint GimpBezierSelectPoint; -typedef struct _GimpBezierSelectTool GimpBezierSelectTool; - -/* undo objects */ - -typedef struct _GimpUndo GimpUndo; -typedef struct _GimpUndoStack GimpUndoStack; - - /* other stuff */ typedef struct _Argument Argument; @@ -152,8 +91,6 @@ typedef struct _ScanConvertPoint ScanConvertPoint; typedef struct _Selection Selection; -typedef struct _SelectionOptions SelectionOptions; - /* some undo stuff */ @@ -173,18 +110,9 @@ typedef void (* TileValidateProc) (TileManager *tm, typedef void (* ToolOptionsResetFunc) (ToolOptions *tool_options); -typedef void (* GimpProgressFunc) (gint min, - gint max, - gint current, - gpointer data); - typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR, PixelRegion *destPR, gpointer data); -typedef void (* GimpDataFileLoaderFunc) (const gchar *filename, - gpointer loader_data); -typedef GimpData * (* GimpDataObjectLoaderFunc) (const gchar *filename); - #endif /* __APPTYPES_H__ */ diff --git a/app/asupsample.c b/app/asupsample.c deleted file mode 100644 index e6d2142822..0000000000 --- a/app/asupsample.c +++ /dev/null @@ -1,377 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * General, non-jittered adaptive supersampling library - * Copyright (C) 1997 Federico Mena Quintero - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -/* This code is *largely* based on the sources for POV-Ray 3.0. I am - * grateful to the POV-Team for such a great program and for making - * their sources available. All comments / bug reports / - * etc. regarding this library should be addressed to me, not to the - * POV-Ray team. Any bugs are my responsibility, not theirs. - */ - -#include "config.h" - -#include - -#include - -#include "libgimpcolor/gimpcolor.h" -#include "libgimpmath/gimpmath.h" - -#include "apptypes.h" - -#include "appenv.h" -#include "asupsample.h" -#include "gimpprogress.h" - - -typedef struct -{ - gchar ready; - GimpRGB color; -} GimpSampleType; - - -/***** Local functions *****/ - -static gulong gimp_render_sub_pixel (gint max_depth, - gint depth, - GimpSampleType **block, - gint x, - gint y, - gint x1, - gint y1, - gint x3, - gint y3, - gdouble threshold, - gint sub_pixel_size, - GimpRGB *color, - GimpRenderFunc render_func, - gpointer render_data); - - -/***** Functions *****/ - -gulong -gimp_adaptive_supersample_area (gint x1, - gint y1, - gint x2, - gint y2, - gint max_depth, - gdouble threshold, - GimpRenderFunc render_func, - gpointer render_data, - GimpPutPixelFunc put_pixel_func, - gpointer put_pixel_data, - GimpProgressFunc progress_func, - gpointer progress_data) -{ - gint x, y, width; /* Counters, width of region */ - gint xt, xtt, yt; /* Temporary counters */ - gint sub_pixel_size; /* Numbe of samples per pixel (1D) */ - GimpRGB color; /* Rendered pixel's color */ - GimpSampleType tmp_sample; /* For swapping samples */ - GimpSampleType *top_row, *bot_row, *tmp_row; /* Sample rows */ - GimpSampleType **block; /* Sample block matrix */ - gulong num_samples; - - /* Initialize color */ - - gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0); - - /* Calculate sub-pixel size */ - - sub_pixel_size = 1 << max_depth; - - /* Create row arrays */ - - width = x2 - x1 + 1; - - top_row = g_new (GimpSampleType, sub_pixel_size * width + 1); - bot_row = g_new (GimpSampleType, sub_pixel_size * width + 1); - - for (x = 0; x < (sub_pixel_size * width + 1); x++) - { - top_row[x].ready = FALSE; - - gimp_rgba_set (&top_row[x].color, 0.0, 0.0, 0.0, 0.0); - - bot_row[x].ready = FALSE; - - gimp_rgba_set (&bot_row[x].color, 0.0, 0.0, 0.0, 0.0); - } - - /* Allocate block matrix */ - - block = g_new (GimpSampleType *, sub_pixel_size + 1); /* Rows */ - - for (y = 0; y < (sub_pixel_size + 1); y++) - { - block[y] = g_new (GimpSampleType, sub_pixel_size + 1); /* Columns */ - - for (x = 0; x < (sub_pixel_size + 1); x++) - { - block[y][x].ready = FALSE; - - gimp_rgba_set (&block[y][x].color, 0.0, 0.0, 0.0, 0.0); - } - } - - /* Render region */ - - num_samples = 0; - - for (y = y1; y <= y2; y++) - { - /* Clear the bottom row */ - - for (xt = 0; xt < (sub_pixel_size * width + 1); xt++) - bot_row[xt].ready = FALSE; - - /* Clear first column */ - - for (yt = 0; yt < (sub_pixel_size + 1); yt++) - block[yt][0].ready = 0; - - /* Render row */ - - for (x = x1; x <= x2; x++) - { - /* Initialize block by clearing all but first row/column */ - - for (yt = 1; yt < (sub_pixel_size + 1); yt++) - for (xt = 1; xt < (sub_pixel_size + 1); xt++) - block[yt][xt].ready = FALSE; - - /* Copy samples from top row to block */ - - for (xtt = 0, xt = (x - x1) * sub_pixel_size; - xtt < (sub_pixel_size + 1); - xtt++, xt++) - block[0][xtt] = top_row[xt]; - - /* Render pixel on (x, y) */ - - num_samples += gimp_render_sub_pixel (max_depth, 1, block, x, y, 0, 0, - sub_pixel_size, sub_pixel_size, - threshold, sub_pixel_size, - &color, - render_func, render_data); - - if (put_pixel_func) - (* put_pixel_func) (x, y, &color, put_pixel_data); - - /* Copy block information to rows */ - - top_row[((x - x1) + 1) * sub_pixel_size] = block[0][sub_pixel_size]; - - for (xtt = 0, xt = (x - x1) * sub_pixel_size; - xtt < (sub_pixel_size + 1); - xtt++, xt++) - bot_row[xt] = block[sub_pixel_size][xtt]; - - /* Swap first and last columns */ - - for (yt = 0; yt < (sub_pixel_size + 1); yt++) - { - tmp_sample = block[yt][0]; - block[yt][0] = block[yt][sub_pixel_size]; - block[yt][sub_pixel_size] = tmp_sample; - } - } - - /* Swap rows */ - - tmp_row = top_row; - top_row = bot_row; - bot_row = tmp_row; - - /* Call progress display function */ - - if (progress_func && !(y & 0xf)) - (* progress_func) (y1, y2, y, progress_data); - } - - /* Free memory */ - - for (y = 0; y < (sub_pixel_size + 1); y++) - g_free (block[y]); - - g_free (block); - g_free (top_row); - g_free (bot_row); - - return num_samples; -} - -static gulong -gimp_render_sub_pixel (gint max_depth, - gint depth, - GimpSampleType **block, - gint x, - gint y, - gint x1, - gint y1, - gint x3, - gint y3, - gdouble threshold, - gint sub_pixel_size, - GimpRGB *color, - GimpRenderFunc render_func, - gpointer render_data) -{ - gint x2, y2; /* Coords of center sample */ - gdouble dx1, dy1; /* Delta to upper left sample */ - gdouble dx3, dy3; /* Delta to lower right sample */ - GimpRGB c1, c2, c3, c4; /* Sample colors */ - gulong num_samples; - - /* Get offsets for corners */ - - dx1 = (gdouble) (x1 - sub_pixel_size / 2) / sub_pixel_size; - dx3 = (gdouble) (x3 - sub_pixel_size / 2) / sub_pixel_size; - - dy1 = (gdouble) (y1 - sub_pixel_size / 2) / sub_pixel_size; - dy3 = (gdouble) (y3 - sub_pixel_size / 2) / sub_pixel_size; - - num_samples = 0; - - /* Render upper left sample */ - - if (!block[y1][x1].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx1, y + dy1, &c1, render_data); - - block[y1][x1].ready = TRUE; - block[y1][x1].color = c1; - } - else - { - c1 = block[y1][x1].color; - } - - /* Render upper right sample */ - - if (! block[y1][x3].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx3, y + dy1, &c2, render_data); - - block[y1][x3].ready = TRUE; - block[y1][x3].color = c2; - } - else - { - c2 = block[y1][x3].color; - } - - /* Render lower left sample */ - - if (! block[y3][x1].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx1, y + dy3, &c3, render_data); - - block[y3][x1].ready = TRUE; - block[y3][x1].color = c3; - } - else - { - c3 = block[y3][x1].color; - } - - /* Render lower right sample */ - - if (! block[y3][x3].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx3, y + dy3, &c4, render_data); - - block[y3][x3].ready = TRUE; - block[y3][x3].color = c4; - } - else - { - c4 = block[y3][x3].color; - } - - /* Check for supersampling */ - - if (depth <= max_depth) - { - /* Check whether we have tu supersample */ - - if ((gimp_rgba_distance (&c1, &c2) >= threshold) || - (gimp_rgba_distance (&c1, &c3) >= threshold) || - (gimp_rgba_distance (&c1, &c4) >= threshold) || - (gimp_rgba_distance (&c2, &c3) >= threshold) || - (gimp_rgba_distance (&c2, &c4) >= threshold) || - (gimp_rgba_distance (&c3, &c4) >= threshold)) - { - /* Calc coordinates of center subsample */ - - x2 = (x1 + x3) / 2; - y2 = (y1 + y3) / 2; - - /* Render sub-blocks */ - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x1, y1, x2, y2, - threshold, sub_pixel_size, - &c1, - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x2, y1, x3, y2, - threshold, sub_pixel_size, - &c2, - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x1, y2, x2, y3, - threshold, sub_pixel_size, - &c3, - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x2, y2, x3, y3, - threshold, sub_pixel_size, - &c4, - render_func, render_data); - } - } - - color->r = 0.25 * (c1.r + c2.r + c3.r + c4.r); - color->g = 0.25 * (c1.g + c2.g + c3.g + c4.g); - color->b = 0.25 * (c1.b + c2.b + c3.b + c4.b); - color->a = 0.25 * (c1.a + c2.a + c3.a + c4.a); - - return num_samples; -} diff --git a/app/asupsample.h b/app/asupsample.h deleted file mode 100644 index ceccd71904..0000000000 --- a/app/asupsample.h +++ /dev/null @@ -1,51 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * General, non-jittered adaptive supersampling library - * Copyright (C) 1997 Federico Mena Quintero - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __ASUPSAMPLE_H__ -#define __ASUPSAMPLE_H__ - - -typedef void (* GimpRenderFunc) (gdouble x, - gdouble y, - GimpRGB *color, - gpointer data); -typedef void (* GimpPutPixelFunc) (gint x, - gint y, - GimpRGB *color, - gpointer data); - - -gulong gimp_adaptive_supersample_area (gint x1, - gint y1, - gint x2, - gint y2, - gint max_depth, - gdouble threshold, - GimpRenderFunc render_func, - gpointer render_data, - GimpPutPixelFunc put_pixel_func, - gpointer put_pixel_data, - GimpProgressFunc progress_func, - gpointer progress_data); - - -#endif /* __ASUPSAMPLE_H__ */ diff --git a/app/base/gimphistogram.c b/app/base/gimphistogram.c index 47c1069e21..0dab16f1ed 100644 --- a/app/base/gimphistogram.c +++ b/app/base/gimphistogram.c @@ -29,7 +29,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/base/lut-funcs.c b/app/base/lut-funcs.c index f9649287c8..0a5d07704a 100644 --- a/app/base/lut-funcs.c +++ b/app/base/lut-funcs.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gimplut.h" #include "gimphistogram.h" diff --git a/app/base/pixel-surround.c b/app/base/pixel-surround.c index f51a47e740..2f14508566 100644 --- a/app/base/pixel-surround.c +++ b/app/base/pixel-surround.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index 641413a3dc..5de3444d6b 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -36,7 +36,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/context_manager.c b/app/context_manager.c index a7ae907ab5..2ffebd4430 100644 --- a/app/context_manager.c +++ b/app/context_manager.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpbrush.h" #include "core/gimpbrushgenerated.h" @@ -32,9 +32,9 @@ #include "core/gimpimage.h" #include "core/gimppalette.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "tools/paint_options.h" #include "tools/tool_manager.h" diff --git a/app/core/Makefile.am b/app/core/Makefile.am index 4d56e1de74..78cc69b4d5 100644 --- a/app/core/Makefile.am +++ b/app/core/Makefile.am @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libappcore.la libappcore_la_SOURCES = \ + core-types.h \ gimpbrush.c \ gimpbrush.h \ gimpbrush-header.h \ @@ -63,6 +64,8 @@ libappcore_la_SOURCES = \ gimppalette.h \ gimppalette-import.c \ gimppalette-import.h \ + gimptoolinfo.c \ + gimptoolinfo.h \ gimpundo.c \ gimpundo.h \ gimpundostack.c \ diff --git a/app/core/core-types.h b/app/core/core-types.h new file mode 100644 index 0000000000..79bf550b2b --- /dev/null +++ b/app/core/core-types.h @@ -0,0 +1,83 @@ +/* The GIMP -- an image manipulation program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __CORE_TYPES_H__ +#define __CORE_TYPES_H__ + + +#include "apptypes.h" + + +/* base objects */ + +typedef struct _GimpObject GimpObject; + +typedef struct _GimpContainer GimpContainer; +typedef struct _GimpList GimpList; +typedef struct _GimpDataList GimpDataList; + +typedef struct _GimpDataFactory GimpDataFactory; + +typedef struct _GimpContext GimpContext; + +typedef struct _GimpViewable GimpViewable; + +typedef struct _GimpToolInfo GimpToolInfo; + + +/* drawable objects */ + +typedef struct _GimpDrawable GimpDrawable; + +typedef struct _GimpChannel GimpChannel; + +typedef struct _GimpLayer GimpLayer; +typedef struct _GimpLayerMask GimpLayerMask; + +typedef struct _GimpImage GimpImage; + + +/* data objects */ + +typedef struct _GimpData GimpData; + +typedef struct _GimpBrush GimpBrush; +typedef struct _GimpBrushGenerated GimpBrushGenerated; +typedef struct _GimpBrushPipe GimpBrushPipe; + +typedef struct _GimpGradient GimpGradient; + +typedef struct _GimpPattern GimpPattern; + +typedef struct _GimpPalette GimpPalette; + + +/* undo objects */ + +typedef struct _GimpUndo GimpUndo; +typedef struct _GimpUndoStack GimpUndoStack; + + +/* functions */ + +typedef void (* GimpDataFileLoaderFunc) (const gchar *filename, + gpointer loader_data); +typedef GimpData * (* GimpDataObjectLoaderFunc) (const gchar *filename); + + +#endif /* __CORE_TYPES_H__ */ diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c index c110bb1cb3..4f95336cc9 100644 --- a/app/core/gimp-edit.c +++ b/app/core/gimp-edit.c @@ -24,7 +24,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimp-parasites.c b/app/core/gimp-parasites.c index 083b1bf039..8a2f3fc904 100644 --- a/app/core/gimp-parasites.c +++ b/app/core/gimp-parasites.c @@ -24,7 +24,7 @@ #include #endif -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "parasitelist.h" diff --git a/app/core/gimp-transform-region.c b/app/core/gimp-transform-region.c index d738a89dfa..13d62da15e 100644 --- a/app/core/gimp-transform-region.c +++ b/app/core/gimp-transform-region.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -36,6 +36,7 @@ #include "core/gimpimage-mask.h" #include "core/gimplayer.h" #include "core/gimpmarshal.h" +#include "core/gimptoolinfo.h" #include "gui/info-dialog.h" #include "cursorutil.h" @@ -52,7 +53,6 @@ #include "tile_manager.h" #include "tile.h" -#include "gimptoolinfo.h" #include "tool_manager.h" #include "tool_options.h" #include "transform_options.h" diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 472968d239..158a077caf 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -41,7 +41,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "brush_scale.h" #include "gimpbrush.h" diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 472968d239..158a077caf 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -41,7 +41,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "brush_scale.h" #include "gimpbrush.h" diff --git a/app/core/gimpbrush.h b/app/core/gimpbrush.h index 53cd8e1733..01c0e09b20 100644 --- a/app/core/gimpbrush.h +++ b/app/core/gimpbrush.h @@ -22,6 +22,9 @@ #include "gimpdata.h" +/* FIXME: remove the GimpPaintTool dependency */ +#include "tools/tools-types.h" + #define GIMP_BRUSH_FILE_EXTENSION ".gbr" #define GIMP_BRUSH_PIXMAP_FILE_EXTENSION ".gpb" diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c index 9265736f6e..94dd0ae342 100644 --- a/app/core/gimpbrushgenerated-load.c +++ b/app/core/gimpbrushgenerated-load.c @@ -32,9 +32,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpbrushgenerated.h" #include "gimprc.h" #include "gimpbrush.h" @@ -48,8 +47,9 @@ /* local function prototypes */ -static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); -static void gimp_brush_generated_init (GimpBrushGenerated *brush); +static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); +static void gimp_brush_generated_init (GimpBrushGenerated *brush); + static void gimp_brush_generated_destroy (GtkObject *object); static gboolean gimp_brush_generated_save (GimpData *data); static void gimp_brush_generated_dirty (GimpData *data); diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c index 9265736f6e..94dd0ae342 100644 --- a/app/core/gimpbrushgenerated-save.c +++ b/app/core/gimpbrushgenerated-save.c @@ -32,9 +32,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpbrushgenerated.h" #include "gimprc.h" #include "gimpbrush.h" @@ -48,8 +47,9 @@ /* local function prototypes */ -static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); -static void gimp_brush_generated_init (GimpBrushGenerated *brush); +static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); +static void gimp_brush_generated_init (GimpBrushGenerated *brush); + static void gimp_brush_generated_destroy (GtkObject *object); static gboolean gimp_brush_generated_save (GimpData *data); static void gimp_brush_generated_dirty (GimpData *data); diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c index 9265736f6e..94dd0ae342 100644 --- a/app/core/gimpbrushgenerated.c +++ b/app/core/gimpbrushgenerated.c @@ -32,9 +32,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpbrushgenerated.h" #include "gimprc.h" #include "gimpbrush.h" @@ -48,8 +47,9 @@ /* local function prototypes */ -static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); -static void gimp_brush_generated_init (GimpBrushGenerated *brush); +static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass); +static void gimp_brush_generated_init (GimpBrushGenerated *brush); + static void gimp_brush_generated_destroy (GtkObject *object); static gboolean gimp_brush_generated_save (GimpData *data); static void gimp_brush_generated_dirty (GimpData *data); diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index c70c33af1a..9b9c36cec3 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -43,9 +43,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushpipe.h" diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index c70c33af1a..9b9c36cec3 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -43,9 +43,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushpipe.h" diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c index 8640daf5e8..45e0221aeb 100644 --- a/app/core/gimpchannel-combine.c +++ b/app/core/gimpchannel-combine.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 8640daf5e8..45e0221aeb 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c index c7d9e6d3f5..1a6f004c1f 100644 --- a/app/core/gimpcontainer.c +++ b/app/core/gimpcontainer.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "gimpcontainer.h" #include "gimpmarshal.h" diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index 0dac6b382c..c0fd9a4c40 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -25,13 +25,13 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: make a GimpToolFactory out of the tool_manager and put it here */ +#include "tools/tools-types.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" -#include "context_manager.h" -#include "gdisplay.h" #include "gimpbrush.h" #include "gimpcontainer.h" #include "gimpcontext.h" @@ -41,6 +41,10 @@ #include "gimpmarshal.h" #include "gimppalette.h" #include "gimppattern.h" +#include "gimptoolinfo.h" + +#include "context_manager.h" +#include "gdisplay.h" #include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c index 5c246ce666..f36a89155a 100644 --- a/app/core/gimpdata.c +++ b/app/core/gimpdata.c @@ -31,13 +31,13 @@ #include -#include "apptypes.h" +#include "libgimp/gimpenv.h" + +#include "core-types.h" #include "gimpdata.h" #include "gimpmarshal.h" -#include "libgimp/gimpenv.h" - enum { diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c index 47abcf5d8b..b327dc2bc3 100644 --- a/app/core/gimpdatafactory.c +++ b/app/core/gimpdatafactory.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core-types.h" #include "datafiles.h" #include "gimpdata.h" @@ -157,9 +157,9 @@ gimp_data_factory_data_init (GimpDataFactory *factory, if (factory->data_path && *factory->data_path) { - datafiles_read_directories (*factory->data_path, 0, - gimp_data_factory_data_load_callback, - factory); + gimp_datafiles_read_directories (*factory->data_path, 0, + gimp_data_factory_data_load_callback, + factory); } gimp_container_thaw (factory->container); @@ -275,8 +275,8 @@ gimp_data_factory_data_load_callback (const gchar *filename, { if (factory->loader_entries[i].extension) { - if (datafiles_check_extension (filename, - factory->loader_entries[i].extension)) + if (gimp_datafiles_check_extension (filename, + factory->loader_entries[i].extension)) { goto insert; } diff --git a/app/core/gimpdatafiles.c b/app/core/gimpdatafiles.c index 674d6055e3..b87f04dfd1 100644 --- a/app/core/gimpdatafiles.c +++ b/app/core/gimpdatafiles.c @@ -45,7 +45,7 @@ #endif #endif /* G_OS_WIN32 */ -#include "apptypes.h" +#include "core/core-types.h" #include "datafiles.h" #include "gimprc.h" @@ -102,8 +102,8 @@ is_script (const gchar *filename) #endif gboolean -datafiles_check_extension (const gchar *filename, - const gchar *extension) +gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension) { gint name_len; gint ext_len; @@ -121,10 +121,10 @@ datafiles_check_extension (const gchar *filename, } void -datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data) +gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data) { gchar *local_path; GList *path; @@ -196,7 +196,7 @@ datafiles_read_directories (const gchar *path_str, } time_t -datafile_atime (void) +gimp_datafile_atime (void) { if (filestat_valid) return filestat.st_atime; @@ -205,7 +205,7 @@ datafile_atime (void) } time_t -datafile_mtime (void) +gimp_datafile_mtime (void) { if (filestat_valid) return filestat.st_mtime; @@ -214,7 +214,7 @@ datafile_mtime (void) } time_t -datafile_ctime (void) +gimp_datafile_ctime (void) { if (filestat_valid) return filestat.st_ctime; diff --git a/app/core/gimpdatafiles.h b/app/core/gimpdatafiles.h index 2a9cef4402..a05f6ed197 100644 --- a/app/core/gimpdatafiles.h +++ b/app/core/gimpdatafiles.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __DATAFILES_H__ -#define __DATAFILES_H__ +#ifndef __GIMP_DATAFILES_H__ +#define __GIMP_DATAFILES_H__ #include @@ -32,22 +32,22 @@ typedef enum } GimpDataFileFlags; -gboolean datafiles_check_extension (const gchar *filename, - const gchar *extension); +gboolean gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension); -void datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data); +void gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data); /* Return the current datafiles access, modification * or change time. The current datafile is the one for * which the "DataFileLoaderFunc" function has been called * on. */ -time_t datafile_atime (void); -time_t datafile_mtime (void); -time_t datafile_ctime (void); +time_t gimp_datafile_atime (void); +time_t gimp_datafile_mtime (void); +time_t gimp_datafile_ctime (void); -#endif /* __DATAFILES_H__ */ +#endif /* __GIMP_DATAFILES_H__ */ diff --git a/app/core/gimpdatalist.c b/app/core/gimpdatalist.c index de0ce645da..7b90e8023c 100644 --- a/app/core/gimpdatalist.c +++ b/app/core/gimpdatalist.c @@ -28,9 +28,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" -#include "appenv.h" #include "gimpdata.h" #include "gimpdatalist.h" diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c index 08ba02949c..cfd413b718 100644 --- a/app/core/gimpdrawable-blend.c +++ b/app/core/gimpdrawable-blend.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -35,11 +35,11 @@ #include "core/gimpgradient.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "appenv.h" -#include "asupsample.h" #include "cursorutil.h" #include "drawable.h" #include "errors.h" @@ -53,7 +53,6 @@ #include "tile_manager.h" #include "gimpblendtool.h" -#include "gimptoolinfo.h" #include "paint_options.h" #include "tool_manager.h" diff --git a/app/core/gimpdrawable-desaturate.c b/app/core/gimpdrawable-desaturate.c index 30c603cf37..f1bae5131f 100644 --- a/app/core/gimpdrawable-desaturate.c +++ b/app/core/gimpdrawable-desaturate.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpdrawable-equalize.c b/app/core/gimpdrawable-equalize.c index 1a1405c386..7b21347f52 100644 --- a/app/core/gimpdrawable-equalize.c +++ b/app/core/gimpdrawable-equalize.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "drawable.h" #include "gimpdrawable.h" diff --git a/app/core/gimpdrawable-invert.c b/app/core/gimpdrawable-invert.c index bb3b7e3e5b..0cf6cd724b 100644 --- a/app/core/gimpdrawable-invert.c +++ b/app/core/gimpdrawable-invert.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "drawable.h" #include "gimpdrawable.h" diff --git a/app/core/gimpdrawable-offset.c b/app/core/gimpdrawable-offset.c index 687c811d4b..0dfba1dd37 100644 --- a/app/core/gimpdrawable-offset.c +++ b/app/core/gimpdrawable-offset.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpdrawable-preview.c b/app/core/gimpdrawable-preview.c index 5b0f9fa723..e3012f366e 100644 --- a/app/core/gimpdrawable-preview.c +++ b/app/core/gimpdrawable-preview.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index d738a89dfa..13d62da15e 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -36,6 +36,7 @@ #include "core/gimpimage-mask.h" #include "core/gimplayer.h" #include "core/gimpmarshal.h" +#include "core/gimptoolinfo.h" #include "gui/info-dialog.h" #include "cursorutil.h" @@ -52,7 +53,6 @@ #include "tile_manager.h" #include "tile.h" -#include "gimptoolinfo.h" #include "tool_manager.h" #include "tool_options.h" #include "transform_options.h" diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index f54759529a..540fed51dd 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpedit.c b/app/core/gimpedit.c index c110bb1cb3..4f95336cc9 100644 --- a/app/core/gimpedit.c +++ b/app/core/gimpedit.c @@ -24,7 +24,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c index 60716b172e..259523b5b8 100644 --- a/app/core/gimpgradient.c +++ b/app/core/gimpgradient.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "errors.h" #include "gimpimage.h" diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c index 2b5e374cc2..a0e9459d1a 100644 --- a/app/core/gimpimage-convert.c +++ b/app/core/gimpimage-convert.c @@ -102,7 +102,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "cursorutil.h" #include "gdisplay.h" diff --git a/app/core/gimpimage-duplicate.c b/app/core/gimpimage-duplicate.c index 93b45d31f4..1d14d6c112 100644 --- a/app/core/gimpimage-duplicate.c +++ b/app/core/gimpimage-duplicate.c @@ -26,7 +26,10 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage-guides.c +++ b/app/core/gimpimage-guides.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-mask.c b/app/core/gimpimage-mask.c index 859a6b21cc..bee4baf24f 100644 --- a/app/core/gimpimage-mask.c +++ b/app/core/gimpimage-mask.c @@ -20,13 +20,13 @@ #include -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: move the "stroke" stuff into the core entirely */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" -#include "tools/gimptool.h" -#include "tools/gimppainttool.h" -#include "tools/paint_options.h" #include "tools/tool_manager.h" #include "gimpchannel.h" diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-pick-color.c b/app/core/gimpimage-pick-color.c index a2a378009a..ff8b425b6e 100644 --- a/app/core/gimpimage-pick-color.c +++ b/app/core/gimpimage-pick-color.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/core/gimpimage-projection.c b/app/core/gimpimage-projection.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage-projection.c +++ b/app/core/gimpimage-projection.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-qmask.c b/app/core/gimpimage-qmask.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/core/gimpimage-qmask.c +++ b/app/core/gimpimage-qmask.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/core/gimpimage-quick-mask.c +++ b/app/core/gimpimage-quick-mask.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage-resize.c +++ b/app/core/gimpimage-resize.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage-scale.c +++ b/app/core/gimpimage-scale.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c index 6b29da392b..bdd300d414 100644 --- a/app/core/gimpimage-undo-push.c +++ b/app/core/gimpimage-undo-push.c @@ -23,7 +23,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimage-undo.c b/app/core/gimpimage-undo.c index 9a70fc7096..b523eda72a 100644 --- a/app/core/gimpimage-undo.c +++ b/app/core/gimpimage-undo.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "gimpimage.h" #include "gimpimage-undo.h" diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpimagemap.c b/app/core/gimpimagemap.c index ec8fa038c8..130eb9fda8 100644 --- a/app/core/gimpimagemap.c +++ b/app/core/gimpimagemap.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimplayer-floating-sel.c b/app/core/gimplayer-floating-sel.c index f0c493eb7f..6c456e10d8 100644 --- a/app/core/gimplayer-floating-sel.c +++ b/app/core/gimplayer-floating-sel.c @@ -22,7 +22,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index 00450b955b..c16db622c1 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -27,7 +27,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimplayermask.c b/app/core/gimplayermask.c index 4d1ac64916..b031a68136 100644 --- a/app/core/gimplayermask.c +++ b/app/core/gimplayermask.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimplist.c b/app/core/gimplist.c index 06ea6a11aa..63e7b7fdd8 100644 --- a/app/core/gimplist.c +++ b/app/core/gimplist.c @@ -25,9 +25,8 @@ #include -#include "apptypes.h" +#include "core-types.h" -#include "gimpcontainer.h" #include "gimplist.h" diff --git a/app/core/gimpobject.c b/app/core/gimpobject.c index 25a64682c2..0fe4eca433 100644 --- a/app/core/gimpobject.c +++ b/app/core/gimpobject.c @@ -22,7 +22,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "gimpobject.h" diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c index 5f13a3547f..59b26935c8 100644 --- a/app/core/gimppalette-import.c +++ b/app/core/gimppalette-import.c @@ -24,12 +24,13 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core-types.h" #include "gimpcontainer.h" #include "gimpgradient.h" #include "gimpimage.h" #include "gimppalette.h" + #include "pixel_region.h" #include "temp_buf.h" diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index 20387910e9..a8d11e3ee2 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -28,15 +28,15 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core-types.h" #include "gimppalette.h" + #include "gimprc.h" #include "temp_buf.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index 20387910e9..a8d11e3ee2 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -28,15 +28,15 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core-types.h" #include "gimppalette.h" + #include "gimprc.h" #include "temp_buf.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index 20387910e9..a8d11e3ee2 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -28,15 +28,15 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core-types.h" #include "gimppalette.h" + #include "gimprc.h" #include "temp_buf.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimpparasite.c b/app/core/gimpparasite.c index 083b1bf039..8a2f3fc904 100644 --- a/app/core/gimpparasite.c +++ b/app/core/gimpparasite.c @@ -24,7 +24,7 @@ #include #endif -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "parasitelist.h" diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c index cc5f5739be..9cc89774a8 100644 --- a/app/core/gimpparasitelist.c +++ b/app/core/gimpparasitelist.c @@ -21,7 +21,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "parasitelist.h" diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c index 72ec9aa586..f31de287e6 100644 --- a/app/core/gimppattern-load.c +++ b/app/core/gimppattern-load.c @@ -40,11 +40,12 @@ #define _O_BINARY 0 #endif -#include "apptypes.h" +#include "core-types.h" #include "gimpimage.h" #include "gimppattern.h" #include "gimppattern-header.h" + #include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c index 72ec9aa586..f31de287e6 100644 --- a/app/core/gimppattern.c +++ b/app/core/gimppattern.c @@ -40,11 +40,12 @@ #define _O_BINARY 0 #endif -#include "apptypes.h" +#include "core-types.h" #include "gimpimage.h" #include "gimppattern.h" #include "gimppattern-header.h" + #include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimpprojection-construct.c b/app/core/gimpprojection-construct.c index c0959e7a41..c037beb6ec 100644 --- a/app/core/gimpprojection-construct.c +++ b/app/core/gimpprojection-construct.c @@ -25,7 +25,10 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core-types.h" + +/* FIXME: remove the Path <-> BezierSelect dependency */ +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c index febb18b936..d0a38aa228 100644 --- a/app/core/gimpprojection.c +++ b/app/core/gimpprojection.c @@ -25,7 +25,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpchannel.h" #include "core/gimpcontainer.h" diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c index e303602cc8..513dc4c165 100644 --- a/app/core/gimpscanconvert.c +++ b/app/core/gimpscanconvert.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c index dd84e3194a..ff8b538bd5 100644 --- a/app/core/gimptoolinfo.c +++ b/app/core/gimptoolinfo.c @@ -20,15 +20,17 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" -#include "core/gimpcontext.h" +#include "gimpcontext.h" +#include "gimptoolinfo.h" #include "context_manager.h" -#include "gimptoolinfo.h" #include "temp_buf.h" -#include "gimprectselecttool.h" +/* GRMPF */ +#include "tools/gimprectselecttool.h" static void gimp_tool_info_class_init (GimpToolInfoClass *klass); diff --git a/app/core/gimpundo.c b/app/core/gimpundo.c index 78560b07ac..e74d74404b 100644 --- a/app/core/gimpundo.c +++ b/app/core/gimpundo.c @@ -20,11 +20,12 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "gimpimage.h" -#include "gimprc.h" #include "gimpundo.h" + +#include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimpundostack.c b/app/core/gimpundostack.c index 00e5c18625..be01200fa5 100644 --- a/app/core/gimpundostack.c +++ b/app/core/gimpundostack.c @@ -20,9 +20,8 @@ #include -#include "apptypes.h" +#include "core-types.h" -#include "gimpcontainer.h" #include "gimpimage.h" #include "gimplist.h" #include "gimpundo.h" @@ -48,7 +47,8 @@ gimp_undo_stack_get_type (void) { static GtkType undo_stack_type = 0; - if (! undo_stack_type) { + if (! undo_stack_type) + { static const GtkTypeInfo undo_stack_info = { "GimpUndoStack", @@ -63,7 +63,7 @@ gimp_undo_stack_get_type (void) undo_stack_type = gtk_type_unique (GIMP_TYPE_UNDO, &undo_stack_info); - } + } return undo_stack_type; } diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c index 67dfa84239..5c5439042d 100644 --- a/app/core/gimpviewable.c +++ b/app/core/gimpviewable.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core-types.h" #include "gimpmarshal.h" #include "gimpviewable.h" diff --git a/app/cursorutil.c b/app/cursorutil.c index 3f58e33bf9..9210fbc6ac 100644 --- a/app/cursorutil.c +++ b/app/cursorutil.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "cursorutil.h" diff --git a/app/datafiles.c b/app/datafiles.c index 674d6055e3..b87f04dfd1 100644 --- a/app/datafiles.c +++ b/app/datafiles.c @@ -45,7 +45,7 @@ #endif #endif /* G_OS_WIN32 */ -#include "apptypes.h" +#include "core/core-types.h" #include "datafiles.h" #include "gimprc.h" @@ -102,8 +102,8 @@ is_script (const gchar *filename) #endif gboolean -datafiles_check_extension (const gchar *filename, - const gchar *extension) +gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension) { gint name_len; gint ext_len; @@ -121,10 +121,10 @@ datafiles_check_extension (const gchar *filename, } void -datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data) +gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data) { gchar *local_path; GList *path; @@ -196,7 +196,7 @@ datafiles_read_directories (const gchar *path_str, } time_t -datafile_atime (void) +gimp_datafile_atime (void) { if (filestat_valid) return filestat.st_atime; @@ -205,7 +205,7 @@ datafile_atime (void) } time_t -datafile_mtime (void) +gimp_datafile_mtime (void) { if (filestat_valid) return filestat.st_mtime; @@ -214,7 +214,7 @@ datafile_mtime (void) } time_t -datafile_ctime (void) +gimp_datafile_ctime (void) { if (filestat_valid) return filestat.st_ctime; diff --git a/app/datafiles.h b/app/datafiles.h index 2a9cef4402..a05f6ed197 100644 --- a/app/datafiles.h +++ b/app/datafiles.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __DATAFILES_H__ -#define __DATAFILES_H__ +#ifndef __GIMP_DATAFILES_H__ +#define __GIMP_DATAFILES_H__ #include @@ -32,22 +32,22 @@ typedef enum } GimpDataFileFlags; -gboolean datafiles_check_extension (const gchar *filename, - const gchar *extension); +gboolean gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension); -void datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data); +void gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data); /* Return the current datafiles access, modification * or change time. The current datafile is the one for * which the "DataFileLoaderFunc" function has been called * on. */ -time_t datafile_atime (void); -time_t datafile_mtime (void); -time_t datafile_ctime (void); +time_t gimp_datafile_atime (void); +time_t gimp_datafile_mtime (void); +time_t gimp_datafile_ctime (void); -#endif /* __DATAFILES_H__ */ +#endif /* __GIMP_DATAFILES_H__ */ diff --git a/app/devices.c b/app/devices.c index 001918b108..59fe39328d 100644 --- a/app/devices.c +++ b/app/devices.c @@ -35,11 +35,11 @@ #include "core/gimpdatafactory.h" #include "core/gimpgradient.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "appenv.h" diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index 0313008bb5..f55cfb48b8 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -31,9 +31,9 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index 5869e7f124..a65c87449b 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -22,7 +22,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpdatafactory.h" #include "core/gimpimage.h" diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c index 0658f6e869..39ec5ea11c 100644 --- a/app/dialogs/dialogs-constructors.c +++ b/app/dialogs/dialogs-constructors.c @@ -32,6 +32,7 @@ #include "core/gimpgradient.h" #include "core/gimpimage.h" #include "core/gimplayer.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpcontainerlistview.h" #include "widgets/gimpcontainergridview.h" @@ -44,7 +45,6 @@ #include "widgets/gimplistitem.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "tools/tool_options_dialog.h" diff --git a/app/dialogs/file-dialog-utils.c b/app/dialogs/file-dialog-utils.c index ad4d67c16d..7f73c0c2b5 100644 --- a/app/dialogs/file-dialog-utils.c +++ b/app/dialogs/file-dialog-utils.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay.h" #include "gimpui.h" diff --git a/app/dialogs/file-open-dialog.c b/app/dialogs/file-open-dialog.c index 6927ee47fe..69ecf6bb27 100644 --- a/app/dialogs/file-open-dialog.c +++ b/app/dialogs/file-open-dialog.c @@ -38,7 +38,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontext.h" #include "core/gimpimage.h" diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c index ba5eeac338..a2e83d987f 100644 --- a/app/dialogs/file-save-dialog.c +++ b/app/dialogs/file-save-dialog.c @@ -32,7 +32,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index a953f01b12..71a9713b06 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -24,7 +24,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "file-new-dialog.h" #include "gdisplay.h" diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index 752b818447..fafb7bf70f 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -22,7 +22,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontainer.h" diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index 0a65a4f99a..4df3276446 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -35,7 +35,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimplist.h" @@ -217,8 +217,8 @@ module_db_init (void) modules = gimp_list_new (MODULE_INFO_TYPE, GIMP_CONTAINER_POLICY_WEAK); if (g_module_supported ()) - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); #ifdef DUMP_DB gimp_container_foreach (modules, print_module_info, NULL); #endif @@ -1135,8 +1135,8 @@ browser_refresh_callback (GtkWidget *widget, kill_list = NULL; /* walk filesystem and add new things we find */ - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); } diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 4ca68cc26f..d5646391ad 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpdrawable-offset.h" diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index e3b7bdb387..3528e042dd 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" @@ -49,6 +49,7 @@ #define IMPORT_PREVIEW_WIDTH 80 #define IMPORT_PREVIEW_HEIGHT 80 + typedef enum { GRAD_IMPORT = 0, diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index e9cde275d1..75df1e2813 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -26,7 +26,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpimage.h" diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index e9b5a4d258..1e4969cba8 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimplayer.h" diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c index 31b2856f3c..66cfce8933 100644 --- a/app/dialogs/resolution-calibrate-dialog.c +++ b/app/dialogs/resolution-calibrate-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay_ops.h" #include "gimprc.h" diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index c9e1699eb2..21ce3064e9 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -33,7 +33,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "gdisplay_ops.h" diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c index 75999ae078..c5aad52619 100644 --- a/app/disp_callbacks.c +++ b/app/disp_callbacks.c @@ -25,7 +25,8 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -33,11 +34,11 @@ #include "core/gimpimage.h" #include "core/gimplayer.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "tools/gimpbucketfilltool.h" #include "tools/gimpfuzzyselecttool.h" #include "tools/gimpmovetool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "cursorutil.h" diff --git a/app/display/gimpdisplay-callbacks.c b/app/display/gimpdisplay-callbacks.c index 75999ae078..c5aad52619 100644 --- a/app/display/gimpdisplay-callbacks.c +++ b/app/display/gimpdisplay-callbacks.c @@ -25,7 +25,8 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -33,11 +34,11 @@ #include "core/gimpimage.h" #include "core/gimplayer.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "tools/gimpbucketfilltool.h" #include "tools/gimpfuzzyselecttool.h" #include "tools/gimpmovetool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "cursorutil.h" diff --git a/app/display/gimpdisplay-ops.c b/app/display/gimpdisplay-ops.c index 9b438d108c..13010b5201 100644 --- a/app/display/gimpdisplay-ops.c +++ b/app/display/gimpdisplay-ops.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/display/gimpdisplay-render.c b/app/display/gimpdisplay-render.c index 7cce7b6ff3..2a1cd4da67 100644 --- a/app/display/gimpdisplay-render.c +++ b/app/display/gimpdisplay-render.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/display/gimpdisplay-scale.c b/app/display/gimpdisplay-scale.c index 7bf4e81cd1..08849d42b3 100644 --- a/app/display/gimpdisplay-scale.c +++ b/app/display/gimpdisplay-scale.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpimage.h" diff --git a/app/display/gimpdisplay-scroll.c b/app/display/gimpdisplay-scroll.c index d500c9f77d..f74aa23275 100644 --- a/app/display/gimpdisplay-scroll.c +++ b/app/display/gimpdisplay-scroll.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "tools/gimptool.h" #include "tools/tool_manager.h" diff --git a/app/display/gimpdisplay-selection.c b/app/display/gimpdisplay-selection.c index dea240d671..d2a363d7a7 100644 --- a/app/display/gimpdisplay-selection.c +++ b/app/display/gimpdisplay-selection.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index febb18b936..d0a38aa228 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -25,7 +25,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpchannel.h" #include "core/gimpcontainer.h" diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 75999ae078..c5aad52619 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -25,7 +25,8 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -33,11 +34,11 @@ #include "core/gimpimage.h" #include "core/gimplayer.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "tools/gimpbucketfilltool.h" #include "tools/gimpfuzzyselecttool.h" #include "tools/gimpmovetool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "cursorutil.h" diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index b0d84a1463..eae64f437c 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimppattern.h" diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c index f89c9b736b..e5d0109013 100644 --- a/app/display/gimpdisplayshell-layer-select.c +++ b/app/display/gimpdisplayshell-layer-select.c @@ -21,7 +21,7 @@ #include #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimplayer.h" diff --git a/app/display/gimpdisplayshell-qmask.c b/app/display/gimpdisplayshell-qmask.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/display/gimpdisplayshell-qmask.c +++ b/app/display/gimpdisplayshell-qmask.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c index 7cce7b6ff3..2a1cd4da67 100644 --- a/app/display/gimpdisplayshell-render.c +++ b/app/display/gimpdisplayshell-render.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index 7bf4e81cd1..08849d42b3 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpimage.h" diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c index d500c9f77d..f74aa23275 100644 --- a/app/display/gimpdisplayshell-scroll.c +++ b/app/display/gimpdisplayshell-scroll.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "tools/gimptool.h" #include "tools/tool_manager.h" diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c index dea240d671..d2a363d7a7 100644 --- a/app/display/gimpdisplayshell-selection.c +++ b/app/display/gimpdisplayshell-selection.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index b0d84a1463..eae64f437c 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimppattern.h" diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c index e6c5bc2ba3..54f8814c5c 100644 --- a/app/display/gimpnavigationeditor.c +++ b/app/display/gimpnavigationeditor.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" diff --git a/app/display/gimpnavigationview.c b/app/display/gimpnavigationview.c index e6c5bc2ba3..54f8814c5c 100644 --- a/app/display/gimpnavigationview.c +++ b/app/display/gimpnavigationview.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" diff --git a/app/display/gimpprogress.c b/app/display/gimpprogress.c index 1a4f7c8c86..07cf3aa297 100644 --- a/app/display/gimpprogress.c +++ b/app/display/gimpprogress.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay.h" #include "gimpprogress.h" diff --git a/app/display/gximage.c b/app/display/gximage.c index 90ee99fbc2..eef2e93a63 100644 --- a/app/display/gximage.c +++ b/app/display/gximage.c @@ -20,13 +20,13 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "colormaps.h" -#include "gimage.h" #include "gximage.h" + typedef struct _GXImage GXImage; struct _GXImage diff --git a/app/docindex.c b/app/docindex.c index d56b5d13d3..8ce044f838 100644 --- a/app/docindex.c +++ b/app/docindex.c @@ -24,7 +24,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpobject.h" diff --git a/app/drawable.c b/app/drawable.c index afeef39425..7e9108b306 100644 --- a/app/drawable.c +++ b/app/drawable.c @@ -22,7 +22,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpcontext.h" diff --git a/app/file-open.c b/app/file-open.c index 85e1ac8b9b..98efe53aae 100644 --- a/app/file-open.c +++ b/app/file-open.c @@ -57,7 +57,7 @@ #define getegid() 0 #endif -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/file-save.c b/app/file-save.c index cfe7137365..d87b2c6481 100644 --- a/app/file-save.c +++ b/app/file-save.c @@ -57,14 +57,14 @@ #define getegid() 0 #endif -#include "apptypes.h" - -#include "docindex.h" -#include "gui/menus.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" +#include "docindex.h" +#include "gui/menus.h" + #include "gimprc.h" #include "file-save.h" #include "file-utils.h" diff --git a/app/file-utils.c b/app/file-utils.c index e55d17509c..5ba5996778 100644 --- a/app/file-utils.c +++ b/app/file-utils.c @@ -42,7 +42,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/file/file-open.c b/app/file/file-open.c index 85e1ac8b9b..98efe53aae 100644 --- a/app/file/file-open.c +++ b/app/file/file-open.c @@ -57,7 +57,7 @@ #define getegid() 0 #endif -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/file/file-save.c b/app/file/file-save.c index cfe7137365..d87b2c6481 100644 --- a/app/file/file-save.c +++ b/app/file/file-save.c @@ -57,14 +57,14 @@ #define getegid() 0 #endif -#include "apptypes.h" - -#include "docindex.h" -#include "gui/menus.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" +#include "docindex.h" +#include "gui/menus.h" + #include "gimprc.h" #include "file-save.h" #include "file-utils.h" diff --git a/app/file/file-utils.c b/app/file/file-utils.c index e55d17509c..5ba5996778 100644 --- a/app/file/file-utils.c +++ b/app/file/file-utils.c @@ -42,7 +42,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/floating_sel.c b/app/floating_sel.c index f0c493eb7f..6c456e10d8 100644 --- a/app/floating_sel.c +++ b/app/floating_sel.c @@ -22,7 +22,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/gdisplay.c b/app/gdisplay.c index febb18b936..d0a38aa228 100644 --- a/app/gdisplay.c +++ b/app/gdisplay.c @@ -25,7 +25,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpchannel.h" #include "core/gimpcontainer.h" diff --git a/app/gdisplay_ops.c b/app/gdisplay_ops.c index 9b438d108c..13010b5201 100644 --- a/app/gdisplay_ops.c +++ b/app/gdisplay_ops.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/gimage.c b/app/gimage.c index d87133fdaf..a35067cd08 100644 --- a/app/gimage.c +++ b/app/gimage.c @@ -20,7 +20,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/gimphistogram.c b/app/gimphistogram.c index 47c1069e21..0dab16f1ed 100644 --- a/app/gimphistogram.c +++ b/app/gimphistogram.c @@ -29,7 +29,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/gimpparasite.c b/app/gimpparasite.c index 083b1bf039..8a2f3fc904 100644 --- a/app/gimpparasite.c +++ b/app/gimpparasite.c @@ -24,7 +24,7 @@ #include #endif -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "parasitelist.h" diff --git a/app/gimpprogress.c b/app/gimpprogress.c index 1a4f7c8c86..07cf3aa297 100644 --- a/app/gimpprogress.c +++ b/app/gimpprogress.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay.h" #include "gimpprogress.h" diff --git a/app/gimprc.c b/app/gimprc.c index 3e7c19f37f..66438676ac 100644 --- a/app/gimprc.c +++ b/app/gimprc.c @@ -35,11 +35,13 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" +#include "core/gimptoolinfo.h" + #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "widgets/gimpdialogfactory.h" diff --git a/app/global_edit.c b/app/global_edit.c index c110bb1cb3..4f95336cc9 100644 --- a/app/global_edit.c +++ b/app/global_edit.c @@ -24,7 +24,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c index 0313008bb5..f55cfb48b8 100644 --- a/app/gui/about-dialog.c +++ b/app/gui/about-dialog.c @@ -31,9 +31,9 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" diff --git a/app/gui/brush-editor.c b/app/gui/brush-editor.c index e195c9b8aa..65b86266d7 100644 --- a/app/gui/brush-editor.c +++ b/app/gui/brush-editor.c @@ -28,7 +28,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpbrushgenerated.h" diff --git a/app/gui/channels-commands.c b/app/gui/channels-commands.c index 73a964ad0f..477634b3b9 100644 --- a/app/gui/channels-commands.c +++ b/app/gui/channels-commands.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/gui/color-area.c b/app/gui/color-area.c index a921d2a9d6..5d0455c641 100644 --- a/app/gui/color-area.c +++ b/app/gui/color-area.c @@ -28,7 +28,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontext.h" diff --git a/app/gui/color-select.c b/app/gui/color-select.c index 9aed928add..8b10628cd2 100644 --- a/app/gui/color-select.c +++ b/app/gui/color-select.c @@ -29,7 +29,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimpcolorselector.h" -#include "apptypes.h" +#include "core/core-types.h" #include "widgets/gimpdnd.h" diff --git a/app/gui/colormap-dialog.c b/app/gui/colormap-dialog.c index 169fd858d8..81be237bc7 100644 --- a/app/gui/colormap-dialog.c +++ b/app/gui/colormap-dialog.c @@ -29,7 +29,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpimage.h" diff --git a/app/gui/commands.c b/app/gui/commands.c index e2af214ced..0d7a8f2af8 100644 --- a/app/gui/commands.c +++ b/app/gui/commands.c @@ -27,7 +27,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" @@ -36,9 +37,9 @@ #include "core/gimpimage.h" #include "core/gimpimage-duplicate.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "commands.h" diff --git a/app/gui/convert-dialog.c b/app/gui/convert-dialog.c index 5869e7f124..a65c87449b 100644 --- a/app/gui/convert-dialog.c +++ b/app/gui/convert-dialog.c @@ -22,7 +22,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpdatafactory.h" #include "core/gimpimage.h" diff --git a/app/gui/device-status-dialog.c b/app/gui/device-status-dialog.c index 001918b108..59fe39328d 100644 --- a/app/gui/device-status-dialog.c +++ b/app/gui/device-status-dialog.c @@ -35,11 +35,11 @@ #include "core/gimpdatafactory.h" #include "core/gimpgradient.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "appenv.h" diff --git a/app/gui/dialogs-constructors.c b/app/gui/dialogs-constructors.c index 0658f6e869..39ec5ea11c 100644 --- a/app/gui/dialogs-constructors.c +++ b/app/gui/dialogs-constructors.c @@ -32,6 +32,7 @@ #include "core/gimpgradient.h" #include "core/gimpimage.h" #include "core/gimplayer.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpcontainerlistview.h" #include "widgets/gimpcontainergridview.h" @@ -44,7 +45,6 @@ #include "widgets/gimplistitem.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "tools/tool_options_dialog.h" diff --git a/app/gui/file-dialog-utils.c b/app/gui/file-dialog-utils.c index ad4d67c16d..7f73c0c2b5 100644 --- a/app/gui/file-dialog-utils.c +++ b/app/gui/file-dialog-utils.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay.h" #include "gimpui.h" diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c index a953f01b12..71a9713b06 100644 --- a/app/gui/file-new-dialog.c +++ b/app/gui/file-new-dialog.c @@ -24,7 +24,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "file-new-dialog.h" #include "gdisplay.h" diff --git a/app/gui/file-open-dialog.c b/app/gui/file-open-dialog.c index 6927ee47fe..69ecf6bb27 100644 --- a/app/gui/file-open-dialog.c +++ b/app/gui/file-open-dialog.c @@ -38,7 +38,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontext.h" #include "core/gimpimage.h" diff --git a/app/gui/file-save-dialog.c b/app/gui/file-save-dialog.c index ba5eeac338..a2e83d987f 100644 --- a/app/gui/file-save-dialog.c +++ b/app/gui/file-save-dialog.c @@ -32,7 +32,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index 766ec9e15f..9787f61a88 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -63,7 +63,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" diff --git a/app/gui/help-commands.c b/app/gui/help-commands.c index e2af214ced..0d7a8f2af8 100644 --- a/app/gui/help-commands.c +++ b/app/gui/help-commands.c @@ -27,7 +27,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" @@ -36,9 +37,9 @@ #include "core/gimpimage.h" #include "core/gimpimage-duplicate.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "commands.h" diff --git a/app/gui/info-window.c b/app/gui/info-window.c index 752b818447..fafb7bf70f 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -22,7 +22,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontainer.h" diff --git a/app/gui/input-dialog.c b/app/gui/input-dialog.c index 001918b108..59fe39328d 100644 --- a/app/gui/input-dialog.c +++ b/app/gui/input-dialog.c @@ -35,11 +35,11 @@ #include "core/gimpdatafactory.h" #include "core/gimpgradient.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "appenv.h" diff --git a/app/gui/layer-select.c b/app/gui/layer-select.c index f89c9b736b..e5d0109013 100644 --- a/app/gui/layer-select.c +++ b/app/gui/layer-select.c @@ -21,7 +21,7 @@ #include #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimplayer.h" diff --git a/app/gui/layers-commands.c b/app/gui/layers-commands.c index 001b618163..40bb9bfb01 100644 --- a/app/gui/layers-commands.c +++ b/app/gui/layers-commands.c @@ -26,7 +26,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/gui/menus.c b/app/gui/menus.c index fbedaa03ce..cb7d0452b2 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -27,11 +27,12 @@ #include "libgimp/gimpenv.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "channels-commands.h" diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index 0a65a4f99a..4df3276446 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -35,7 +35,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimplist.h" @@ -217,8 +217,8 @@ module_db_init (void) modules = gimp_list_new (MODULE_INFO_TYPE, GIMP_CONTAINER_POLICY_WEAK); if (g_module_supported ()) - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); #ifdef DUMP_DB gimp_container_foreach (modules, print_module_info, NULL); #endif @@ -1135,8 +1135,8 @@ browser_refresh_callback (GtkWidget *widget, kill_list = NULL; /* walk filesystem and add new things we find */ - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); } diff --git a/app/gui/offset-dialog.c b/app/gui/offset-dialog.c index 4ca68cc26f..d5646391ad 100644 --- a/app/gui/offset-dialog.c +++ b/app/gui/offset-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpdrawable.h" #include "core/gimpdrawable-offset.h" diff --git a/app/gui/palette-import-dialog.c b/app/gui/palette-import-dialog.c index e3b7bdb387..3528e042dd 100644 --- a/app/gui/palette-import-dialog.c +++ b/app/gui/palette-import-dialog.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" @@ -49,6 +49,7 @@ #define IMPORT_PREVIEW_WIDTH 80 #define IMPORT_PREVIEW_HEIGHT 80 + typedef enum { GRAD_IMPORT = 0, diff --git a/app/gui/paths-dialog.c b/app/gui/paths-dialog.c index bfa3df1b49..819eb1a18a 100644 --- a/app/gui/paths-dialog.c +++ b/app/gui/paths-dialog.c @@ -30,7 +30,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index e9cde275d1..75df1e2813 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -26,7 +26,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpimage.h" diff --git a/app/gui/qmask-commands.c b/app/gui/qmask-commands.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/gui/qmask-commands.c +++ b/app/gui/qmask-commands.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/gui/resize-dialog.c b/app/gui/resize-dialog.c index e9b5a4d258..1e4969cba8 100644 --- a/app/gui/resize-dialog.c +++ b/app/gui/resize-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimplayer.h" diff --git a/app/gui/resolution-calibrate-dialog.c b/app/gui/resolution-calibrate-dialog.c index 31b2856f3c..66cfce8933 100644 --- a/app/gui/resolution-calibrate-dialog.c +++ b/app/gui/resolution-calibrate-dialog.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay_ops.h" #include "gimprc.h" diff --git a/app/gui/test-commands.c b/app/gui/test-commands.c index d8894a2ebc..af6feb9b84 100644 --- a/app/gui/test-commands.c +++ b/app/gui/test-commands.c @@ -23,7 +23,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpchannel.h" diff --git a/app/gui/tool-options-dialog.c b/app/gui/tool-options-dialog.c index 1447b2a634..83bea6e238 100644 --- a/app/gui/tool-options-dialog.c +++ b/app/gui/tool-options-dialog.c @@ -22,11 +22,12 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontext.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" @@ -35,7 +36,6 @@ #include "gimpui.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "tool_options.h" #include "tool_options_dialog.h" #include "tool_manager.h" diff --git a/app/gui/toolbox.c b/app/gui/toolbox.c index e0dd56f725..4336eb07b2 100644 --- a/app/gui/toolbox.c +++ b/app/gui/toolbox.c @@ -24,7 +24,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "paint-funcs/paint-funcs.h" @@ -34,13 +35,13 @@ #include "core/gimplayer.h" #include "core/gimplayermask.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdialogfactory.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" #include "widgets/gtkhwrapbox.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "color-area.h" diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index c9e1699eb2..21ce3064e9 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -33,7 +33,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "gdisplay_ops.h" diff --git a/app/gximage.c b/app/gximage.c index 90ee99fbc2..eef2e93a63 100644 --- a/app/gximage.c +++ b/app/gximage.c @@ -20,13 +20,13 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "colormaps.h" -#include "gimage.h" #include "gximage.h" + typedef struct _GXImage GXImage; struct _GXImage diff --git a/app/image_map.c b/app/image_map.c index ec8fa038c8..130eb9fda8 100644 --- a/app/image_map.c +++ b/app/image_map.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/image_new.c b/app/image_new.c index af1c9d0843..96535cd068 100644 --- a/app/image_new.c +++ b/app/image_new.c @@ -22,7 +22,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" diff --git a/app/image_render.c b/app/image_render.c index 7cce7b6ff3..2a1cd4da67 100644 --- a/app/image_render.c +++ b/app/image_render.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/interface.c b/app/interface.c index b0d84a1463..eae64f437c 100644 --- a/app/interface.c +++ b/app/interface.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimppattern.h" diff --git a/app/lc_dialog.c b/app/lc_dialog.c index 173430dfde..ef58df021b 100644 --- a/app/lc_dialog.c +++ b/app/lc_dialog.c @@ -23,7 +23,8 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontainer.h" diff --git a/app/libgimp_glue.c b/app/libgimp_glue.c index 25d7817ded..2f9896e15f 100644 --- a/app/libgimp_glue.c +++ b/app/libgimp_glue.c @@ -22,7 +22,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontext.h" diff --git a/app/lut_funcs.c b/app/lut_funcs.c index f9649287c8..0a5d07704a 100644 --- a/app/lut_funcs.c +++ b/app/lut_funcs.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gimplut.h" #include "gimphistogram.h" diff --git a/app/menus/menus.c b/app/menus/menus.c index fbedaa03ce..cb7d0452b2 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -27,11 +27,12 @@ #include "libgimp/gimpenv.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "channels-commands.h" diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/module_db.c b/app/module_db.c index 0a65a4f99a..4df3276446 100644 --- a/app/module_db.c +++ b/app/module_db.c @@ -35,7 +35,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimplist.h" @@ -217,8 +217,8 @@ module_db_init (void) modules = gimp_list_new (MODULE_INFO_TYPE, GIMP_CONTAINER_POLICY_WEAK); if (g_module_supported ()) - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); #ifdef DUMP_DB gimp_container_foreach (modules, print_module_info, NULL); #endif @@ -1135,8 +1135,8 @@ browser_refresh_callback (GtkWidget *widget, kill_list = NULL; /* walk filesystem and add new things we find */ - datafiles_read_directories (module_path, 0 /* no flags */, - module_initialize, NULL); + gimp_datafiles_read_directories (module_path, 0 /* no flags */, + module_initialize, NULL); } diff --git a/app/nav_window.c b/app/nav_window.c index e6c5bc2ba3..54f8814c5c 100644 --- a/app/nav_window.c +++ b/app/nav_window.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c index 282c580fc0..71b2a717f6 100644 --- a/app/paint-funcs/paint-funcs.c +++ b/app/paint-funcs/paint-funcs.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs.h" diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c index ca34e61de5..eaf6906b23 100644 --- a/app/paint/gimpairbrush.c +++ b/app/paint/gimpairbrush.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c index 3cf93a35e9..d83fa72dfc 100644 --- a/app/paint/gimpclone.c +++ b/app/paint/gimpclone.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c index d2cc810ddb..88cb9d5f86 100644 --- a/app/paint/gimpconvolve.c +++ b/app/paint/gimpconvolve.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpbrush.h" #include "core/gimpcontext.h" diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c index 96a56dca7a..02567028e5 100644 --- a/app/paint/gimpdodgeburn.c +++ b/app/paint/gimpdodgeburn.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c index 620e49ea1a..d02279922e 100644 --- a/app/paint/gimperaser.c +++ b/app/paint/gimperaser.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index b8a5980f79..4d9c2960ff 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c index 99d9f7392e..523719c460 100644 --- a/app/paint/gimppaintbrush.c +++ b/app/paint/gimppaintbrush.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c index d0924b50bd..0643662f77 100644 --- a/app/paint/gimppaintcore.c +++ b/app/paint/gimppaintcore.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimppencil.c b/app/paint/gimppencil.c index 5dec740b17..2c2b883909 100644 --- a/app/paint/gimppencil.c +++ b/app/paint/gimppencil.c @@ -22,7 +22,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c index f277f8a676..d716cc98da 100644 --- a/app/paint/gimpsmudge.c +++ b/app/paint/gimpsmudge.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c index 3cf93a35e9..d83fa72dfc 100644 --- a/app/paint/gimpsourcecore.c +++ b/app/paint/gimpsourcecore.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/parasitelist.c b/app/parasitelist.c index cc5f5739be..9cc89774a8 100644 --- a/app/parasitelist.c +++ b/app/parasitelist.c @@ -21,7 +21,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "parasitelist.h" diff --git a/app/path.c b/app/path.c index 721601c34c..5581949dfa 100644 --- a/app/path.c +++ b/app/path.c @@ -26,7 +26,8 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpimage.h" diff --git a/app/path_bezier.c b/app/path_bezier.c index 7d8c9f6927..60956bd73a 100644 --- a/app/path_bezier.c +++ b/app/path_bezier.c @@ -17,14 +17,19 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include "config.h" + +#include + +#include "libgimpmath/gimpmath.h" + +#include "core/core-types.h" +#include "tools/tools-types.h" -#include -#include -#include "apptypes.h" #include "path_curves.h" #include "path_bezier.h" + #define HANDLE_HALFWIDTH 3 #define HANDLE_WIDTH 6 diff --git a/app/path_curves.c b/app/path_curves.c index 60f6315d8a..ff60f72a47 100644 --- a/app/path_curves.c +++ b/app/path_curves.c @@ -17,15 +17,21 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include "apptypes.h" +#include "config.h" + +#include + +#include "libgimpmath/gimpmath.h" + +#include "core/core-types.h" +#include "tools/tools-types.h" + #include "path_curves.h" #include "path_bezier.h" #include "tools/gimpdrawtool.h" + /* only here temporarily */ PathSegment * path_split_segment (PathSegment *, gdouble); diff --git a/app/pdb/brush_select_cmds.c b/app/pdb/brush_select_cmds.c index af78f1a220..512f9e2ecf 100644 --- a/app/pdb/brush_select_cmds.c +++ b/app/pdb/brush_select_cmds.c @@ -24,9 +24,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "context_manager.h" #include "core/gimpbrush.h" #include "core/gimpcontext.h" diff --git a/app/pdb/brushes_cmds.c b/app/pdb/brushes_cmds.c index f9eee7a3e9..f6f60125d0 100644 --- a/app/pdb/brushes_cmds.c +++ b/app/pdb/brushes_cmds.c @@ -24,9 +24,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "context_manager.h" #include "core/gimpbrush.h" #include "core/gimpcontext.h" diff --git a/app/pdb/channel_cmds.c b/app/pdb/channel_cmds.c index dfde1a874f..cadd63e526 100644 --- a/app/pdb/channel_cmds.c +++ b/app/pdb/channel_cmds.c @@ -23,9 +23,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" #include "drawable.h" diff --git a/app/pdb/color_cmds.c b/app/pdb/color_cmds.c index 3c2f3a1dd0..54c3dce4b9 100644 --- a/app/pdb/color_cmds.c +++ b/app/pdb/color_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "core/gimpdrawable-desaturate.h" diff --git a/app/pdb/convert_cmds.c b/app/pdb/convert_cmds.c index 45402eb800..c5d9216047 100644 --- a/app/pdb/convert_cmds.c +++ b/app/pdb/convert_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/display_cmds.c b/app/pdb/display_cmds.c index 2c0a55ea6f..52c063dc5a 100644 --- a/app/pdb/display_cmds.c +++ b/app/pdb/display_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "core/gimpimage.h" diff --git a/app/pdb/drawable_cmds.c b/app/pdb/drawable_cmds.c index 370eda1024..6d90584432 100644 --- a/app/pdb/drawable_cmds.c +++ b/app/pdb/drawable_cmds.c @@ -24,9 +24,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpchannel.h" #include "core/gimpdrawable-offset.h" #include "core/gimpdrawable.h" diff --git a/app/pdb/edit_cmds.c b/app/pdb/edit_cmds.c index 8aa8c4e832..2c7b81853e 100644 --- a/app/pdb/edit_cmds.c +++ b/app/pdb/edit_cmds.c @@ -23,9 +23,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpimage-mask.h" #include "core/gimplayer.h" #include "drawable.h" diff --git a/app/pdb/fileops_cmds.c b/app/pdb/fileops_cmds.c index 28b6007fe8..9586b71b63 100644 --- a/app/pdb/fileops_cmds.c +++ b/app/pdb/fileops_cmds.c @@ -36,7 +36,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "core/gimpimage.h" diff --git a/app/pdb/floating_sel_cmds.c b/app/pdb/floating_sel_cmds.c index 8e6288ed72..76c3d18d4b 100644 --- a/app/pdb/floating_sel_cmds.c +++ b/app/pdb/floating_sel_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "core/gimplayer.h" diff --git a/app/pdb/gimp-pdb.c b/app/pdb/gimp-pdb.c index 6bee505e86..dc4fff8e1a 100644 --- a/app/pdb/gimp-pdb.c +++ b/app/pdb/gimp-pdb.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "context_manager.h" diff --git a/app/pdb/gimppdb.c b/app/pdb/gimppdb.c index 6bee505e86..dc4fff8e1a 100644 --- a/app/pdb/gimppdb.c +++ b/app/pdb/gimppdb.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "context_manager.h" diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c index 6bee505e86..dc4fff8e1a 100644 --- a/app/pdb/gimpprocedure.c +++ b/app/pdb/gimpprocedure.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "context_manager.h" diff --git a/app/pdb/gimprc_cmds.c b/app/pdb/gimprc_cmds.c index 9262eb8c1f..4e527741c1 100644 --- a/app/pdb/gimprc_cmds.c +++ b/app/pdb/gimprc_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "gimprc.h" diff --git a/app/pdb/gradient_select_cmds.c b/app/pdb/gradient_select_cmds.c index 3e4b666b96..5a0e2db04c 100644 --- a/app/pdb/gradient_select_cmds.c +++ b/app/pdb/gradient_select_cmds.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/gradients_cmds.c b/app/pdb/gradients_cmds.c index 5419195952..2eb882a687 100644 --- a/app/pdb/gradients_cmds.c +++ b/app/pdb/gradients_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/guides_cmds.c b/app/pdb/guides_cmds.c index 677b5f26d5..49164e7540 100644 --- a/app/pdb/guides_cmds.c +++ b/app/pdb/guides_cmds.c @@ -23,9 +23,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpimage.h" #include "gimage.h" #include "undo.h" diff --git a/app/pdb/help_cmds.c b/app/pdb/help_cmds.c index d8ed0019dd..1f3a04457b 100644 --- a/app/pdb/help_cmds.c +++ b/app/pdb/help_cmds.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "gimphelp.h" diff --git a/app/pdb/image_cmds.c b/app/pdb/image_cmds.c index a27d82c7f7..06782f7eb7 100644 --- a/app/pdb/image_cmds.c +++ b/app/pdb/image_cmds.c @@ -24,9 +24,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "context_manager.h" #include "core/gimpchannel.h" #include "core/gimpcontainer.h" diff --git a/app/pdb/layer_cmds.c b/app/pdb/layer_cmds.c index 063d023fdf..5ad7b01450 100644 --- a/app/pdb/layer_cmds.c +++ b/app/pdb/layer_cmds.c @@ -23,9 +23,10 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpimage.h" #include "core/gimplayer.h" #include "core/gimplayermask.h" diff --git a/app/pdb/message_cmds.c b/app/pdb/message_cmds.c index 86cbf0c74c..d9bce7157d 100644 --- a/app/pdb/message_cmds.c +++ b/app/pdb/message_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "appenv.h" diff --git a/app/pdb/misc_cmds.c b/app/pdb/misc_cmds.c index eacd4dbba2..aa0d34c092 100644 --- a/app/pdb/misc_cmds.c +++ b/app/pdb/misc_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "app_procs.h" diff --git a/app/pdb/palette_cmds.c b/app/pdb/palette_cmds.c index 884297c4f3..e5881f80cd 100644 --- a/app/pdb/palette_cmds.c +++ b/app/pdb/palette_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/parasite_cmds.c b/app/pdb/parasite_cmds.c index fb6888cf21..7f798bb2f5 100644 --- a/app/pdb/parasite_cmds.c +++ b/app/pdb/parasite_cmds.c @@ -23,7 +23,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "procedural_db.h" #include "core/gimpdrawable.h" diff --git a/app/pdb/paths_cmds.c b/app/pdb/paths_cmds.c index f10a743b5b..a45e67b889 100644 --- a/app/pdb/paths_cmds.c +++ b/app/pdb/paths_cmds.c @@ -24,7 +24,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "core/gimpimage.h" diff --git a/app/pdb/pattern_select_cmds.c b/app/pdb/pattern_select_cmds.c index 34eda8def2..2c8b0636f3 100644 --- a/app/pdb/pattern_select_cmds.c +++ b/app/pdb/pattern_select_cmds.c @@ -24,7 +24,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/patterns_cmds.c b/app/pdb/patterns_cmds.c index a7914fd01d..8ff0433f9e 100644 --- a/app/pdb/patterns_cmds.c +++ b/app/pdb/patterns_cmds.c @@ -24,7 +24,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "context_manager.h" diff --git a/app/pdb/plug_in_cmds.c b/app/pdb/plug_in_cmds.c index 08a8e4ed65..deb79cdc70 100644 --- a/app/pdb/plug_in_cmds.c +++ b/app/pdb/plug_in_cmds.c @@ -25,7 +25,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "appenv.h" diff --git a/app/pdb/procedural_db.c b/app/pdb/procedural_db.c index 6bee505e86..dc4fff8e1a 100644 --- a/app/pdb/procedural_db.c +++ b/app/pdb/procedural_db.c @@ -24,7 +24,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "app_procs.h" #include "context_manager.h" diff --git a/app/pdb/procedural_db_cmds.c b/app/pdb/procedural_db_cmds.c index 8999a98a7b..a41470f02c 100644 --- a/app/pdb/procedural_db_cmds.c +++ b/app/pdb/procedural_db_cmds.c @@ -26,9 +26,11 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" +#include "appenums.h" #ifdef HAVE_GLIBC_REGEX #include diff --git a/app/pdb/selection_cmds.c b/app/pdb/selection_cmds.c index 79774ba382..676fca9a79 100644 --- a/app/pdb/selection_cmds.c +++ b/app/pdb/selection_cmds.c @@ -23,9 +23,11 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpchannel.h" #include "core/gimpimage-mask.h" #include "core/gimpimage.h" diff --git a/app/pdb/text_tool_cmds.c b/app/pdb/text_tool_cmds.c index ecede7a4f1..05835ec73e 100644 --- a/app/pdb/text_tool_cmds.c +++ b/app/pdb/text_tool_cmds.c @@ -25,7 +25,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "appenv.h" diff --git a/app/pdb/tools_cmds.c b/app/pdb/tools_cmds.c index 3f8ec2158f..b8a1b29026 100644 --- a/app/pdb/tools_cmds.c +++ b/app/pdb/tools_cmds.c @@ -23,9 +23,11 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" +#include "appenums.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" #include "drawable.h" diff --git a/app/pdb/undo_cmds.c b/app/pdb/undo_cmds.c index c76a6da774..e050a07213 100644 --- a/app/pdb/undo_cmds.c +++ b/app/pdb/undo_cmds.c @@ -23,7 +23,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" #include "core/gimpimage.h" diff --git a/app/pdb/unit_cmds.c b/app/pdb/unit_cmds.c index 019bd87dce..1aa7eb26b8 100644 --- a/app/pdb/unit_cmds.c +++ b/app/pdb/unit_cmds.c @@ -23,7 +23,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "procedural_db.h" diff --git a/app/pixel_surround.c b/app/pixel_surround.c index f51a47e740..2f14508566 100644 --- a/app/pixel_surround.c +++ b/app/pixel_surround.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/plug_in.c b/app/plug_in.c index 7ede96a8d4..2b9b8afa01 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -79,7 +79,7 @@ #include "libgimp/gimpenv.h" -#include "apptypes.h" +#include "core/core-types.h" #include "libgimp/gimpparasite.h" #include "libgimp/gimpprotocol.h" @@ -319,8 +319,8 @@ plug_in_init (void) plug_in_init_shm (); /* search for binaries in the plug-in directory path */ - datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, - plug_in_init_file, NULL); + gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE, + plug_in_init_file, NULL); /* read the pluginrc file for cached data */ filename = NULL; @@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename, plug_in_def = NULL; } - plug_in_def = plug_in_def_new (filename); - plug_in_def->mtime = datafile_mtime (); + plug_in_def = plug_in_def_new (filename); + plug_in_def->mtime = gimp_datafile_mtime (); plug_in_def->query = TRUE; plug_in_defs = g_slist_append (plug_in_defs, plug_in_def); diff --git a/app/qmask.c b/app/qmask.c index 06bd652a0b..d84cf39d5b 100644 --- a/app/qmask.c +++ b/app/qmask.c @@ -27,7 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpcontext.h" diff --git a/app/resize.c b/app/resize.c index e9b5a4d258..1e4969cba8 100644 --- a/app/resize.c +++ b/app/resize.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimplayer.h" diff --git a/app/resolution_calibrate.c b/app/resolution_calibrate.c index 31b2856f3c..66cfce8933 100644 --- a/app/resolution_calibrate.c +++ b/app/resolution_calibrate.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "gdisplay_ops.h" #include "gimprc.h" diff --git a/app/scale.c b/app/scale.c index 7bf4e81cd1..08849d42b3 100644 --- a/app/scale.c +++ b/app/scale.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpimage.h" diff --git a/app/scan_convert.c b/app/scan_convert.c index e303602cc8..513dc4c165 100644 --- a/app/scan_convert.c +++ b/app/scan_convert.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/scroll.c b/app/scroll.c index d500c9f77d..f74aa23275 100644 --- a/app/scroll.c +++ b/app/scroll.c @@ -22,7 +22,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "tools/gimptool.h" #include "tools/tool_manager.h" diff --git a/app/selection.c b/app/selection.c index dea240d671..d2a363d7a7 100644 --- a/app/selection.c +++ b/app/selection.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" diff --git a/app/temp_buf.c b/app/temp_buf.c index 641413a3dc..5de3444d6b 100644 --- a/app/temp_buf.c +++ b/app/temp_buf.c @@ -36,7 +36,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am index b7f218b3fa..2fa63c75f8 100644 --- a/app/tools/Makefile.am +++ b/app/tools/Makefile.am @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libapptools.la libapptools_la_SOURCES = \ + tools-types.h \ gimpairbrushtool.c \ gimpairbrushtool.h \ gimpbezierselecttool.c \ @@ -90,8 +91,6 @@ libapptools_la_SOURCES = \ tool_options_dialog.c \ tool_options_dialog.h \ \ - gimptoolinfo.c \ - gimptoolinfo.h \ tool_manager.c \ tool_manager.h \ tools.c \ diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c index ca34e61de5..eaf6906b23 100644 --- a/app/tools/gimpairbrushtool.c +++ b/app/tools/gimpairbrushtool.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpbezierselecttool.c b/app/tools/gimpbezierselecttool.c index 79388b554c..caff640f2b 100644 --- a/app/tools/gimpbezierselecttool.c +++ b/app/tools/gimpbezierselecttool.c @@ -26,7 +26,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpmarshal.h" @@ -49,7 +49,6 @@ #include "gimpeditselectiontool.h" #include "gimpbezierselecttool.h" -#include "gimptoolinfo.h" #include "selection_options.h" #include "tool_options.h" #include "tool_manager.h" diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c index 08ba02949c..cfd413b718 100644 --- a/app/tools/gimpblendtool.c +++ b/app/tools/gimpblendtool.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -35,11 +35,11 @@ #include "core/gimpgradient.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "appenv.h" -#include "asupsample.h" #include "cursorutil.h" #include "drawable.h" #include "errors.h" @@ -53,7 +53,6 @@ #include "tile_manager.h" #include "gimpblendtool.h" -#include "gimptoolinfo.h" #include "paint_options.h" #include "tool_manager.h" diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c index d0924b50bd..0643662f77 100644 --- a/app/tools/gimpbrushtool.c +++ b/app/tools/gimpbrushtool.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index e47aa005d1..80c5df2aca 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c index 3cf93a35e9..d83fa72dfc 100644 --- a/app/tools/gimpclonetool.c +++ b/app/tools/gimpclonetool.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index a2a378009a..ff8b425b6e 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -23,7 +23,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c index d2cc810ddb..88cb9d5f86 100644 --- a/app/tools/gimpconvolvetool.c +++ b/app/tools/gimpconvolvetool.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpbrush.h" #include "core/gimpcontext.h" diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 9ed84b84c7..1f5f71ebd3 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpdrawable.h" diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c index 96a56dca7a..02567028e5 100644 --- a/app/tools/gimpdodgeburntool.c +++ b/app/tools/gimpdodgeburntool.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c index 103a0ad4c2..e384017111 100644 --- a/app/tools/gimpdrawtool.c +++ b/app/tools/gimpdrawtool.c @@ -20,12 +20,14 @@ #include -#include "apptypes.h" - -#include "gdisplay.h" -#include "gimpdrawtool.h" #include "libgimpmath/gimpmath.h" +#include "tools-types.h" + +#include "gimpdrawtool.h" + +#include "gdisplay.h" + enum { diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c index d9125691bd..1a1b559036 100644 --- a/app/tools/gimpeditselectiontool.c +++ b/app/tools/gimpeditselectiontool.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpdrawable.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpellipseselecttool.c b/app/tools/gimpellipseselecttool.c index 64593803e0..6e7af7ba3b 100644 --- a/app/tools/gimpellipseselecttool.c +++ b/app/tools/gimpellipseselecttool.c @@ -22,16 +22,16 @@ #include -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" +#include "core/gimptoolinfo.h" #include "gdisplay.h" #include "gimpellipseselecttool.h" -#include "gimptoolinfo.h" #include "selection_options.h" #include "tool_options.h" #include "tool_manager.h" diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c index 620e49ea1a..d02279922e 100644 --- a/app/tools/gimperasertool.c +++ b/app/tools/gimperasertool.c @@ -23,7 +23,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index 54109b5a9a..250770333d 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 8a62433103..71845c2923 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c index 0dbcb1b2fe..c3f8f0fa34 100644 --- a/app/tools/gimpfuzzyselecttool.c +++ b/app/tools/gimpfuzzyselecttool.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpdrawable.h" diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index b8a5980f79..4d9c2960ff 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index 7ea11f8410..9f373cc5f3 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -43,7 +43,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c index 2fe3b40fa8..aa2631516d 100644 --- a/app/tools/gimpmagnifytool.c +++ b/app/tools/gimpmagnifytool.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "gui/info-window.h" #include "gdisplay.h" diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 1477c81ff4..d37ddfe2d4 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -28,7 +28,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index ceac6adc73..d1ed6ab5a3 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -22,7 +22,7 @@ #include -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c index 99d9f7392e..523719c460 100644 --- a/app/tools/gimppaintbrushtool.c +++ b/app/tools/gimppaintbrushtool.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index 2974ce6b29..c7ed38d7d1 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -22,16 +22,16 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpcontext.h" +#include "core/gimptoolinfo.h" #include "widgets/gtkhwrapbox.h" #include "gimprc.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "paint_options.h" #include "tool_manager.h" diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index d0924b50bd..0643662f77 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimppathtool.c b/app/tools/gimppathtool.c index e05f6f446f..558d40f66e 100644 --- a/app/tools/gimppathtool.c +++ b/app/tools/gimppathtool.c @@ -26,7 +26,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "gdisplay.h" #include "path_curves.h" diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c index 5dec740b17..2c2b883909 100644 --- a/app/tools/gimppenciltool.c +++ b/app/tools/gimppenciltool.c @@ -22,7 +22,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index 9891d44455..876919fc95 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" diff --git a/app/tools/gimprectselecttool.c b/app/tools/gimprectselecttool.c index 1dee1b05c3..ce023ecd9a 100644 --- a/app/tools/gimprectselecttool.c +++ b/app/tools/gimprectselecttool.c @@ -25,12 +25,13 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" #include "core/gimpmarshal.h" +#include "core/gimptoolinfo.h" #include "cursorutil.h" #include "gdisplay.h" @@ -38,7 +39,6 @@ #include "gimpeditselectiontool.h" #include "gimprectselecttool.h" -#include "gimptoolinfo.h" #include "selection_options.h" #include "tool_options.h" #include "tool_manager.h" diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index 0dbcb1b2fe..c3f8f0fa34 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpchannel.h" #include "core/gimpdrawable.h" diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index ce92072cf5..d8ce960524 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -23,7 +23,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index ac028a6916..c3ad1de134 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -24,7 +24,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c index 7c9916891a..f0a0d294d4 100644 --- a/app/tools/gimpselectionoptions.c +++ b/app/tools/gimpselectionoptions.c @@ -22,7 +22,9 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" + +#include "core/gimptoolinfo.h" #include "gimprc.h" @@ -31,7 +33,6 @@ #include "gimpiscissorstool.h" #include "gimprectselecttool.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "selection_options.h" #include "tool_manager.h" diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c index 0d70827509..d1374dac67 100644 --- a/app/tools/gimpselectiontool.c +++ b/app/tools/gimpselectiontool.c @@ -21,17 +21,17 @@ #include #include -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" -#include "cursorutil.h" #include "gimpdrawtool.h" -#include "gdisplay.h" - #include "gimpselectiontool.h" +#include "cursorutil.h" +#include "gdisplay.h" + static void gimp_selection_tool_class_init (GimpSelectionToolClass *klass); static void gimp_selection_tool_init (GimpSelectionTool *selection_tool); diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 9dc2c45dde..f27f1aa41b 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c index f277f8a676..d716cc98da 100644 --- a/app/tools/gimpsmudgetool.c +++ b/app/tools/gimpsmudgetool.c @@ -24,7 +24,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c index 3cf93a35e9..d83fa72dfc 100644 --- a/app/tools/gimpsourcetool.c +++ b/app/tools/gimpsourcetool.c @@ -25,7 +25,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 8fc2291b83..582a85ffef 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -33,7 +33,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/tools/gimptool.c b/app/tools/gimptool.c index 43ab04d512..f0349b378d 100644 --- a/app/tools/gimptool.c +++ b/app/tools/gimptool.c @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpimage.h" diff --git a/app/tools/gimptoolinfo.c b/app/tools/gimptoolinfo.c deleted file mode 100644 index dd84e3194a..0000000000 --- a/app/tools/gimptoolinfo.c +++ /dev/null @@ -1,259 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "apptypes.h" - -#include "core/gimpcontext.h" - -#include "context_manager.h" -#include "gimptoolinfo.h" -#include "temp_buf.h" - -#include "gimprectselecttool.h" - - -static void gimp_tool_info_class_init (GimpToolInfoClass *klass); -static void gimp_tool_info_init (GimpToolInfo *tool_info); - -static void gimp_tool_info_destroy (GtkObject *object); -static TempBuf * gimp_tool_info_get_new_preview (GimpViewable *viewable, - gint width, - gint height); - - -static GimpDataClass *parent_class = NULL; - - -GtkType -gimp_tool_info_get_type (void) -{ - static GtkType tool_info_type = 0; - - if (! tool_info_type) - { - GtkTypeInfo tool_info_info = - { - "GimpToolInfo", - sizeof (GimpToolInfo), - sizeof (GimpToolInfoClass), - (GtkClassInitFunc) gimp_tool_info_class_init, - (GtkObjectInitFunc) gimp_tool_info_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - tool_info_type = gtk_type_unique (GIMP_TYPE_DATA, &tool_info_info); - } - - return tool_info_type; -} - -static void -gimp_tool_info_class_init (GimpToolInfoClass *klass) -{ - GtkObjectClass *object_class; - GimpViewableClass *viewable_class; - - object_class = (GtkObjectClass *) klass; - viewable_class = (GimpViewableClass *) klass; - - parent_class = gtk_type_class (GIMP_TYPE_DATA); - - object_class->destroy = gimp_tool_info_destroy; - - viewable_class->get_new_preview = gimp_tool_info_get_new_preview; -} - -void -gimp_tool_info_init (GimpToolInfo *tool_info) -{ - tool_info->tool_type = GTK_TYPE_NONE; - - tool_info->blurb = NULL; - tool_info->help = NULL; - - tool_info->menu_path = NULL; - tool_info->menu_accel = NULL; - - tool_info->help_domain = NULL; - tool_info->help_data = NULL; - - tool_info->icon_data = NULL; - - tool_info->context = NULL; - - tool_info->tool_options = NULL; -} - -static void -gimp_tool_info_destroy (GtkObject *object) -{ - GimpToolInfo *tool_info; - - tool_info = (GimpToolInfo *) object; - - g_free (tool_info->blurb); - g_free (tool_info->help); - - g_free (tool_info->menu_path); - g_free (tool_info->menu_accel); - - g_free (tool_info->help_domain); - g_free (tool_info->help_data); - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); -} - -static TempBuf * -gimp_tool_info_get_new_preview (GimpViewable *viewable, - gint width, - gint height) -{ - GimpToolInfo *tool_info; - TempBuf *temp_buf; - TempBuf *return_buf; - guchar opaque[4] = { 0, 0, 0, 0 }; - gint offset_x = 0; - gint offset_y = 0; - gint r, s, cnt; - guchar value; - guchar *data; - guchar *p; - - static gint colors[8][3] = - { - { 0x00, 0x00, 0x00 }, /* a - 0 */ - { 0x24, 0x24, 0x24 }, /* b - 36 */ - { 0x49, 0x49, 0x49 }, /* c - 73 */ - { 0x6D, 0x6D, 0x6D }, /* d - 109 */ - { 0x92, 0x92, 0x92 }, /* e - 146 */ - { 0xB6, 0xB6, 0xB6 }, /* f - 182 */ - { 0xDB, 0xDB, 0xDB }, /* g - 219 */ - { 0xFF, 0xFF, 0xFF }, /* h - 255 */ - }; - - tool_info = GIMP_TOOL_INFO (viewable); - -#define TOOL_INFO_WIDTH 22 -#define TOOL_INFO_HEIGHT 22 - - temp_buf = temp_buf_new (TOOL_INFO_WIDTH, TOOL_INFO_HEIGHT, 4, 0, 0, opaque); - - data = temp_buf_data (temp_buf); - - p = data; - - for (r = 0; r < TOOL_INFO_HEIGHT; r++) - { - for (s = 0, cnt = 0; s < TOOL_INFO_WIDTH; s++) - { - value = tool_info->icon_data[r][s]; - - if (value != '.') - { - *p++ = colors[value - 'a'][0]; - *p++ = colors[value - 'a'][1]; - *p++ = colors[value - 'a'][2]; - *p++ = 255; - } - else - { - p += 4; - } - } - } - - if (width > TOOL_INFO_WIDTH) - offset_x = (width - TOOL_INFO_WIDTH) / 2; - - if (height > TOOL_INFO_HEIGHT) - offset_y = (height - TOOL_INFO_HEIGHT) / 2; - - return_buf = temp_buf_scale (temp_buf, width, height); - - temp_buf_free (temp_buf); - - return return_buf; -} - -GimpToolInfo * -gimp_tool_info_new (GtkType tool_type, - gboolean tool_context, - const gchar *identifier, - const gchar *blurb, - const gchar *help, - const gchar *menu_path, - const gchar *menu_accel, - const gchar *help_domain, - const gchar *help_data, - const gchar **icon_data) -{ - GimpToolInfo *tool_info; - - tool_info = gtk_type_new (GIMP_TYPE_TOOL_INFO); - - gimp_object_set_name (GIMP_OBJECT (tool_info), identifier); - - tool_info->tool_type = tool_type; - - tool_info->blurb = g_strdup (blurb); - tool_info->help = g_strdup (help); - - tool_info->menu_path = g_strdup (menu_path); - tool_info->menu_accel = g_strdup (menu_accel); - - tool_info->help_domain = g_strdup (help_domain); - tool_info->help_data = g_strdup (help_data); - - tool_info->icon_data = icon_data; - - if (tool_context) - { - tool_info->context = gimp_context_new (identifier, - global_tool_context); - } - - return tool_info; -} - -GimpToolInfo * -gimp_tool_info_get_standard (void) -{ - static GimpToolInfo *standard_tool_info = NULL; - - if (! standard_tool_info) - { - standard_tool_info = - gimp_tool_info_new (GIMP_TYPE_RECT_SELECT_TOOL, - FALSE, - "gimp:standard_tool", - "Standard Tool", - "Well something must be broken", - NULL, NULL, - NULL, NULL, - NULL); - } - - return standard_tool_info; -} diff --git a/app/tools/gimptoolinfo.h b/app/tools/gimptoolinfo.h deleted file mode 100644 index abcb992289..0000000000 --- a/app/tools/gimptoolinfo.h +++ /dev/null @@ -1,80 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __GIMP_TOOL_INFO_H__ -#define __GIMP_TOOL_INFO_H__ - - -#include "core/gimpdata.h" - - -#define GIMP_TYPE_TOOL_INFO (gimp_tool_info_get_type ()) -#define GIMP_TOOL_INFO(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_TOOL_INFO, GimpToolInfo)) -#define GIMP_IS_TOOL_INFO(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_TOOL_INFO)) -#define GIMP_TOOL_INFO_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOOL_INFO, GimpToolInfoClass)) -#define GIMP_IS_TOOL_INFO_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_TOOL_INFO)) - - -typedef struct _GimpToolInfoClass GimpToolInfoClass; - - -struct _GimpToolInfo -{ - GimpData parent_instance; - - GtkType tool_type; - - gchar *blurb; - gchar *help; - - gchar *menu_path; - gchar *menu_accel; - - gchar *help_domain; - gchar *help_data; - - const gchar **icon_data; - - GimpContext *context; - - ToolOptions *tool_options; -}; - -struct _GimpToolInfoClass -{ - GimpDataClass parent_class; -}; - - -GtkType gimp_tool_info_get_type (void); - -GimpToolInfo * gimp_tool_info_new (GtkType tool_type, - gboolean tool_context, - const gchar *identifier, - const gchar *blurb, - const gchar *help, - const gchar *menu_path, - const gchar *menu_accel, - const gchar *help_domain, - const gchar *help_data, - const gchar **icon_data); - -GimpToolInfo * gimp_tool_info_get_standard (void); - - -#endif /* __GIMP_TOOL_INFO_H__ */ diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c index 9424cc3c83..e5304f9a03 100644 --- a/app/tools/gimptransformoptions.c +++ b/app/tools/gimptransformoptions.c @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "config.h" #include @@ -24,12 +23,13 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" + +#include "core/gimptoolinfo.h" #include "gimprc.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "gimptransformtool.h" #include "transform_options.h" #include "tool_manager.h" diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c index d738a89dfa..13d62da15e 100644 --- a/app/tools/gimptransformtool.c +++ b/app/tools/gimptransformtool.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "paint-funcs/paint-funcs.h" @@ -36,6 +36,7 @@ #include "core/gimpimage-mask.h" #include "core/gimplayer.h" #include "core/gimpmarshal.h" +#include "core/gimptoolinfo.h" #include "gui/info-dialog.h" #include "cursorutil.h" @@ -52,7 +53,6 @@ #include "tile_manager.h" #include "tile.h" -#include "gimptoolinfo.h" #include "tool_manager.h" #include "tool_options.h" #include "transform_options.h" diff --git a/app/tools/paint_options.c b/app/tools/paint_options.c index 2974ce6b29..c7ed38d7d1 100644 --- a/app/tools/paint_options.c +++ b/app/tools/paint_options.c @@ -22,16 +22,16 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpcontext.h" +#include "core/gimptoolinfo.h" #include "widgets/gtkhwrapbox.h" #include "gimprc.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "paint_options.h" #include "tool_manager.h" diff --git a/app/tools/path_tool.c b/app/tools/path_tool.c index da906edd38..33703e1e00 100644 --- a/app/tools/path_tool.c +++ b/app/tools/path_tool.c @@ -27,22 +27,18 @@ * segments between two anchors. */ -/* -#include - - -#include "path_curves.h" #include "config.h" -#include "libgimp/gimpintl.h" -*/ -#include -#include -#include "apptypes.h" +#include + +#include "tools-types.h" + #include "path_curves.h" #include "path_tool.h" #include "gimppathtool.h" +#include "libgimp/gimpintl.h" + /* * Every new curve-type has to have a parameter between 0 and 1, and * should go from a starting to a target point. diff --git a/app/tools/selection_options.c b/app/tools/selection_options.c index 7c9916891a..f0a0d294d4 100644 --- a/app/tools/selection_options.c +++ b/app/tools/selection_options.c @@ -22,7 +22,9 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" + +#include "core/gimptoolinfo.h" #include "gimprc.h" @@ -31,7 +33,6 @@ #include "gimpiscissorstool.h" #include "gimprectselecttool.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "selection_options.h" #include "tool_manager.h" diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c index b2fc052ea7..40bc2fd4be 100644 --- a/app/tools/tool_manager.c +++ b/app/tools/tool_manager.c @@ -22,12 +22,13 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" #include "core/gimpimage.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "appenv.h" #include "context_manager.h" @@ -36,7 +37,6 @@ #include "gimpui.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "tool_manager.h" #include "tool_options.h" #include "tool_options_dialog.h" diff --git a/app/tools/tool_options_dialog.c b/app/tools/tool_options_dialog.c index 1447b2a634..83bea6e238 100644 --- a/app/tools/tool_options_dialog.c +++ b/app/tools/tool_options_dialog.c @@ -22,11 +22,12 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontext.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" @@ -35,7 +36,6 @@ #include "gimpui.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "tool_options.h" #include "tool_options_dialog.h" #include "tool_manager.h" diff --git a/app/tools/tools-types.h b/app/tools/tools-types.h new file mode 100644 index 0000000000..7634ac1d51 --- /dev/null +++ b/app/tools/tools-types.h @@ -0,0 +1,43 @@ +/* The GIMP -- an image manipulation program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __TOOLS_TYPES_H__ +#define __TOOLS_TYPES_H__ + + +#include "core/core-types.h" + + +/* tools */ + +typedef struct _GimpTool GimpTool; +typedef struct _GimpPaintTool GimpPaintTool; +typedef struct _GimpDrawTool GimpDrawTool; +typedef struct _GimpPathTool GimpPathTool; +typedef struct _GimpTransformTool GimpTransformTool; + +typedef struct _GimpBezierSelectPoint GimpBezierSelectPoint; +typedef struct _GimpBezierSelectTool GimpBezierSelectTool; + + +/* stuff */ + +typedef struct _SelectionOptions SelectionOptions; + + +#endif /* __TOOLS_TYPES_H__ */ diff --git a/app/tools/tools.c b/app/tools/tools.c index 31ee1025ef..0964f603b1 100644 --- a/app/tools/tools.c +++ b/app/tools/tools.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "tools-types.h" #include "gimptool.h" #include "tool_manager.h" diff --git a/app/tools/transform_options.c b/app/tools/transform_options.c index 9424cc3c83..e5304f9a03 100644 --- a/app/tools/transform_options.c +++ b/app/tools/transform_options.c @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "config.h" #include @@ -24,12 +23,13 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" + +#include "core/gimptoolinfo.h" #include "gimprc.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "gimptransformtool.h" #include "transform_options.h" #include "tool_manager.h" diff --git a/app/undo.c b/app/undo.c index 6b29da392b..bdd300d414 100644 --- a/app/undo.c +++ b/app/undo.c @@ -23,7 +23,8 @@ #include -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/undo_history.c b/app/undo_history.c index ba7d177544..f15bf4e54a 100644 --- a/app/undo_history.c +++ b/app/undo_history.c @@ -47,7 +47,7 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/user_install.c b/app/user_install.c index c9e1699eb2..21ce3064e9 100644 --- a/app/user_install.c +++ b/app/user_install.c @@ -33,7 +33,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "gdisplay_ops.h" diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c index e195c9b8aa..65b86266d7 100644 --- a/app/widgets/gimpbrusheditor.c +++ b/app/widgets/gimpbrusheditor.c @@ -28,7 +28,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpbrushgenerated.h" diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 169fd858d8..81be237bc7 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -29,7 +29,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpimage.h" diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c index 3f58e33bf9..9210fbc6ac 100644 --- a/app/widgets/gimpcursor.c +++ b/app/widgets/gimpcursor.c @@ -20,7 +20,7 @@ #include -#include "apptypes.h" +#include "core/core-types.h" #include "appenv.h" #include "cursorutil.h" diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index 001918b108..59fe39328d 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -35,11 +35,11 @@ #include "core/gimpdatafactory.h" #include "core/gimpgradient.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "appenv.h" diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c index 001918b108..59fe39328d 100644 --- a/app/widgets/gimpdevices.c +++ b/app/widgets/gimpdevices.c @@ -35,11 +35,11 @@ #include "core/gimpdatafactory.h" #include "core/gimpgradient.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "appenv.h" diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index 9a63925778..60475d69ae 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -26,8 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" -#include "widgets/widgets-types.h" +#include "widgets-types.h" #include "core/gimpimage.h" #include "core/gimpbrush.h" @@ -40,9 +39,9 @@ #include "core/gimplayermask.h" #include "core/gimppalette.h" #include "core/gimppattern.h" +#include "core/gimptoolinfo.h" #include "tools/gimptool.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "gui/file-open-dialog.h" diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 766ec9e15f..9787f61a88 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -63,7 +63,7 @@ #include "libgimp/gimpenv.h" #include "libgimp/gimplimits.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index fbedaa03ce..cb7d0452b2 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -27,11 +27,12 @@ #include "libgimp/gimpenv.h" #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "channels-commands.h" diff --git a/app/widgets/gimppreview.c b/app/widgets/gimppreview.c index 70548e3973..e873100a9a 100644 --- a/app/widgets/gimppreview.c +++ b/app/widgets/gimppreview.c @@ -38,8 +38,7 @@ #include "core/gimpmarshal.h" #include "core/gimppalette.h" #include "core/gimppattern.h" - -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "gimpbrushpreview.h" #include "gimpdnd.h" diff --git a/app/widgets/gimppreviewrenderer.c b/app/widgets/gimppreviewrenderer.c index 70548e3973..e873100a9a 100644 --- a/app/widgets/gimppreviewrenderer.c +++ b/app/widgets/gimppreviewrenderer.c @@ -38,8 +38,7 @@ #include "core/gimpmarshal.h" #include "core/gimppalette.h" #include "core/gimppattern.h" - -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "gimpbrushpreview.h" #include "gimpdnd.h" diff --git a/app/widgets/gimptoolbox-color-area.c b/app/widgets/gimptoolbox-color-area.c index a921d2a9d6..5d0455c641 100644 --- a/app/widgets/gimptoolbox-color-area.c +++ b/app/widgets/gimptoolbox-color-area.c @@ -28,7 +28,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" #include "core/gimpcontext.h" diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index e0dd56f725..4336eb07b2 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -24,7 +24,8 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "widgets/widgets-types.h" #include "paint-funcs/paint-funcs.h" @@ -34,13 +35,13 @@ #include "core/gimplayer.h" #include "core/gimplayermask.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdialogfactory.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" #include "widgets/gtkhwrapbox.h" -#include "tools/gimptoolinfo.h" #include "tools/tool_manager.h" #include "color-area.h" diff --git a/app/widgets/gimptoolinfopreview.c b/app/widgets/gimptoolinfopreview.c index 055da5c440..30f71fab95 100644 --- a/app/widgets/gimptoolinfopreview.c +++ b/app/widgets/gimptoolinfopreview.c @@ -25,7 +25,7 @@ #include "widgets-types.h" -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "gimptoolinfopreview.h" diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c index 1447b2a634..83bea6e238 100644 --- a/app/widgets/gimptooloptionseditor.c +++ b/app/widgets/gimptooloptionseditor.c @@ -22,11 +22,12 @@ #include "libgimpwidgets/gimpwidgets.h" -#include "apptypes.h" +#include "tools-types.h" #include "widgets/widgets-types.h" #include "core/gimpcontext.h" #include "core/gimplist.h" +#include "core/gimptoolinfo.h" #include "widgets/gimpdnd.h" #include "widgets/gimppreview.h" @@ -35,7 +36,6 @@ #include "gimpui.h" #include "gimptool.h" -#include "gimptoolinfo.h" #include "tool_options.h" #include "tool_options_dialog.h" #include "tool_manager.h" diff --git a/app/widgets/gimpview.c b/app/widgets/gimpview.c index 70548e3973..e873100a9a 100644 --- a/app/widgets/gimpview.c +++ b/app/widgets/gimpview.c @@ -38,8 +38,7 @@ #include "core/gimpmarshal.h" #include "core/gimppalette.h" #include "core/gimppattern.h" - -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "gimpbrushpreview.h" #include "gimpdnd.h" diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 70548e3973..e873100a9a 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -38,8 +38,7 @@ #include "core/gimpmarshal.h" #include "core/gimppalette.h" #include "core/gimppattern.h" - -#include "tools/gimptoolinfo.h" +#include "core/gimptoolinfo.h" #include "gimpbrushpreview.h" #include "gimpdnd.h" diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h index e278531303..8c4298fe06 100644 --- a/app/widgets/widgets-types.h +++ b/app/widgets/widgets-types.h @@ -22,7 +22,7 @@ #include "libgimpwidgets/gimpwidgetstypes.h" -#include "apptypes.h" +#include "core/core-types.h" /* enums */ diff --git a/app/xcf.c b/app/xcf.c index 92112facfc..deed742a87 100644 --- a/app/xcf.c +++ b/app/xcf.c @@ -35,7 +35,8 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index 92112facfc..deed742a87 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -35,7 +35,8 @@ #include "libgimpcolor/gimpcolor.h" -#include "apptypes.h" +#include "core/core-types.h" +#include "tools/tools-types.h" #include "core/gimpchannel.h" #include "core/gimpimage.h" diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 2bbbc407a2..885ffdf888 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -156,10 +156,6 @@ libgimp_1_3_la_SOURCES = \ \ gimpenv.c \ gimpenv.h \ - gimpadaptivesupersample.c \ - gimpadaptivesupersample.h \ - gimpbilinear.c \ - gimpbilinear.h \ gimpsignal.c \ gimpsignal.h \ gimputils.c \ @@ -198,8 +194,6 @@ gimpinclude_HEADERS = \ gimp.h \ gimptypes.h \ ${PDB_WRAPPERS_H} \ - gimpadaptivesupersample.h \ - gimpbilinear.h \ gimpchannel.h \ gimpdrawable.h \ gimpenums.h \ diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 269eacb452..6406a14f19 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -30,8 +30,6 @@ #include #include -#include -#include #include #include #include diff --git a/libgimp/gimpadaptivesupersample.c b/libgimp/gimpadaptivesupersample.c deleted file mode 100644 index 8cf6e745c4..0000000000 --- a/libgimp/gimpadaptivesupersample.c +++ /dev/null @@ -1,381 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "libgimpcolor/gimpcolor.h" -#include "libgimpmath/gimpmath.h" - -#include "gimpadaptivesupersample.h" - - -/*********************************************************************/ -/* Sumpersampling code (Quartic) */ -/* This code is *largely* based on the sources for POV-Ray 3.0. I am */ -/* grateful to the POV-Team for such a great program and for making */ -/* their sources available. All comments / bug reports / */ -/* etc. regarding this code should be addressed to me, not to the */ -/* POV-Ray team. Any bugs are my responsibility, not theirs. */ -/*********************************************************************/ - - -typedef struct _GimpSampleType GimpSampleType; - -struct _GimpSampleType -{ - guchar ready; - GimpRGB color; -}; - - -static gulong -gimp_render_sub_pixel (gint max_depth, - gint depth, - GimpSampleType **block, - gint x, - gint y, - gint x1, - gint y1, - gint x3, - gint y3, - gdouble threshold, - gint sub_pixel_size, - GimpRGB *color, - GimpRenderFunc render_func, - gpointer render_data) -{ - gint x2, y2; /* Coords of center sample */ - gdouble dx1, dy1; /* Delta to upper left sample */ - gdouble dx3, dy3; /* Delta to lower right sample */ - GimpRGB c[4]; /* Sample colors */ - gulong num_samples = 0; - gint cnt; - - /* Get offsets for corners */ - - dx1 = (gdouble) (x1 - sub_pixel_size / 2) / sub_pixel_size; - dx3 = (gdouble) (x3 - sub_pixel_size / 2) / sub_pixel_size; - - dy1 = (gdouble) (y1 - sub_pixel_size / 2) / sub_pixel_size; - dy3 = (gdouble) (y3 - sub_pixel_size / 2) / sub_pixel_size; - - /* Render upper left sample */ - - if (! block[y1][x1].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx1, y + dy1, &c[0], render_data); - - block[y1][x1].ready = TRUE; - block[y1][x1].color = c[0]; - } - else - { - c[0] = block[y1][x1].color; - } - - /* Render upper right sample */ - - if (! block[y1][x3].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx3, y + dy1, &c[1], render_data); - - block[y1][x3].ready = TRUE; - block[y1][x3].color = c[1]; - } - else - { - c[1] = block[y1][x3].color; - } - - /* Render lower left sample */ - - if (! block[y3][x1].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx1, y + dy3, &c[2], render_data); - - block[y3][x1].ready = TRUE; - block[y3][x1].color = c[2]; - } - else - { - c[2] = block[y3][x1].color; - } - - /* Render lower right sample */ - - if (! block[y3][x3].ready) - { - num_samples++; - - if (render_func) - (* render_func) (x + dx3, y + dy3, &c[3], render_data); - - block[y3][x3].ready = TRUE; - block[y3][x3].color = c[3]; - } - else - { - c[3] = block[y3][x3].color; - } - - /* Check for supersampling */ - - if (depth <= max_depth) - { - /* Check whether we have to supersample */ - - if ((gimp_rgba_distance (&c[0], &c[1]) >= threshold) || - (gimp_rgba_distance (&c[0], &c[2]) >= threshold) || - (gimp_rgba_distance (&c[0], &c[3]) >= threshold) || - (gimp_rgba_distance (&c[1], &c[2]) >= threshold) || - (gimp_rgba_distance (&c[1], &c[3]) >= threshold) || - (gimp_rgba_distance (&c[2], &c[3]) >= threshold)) - { - /* Calc coordinates of center subsample */ - - x2 = (x1 + x3) / 2; - y2 = (y1 + y3) / 2; - - /* Render sub-blocks */ - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x1, y1, x2, y2, - threshold, sub_pixel_size, - &c[0], - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x2, y1, x3, y2, - threshold, sub_pixel_size, - &c[1], - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x1, y2, x2, y3, - threshold, sub_pixel_size, - &c[2], - render_func, render_data); - - num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block, - x, y, x2, y2, x3, y3, - threshold, sub_pixel_size, - &c[3], - render_func, render_data); - } - } - - if (c[0].a == 0.0 || c[1].a == 0.0 || c[2].a == 0.0 || c[3].a == 0.0) - { - GimpRGB tmpcol; - gdouble weight; - - gimp_rgb_set (&tmpcol, 0.0, 0.0, 0.0); - - weight = 2.0; - - for (cnt = 0; cnt < 4; cnt++) - { - if (c[cnt].a != 0.0) - { - tmpcol.r += c[cnt].r; - tmpcol.g += c[cnt].g; - tmpcol.b += c[cnt].b; - - weight /= 2.0; - } - } - - color->r = weight * tmpcol.r; - color->g = weight * tmpcol.g; - color->b = weight * tmpcol.b; - } - else - { - color->r = 0.25 * (c[0].r + c[1].r + c[2].r + c[3].r); - color->g = 0.25 * (c[0].g + c[1].g + c[2].g + c[3].g); - color->b = 0.25 * (c[0].b + c[1].b + c[2].b + c[3].b); - } - - color->a = 0.25 * (c[0].a + c[1].a + c[2].a + c[3].a); - - return num_samples; -} - -gulong -gimp_adaptive_supersample_area (gint x1, - gint y1, - gint x2, - gint y2, - gint max_depth, - gdouble threshold, - GimpRenderFunc render_func, - gpointer render_data, - GimpPutPixelFunc put_pixel_func, - gpointer put_pixel_data, - GimpProgressFunc progress_func, - gpointer progress_data) -{ - gint x, y, width; /* Counters, width of region */ - gint xt, xtt, yt; /* Temporary counters */ - gint sub_pixel_size; /* Number of samples per pixel (1D) */ - GimpRGB color; /* Rendered pixel's color */ - GimpSampleType tmp_sample; /* For swapping samples */ - GimpSampleType *top_row, *bot_row, *tmp_row; /* Sample rows */ - GimpSampleType **block; /* Sample block matrix */ - gulong num_samples; - - /* Initialize color */ - - gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0); - - /* Calculate sub-pixel size */ - - sub_pixel_size = 1 << max_depth; - - /* Create row arrays */ - - width = x2 - x1 + 1; - - top_row = g_new (GimpSampleType, sub_pixel_size * width + 1); - bot_row = g_new (GimpSampleType, sub_pixel_size * width + 1); - - for (x = 0; x < (sub_pixel_size * width + 1); x++) - { - top_row[x].ready = FALSE; - - gimp_rgba_set (&top_row[x].color, 0.0, 0.0, 0.0, 0.0); - - bot_row[x].ready = FALSE; - - gimp_rgba_set (&bot_row[x].color, 0.0, 0.0, 0.0, 0.0); - } - - /* Allocate block matrix */ - - block = g_new (GimpSampleType *, sub_pixel_size + 1); /* Rows */ - - for (y = 0; y < (sub_pixel_size + 1); y++) - { - block[y] = g_new (GimpSampleType, sub_pixel_size + 1); /* Columns */ - - for (x = 0; x < (sub_pixel_size + 1); x++) - { - block[y][x].ready = FALSE; - - gimp_rgba_set (&block[y][x].color, 0.0, 0.0, 0.0, 0.0); - } - } - - /* Render region */ - - num_samples = 0; - - for (y = y1; y <= y2; y++) - { - /* Clear the bottom row */ - - for (xt = 0; xt < (sub_pixel_size * width + 1); xt++) - bot_row[xt].ready = FALSE; - - /* Clear first column */ - - for (yt = 0; yt < (sub_pixel_size + 1); yt++) - block[yt][0].ready = FALSE; - - /* Render row */ - - for (x = x1; x <= x2; x++) - { - /* Initialize block by clearing all but first row/column */ - - for (yt = 1; yt < (sub_pixel_size + 1); yt++) - for (xt = 1; xt < (sub_pixel_size + 1); xt++) - block[yt][xt].ready = FALSE; - - /* Copy samples from top row to block */ - - for (xtt = 0, xt = (x - x1) * sub_pixel_size; - xtt < (sub_pixel_size + 1); - xtt++, xt++) - block[0][xtt] = top_row[xt]; - - /* Render pixel on (x, y) */ - - num_samples += gimp_render_sub_pixel (max_depth, 1, block, x, y, 0, 0, - sub_pixel_size, sub_pixel_size, - threshold, sub_pixel_size, - &color, - render_func, render_data); - - if (put_pixel_func) - (* put_pixel_func) (x, y, &color, put_pixel_data); - - /* Copy block information to rows */ - - top_row[(x - x1 + 1) * sub_pixel_size] = block[0][sub_pixel_size]; - - for (xtt = 0, xt = (x - x1) * sub_pixel_size; - xtt < (sub_pixel_size + 1); - xtt++, xt++) - bot_row[xt] = block[sub_pixel_size][xtt]; - - /* Swap first and last columns */ - - for (yt = 0; yt < (sub_pixel_size + 1); yt++) - { - tmp_sample = block[yt][0]; - block[yt][0] = block[yt][sub_pixel_size]; - block[yt][sub_pixel_size] = tmp_sample; - } - } - - /* Swap rows */ - - tmp_row = top_row; - top_row = bot_row; - bot_row = tmp_row; - - /* Call progress display function (if any) */ - - if (progress_func != NULL) - (* progress_func) (y1, y2, y, progress_data); - } - - /* Free memory */ - - for (y = 0; y < (sub_pixel_size + 1); y++) - g_free (block[y]); - - g_free (block); - g_free (top_row); - g_free (bot_row); - - return num_samples; -} diff --git a/libgimp/gimpadaptivesupersample.h b/libgimp/gimpadaptivesupersample.h deleted file mode 100644 index fe71bfe65d..0000000000 --- a/libgimp/gimpadaptivesupersample.h +++ /dev/null @@ -1,65 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GIMP_ADAPTIVE_SUPERSAMPLE_H__ -#define __GIMP_ADAPTIVE_SUPERSAMPLE_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* For information look into the C source or the html documentation */ - - -/* adaptive supersampling function taken from LibGCK */ - - -typedef void (* GimpRenderFunc) (gdouble x, - gdouble y, - GimpRGB *color, - gpointer data); -typedef void (* GimpPutPixelFunc) (gint x, - gint y, - GimpRGB *color, - gpointer data); -typedef void (* GimpProgressFunc) (gint min, - gint max, - gint current, - gpointer data); - - -gulong gimp_adaptive_supersample_area (gint x1, - gint y1, - gint x2, - gint y2, - gint max_depth, - gdouble threshold, - GimpRenderFunc render_func, - gpointer render_data, - GimpPutPixelFunc put_pixel_func, - gpointer put_pixel_data, - GimpProgressFunc progress_func, - gpointer progress_data); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GIMP_ADAPTIVE_SUPERSAMPLE_H__ */ diff --git a/libgimp/gimpbilinear.c b/libgimp/gimpbilinear.c deleted file mode 100644 index 062c3fbbc2..0000000000 --- a/libgimp/gimpbilinear.c +++ /dev/null @@ -1,223 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "libgimpcolor/gimpcolor.h" -#include "libgimpmath/gimpmath.h" - -#include "gimpbilinear.h" - - -gdouble -gimp_bilinear (gdouble x, - gdouble y, - gdouble *values) -{ - gdouble xx, yy; - gdouble m0, m1; - - g_assert (values != NULL); - - xx = fmod (x, 1.0); - yy = fmod (y, 1.0); - - if (x < 0.0) - x += 1.0; - if (y < 0.0) - y += 1.0; - - m0 = (1.0 - xx) * values[0] + xx * values[1]; - m1 = (1.0 - xx) * values[2] + xx * values[3]; - - return (1.0 - yy) * m0 + yy * m1; -} - -guchar -gimp_bilinear_8 (gdouble x, - gdouble y, - guchar *values) -{ - gdouble xx, yy; - gdouble m0, m1; - - g_assert (values != NULL); - - xx = fmod (x, 1.0); - yy = fmod (y, 1.0); - - if (x < 0.0) - x += 1.0; - if (y < 0.0) - y += 1.0; - - m0 = (1.0 - xx) * values[0] + xx * values[1]; - m1 = (1.0 - xx) * values[2] + xx * values[3]; - - return (guchar) ((1.0 - yy) * m0 + yy * m1); -} - -guint16 -gimp_bilinear_16 (gdouble x, - gdouble y, - guint16 *values) -{ - gdouble xx, yy; - gdouble m0, m1; - - g_assert (values != NULL); - - xx = fmod (x, 1.0); - yy = fmod (y, 1.0); - - if (x < 0.0) - x += 1.0; - if (y < 0.0) - y += 1.0; - - m0 = (1.0 - xx) * values[0] + xx * values[1]; - m1 = (1.0 - xx) * values[2] + xx * values[3]; - - return (guint16) ((1.0 - yy) * m0 + yy * m1); -} - -guint32 -gimp_bilinear_32 (gdouble x, - gdouble y, - guint32 *values) -{ - gdouble xx, yy; - gdouble m0, m1; - - g_assert (values != NULL); - - xx = fmod (x, 1.0); - yy = fmod (y, 1.0); - - if (x < 0.0) - x += 1.0; - if (y < 0.0) - y += 1.0; - - m0 = (1.0 - xx) * values[0] + xx * values[1]; - m1 = (1.0 - xx) * values[2] + xx * values[3]; - - return (guint32) ((1.0 - yy) * m0 + yy * m1); -} - -GimpRGB -gimp_bilinear_rgb (gdouble x, - gdouble y, - GimpRGB *values) -{ - gdouble m0, m1; - gdouble ix, iy; - GimpRGB v; - - g_assert (values != NULL); - - x = fmod(x, 1.0); - y = fmod(y, 1.0); - - if (x < 0) - x += 1.0; - if (y < 0) - y += 1.0; - - ix = 1.0 - x; - iy = 1.0 - y; - - /* Red */ - - m0 = ix * values[0].r + x * values[1].r; - m1 = ix * values[2].r + x * values[3].r; - - v.r = iy * m0 + y * m1; - - /* Green */ - - m0 = ix * values[0].g + x * values[1].g; - m1 = ix * values[2].g + x * values[3].g; - - v.g = iy * m0 + y * m1; - - /* Blue */ - - m0 = ix * values[0].b + x * values[1].b; - m1 = ix * values[2].b + x * values[3].b; - - v.b = iy * m0 + y * m1; - - return v; -} - -GimpRGB -gimp_bilinear_rgba (gdouble x, - gdouble y, - GimpRGB *values) -{ - gdouble m0, m1; - gdouble ix, iy; - GimpRGB v; - - g_assert (values != NULL); - - x = fmod (x, 1.0); - y = fmod (y, 1.0); - - if (x < 0) - x += 1.0; - if (y < 0) - y += 1.0; - - ix = 1.0 - x; - iy = 1.0 - y; - - /* Red */ - - m0 = ix * values[0].r + x * values[1].r; - m1 = ix * values[2].r + x * values[3].r; - - v.r = iy * m0 + y * m1; - - /* Green */ - - m0 = ix * values[0].g + x * values[1].g; - m1 = ix * values[2].g + x * values[3].g; - - v.g = iy * m0 + y * m1; - - /* Blue */ - - m0 = ix * values[0].b + x * values[1].b; - m1 = ix * values[2].b + x * values[3].b; - - v.b = iy * m0 + y * m1; - - /* Alpha */ - - m0 = ix * values[0].a + x * values[1].a; - m1 = ix * values[2].a + x * values[3].a; - - v.a = iy * m0 + y * m1; - - return v; -} diff --git a/libgimp/gimpbilinear.h b/libgimp/gimpbilinear.h deleted file mode 100644 index 1b6ac57513..0000000000 --- a/libgimp/gimpbilinear.h +++ /dev/null @@ -1,57 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GIMP_BILINEAR_H__ -#define __GIMP_BILINEAR_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* For information look into the C source or the html documentation */ - - -/* bilinear interpolation functions taken from LibGCK */ - - -gdouble gimp_bilinear (gdouble x, - gdouble y, - gdouble *values); -guchar gimp_bilinear_8 (gdouble x, - gdouble y, - guchar *values); -guint16 gimp_bilinear_16 (gdouble x, - gdouble y, - guint16 *values); -guint32 gimp_bilinear_32 (gdouble x, - gdouble y, - guint32 *values); -GimpRGB gimp_bilinear_rgb (gdouble x, - gdouble y, - GimpRGB *values); -GimpRGB gimp_bilinear_rgba (gdouble x, - gdouble y, - GimpRGB *values); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GIMP_BILINEAR_H__ */ diff --git a/libgimpbase/gimpdatafiles.c b/libgimpbase/gimpdatafiles.c index 674d6055e3..b87f04dfd1 100644 --- a/libgimpbase/gimpdatafiles.c +++ b/libgimpbase/gimpdatafiles.c @@ -45,7 +45,7 @@ #endif #endif /* G_OS_WIN32 */ -#include "apptypes.h" +#include "core/core-types.h" #include "datafiles.h" #include "gimprc.h" @@ -102,8 +102,8 @@ is_script (const gchar *filename) #endif gboolean -datafiles_check_extension (const gchar *filename, - const gchar *extension) +gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension) { gint name_len; gint ext_len; @@ -121,10 +121,10 @@ datafiles_check_extension (const gchar *filename, } void -datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data) +gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data) { gchar *local_path; GList *path; @@ -196,7 +196,7 @@ datafiles_read_directories (const gchar *path_str, } time_t -datafile_atime (void) +gimp_datafile_atime (void) { if (filestat_valid) return filestat.st_atime; @@ -205,7 +205,7 @@ datafile_atime (void) } time_t -datafile_mtime (void) +gimp_datafile_mtime (void) { if (filestat_valid) return filestat.st_mtime; @@ -214,7 +214,7 @@ datafile_mtime (void) } time_t -datafile_ctime (void) +gimp_datafile_ctime (void) { if (filestat_valid) return filestat.st_ctime; diff --git a/libgimpbase/gimpdatafiles.h b/libgimpbase/gimpdatafiles.h index 2a9cef4402..a05f6ed197 100644 --- a/libgimpbase/gimpdatafiles.h +++ b/libgimpbase/gimpdatafiles.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __DATAFILES_H__ -#define __DATAFILES_H__ +#ifndef __GIMP_DATAFILES_H__ +#define __GIMP_DATAFILES_H__ #include @@ -32,22 +32,22 @@ typedef enum } GimpDataFileFlags; -gboolean datafiles_check_extension (const gchar *filename, - const gchar *extension); +gboolean gimp_datafiles_check_extension (const gchar *filename, + const gchar *extension); -void datafiles_read_directories (const gchar *path_str, - GimpDataFileFlags flags, - GimpDataFileLoaderFunc loader_func, - gpointer loader_data); +void gimp_datafiles_read_directories (const gchar *path_str, + GimpDataFileFlags flags, + GimpDataFileLoaderFunc loader_func, + gpointer loader_data); /* Return the current datafiles access, modification * or change time. The current datafile is the one for * which the "DataFileLoaderFunc" function has been called * on. */ -time_t datafile_atime (void); -time_t datafile_mtime (void); -time_t datafile_ctime (void); +time_t gimp_datafile_atime (void); +time_t gimp_datafile_mtime (void); +time_t gimp_datafile_ctime (void); -#endif /* __DATAFILES_H__ */ +#endif /* __GIMP_DATAFILES_H__ */ diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index f133c67d34..0505c53ba5 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -25,20 +25,26 @@ EXTRA_DIST = \ lib_LTLIBRARIES = libgimpcolor-1.3.la libgimpcolor_1_3_la_SOURCES = \ - gimpcolor.h \ - gimpcolortypes.h \ - gimpcolorspace.c \ - gimpcolorspace.h \ - gimphsv.c \ - gimphsv.h \ - gimprgb.c \ + gimpcolor.h \ + gimpcolortypes.h \ + gimpadaptivesupersample.c \ + gimpadaptivesupersample.h \ + gimpbilinear.c \ + gimpbilinear.h \ + gimpcolorspace.c \ + gimpcolorspace.h \ + gimphsv.c \ + gimphsv.h \ + gimprgb.c \ gimprgb.h libgimpcolorinclude_HEADERS = \ - gimpcolor.h \ - gimpcolortypes.h \ - gimpcolorspace.h \ - gimphsv.h \ + gimpcolor.h \ + gimpcolortypes.h \ + gimpadaptivesupersample.h \ + gimpbilinear.h \ + gimpcolorspace.h \ + gimphsv.h \ gimprgb.h libgimpcolor_1_3_la_LDFLAGS = \ diff --git a/libgimpcolor/gimpadaptivesupersample.c b/libgimpcolor/gimpadaptivesupersample.c index 8cf6e745c4..7a8d1a28e0 100644 --- a/libgimpcolor/gimpadaptivesupersample.c +++ b/libgimpcolor/gimpadaptivesupersample.c @@ -21,10 +21,12 @@ #include -#include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "gimpcolortypes.h" + #include "gimpadaptivesupersample.h" +#include "gimprgb.h" /*********************************************************************/ diff --git a/libgimpcolor/gimpadaptivesupersample.h b/libgimpcolor/gimpadaptivesupersample.h index fe71bfe65d..aa86756dd6 100644 --- a/libgimpcolor/gimpadaptivesupersample.h +++ b/libgimpcolor/gimpadaptivesupersample.h @@ -30,20 +30,6 @@ extern "C" { /* adaptive supersampling function taken from LibGCK */ -typedef void (* GimpRenderFunc) (gdouble x, - gdouble y, - GimpRGB *color, - gpointer data); -typedef void (* GimpPutPixelFunc) (gint x, - gint y, - GimpRGB *color, - gpointer data); -typedef void (* GimpProgressFunc) (gint min, - gint max, - gint current, - gpointer data); - - gulong gimp_adaptive_supersample_area (gint x1, gint y1, gint x2, diff --git a/libgimpcolor/gimpbilinear.c b/libgimpcolor/gimpbilinear.c index 062c3fbbc2..700ac5f193 100644 --- a/libgimpcolor/gimpbilinear.c +++ b/libgimpcolor/gimpbilinear.c @@ -21,9 +21,10 @@ #include -#include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "gimpcolortypes.h" + #include "gimpbilinear.h" diff --git a/libgimpcolor/gimpcolor.h b/libgimpcolor/gimpcolor.h index 5e71dcc8dd..692b0771cf 100644 --- a/libgimpcolor/gimpcolor.h +++ b/libgimpcolor/gimpcolor.h @@ -23,6 +23,8 @@ #include +#include +#include #include #include #include diff --git a/libgimpcolor/gimpcolortypes.h b/libgimpcolor/gimpcolortypes.h index 3e348d556b..360fe2674f 100644 --- a/libgimpcolor/gimpcolortypes.h +++ b/libgimpcolor/gimpcolortypes.h @@ -47,6 +47,20 @@ struct _GimpHSV }; +typedef void (* GimpRenderFunc) (gdouble x, + gdouble y, + GimpRGB *color, + gpointer data); +typedef void (* GimpPutPixelFunc) (gint x, + gint y, + GimpRGB *color, + gpointer data); +typedef void (* GimpProgressFunc) (gint min, + gint max, + gint current, + gpointer data); + + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index 9aed928add..8b10628cd2 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -29,7 +29,7 @@ #include "libgimpwidgets/gimpwidgets.h" #include "libgimp/gimpcolorselector.h" -#include "apptypes.h" +#include "core/core-types.h" #include "widgets/gimpdnd.h" diff --git a/tools/pdbgen/pdb/paths.pdb b/tools/pdbgen/pdb/paths.pdb index b9626563d2..11a76cec8a 100644 --- a/tools/pdbgen/pdb/paths.pdb +++ b/tools/pdbgen/pdb/paths.pdb @@ -763,7 +763,7 @@ CODE } -@headers = qw( "gimage.h" "path.h" "pathP.h"); +@headers = qw( "gimage.h" "path.h" "pathP.h" "tools/tools-types.h"); @procs = qw(path_list path_get_points path_get_current path_set_current path_set_points path_stroke_current path_get_point_at_dist