From beef6e78413c341580aab94410b4da7cfe216294 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 21 Oct 2016 15:30:14 +0200
Subject: [PATCH] Merge #8990: moveonly: move `coincontrol` to `src/wallet`

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
---
 src/Makefile.am                | 2 +-
 src/privatesend-client.cpp     | 2 +-
 src/qt/coincontroldialog.cpp   | 2 +-
 src/qt/sendcoinsdialog.cpp     | 2 +-
 src/{ => wallet}/coincontrol.h | 6 +++---
 src/wallet/wallet.cpp          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{ => wallet}/coincontrol.h (94%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 9024d291d..b9acfaa53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,7 +95,6 @@ BITCOIN_CORE_H = \
   checkpoints.h \
   checkqueue.h \
   clientversion.h \
-  coincontrol.h \
   coins.h \
   compat.h \
   compat/byteswap.h \
@@ -181,6 +180,7 @@ BITCOIN_CORE_H = \
   validation.h \
   validationinterface.h \
   versionbits.h \
+  wallet/coincontrol.h \
   wallet/crypter.h \
   wallet/db.h \
   wallet/rpcwallet.h \
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 4ec2f65ff..0036f7ed3 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "privatesend-client.h"
 
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 0bd4a42ac..c0aa16ba1 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -14,7 +14,7 @@
 #include "txmempool.h"
 #include "walletmodel.h"
 
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "init.h"
 #include "validation.h" // For minRelayTxFee
 #include "wallet/wallet.h"
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 626ef31db..20df5aff1 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -17,7 +17,7 @@
 #include "walletmodel.h"
 
 #include "base58.h"
-#include "coincontrol.h"
+#include "wallet/coincontrol.h"
 #include "validation.h" // mempool and minRelayTxFee
 #include "ui_interface.h"
 #include "txmempool.h"
diff --git a/src/coincontrol.h b/src/wallet/coincontrol.h
similarity index 94%
rename from src/coincontrol.h
rename to src/wallet/coincontrol.h
index cd382c7ab..15dbf41bb 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"
 
@@ -77,4 +77,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 cc2faaaeb..2e9ce8021 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -9,7 +9,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"