sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed an unused extended account xdata flag

Browse source
This commit is contained in:
John Wiegley 2009-02-16 21:23:12 -04:00
parent e3b44038b3
commit e6934fbd3c
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/account.h
View file

@ -118,11 +118,10 @@ class account_t : public scope_t
struct xdata_t : public supports_flags<> struct xdata_t : public supports_flags<>
{ {
#define ACCOUNT_EXT_TO_DISPLAY 0x01 #define ACCOUNT_EXT_DISPLAYED 0x01
#define ACCOUNT_EXT_DISPLAYED 0x02 #define ACCOUNT_EXT_SORT_CALC 0x02
#define ACCOUNT_EXT_SORT_CALC 0x04 #define ACCOUNT_EXT_HAS_NON_VIRTUALS 0x04
#define ACCOUNT_EXT_HAS_NON_VIRTUALS 0x08 #define ACCOUNT_EXT_HAS_UNB_VIRTUALS 0x08
#define ACCOUNT_EXT_HAS_UNB_VIRTUALS 0x10
value_t value; value_t value;
value_t total; value_t total;

16
src/output.cc
View file

@ -242,14 +242,11 @@ void format_accounts::flush()
void format_accounts::operator()(account_t& account) void format_accounts::operator()(account_t& account)
{ {
if (display_account(account)) { // Never display the top-most account (the "root", or master, account)
if (! account.parent) { if (account.parent && display_account(account)) {
account.xdata().add_flags(ACCOUNT_EXT_TO_DISPLAY); bind_scope_t bound_scope(report, account);
} else { format.format(report.output_stream, bound_scope);
bind_scope_t bound_scope(report, account); account.xdata().add_flags(ACCOUNT_EXT_DISPLAYED);
format.format(report.output_stream, bound_scope);
account.xdata().add_flags(ACCOUNT_EXT_DISPLAYED);
}
} }
} }
@ -265,6 +262,8 @@ bool format_accounts::disp_subaccounts_p(account_t& account,
to_show = NULL; to_show = NULL;
bind_scope_t account_scope(report, account);
foreach (accounts_map::value_type pair, account.accounts) { foreach (accounts_map::value_type pair, account.accounts) {
if (! should_display(*pair.second)) if (! should_display(*pair.second))
continue; continue;
@ -273,7 +272,6 @@ bool format_accounts::disp_subaccounts_p(account_t& account,
call_scope_t args(bound_scope); call_scope_t args(bound_scope);
result = report.fn_total_expr(args); result = report.fn_total_expr(args);
if (! computed) { if (! computed) {
bind_scope_t account_scope(report, account);
call_scope_t args(account_scope); call_scope_t args(account_scope);
acct_total = report.fn_total_expr(args); acct_total = report.fn_total_expr(args);
computed = true; computed = true;