GNOME.org
 

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

commit 4b18b1ac39b5f570c222225e374730ae60f24a9c
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jun 6 21:05:16 2016 +0200

    libgimpconfig: rename gimpcolorconfig-enums.[ch] to gimpconfigenums.[ch]
    
    It makes no sense to do this differently than in all other of our
    libraries.

 libgimp/Makefile.am                                |    2 +-
 libgimpconfig/Makefile.am                          |   17 +++++++++--------
 .../{gimpcolorconfig-enums.c => gimpconfigenums.c} |    4 ++--
 .../{gimpcolorconfig-enums.h => gimpconfigenums.h} |   12 +++++-------
 libgimpconfig/gimpconfigtypes.h                    |    5 ++---
 po-libgimp/POTFILES.in                             |    2 +-
 tools/pdbgen/Makefile.am                           |    6 +++---
 tools/pdbgen/enums.pl                              |    4 ++--
 8 files changed, 25 insertions(+), 27 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index cba3181..c08c300 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -438,7 +438,7 @@ CLEANFILES = $(gen_sources)
 
 gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(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 \" */" \
                --vhead "GType\n enum_name@_get_type (void)\n{\n  static const G Type@Value values[] =\n  {" \
                --vprod "    { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 6c76926..585826e 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -61,7 +61,9 @@ lib_LTLIBRARIES = libgimpconfig- GIMP_API_VERSION@.la
 
 libgimpconfig_sources =                \
        gimpconfig.h                    \
+       gimpconfigenums.h               \
        gimpconfigtypes.h               \
+       \
        gimpconfig-iface.c              \
        gimpconfig-iface.h              \
        gimpconfig-deserialize.c        \
@@ -80,11 +82,10 @@ libgimpconfig_sources =             \
        gimpscanner.c                   \
        gimpscanner.h                   \
        gimpcolorconfig.c               \
-       gimpcolorconfig.h               \
-       gimpcolorconfig-enums.h
+       gimpcolorconfig.h
 
 libgimpconfig_built_sources = \
-       gimpcolorconfig-enums.c
+       gimpconfigenums.c
 
 libgimpconfig_ GIMP_API_VERSION@_la_SOURCES = \
        $(libgimpconfig_sources)        \
@@ -93,6 +94,7 @@ libgimpconfig_ GIMP_API_VERSION@_la_SOURCES = \
 
 libgimpconfiginclude_HEADERS = \
        gimpconfig.h                    \
+       gimpconfigenums.h               \
        gimpconfigtypes.h               \
        gimpconfig-iface.h              \
        gimpconfig-deserialize.h        \
@@ -103,8 +105,7 @@ libgimpconfiginclude_HEADERS = \
        gimpconfig-utils.h              \
        gimpconfigwriter.h              \
        gimpscanner.h                   \
-       gimpcolorconfig.h               \
-       gimpcolorconfig-enums.h
+       gimpcolorconfig.h
 
 
 libgimpconfig_ GIMP_API_VERSION@_la_LDFLAGS = \
@@ -137,9 +138,9 @@ uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 gen_sources = xgen-cec
 CLEANFILES = $(gen_sources)
 
-$(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKENUMS)
+$(srcdir)/gimpconfigenums.c: $(srcdir)/gimpconfigenums.h $(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 \" */" \
                --vhead "GType\n enum_name@_get_type (void)\n{\n  static const G Type@Value values[] =\n  {" \
                --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  {" \
                --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" \
-               $(srcdir)/gimpcolorconfig-enums.h > xgen-cec \
+               $(srcdir)/gimpconfigenums.h > xgen-cec \
        && cp xgen-cec $(@F) \
        && rm -f xgen-cec
diff --git a/libgimpconfig/gimpcolorconfig-enums.c b/libgimpconfig/gimpconfigenums.c
similarity index 96%
rename from libgimpconfig/gimpcolorconfig-enums.c
rename to libgimpconfig/gimpconfigenums.c
index f75e473..668b52f 100644
--- a/libgimpconfig/gimpcolorconfig-enums.c
+++ b/libgimpconfig/gimpconfigenums.c
@@ -4,10 +4,10 @@
 #include "config.h"
 #include <gio/gio.h>
 #include "libgimpbase/gimpbase.h"
-#include "gimpcolorconfig-enums.h"
+#include "gimpconfigenums.h"
 #include "libgimp/libgimp-intl.h"
 
-/* enumerations from "./gimpcolorconfig-enums.h" */
+/* enumerations from "./gimpconfigenums.h" */
 GType
 gimp_color_management_mode_get_type (void)
 {
diff --git a/libgimpconfig/gimpcolorconfig-enums.h b/libgimpconfig/gimpconfigenums.h
similarity index 88%
rename from libgimpconfig/gimpcolorconfig-enums.h
rename to libgimpconfig/gimpconfigenums.h
index 2627499..05ebeb2 100644
--- a/libgimpconfig/gimpcolorconfig-enums.h
+++ b/libgimpconfig/gimpconfigenums.h
@@ -1,7 +1,7 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
- * GimpColorConfig enums
+ * gimpconfigenums.h
  * Copyright (C) 2004  Stefan Döhla <stefan doehla de>
  *
  * This library is free software: you can redistribute it and/or
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_COLOR_CONFIG_ENUMS_H__
-#define __GIMP_COLOR_CONFIG_ENUMS_H__
+#ifndef __GIMP_CONFIG_ENUMS_H__
+#define __GIMP_CONFIG_ENUMS_H__
 
 
 #define GIMP_TYPE_COLOR_MANAGEMENT_MODE (gimp_color_management_mode_get_type ())
@@ -35,8 +35,7 @@ typedef enum
 } GimpColorManagementMode;
 
 
-#define GIMP_TYPE_COLOR_RENDERING_INTENT \
-  (gimp_color_rendering_intent_get_type ())
+#define GIMP_TYPE_COLOR_RENDERING_INTENT (gimp_color_rendering_intent_get_type ())
 
 GType gimp_color_rendering_intent_get_type (void) G_GNUC_CONST;
 
@@ -49,5 +48,4 @@ typedef enum
 } GimpColorRenderingIntent;
 
 
-
-#endif /* GIMP_COLOR_CONFIG_ENUMS_H__ */
+#endif /* __GIMP_CONFIG_ENUMS_H__ */
diff --git a/libgimpconfig/gimpconfigtypes.h b/libgimpconfig/gimpconfigtypes.h
index 31eddd7..60773c9 100644
--- a/libgimpconfig/gimpconfigtypes.h
+++ b/libgimpconfig/gimpconfigtypes.h
@@ -30,10 +30,9 @@ typedef struct _GimpConfig        GimpConfig; /* dummy typedef */
 typedef struct _GimpConfigWriter  GimpConfigWriter;
 typedef gchar *                   GimpConfigPath; /* to satisfy docs */
 
-
-#include <libgimpconfig/gimpcolorconfig-enums.h>
-
 typedef struct _GimpColorConfig   GimpColorConfig;
 
+#include <libgimpconfig/gimpconfigenums.h>
+
 
 #endif  /* __GIMP_CONFIG_TYPES_H__ */
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index 2ca6385..020c9f8 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -28,8 +28,8 @@ libgimpbase/gimputils.c
 
 libgimpcolor/gimpcolorprofile.c
 
+libgimpconfig/gimpconfigenums.c
 libgimpconfig/gimpcolorconfig.c
-libgimpconfig/gimpcolorconfig-enums.c
 libgimpconfig/gimpconfig-deserialize.c
 libgimpconfig/gimpconfig-iface.c
 libgimpconfig/gimpconfig-path.c
diff --git a/tools/pdbgen/Makefile.am b/tools/pdbgen/Makefile.am
index f84b146..b396303 100644
--- a/tools/pdbgen/Makefile.am
+++ b/tools/pdbgen/Makefile.am
@@ -74,9 +74,9 @@ EXTRA_DIST = \
        $(pdb_sources)
 
 enum_headers = \
-       ../../libgimpbase/gimpbaseenums.h               \
-       ../../libgimpconfig/gimpcolorconfig-enums.h     \
-       ../../app/core/core-enums.h                     \
+       ../../libgimpbase/gimpbaseenums.h       \
+       ../../libgimpconfig/gimpconfigenums.h   \
+       ../../app/core/core-enums.h             \
        ../../app/paint/paint-enums.h
 
 pdb_scripts = \
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 905725c..d2a4b0c 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -630,7 +630,7 @@ package Gimp::CodeGen::enums;
        },
     GimpColorManagementMode =>
        { contig => 1,
-         header => 'libgimpconfig/gimpcolorconfig-enums.h',
+         header => 'libgimpconfig/gimpconfigenums.h',
          symbols => [ qw(GIMP_COLOR_MANAGEMENT_OFF
                          GIMP_COLOR_MANAGEMENT_DISPLAY
                          GIMP_COLOR_MANAGEMENT_SOFTPROOF) ],
@@ -640,7 +640,7 @@ package Gimp::CodeGen::enums;
        },
     GimpColorRenderingIntent =>
        { contig => 1,
-         header => 'libgimpconfig/gimpcolorconfig-enums.h',
+         header => 'libgimpconfig/gimpconfigenums.h',
          symbols => [ qw(GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL
                          GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC
                          GIMP_COLOR_RENDERING_INTENT_SATURATION
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]