Cleanning code

diff --git a/src/google-map-type.gob b/src/google-map-type.gob
index 670bd2d70d8fd8933c6fa3314c45ba5a410818e0..708ad2e912af3359b50d8c000fdf8dae95e2678f 100644 (file)
--- a/src/google-map-type.gob
+++ b/src/google-map-type.gob
@@ -215,15 +215,9 @@ class Google:Map:Type from Vik:Map:Type {
 
   public GObject *
   new_with_id (guint8 id, GoogleType type) {
-         GObject *ret = GET_NEW;
+         GoogleMapType *ret = GET_NEW;
          VIK_MAP_TYPE(ret)->uniq_id = id;
-         GOOGLE_MAP_TYPE(ret)->_priv->type = type;
-         return G_OBJECT (ret);
-  }
-
-  public GObject *
-  new (void) {
-         GObject *ret = GET_NEW;
+         ret->_priv->type = type;
          return G_OBJECT (ret);
   }
 

diff --git a/src/osm-map-type.gob b/src/osm-map-type.gob
index 34ef6c6b54368b8503c5d32dd8f04d4c526ef746..817769b181fe0e5c47089a7f267c535daee8e774 100644 (file)
--- a/src/osm-map-type.gob
+++ b/src/osm-map-type.gob
@@ -69,16 +69,10 @@ class Osm:Map:Type from Vik:Map:Type {
 
   public GObject *
   new_with_id (guint8 id, const gchar *hostname, const gchar *url) {
-         GObject *ret = GET_NEW;
+         OsmMapType *ret = GET_NEW;
          VIK_MAP_TYPE(ret)->uniq_id = id;
-         OSM_MAP_TYPE(ret)->_priv->hostname = g_strdup(hostname);
-         OSM_MAP_TYPE(ret)->_priv->url = g_strdup(url);
-         return G_OBJECT (ret);
-  }
-
-  public GObject *
-  new (void) {
-         GObject *ret = GET_NEW;
+         ret->_priv->hostname = g_strdup(hostname);
+         ret->_priv->url = g_strdup(url);
          return G_OBJECT (ret);
   }
 

diff --git a/src/terraserver-map-type.gob b/src/terraserver-map-type.gob
index 8a64850efed4a2a6cd6f4c8a36b33efd0caa75d7..f50712cc8210e9f736d279d62a551594a135daf0 100644 (file)
--- a/src/terraserver-map-type.gob
+++ b/src/terraserver-map-type.gob
@@ -71,9 +71,9 @@ class Terraserver:Map:Type from Vik:Map:Type {
 
   public GObject *
   new_with_id (guint8 id, int type) {
-         GObject *ret = GET_NEW;
+         TerraserverMapType *ret = GET_NEW;
          VIK_MAP_TYPE(ret)->uniq_id = id;
-         TERRASERVER_MAP_TYPE(ret)->_priv->type = type;
+         ret->_priv->type = type;
          return G_OBJECT (ret);
   }
 

diff --git a/src/vik-map-type.gob b/src/vik-map-type.gob
index d28caccd677ab407f6389eab59aa46c3ef700895..801bbe888e8b8190d79f7d9fa2d07322a1cb6791 100644 (file)
--- a/src/vik-map-type.gob
+++ b/src/vik-map-type.gob
@@ -3,6 +3,7 @@
 #include "config.h"
 #endif
 
+#include "vikviewport.h"
 #include "vikcoord.h"
 #include "mapcoord.h"
 %}
@@ -11,7 +12,7 @@
   public guint8 uniq_id;
   public guint16 tilesize_x;
   public guint16 tilesize_y;
-  public guint drawmode;
+  public VikViewportDrawMode drawmode;
   virtual public gboolean coord_to_mapcoord ( self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
   {
     return FALSE;