rename payee_mappings to payee_alias_mappings

(and similar renames) in preparation for payee_uuid_mappings

4 files changed, 39 insertions, 39 deletions

diff --git a/src/csv.cc b/src/csv.cc
index bcfa1284..9f7e78e4 100644
--- a/src/csv.cc
+++ b/src/csv.cc
@@ -186,7 +186,7 @@ xact_t * csv_reader::read_xact(bool rich_data)
 
     case FIELD_PAYEE: {
       bool found = false;
-      foreach (payee_mapping_t& value, context.journal->payee_mappings) {
+      foreach (payee_alias_mapping_t& value, context.journal->payee_alias_mappings) {
         DEBUG("csv.mappings", "Looking for payee mapping: " << value.first);
         if (value.first.match(field)) {
           xact->payee = value.second;
diff --git a/src/journal.cc b/src/journal.cc
index 142b68a6..ced96ee9 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -249,7 +249,7 @@ string journal_t::register_payee(const string& name, xact_t * xact)
     }
   }
 
-  foreach (payee_mapping_t& value, payee_mappings) {
+  foreach (payee_alias_mapping_t& value, payee_alias_mappings) {
     if (value.first.match(name)) {
       payee = value.second;
       break;
diff --git a/src/journal.h b/src/journal.h
index ad7b4b48..4458ba93 100644
--- a/src/journal.h
+++ b/src/journal.h
@@ -58,15 +58,15 @@ class account_t;
 class parse_context_t;
 class parse_context_stack_t;
 
-typedef std::list<xact_t *>            xacts_list;
-typedef std::list<auto_xact_t *>       auto_xacts_list;
-typedef std::list<period_xact_t *>     period_xacts_list;
-typedef std::pair<mask_t, string>      payee_mapping_t;
-typedef std::list<payee_mapping_t>     payee_mappings_t;
-typedef std::pair<mask_t, account_t *> account_mapping_t;
-typedef std::list<account_mapping_t>   account_mappings_t;
-typedef std::map<string, account_t *>  accounts_map;
-typedef std::map<string, xact_t *>     checksum_map_t;
+typedef std::list<xact_t *>              xacts_list;
+typedef std::list<auto_xact_t *>         auto_xacts_list;
+typedef std::list<period_xact_t *>       period_xacts_list;
+typedef std::pair<mask_t, string>        payee_alias_mapping_t;
+typedef std::list<payee_alias_mapping_t> payee_alias_mappings_t;
+typedef std::pair<mask_t, account_t *>   account_mapping_t;
+typedef std::list<account_mapping_t>     account_mappings_t;
+typedef std::map<string, account_t *>    accounts_map;
+typedef std::map<string, xact_t *>       checksum_map_t;
 
 typedef std::multimap<string, expr_t::check_expr_pair> tag_check_exprs_map;
 
@@ -115,32 +115,32 @@ public:
 #endif // HAVE_BOOST_SERIALIZATION
   };
 
-  account_t *           master;
-  account_t *           bucket;
-  xacts_list            xacts;
-  auto_xacts_list       auto_xacts;
-  period_xacts_list     period_xacts;
-  std::list<fileinfo_t> sources;
-  std::set<string>      known_payees;
-  std::set<string>      known_tags;
-  bool                  fixed_accounts;
-  bool                  fixed_payees;
-  bool                  fixed_commodities;
-  bool                  fixed_metadata;
-  bool                  was_loaded;
-  bool                  force_checking;
-  bool                  check_payees;
-  bool                  day_break;
-  bool                  recursive_aliases;
-  bool                  no_aliases;
-  payee_mappings_t      payee_mappings;
-  account_mappings_t    account_mappings;
-  accounts_map          account_aliases;
-  account_mappings_t    payees_for_unknown_accounts;
-  checksum_map_t        checksum_map;
-  tag_check_exprs_map   tag_check_exprs;
-  optional<expr_t>      value_expr;
-  parse_context_t *     current_context;
+  account_t *            master;
+  account_t *            bucket;
+  xacts_list             xacts;
+  auto_xacts_list        auto_xacts;
+  period_xacts_list      period_xacts;
+  std::list<fileinfo_t>  sources;
+  std::set<string>       known_payees;
+  std::set<string>       known_tags;
+  bool                   fixed_accounts;
+  bool                   fixed_payees;
+  bool                   fixed_commodities;
+  bool                   fixed_metadata;
+  bool                   was_loaded;
+  bool                   force_checking;
+  bool                   check_payees;
+  bool                   day_break;
+  bool                   recursive_aliases;
+  bool                   no_aliases;
+  payee_alias_mappings_t payee_alias_mappings;
+  account_mappings_t     account_mappings;
+  accounts_map           account_aliases;
+  account_mappings_t     payees_for_unknown_accounts;
+  checksum_map_t         checksum_map;
+  tag_check_exprs_map    tag_check_exprs;
+  optional<expr_t>       value_expr;
+  parse_context_t *      current_context;
 
   enum checking_style_t {
     CHECK_PERMISSIVE,
diff --git a/src/textual.cc b/src/textual.cc
index 55f22a2c..0a590e08 100644
--- a/src/textual.cc
+++ b/src/textual.cc
@@ -1041,8 +1041,8 @@ void instance_t::payee_directive(char * line)
 void instance_t::payee_alias_directive(const string& payee, string alias)
 {
   trim(alias);
-  context.journal->payee_mappings
-    .push_back(payee_mapping_t(mask_t(alias), payee));
+  context.journal->payee_alias_mappings
+    .push_back(payee_alias_mapping_t(mask_t(alias), payee));
 }
 
 void instance_t::commodity_directive(char * line)