From a0c93ebaa51913122765dfbbab9461e3e7b14027 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 20 Dec 2016 17:27:59 +0400 Subject: [PATCH] cleanup/fix includes: (#1214) - some were not used, some were included twice, some were in the wrong place, some were missing (but it compiled because some were in the wrong place) - organized a bit better, grouped dash specific includes in original bitcoin files, should save some time solving conflicts when/if merging patches later --- src/governance-classes.cpp | 18 ++++-------------- src/governance-classes.h | 14 ++++---------- src/governance-exceptions.h | 3 ++- src/governance-object.cpp | 15 +++------------ src/governance-object.h | 23 ++++++----------------- src/governance-vote.cpp | 14 ++------------ src/governance-vote.h | 9 ++------- src/governance.cpp | 14 +++----------- src/governance.h | 28 ++++++++-------------------- src/init.cpp | 30 +++++++++++++++++------------- src/instantx.cpp | 16 ++++++++-------- src/instantx.h | 6 +----- src/main.cpp | 13 +++++++------ src/masternode-payments.cpp | 1 - src/masternodeman.cpp | 8 ++------ src/net.cpp | 5 +++-- src/qt/clientmodel.cpp | 5 +++-- src/qt/coincontroldialog.cpp | 4 +++- src/qt/masternodelist.cpp | 10 +++++----- src/qt/optionsdialog.cpp | 3 ++- src/qt/optionsmodel.cpp | 5 ++++- src/qt/overviewpage.cpp | 8 +++++--- src/qt/transactiondesc.cpp | 2 ++ src/qt/transactionrecord.cpp | 3 ++- src/qt/walletmodel.cpp | 6 ++++-- src/qt/walletmodel.h | 1 - src/rpcgovernance.cpp | 19 ++++++------------- src/rpcmasternode.cpp | 7 +++---- src/wallet/wallet.cpp | 11 ++++++----- 29 files changed, 117 insertions(+), 184 deletions(-) diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp index 75a476f0b..f32db2f67 100644 --- a/src/governance-classes.cpp +++ b/src/governance-classes.cpp @@ -4,26 +4,16 @@ //#define ENABLE_DASH_DEBUG -#include "governance-classes.h" - #include "core_io.h" -#include "main.h" +#include "governance-classes.h" #include "init.h" -#include "chainparams.h" +#include "main.h" +#include "utilstrencodings.h" -#include "consensus/consensus.h" -#include "consensus/merkle.h" -#include "consensus/validation.h" - -#include "governance.h" -#include "masternode.h" -#include -#include - -#include #include #include +#include // DECLARE GLOBAL VARIABLES FOR GOVERNANCE CLASSES CGovernanceTriggerManager triggerman; diff --git a/src/governance-classes.h b/src/governance-classes.h index 8817a56d0..e74c583f8 100644 --- a/src/governance-classes.h +++ b/src/governance-classes.h @@ -6,19 +6,13 @@ //#define ENABLE_DASH_DEBUG -#include "util.h" -#include "main.h" -#include "sync.h" -#include "net.h" -#include "key.h" -#include "util.h" #include "base58.h" -#include "masternode.h" -#include -#include -#include "init.h" #include "governance.h" +#include "key.h" +#include "script/standard.h" +#include "util.h" +#include class CSuperblock; class CGovernanceTrigger; diff --git a/src/governance-exceptions.h b/src/governance-exceptions.h index 92b2b507b..a125e970c 100644 --- a/src/governance-exceptions.h +++ b/src/governance-exceptions.h @@ -6,8 +6,9 @@ #define GOVERNANCE_EXCEPTIONS_H #include -#include #include +#include +#include enum governance_exception_type_enum_t { /// Default value, normally indicates no exception condition occurred diff --git a/src/governance-object.cpp b/src/governance-object.cpp index 3e9a7f00d..628735c6a 100644 --- a/src/governance-object.cpp +++ b/src/governance-object.cpp @@ -3,23 +3,14 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "core_io.h" -#include "main.h" -#include "init.h" - -#include "flat-database.h" +#include "darksend.h" #include "governance.h" +#include "governance-classes.h" #include "governance-object.h" #include "governance-vote.h" -#include "governance-classes.h" -#include "masternode.h" -#include "governance.h" -#include "darksend.h" #include "masternodeman.h" -#include "masternode-sync.h" -#include "netfulfilledman.h" #include "util.h" -#include "addrman.h" -#include + #include CGovernanceObject::CGovernanceObject() diff --git a/src/governance-object.h b/src/governance-object.h index f0694d71d..fc67ec0fe 100644 --- a/src/governance-object.h +++ b/src/governance-object.h @@ -7,27 +7,16 @@ //#define ENABLE_DASH_DEBUG -#include "util.h" -#include "main.h" -#include "sync.h" -#include "net.h" -#include "key.h" -#include "util.h" -#include "base58.h" -#include "masternode.h" +#include "cachemultimap.h" #include "governance-exceptions.h" #include "governance-vote.h" #include "governance-votedb.h" -#include "masternodeman.h" -#include -#include "init.h" -#include -#include "utilstrencodings.h" -#include "cachemap.h" -#include "cachemultimap.h" +#include "key.h" +#include "net.h" +#include "sync.h" +#include "util.h" -#include -#include +#include class CGovernanceManager; class CGovernanceTriggerManager; diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp index f0668267e..7bacedc69 100644 --- a/src/governance-vote.cpp +++ b/src/governance-vote.cpp @@ -2,23 +2,13 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "core_io.h" -#include "main.h" -#include "init.h" - -#include "flat-database.h" -#include "governance.h" -#include "masternode.h" -#include "governance.h" #include "darksend.h" +#include "governance-vote.h" #include "masternodeman.h" -#include "masternode-sync.h" #include "util.h" -#include "addrman.h" + #include - - std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome) { switch(nOutcome) diff --git a/src/governance-vote.h b/src/governance-vote.h index 3ae9035d0..5e1e50788 100644 --- a/src/governance-vote.h +++ b/src/governance-vote.h @@ -5,15 +5,10 @@ #ifndef GOVERNANCE_VOTE_H #define GOVERNANCE_VOTE_H -#include "main.h" -#include "sync.h" -#include "net.h" #include "key.h" -#include "util.h" -#include "base58.h" -#include "masternode.h" +#include "primitives/transaction.h" + #include -#include "init.h" using namespace std; diff --git a/src/governance.cpp b/src/governance.cpp index ca53a46be..340a975b7 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -2,25 +2,17 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "core_io.h" -#include "main.h" -#include "init.h" - -#include "flat-database.h" +#include "darksend.h" #include "governance.h" #include "governance-object.h" #include "governance-vote.h" #include "governance-classes.h" +#include "main.h" #include "masternode.h" -#include "governance.h" -#include "darksend.h" -#include "masternodeman.h" #include "masternode-sync.h" +#include "masternodeman.h" #include "netfulfilledman.h" #include "util.h" -#include "addrman.h" -#include -#include CGovernanceManager governance; diff --git a/src/governance.h b/src/governance.h index b3037d3b0..82aff2beb 100644 --- a/src/governance.h +++ b/src/governance.h @@ -7,28 +7,16 @@ //#define ENABLE_DASH_DEBUG -#include "util.h" -#include "main.h" -#include "sync.h" -#include "net.h" -#include "key.h" -#include "util.h" -#include "base58.h" -#include "governance-object.h" -#include "masternode.h" -#include "governance-exceptions.h" -#include "governance-vote.h" -#include "governance-votedb.h" -#include "masternodeman.h" -#include -#include "init.h" -#include -#include "utilstrencodings.h" #include "cachemap.h" #include "cachemultimap.h" - -#include -#include +#include "chain.h" +#include "governance-exceptions.h" +#include "governance-object.h" +#include "governance-vote.h" +#include "net.h" +#include "sync.h" +#include "timedata.h" +#include "util.h" class CGovernanceManager; class CGovernanceTriggerManager; diff --git a/src/init.cpp b/src/init.cpp index 0b7cf426d..21c1e854b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -34,25 +34,31 @@ #include "torcontrol.h" #include "ui_interface.h" #include "util.h" -#include "activemasternode.h" -#include "instantx.h" -#include "darksend.h" -#include "masternode-payments.h" -#include "masternode-sync.h" -#include "masternodeman.h" -#include "masternodeconfig.h" -#include "flat-database.h" -#include "governance.h" -#include "spork.h" #include "utilmoneystr.h" #include "utilstrencodings.h" #include "validationinterface.h" #ifdef ENABLE_WALLET -#include "keepass.h" #include "wallet/db.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" #endif + +#include "activemasternode.h" +#include "darksend.h" +#include "dsnotificationinterface.h" +#include "flat-database.h" +#include "governance.h" +#include "instantx.h" +#ifdef ENABLE_WALLET +#include "keepass.h" +#endif +#include "masternode-payments.h" +#include "masternode-sync.h" +#include "masternodeman.h" +#include "masternodeconfig.h" +#include "netfulfilledman.h" +#include "spork.h" + #include #include @@ -75,8 +81,6 @@ #include "zmq/zmqnotificationinterface.h" #endif -#include "dsnotificationinterface.h" - using namespace std; #ifdef ENABLE_WALLET diff --git a/src/instantx.cpp b/src/instantx.cpp index ad3b82c06..860c1b0b1 100644 --- a/src/instantx.cpp +++ b/src/instantx.cpp @@ -2,19 +2,19 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "consensus/validation.h" -#include "sync.h" -#include "net.h" -#include "key.h" -#include "util.h" -#include "base58.h" -#include "protocol.h" -#include "instantx.h" + #include "activemasternode.h" #include "darksend.h" +#include "instantx.h" +#include "key.h" #include "masternode-sync.h" #include "masternodeman.h" +#include "net.h" +#include "protocol.h" #include "spork.h" +#include "sync.h" +#include "util.h" +#include "consensus/validation.h" #include #include diff --git a/src/instantx.h b/src/instantx.h index 1bcde4055..8cc959280 100644 --- a/src/instantx.h +++ b/src/instantx.h @@ -4,12 +4,8 @@ #ifndef INSTANTX_H #define INSTANTX_H -#include "sync.h" #include "net.h" -#include "key.h" -#include "util.h" -#include "base58.h" -#include "main.h" +#include "primitives/transaction.h" class CTransaction; class CTxLockVote; diff --git a/src/main.cpp b/src/main.cpp index 241b16754..11d6fc92f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,12 +17,6 @@ #include "consensus/validation.h" #include "hash.h" #include "init.h" -#include "instantx.h" -#include "darksend.h" -#include "governance.h" -#include "masternode-payments.h" -#include "masternode-sync.h" -#include "masternodeman.h" #include "merkleblock.h" #include "net.h" #include "policy/policy.h" @@ -44,6 +38,13 @@ #include "validationinterface.h" #include "versionbits.h" +#include "darksend.h" +#include "governance.h" +#include "instantx.h" +#include "masternode-payments.h" +#include "masternode-sync.h" +#include "masternodeman.h" + #include #include diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index 62413c0f4..07e7cb492 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -3,7 +3,6 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "activemasternode.h" -#include "addrman.h" #include "darksend.h" #include "governance-classes.h" #include "masternode-payments.h" diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 009a2ce6a..5d8798bd4 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -2,19 +2,15 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "masternodeman.h" #include "activemasternode.h" +#include "addrman.h" #include "darksend.h" #include "governance.h" -#include "masternode.h" #include "masternode-payments.h" #include "masternode-sync.h" +#include "masternodeman.h" #include "netfulfilledman.h" #include "util.h" -#include "addrman.h" -#include "spork.h" -#include -#include /** Masternode manager */ CMasternodeMan mnodeman; diff --git a/src/net.cpp b/src/net.cpp index 9ebfa92ee..fdcbcf4cd 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -19,11 +19,12 @@ #include "primitives/transaction.h" #include "scheduler.h" #include "ui_interface.h" -#include "darksend.h" -#include "instantx.h" #include "wallet/wallet.h" #include "utilstrencodings.h" +#include "darksend.h" +#include "instantx.h" + #ifdef WIN32 #include #else diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 0661e8238..0bcefc295 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -13,13 +13,14 @@ #include "chainparams.h" #include "checkpoints.h" #include "clientversion.h" -#include "darksend.h" #include "net.h" #include "txmempool.h" #include "ui_interface.h" +#include "util.h" + +#include "darksend.h" #include "masternodeman.h" #include "masternode-sync.h" -#include "util.h" #include diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 601c59071..cd15edb8b 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -15,11 +15,13 @@ #include "walletmodel.h" #include "coincontrol.h" -#include "darksend.h" #include "init.h" #include "main.h" // For minRelayTxFee #include "wallet/wallet.h" +#include "darksend.h" +#include "instantx.h" + #include // for 'map_list_of()' #include diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp index fe46c900c..4cf0b6dd3 100644 --- a/src/qt/masternodelist.cpp +++ b/src/qt/masternodelist.cpp @@ -1,16 +1,16 @@ #include "masternodelist.h" #include "ui_masternodelist.h" -#include "sync.h" -#include "clientmodel.h" -#include "walletmodel.h" #include "activemasternode.h" +#include "clientmodel.h" +#include "init.h" +#include "guiutil.h" #include "masternode-sync.h" #include "masternodeconfig.h" #include "masternodeman.h" +#include "sync.h" #include "wallet/wallet.h" -#include "init.h" -#include "guiutil.h" +#include "walletmodel.h" #include #include diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 853180395..e18e5c385 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -12,7 +12,6 @@ #include "bitcoinunits.h" #include "guiutil.h" #include "optionsmodel.h" -#include "darksend.h" #include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS #include "netbase.h" @@ -22,6 +21,8 @@ #include "wallet/wallet.h" // for CWallet::GetRequiredFee() #endif +#include "darksend.h" + #include #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 4e3cff00f..f22089b31 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -13,7 +13,6 @@ #include "guiutil.h" #include "amount.h" -#include "darksend.h" #include "init.h" #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS #include "net.h" @@ -22,6 +21,10 @@ #ifdef ENABLE_WALLET #include "wallet/wallet.h" #include "wallet/walletdb.h" +#endif + +#include "darksend.h" +#ifdef ENABLE_WALLET #include "masternodeconfig.h" #endif diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index a83be6a7f..477b5770d 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -8,17 +8,19 @@ #include "bitcoinunits.h" #include "clientmodel.h" -#include "darksend.h" -#include "darksendconfig.h" #include "guiconstants.h" #include "guiutil.h" +#include "init.h" #include "optionsmodel.h" #include "platformstyle.h" #include "transactionfilterproxy.h" #include "transactiontablemodel.h" #include "utilitydialog.h" #include "walletmodel.h" -#include "init.h" + +#include "darksend.h" +#include "instantx.h" +#include "darksendconfig.h" #include "masternode-sync.h" #include diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index cac05c517..d726dac22 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -19,6 +19,8 @@ #include "wallet/db.h" #include "wallet/wallet.h" +#include "instantx.h" + #include #include diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index f53166608..5b5c11891 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -9,9 +9,10 @@ #include "consensus/consensus.h" #include "main.h" #include "timedata.h" +#include "wallet/wallet.h" + #include "darksend.h" #include "instantx.h" -#include "wallet/wallet.h" #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 016902ee1..7ac91275c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -13,15 +13,17 @@ #include "transactiontablemodel.h" #include "base58.h" -#include "darksend.h" #include "keystore.h" #include "main.h" #include "sync.h" #include "ui_interface.h" -#include "spork.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" // for BackupWallet +#include "darksend.h" +#include "instantx.h" +#include "spork.h" + #include #include diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 47e91c7bc..369df01f0 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -8,7 +8,6 @@ #include "paymentrequestplus.h" #include "walletmodeltransaction.h" -#include "instantx.h" #include "wallet/wallet.h" #include "support/allocators/secure.h" diff --git a/src/rpcgovernance.cpp b/src/rpcgovernance.cpp index 543c748ef..0d42da4d7 100644 --- a/src/rpcgovernance.cpp +++ b/src/rpcgovernance.cpp @@ -4,30 +4,23 @@ //#define ENABLE_DASH_DEBUG -#include "util.h" -#include "main.h" -#include "db.h" -#include "init.h" #include "activemasternode.h" #include "darksend.h" #include "governance.h" +#include "governance-vote.h" +#include "governance-classes.h" +#include "init.h" +#include "main.h" #include "masternode.h" -#include "masternode-payments.h" #include "masternode-sync.h" #include "masternodeconfig.h" #include "masternodeman.h" #include "rpcserver.h" +#include "util.h" #include "utilmoneystr.h" -#include "governance-vote.h" -#include "governance-classes.h" + #include -#include -#include -#include - -using namespace std; - UniValue gobject(const UniValue& params, bool fHelp) { std::string strCommand; diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index e98f5b93d..b78b64658 100644 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -2,17 +2,16 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "main.h" -#include "db.h" -#include "init.h" #include "activemasternode.h" #include "darksend.h" -#include "governance.h" +#include "init.h" +#include "main.h" #include "masternode-payments.h" #include "masternode-sync.h" #include "masternodeconfig.h" #include "masternodeman.h" #include "rpcserver.h" +#include "util.h" #include "utilmoneystr.h" #include diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 5aa8663ae..5c3568284 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -12,25 +12,26 @@ #include "coincontrol.h" #include "consensus/consensus.h" #include "consensus/validation.h" -#include "darksend.h" #include "key.h" #include "keystore.h" #include "main.h" #include "net.h" -#include "governance.h" -#include "keepass.h" -#include "instantx.h" #include "policy/policy.h" #include "primitives/block.h" #include "primitives/transaction.h" #include "script/script.h" #include "script/sign.h" -#include "spork.h" #include "timedata.h" #include "txmempool.h" #include "util.h" #include "utilmoneystr.h" +#include "darksend.h" +#include "governance.h" +#include "instantx.h" +#include "keepass.h" +#include "spork.h" + #include #include