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

Renamed journal_t::basket to bucket

Browse source
This commit is contained in:
John Wiegley 2009-11-07 06:39:50 -05:00
parent c8bab6d1c6
commit 06f4c27867
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/journal.cc
View file

@ -83,7 +83,7 @@ journal_t::~journal_t()
void journal_t::initialize() void journal_t::initialize()
{ {
master = new account_t; master = new account_t;
basket = NULL; bucket = NULL;
was_loaded = false; was_loaded = false;
commodity_pool.reset(new commodity_pool_t); commodity_pool.reset(new commodity_pool_t);

4
src/journal.h
View file

@ -115,7 +115,7 @@ public:
}; };
account_t * master; account_t * master;
account_t * basket; account_t * bucket;
xacts_list xacts; xacts_list xacts;
auto_xacts_list auto_xacts; auto_xacts_list auto_xacts;
period_xacts_list period_xacts; period_xacts_list period_xacts;
@ -202,7 +202,7 @@ private:
template<class Archive> template<class Archive>
void serialize(Archive& ar, const unsigned int /* version */) { void serialize(Archive& ar, const unsigned int /* version */) {
ar & master; ar & master;
ar & basket; ar & bucket;
ar & xacts; ar & xacts;
ar & auto_xacts; ar & auto_xacts;
ar & period_xacts; ar & period_xacts;

6
src/py_journal.cc
View file

@ -193,10 +193,10 @@ void export_journal()
.add_property("master", make_getter(&journal_t::master, .add_property("master", make_getter(&journal_t::master,
return_internal_reference<>())) return_internal_reference<>()))
.add_property("basket", .add_property("bucket",
make_getter(&journal_t::basket, make_getter(&journal_t::bucket,
return_internal_reference<>()), return_internal_reference<>()),
make_setter(&journal_t::basket)) make_setter(&journal_t::bucket))
.add_property("was_loaded", make_getter(&journal_t::was_loaded)) .add_property("was_loaded", make_getter(&journal_t::was_loaded))
.add_property("commodity_pool", .add_property("commodity_pool",
make_getter(&journal_t::commodity_pool, make_getter(&journal_t::commodity_pool,

4
src/textual.cc
View file

@ -442,8 +442,8 @@ void instance_t::default_commodity_directive(char * line)
void instance_t::default_account_directive(char * line) void instance_t::default_account_directive(char * line)
{ {
journal.basket = account_stack.front()->find_account(skip_ws(line + 1)); journal.bucket = account_stack.front()->find_account(skip_ws(line + 1));
journal.basket->add_flags(ACCOUNT_KNOWN); journal.bucket->add_flags(ACCOUNT_KNOWN);
} }
void instance_t::price_conversion_directive(char * line) void instance_t::price_conversion_directive(char * line)

4
src/xact.cc
View file

@ -156,8 +156,8 @@ bool xact_base_t::finalize()
// If there is only one post, balance against the default account if one has // If there is only one post, balance against the default account if one has
// been set. // been set.
if (journal && journal->basket && posts.size() == 1 && ! balance.is_null()) { if (journal && journal->bucket && posts.size() == 1 && ! balance.is_null()) {
null_post = new post_t(journal->basket, ITEM_GENERATED); null_post = new post_t(journal->bucket, ITEM_GENERATED);
null_post->_state = (*posts.begin())->_state; null_post->_state = (*posts.begin())->_state;
add_post(null_post); add_post(null_post);
} }