Merge #8990: moveonly: move coincontrol to src/wallet

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-10-21 15:30:14 +02:00 committed by Alexander Block
parent 6cacb79c03
commit beef6e7841
6 changed files with 8 additions and 8 deletions

View File

@ -95,7 +95,6 @@ BITCOIN_CORE_H = \
checkpoints.h \ checkpoints.h \
checkqueue.h \ checkqueue.h \
clientversion.h \ clientversion.h \
coincontrol.h \
coins.h \ coins.h \
compat.h \ compat.h \
compat/byteswap.h \ compat/byteswap.h \
@ -181,6 +180,7 @@ BITCOIN_CORE_H = \
validation.h \ validation.h \
validationinterface.h \ validationinterface.h \
versionbits.h \ versionbits.h \
wallet/coincontrol.h \
wallet/crypter.h \ wallet/crypter.h \
wallet/db.h \ wallet/db.h \
wallet/rpcwallet.h \ wallet/rpcwallet.h \

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "privatesend-client.h" #include "privatesend-client.h"
#include "coincontrol.h" #include "wallet/coincontrol.h"
#include "consensus/validation.h" #include "consensus/validation.h"
#include "core_io.h" #include "core_io.h"
#include "init.h" #include "init.h"

View File

@ -14,7 +14,7 @@
#include "txmempool.h" #include "txmempool.h"
#include "walletmodel.h" #include "walletmodel.h"
#include "coincontrol.h" #include "wallet/coincontrol.h"
#include "init.h" #include "init.h"
#include "validation.h" // For minRelayTxFee #include "validation.h" // For minRelayTxFee
#include "wallet/wallet.h" #include "wallet/wallet.h"

View File

@ -17,7 +17,7 @@
#include "walletmodel.h" #include "walletmodel.h"
#include "base58.h" #include "base58.h"
#include "coincontrol.h" #include "wallet/coincontrol.h"
#include "validation.h" // mempool and minRelayTxFee #include "validation.h" // mempool and minRelayTxFee
#include "ui_interface.h" #include "ui_interface.h"
#include "txmempool.h" #include "txmempool.h"

View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_COINCONTROL_H #ifndef BITCOIN_WALLET_COINCONTROL_H
#define BITCOIN_COINCONTROL_H #define BITCOIN_WALLET_COINCONTROL_H
#include "primitives/transaction.h" #include "primitives/transaction.h"
@ -77,4 +77,4 @@ private:
std::set<COutPoint> setSelected; std::set<COutPoint> setSelected;
}; };
#endif // BITCOIN_COINCONTROL_H #endif // BITCOIN_WALLET_COINCONTROL_H

View File

@ -9,7 +9,7 @@
#include "base58.h" #include "base58.h"
#include "checkpoints.h" #include "checkpoints.h"
#include "chain.h" #include "chain.h"
#include "coincontrol.h" #include "wallet/coincontrol.h"
#include "consensus/consensus.h" #include "consensus/consensus.h"
#include "consensus/validation.h" #include "consensus/validation.h"
#include "key.h" #include "key.h"