[dia] [warningectomy] '_dia_context_get_type' defined but not used
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [warningectomy] '_dia_context_get_type' defined but not used
- Date: Sat, 4 May 2013 18:59:40 +0000 (UTC)
commit d9959ceaa01bf06c4c076110e04f0e1c5d0f382e
Author: Hans Breuer <hans breuer org>
Date: Sat May 4 12:48:23 2013 +0200
[warningectomy] '_dia_context_get_type' defined but not used
Actually G_DEFINE_TYPE was not used correctly (needs the base type)
and a superfluous get_type implementation was hiding that bug.
lib/diacontext.c | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/lib/diacontext.c b/lib/diacontext.c
index dda472d..518fb6a 100644
--- a/lib/diacontext.c
+++ b/lib/diacontext.c
@@ -34,8 +34,8 @@
#include "message.h" /* just for testing */
typedef struct _DiaContextClass DiaContextClass;
-#define DIA_TYPE_CONTEXT (dia_context_get_type ())
-GType dia_context_get_type (void) G_GNUC_CONST;
+#define DIA_TYPE_CONTEXT (_dia_context_get_type ())
+static GType _dia_context_get_type (void) G_GNUC_CONST;
struct _DiaContext
{
@@ -53,9 +53,8 @@ struct _DiaContextClass
/* The use of GObject is intentionally hidden from the API */
static void _dia_context_finalize (GObject *object);
-static GType _dia_context_get_type (void);
-G_DEFINE_TYPE (DiaContext, _dia_context, DIA_TYPE_CONTEXT);
+G_DEFINE_TYPE (DiaContext, _dia_context, G_TYPE_OBJECT);
static gpointer parent_class = NULL;
static void
@@ -83,34 +82,6 @@ _dia_context_init(DiaContext *self)
/* zero initialization should be right */
}
-GType
-dia_context_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (DiaContextClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) _dia_context_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (DiaContext),
- 0, /* n_preallocs */
- NULL /* init */
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT,
- "DiaContext",
- &object_info, 0);
- }
-
- return object_type;
-}
-
DiaContext *
dia_context_new (const char *desc)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]