From 0ab355252e7f5431a1765140520acb79bcf7a5cb Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Mon, 25 Nov 2013 00:35:31 +0000 Subject: [PATCH] [QA] Remove unused parameter --- src/acquire.c | 2 +- src/datasource_osm_my_traces.c | 2 +- src/file.c | 4 ++-- src/vikgpslayer.c | 2 +- src/viklayer.c | 2 +- src/viklayer.h | 2 +- src/viklayerspanel.c | 2 +- src/viktrwlayer.c | 2 +- src/vikwindow.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/acquire.c b/src/acquire.c index 184ae2ab..aa1da532 100644 --- a/src/acquire.c +++ b/src/acquire.c @@ -380,7 +380,7 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD wi->vtl = VIK_TRW_LAYER(current_selected); } if ( wi->creating_new_layer ) { - wi->vtl = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, w->vvp, NULL, FALSE ) ); + wi->vtl = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, w->vvp, FALSE ) ); vik_layer_rename ( VIK_LAYER ( wi->vtl ), _(source_interface->layer_title) ); } diff --git a/src/datasource_osm_my_traces.c b/src/datasource_osm_my_traces.c index 5db7a591..f496206c 100644 --- a/src/datasource_osm_my_traces.c +++ b/src/datasource_osm_my_traces.c @@ -627,7 +627,7 @@ static gboolean datasource_osm_my_traces_process ( VikTrwLayer *vtl, const gchar if ( create_new_layer ) { // Have data but no layer - so create one - vtlX = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, vik_window_viewport(adw->vw), NULL, FALSE ) ); + vtlX = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, adw->vvp, FALSE ) ); if ( ((gpx_meta_data_t*)selected_iterator->data)->name ) vik_layer_rename ( VIK_LAYER ( vtlX ), ((gpx_meta_data_t*)selected_iterator->data)->name ); else diff --git a/src/file.c b/src/file.c index ae22df2c..a8812c65 100644 --- a/src/file.c +++ b/src/file.c @@ -341,7 +341,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, const gchar *dirpat } else { - stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE ); + stack->data = (gpointer) vik_layer_create ( type, vp, FALSE ); params = vik_layer_get_interface(type)->params; params_count = vik_layer_get_interface(type)->params_count; } @@ -676,7 +676,7 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar // must be loaded into a new TrackWaypoint layer (hence it be created) gboolean success = TRUE; // Detect load failures - mainly to remove the layer created as it's not required - VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ); + VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, FALSE ); vik_layer_rename ( vtl, a_file_basename ( filename ) ); // In fact both kml & gpx files start the same as they are in xml diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index 77d1878d..207f487f 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -418,7 +418,7 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp) vik_layer_rename ( VIK_LAYER(rv), vik_gps_layer_interface.name ); for (i = 0; i < NUM_TRW; i++) { - rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE )); + rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, FALSE )); vik_layer_set_menu_items_selection(VIK_LAYER(rv->trw_children[i]), VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_DELETE)); } return rv; diff --git a/src/viklayer.c b/src/viklayer.c index 0b2ca28a..880c7394 100644 --- a/src/viklayer.c +++ b/src/viklayer.c @@ -203,7 +203,7 @@ const gchar *vik_layer_get_name ( VikLayer *l ) return l->name; } -VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, GtkWindow *w, gboolean interactive ) +VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, gboolean interactive ) { VikLayer *new_layer = NULL; g_assert ( type < VIK_LAYER_NUM_TYPES ); diff --git a/src/viklayer.h b/src/viklayer.h index 40aa1708..f7d16a91 100644 --- a/src/viklayer.h +++ b/src/viklayer.h @@ -277,7 +277,7 @@ void vik_layer_emit_update ( VikLayer *vl ); void vik_layer_set_menu_items_selection(VikLayer *l, guint16 selection); guint16 vik_layer_get_menu_items_selection(VikLayer *l); void vik_layer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp ); -VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, GtkWindow *w, gboolean interactive ); +VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, gboolean interactive ); gboolean vik_layer_properties ( VikLayer *layer, VikViewport *vp ); void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter * layer_iter ); diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index 8bd534a0..5c9ef5b6 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -447,7 +447,7 @@ gboolean vik_layers_panel_new_layer ( VikLayersPanel *vlp, VikLayerTypeEnum type { VikLayer *l; g_assert ( vlp->vvp ); - l = vik_layer_create ( type, vlp->vvp, VIK_GTK_WINDOW_FROM_WIDGET(vlp), TRUE ); + l = vik_layer_create ( type, vlp->vvp, TRUE ); if ( l ) { vik_layers_panel_add_layer ( vlp, l ); diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index 741edaef..7b1de64f 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -1440,7 +1440,7 @@ static void trw_layer_marshall( VikTrwLayer *vtl, guint8 **data, gint *len ) static VikTrwLayer *trw_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ) { - VikTrwLayer *vtl = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vvp, NULL, FALSE )); + VikTrwLayer *vtl = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vvp, FALSE )); gint pl; gint consumed_length; diff --git a/src/vikwindow.c b/src/vikwindow.c index 016548f3..e2999d5b 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -438,7 +438,7 @@ void vik_window_new_window_finish ( VikWindow *vw ) // Maybe add a default map layer if ( a_vik_get_add_default_map_layer () ) { - VikMapsLayer *vml = VIK_MAPS_LAYER ( vik_layer_create(VIK_LAYER_MAPS, vw->viking_vvp, NULL, FALSE) ); + VikMapsLayer *vml = VIK_MAPS_LAYER ( vik_layer_create(VIK_LAYER_MAPS, vw->viking_vvp, FALSE) ); vik_layer_rename ( VIK_LAYER(vml), _("Default Map") ); vik_aggregate_layer_add_layer ( vik_layers_panel_get_top_layer(vw->viking_vlp), VIK_LAYER(vml), TRUE ); -- 2.39.5