GNOME.org
 

[gom] gom: Remove separate error enums and quarks functions

commit 61a7aca1de2fdcfdf9beec8ad10a41907c2a4870
Author: Tristan Brindle <t c brindle gmail com>
Date:   Sat Apr 19 01:06:23 2014 +0800

    gom: Remove separate error enums and quarks functions
    
    Replaced by GomError domain
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728491

 gom/gom-adapter.c    |    6 ------
 gom/gom-adapter.h    |    8 --------
 gom/gom-command.c    |    6 ------
 gom/gom-command.h    |    9 ---------
 gom/gom-repository.c |    6 ------
 gom/gom-repository.h |    7 -------
 gom/gom-resource.c   |    6 ------
 gom/gom-resource.h   |    8 --------
 8 files changed, 0 insertions(+), 56 deletions(-)
---
diff --git a/gom/gom-adapter.c b/gom/gom-adapter.c
index ed64db7..8d7ed61 100644
--- a/gom/gom-adapter.c
+++ b/gom/gom-adapter.c
@@ -523,9 +523,3 @@ gom_adapter_init (GomAdapter *adapter)
                                   GOM_TYPE_ADAPTER,
                                   GomAdapterPrivate);
 }
-
-GQuark
-gom_adapter_error_quark (void)
-{
-   return g_quark_from_static_string("gom_adapter_error_quark");
-}
diff --git a/gom/gom-adapter.h b/gom/gom-adapter.h
index e1d9bdb..5b2c6ce 100644
--- a/gom/gom-adapter.h
+++ b/gom/gom-adapter.h
@@ -30,21 +30,14 @@ G_BEGIN_DECLS
 #define GOM_IS_ADAPTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOM_TYPE_ADAPTER))
 #define GOM_IS_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GOM_TYPE_ADAPTER))
 #define GOM_ADAPTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GOM_TYPE_ADAPTER, GomAdapterClass))
-#define GOM_ADAPTER_ERROR           (gom_adapter_error_quark())
 
 typedef struct _GomAdapter        GomAdapter;
 typedef struct _GomAdapterClass   GomAdapterClass;
 typedef struct _GomAdapterPrivate GomAdapterPrivate;
-typedef enum   _GomAdapterError   GomAdapterError;
 
 typedef void (*GomAdapterCallback) (GomAdapter *adapter,
                                     gpointer    user_data);
 
-enum _GomAdapterError
-{
-   GOM_ADAPTER_ERROR_OPEN = 1,
-};
-
 struct _GomAdapter
 {
    GObject parent;
@@ -66,7 +59,6 @@ void        gom_adapter_close_async  (GomAdapter           *adapter,
 gboolean    gom_adapter_close_finish (GomAdapter           *adapter,
                                       GAsyncResult         *result,
                                       GError              **error);
-GQuark      gom_adapter_error_quark  (void) G_GNUC_CONST;
 gpointer    gom_adapter_get_handle   (GomAdapter           *adapter);
 GType       gom_adapter_get_type     (void) G_GNUC_CONST;
 GomAdapter *gom_adapter_new          (void);
diff --git a/gom/gom-command.c b/gom/gom-command.c
index 88f4824..e32afca 100644
--- a/gom/gom-command.c
+++ b/gom/gom-command.c
@@ -523,9 +523,3 @@ gom_command_init (GomCommand *command)
                                   GomCommandPrivate);
    command->priv->blobs = g_ptr_array_new_with_free_func ((GDestroyNotify) g_bytes_unref);
 }
-
-GQuark
-gom_command_error_quark (void)
-{
-   return g_quark_from_static_string("gom_command_error_quark");
-}
diff --git a/gom/gom-command.h b/gom/gom-command.h
index d3f0cc0..89d64f7 100644
--- a/gom/gom-command.h
+++ b/gom/gom-command.h
@@ -32,18 +32,10 @@ G_BEGIN_DECLS
 #define GOM_IS_COMMAND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOM_TYPE_COMMAND))
 #define GOM_IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GOM_TYPE_COMMAND))
 #define GOM_COMMAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GOM_TYPE_COMMAND, GomCommandClass))
-#define GOM_COMMAND_ERROR           (gom_command_error_quark())
 
 typedef struct _GomCommand        GomCommand;
 typedef struct _GomCommandClass   GomCommandClass;
 typedef struct _GomCommandPrivate GomCommandPrivate;
-typedef enum   _GomCommandError   GomCommandError;
-
-enum _GomCommandError
-{
-   GOM_COMMAND_ERROR_NO_SQL = 1,
-   GOM_COMMAND_ERROR_SQLITE,
-};
 
 struct _GomCommand
 {
@@ -58,7 +50,6 @@ struct _GomCommandClass
    GObjectClass parent_class;
 };
 
-GQuark       gom_command_error_quark      (void) G_GNUC_CONST;
 gboolean     gom_command_execute          (GomCommand    *command,
                                            GomCursor    **cursor,
                                            GError       **error);
diff --git a/gom/gom-repository.c b/gom/gom-repository.c
index 25ececb..9568176 100644
--- a/gom/gom-repository.c
+++ b/gom/gom-repository.c
@@ -905,9 +905,3 @@ gom_repository_init (GomRepository *repository)
                                   GOM_TYPE_REPOSITORY,
                                   GomRepositoryPrivate);
 }
-
-GQuark
-gom_repository_error_quark (void)
-{
-   return g_quark_from_static_string("gom-repository-error-quark");
-}
diff --git a/gom/gom-repository.h b/gom/gom-repository.h
index 1bad0de..c335f00 100644
--- a/gom/gom-repository.h
+++ b/gom/gom-repository.h
@@ -34,12 +34,10 @@ G_BEGIN_DECLS
 #define GOM_IS_REPOSITORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOM_TYPE_REPOSITORY))
 #define GOM_IS_REPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GOM_TYPE_REPOSITORY))
 #define GOM_REPOSITORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GOM_TYPE_REPOSITORY, 
GomRepositoryClass))
-#define GOM_REPOSITORY_ERROR           (gom_repository_error_quark())
 
 typedef struct _GomRepository        GomRepository;
 typedef struct _GomRepositoryClass   GomRepositoryClass;
 typedef struct _GomRepositoryPrivate GomRepositoryPrivate;
-typedef enum   _GomRepositoryError   GomRepositoryError;
 
 typedef gboolean (*GomRepositoryMigrator) (GomRepository  *repository,
                                            GomAdapter     *adapter,
@@ -47,10 +45,6 @@ typedef gboolean (*GomRepositoryMigrator) (GomRepository  *repository,
                                            gpointer        user_data,
                                            GError        **error);
 
-enum _GomRepositoryError
-{
-   GOM_REPOSITORY_ERROR_EMPTY_RESULT = 1,
-};
 
 struct _GomRepository
 {
@@ -65,7 +59,6 @@ struct _GomRepositoryClass
    GObjectClass parent_class;
 };
 
-GQuark            gom_repository_error_quark     (void) G_GNUC_CONST;
 GomAdapter       *gom_repository_get_adapter     (GomRepository          *repository);
 GType             gom_repository_get_type        (void) G_GNUC_CONST;
 GomRepository    *gom_repository_new             (GomAdapter             *adapter);
diff --git a/gom/gom-resource.c b/gom/gom-resource.c
index a4a969d..b4bcacb 100644
--- a/gom/gom-resource.c
+++ b/gom/gom-resource.c
@@ -885,12 +885,6 @@ gom_resource_init (GomResource *resource)
 }
 
 GQuark
-gom_resource_error_quark (void)
-{
-   return g_quark_from_static_string("gom_resource_error_quark");
-}
-
-GQuark
 gom_resource_new_in_version_quark (void)
 {
    return g_quark_from_static_string("gom_resource_new_in_version_quark");
diff --git a/gom/gom-resource.h b/gom/gom-resource.h
index ebab1f4..2abcd7e 100644
--- a/gom/gom-resource.h
+++ b/gom/gom-resource.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 #define GOM_IS_RESOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOM_TYPE_RESOURCE))
 #define GOM_IS_RESOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GOM_TYPE_RESOURCE))
 #define GOM_RESOURCE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GOM_TYPE_RESOURCE, 
GomResourceClass))
-#define GOM_RESOURCE_ERROR           (gom_resource_error_quark())
 #define GOM_RESOURCE_NEW_IN_VERSION  (gom_resource_new_in_version_quark())
 #define GOM_RESOURCE_NOT_MAPPED      (gom_resource_not_mapped_quark())
 #define GOM_RESOURCE_TO_BYTES_FUNC   (gom_resource_to_bytes_func_quark())
@@ -43,15 +42,9 @@ G_BEGIN_DECLS
 typedef struct _GomResource        GomResource;
 typedef struct _GomResourceClass   GomResourceClass;
 typedef struct _GomResourcePrivate GomResourcePrivate;
-typedef enum   _GomResourceError   GomResourceError;
 
 #include "gom-resource-group.h"
 
-enum _GomResourceError
-{
-   GOM_RESOURCE_ERROR_CURSOR = 1,
-};
-
 struct _GomResource
 {
    GObject parent;
@@ -98,7 +91,6 @@ gboolean          gom_resource_delete_finish         (GomResource          *reso
                                                       GError              **error);
 gboolean          gom_resource_delete_sync           (GomResource          *resource,
                                                       GError              **error);
-GQuark            gom_resource_error_quark           (void) G_GNUC_CONST;
 GQuark            gom_resource_new_in_version_quark  (void) G_GNUC_CONST;
 GQuark            gom_resource_not_mapped_quark      (void) G_GNUC_CONST;
 GQuark            gom_resource_to_bytes_func_quark   (void) G_GNUC_CONST;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]