diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-07 06:39:50 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-07 06:39:50 -0500 |
| commit | 06f4c2786700121036ab02556a028e51573307fd (patch) | |
| tree | b36e4d7fd21eab9b2d8ba3d012e8df1cea87e590 /src | |
| parent | c8bab6d1c6c36c67a5c354fb719474542f4f80b5 (diff) | |
| download | fork-ledger-06f4c2786700121036ab02556a028e51573307fd.tar.gz fork-ledger-06f4c2786700121036ab02556a028e51573307fd.tar.bz2 fork-ledger-06f4c2786700121036ab02556a028e51573307fd.zip | |
Renamed journal_t::basket to bucket
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal.cc | 2 | ||||
| -rw-r--r-- | src/journal.h | 4 | ||||
| -rw-r--r-- | src/py_journal.cc | 6 | ||||
| -rw-r--r-- | src/textual.cc | 4 | ||||
| -rw-r--r-- | src/xact.cc | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/journal.cc b/src/journal.cc index 3a4ada47..550b4f4c 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -83,7 +83,7 @@ journal_t::~journal_t() void journal_t::initialize() { master = new account_t; - basket = NULL; + bucket = NULL; was_loaded = false; commodity_pool.reset(new commodity_pool_t); diff --git a/src/journal.h b/src/journal.h index e2af0dde..ff2b5f84 100644 --- a/src/journal.h +++ b/src/journal.h @@ -115,7 +115,7 @@ public: }; account_t * master; - account_t * basket; + account_t * bucket; xacts_list xacts; auto_xacts_list auto_xacts; period_xacts_list period_xacts; @@ -202,7 +202,7 @@ private: template<class Archive> void serialize(Archive& ar, const unsigned int /* version */) { ar & master; - ar & basket; + ar & bucket; ar & xacts; ar & auto_xacts; ar & period_xacts; diff --git a/src/py_journal.cc b/src/py_journal.cc index 9b3e7513..3b78e556 100644 --- a/src/py_journal.cc +++ b/src/py_journal.cc @@ -193,10 +193,10 @@ void export_journal() .add_property("master", make_getter(&journal_t::master, return_internal_reference<>())) - .add_property("basket", - make_getter(&journal_t::basket, + .add_property("bucket", + make_getter(&journal_t::bucket, 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("commodity_pool", make_getter(&journal_t::commodity_pool, diff --git a/src/textual.cc b/src/textual.cc index 6e2c919f..4b800ab2 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -442,8 +442,8 @@ void instance_t::default_commodity_directive(char * line) void instance_t::default_account_directive(char * line) { - journal.basket = account_stack.front()->find_account(skip_ws(line + 1)); - journal.basket->add_flags(ACCOUNT_KNOWN); + journal.bucket = account_stack.front()->find_account(skip_ws(line + 1)); + journal.bucket->add_flags(ACCOUNT_KNOWN); } void instance_t::price_conversion_directive(char * line) diff --git a/src/xact.cc b/src/xact.cc index 67dad155..68b607f4 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -156,8 +156,8 @@ bool xact_base_t::finalize() // If there is only one post, balance against the default account if one has // been set. - if (journal && journal->basket && posts.size() == 1 && ! balance.is_null()) { - null_post = new post_t(journal->basket, ITEM_GENERATED); + if (journal && journal->bucket && posts.size() == 1 && ! balance.is_null()) { + null_post = new post_t(journal->bucket, ITEM_GENERATED); null_post->_state = (*posts.begin())->_state; add_post(null_post); } |