diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-25 16:51:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-25 17:00:09 +0200 |
| commit | 343feecf562a39e7d898ece2fd745fcb9d4c90e9 (patch) | |
| tree | f780cbfe1b73ae0765d1930595e59cf7b13b53d6 /src/qt/paymentserver.cpp | |
| parent | Merge pull request #3839 (diff) | |
| parent | Move coins.cpp and keystore.cpp to libbitcoin_common (diff) | |
| download | discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.tar.xz discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.zip | |
Merge pull request #4368
75c82d4 Move coins.cpp and keystore.cpp to libbitcoin_common (Wladimir J. van der Laan)
84ce18c Remove unnecessary dependencies for bitcoin-cli (Wladimir J. van der Laan)
14f888c Move network-time related functions to timedata.cpp/h (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 49923a1af..fbb11617f 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -199,10 +199,10 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) { CBitcoinAddress address(r.address.toStdString()); - SelectParams(CChainParams::MAIN); + SelectParams(CBaseChainParams::MAIN); if (!address.IsValid()) { - SelectParams(CChainParams::TESTNET); + SelectParams(CBaseChainParams::TESTNET); } } } @@ -214,9 +214,9 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) if (readPaymentRequest(arg, request)) { if (request.getDetails().network() == "main") - SelectParams(CChainParams::MAIN); + SelectParams(CBaseChainParams::MAIN); else - SelectParams(CChainParams::TESTNET); + SelectParams(CBaseChainParams::TESTNET); } } else |