Merge branch 'upstream'

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

diff --git a/src/hb-category.h b/src/hb-category.h
index 9bb621ea85d395633d232bdd20c9aa18b2af76da..1748a151c07e41fcc4da550ec155a731f5deec4c 100644 (file)
--- a/src/hb-category.h
+++ b/src/hb-category.h
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2014 Maxime DOYEN
+ *  Copyright (C) 1995-2016 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -29,11 +29,13 @@ struct _category
        guint32         key;
        guint32         parent;
        gushort         flags;
+       gushort         _pad1;
        gchar           *name;
        gdouble         budget[13];     //0:is same value, 1 ..12 are months
 
        /* unsaved datas */
        gboolean        filter;
+       guint           usage_count;
        gboolean        imported;
 };
 
@@ -57,6 +59,9 @@ guint32 da_cat_get_max_key(void);
 gchar *da_cat_get_fullname(Category *cat);
 
 guint32 da_cat_get_key_by_name(gchar *name);
+
+guint32 category_report_id(guint32 key, gboolean subcat);
+
 Category *da_cat_get_by_name(gchar *name);
 Category *da_cat_get(guint32 key);
 Category *da_cat_get_by_fullname(gchar *fullname);
@@ -65,7 +70,8 @@ void da_cat_consistency(Category *item);
 
 GList *category_glist_sorted(gint column);
 
-gboolean category_is_used(guint32 key);
+void category_delete_unused(void);
+void category_fill_usage(void);
 void category_move(guint32 key1, guint32 key2);
 gboolean category_rename(Category *item, const gchar *newname);
 gint category_change_type(Category *item, gboolean isIncome);
@@ -73,5 +79,6 @@ gint category_change_type(Category *item, gboolean isIncome);
 gboolean category_load_csv(gchar *filename, gchar **error);
 gboolean category_save_csv(gchar *filename, gchar **error);
 gchar *category_find_preset(gchar **lang);
+gint category_type_get(Category *item);
 
 #endif