From dd4b03ec29cff950f2bc13dd519dfb84e2dd47da Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 21 May 2001 20:30:16 +0000 Subject: [PATCH] app/app_procs.c app/datafiles.c app/devices.c app/docindex.c 2001-05-21 Michael Natterer * app/app_procs.c * app/datafiles.c * app/devices.c * app/docindex.c * app/gdisplay_color.c * app/gdisplay_color_ui.c * app/gimphelp.c * app/main.c * app/module_db.c * app/plug_in.c * app/resize.c * app/resolution_calibrate.c * app/undo_history.c * app/user_install.c * app/core/gimpbrushpipe.c * app/core/gimpdata.c * app/core/gimpgradient.c * app/core/gimppalette.c * app/gui/about-dialog.c * app/gui/file-new-dialog.c * app/gui/gradient-editor.c * app/gui/layers-commands.c * app/gui/menus.c * app/gui/palette-editor.c * app/gui/session.c * app/gui/splash.c * app/gui/tips-dialog.c * app/pdb/image_cmds.c * app/pdb/text_tool_cmds.c * app/tools/curves.c * app/tools/gimptexttool.c * app/tools/levels.c * app/widgets/gimpdnd.c * app/widgets/gimppreview.c * libgimp/gimpcolordisplay.h * libgimpbase/gimpbase.h * libgimpwidgets/gimpcolorarea.c * libgimpwidgets/libgimp-glue.c * plug-ins/common/gih.c * plug-ins/common/psp.c * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/text_tool.pdb: last checkin didn't get all #include "libgimp/i_dont_exist_any_more.h". This one should make it compile again without old crap hanging around in /include. --- ChangeLog | 49 +++++++++++++++++++- app/actions/layers-commands.c | 2 +- app/actions/plug-in-commands.c | 6 +-- app/app_procs.c | 3 +- app/base/curves.c | 3 +- app/core/gimpbrushpipe-load.c | 3 +- app/core/gimpbrushpipe.c | 3 +- app/core/gimpdata.c | 2 +- app/core/gimpdatafiles.c | 4 +- app/core/gimpgradient.c | 2 +- app/core/gimppalette-load.c | 1 - app/core/gimppalette-save.c | 1 - app/core/gimppalette.c | 1 - app/datafiles.c | 4 +- app/devices.c | 2 +- app/dialogs/about-dialog.c | 2 +- app/dialogs/image-new-dialog.c | 2 +- app/dialogs/module-dialog.c | 2 +- app/dialogs/resize-dialog.c | 2 - app/dialogs/resolution-calibrate-dialog.c | 4 +- app/dialogs/tips-dialog.c | 2 +- app/dialogs/user-install-dialog.c | 4 +- app/display/gimpdisplayshell-filter-dialog.c | 5 +- app/display/gimpdisplayshell-filter.c | 4 +- app/docindex.c | 3 +- app/gdisplay_color.c | 4 +- app/gdisplay_color_ui.c | 5 +- app/gimphelp.c | 2 +- app/gui/about-dialog.c | 2 +- app/gui/device-status-dialog.c | 2 +- app/gui/file-new-dialog.c | 2 +- app/gui/gradient-editor.c | 3 +- app/gui/input-dialog.c | 2 +- app/gui/layers-commands.c | 2 +- app/gui/menus.c | 2 +- app/gui/module-browser.c | 2 +- app/gui/palette-editor.c | 2 +- app/gui/plug-in-commands.c | 6 +-- app/gui/plug-in-menus.c | 6 +-- app/gui/resize-dialog.c | 2 - app/gui/resolution-calibrate-dialog.c | 4 +- app/gui/session.c | 2 +- app/gui/splash.c | 2 +- app/gui/tips-dialog.c | 2 +- app/gui/user-install-dialog.c | 4 +- app/main.c | 7 +-- app/menus/menus.c | 2 +- app/menus/plug-in-menus.c | 6 +-- app/module_db.c | 2 +- app/pdb/image_cmds.c | 2 +- app/pdb/text_tool_cmds.c | 2 +- app/plug-in/gimpplugin-message.c | 6 +-- app/plug-in/gimpplugin-progress.c | 6 +-- app/plug-in/gimpplugin.c | 6 +-- app/plug-in/gimppluginmanager-call.c | 6 +-- app/plug-in/gimppluginmanager-run.c | 6 +-- app/plug-in/gimppluginmanager.c | 6 +-- app/plug-in/gimppluginshm.c | 6 +-- app/plug-in/plug-in-def.c | 6 +-- app/plug-in/plug-in-message.c | 6 +-- app/plug-in/plug-in-params.c | 6 +-- app/plug-in/plug-in-progress.c | 6 +-- app/plug-in/plug-in-run.c | 6 +-- app/plug-in/plug-in-shm.c | 6 +-- app/plug-in/plug-in.c | 6 +-- app/plug-in/plug-ins.c | 6 +-- app/plug_in.c | 6 +-- app/resize.c | 2 - app/resolution_calibrate.c | 4 +- app/tools/curves.c | 3 +- app/tools/gimpcurvestool.c | 3 +- app/tools/gimplevelstool.c | 3 +- app/tools/gimptexttool.c | 3 +- app/tools/levels.c | 3 +- app/undo_history.c | 3 +- app/user_install.c | 4 +- app/widgets/gimpcolordisplayeditor.c | 5 +- app/widgets/gimpdeviceinfo.c | 2 +- app/widgets/gimpdevices.c | 2 +- app/widgets/gimpdnd.c | 2 +- app/widgets/gimpgradienteditor.c | 3 +- app/widgets/gimphelp.c | 2 +- app/widgets/gimpitemfactory.c | 2 +- app/widgets/gimppaletteeditor.c | 2 +- app/widgets/gimppreview.c | 3 +- app/widgets/gimppreviewrenderer.c | 3 +- app/widgets/gimpview.c | 3 +- app/widgets/gimpviewrenderer.c | 3 +- libgimp/gimpcolordisplay.h | 2 +- libgimpbase/gimpbase.h | 4 ++ libgimpbase/gimpdatafiles.c | 4 +- libgimpwidgets/gimpcolorarea.c | 2 +- libgimpwidgets/libgimp-glue.c | 5 +- plug-ins/common/gih.c | 2 +- plug-ins/common/psp.c | 2 +- tools/pdbgen/pdb/image.pdb | 2 +- tools/pdbgen/pdb/text_tool.pdb | 2 +- 97 files changed, 175 insertions(+), 201 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcf2406c21..9303aabd86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2001-05-21 Michael Natterer + + * app/app_procs.c + * app/datafiles.c + * app/devices.c + * app/docindex.c + * app/gdisplay_color.c + * app/gdisplay_color_ui.c + * app/gimphelp.c + * app/main.c + * app/module_db.c + * app/plug_in.c + * app/resize.c + * app/resolution_calibrate.c + * app/undo_history.c + * app/user_install.c + * app/core/gimpbrushpipe.c + * app/core/gimpdata.c + * app/core/gimpgradient.c + * app/core/gimppalette.c + * app/gui/about-dialog.c + * app/gui/file-new-dialog.c + * app/gui/gradient-editor.c + * app/gui/layers-commands.c + * app/gui/menus.c + * app/gui/palette-editor.c + * app/gui/session.c + * app/gui/splash.c + * app/gui/tips-dialog.c + * app/pdb/image_cmds.c + * app/pdb/text_tool_cmds.c + * app/tools/curves.c + * app/tools/gimptexttool.c + * app/tools/levels.c + * app/widgets/gimpdnd.c + * app/widgets/gimppreview.c + * libgimp/gimpcolordisplay.h + * libgimpbase/gimpbase.h + * libgimpwidgets/gimpcolorarea.c + * libgimpwidgets/libgimp-glue.c + * plug-ins/common/gih.c + * plug-ins/common/psp.c + * tools/pdbgen/pdb/image.pdb + * tools/pdbgen/pdb/text_tool.pdb: last checkin didn't get all + #include "libgimp/i_dont_exist_any_more.h". This one should make + it compile again without old crap hanging around in /include. + 2001-05-21 Michael Natterer * libgimp/gimp.def: removed removed symbols :) @@ -141,7 +188,7 @@ Mon May 21 04:08:29 CEST 2001 Marc Lehmann * app/gui/menus.c: use the correct callback for opening L&C. - * app/widgets/gimpdock.c: set the window title, the WM name/class + * app/widgets/gimpdock.c: set the window title, the WM-name/class and the icon. 2001-05-16 Michael Natterer diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index 40bb9bfb01..fc11988f86 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -23,8 +23,8 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index a8e9decea0..8d5ba674fa 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/app_procs.c b/app/app_procs.c index 51c27e35b8..1fa9fdbf96 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -26,9 +26,8 @@ #include -#include "libgimp/gimplimits.h" +#include "libgimpbase/gimpbase.h" #include "libgimp/gimpfeatures.h" -#include "libgimp/gimpenv.h" #include "core/core-types.h" #include "tools/tools-types.h" diff --git a/app/base/curves.c b/app/base/curves.c index f6ddd96853..5043c33319 100644 --- a/app/base/curves.c +++ b/app/base/curves.c @@ -25,6 +25,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -42,8 +43,6 @@ #include "tool_options.h" #include "tools.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index 9b9c36cec3..1df04d07e2 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -42,6 +42,7 @@ #endif #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpparasiteio.h" #include "core-types.h" @@ -54,8 +55,6 @@ /* this needs to go away */ #include "tools/gimppainttool.h" -#include "libgimp/gimpparasiteio.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index 9b9c36cec3..1df04d07e2 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -42,6 +42,7 @@ #endif #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpparasiteio.h" #include "core-types.h" @@ -54,8 +55,6 @@ /* this needs to go away */ #include "tools/gimppainttool.h" -#include "libgimp/gimpparasiteio.h" - #include "libgimp/gimpintl.h" diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c index f36a89155a..b5dbb1f599 100644 --- a/app/core/gimpdata.c +++ b/app/core/gimpdata.c @@ -31,7 +31,7 @@ #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "core-types.h" diff --git a/app/core/gimpdatafiles.c b/app/core/gimpdatafiles.c index ec29c24c29..f2f515491e 100644 --- a/app/core/gimpdatafiles.c +++ b/app/core/gimpdatafiles.c @@ -45,12 +45,12 @@ #endif #endif /* G_OS_WIN32 */ +#include "libgimpbase/gimpbase.h" + #include "core/core-types.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" - static gboolean filestat_valid = FALSE; static struct stat filestat; diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c index 157ef810fe..0c0861f30f 100644 --- a/app/core/gimpgradient.c +++ b/app/core/gimpgradient.c @@ -26,7 +26,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "libgimp/gimplimits.h" +#include "libgimpbase/gimpbase.h" #include "core-types.h" diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index 9274b6e949..3a625dfc09 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -28,7 +28,6 @@ #include #include "libgimpcolor/gimpcolor.h" -#include "libgimp/gimpenv.h" #include "core-types.h" diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index 9274b6e949..3a625dfc09 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -28,7 +28,6 @@ #include #include "libgimpcolor/gimpcolor.h" -#include "libgimp/gimpenv.h" #include "core-types.h" diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index 9274b6e949..3a625dfc09 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -28,7 +28,6 @@ #include #include "libgimpcolor/gimpcolor.h" -#include "libgimp/gimpenv.h" #include "core-types.h" diff --git a/app/datafiles.c b/app/datafiles.c index ec29c24c29..f2f515491e 100644 --- a/app/datafiles.c +++ b/app/datafiles.c @@ -45,12 +45,12 @@ #endif #endif /* G_OS_WIN32 */ +#include "libgimpbase/gimpbase.h" + #include "core/core-types.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" - static gboolean filestat_valid = FALSE; static struct stat filestat; diff --git a/app/devices.c b/app/devices.c index 59fe39328d..4ac7b4ee8a 100644 --- a/app/devices.c +++ b/app/devices.c @@ -24,6 +24,7 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -47,7 +48,6 @@ #include "devices.h" #include "dialog_handler.h" #include "gimprc.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpintl.h" diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index f55cfb48b8..c7b59063c5 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -27,8 +27,8 @@ #include #include "libgimp/gimpfeatures.h" -#include "libgimp/gimpenv.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index 71a9713b06..2fda7dcbb1 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -21,8 +21,8 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index 4df3276446..a35b4d9daf 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -33,6 +33,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,7 +45,6 @@ #include "gimprc.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" #include "libgimp/gimpintl.h" diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index 0529464d11..737ec55233 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -35,8 +35,6 @@ #include "resize.h" #include "undo.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c index 66cfce8933..878ca85e88 100644 --- a/app/dialogs/resolution-calibrate-dialog.c +++ b/app/dialogs/resolution-calibrate-dialog.c @@ -21,6 +21,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -30,9 +31,6 @@ #include "resolution_calibrate.h" #include "unitrc.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index ec11ab55c2..d59212c726 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -25,8 +25,8 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "apptypes.h" diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 90e0231ac4..acda3ed250 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -31,6 +31,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,9 +45,6 @@ #include "unitrc.h" #include "user_install.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" #include "pixmaps/eek.xpm" diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 3a8c731590..a0b25cca6e 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -20,7 +20,10 @@ #include +#include "libgimpbase/gimpbsse.h" + #include "apptypes.h" + #include "color_area.h" #include "dialog_handler.h" #include "gdisplay.h" @@ -29,8 +32,6 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/gimpparasite.h" - #include "libgimp/gimpintl.h" diff --git a/app/display/gimpdisplayshell-filter.c b/app/display/gimpdisplayshell-filter.c index f7214a5f27..ff7bf6acf1 100644 --- a/app/display/gimpdisplayshell-filter.c +++ b/app/display/gimpdisplayshell-filter.c @@ -22,14 +22,14 @@ #include +#include "libgimpbase/gimpbase.h" + #include "apptypes.h" #include "gdisplay_color.h" #include "gdisplay.h" #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/gimpparasite.h" - #include typedef struct _ColorDisplayInfo ColorDisplayInfo; diff --git a/app/docindex.c b/app/docindex.c index 4fabd05f15..1af33625ea 100644 --- a/app/docindex.c +++ b/app/docindex.c @@ -22,6 +22,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -37,8 +38,6 @@ #include "gdisplay.h" #include "ops_buttons.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" #include "pixmaps/folder.xpm" diff --git a/app/gdisplay_color.c b/app/gdisplay_color.c index f7214a5f27..ff7bf6acf1 100644 --- a/app/gdisplay_color.c +++ b/app/gdisplay_color.c @@ -22,14 +22,14 @@ #include +#include "libgimpbase/gimpbase.h" + #include "apptypes.h" #include "gdisplay_color.h" #include "gdisplay.h" #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/gimpparasite.h" - #include typedef struct _ColorDisplayInfo ColorDisplayInfo; diff --git a/app/gdisplay_color_ui.c b/app/gdisplay_color_ui.c index 3a8c731590..a0b25cca6e 100644 --- a/app/gdisplay_color_ui.c +++ b/app/gdisplay_color_ui.c @@ -20,7 +20,10 @@ #include +#include "libgimpbase/gimpbsse.h" + #include "apptypes.h" + #include "color_area.h" #include "dialog_handler.h" #include "gdisplay.h" @@ -29,8 +32,6 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/gimpparasite.h" - #include "libgimp/gimpintl.h" diff --git a/app/gimphelp.c b/app/gimphelp.c index 9293027daf..2dd1502c32 100644 --- a/app/gimphelp.c +++ b/app/gimphelp.c @@ -31,8 +31,8 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "core/core-types.h" diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c index f55cfb48b8..c7b59063c5 100644 --- a/app/gui/about-dialog.c +++ b/app/gui/about-dialog.c @@ -27,8 +27,8 @@ #include #include "libgimp/gimpfeatures.h" -#include "libgimp/gimpenv.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" diff --git a/app/gui/device-status-dialog.c b/app/gui/device-status-dialog.c index 59fe39328d..4ac7b4ee8a 100644 --- a/app/gui/device-status-dialog.c +++ b/app/gui/device-status-dialog.c @@ -24,6 +24,7 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -47,7 +48,6 @@ #include "devices.h" #include "dialog_handler.h" #include "gimprc.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c index 71a9713b06..2fda7dcbb1 100644 --- a/app/gui/file-new-dialog.c +++ b/app/gui/file-new-dialog.c @@ -21,8 +21,8 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index 5800d60a3a..b6d58a8ac5 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -59,9 +59,8 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/gui/input-dialog.c b/app/gui/input-dialog.c index 59fe39328d..4ac7b4ee8a 100644 --- a/app/gui/input-dialog.c +++ b/app/gui/input-dialog.c @@ -24,6 +24,7 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -47,7 +48,6 @@ #include "devices.h" #include "dialog_handler.h" #include "gimprc.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/layers-commands.c b/app/gui/layers-commands.c index 40bb9bfb01..fc11988f86 100644 --- a/app/gui/layers-commands.c +++ b/app/gui/layers-commands.c @@ -23,8 +23,8 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/gui/menus.c b/app/gui/menus.c index f3ab1e2935..9fdc0cf126 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -24,7 +24,7 @@ #include #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index 4df3276446..a35b4d9daf 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -33,6 +33,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,7 +45,6 @@ #include "gimprc.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" #include "libgimp/gimpintl.h" diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 546aa1f69f..cadb0dfb54 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -21,8 +21,8 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "apptypes.h" #include "widgets/widgets-types.h" diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index a8e9decea0..8d5ba674fa 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index a8e9decea0..8d5ba674fa 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/gui/resize-dialog.c b/app/gui/resize-dialog.c index 0529464d11..737ec55233 100644 --- a/app/gui/resize-dialog.c +++ b/app/gui/resize-dialog.c @@ -35,8 +35,6 @@ #include "resize.h" #include "undo.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/gui/resolution-calibrate-dialog.c b/app/gui/resolution-calibrate-dialog.c index 66cfce8933..878ca85e88 100644 --- a/app/gui/resolution-calibrate-dialog.c +++ b/app/gui/resolution-calibrate-dialog.c @@ -21,6 +21,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -30,9 +31,6 @@ #include "resolution_calibrate.h" #include "unitrc.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/gui/session.c b/app/gui/session.c index b0810d653d..e830c33056 100644 --- a/app/gui/session.c +++ b/app/gui/session.c @@ -47,7 +47,7 @@ #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "apptypes.h" #include "widgets/widgets-types.h" diff --git a/app/gui/splash.c b/app/gui/splash.c index 485b1725a3..42946fc6d1 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -23,7 +23,7 @@ #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "libgimp/gimpfeatures.h" #include "libgimpwidgets/gimpwidgets.h" diff --git a/app/gui/tips-dialog.c b/app/gui/tips-dialog.c index ec11ab55c2..d59212c726 100644 --- a/app/gui/tips-dialog.c +++ b/app/gui/tips-dialog.c @@ -25,8 +25,8 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "apptypes.h" diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index 90e0231ac4..acda3ed250 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -31,6 +31,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,9 +45,6 @@ #include "unitrc.h" #include "user_install.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" #include "pixmaps/eek.xpm" diff --git a/app/main.c b/app/main.c index e960d75fe3..ce508dbbfd 100644 --- a/app/main.c +++ b/app/main.c @@ -38,12 +38,9 @@ #include -#include "libgimp/gimpfeatures.h" -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" -#ifndef G_OS_WIN32 -#include "libgimp/gimpsignal.h" -#endif +#include "libgimp/gimpfeatures.h" #include "apptypes.h" diff --git a/app/menus/menus.c b/app/menus/menus.c index f3ab1e2935..9fdc0cf126 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -24,7 +24,7 @@ #include #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index a8e9decea0..8d5ba674fa 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/module_db.c b/app/module_db.c index 4df3276446..a35b4d9daf 100644 --- a/app/module_db.c +++ b/app/module_db.c @@ -33,6 +33,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,7 +45,6 @@ #include "gimprc.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" #include "libgimp/gimpintl.h" diff --git a/app/pdb/image_cmds.c b/app/pdb/image_cmds.c index d8d12a203c..b5de67342d 100644 --- a/app/pdb/image_cmds.c +++ b/app/pdb/image_cmds.c @@ -45,7 +45,7 @@ #include "gimage.h" #include "libgimp/gimpintl.h" -#include "libgimp/gimplimits.h" +#include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" static ProcRecord image_list_proc; diff --git a/app/pdb/text_tool_cmds.c b/app/pdb/text_tool_cmds.c index 1c7092b312..9cac5aae05 100644 --- a/app/pdb/text_tool_cmds.c +++ b/app/pdb/text_tool_cmds.c @@ -37,7 +37,7 @@ #include "drawable.h" #include "tools/gimptexttool.h" -#include "libgimp/gimplimits.h" +#include "libgimpbase/gimpbase.h" static ProcRecord text_fontname_proc; static ProcRecord text_get_extents_fontname_proc; diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/plug_in.c b/app/plug_in.c index a8e9decea0..8d5ba674fa 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -80,14 +80,12 @@ #include #endif -#include "libgimp/gimpenv.h" - -#include "core/core-types.h" - #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" +#include "core/core-types.h" + #include "base/tile.h" #include "base/tile-manager.h" diff --git a/app/resize.c b/app/resize.c index 0529464d11..737ec55233 100644 --- a/app/resize.c +++ b/app/resize.c @@ -35,8 +35,6 @@ #include "resize.h" #include "undo.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/resolution_calibrate.c b/app/resolution_calibrate.c index 66cfce8933..878ca85e88 100644 --- a/app/resolution_calibrate.c +++ b/app/resolution_calibrate.c @@ -21,6 +21,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -30,9 +31,6 @@ #include "resolution_calibrate.h" #include "unitrc.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" diff --git a/app/tools/curves.c b/app/tools/curves.c index f6ddd96853..5043c33319 100644 --- a/app/tools/curves.c +++ b/app/tools/curves.c @@ -25,6 +25,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -42,8 +43,6 @@ #include "tool_options.h" #include "tools.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index f6ddd96853..5043c33319 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -25,6 +25,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -42,8 +43,6 @@ #include "tool_options.h" #include "tools.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index c819aa3db8..aafa7a2c32 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -26,6 +26,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -44,8 +45,6 @@ #include "tool_options.h" #include "tools.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 118fcd672b..b155ec4036 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -31,6 +31,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "tools-types.h" @@ -61,8 +62,6 @@ #include "tool_manager.h" #include "tool_options.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" #define WANT_TEXT_BITS diff --git a/app/tools/levels.c b/app/tools/levels.c index c819aa3db8..aafa7a2c32 100644 --- a/app/tools/levels.c +++ b/app/tools/levels.c @@ -26,6 +26,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -44,8 +45,6 @@ #include "tool_options.h" #include "tools.h" -#include "libgimp/gimpenv.h" - #include "libgimp/gimpintl.h" diff --git a/app/undo_history.c b/app/undo_history.c index e0e024d6e0..075b725e8a 100644 --- a/app/undo_history.c +++ b/app/undo_history.c @@ -45,6 +45,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -62,8 +63,6 @@ #include "gimprc.h" #include "undo.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" #include "pixmaps/raise.xpm" diff --git a/app/user_install.c b/app/user_install.c index 90e0231ac4..acda3ed250 100644 --- a/app/user_install.c +++ b/app/user_install.c @@ -31,6 +31,7 @@ #include #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" @@ -44,9 +45,6 @@ #include "unitrc.h" #include "user_install.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" - #include "libgimp/gimpintl.h" #include "pixmaps/eek.xpm" diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index 3a8c731590..a0b25cca6e 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -20,7 +20,10 @@ #include +#include "libgimpbase/gimpbsse.h" + #include "apptypes.h" + #include "color_area.h" #include "dialog_handler.h" #include "gdisplay.h" @@ -29,8 +32,6 @@ #include "gimpimageP.h" #include "gimpui.h" -#include "libgimp/gimpparasite.h" - #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index 59fe39328d..4ac7b4ee8a 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -24,6 +24,7 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -47,7 +48,6 @@ #include "devices.h" #include "dialog_handler.h" #include "gimprc.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c index 59fe39328d..4ac7b4ee8a 100644 --- a/app/widgets/gimpdevices.c +++ b/app/widgets/gimpdevices.c @@ -24,6 +24,7 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -47,7 +48,6 @@ #include "devices.h" #include "dialog_handler.h" #include "gimprc.h" -#include "libgimp/gimpenv.h" #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index 79467194bb..e6cb2ed571 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -24,8 +24,8 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimplimits.h" #include "widgets-types.h" diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 5800d60a3a..b6d58a8ac5 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -59,9 +59,8 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" -#include "libgimp/gimplimits.h" #include "core/core-types.h" diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c index 9293027daf..2dd1502c32 100644 --- a/app/widgets/gimphelp.c +++ b/app/widgets/gimphelp.c @@ -31,8 +31,8 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "core/core-types.h" diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index f3ab1e2935..9fdc0cf126 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -24,7 +24,7 @@ #include #include -#include "libgimp/gimpenv.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "core/core-types.h" diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 546aa1f69f..cadb0dfb54 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -21,8 +21,8 @@ #include #include "libgimpcolor/gimpcolor.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpenv.h" #include "apptypes.h" #include "widgets/widgets-types.h" diff --git a/app/widgets/gimppreview.c b/app/widgets/gimppreview.c index 137eda29bf..ba1009e813 100644 --- a/app/widgets/gimppreview.c +++ b/app/widgets/gimppreview.c @@ -27,6 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" @@ -54,8 +55,6 @@ #include "image_render.h" -#include "libgimp/gimplimits.h" - #define PREVIEW_POPUP_DELAY 150 diff --git a/app/widgets/gimppreviewrenderer.c b/app/widgets/gimppreviewrenderer.c index 137eda29bf..ba1009e813 100644 --- a/app/widgets/gimppreviewrenderer.c +++ b/app/widgets/gimppreviewrenderer.c @@ -27,6 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" @@ -54,8 +55,6 @@ #include "image_render.h" -#include "libgimp/gimplimits.h" - #define PREVIEW_POPUP_DELAY 150 diff --git a/app/widgets/gimpview.c b/app/widgets/gimpview.c index 137eda29bf..ba1009e813 100644 --- a/app/widgets/gimpview.c +++ b/app/widgets/gimpview.c @@ -27,6 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" @@ -54,8 +55,6 @@ #include "image_render.h" -#include "libgimp/gimplimits.h" - #define PREVIEW_POPUP_DELAY 150 diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 137eda29bf..ba1009e813 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -27,6 +27,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" @@ -54,8 +55,6 @@ #include "image_render.h" -#include "libgimp/gimplimits.h" - #define PREVIEW_POPUP_DELAY 150 diff --git a/libgimp/gimpcolordisplay.h b/libgimp/gimpcolordisplay.h index 60428be2e1..27c8415455 100644 --- a/libgimp/gimpcolordisplay.h +++ b/libgimp/gimpcolordisplay.h @@ -22,7 +22,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/libgimpbase/gimpbase.h b/libgimpbase/gimpbase.h index 9093d777df..2bf405a0cf 100644 --- a/libgimpbase/gimpbase.h +++ b/libgimpbase/gimpbase.h @@ -29,5 +29,9 @@ #include #include +#ifndef G_OS_WIN32 +#include +#endif + #endif /* __GIMP_BASE_H__ */ diff --git a/libgimpbase/gimpdatafiles.c b/libgimpbase/gimpdatafiles.c index ec29c24c29..f2f515491e 100644 --- a/libgimpbase/gimpdatafiles.c +++ b/libgimpbase/gimpdatafiles.c @@ -45,12 +45,12 @@ #endif #endif /* G_OS_WIN32 */ +#include "libgimpbase/gimpbase.h" + #include "core/core-types.h" #include "datafiles.h" -#include "libgimp/gimpenv.h" - static gboolean filestat_valid = FALSE; static struct stat filestat; diff --git a/libgimpwidgets/gimpcolorarea.c b/libgimpwidgets/gimpcolorarea.c index 57442cd30c..78ea32f1dd 100644 --- a/libgimpwidgets/gimpcolorarea.c +++ b/libgimpwidgets/gimpcolorarea.c @@ -25,7 +25,7 @@ #include #include "libgimpcolor/gimpcolor.h" -#include "libgimp/gimplimits.h" +#include "libgimpbase/gimpbase.h" #include "gimpwidgetstypes.h" diff --git a/libgimpwidgets/libgimp-glue.c b/libgimpwidgets/libgimp-glue.c index 5282ecd3d9..0a71139961 100644 --- a/libgimpwidgets/libgimp-glue.c +++ b/libgimpwidgets/libgimp-glue.c @@ -41,10 +41,11 @@ gimp_unit_get_symbol */ #include -#include + +#include "libgimpcolor/gimpcolortypes.h" +#include "libgimpbase/gimpunit.h" #include "libgimp/gimppalette_pdb.h" -#include "libgimp/gimpunit.h" /* too much depencencies diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index 5538945d5a..cc12bae26b 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -66,7 +66,7 @@ #include #include -#include +#include #include "app/core/gimpbrush-header.h" #include "app/core/gimppattern-header.h" diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c index 8dbd2c7a64..94e5a16a2b 100644 --- a/plug-ins/common/psp.c +++ b/plug-ins/common/psp.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include "libgimp/stdplugins-intl.h" diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index 3fd75b199f..4d1b3b7671 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -1462,7 +1462,7 @@ CODE @headers = qw( "gimage.h" "context_manager.h" "core/gimpcontainer.h" "core/gimplist.h" "base/temp-buf.h" - "libgimpmath/gimpmath.h" "libgimp/gimplimits.h" + "libgimpmath/gimpmath.h" "libgimpbase/gimpbase.h" "libgimp/gimpintl.h"); $extra{app}->{code} = <<'CODE'; diff --git a/tools/pdbgen/pdb/text_tool.pdb b/tools/pdbgen/pdb/text_tool.pdb index 0010e2db28..7313fbefed 100644 --- a/tools/pdbgen/pdb/text_tool.pdb +++ b/tools/pdbgen/pdb/text_tool.pdb @@ -254,7 +254,7 @@ HELP } @headers = qw("appenv.h" "tools/tools-types.h" "tools/gimptexttool.h" - "libgimp/gimplimits.h" ); + "libgimpbase/gimpbase.h" ); $extra{app}->{code} = <<'CODE'; static gchar * -- GitLab