diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2015-02-05 01:21:11 +0100 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2015-03-24 17:23:32 +0100 |
| commit | 8a893c949bf6b011c8ae1645888576bf236db79c (patch) | |
| tree | f8cc7e9b3268bea6b3333a9bc9f3a3f48eb87fbb /src/wallet | |
| parent | eca0b1ea62b2625d9df8daecacde96edeb486d65 (diff) | |
| download | bitcoin-8a893c949bf6b011c8ae1645888576bf236db79c.tar.xz | |
Includes: Do not include main.h from any other header
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 5 | ||||
| -rw-r--r-- | src/wallet/walletdb.cpp | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5502b0b261..9318c1b2b1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6,10 +6,11 @@ #include "amount.h" #include "base58.h" #include "core_io.h" -#include "rpcserver.h" #include "init.h" +#include "main.h" #include "net.h" #include "netbase.h" +#include "rpcserver.h" #include "timedata.h" #include "util.h" #include "utilmoneystr.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index cc03d5632e..09bcda577e 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -8,6 +8,7 @@ #include "base58.h" #include "checkpoints.h" #include "coincontrol.h" +#include "main.h" #include "net.h" #include "script/script.h" #include "script/sign.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9abc73f9ce..4a13f02195 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -9,10 +9,11 @@ #include "amount.h" #include "key.h" #include "keystore.h" -#include "main.h" #include "primitives/block.h" #include "primitives/transaction.h" +#include "tinyformat.h" #include "ui_interface.h" +#include "utilstrencodings.h" #include "validationinterface.h" #include "wallet/crypter.h" #include "wallet/wallet_ismine.h" @@ -49,10 +50,12 @@ static const CAmount nHighTransactionMaxFeeWarning = 100 * nHighTransactionFeeWa static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000; class CAccountingEntry; +class CBlockIndex; class CCoinControl; class COutput; class CReserveKey; class CScript; +class CTxMemPool; class CWalletTx; /** (client) version numbers for particular wallet features */ diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index d7f70e435e..de56a2d1af 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -6,6 +6,7 @@ #include "wallet/walletdb.h" #include "base58.h" +#include "main.h" #include "protocol.h" #include "serialize.h" #include "sync.h" |