Skip to content

Commit

Permalink
Bitmonero namespace renamed Monero. Bitmonero namespace alias added s…
Browse files Browse the repository at this point in the history
…o that third party uses of the wallet api can transition.
  • Loading branch information
codehalo committed Dec 13, 2016
1 parent 1a28606 commit b2adfa8
Show file tree
Hide file tree
Showing 17 changed files with 183 additions and 155 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Expand Up @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Bitmonero"
PROJECT_NAME = "Monero"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
Expand Down
6 changes: 4 additions & 2 deletions src/wallet/api/address_book.cpp
Expand Up @@ -36,7 +36,7 @@

#include <vector>

namespace Bitmonero {
namespace Monero {

AddressBook::~AddressBook() {}

Expand Down Expand Up @@ -126,4 +126,6 @@ AddressBookImpl::~AddressBookImpl()
clearRows();
}

} // namespace
} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/address_book.h
Expand Up @@ -31,7 +31,7 @@
#include "wallet/wallet2_api.h"
#include "wallet/wallet2.h"

namespace Bitmonero {
namespace Monero {

class AddressBookRow;
class WalletImpl;
Expand Down Expand Up @@ -65,3 +65,5 @@ class AddressBookImpl : public AddressBook

}

namespace Bitmonero = Monero;

4 changes: 3 additions & 1 deletion src/wallet/api/pending_transaction.cpp
Expand Up @@ -43,7 +43,7 @@

using namespace std;

namespace Bitmonero {
namespace Monero {

PendingTransaction::~PendingTransaction() {}

Expand Down Expand Up @@ -149,3 +149,5 @@ uint64_t PendingTransactionImpl::txCount() const

}

namespace Bitmonero = Monero;

4 changes: 3 additions & 1 deletion src/wallet/api/pending_transaction.h
Expand Up @@ -35,7 +35,7 @@
#include <vector>


namespace Bitmonero {
namespace Monero {

class WalletImpl;
class PendingTransactionImpl : public PendingTransaction
Expand Down Expand Up @@ -64,3 +64,5 @@ class PendingTransactionImpl : public PendingTransaction


}

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/transaction_history.cpp
Expand Up @@ -42,7 +42,7 @@

using namespace epee;

namespace Bitmonero {
namespace Monero {

TransactionHistory::~TransactionHistory() {}

Expand Down Expand Up @@ -209,3 +209,5 @@ void TransactionHistoryImpl::refresh()
}

} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/transaction_history.h
Expand Up @@ -31,7 +31,7 @@
#include "wallet/wallet2_api.h"
#include <boost/thread/shared_mutex.hpp>

namespace Bitmonero {
namespace Monero {

class TransactionInfo;
class WalletImpl;
Expand All @@ -57,3 +57,5 @@ class TransactionHistoryImpl : public TransactionHistory

}

namespace Bitmonero = Monero;

4 changes: 3 additions & 1 deletion src/wallet/api/transaction_info.cpp
Expand Up @@ -33,7 +33,7 @@

using namespace std;

namespace Bitmonero {
namespace Monero {

TransactionInfo::~TransactionInfo() {}

Expand Down Expand Up @@ -110,3 +110,5 @@ const std::vector<TransactionInfo::Transfer> &TransactionInfoImpl::transfers() c
}

} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/transaction_info.h
Expand Up @@ -32,7 +32,7 @@
#include <string>
#include <ctime>

namespace Bitmonero {
namespace Monero {

class TransactionHistoryImpl;

Expand Down Expand Up @@ -73,3 +73,5 @@ class TransactionInfoImpl : public TransactionInfo
};

} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/utils.cpp
Expand Up @@ -36,7 +36,7 @@

using namespace std;

namespace Bitmonero {
namespace Monero {
namespace Utils {


Expand Down Expand Up @@ -81,3 +81,5 @@ bool isAddressLocal(const std::string &address)


} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/wallet.cpp
Expand Up @@ -43,7 +43,7 @@
using namespace std;
using namespace cryptonote;

namespace Bitmonero {
namespace Monero {

namespace {
// copy-pasted from simplewallet
Expand Down Expand Up @@ -1059,3 +1059,5 @@ void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction
}

} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/wallet.h
Expand Up @@ -40,7 +40,7 @@
#include <boost/thread/condition_variable.hpp>


namespace Bitmonero {
namespace Monero {
class TransactionHistoryImpl;
class PendingTransactionImpl;
class AddressBookImpl;
Expand Down Expand Up @@ -156,5 +156,7 @@ class WalletImpl : public Wallet

} // namespace

namespace Bitmonero = Monero;

#endif

4 changes: 3 additions & 1 deletion src/wallet/api/wallet_manager.cpp
Expand Up @@ -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)
Expand Down Expand Up @@ -375,3 +375,5 @@ void WalletManagerFactory::setLogLevel(int level)


}

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/api/wallet_manager.h
Expand Up @@ -32,7 +32,7 @@
#include "wallet/wallet2_api.h"
#include <string>

namespace Bitmonero {
namespace Monero {

class WalletManagerImpl : public WalletManager
{
Expand Down Expand Up @@ -61,3 +61,5 @@ class WalletManagerImpl : public WalletManager
};

} // namespace

namespace Bitmonero = Monero;
4 changes: 3 additions & 1 deletion src/wallet/wallet2_api.h
Expand Up @@ -37,7 +37,7 @@
#include <iostream>

// Public interface for libwallet library
namespace Bitmonero {
namespace Monero {

namespace Utils {
bool isAddressLocal(const std::string &hostaddr);
Expand Down Expand Up @@ -576,3 +576,5 @@ struct WalletManagerFactory

}

namespace Bitmonero = Monero;

0 comments on commit b2adfa8

Please sign in to comment.