Replace ugly macros with ugly boilerplate

[grits] / src / objects / gis-object.c

diff --git a/src/objects/gis-object.c b/src/objects/gis-object.c
index fe51eb13b0e91c2c39afa4d7bb0a71767d93d09a..ac01a294379b67c512ca585b815fad9407c7079b 100644 (file)
--- a/src/objects/gis-object.c
+++ b/src/objects/gis-object.c
@@ -15,86 +15,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
-#include <GL/glu.h>
-
+#include <config.h>
 #include "gis-object.h"
 
+
 /* GisPoint */
 GisPoint *gis_point_new()
 {
        return g_new0(GisPoint, 1);
 }
 
-void gis_point_set_lle(GisPoint *self, gdouble lat, gdouble lon, gdouble elev)
+void gis_point_set_lle(GisPoint *point, gdouble lat, gdouble lon, gdouble elev)
 {
-       self->lat  = lat;
-       self->lon  = lon;
-       self->elev = elev;
+       point->lat  = lat;
+       point->lon  = lon;
+       point->elev = elev;
 }
 
-void gis_point_free(GisPoint *self)
+void gis_point_free(GisPoint *point)
 {
-       g_free(self);
+       g_free(point);
 }
 
 
 /* GisObject */
-G_DEFINE_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
-static void gis_object_init(GisObject *self) { }
-static void gis_object_class_init(GisObjectClass *klass) { }
-
-
-/* GisMarker */
-G_DEFINE_TYPE(GisMarker, gis_marker, GIS_TYPE_OBJECT);
-static void gis_marker_init(GisMarker *self) { }
-
-static void gis_marker_finalize(GObject *_self);
-static void gis_marker_class_init(GisMarkerClass *klass)
-{
-       G_OBJECT_CLASS(klass)->finalize = gis_marker_finalize;
-}
-
-GisMarker *gis_marker_new(const gchar *label)
+G_DEFINE_ABSTRACT_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
+static void gis_object_init(GisObject *object)
 {
-       static const int RADIUS =   4;
-       static const int WIDTH  = 100;
-       static const int HEIGHT =  20;
-
-       GisMarker *self = g_object_new(GIS_TYPE_MARKER, NULL);
-       self->xoff  = RADIUS;
-       self->yoff  = HEIGHT-RADIUS;
-       self->label = g_strdup(label);
-       self->cairo = cairo_create(cairo_image_surface_create(
-                               CAIRO_FORMAT_ARGB32, WIDTH, HEIGHT));
-       cairo_set_source_rgba(self->cairo, 1, 1, 1, 1);
-       cairo_arc(self->cairo, self->xoff, self->yoff, RADIUS, 0, 2*G_PI);
-       cairo_fill(self->cairo);
-       cairo_move_to(self->cairo, self->xoff+4, self->yoff-8);
-       cairo_set_font_size(self->cairo, 10);
-       cairo_show_text(self->cairo, self->label);
-       return self;
 }
 
-static void gis_marker_finalize(GObject *_self)
-{
-       GisMarker *self = GIS_MARKER(_self);
-       cairo_surface_destroy(cairo_get_target(self->cairo));
-       cairo_destroy(self->cairo);
-       g_free(self->label);
-       g_free(self);
-}
-
-
-/* GisCallback */
-G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);
-static void gis_callback_init(GisCallback *self) { }
-static void gis_callback_class_init(GisCallbackClass *klass) { }
-
-GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data)
+static void gis_object_class_init(GisObjectClass *klass)
 {
-       GisCallback *self = g_object_new(GIS_TYPE_CALLBACK, NULL);
-       self->callback  = callback;
-       self->user_data = user_data;
-       return self;
 }