Skip to content

Commit 697572c

Browse files
mitchfoomitchfoo
committed
app,libgimp*: fix includes to follow our include policy
- don't include <gdk-pixbuf/gdk-pixbuf.h> in headers in app/ - instead, include it in many .c files instead of <glib-object.h>, finally acknowledging the fact that app/ depends on gdk-pixbuf almost globally - fix up includes as if libgimpbase depended in GIO, which it soon will
1 parent 22b6cb4 commit 697572c

File tree

258 files changed

+273
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+273
-94
lines changed

‎app/app.c

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <unistd.h>
3131
#endif
3232

33+
#include <gio/gio.h>
3334
#include <gegl.h>
3435

3536
#ifdef G_OS_WIN32

‎app/batch.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <string.h>
2121
#include <stdlib.h>
2222

23+
#include <gio/gio.h>
2324
#include <gegl.h>
2425

2526
#include "libgimpbase/gimpbase.h"

‎app/config/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ CLEANFILES += $(gen_sources)
123123

124124
config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS)
125125
$(GIMP_MKENUMS) \
126-
--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
126+
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
127127
--fprod "\n/* enumerations from \"@filename@\" */" \
128128
--vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \
129129
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

‎app/config/config-enums.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* Generated data (by gimp-mkenums) */
33

44
#include "config.h"
5-
#include <glib-object.h>
5+
#include <gio/gio.h>
66
#include "libgimpbase/gimpbase.h"
77
#include "config-enums.h"
88
#include"gimp-intl.h"

‎app/config/gimpconfig-file.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <errno.h>
2424
#include <sys/types.h>
2525

26-
#include <glib-object.h>
26+
#include <gio/gio.h>
2727
#include <glib/gstdio.h>
2828

2929
#include "libgimpbase/gimpbase.h"

‎app/config/gimpconfig-utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "config.h"
2222

23-
#include <glib-object.h>
23+
#include <gio/gio.h>
2424

2525
#include "libgimpbase/gimpbase.h"
2626
#include "libgimpconfig/gimpconfig.h"

‎app/config/gimpgeglconfig.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <unistd.h>
2525
#endif
2626

27+
#include <gio/gio.h>
2728
#include <gegl.h>
2829

2930
#include "libgimpbase/gimpbase.h"

‎app/config/gimpguiconfig.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "config.h"
2222

23-
#include <glib-object.h>
23+
#include <gio/gio.h>
2424

2525
#include "libgimpbase/gimpbase.h"
2626
#include "libgimpconfig/gimpconfig.h"

‎app/config/gimppluginconfig.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "config.h"
2222

23-
#include <glib-object.h>
23+
#include <gio/gio.h>
2424

2525
#include "libgimpbase/gimpbase.h"
2626
#include "libgimpconfig/gimpconfig.h"

‎app/config/gimprc-serialize.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "config.h"
2222

23-
#include <glib-object.h>
23+
#include <gio/gio.h>
2424

2525
#include "libgimpbase/gimpbase.h"
2626
#include "libgimpconfig/gimpconfig.h"

‎app/config/gimprc-unknown.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <string.h>
2424

25-
#include <glib-object.h>
25+
#include <gio/gio.h>
2626

2727
#include "libgimpbase/gimpbase.h"
2828
#include "libgimpconfig/gimpconfig.h"

‎app/config/gimprc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <string.h>
2424

25-
#include <glib-object.h>
25+
#include <gio/gio.h>
2626

2727
#include "libgimpbase/gimpbase.h"
2828
#include "libgimpconfig/gimpconfig.h"

‎app/core/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ gimpmarshal.c: gimpmarshal.h
403403

404404
core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS)
405405
$(GIMP_MKENUMS) \
406-
--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
406+
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
407407
--fprod "\n/* enumerations from \"@filename@\" */" \
408408
--vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \
409409
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

‎app/core/core-enums.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* Generated data (by gimp-mkenums) */
33

44
#include "config.h"
5-
#include <glib-object.h>
5+
#include <gio/gio.h>
66
#include "libgimpbase/gimpbase.h"
77
#include "core-enums.h"
88
#include "gimp-intl.h"

‎app/core/gimp-contexts.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
#include <unistd.h>
2626
#endif
2727

28-
#include <gegl.h>
28+
#include <gdk-pixbuf/gdk-pixbuf.h>
2929
#include <glib/gstdio.h>
30+
#include <gegl.h>
3031

3132
#include "libgimpbase/gimpbase.h"
3233
#include "libgimpconfig/gimpconfig.h"

‎app/core/gimp-gradients.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "config.h"
2222

23+
#include <gdk-pixbuf/gdk-pixbuf.h>
2324
#include <gegl.h>
2425

2526
#include "core-types.h"

‎app/core/gimp-gui.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "config.h"
1919

20+
#include <gdk-pixbuf/gdk-pixbuf.h>
2021
#include <gegl.h>
2122

2223
#include "libgimpbase/gimpbase.h"

‎app/core/gimp-modules.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "config.h"
2222

23-
#include <glib-object.h>
23+
#include <gio/gio.h>
2424

2525
#include "libgimpbase/gimpbase.h"
2626
#include "libgimpmodule/gimpmodule.h"

‎app/core/gimp-parasites.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "config.h"
1818

19-
#include <glib-object.h>
19+
#include <gio/gio.h>
2020

2121
#include "libgimpbase/gimpbase.h"
2222
#include "libgimpconfig/gimpconfig.h"

‎app/core/gimp-tags.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <stdlib.h>
2424
#include <string.h>
2525

26+
#include <gio/gio.h>
2627
#include <gegl.h>
2728

2829
#include "libgimpbase/gimpbase.h"

‎app/core/gimp-templates.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <string.h>
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpbase/gimpbase.h"

‎app/core/gimp-units.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "config.h"
2626

27-
#include <glib-object.h>
27+
#include <gio/gio.h>
2828

2929
#include "libgimpbase/gimpbase.h"
3030
#include "libgimpconfig/gimpconfig.h"

‎app/core/gimp-user-install.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434
#include <unistd.h>
3535
#endif
3636

37+
#include <gio/gio.h>
3738
#include <glib/gstdio.h>
3839

39-
#include <glib-object.h>
40-
4140
#ifdef G_OS_WIN32
4241
#include <libgimpbase/gimpwin32-io.h>
4342
#endif

‎app/core/gimp.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <string.h> /* strlen */
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpbase/gimpbase.h"

‎app/core/gimpbrush-boundary.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "config.h"
1919

2020
#include <cairo.h>
21+
#include <gdk-pixbuf/gdk-pixbuf.h>
2122
#include <gegl.h>
2223

2324
#include "core-types.h"

‎app/core/gimpbrush-load.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
#define _O_BINARY 0
3535
#endif
3636

37-
#include <gegl.h>
37+
#include <gdk-pixbuf/gdk-pixbuf.h>
3838
#include <glib/gstdio.h>
39+
#include <gegl.h>
3940

4041
#include "libgimpbase/gimpbase.h"
4142

‎app/core/gimpbrush-transform.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "config.h"
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpmath/gimpmath.h"

‎app/core/gimpbrush.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "config.h"
1919

2020
#include <cairo.h>
21+
#include <gdk-pixbuf/gdk-pixbuf.h>
2122
#include <gegl.h>
2223

2324
#include "libgimpbase/gimpbase.h"

‎app/core/gimpbrushclipboard.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "config.h"
2222

23+
#include <gdk-pixbuf/gdk-pixbuf.h>
2324
#include <gegl.h>
2425

2526
#include "core-types.h"

‎app/core/gimpbrushgenerated-load.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
#include <unistd.h>
2828
#endif
2929

30-
#include <gegl.h>
30+
#include <gdk-pixbuf/gdk-pixbuf.h>
3131
#include <glib/gstdio.h>
32+
#include <gegl.h>
3233

3334
#include "libgimpbase/gimpbase.h"
3435

‎app/core/gimpbrushgenerated-save.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
#include <unistd.h>
2828
#endif
2929

30-
#include <gegl.h>
30+
#include <gdk-pixbuf/gdk-pixbuf.h>
3131
#include <glib/gstdio.h>
32+
#include <gegl.h>
3233

3334
#include "libgimpbase/gimpbase.h"
3435

‎app/core/gimpbrushgenerated.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "config.h"
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpbase/gimpbase.h"

‎app/core/gimpbrushpipe-load.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
#define _O_BINARY 0
3434
#endif
3535

36-
#include <gegl.h>
36+
#include <gdk-pixbuf/gdk-pixbuf.h>
3737
#include <glib/gstdio.h>
38+
#include <gegl.h>
3839

3940
#ifdef G_OS_WIN32
4041
#include <io.h>

‎app/core/gimpbrushpipe.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "config.h"
2020

21+
#include <gdk-pixbuf/gdk-pixbuf.h>
2122
#include <gegl.h>
2223

2324
#include "libgimpmath/gimpmath.h"

‎app/core/gimpchannel-combine.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <string.h>
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpbase/gimpbase.h"

‎app/core/gimpchannel-select.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <string.h>
2121

2222
#include <cairo.h>
23+
#include <gdk-pixbuf/gdk-pixbuf.h>
2324
#include <gegl.h>
2425

2526
#include "libgimpbase/gimpbase.h"

‎app/core/gimpchannelpropundo.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "config.h"
1919

20+
#include <gdk-pixbuf/gdk-pixbuf.h>
2021
#include <gegl.h>
2122

2223
#include "libgimpbase/gimpbase.h"

‎app/core/gimpchannelundo.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "config.h"
1919

20+
#include <gdk-pixbuf/gdk-pixbuf.h>
2021
#include <gegl.h>
2122

2223
#include "core-types.h"

‎app/core/gimpcurve-load.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
#include <errno.h>
2121

22-
#include <gegl.h>
22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2323
#include <glib/gstdio.h>
24+
#include <gegl.h>
2425

2526
#include "libgimpbase/gimpbase.h"
2627

‎app/core/gimpcurve-map.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <string.h>
2121

22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2223
#include <gegl.h>
2324

2425
#include "libgimpmath/gimpmath.h"

‎app/core/gimpcurve-save.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
#include <errno.h>
2121

22-
#include <gegl.h>
22+
#include <gdk-pixbuf/gdk-pixbuf.h>
2323
#include <glib/gstdio.h>
24+
#include <gegl.h>
2425

2526
#include "libgimpbase/gimpbase.h"
2627

‎app/core/gimpcurve.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <stdlib.h>
2121
#include <string.h> /* memcmp */
2222

23+
#include <gdk-pixbuf/gdk-pixbuf.h>
2324
#include <gegl.h>
2425

2526
#include "libgimpbase/gimpbase.h"

‎app/core/gimpdashpattern.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "config.h"
2323

24-
#include <glib-object.h>
24+
#include <gio/gio.h>
2525

2626
#include "libgimpbase/gimpbase.h"
2727

‎app/core/gimpdata.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <unistd.h>
2828
#endif
2929

30+
#include <gdk-pixbuf/gdk-pixbuf.h>
3031
#include <gegl.h>
3132
#include <glib/gstdio.h>
3233

‎app/core/gimpdatafactory.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <stdlib.h>
2424
#include <string.h>
2525

26+
#include <gdk-pixbuf/gdk-pixbuf.h>
2627
#include <gegl.h>
2728

2829
#include "libgimpbase/gimpbase.h"

0 commit comments

Comments
 (0)