Fix up primitive datatypes

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

diff --git a/src/objects/gis-object.h b/src/objects/gis-object.h
index b823161d656ee4259c4bfe3fbafcabe38d5541e5..1777fce1fb27713af276971c95f929876a2ef593 100644 (file)
--- a/src/objects/gis-object.h
+++ b/src/objects/gis-object.h
@@ -20,18 +20,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
-/* GisPoint */
-typedef struct _GisPoint GisPoint;
-
-struct _GisPoint {
-       gdouble lat, lon, elev;
-};
-
-GisPoint *gis_point_new();
-void gis_point_set_lle(GisPoint *point, gdouble lat, gdouble lon, gdouble elev);
-void gis_point_free(GisPoint *point);
-
+#include "gis-util.h"
 
 /* GisObject */
 #define GIS_TYPE_OBJECT            (gis_object_get_type())
@@ -56,9 +45,15 @@ struct _GisObjectClass {
 
 GType gis_object_get_type(void);
 
-static inline GisPoint *gis_object_center(GisObject *object)
-{
-       return &GIS_OBJECT(object)->center;
-}
+/**
+ * gis_object_center:
+ * @object: The #GisObject to get the center of
+ * 
+ * Get the #GisPoint representing the center of an object
+ *
+ * Returns: the center point
+ */
+#define gis_object_center(object) \
+       (&GIS_OBJECT(object)->center)
 
 #endif