diff options
author | Randi Joseph <randi@codehalo.com> | 2016-12-13 10:21:38 -0500 |
---|---|---|
committer | Randi Joseph <randi@codehalo.com> | 2016-12-13 10:21:38 -0500 |
commit | b2adfa8c514b9015412f2c13429928ccc038f0ba (patch) | |
tree | ab5d7599825e8428284effcc5a9fb24f91da6a5b /src/wallet/api | |
parent | Merge pull request #1436 (diff) | |
download | monero-b2adfa8c514b9015412f2c13429928ccc038f0ba.tar.xz |
Bitmonero namespace renamed Monero. Bitmonero namespace alias added so that third party uses of the wallet api can transition.
Diffstat (limited to 'src/wallet/api')
-rw-r--r-- | src/wallet/api/address_book.cpp | 6 | ||||
-rw-r--r-- | src/wallet/api/address_book.h | 4 | ||||
-rw-r--r-- | src/wallet/api/pending_transaction.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/pending_transaction.h | 4 | ||||
-rw-r--r-- | src/wallet/api/transaction_history.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/transaction_history.h | 4 | ||||
-rw-r--r-- | src/wallet/api/transaction_info.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/transaction_info.h | 4 | ||||
-rw-r--r-- | src/wallet/api/utils.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/wallet.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/wallet.h | 4 | ||||
-rw-r--r-- | src/wallet/api/wallet_manager.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/wallet_manager.h | 4 |
13 files changed, 40 insertions, 14 deletions
diff --git a/src/wallet/api/address_book.cpp b/src/wallet/api/address_book.cpp index edeb5bb46..1847e1496 100644 --- a/src/wallet/api/address_book.cpp +++ b/src/wallet/api/address_book.cpp @@ -36,7 +36,7 @@ #include <vector> -namespace Bitmonero { +namespace Monero { AddressBook::~AddressBook() {} @@ -126,4 +126,6 @@ AddressBookImpl::~AddressBookImpl() clearRows(); } -} // namespace
\ No newline at end of file +} // namespace + +namespace Bitmonero = Monero;
\ No newline at end of file diff --git a/src/wallet/api/address_book.h b/src/wallet/api/address_book.h index 470dfdcfb..c3a24eff9 100644 --- a/src/wallet/api/address_book.h +++ b/src/wallet/api/address_book.h @@ -31,7 +31,7 @@ #include "wallet/wallet2_api.h" #include "wallet/wallet2.h" -namespace Bitmonero { +namespace Monero { class AddressBookRow; class WalletImpl; @@ -65,3 +65,5 @@ private: } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp index 2521decea..6586d0c48 100644 --- a/src/wallet/api/pending_transaction.cpp +++ b/src/wallet/api/pending_transaction.cpp @@ -43,7 +43,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { PendingTransaction::~PendingTransaction() {} @@ -149,3 +149,5 @@ uint64_t PendingTransactionImpl::txCount() const } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/pending_transaction.h b/src/wallet/api/pending_transaction.h index c5e847c97..47ccdec76 100644 --- a/src/wallet/api/pending_transaction.h +++ b/src/wallet/api/pending_transaction.h @@ -35,7 +35,7 @@ #include <vector> -namespace Bitmonero { +namespace Monero { class WalletImpl; class PendingTransactionImpl : public PendingTransaction @@ -64,3 +64,5 @@ private: } + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp index 603739598..5f52438cd 100644 --- a/src/wallet/api/transaction_history.cpp +++ b/src/wallet/api/transaction_history.cpp @@ -42,7 +42,7 @@ using namespace epee; -namespace Bitmonero { +namespace Monero { TransactionHistory::~TransactionHistory() {} @@ -209,3 +209,5 @@ void TransactionHistoryImpl::refresh() } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_history.h b/src/wallet/api/transaction_history.h index 1b6617ead..bd18e9440 100644 --- a/src/wallet/api/transaction_history.h +++ b/src/wallet/api/transaction_history.h @@ -31,7 +31,7 @@ #include "wallet/wallet2_api.h" #include <boost/thread/shared_mutex.hpp> -namespace Bitmonero { +namespace Monero { class TransactionInfo; class WalletImpl; @@ -57,3 +57,5 @@ private: } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/transaction_info.cpp b/src/wallet/api/transaction_info.cpp index f25c53a90..8d26f2035 100644 --- a/src/wallet/api/transaction_info.cpp +++ b/src/wallet/api/transaction_info.cpp @@ -33,7 +33,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { TransactionInfo::~TransactionInfo() {} @@ -110,3 +110,5 @@ const std::vector<TransactionInfo::Transfer> &TransactionInfoImpl::transfers() c } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_info.h b/src/wallet/api/transaction_info.h index 82ab2cc6b..14efebac4 100644 --- a/src/wallet/api/transaction_info.h +++ b/src/wallet/api/transaction_info.h @@ -32,7 +32,7 @@ #include <string> #include <ctime> -namespace Bitmonero { +namespace Monero { class TransactionHistoryImpl; @@ -73,3 +73,5 @@ private: }; } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/utils.cpp b/src/wallet/api/utils.cpp index 7de9d1927..0d30b61cd 100644 --- a/src/wallet/api/utils.cpp +++ b/src/wallet/api/utils.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { namespace Utils { @@ -81,3 +81,5 @@ bool isAddressLocal(const std::string &address) } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 5b7a3e286..6d8e48deb 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -43,7 +43,7 @@ using namespace std; using namespace cryptonote; -namespace Bitmonero { +namespace Monero { namespace { // copy-pasted from simplewallet @@ -1059,3 +1059,5 @@ void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 6fbb0da90..5046fbf0f 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -40,7 +40,7 @@ #include <boost/thread/condition_variable.hpp> -namespace Bitmonero { +namespace Monero { class TransactionHistoryImpl; class PendingTransactionImpl; class AddressBookImpl; @@ -156,5 +156,7 @@ private: } // namespace +namespace Bitmonero = Monero; + #endif diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 40afc87e9..5a6f02b01 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -42,7 +42,7 @@ namespace epee { unsigned int g_test_dbg_lock_sleep = 0; } -namespace Bitmonero { +namespace Monero { Wallet *WalletManagerImpl::createWallet(const std::string &path, const std::string &password, const std::string &language, bool testnet) @@ -375,3 +375,5 @@ void WalletManagerFactory::setLogLevel(int level) } + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h index d454548f8..fe9662534 100644 --- a/src/wallet/api/wallet_manager.h +++ b/src/wallet/api/wallet_manager.h @@ -32,7 +32,7 @@ #include "wallet/wallet2_api.h" #include <string> -namespace Bitmonero { +namespace Monero { class WalletManagerImpl : public WalletManager { @@ -61,3 +61,5 @@ private: }; } // namespace + +namespace Bitmonero = Monero; |