diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-21 15:30:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-21 15:30:28 +0200 |
| commit | 3fb3fade3c021bffbfeaa89e15b00cfcba73e371 (patch) | |
| tree | b7a564a59ffff3cec381ee81eed34b834800932e | |
| parent | 7b1bfa3a8786f0c154d9def003ab1b42f09fe717 (diff) | |
| parent | 1ae5839ff024096c65e1590084f2720fa08d3e23 (diff) | |
Merge #8990: moveonly: move `coincontrol` to `src/wallet`
1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/qt/coincontroldialog.cpp | 2 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/coincontrol.h (renamed from src/coincontrol.h) | 6 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e7f1d82b8b..ab3104ec63 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 = \ utiltime.h \ validationinterface.h \ versionbits.h \ + wallet/coincontrol.h \ wallet/crypter.h \ wallet/db.h \ wallet/rpcwallet.h \ diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 86fd4ebd65..1a1671f0ee 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -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" diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 4b2ba7d624..f1c867e6f8 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -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" diff --git a/src/coincontrol.h b/src/wallet/coincontrol.h index e33adc4d2b..78516770e6 100644 --- a/src/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -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: std::set<COutPoint> setSelected; }; -#endif // BITCOIN_COINCONTROL_H +#endif // BITCOIN_WALLET_COINCONTROL_H diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c7f98b238e..60a769704b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -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" |