Browse Source

Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included

a720b92 Remove includes in .cpp files for things the corresponding .h file already included (practicalswift)

Pull request description:

  Remove includes in .cpp files for things the corresponding .h file already included.

  Example case:
  * `addrdb.cpp` includes `addrdb.h` and `fs.h`
  * `addrdb.h` includes `fs.h`

  Then remove the direct inclusion of `fs.h` in `addrman.cpp` and rely on the indirect inclusion of `fs.h` via the included `addrdb.h`.

  In line with the header include guideline (see #10575).

Tree-SHA512: 8704b9de3011a4c234db336a39f7d2c139e741cf0f7aef08a5d3e05197e1e18286b863fdab25ae9638af4ff86b3d52e5cab9eed66bfa2476063aa5c79f9b0346
0.16
Wladimir J. van der Laan 7 years ago
parent
commit
5d132e8b97
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
  1. 1
      src/addrdb.cpp
  2. 1
      src/checkpoints.cpp
  3. 1
      src/clientversion.cpp
  4. 3
      src/coins.cpp
  5. 2
      src/dbwrapper.cpp
  6. 1
      src/key.cpp
  7. 2
      src/keystore.cpp
  8. 1
      src/miner.cpp
  9. 2
      src/net.cpp
  10. 2
      src/net_processing.cpp
  11. 4
      src/netaddress.cpp
  12. 4
      src/netbase.cpp
  13. 2
      src/policy/fees.cpp
  14. 4
      src/qt/bitcoingui.cpp
  15. 2
      src/qt/coincontroldialog.cpp
  16. 1
      src/qt/guiutil.cpp
  17. 1
      src/qt/notificator.cpp
  18. 1
      src/qt/optionsmodel.cpp
  19. 2
      src/qt/platformstyle.cpp
  20. 2
      src/qt/receivecoinsdialog.cpp
  21. 1
      src/qt/receiverequestdialog.cpp
  22. 2
      src/qt/rpcconsole.cpp
  23. 3
      src/qt/sendcoinsdialog.cpp
  24. 1
      src/qt/sendcoinsentry.cpp
  25. 2
      src/qt/transactionfilterproxy.cpp
  26. 1
      src/qt/transactionview.cpp
  27. 2
      src/rpc/client.cpp
  28. 2
      src/rpc/mining.cpp
  29. 1
      src/rpc/protocol.cpp
  30. 2
      src/rpc/server.cpp
  31. 1
      src/script/interpreter.cpp
  32. 1
      src/script/ismine.cpp
  33. 6
      src/test/test_bitcoin.cpp
  34. 6
      src/util.cpp
  35. 3
      src/validation.cpp
  36. 1
      src/wallet/db.cpp
  37. 2
      src/wallet/wallet.cpp

1
src/addrdb.cpp

@ -8,7 +8,6 @@
#include <addrman.h> #include <addrman.h>
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>
#include <fs.h>
#include <hash.h> #include <hash.h>
#include <random.h> #include <random.h>
#include <streams.h> #include <streams.h>

1
src/checkpoints.cpp

@ -8,7 +8,6 @@
#include <chainparams.h> #include <chainparams.h>
#include <reverse_iterator.h> #include <reverse_iterator.h>
#include <validation.h> #include <validation.h>
#include <uint256.h>
#include <stdint.h> #include <stdint.h>

1
src/clientversion.cpp

@ -6,7 +6,6 @@
#include <tinyformat.h> #include <tinyformat.h>
#include <string>
/** /**
* Name of client reported in the 'version' message. Report the same name * Name of client reported in the 'version' message. Report the same name

3
src/coins.cpp

@ -5,11 +5,8 @@
#include <coins.h> #include <coins.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <memusage.h>
#include <random.h> #include <random.h>
#include <assert.h>
bool CCoinsView::GetCoin(const COutPoint &outpoint, Coin &coin) const { return false; } bool CCoinsView::GetCoin(const COutPoint &outpoint, Coin &coin) const { return false; }
uint256 CCoinsView::GetBestBlock() const { return uint256(); } uint256 CCoinsView::GetBestBlock() const { return uint256(); }
std::vector<uint256> CCoinsView::GetHeadBlocks() const { return std::vector<uint256>(); } std::vector<uint256> CCoinsView::GetHeadBlocks() const { return std::vector<uint256>(); }

2
src/dbwrapper.cpp

@ -4,8 +4,6 @@
#include <dbwrapper.h> #include <dbwrapper.h>
#include <fs.h>
#include <util.h>
#include <random.h> #include <random.h>
#include <leveldb/cache.h> #include <leveldb/cache.h>

1
src/key.cpp

@ -7,7 +7,6 @@
#include <arith_uint256.h> #include <arith_uint256.h>
#include <crypto/common.h> #include <crypto/common.h>
#include <crypto/hmac_sha512.h> #include <crypto/hmac_sha512.h>
#include <pubkey.h>
#include <random.h> #include <random.h>
#include <secp256k1.h> #include <secp256k1.h>

2
src/keystore.cpp

@ -5,8 +5,6 @@
#include <keystore.h> #include <keystore.h>
#include <key.h>
#include <pubkey.h>
#include <util.h> #include <util.h>
bool CKeyStore::AddKey(const CKey &key) { bool CKeyStore::AddKey(const CKey &key) {

1
src/miner.cpp

@ -22,7 +22,6 @@
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <script/standard.h> #include <script/standard.h>
#include <timedata.h> #include <timedata.h>
#include <txmempool.h>
#include <util.h> #include <util.h>
#include <utilmoneystr.h> #include <utilmoneystr.h>
#include <validationinterface.h> #include <validationinterface.h>

2
src/net.cpp

@ -9,13 +9,11 @@
#include <net.h> #include <net.h>
#include <addrman.h>
#include <chainparams.h> #include <chainparams.h>
#include <clientversion.h> #include <clientversion.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <crypto/common.h> #include <crypto/common.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <hash.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <netbase.h> #include <netbase.h>
#include <scheduler.h> #include <scheduler.h>

2
src/net_processing.cpp

@ -14,7 +14,6 @@
#include <init.h> #include <init.h>
#include <validation.h> #include <validation.h>
#include <merkleblock.h> #include <merkleblock.h>
#include <net.h>
#include <netmessagemaker.h> #include <netmessagemaker.h>
#include <netbase.h> #include <netbase.h>
#include <policy/fees.h> #include <policy/fees.h>
@ -30,7 +29,6 @@
#include <util.h> #include <util.h>
#include <utilmoneystr.h> #include <utilmoneystr.h>
#include <utilstrencodings.h> #include <utilstrencodings.h>
#include <validationinterface.h>
#if defined(NDEBUG) #if defined(NDEBUG)
# error "Bitcoin cannot be compiled without assertions." # error "Bitcoin cannot be compiled without assertions."

4
src/netaddress.cpp

@ -3,10 +3,6 @@
// 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.
#ifdef HAVE_CONFIG_H
#include <config/bitcoin-config.h>
#endif
#include <netaddress.h> #include <netaddress.h>
#include <hash.h> #include <hash.h>
#include <utilstrencodings.h> #include <utilstrencodings.h>

4
src/netbase.cpp

@ -3,10 +3,6 @@
// 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.
#ifdef HAVE_CONFIG_H
#include <config/bitcoin-config.h>
#endif
#include <netbase.h> #include <netbase.h>
#include <hash.h> #include <hash.h>

2
src/policy/fees.cpp

@ -6,10 +6,8 @@
#include <policy/fees.h> #include <policy/fees.h>
#include <policy/policy.h> #include <policy/policy.h>
#include <amount.h>
#include <clientversion.h> #include <clientversion.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <random.h>
#include <streams.h> #include <streams.h>
#include <txmempool.h> #include <txmempool.h>
#include <util.h> #include <util.h>

4
src/qt/bitcoingui.cpp

@ -2,10 +2,6 @@
// 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.
#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif
#include <qt/bitcoingui.h> #include <qt/bitcoingui.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>

2
src/qt/coincontroldialog.cpp

@ -28,9 +28,7 @@
#include <QFlags> #include <QFlags>
#include <QIcon> #include <QIcon>
#include <QSettings> #include <QSettings>
#include <QString>
#include <QTreeWidget> #include <QTreeWidget>
#include <QTreeWidgetItem>
QList<CAmount> CoinControlDialog::payAmounts; QList<CAmount> CoinControlDialog::payAmounts;
CCoinControl* CoinControlDialog::coinControl = new CCoinControl(); CCoinControl* CoinControlDialog::coinControl = new CCoinControl();

1
src/qt/guiutil.cpp

@ -9,7 +9,6 @@
#include <qt/qvalidatedlineedit.h> #include <qt/qvalidatedlineedit.h>
#include <qt/walletmodel.h> #include <qt/walletmodel.h>
#include <fs.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <init.h> #include <init.h>
#include <policy/policy.h> #include <policy/policy.h>

1
src/qt/notificator.cpp

@ -6,7 +6,6 @@
#include <QApplication> #include <QApplication>
#include <QByteArray> #include <QByteArray>
#include <QIcon>
#include <QImageWriter> #include <QImageWriter>
#include <QMessageBox> #include <QMessageBox>
#include <QMetaType> #include <QMetaType>

1
src/qt/optionsmodel.cpp

@ -11,7 +11,6 @@
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>
#include <amount.h>
#include <init.h> #include <init.h>
#include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS #include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS
#include <net.h> #include <net.h>

2
src/qt/platformstyle.cpp

@ -8,10 +8,8 @@
#include <QApplication> #include <QApplication>
#include <QColor> #include <QColor>
#include <QIcon>
#include <QImage> #include <QImage>
#include <QPalette> #include <QPalette>
#include <QPixmap>
static const struct { static const struct {
const char *platformId; const char *platformId;

2
src/qt/receivecoinsdialog.cpp

@ -8,7 +8,6 @@
#include <qt/addressbookpage.h> #include <qt/addressbookpage.h>
#include <qt/addresstablemodel.h> #include <qt/addresstablemodel.h>
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/guiutil.h>
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/platformstyle.h> #include <qt/platformstyle.h>
#include <qt/receiverequestdialog.h> #include <qt/receiverequestdialog.h>
@ -17,7 +16,6 @@
#include <QAction> #include <QAction>
#include <QCursor> #include <QCursor>
#include <QItemSelection>
#include <QMessageBox> #include <QMessageBox>
#include <QScrollBar> #include <QScrollBar>
#include <QTextDocument> #include <QTextDocument>

1
src/qt/receiverequestdialog.cpp

@ -9,7 +9,6 @@
#include <qt/guiconstants.h> #include <qt/guiconstants.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/walletmodel.h>
#include <QClipboard> #include <QClipboard>
#include <QDrag> #include <QDrag>

2
src/qt/rpcconsole.cpp

@ -11,7 +11,6 @@
#include <qt/bantablemodel.h> #include <qt/bantablemodel.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>
#include <qt/guiutil.h>
#include <qt/platformstyle.h> #include <qt/platformstyle.h>
#include <chainparams.h> #include <chainparams.h>
#include <netbase.h> #include <netbase.h>
@ -35,7 +34,6 @@
#include <QScrollBar> #include <QScrollBar>
#include <QSettings> #include <QSettings>
#include <QSignalMapper> #include <QSignalMapper>
#include <QThread>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QStringList> #include <QStringList>

3
src/qt/sendcoinsdialog.cpp

@ -13,7 +13,6 @@
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/platformstyle.h> #include <qt/platformstyle.h>
#include <qt/sendcoinsentry.h> #include <qt/sendcoinsentry.h>
#include <qt/walletmodel.h>
#include <base58.h> #include <base58.h>
#include <chainparams.h> #include <chainparams.h>
@ -25,11 +24,9 @@
#include <wallet/fees.h> #include <wallet/fees.h>
#include <QFontMetrics> #include <QFontMetrics>
#include <QMessageBox>
#include <QScrollBar> #include <QScrollBar>
#include <QSettings> #include <QSettings>
#include <QTextDocument> #include <QTextDocument>
#include <QTimer>
static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} }; static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
int getConfTargetForIndex(int index) { int getConfTargetForIndex(int index) {

1
src/qt/sendcoinsentry.cpp

@ -10,7 +10,6 @@
#include <qt/guiutil.h> #include <qt/guiutil.h>
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/platformstyle.h> #include <qt/platformstyle.h>
#include <qt/walletmodel.h>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>

2
src/qt/transactionfilterproxy.cpp

@ -9,8 +9,6 @@
#include <cstdlib> #include <cstdlib>
#include <QDateTime>
// Earliest date that can be represented (far in the past) // Earliest date that can be represented (far in the past)
const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0); const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0);
// Last date that can be represented (far in the future) // Last date that can be represented (far in the future)

1
src/qt/transactionview.cpp

@ -8,7 +8,6 @@
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <qt/csvmodelwriter.h> #include <qt/csvmodelwriter.h>
#include <qt/editaddressdialog.h> #include <qt/editaddressdialog.h>
#include <qt/guiutil.h>
#include <qt/optionsmodel.h> #include <qt/optionsmodel.h>
#include <qt/platformstyle.h> #include <qt/platformstyle.h>
#include <qt/sendcoinsdialog.h> #include <qt/sendcoinsdialog.h>

2
src/rpc/client.cpp

@ -10,8 +10,6 @@
#include <set> #include <set>
#include <stdint.h> #include <stdint.h>
#include <univalue.h>
class CRPCConvertParam class CRPCConvertParam
{ {
public: public:

2
src/rpc/mining.cpp

@ -29,8 +29,6 @@
#include <memory> #include <memory>
#include <stdint.h> #include <stdint.h>
#include <univalue.h>
unsigned int ParseConfirmTarget(const UniValue& value) unsigned int ParseConfirmTarget(const UniValue& value)
{ {
int target = value.get_int(); int target = value.get_int();

1
src/rpc/protocol.cpp

@ -12,7 +12,6 @@
#include <utiltime.h> #include <utiltime.h>
#include <version.h> #include <version.h>
#include <stdint.h>
#include <fstream> #include <fstream>
/** /**

2
src/rpc/server.cpp

@ -14,8 +14,6 @@
#include <util.h> #include <util.h>
#include <utilstrencodings.h> #include <utilstrencodings.h>
#include <univalue.h>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_upper() #include <boost/algorithm/string/case_conv.hpp> // for to_upper()

1
src/script/interpreter.cpp

@ -5,7 +5,6 @@
#include <script/interpreter.h> #include <script/interpreter.h>
#include <primitives/transaction.h>
#include <crypto/ripemd160.h> #include <crypto/ripemd160.h>
#include <crypto/sha1.h> #include <crypto/sha1.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>

1
src/script/ismine.cpp

@ -8,7 +8,6 @@
#include <key.h> #include <key.h>
#include <keystore.h> #include <keystore.h>
#include <script/script.h> #include <script/script.h>
#include <script/standard.h>
#include <script/sign.h> #include <script/sign.h>

6
src/test/test_bitcoin.cpp

@ -8,15 +8,9 @@
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <crypto/sha256.h> #include <crypto/sha256.h>
#include <fs.h>
#include <key.h>
#include <validation.h> #include <validation.h>
#include <miner.h> #include <miner.h>
#include <net_processing.h> #include <net_processing.h>
#include <pubkey.h>
#include <random.h>
#include <txdb.h>
#include <txmempool.h>
#include <ui_interface.h> #include <ui_interface.h>
#include <streams.h> #include <streams.h>
#include <rpc/server.h> #include <rpc/server.h>

6
src/util.cpp

@ -3,18 +3,12 @@
// 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.
#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif
#include <util.h> #include <util.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <fs.h>
#include <random.h> #include <random.h>
#include <serialize.h> #include <serialize.h>
#include <utilstrencodings.h> #include <utilstrencodings.h>
#include <utiltime.h>
#include <stdarg.h> #include <stdarg.h>

3
src/validation.cpp

@ -15,7 +15,6 @@
#include <consensus/tx_verify.h> #include <consensus/tx_verify.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <cuckoocache.h> #include <cuckoocache.h>
#include <fs.h>
#include <hash.h> #include <hash.h>
#include <init.h> #include <init.h>
#include <policy/fees.h> #include <policy/fees.h>
@ -39,10 +38,8 @@
#include <utilmoneystr.h> #include <utilmoneystr.h>
#include <utilstrencodings.h> #include <utilstrencodings.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <versionbits.h>
#include <warnings.h> #include <warnings.h>
#include <atomic>
#include <sstream> #include <sstream>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>

1
src/wallet/db.cpp

@ -6,7 +6,6 @@
#include <wallet/db.h> #include <wallet/db.h>
#include <addrman.h> #include <addrman.h>
#include <fs.h>
#include <hash.h> #include <hash.h>
#include <protocol.h> #include <protocol.h>
#include <util.h> #include <util.h>

2
src/wallet/wallet.cpp

@ -23,12 +23,10 @@
#include <primitives/block.h> #include <primitives/block.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <script/script.h> #include <script/script.h>
#include <script/sign.h>
#include <scheduler.h> #include <scheduler.h>
#include <timedata.h> #include <timedata.h>
#include <txmempool.h> #include <txmempool.h>
#include <util.h> #include <util.h>
#include <ui_interface.h>
#include <utilmoneystr.h> #include <utilmoneystr.h>
#include <wallet/fees.h> #include <wallet/fees.h>

Loading…
Cancel
Save