From 6d506d51bb4361eb9a8ff97cc0208ed0535bb793 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 19 Jan 2004 01:54:11 +0000 Subject: [PATCH] include "libgimpbase/gimpbase.h" where needed; removed now unnecessary 2004-01-19 Sven Neumann * app/*/*.c: include "libgimpbase/gimpbase.h" where needed; removed now unnecessary inclusions of "file/file-utils.h". --- ChangeLog | 5 +++++ app/base/temp-buf.c | 3 +-- app/base/tile-swap.c | 6 +++--- app/config/gimpconfig-path.c | 6 ++---- app/config/gimpconfig-utils.c | 2 -- app/config/gimprc.c | 2 -- app/config/gimpscanner.c | 2 -- app/core/gimpbrush-load.c | 2 -- app/core/gimpbrush.c | 2 -- app/core/gimpbrushgenerated-load.c | 3 +-- app/core/gimpbrushgenerated-save.c | 3 +-- app/core/gimpbrushgenerated.c | 3 +-- app/core/gimpbrushpipe-load.c | 5 ++--- app/core/gimpbrushpipe.c | 5 ++--- app/core/gimpenvirontable.c | 2 -- app/core/gimpgradient.c | 2 -- app/core/gimppalette-load.c | 2 -- app/core/gimppalette-save.c | 2 -- app/core/gimppalette.c | 2 -- app/core/gimppattern-load.c | 2 -- app/core/gimppattern.c | 2 -- app/dialogs/info-window.c | 2 -- app/dialogs/user-install-dialog.c | 4 +--- app/gui/info-window.c | 2 -- app/gui/themes.c | 2 -- app/gui/user-install-dialog.c | 4 +--- app/plug-in/gimpenvirontable.c | 2 -- app/plug-in/gimpplugin-message.c | 2 -- app/plug-in/gimpplugin.c | 2 -- app/plug-in/gimppluginmanager.c | 2 -- app/plug-in/plug-in-message.c | 2 -- app/plug-in/plug-in-rc.c | 2 -- app/plug-in/plug-in.c | 2 -- app/plug-in/plug-ins.c | 2 -- app/tools/gimpcurvestool.c | 2 -- app/tools/gimplevelstool.c | 2 -- app/vectors/gimpvectors-export.c | 4 ++-- app/widgets/gimperrorconsole.c | 3 +-- app/widgets/gimptexteditor.c | 3 +-- app/xcf/xcf.c | 4 ++-- devel-docs/libgimpbase/tmpl/gimputils.sgml | 9 +++++++++ libgimpconfig/gimpconfig-path.c | 6 ++---- libgimpconfig/gimpconfig-utils.c | 2 -- libgimpconfig/gimpscanner.c | 2 -- 44 files changed, 37 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index be20694b31..84c0167ef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-19 Sven Neumann + + * app/*/*.c: include "libgimpbase/gimpbase.h" where needed; removed + now unnecessary inclusions of "file/file-utils.h". + 2004-01-19 Sven Neumann * app/file/file-utils.[ch]: removed file_utils_filename_to_utf8() ... diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index c3d626018e..3a39ddf6c7 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -33,6 +33,7 @@ #include /* For _getpid() */ #endif +#include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" #include "base-types.h" @@ -40,8 +41,6 @@ #include "config/gimpbaseconfig.h" #include "config/gimpconfig-path.h" -#include "file/file-utils.h" - #include "pixel-region.h" #include "temp-buf.h" diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c index db40b1bd87..a26609de66 100644 --- a/app/base/tile-swap.c +++ b/app/base/tile-swap.c @@ -32,8 +32,10 @@ #include +#include "libgimpbase/gimpbase.h" + #ifdef G_OS_WIN32 -#include +#include "libgimpbase/gimpwin32-io.h" #endif #include "base-types.h" @@ -45,8 +47,6 @@ #define _O_TEMPORARY 0 #endif -#include "file/file-utils.h" - #include "tile.h" #include "tile-private.h" #include "tile-swap.h" diff --git a/app/config/gimpconfig-path.c b/app/config/gimpconfig-path.c index 7ab68b5ea0..5276943564 100644 --- a/app/config/gimpconfig-path.c +++ b/app/config/gimpconfig-path.c @@ -26,9 +26,7 @@ #include -#include "libgimpbase/gimpenv.h" - -#include "file/file-utils.h" +#include "libgimpbase/gimpbase.h" #include "gimpconfig-path.h" @@ -161,7 +159,7 @@ gimp_config_path_expand_only (const gchar *path, substs = g_renew (gchar *, substs, 2 * (n_substs + SUBSTS_ALLOC)); substs[2*n_substs] = token; - substs[2*n_substs + 1] = gimp_filename_to_utf8 (s); + substs[2*n_substs + 1] = (gchar *) gimp_filename_to_utf8 (s); n_substs++; length += strlen (s); diff --git a/app/config/gimpconfig-utils.c b/app/config/gimpconfig-utils.c index bd84b78b5c..c2ea1fedf5 100644 --- a/app/config/gimpconfig-utils.c +++ b/app/config/gimpconfig-utils.c @@ -29,8 +29,6 @@ #include "libgimpbase/gimpbase.h" -#include "file/file-utils.h" - #include "config-types.h" #include "gimpconfig.h" diff --git a/app/config/gimprc.c b/app/config/gimprc.c index b76b75f034..2789602a99 100644 --- a/app/config/gimprc.c +++ b/app/config/gimprc.c @@ -37,8 +37,6 @@ #include "config-types.h" -#include "file/file-utils.h" - #include "gimpconfig.h" #include "gimpconfig-deserialize.h" #include "gimpconfig-error.h" diff --git a/app/config/gimpscanner.c b/app/config/gimpscanner.c index c9b38ef6cd..7298a37bb5 100644 --- a/app/config/gimpscanner.c +++ b/app/config/gimpscanner.c @@ -41,8 +41,6 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "file/file-utils.h" - #include "config-types.h" #include "gimpconfig-error.h" diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 7f8876b8e5..74f7c10caf 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -51,8 +51,6 @@ #include "config/gimpbaseconfig.h" -#include "file/file-utils.h" - #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushgenerated.h" diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 7f8876b8e5..74f7c10caf 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -51,8 +51,6 @@ #include "config/gimpbaseconfig.h" -#include "file/file-utils.h" - #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushgenerated.h" diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c index 3a79656de2..9d25a60625 100644 --- a/app/core/gimpbrushgenerated-load.c +++ b/app/core/gimpbrushgenerated-load.c @@ -30,14 +30,13 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" #include "core-types.h" #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpbrushgenerated.h" #include "gimp-intl.h" diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c index 3a79656de2..9d25a60625 100644 --- a/app/core/gimpbrushgenerated-save.c +++ b/app/core/gimpbrushgenerated-save.c @@ -30,14 +30,13 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" #include "core-types.h" #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpbrushgenerated.h" #include "gimp-intl.h" diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c index 3a79656de2..9d25a60625 100644 --- a/app/core/gimpbrushgenerated.c +++ b/app/core/gimpbrushgenerated.c @@ -30,14 +30,13 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpmath/gimpmath.h" #include "core-types.h" #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpbrushgenerated.h" #include "gimp-intl.h" diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index 6bacf889fd..6b5f3b9250 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -40,15 +40,14 @@ #include #endif -#include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpparasiteio.h" +#include "libgimpmath/gimpmath.h" #include "core-types.h" #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushpipe.h" diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index 6bacf889fd..6b5f3b9250 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -40,15 +40,14 @@ #include #endif -#include "libgimpmath/gimpmath.h" +#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpparasiteio.h" +#include "libgimpmath/gimpmath.h" #include "core-types.h" #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpbrush.h" #include "gimpbrush-header.h" #include "gimpbrushpipe.h" diff --git a/app/core/gimpenvirontable.c b/app/core/gimpenvirontable.c index 5d919eda7e..1ded61d0e3 100644 --- a/app/core/gimpenvirontable.c +++ b/app/core/gimpenvirontable.c @@ -29,8 +29,6 @@ #include "libgimpbase/gimpbase.h" -#include "file/file-utils.h" - #include "core-types.h" #include "gimpenvirontable.h" diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c index adddbfcfd8..a2daf99187 100644 --- a/app/core/gimpgradient.c +++ b/app/core/gimpgradient.c @@ -33,8 +33,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpimage.h" #include "gimpgradient.h" diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index fb1bfcf85a..adc93f98d7 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -35,8 +35,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimppalette.h" #include "gimp-intl.h" diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index fb1bfcf85a..adc93f98d7 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -35,8 +35,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimppalette.h" #include "gimp-intl.h" diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index fb1bfcf85a..adc93f98d7 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -35,8 +35,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimppalette.h" #include "gimp-intl.h" diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c index cee06ab8f1..c42efd6677 100644 --- a/app/core/gimppattern-load.c +++ b/app/core/gimppattern-load.c @@ -49,8 +49,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpimage.h" #include "gimppattern.h" #include "gimppattern-header.h" diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c index cee06ab8f1..c42efd6677 100644 --- a/app/core/gimppattern.c +++ b/app/core/gimppattern.c @@ -49,8 +49,6 @@ #include "base/temp-buf.h" -#include "file/file-utils.h" - #include "gimpimage.h" #include "gimppattern.h" #include "gimppattern-header.h" diff --git a/app/dialogs/info-window.c b/app/dialogs/info-window.c index d7f113df44..eb4b7319c0 100644 --- a/app/dialogs/info-window.c +++ b/app/dialogs/info-window.c @@ -37,8 +37,6 @@ #include "core/gimptemplate.h" #include "core/gimpunit.h" -#include "file/file-utils.h" - #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index dc7a01ce81..d11a1913be 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -34,8 +34,8 @@ #include /* _mkdir() */ #endif -#include "libgimpmath/gimpmath.h" #include "libgimpbase/gimpbase.h" +#include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" #include "gui-types.h" @@ -43,8 +43,6 @@ #include "config/gimpconfig-utils.h" #include "config/gimprc.h" -#include "file/file-utils.h" - #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" diff --git a/app/gui/info-window.c b/app/gui/info-window.c index d7f113df44..eb4b7319c0 100644 --- a/app/gui/info-window.c +++ b/app/gui/info-window.c @@ -37,8 +37,6 @@ #include "core/gimptemplate.h" #include "core/gimpunit.h" -#include "file/file-utils.h" - #include "display/gimpdisplay.h" #include "display/gimpdisplayshell.h" diff --git a/app/gui/themes.c b/app/gui/themes.c index 839bb6de33..0370a1e42d 100644 --- a/app/gui/themes.c +++ b/app/gui/themes.c @@ -33,8 +33,6 @@ #include "core/gimp.h" -#include "file/file-utils.h" - #include "themes.h" #include "gimp-intl.h" diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index dc7a01ce81..d11a1913be 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -34,8 +34,8 @@ #include /* _mkdir() */ #endif -#include "libgimpmath/gimpmath.h" #include "libgimpbase/gimpbase.h" +#include "libgimpmath/gimpmath.h" #include "libgimpwidgets/gimpwidgets.h" #include "gui-types.h" @@ -43,8 +43,6 @@ #include "config/gimpconfig-utils.h" #include "config/gimprc.h" -#include "file/file-utils.h" - #include "widgets/gimppropwidgets.h" #include "widgets/gimpwidgets-utils.h" diff --git a/app/plug-in/gimpenvirontable.c b/app/plug-in/gimpenvirontable.c index 5d919eda7e..1ded61d0e3 100644 --- a/app/plug-in/gimpenvirontable.c +++ b/app/plug-in/gimpenvirontable.c @@ -29,8 +29,6 @@ #include "libgimpbase/gimpbase.h" -#include "file/file-utils.h" - #include "core-types.h" #include "gimpenvirontable.h" diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index c8b19f226f..d8ead390fe 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -34,8 +34,6 @@ #include "core/gimp.h" #include "core/gimpdrawable.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-def.h" diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index eaeca68555..375273c9a2 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -74,8 +74,6 @@ #include "core/gimp.h" #include "core/gimpenvirontable.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-debug.h" diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 7136892fe2..5c74f0c8a5 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -36,8 +36,6 @@ #include "core/gimpdrawable.h" #include "core/gimpimage.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-def.h" diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index c8b19f226f..d8ead390fe 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -34,8 +34,6 @@ #include "core/gimp.h" #include "core/gimpdrawable.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-def.h" diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c index 39e0392d97..90d448d922 100644 --- a/app/plug-in/plug-in-rc.c +++ b/app/plug-in/plug-in-rc.c @@ -34,8 +34,6 @@ #include "core/gimp.h" -#include "file/file-utils.h" - #include "plug-ins.h" #include "plug-in-def.h" #include "plug-in-proc.h" diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index eaeca68555..375273c9a2 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -74,8 +74,6 @@ #include "core/gimp.h" #include "core/gimpenvirontable.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-debug.h" diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 7136892fe2..5c74f0c8a5 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -36,8 +36,6 @@ #include "core/gimpdrawable.h" #include "core/gimpimage.h" -#include "file/file-utils.h" - #include "plug-in.h" #include "plug-ins.h" #include "plug-in-def.h" diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 301d8ebad5..fab601d3a2 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -50,8 +50,6 @@ #include "core/gimpimagemap.h" #include "core/gimptoolinfo.h" -#include "file/file-utils.h" - #include "widgets/gimpcursor.h" #include "widgets/gimpenummenu.h" #include "widgets/gimphelp-ids.h" diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index 81c5a0ebb6..df6a783a65 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -49,8 +49,6 @@ #include "core/gimpimagemap.h" #include "core/gimptoolinfo.h" -#include "file/file-utils.h" - #include "widgets/gimpenummenu.h" #include "widgets/gimphelp-ids.h" #include "widgets/gimphistogramview.h" diff --git a/app/vectors/gimpvectors-export.c b/app/vectors/gimpvectors-export.c index d20ec811d8..dfbd71553b 100644 --- a/app/vectors/gimpvectors-export.c +++ b/app/vectors/gimpvectors-export.c @@ -24,6 +24,8 @@ #include +#include "libgimpbase/gimpbase.h" + #include "vectors-types.h" #include "core/gimpimage.h" @@ -31,8 +33,6 @@ #include "core/gimplist.h" #include "core/gimpunit.h" -#include "file/file-utils.h" - #include "gimpanchor.h" #include "gimpstroke.h" #include "gimpbezierstroke.h" diff --git a/app/widgets/gimperrorconsole.c b/app/widgets/gimperrorconsole.c index 10886bebfd..60f02ab64a 100644 --- a/app/widgets/gimperrorconsole.c +++ b/app/widgets/gimperrorconsole.c @@ -49,14 +49,13 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" #include "core/gimp.h" -#include "file/file-utils.h" - #include "gimperrorconsole.h" #include "gimphelp-ids.h" #include "gimpitemfactory.h" diff --git a/app/widgets/gimptexteditor.c b/app/widgets/gimptexteditor.c index 430ee365f7..269d600dee 100644 --- a/app/widgets/gimptexteditor.c +++ b/app/widgets/gimptexteditor.c @@ -28,14 +28,13 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" #include "core/gimpmarshal.h" -#include "file/file-utils.h" - #include "gimpenummenu.h" #include "gimphelp-ids.h" #include "gimptexteditor.h" diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index 9702be7e56..c2ab08d0c9 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -25,13 +25,13 @@ #include +#include "libgimpbase/gimpbase.h" + #include "core/core-types.h" #include "core/gimp.h" #include "core/gimpimage.h" -#include "file/file-utils.h" - #include "pdb/procedural_db.h" #include "plug-in/plug-ins.h" diff --git a/devel-docs/libgimpbase/tmpl/gimputils.sgml b/devel-docs/libgimpbase/tmpl/gimputils.sgml index 0bde6e77e9..141ad37d36 100644 --- a/devel-docs/libgimpbase/tmpl/gimputils.sgml +++ b/devel-docs/libgimpbase/tmpl/gimputils.sgml @@ -26,6 +26,15 @@ Utilities of general interest @Returns: + + + + + +@filename: +@Returns: + + diff --git a/libgimpconfig/gimpconfig-path.c b/libgimpconfig/gimpconfig-path.c index 7ab68b5ea0..5276943564 100644 --- a/libgimpconfig/gimpconfig-path.c +++ b/libgimpconfig/gimpconfig-path.c @@ -26,9 +26,7 @@ #include -#include "libgimpbase/gimpenv.h" - -#include "file/file-utils.h" +#include "libgimpbase/gimpbase.h" #include "gimpconfig-path.h" @@ -161,7 +159,7 @@ gimp_config_path_expand_only (const gchar *path, substs = g_renew (gchar *, substs, 2 * (n_substs + SUBSTS_ALLOC)); substs[2*n_substs] = token; - substs[2*n_substs + 1] = gimp_filename_to_utf8 (s); + substs[2*n_substs + 1] = (gchar *) gimp_filename_to_utf8 (s); n_substs++; length += strlen (s); diff --git a/libgimpconfig/gimpconfig-utils.c b/libgimpconfig/gimpconfig-utils.c index bd84b78b5c..c2ea1fedf5 100644 --- a/libgimpconfig/gimpconfig-utils.c +++ b/libgimpconfig/gimpconfig-utils.c @@ -29,8 +29,6 @@ #include "libgimpbase/gimpbase.h" -#include "file/file-utils.h" - #include "config-types.h" #include "gimpconfig.h" diff --git a/libgimpconfig/gimpscanner.c b/libgimpconfig/gimpscanner.c index c9b38ef6cd..7298a37bb5 100644 --- a/libgimpconfig/gimpscanner.c +++ b/libgimpconfig/gimpscanner.c @@ -41,8 +41,6 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "file/file-utils.h" - #include "config-types.h" #include "gimpconfig-error.h"