Replace ugly macros with ugly boilerplate

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

diff --git a/src/objects/gis-object.h b/src/objects/gis-object.h
index acc425506451c0f876c58db9178bbc32405cfd3f..b823161d656ee4259c4bfe3fbafcabe38d5541e5 100644 (file)
--- a/src/objects/gis-object.h
+++ b/src/objects/gis-object.h
@@ -20,47 +20,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <cairo.h>
-
-
-/* Take that GLib boilerplate! */
-#define GOBJECT_HEAD( \
-               MAM, BAR, \
-               Mam, Bar, \
-               mam, bar) \
-GType mam##_##bar##_get_type(void); \
-typedef struct _##Mam##Bar Mam##Bar; \
-typedef struct _##Mam##Bar##Class Mam##Bar##Class; \
-static inline Mam##Bar *MAM##_##BAR(gpointer obj) { \
-       return G_TYPE_CHECK_INSTANCE_CAST(obj, MAM##_TYPE_##BAR, Mam##Bar); \
-} \
-static inline gboolean MAM##_IS_##BAR(gpointer obj) { \
-       return G_TYPE_CHECK_INSTANCE_TYPE(obj, MAM##_TYPE_##BAR); \
-} \
-static inline Mam##Bar##Class *MAM##_##BAR##_CLASS(gpointer klass) { \
-       return G_TYPE_CHECK_CLASS_CAST(klass, MAM##_TYPE_##BAR, Mam##Bar##Class); \
-} \
-static inline gboolean MAM##_IS_##BAR##_CLASS(gpointer klass) { \
-       return G_TYPE_CHECK_CLASS_TYPE(klass, MAM##_TYPE_##BAR); \
-} \
-static inline Mam##Bar##Class *MAM##_##BAR##_GET_CLASS(gpointer obj) { \
-       return G_TYPE_INSTANCE_GET_CLASS(obj, MAM##_TYPE_##BAR, Mam##Bar##Class); \
-}
-
-#define GOBJECT_BODY( \
-               parent_type, \
-               MAM, BAR, \
-               Mam, Bar, \
-               mam, bar) \
-G_DEFINE_TYPE(Mam##Bar, mam##_##bar, parent_type); \
-static void mam##_##bar##_init(Mam##Bar *self) { \
-} \
-static void mam##_##bar##_class_init(Mam##Bar##Class *klass) { \
-} \
-static Mam##Bar *mam##_##bar##_new() { \
-       return g_object_new(MAM##_TYPE_##BAR, NULL); \
-}
-
 
 /* GisPoint */
 typedef struct _GisPoint GisPoint;
@@ -75,15 +34,18 @@ void gis_point_free(GisPoint *point);
 
 
 /* GisObject */
-#define GIS_TYPE_OBJECT (gis_object_get_type())
+#define GIS_TYPE_OBJECT            (gis_object_get_type())
+#define GIS_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_OBJECT, GisObject))
+#define GIS_IS_OBJECT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_OBJECT))
+#define GIS_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_OBJECT, GisObjectClass))
+#define GIS_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_OBJECT))
+#define GIS_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_OBJECT, GisObjectClass))
 
-GOBJECT_HEAD(
-       GIS, OBJECT,
-       Gis, Object,
-       gis, object);
+typedef struct _GisObject      GisObject;
+typedef struct _GisObjectClass GisObjectClass;
 
 struct _GisObject {
-       GObject parent_instance;
+       GObject  parent_instance;
        GisPoint center;
        gdouble  lod;
 };
@@ -92,55 +54,11 @@ struct _GisObjectClass {
        GObjectClass parent_class;
 };
 
+GType gis_object_get_type(void);
+
 static inline GisPoint *gis_object_center(GisObject *object)
 {
        return &GIS_OBJECT(object)->center;
 }
 
-
-/* GisMarker */
-#define GIS_TYPE_MARKER (gis_marker_get_type())
-
-GOBJECT_HEAD(
-       GIS, MARKER,
-       Gis, Marker,
-       gis, marker);
-
-struct _GisMarker {
-       GisObject  parent_instance;
-       gint       xoff, yoff;
-       gchar     *label;
-       cairo_t   *cairo;
-       guint      tex;
-};
-
-struct _GisMarkerClass {
-       GisObjectClass parent_class;
-};
-
-GisMarker *gis_marker_new(const gchar *label);
-
-
-/* GisCallback */
-#define GIS_TYPE_CALLBACK (gis_callback_get_type())
-
-GOBJECT_HEAD(
-       GIS, CALLBACK,
-       Gis, Callback,
-       gis, callback);
-
-typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
-
-struct _GisCallback {
-       GisObject       parent;
-       GisCallbackFunc callback;
-       gpointer        user_data;
-};
-
-struct _GisCallbackClass {
-       GisObjectClass parent_class;
-};
-
-GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
-
 #endif