[QA] Consistent use of *_layer_draw parameter types.

diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c
index 3b8cce65e7fc75d34d510c5d90d5ac1dd0b4c96c..42b7b93899c14e05628923d7cb97f9d61849239f 100644 (file)
--- a/src/vikaggregatelayer.c
+++ b/src/vikaggregatelayer.c
@@ -294,24 +294,23 @@ void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child
  * of the pixmap before drawing the trigger layer so we can use it again
  * later.
  */
-void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data )
+void vik_aggregate_layer_draw ( VikAggregateLayer *val, VikViewport *vp )
 {
   GList *iter = val->children;
   VikLayer *vl;
-  VikViewport *viewport = VIK_VIEWPORT(data);
-  VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( viewport ));
+  VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( vp ));
   while ( iter ) {
     vl = VIK_LAYER(iter->data);
     if ( vl == trigger ) {
-      if ( vik_viewport_get_half_drawn ( viewport ) ) {
-        vik_viewport_set_half_drawn ( viewport, FALSE );
-        vik_viewport_snapshot_load( viewport );
+      if ( vik_viewport_get_half_drawn ( vp ) ) {
+        vik_viewport_set_half_drawn ( vp, FALSE );
+        vik_viewport_snapshot_load( vp );
       } else {
-        vik_viewport_snapshot_save( viewport );
+        vik_viewport_snapshot_save( vp );
       }
     }
-    if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( viewport ) )
-      vik_layer_draw ( vl, data );
+    if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( vp ) )
+      vik_layer_draw ( vl, vp );
     iter = iter->next;
   }
 }

diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
index 22652a818caf2d2f6da6e184989f190ac580900f..4a3cf7a13420b16bb1a2547bd4973ae606fcd3ed 100644 (file)
--- a/src/vikaggregatelayer.h
+++ b/src/vikaggregatelayer.h
@@ -46,7 +46,7 @@ VikAggregateLayer *vik_aggregate_layer_new ();
 void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l );
 void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_layer );
 void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up );
-void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data );
+void vik_aggregate_layer_draw ( VikAggregateLayer *val, VikViewport *vp );
 void vik_aggregate_layer_free ( VikAggregateLayer *val );
 void vik_aggregate_layer_clear ( VikAggregateLayer *val );
 gboolean vik_aggregate_layer_delete ( VikAggregateLayer *val, GtkTreeIter *iter );

diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
index de92d7fbe95262c705dbe63ae2989d262bc9e829..cf724a246282eeebddfdb246b0b9d124e5a5cb88 100644 (file)
--- a/src/vikgpslayer.c
+++ b/src/vikgpslayer.c
@@ -49,7 +49,7 @@
 static VikGpsLayer *vik_gps_layer_create (VikViewport *vp);
 static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter );
 static void vik_gps_layer_free ( VikGpsLayer *val );
-static void vik_gps_layer_draw ( VikGpsLayer *val, gpointer data );
+static void vik_gps_layer_draw ( VikGpsLayer *val, VikViewport *vp );
 static VikGpsLayer *vik_gps_layer_new ( VikViewport *vp );
 
 static void gps_layer_marshall( VikGpsLayer *val, guint8 **data, gint *len );
@@ -666,37 +666,37 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp)
   return vgl;
 }
 
-static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data )
+static void vik_gps_layer_draw ( VikGpsLayer *vgl, VikViewport *vp )
 {
   gint i;
   VikLayer *vl;
-  VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( VIK_VIEWPORT(data) ));
+  VikLayer *trigger = VIK_LAYER(vik_viewport_get_trigger( vp ));
 
   for (i = 0; i < NUM_TRW; i++) {
     vl = VIK_LAYER(vgl->trw_children[i]);
     if (vl == trigger) {
-      if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) {
-        vik_viewport_set_half_drawn ( VIK_VIEWPORT(data), FALSE );
-        vik_viewport_snapshot_load( VIK_VIEWPORT(data) );
+      if ( vik_viewport_get_half_drawn ( vp ) ) {
+        vik_viewport_set_half_drawn ( vp, FALSE );
+        vik_viewport_snapshot_load( vp );
       } else {
-        vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
+        vik_viewport_snapshot_save( vp );
       }
     }
-    if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
-      vik_layer_draw ( vl, data );
+    if (!vik_viewport_get_half_drawn(vp))
+      vik_layer_draw ( vl, vp );
   }
 #if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION)
   if (vgl->realtime_tracking) {
     if (VIK_LAYER(vgl) == trigger) {
-      if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) {
-        vik_viewport_set_half_drawn ( VIK_VIEWPORT(data), FALSE );
-        vik_viewport_snapshot_load( VIK_VIEWPORT(data) );
+      if ( vik_viewport_get_half_drawn ( vp ) ) {
+        vik_viewport_set_half_drawn ( vp, FALSE );
+        vik_viewport_snapshot_load( vp );
       } else {
-        vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
+        vik_viewport_snapshot_save( vp );
       }
     }
-    if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data)))
-      realtime_tracking_draw(vgl, VIK_VIEWPORT(data));
+    if (!vik_viewport_get_half_drawn(vp))
+      realtime_tracking_draw(vgl, vp);
   }
 #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
 }

diff --git a/src/viklayer.c b/src/viklayer.c
index 1cd70cbe12a1ed1f1f129f5f60e6189a60f68688..f213a975ab7e37fc99d59cdcbc4e3577fd826b61 100644 (file)
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -234,11 +234,11 @@ gboolean vik_layer_properties ( VikLayer *layer, gpointer vp )
   return vik_layer_properties_factory ( layer, vp );
 }
 
-void vik_layer_draw ( VikLayer *l, gpointer data )
+void vik_layer_draw ( VikLayer *l, VikViewport *vp )
 {
   if ( l->visible )
     if ( vik_layer_interfaces[l->type]->draw )
-      vik_layer_interfaces[l->type]->draw ( l, data );
+      vik_layer_interfaces[l->type]->draw ( l, vp );
 }
 
 void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode )

diff --git a/src/viklayer.h b/src/viklayer.h
index d07950d53966432b33cf34b0200f71e43f79a283..1933fb4874cf3a7f3cdcd19b5d43e74a0f73794d 100644 (file)
--- a/src/viklayer.h
+++ b/src/viklayer.h
@@ -257,7 +257,7 @@ VikLayerInterface *vik_layer_get_interface ( VikLayerTypeEnum type );
 
 
 void vik_layer_set_type ( VikLayer *vl, VikLayerTypeEnum type );
-void vik_layer_draw ( VikLayer *l, gpointer data );
+void vik_layer_draw ( VikLayer *l, VikViewport *vp );
 void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode );
 void vik_layer_rename ( VikLayer *l, const gchar *new_name );
 void vik_layer_rename_no_copy ( VikLayer *l, gchar *new_name );