[perl-Glib] Adjust naming scheme of generated GTypes

[Torsten Schönfeld <tsch src gnome org>]

commit 19af64e5e439b4636d49eeb29c1cb13eefc5f193
Author: Torsten Schönfeld <kaffeetisch gmx de>
Date:   Tue Nov 26 22:24:56 2013 +0100

    Adjust naming scheme of generated GTypes
    
    In preparation for the upcoming changes.

 gperl-gtypes.c |  122 ++++++++++++++++++++++++++++---------------------------
 gperl-gtypes.h |   49 +++++++++-------------
 2 files changed, 82 insertions(+), 89 deletions(-)
---
diff --git a/gperl-gtypes.c b/gperl-gtypes.c
index b37845d..f1114d9 100644
--- a/gperl-gtypes.c
+++ b/gperl-gtypes.c
@@ -2,9 +2,12 @@
  * this was initially generated by glib-mkenums, but i stripped out all the
  * non-Error definitions, as we won't use them.
  */
+
 #include "gperl.h"
 
-static const GEnumValue _gperl_g_convert_error_values[] = {
+/* -------------------------------------------------------------------------- */
+
+static const GEnumValue _gperl_convert_error_values[] = {
   { G_CONVERT_ERROR_NO_CONVERSION, "G_CONVERT_ERROR_NO_CONVERSION", "no-conversion" },
   { G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "G_CONVERT_ERROR_ILLEGAL_SEQUENCE", "illegal-sequence" },
   { G_CONVERT_ERROR_FAILED, "G_CONVERT_ERROR_FAILED", "failed" },
@@ -15,23 +18,22 @@ static const GEnumValue _gperl_g_convert_error_values[] = {
 };
 
 GType
-gperl_g_convert_error_get_type (void)
+gperl_convert_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GConvertError", _gperl_g_convert_error_values);
+    type = g_enum_register_static ("GConvertError", _gperl_convert_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_CONVERT_ERROR gperl_g_convert_error_get_type()
-GType gperl_g_convert_error_get_type (void);
-
+#define GPERL_TYPE_CONVERT_ERROR gperl_convert_error_get_type()
+GType gperl_convert_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-
-static const GEnumValue _gperl_g_file_error_values[] = {
+static const GEnumValue _gperl_file_error_values[] = {
   { G_FILE_ERROR_EXIST, "G_FILE_ERROR_EXIST", "exist" },
   { G_FILE_ERROR_ISDIR, "G_FILE_ERROR_ISDIR", "isdir" },
   { G_FILE_ERROR_ACCES, "G_FILE_ERROR_ACCES", "acces" },
@@ -60,23 +62,22 @@ static const GEnumValue _gperl_g_file_error_values[] = {
 };
 
 GType
-gperl_g_file_error_get_type (void)
+gperl_file_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GFileError", _gperl_g_file_error_values);
+    type = g_enum_register_static ("GFileError", _gperl_file_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_FILE_ERROR gperl_g_file_error_get_type()
-GType gperl_g_file_error_get_type (void);
-
-
+#define GPERL_TYPE_FILE_ERROR gperl_file_error_get_type()
+GType gperl_file_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-static const GEnumValue _gperl_g_io_error_values[] = {
+static const GEnumValue _gperl_io_error_values[] = {
   { G_IO_ERROR_NONE, "G_IO_ERROR_NONE", "none" },
   { G_IO_ERROR_AGAIN, "G_IO_ERROR_AGAIN", "again" },
   { G_IO_ERROR_INVAL, "G_IO_ERROR_INVAL", "inval" },
@@ -85,21 +86,22 @@ static const GEnumValue _gperl_g_io_error_values[] = {
 };
 
 GType
-gperl_g_io_error_get_type (void)
+gperl_io_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GIOError", _gperl_g_io_error_values);
+    type = g_enum_register_static ("GIOError", _gperl_io_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_IO_ERROR gperl_g_io_error_get_type()
-GType gperl_g_io_error_get_type (void);
+#define GPERL_TYPE_IO_ERROR gperl_io_error_get_type()
+GType gperl_io_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-static const GEnumValue _gperl_g_io_channel_error_values[] = {
+static const GEnumValue _gperl_io_channel_error_values[] = {
   { G_IO_CHANNEL_ERROR_FBIG, "G_IO_CHANNEL_ERROR_FBIG", "fbig" },
   { G_IO_CHANNEL_ERROR_INVAL, "G_IO_CHANNEL_ERROR_INVAL", "inval" },
   { G_IO_CHANNEL_ERROR_IO, "G_IO_CHANNEL_ERROR_IO", "io" },
@@ -113,23 +115,23 @@ static const GEnumValue _gperl_g_io_channel_error_values[] = {
 };
 
 GType
-gperl_g_io_channel_error_get_type (void)
+gperl_io_channel_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GIOChannelError", _gperl_g_io_channel_error_values);
+    type = g_enum_register_static ("GIOChannelError", _gperl_io_channel_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_IO_CHANNEL_ERROR gperl_g_io_channel_error_get_type()
-GType gperl_g_io_channel_error_get_type (void);
-
+#define GPERL_TYPE_IO_CHANNEL_ERROR gperl_io_channel_error_get_type()
+GType gperl_io_channel_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
 #if GLIB_CHECK_VERSION (2, 6, 0)
-static const GEnumValue _gperl_g_key_file_error_values[] = {
+static const GEnumValue _gperl_key_file_error_values[] = {
   { G_KEY_FILE_ERROR_UNKNOWN_ENCODING, "G_KEY_FILE_ERROR_UNKNOWN_ENCODING", "unknwon-encoding" },
   { G_KEY_FILE_ERROR_PARSE, "G_KEY_FILE_ERROR_PARSE", "parse" },
   { G_KEY_FILE_ERROR_NOT_FOUND, "G_KEY_FILE_ERROR_NOT_FOUND", "not-found" },
@@ -140,24 +142,24 @@ static const GEnumValue _gperl_g_key_file_error_values[] = {
 };
 
 GType
-gperl_g_key_file_error_get_type (void)
+gperl_key_file_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GKeyFileError", _gperl_g_key_file_error_values);
+    type = g_enum_register_static ("GKeyFileError", _gperl_key_file_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_KEY_FILE_ERROR gperl_g_key_file_error_get_type()
-GType gperl_g_key_file_error_get_type (void);
+#define GPERL_TYPE_KEY_FILE_ERROR gperl_key_file_error_get_type()
+GType gperl_key_file_error_get_type (void);
 #endif /* GLIB_CHECK_VERSION (2, 6, 0) */
 
-
+/* -------------------------------------------------------------------------- */
 
 #if GLIB_CHECK_VERSION (2, 12, 0)
-static const GEnumValue _gperl_g_bookmark_file_error_values[] = {
+static const GEnumValue _gperl_bookmark_file_error_values[] = {
   { G_BOOKMARK_FILE_ERROR_INVALID_URI, "G_BOOKMARK_FILE_ERROR_INVALID_URI", "invalid-uri" },
   { G_BOOKMARK_FILE_ERROR_INVALID_VALUE, "G_BOOKMARK_FILE_ERROR_INVALID_VALUE", "invalid-value" },
   { G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED, "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED", "not-registered" },
@@ -170,23 +172,23 @@ static const GEnumValue _gperl_g_bookmark_file_error_values[] = {
 };
 
 GType
-gperl_g_bookmark_file_error_get_type (void)
+gperl_bookmark_file_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GBookmarkFileError", _gperl_g_bookmark_file_error_values);
+    type = g_enum_register_static ("GBookmarkFileError", _gperl_bookmark_file_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_BOOKMARK_FILE_ERROR gperl_g_bookmark_file_error_get_type()
-GType gperl_g_bookmark_file_error_get_type (void);
+#define GPERL_TYPE_BOOKMARK_FILE_ERROR gperl_bookmark_file_error_get_type()
+GType gperl_bookmark_file_error_get_type (void);
 #endif /* GLIB_CHECK_VERSION (2, 12, 0) */
 
+/* -------------------------------------------------------------------------- */
 
-
-static const GEnumValue _gperl_g_markup_error_values[] = {
+static const GEnumValue _gperl_markup_error_values[] = {
   { G_MARKUP_ERROR_BAD_UTF8, "G_MARKUP_ERROR_BAD_UTF8", "bad-utf8" },
   { G_MARKUP_ERROR_EMPTY, "G_MARKUP_ERROR_EMPTY", "empty" },
   { G_MARKUP_ERROR_PARSE, "G_MARKUP_ERROR_PARSE", "parse" },
@@ -197,22 +199,22 @@ static const GEnumValue _gperl_g_markup_error_values[] = {
 };
 
 GType
-gperl_g_markup_error_get_type (void)
+gperl_markup_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GMarkupError", _gperl_g_markup_error_values);
+    type = g_enum_register_static ("GMarkupError", _gperl_markup_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_MARKUP_ERROR gperl_g_markup_error_get_type()
-GType gperl_g_markup_error_get_type (void);
+#define GPERL_TYPE_MARKUP_ERROR gperl_markup_error_get_type()
+GType gperl_markup_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-
-static const GEnumValue _gperl_g_shell_error_values[] = {
+static const GEnumValue _gperl_shell_error_values[] = {
   { G_SHELL_ERROR_BAD_QUOTING, "G_SHELL_ERROR_BAD_QUOTING", "bad-quoting" },
   { G_SHELL_ERROR_EMPTY_STRING, "G_SHELL_ERROR_EMPTY_STRING", "empty-string" },
   { G_SHELL_ERROR_FAILED, "G_SHELL_ERROR_FAILED", "failed" },
@@ -220,21 +222,22 @@ static const GEnumValue _gperl_g_shell_error_values[] = {
 };
 
 GType
-gperl_g_shell_error_get_type (void)
+gperl_shell_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GShellError", _gperl_g_shell_error_values);
+    type = g_enum_register_static ("GShellError", _gperl_shell_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_SHELL_ERROR gperl_g_shell_error_get_type()
-GType gperl_g_shell_error_get_type (void);
+#define GPERL_TYPE_SHELL_ERROR gperl_shell_error_get_type()
+GType gperl_shell_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-static const GEnumValue _gperl_g_spawn_error_values[] = {
+static const GEnumValue _gperl_spawn_error_values[] = {
   { G_SPAWN_ERROR_FORK, "G_SPAWN_ERROR_FORK", "fork" },
   { G_SPAWN_ERROR_READ, "G_SPAWN_ERROR_READ", "read" },
   { G_SPAWN_ERROR_CHDIR, "G_SPAWN_ERROR_CHDIR", "chdir" },
@@ -259,37 +262,36 @@ static const GEnumValue _gperl_g_spawn_error_values[] = {
 };
 
 GType
-gperl_g_spawn_error_get_type (void)
+gperl_spawn_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GSpawnError", _gperl_g_spawn_error_values);
+    type = g_enum_register_static ("GSpawnError", _gperl_spawn_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_SPAWN_ERROR gperl_g_spawn_error_get_type()
-GType gperl_g_spawn_error_get_type (void);
-
+#define GPERL_TYPE_SPAWN_ERROR gperl_spawn_error_get_type()
+GType gperl_spawn_error_get_type (void);
 
+/* -------------------------------------------------------------------------- */
 
-static const GEnumValue _gperl_g_thread_error_values[] = {
+static const GEnumValue _gperl_thread_error_values[] = {
   { G_THREAD_ERROR_AGAIN, "G_THREAD_ERROR_AGAIN", "again" },
   { 0, NULL, NULL }
 };
 
 GType
-gperl_g_thread_error_get_type (void)
+gperl_thread_error_get_type (void)
 {
   static GType type = 0;
 
   if (!type)
-    type = g_enum_register_static ("GThreadError", _gperl_g_thread_error_values);
+    type = g_enum_register_static ("GThreadError", _gperl_thread_error_values);
 
   return type;
 }
 
-#define GPERL_TYPE_THREAD_ERROR gperl_g_thread_error_get_type()
-GType gperl_g_thread_error_get_type (void);
-
+#define GPERL_TYPE_THREAD_ERROR gperl_thread_error_get_type()
+GType gperl_thread_error_get_type (void);
diff --git a/gperl-gtypes.h b/gperl-gtypes.h
index cc864d8..9b1df3d 100644
--- a/gperl-gtypes.h
+++ b/gperl-gtypes.h
@@ -1,6 +1,3 @@
-
-/* Generated data (by glib-mkenums) */
-
 #ifndef __GPERL_GTYPES_H__
 #define __GPERL_GTYPES_H__ 1
 
@@ -8,46 +5,40 @@
 
 G_BEGIN_DECLS
 
-
 #if GLIB_CHECK_VERSION (2, 12, 0)
-#define GPERL_TYPE_BOOKMARK_FILE_ERROR gperl_g_bookmark_file_error_get_type()
-GType gperl_g_bookmark_file_error_get_type (void);
+#define GPERL_TYPE_BOOKMARK_FILE_ERROR gperl_bookmark_file_error_get_type()
+GType gperl_bookmark_file_error_get_type (void);
 #endif /* GLIB_CHECK_VERSION (2, 12, 0) */
 
-#define GPERL_TYPE_CONVERT_ERROR gperl_g_convert_error_get_type()
-GType gperl_g_convert_error_get_type (void);
+#define GPERL_TYPE_CONVERT_ERROR gperl_convert_error_get_type()
+GType gperl_convert_error_get_type (void);
 
-#define GPERL_TYPE_FILE_ERROR gperl_g_file_error_get_type()
-GType gperl_g_file_error_get_type (void);
+#define GPERL_TYPE_FILE_ERROR gperl_file_error_get_type()
+GType gperl_file_error_get_type (void);
 
 #if GLIB_CHECK_VERSION (2, 6, 0)
-#define GPERL_TYPE_KEY_FILE_ERROR gperl_g_key_file_error_get_type()
-GType gperl_g_key_file_error_get_type (void);
+#define GPERL_TYPE_KEY_FILE_ERROR gperl_key_file_error_get_type()
+GType gperl_key_file_error_get_type (void);
 #endif /* GLIB_CHECK_VERSION (2, 6, 0) */
 
-#define GPERL_TYPE_IO_ERROR gperl_g_io_error_get_type()
-GType gperl_g_io_error_get_type (void);
-
-#define GPERL_TYPE_IO_CHANNEL_ERROR gperl_g_io_channel_error_get_type()
-GType gperl_g_io_channel_error_get_type (void);
+#define GPERL_TYPE_IO_ERROR gperl_io_error_get_type()
+GType gperl_io_error_get_type (void);
 
-#define GPERL_TYPE_MARKUP_ERROR gperl_g_markup_error_get_type()
-GType gperl_g_markup_error_get_type (void);
+#define GPERL_TYPE_IO_CHANNEL_ERROR gperl_io_channel_error_get_type()
+GType gperl_io_channel_error_get_type (void);
 
-#define GPERL_TYPE_SHELL_ERROR gperl_g_shell_error_get_type()
-GType gperl_g_shell_error_get_type (void);
+#define GPERL_TYPE_MARKUP_ERROR gperl_markup_error_get_type()
+GType gperl_markup_error_get_type (void);
 
-#define GPERL_TYPE_SPAWN_ERROR gperl_g_spawn_error_get_type()
-GType gperl_g_spawn_error_get_type (void);
+#define GPERL_TYPE_SHELL_ERROR gperl_shell_error_get_type()
+GType gperl_shell_error_get_type (void);
 
-#define GPERL_TYPE_THREAD_ERROR gperl_g_thread_error_get_type()
-GType gperl_g_thread_error_get_type (void);
+#define GPERL_TYPE_SPAWN_ERROR gperl_spawn_error_get_type()
+GType gperl_spawn_error_get_type (void);
 
+#define GPERL_TYPE_THREAD_ERROR gperl_thread_error_get_type()
+GType gperl_thread_error_get_type (void);
 
 G_END_DECLS
 
 #endif /* __GPERL_GTYPES_H__ */
-
-
-/* Generated data ends here */
-