Replace ugly macros with ugly boilerplate

diff --git a/src/data/gis-http.c b/src/data/gis-http.c
index 1f1c27080322c6a6d8a32961959b52cebe0e25e7..78251bec02b8230a66f6719f2ba19ffc6d49e4db 100644 (file)
--- a/src/data/gis-http.c
+++ b/src/data/gis-http.c
@@ -97,7 +97,7 @@ gchar *gis_http_fetch(GisHttp *http, const gchar *uri, const char *local,
                FILE *fp = fopen_p(path, "a");
 
                /* Make temp data */
                FILE *fp = fopen_p(path, "a");
 
                /* Make temp data */

-               struct _cache_info info = {
+               struct _CacheInfo info = {

                        .fp        = fp,
                        .path      = path,
                        .callback  = callback,
                        .fp        = fp,
                        .path      = path,
                        .callback  = callback,

diff --git a/src/objects/gis-callback.c b/src/objects/gis-callback.c
index 79d8300e3d22b71fed2c5bc66f736cfc947605c5..05fa7467b5769abe92f5a5bc3651c3aedd3801a7 100644 (file)
--- a/src/objects/gis-callback.c
+++ b/src/objects/gis-callback.c
@@ -20,8 +20,13 @@
 
 /* GisCallback */
 G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);
 
 /* GisCallback */
 G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);

-static void gis_callback_init(GisCallback *cb) { }
-static void gis_callback_class_init(GisCallbackClass *klass) { }
+static void gis_callback_init(GisCallback *cb)
+{
+}
+
+static void gis_callback_class_init(GisCallbackClass *klass)
+{
+}

 
 GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data)
 {
 
 GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data)
 {

diff --git a/src/objects/gis-callback.h b/src/objects/gis-callback.h
index 8677fa698fe12af0510306f71888be01dcaca0b0..f3eee6de59a4e71ef95ddb4e7049a6a3d720f4c1 100644 (file)
--- a/src/objects/gis-callback.h
+++ b/src/objects/gis-callback.h
@@ -23,12 +23,15 @@
 #include "gis-object.h"
 
 /* GisCallback */
 #include "gis-object.h"
 
 /* GisCallback */

-#define GIS_TYPE_CALLBACK (gis_callback_get_type())
+#define GIS_TYPE_CALLBACK            (gis_callback_get_type())
+#define GIS_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_CALLBACK, GisCallback))
+#define GIS_IS_CALLBACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_CALLBACK))
+#define GIS_CALLBACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_CALLBACK, GisCallbackClass))
+#define GIS_IS_CALLBACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_CALLBACK))
+#define GIS_CALLBACK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_CALLBACK, GisCallbackClass))

 
 

-GOBJECT_HEAD(
-       GIS, CALLBACK,
-       Gis, Callback,
-       gis, callback);
+typedef struct _GisCallback      GisCallback;
+typedef struct _GisCallbackClass GisCallbackClass;

 
 typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
 
 
 typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
 


@@ -42,6 +45,8 @@ struct _GisCallbackClass {
        GisObjectClass parent_class;
 };
 
        GisObjectClass parent_class;
 };
 

+GType gis_callback_get_type(void);
+

 GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
 
 #endif
 GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
 
 #endif

diff --git a/src/objects/gis-marker.c b/src/objects/gis-marker.c
index 69e8ad55ba13338c9907f43445a4a2d100e516dc..f3a5079a66db4b6d4f75a9e2b2bbceedaeebb181 100644 (file)
--- a/src/objects/gis-marker.c
+++ b/src/objects/gis-marker.c
@@ -42,7 +42,9 @@ GisMarker *gis_marker_new(const gchar *label)
 }
 
 G_DEFINE_TYPE(GisMarker, gis_marker, GIS_TYPE_OBJECT);
 }
 
 G_DEFINE_TYPE(GisMarker, gis_marker, GIS_TYPE_OBJECT);

-static void gis_marker_init(GisMarker *marker) { }
+static void gis_marker_init(GisMarker *marker)
+{
+}

 
 static void gis_marker_finalize(GObject *_marker)
 {
 
 static void gis_marker_finalize(GObject *_marker)
 {

diff --git a/src/objects/gis-marker.h b/src/objects/gis-marker.h
index c712759f640f4e629e95fee3ae5333ca638332db..fac46800692877febab28628bbf155dc0f0ae8fa 100644 (file)
--- a/src/objects/gis-marker.h
+++ b/src/objects/gis-marker.h
@@ -24,12 +24,15 @@
 #include "gis-object.h"
 
 /* GisMarker */
 #include "gis-object.h"
 
 /* GisMarker */

-#define GIS_TYPE_MARKER (gis_marker_get_type())
+#define GIS_TYPE_MARKER            (gis_marker_get_type())
+#define GIS_MARKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_MARKER, GisMarker))
+#define GIS_IS_MARKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_MARKER))
+#define GIS_MARKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_MARKER, GisMarkerClass))
+#define GIS_IS_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_MARKER))
+#define GIS_MARKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_MARKER, GisMarkerClass))

 
 

-GOBJECT_HEAD(
-       GIS, MARKER,
-       Gis, Marker,
-       gis, marker);
+typedef struct _GisMarker      GisMarker;
+typedef struct _GisMarkerClass GisMarkerClass;

 
 struct _GisMarker {
        GisObject  parent_instance;
 
 struct _GisMarker {
        GisObject  parent_instance;


@@ -43,6 +46,8 @@ struct _GisMarkerClass {
        GisObjectClass parent_class;
 };
 
        GisObjectClass parent_class;
 };
 

+GType gis_marker_get_type(void);
+

 GisMarker *gis_marker_new(const gchar *label);
 
 #endif
 GisMarker *gis_marker_new(const gchar *label);
 
 #endif

diff --git a/src/objects/gis-object.c b/src/objects/gis-object.c
index e7f4b06140a5a7b530bd46dfbb821cb64c8e609b..ac01a294379b67c512ca585b815fad9407c7079b 100644 (file)
--- a/src/objects/gis-object.c
+++ b/src/objects/gis-object.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include "gis-object.h"
 
 #include <config.h>
 #include "gis-object.h"
 

+

 /* GisPoint */
 GisPoint *gis_point_new()
 {
 /* GisPoint */
 GisPoint *gis_point_new()
 {


@@ -38,6 +39,11 @@ void gis_point_free(GisPoint *point)
 
 
 /* GisObject */
 
 
 /* GisObject */

-G_DEFINE_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
-static void gis_object_init(GisObject *object) { }
-static void gis_object_class_init(GisObjectClass *klass) { }
+G_DEFINE_ABSTRACT_TYPE(GisObject, gis_object, G_TYPE_OBJECT);
+static void gis_object_init(GisObject *object)
+{
+}
+
+static void gis_object_class_init(GisObjectClass *klass)
+{
+}

diff --git a/src/objects/gis-object.h b/src/objects/gis-object.h
index 4055d877cbd97a966aa86820d0114257766049c4..b823161d656ee4259c4bfe3fbafcabe38d5541e5 100644 (file)
--- a/src/objects/gis-object.h
+++ b/src/objects/gis-object.h
@@ -21,45 +21,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
 #include <glib.h>
 #include <glib-object.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 *mambar) { \
-} \
-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;
 
 /* GisPoint */
 typedef struct _GisPoint GisPoint;
 


@@ -73,15 +34,18 @@ void gis_point_free(GisPoint *point);
 
 
 /* GisObject */
 
 
 /* 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 {
 
 struct _GisObject {

-       GObject parent_instance;
+       GObject  parent_instance;

        GisPoint center;
        gdouble  lod;
 };
        GisPoint center;
        gdouble  lod;
 };


@@ -90,6 +54,8 @@ struct _GisObjectClass {
        GObjectClass parent_class;
 };
 
        GObjectClass parent_class;
 };
 

+GType gis_object_get_type(void);
+

 static inline GisPoint *gis_object_center(GisObject *object)
 {
        return &GIS_OBJECT(object)->center;
 static inline GisPoint *gis_object_center(GisObject *object)
 {
        return &GIS_OBJECT(object)->center;

diff --git a/src/objects/gis-tile.c b/src/objects/gis-tile.c
index fce15e57c0ae79dba31c8446d66ed01d144cdeef..d7f8ac77073630ec5157a89cdc873e075d0baf22 100644 (file)
--- a/src/objects/gis-tile.c
+++ b/src/objects/gis-tile.c
@@ -194,5 +194,10 @@ void gis_tile_free(GisTile *tile, GisTileFreeFunc free_func, gpointer user_data)
 
 /* GObject code */
 G_DEFINE_TYPE(GisTile, gis_tile, GIS_TYPE_OBJECT);
 
 /* GObject code */
 G_DEFINE_TYPE(GisTile, gis_tile, GIS_TYPE_OBJECT);

-static void gis_tile_init(GisTile *tile) { }
-static void gis_tile_class_init(GisTileClass *klass) { }
+static void gis_tile_init(GisTile *tile)
+{
+}
+
+static void gis_tile_class_init(GisTileClass *klass)
+{
+}

diff --git a/src/objects/gis-tile.h b/src/objects/gis-tile.h
index 698c0c42952d518e413bae1a397fa004fe6cc697..c1e3ea77d999cbb155eacf4266545273ee970e24 100644 (file)
--- a/src/objects/gis-tile.h
+++ b/src/objects/gis-tile.h
@@ -22,12 +22,15 @@
 #include <glib-object.h>
 #include "gis-object.h"
 
 #include <glib-object.h>
 #include "gis-object.h"
 

-#define GIS_TYPE_TILE (gis_tile_get_type())
+#define GIS_TYPE_TILE            (gis_tile_get_type())
+#define GIS_TILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_TILE, GisTile))
+#define GIS_IS_TILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_TILE))
+#define GIS_TILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_TILE, GisTileClass))
+#define GIS_IS_TILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_TILE))
+#define GIS_TILE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_TILE, GisTileClass))

 
 

-GOBJECT_HEAD(
-       GIS, TILE,
-       Gis, Tile,
-       gis, tile);
+typedef struct _GisTile      GisTile;
+typedef struct _GisTileClass GisTileClass;

 
 struct _GisTile {
        GisObject  parent_instance;
 
 struct _GisTile {
        GisObject  parent_instance;


@@ -68,6 +71,8 @@ typedef void (*GisTileFreeFunc)(GisTile *tile, gpointer user_data);
 /* Path to string table, keep in sync with tile->children */
 extern gchar *gis_tile_path_table[2][2];
 
 /* Path to string table, keep in sync with tile->children */
 extern gchar *gis_tile_path_table[2][2];
 

+GType gis_tile_get_type(void);
+

 /* Allocate a new Tile */
 GisTile *gis_tile_new(GisTile *parent,
        gdouble n, gdouble s, gdouble e, gdouble w);
 /* Allocate a new Tile */
 GisTile *gis_tile_new(GisTile *parent,
        gdouble n, gdouble s, gdouble e, gdouble w);