diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-14 17:14:56 -0400 |
| commit | f3bedb88b24ae8b2047ad86e57b161265c2812f5 (patch) | |
| tree | e6e5954f40a09e7fd002f242523c1eb0f318b397 /src/item.cc | |
| parent | 0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (diff) | |
| parent | 63b4bdaecff5a865bff22e8e7914bef6ab46fa6b (diff) | |
| download | fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.gz fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.tar.bz2 fork-ledger-f3bedb88b24ae8b2047ad86e57b161265c2812f5.zip | |
Merge branch 'next'
Diffstat (limited to 'src/item.cc')
| -rw-r--r-- | src/item.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/item.cc b/src/item.cc index f0273e59..63f0f3a9 100644 --- a/src/item.cc +++ b/src/item.cc @@ -134,10 +134,9 @@ item_t::set_tag(const string& tag, } } -void item_t::parse_tags(const char * p, - scope_t& scope, - bool overwrite_existing, - optional<date_t::year_type> current_year) +void item_t::parse_tags(const char * p, + scope_t& scope, + bool overwrite_existing) { if (const char * b = std::strchr(p, '[')) { if (*(b + 1) != '\0' && @@ -149,10 +148,10 @@ void item_t::parse_tags(const char * p, if (char * p = std::strchr(buf, '=')) { *p++ = '\0'; - _date_eff = parse_date(p, current_year); + _date_eff = parse_date(p); } if (buf[0]) - _date = parse_date(buf, current_year); + _date = parse_date(buf); } } } @@ -202,10 +201,9 @@ void item_t::parse_tags(const char * p, } } -void item_t::append_note(const char * p, - scope_t& scope, - bool overwrite_existing, - optional<date_t::year_type> current_year) +void item_t::append_note(const char * p, + scope_t& scope, + bool overwrite_existing) { if (note) { *note += '\n'; @@ -214,7 +212,7 @@ void item_t::append_note(const char * p, note = p; } - parse_tags(p, scope, overwrite_existing, current_year); + parse_tags(p, scope, overwrite_existing); } namespace { |