dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpconfig: rename gimpcolorconfig-enums.[ch] to gimpconfigenums.[ch] 

It makes no sense to do this differently than in all other of our
libraries.
This commit is contained in:
Michael Natterer 2016-06-06 21:05:16 +02:00
parent 7858eb3df2
commit 4b18b1ac39
8 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgimp/Makefile.am
View File

@ -438,7 +438,7 @@ CLEANFILES = $(gen_sources)
gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS) gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \ $(GIMP_MKENUMS) \
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"libgimpconfig/gimpcolorconfig-enums.h\"\n#include \"gimpenums.h\"" \ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"libgimpconfig/gimpconfigenums.h\"\n#include \"gimpenums.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

17
libgimpconfig/Makefile.am
View File

@ -61,7 +61,9 @@ lib_LTLIBRARIES = libgimpconfig-@GIMP_API_VERSION@.la
libgimpconfig_sources = \ libgimpconfig_sources = \
gimpconfig.h \ gimpconfig.h \
gimpconfigenums.h \
gimpconfigtypes.h \ gimpconfigtypes.h \
\
gimpconfig-iface.c \ gimpconfig-iface.c \
gimpconfig-iface.h \ gimpconfig-iface.h \
gimpconfig-deserialize.c \ gimpconfig-deserialize.c \
@ -80,11 +82,10 @@ libgimpconfig_sources = \
gimpscanner.c \ gimpscanner.c \
gimpscanner.h \ gimpscanner.h \
gimpcolorconfig.c \ gimpcolorconfig.c \
gimpcolorconfig.h \ gimpcolorconfig.h
gimpcolorconfig-enums.h
libgimpconfig_built_sources = \ libgimpconfig_built_sources = \
gimpcolorconfig-enums.c gimpconfigenums.c
libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \ libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimpconfig_sources) \ $(libgimpconfig_sources) \
@ -93,6 +94,7 @@ libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \
libgimpconfiginclude_HEADERS = \ libgimpconfiginclude_HEADERS = \
gimpconfig.h \ gimpconfig.h \
gimpconfigenums.h \
gimpconfigtypes.h \ gimpconfigtypes.h \
gimpconfig-iface.h \ gimpconfig-iface.h \
gimpconfig-deserialize.h \ gimpconfig-deserialize.h \
@ -103,8 +105,7 @@ libgimpconfiginclude_HEADERS = \
gimpconfig-utils.h \ gimpconfig-utils.h \
gimpconfigwriter.h \ gimpconfigwriter.h \
gimpscanner.h \ gimpscanner.h \
gimpcolorconfig.h \ gimpcolorconfig.h
gimpcolorconfig-enums.h
libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \
@ -137,9 +138,9 @@ uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
gen_sources = xgen-cec gen_sources = xgen-cec
CLEANFILES = $(gen_sources) CLEANFILES = $(gen_sources)
$(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKENUMS) $(srcdir)/gimpconfigenums.c: $(srcdir)/gimpconfigenums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \ $(GIMP_MKENUMS) \
--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpcolorconfig-enums.h\"\n#include \"libgimp/libgimp-intl.h\"" \ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpconfigenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
@ -147,6 +148,6 @@ $(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKEN
--dhead " static const Gimp@Type@Desc descs[] =\n {" \ --dhead " static const Gimp@Type@Desc descs[] =\n {" \
--dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \ --dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
--dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_type_set_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n gimp_type_set_translation_context (type, \"@enumnick@\");\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \ --dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n if (G_UNLIKELY (! type))\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n gimp_type_set_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n gimp_type_set_translation_context (type, \"@enumnick@\");\n gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \
$(srcdir)/gimpcolorconfig-enums.h > xgen-cec \ $(srcdir)/gimpconfigenums.h > xgen-cec \
&& cp xgen-cec $(@F) \ && cp xgen-cec $(@F) \
&& rm -f xgen-cec && rm -f xgen-cec

4
libgimpconfig/gimpcolorconfig-enums.c → libgimpconfig/gimpconfigenums.c
View File

@ -4,10 +4,10 @@
#include "config.h" #include "config.h"
#include <gio/gio.h> #include <gio/gio.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "gimpcolorconfig-enums.h" #include "gimpconfigenums.h"
#include "libgimp/libgimp-intl.h" #include "libgimp/libgimp-intl.h"
/* enumerations from "./gimpcolorconfig-enums.h" */ /* enumerations from "./gimpconfigenums.h" */
GType GType
gimp_color_management_mode_get_type (void) gimp_color_management_mode_get_type (void)
{ {

12
libgimpconfig/gimpcolorconfig-enums.h → libgimpconfig/gimpconfigenums.h
View File

@ -1,7 +1,7 @@
/* LIBGIMP - The GIMP Library /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995 Spencer Kimball and Peter Mattis
* *
* GimpColorConfig enums * gimpconfigenums.h
* Copyright (C) 2004 Stefan Döhla <stefan@doehla.de> * Copyright (C) 2004 Stefan Döhla <stefan@doehla.de>
* *
* This library is free software: you can redistribute it and/or * This library is free software: you can redistribute it and/or
@ -19,8 +19,8 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GIMP_COLOR_CONFIG_ENUMS_H__ #ifndef __GIMP_CONFIG_ENUMS_H__
#define __GIMP_COLOR_CONFIG_ENUMS_H__ #define __GIMP_CONFIG_ENUMS_H__
#define GIMP_TYPE_COLOR_MANAGEMENT_MODE (gimp_color_management_mode_get_type ()) #define GIMP_TYPE_COLOR_MANAGEMENT_MODE (gimp_color_management_mode_get_type ())
@ -35,8 +35,7 @@ typedef enum
} GimpColorManagementMode; } GimpColorManagementMode;
#define GIMP_TYPE_COLOR_RENDERING_INTENT \ #define GIMP_TYPE_COLOR_RENDERING_INTENT (gimp_color_rendering_intent_get_type ())
(gimp_color_rendering_intent_get_type ())
GType gimp_color_rendering_intent_get_type (void) G_GNUC_CONST; GType gimp_color_rendering_intent_get_type (void) G_GNUC_CONST;
@ -49,5 +48,4 @@ typedef enum
} GimpColorRenderingIntent; } GimpColorRenderingIntent;
#endif /* __GIMP_CONFIG_ENUMS_H__ */
#endif /* GIMP_COLOR_CONFIG_ENUMS_H__ */

5
libgimpconfig/gimpconfigtypes.h
View File

@ -30,10 +30,9 @@ typedef struct _GimpConfig GimpConfig; /* dummy typedef */
typedef struct _GimpConfigWriter GimpConfigWriter; typedef struct _GimpConfigWriter GimpConfigWriter;
typedef gchar * GimpConfigPath; /* to satisfy docs */ typedef gchar * GimpConfigPath; /* to satisfy docs */
#include <libgimpconfig/gimpcolorconfig-enums.h>
typedef struct _GimpColorConfig GimpColorConfig; typedef struct _GimpColorConfig GimpColorConfig;
#include <libgimpconfig/gimpconfigenums.h>
#endif /* __GIMP_CONFIG_TYPES_H__ */ #endif /* __GIMP_CONFIG_TYPES_H__ */

2
po-libgimp/POTFILES.in
View File

@ -28,8 +28,8 @@ libgimpbase/gimputils.c
libgimpcolor/gimpcolorprofile.c libgimpcolor/gimpcolorprofile.c
libgimpconfig/gimpconfigenums.c
libgimpconfig/gimpcolorconfig.c libgimpconfig/gimpcolorconfig.c
libgimpconfig/gimpcolorconfig-enums.c
libgimpconfig/gimpconfig-deserialize.c libgimpconfig/gimpconfig-deserialize.c
libgimpconfig/gimpconfig-iface.c libgimpconfig/gimpconfig-iface.c
libgimpconfig/gimpconfig-path.c libgimpconfig/gimpconfig-path.c

6
tools/pdbgen/Makefile.am
View File

@ -74,9 +74,9 @@ EXTRA_DIST = \
$(pdb_sources) $(pdb_sources)
enum_headers = \ enum_headers = \
../../libgimpbase/gimpbaseenums.h \ ../../libgimpbase/gimpbaseenums.h \
../../libgimpconfig/gimpcolorconfig-enums.h \ ../../libgimpconfig/gimpconfigenums.h \
../../app/core/core-enums.h \ ../../app/core/core-enums.h \
../../app/paint/paint-enums.h ../../app/paint/paint-enums.h
pdb_scripts = \ pdb_scripts = \

4
tools/pdbgen/enums.pl
View File

@ -630,7 +630,7 @@ package Gimp::CodeGen::enums;
}, },
GimpColorManagementMode => GimpColorManagementMode =>
{ contig => 1, { contig => 1,
header => 'libgimpconfig/gimpcolorconfig-enums.h', header => 'libgimpconfig/gimpconfigenums.h',
symbols => [ qw(GIMP_COLOR_MANAGEMENT_OFF symbols => [ qw(GIMP_COLOR_MANAGEMENT_OFF
GIMP_COLOR_MANAGEMENT_DISPLAY GIMP_COLOR_MANAGEMENT_DISPLAY
GIMP_COLOR_MANAGEMENT_SOFTPROOF) ], GIMP_COLOR_MANAGEMENT_SOFTPROOF) ],
@ -640,7 +640,7 @@ package Gimp::CodeGen::enums;
}, },
GimpColorRenderingIntent => GimpColorRenderingIntent =>
{ contig => 1, { contig => 1,
header => 'libgimpconfig/gimpcolorconfig-enums.h', header => 'libgimpconfig/gimpconfigenums.h',
symbols => [ qw(GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL symbols => [ qw(GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL
GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC
GIMP_COLOR_RENDERING_INTENT_SATURATION GIMP_COLOR_RENDERING_INTENT_SATURATION