Merge branch 'upstream'

[chaz/homebank] / src / rep-vehicle.c

diff --git a/src/rep_vehicle.c b/src/rep-vehicle.c
similarity index 98%
rename from src/rep_vehicle.c
rename to src/rep-vehicle.c
index a4989371d732f9c0ff027fed5f08aff57c12e439..e14981cc6589d596c54b4671bb2e213aa0967e14 100644 (file)
--- a/src/rep_vehicle.c
+++ b/src/rep-vehicle.c
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2018 Maxime DOYEN
+ *  Copyright (C) 1995-2019 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -20,13 +20,13 @@
 
 #include "homebank.h"
 
-#include "rep_vehicle.h"
+#include "rep-vehicle.h"
 
-#include "list_operation.h"
+#include "list-operation.h"
 #include "gtk-chart.h"
 #include "gtk-dateentry.h"
 
-#include "dsp_mainwindow.h"
+#include "dsp-mainwindow.h"
 #include "ui-category.h"
 
 
@@ -62,7 +62,7 @@ static GtkWidget *create_list_repvehicle(void);
 
 
 static GtkActionEntry entries[] = {
-  { "Refresh" , ICONNAME_REFRESH   , N_("Refresh"), NULL,   N_("Refresh results"), G_CALLBACK (repvehicle_action_refresh) },
+  { "Refresh" , ICONNAME_HB_REFRESH   , N_("Refresh"), NULL,   N_("Refresh results"), G_CALLBACK (repvehicle_action_refresh) },
 
   { "Export" , ICONNAME_HB_FILE_EXPORT, N_("Export")  , NULL,   N_("Export as CSV"), G_CALLBACK (repvehicle_action_export) },
 };
@@ -327,14 +327,14 @@ guint32 catkey;
                // eval split transaction
                else
                {
-               guint i, nbsplit = da_splits_count(ope->splits);
+               guint i, nbsplit = da_splits_length(ope->splits);
                Split *split;
 
                        DB( g_print(" -> nb split %d\n", nbsplit) );
                        
                        for(i=0;i<nbsplit;i++)
                        {
-                               split = ope->splits[i];
+                               split = da_splits_get(ope->splits, i);
                                cat = da_cat_get(split->kcat);
 
                                DB( g_print(" -> eval split '%s'\n", split->memo) );
@@ -604,8 +604,8 @@ static void repvehicle_setup(struct repvehicle_data *data)
        data->txn_queue = g_queue_new ();
        data->vehicle_list = NULL;
 
-       data->filter = da_filter_malloc();
-       filter_default_all_set(data->filter);
+       data->filter = da_flt_malloc();
+       filter_reset(data->filter);
 
        /* 3.4 : make int transfer out of stats */
        data->filter->option[FILTER_PAYMODE] = 1;
@@ -648,7 +648,7 @@ struct WinGeometry *wg;
        
        da_vehiclecost_destroy(data->vehicle_list);
 
-       da_filter_free(data->filter);
+       da_flt_free(data->filter);
        
        g_free(data);