Browse Source

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

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
3fb3fade3c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/Makefile.am
  2. 2
      src/qt/coincontroldialog.cpp
  3. 2
      src/qt/sendcoinsdialog.cpp
  4. 6
      src/wallet/coincontrol.h
  5. 2
      src/wallet/wallet.cpp

2
src/Makefile.am

@ -87,7 +87,6 @@ BITCOIN_CORE_H = \ @@ -87,7 +87,6 @@ BITCOIN_CORE_H = \
checkpoints.h \
checkqueue.h \
clientversion.h \
coincontrol.h \
coins.h \
compat.h \
compat/byteswap.h \
@ -147,6 +146,7 @@ BITCOIN_CORE_H = \ @@ -147,6 +146,7 @@ BITCOIN_CORE_H = \
utiltime.h \
validationinterface.h \
versionbits.h \
wallet/coincontrol.h \
wallet/crypter.h \
wallet/db.h \
wallet/rpcwallet.h \

2
src/qt/coincontroldialog.cpp

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

2
src/qt/sendcoinsdialog.cpp

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

6
src/coincontrol.h → src/wallet/coincontrol.h

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

2
src/wallet/wallet.cpp

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

Loading…
Cancel
Save