Merge branch 'upstream'

[chaz/homebank] / src / hb-payee.h

diff --git a/src/hb-payee.h b/src/hb-payee.h
index 6df1c25ba4ed3a29ba9a58a303af58abf052c8ca..f5c5a3880918d5103d16328544ef66ecd15c4456 100644 (file)
--- a/src/hb-payee.h
+++ b/src/hb-payee.h
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2014 Maxime DOYEN
+ *  Copyright (C) 1995-2019 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -26,12 +26,14 @@ typedef struct _payee               Payee;
 struct _payee
 {
        guint32         key;
-       //gushort       flags;
+       gushort         paymode;
+       gushort         _pad1;
+       guint32         kcat;
        gchar           *name;
 
        /* unsaved datas */
-       gboolean        filter;
-       gboolean        imported;
+       gboolean        flt_select;
+       guint           usage_count;
 };
 
 void da_pay_free(Payee *item);
@@ -40,24 +42,28 @@ Payee *da_pay_malloc(void);
 void da_pay_destroy(void);
 void da_pay_new(void);
 
-guint          da_pay_length(void);
-gboolean       da_pay_create_none(void);
-gboolean       da_pay_remove(guint32 key);
-gboolean       da_pay_insert(Payee *acc);
-gboolean       da_pay_append(Payee *acc);
-guint32                da_pay_get_max_key(void);
-Payee          *da_pay_get_by_name(gchar *name);
-Payee          *da_pay_get(guint32 key);
+guint da_pay_length(void);
+guint32 da_pay_get_max_key(void);
+
+gboolean da_pay_remove(guint32 key);
+gboolean da_pay_insert(Payee *acc);
+gboolean da_pay_append(Payee *acc);
+Payee *da_pay_append_if_new(gchar *rawname);
+
+Payee *da_pay_get(guint32 key);
+Payee *da_pay_get_by_name(gchar *rawname);
+
 void da_pay_consistency(Payee *item);
 
+void payee_delete_unused(void);
+void payee_fill_usage(void);
+
 GList *payee_glist_sorted(gint column);
 
-gboolean payee_is_used(guint32 key);
 void payee_move(guint32 key1, guint32 key2);
 gboolean payee_rename(Payee *item, const gchar *newname);
-Payee *payee_append_if_new(gchar *name);
 
-void payee_load_csv(gchar *filename);
+gboolean payee_load_csv(gchar *filename, gchar **error);
 void payee_save_csv(gchar *filename);
 
 #endif