X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/92806042fbacaadd1a9216d01c7b2503ede459af..dade5f874b05c2263bbbe668a77021d487b0761b:/src/vikexttool.c?ds=sidebyside

diff --git a/src/vikexttool.c b/src/vikexttool.c
index 66fb3566..0b735bd3 100644
--- a/src/vikexttool.c
+++ b/src/vikexttool.c
@@ -29,9 +29,6 @@
 
 #include <glib/gi18n.h>
 
-static void ext_tool_class_init ( VikExtToolClass *klass );
-static void ext_tool_init ( VikExtTool *vlp );
-
 static GObjectClass *parent_class;
 
 static void ext_tool_finalize ( GObject *gob );
@@ -49,29 +46,7 @@ struct _VikExtToolPrivate
                                 VIK_EXT_TOOL_TYPE,          \
                                 VikExtToolPrivate))
 
-GType vik_ext_tool_get_type()
-{
-  static GType w_type = 0;
-
-  if (!w_type)
-  {
-    static const GTypeInfo w_info = 
-    {
-      sizeof (VikExtToolClass),
-      NULL, /* base_init */
-      NULL, /* base_finalize */
-      (GClassInitFunc) ext_tool_class_init,
-      NULL, /* class_finalize */
-      NULL, /* class_data */
-      sizeof (VikExtTool),
-      0,
-      (GInstanceInitFunc) ext_tool_init,
-    };
-    w_type = g_type_register_static ( G_TYPE_OBJECT, "VikExtTool", &w_info, G_TYPE_FLAG_ABSTRACT );
-  }
-
-  return w_type;
-}
+G_DEFINE_ABSTRACT_TYPE (VikExtTool, vik_ext_tool, G_TYPE_OBJECT)
 
 enum
 {
@@ -136,7 +111,7 @@ ext_tool_get_property (GObject    *object,
     }
 }
 
-static void ext_tool_class_init ( VikExtToolClass *klass )
+static void vik_ext_tool_class_init ( VikExtToolClass *klass )
 {
   GObjectClass *gobject_class;
   GParamSpec *pspec;
@@ -173,12 +148,7 @@ static void ext_tool_class_init ( VikExtToolClass *klass )
   g_type_class_add_private (klass, sizeof (VikExtToolPrivate));
 }
 
-VikExtTool *vik_ext_tool_new ()
-{
-  return VIK_EXT_TOOL ( g_object_new ( VIK_EXT_TOOL_TYPE, NULL ) );
-}
-
-static void ext_tool_init ( VikExtTool *self )
+static void vik_ext_tool_init ( VikExtTool *self )
 {
   VikExtToolPrivate *priv = EXT_TOOL_GET_PRIVATE (self);
   priv->label = NULL;