diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-12-12 23:46:47 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-12-12 23:46:47 +0200 |
commit | 1a286061ff294f8fd8910492e1725b08d0942377 (patch) | |
tree | 8b340ead05c950767ba6f8776a864eff2afced39 /src/wallet/wallet2.h | |
parent | Merge pull request #1424 (diff) | |
parent | addressbook updates (diff) | |
download | monero-1a286061ff294f8fd8910492e1725b08d0942377.tar.xz |
Merge pull request #1436
3b4539ee addressbook updates (Jaquee)
Diffstat (limited to '')
-rw-r--r-- | src/wallet/wallet2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index fc06864e2..36b9b3d1f 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -292,7 +292,7 @@ namespace tools { cryptonote::account_public_address m_address; crypto::hash m_payment_id; - std::string m_description; + std::string m_description; }; /*! @@ -523,7 +523,7 @@ namespace tools /*! * \brief GUI Address book get/store */ - std::map<int, address_book_row> get_address_book() const { return m_address_book; } + std::vector<address_book_row> get_address_book() const { return m_address_book; } bool add_address_book_row(const cryptonote::account_public_address &address, const crypto::hash &payment_id, const std::string &description); bool delete_address_book_row(int row_id); @@ -641,7 +641,7 @@ namespace tools std::unordered_map<crypto::public_key, size_t> m_pub_keys; cryptonote::account_public_address m_account_public_address; std::unordered_map<crypto::hash, std::string> m_tx_notes; - std::map<int, tools::wallet2::address_book_row> m_address_book; + std::vector<tools::wallet2::address_book_row> m_address_book; uint64_t m_upper_transaction_size_limit; //TODO: auto-calc this value or request from daemon, now use some fixed value std::atomic<bool> m_run; |