From db747ea38477bf78a620a7c6bcd043b5843a34cf Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 1 Apr 2018 18:30:17 -0400 Subject: [PATCH] Merge #12757: Clarify include guard naming convention 3bcc0059b8 Add lint-include-guards.sh which checks include guard consistency (practicalswift) 8fd6af89a0 Fix missing or inconsistent include guards (practicalswift) 8af65d96f4 Document include guard convention (practicalswift) Pull request description: * **Documentation**: Document include guard convention * **Fix**: Fix missing or inconsistent include guards * **Regression test**: Add `lint-include-guards.sh` which checks include guard consistency Tree-SHA512: 8171878f60fd08ccbea943a11e835195750592abb9d7ab74eaa4265ae7fac523b1da9d31ca13d6ab73dd596e49986bfb7593c696e5f39567c93e610165bc2acc Signed-off-by: pasta # Conflicts: # src/bech32.h # src/consensus/merkle.h # src/key_io.h # src/policy/fees.h # src/rpc/server.h # src/script/bitcoinconsensus.h # src/wallet/coinselection.h --- contrib/devtools/lint-include-guards.sh | 29 +++++++++++++++++++++++++ doc/developer-notes.md | 10 +++++++++ src/batchedlogger.h | 6 ++--- src/bench/perf.h | 6 ++--- src/bip39.h | 6 ++--- src/bip39_english.h | 5 +++++ src/blockencodings.h | 6 ++--- src/cachemap.h | 6 ++--- src/cachemultimap.h | 6 ++--- src/chainparamsseeds.h | 6 ++--- src/consensus/merkle.h | 6 ++--- src/evo/cbtx.h | 6 ++--- src/evo/deterministicmns.h | 6 ++--- src/evo/evodb.h | 6 ++--- src/evo/mnauth.h | 6 ++--- src/evo/providertx.h | 6 ++--- src/evo/simplifiedmns.h | 6 ++--- src/evo/specialtx.h | 6 ++--- src/flat-database.h | 6 ++--- src/governance/governance-classes.h | 6 ++--- src/governance/governance-exceptions.h | 6 ++--- src/governance/governance-object.h | 6 ++--- src/governance/governance-validators.h | 6 ++--- src/governance/governance-vote.h | 6 ++--- src/governance/governance-votedb.h | 6 ++--- src/governance/governance.h | 6 ++--- src/hdchain.h | 6 ++--- src/keepass.h | 6 ++--- src/llmq/quorums.h | 6 ++--- src/llmq/quorums_blockprocessor.h | 6 ++--- src/llmq/quorums_chainlocks.h | 6 ++--- src/llmq/quorums_commitment.h | 6 ++--- src/llmq/quorums_debug.h | 6 ++--- src/llmq/quorums_dkgsession.h | 6 ++--- src/llmq/quorums_dkgsessionhandler.h | 6 ++--- src/llmq/quorums_dkgsessionmgr.h | 6 ++--- src/llmq/quorums_init.h | 6 ++--- src/llmq/quorums_instantsend.h | 6 ++--- src/llmq/quorums_signing.h | 6 ++--- src/llmq/quorums_signing_shares.h | 6 ++--- src/llmq/quorums_utils.h | 6 ++--- src/masternode/activemasternode.h | 6 ++--- src/masternode/masternode-meta.h | 6 ++--- src/masternode/masternode-payments.h | 6 ++--- src/masternode/masternode-sync.h | 6 ++--- src/masternode/masternode-utils.h | 6 ++--- src/messagesigner.h | 6 ++--- src/netfulfilledman.h | 6 ++--- src/policy/fees.h | 6 ++--- src/privatesend/privatesend-client.h | 6 ++--- src/privatesend/privatesend-server.h | 6 ++--- src/privatesend/privatesend-util.h | 6 ++--- src/privatesend/privatesend.h | 6 ++--- src/qt/masternodelist.h | 6 ++--- src/qt/test/paymentrequestdata.h | 5 +++++ src/qt/test/rpcnestedtests.h | 6 ++--- src/qt/test/trafficgraphdatatests.h | 6 ++--- src/qt/trafficgraphdata.h | 6 ++--- src/rpc/client.h | 6 ++--- src/rpc/protocol.h | 6 ++--- src/rpc/register.h | 6 ++--- src/rpc/server.h | 6 ++--- src/saltedhasher.h | 6 ++--- src/script/dashconsensus.h | 6 ++--- src/spork.h | 6 ++--- src/stacktraces.h | 6 ++--- src/unordered_lru_cache.h | 6 ++--- src/versionbits.h | 6 ++--- src/wallet/test/wallet_test_fixture.h | 7 +++--- src/wallet/walletutil.h | 6 ++--- src/walletinitinterface.h | 6 ++--- 71 files changed, 250 insertions(+), 202 deletions(-) create mode 100755 contrib/devtools/lint-include-guards.sh diff --git a/contrib/devtools/lint-include-guards.sh b/contrib/devtools/lint-include-guards.sh new file mode 100755 index 0000000000..d8d0bc6214 --- /dev/null +++ b/contrib/devtools/lint-include-guards.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# +# Copyright (c) 2018 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# +# Check include guards. + +HEADER_ID_PREFIX="BITCOIN_" +HEADER_ID_SUFFIX="_H" + +REGEXP_EXCLUDE_FILES_WITH_PREFIX="src/(crypto/ctaes/|leveldb/|secp256k1/|tinyformat.h|univalue/|ctpl.h|bls/|crypto/sph)" + +EXIT_CODE=0 +for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_WITH_PREFIX}") +do + HEADER_ID_BASE=$(cut -f2- -d/ <<< "${HEADER_FILE}" | sed "s/\.h$//g" | tr / _ | tr "[:lower:]" "[:upper:]") + HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}" + if [[ $(grep -cE "^#(ifndef|define) ${HEADER_ID}" "${HEADER_FILE}") != 2 ]]; then + echo "${HEADER_FILE} seems to be missing the expected include guard:" + echo " #ifndef ${HEADER_ID}" + echo " #define ${HEADER_ID}" + echo " ..." + echo " #endif // ${HEADER_ID}" + echo + EXIT_CODE=1 + fi +done +exit ${EXIT_CODE} diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 90bad116f0..e3df55b16b 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -563,6 +563,16 @@ namespace { source file into account. This allows quoted includes to stand out more when the location of the source file actually is relevant. +- Use include guards to avoid the problem of double inclusion. The header file + `foo/bar.h` should use the include guard identifier `BITCOIN_FOO_BAR_H`, e.g. + +```c++ +#ifndef BITCOIN_FOO_BAR_H +#define BITCOIN_FOO_BAR_H +... +#endif // BITCOIN_FOO_BAR_H +``` + GUI ----- diff --git a/src/batchedlogger.h b/src/batchedlogger.h index 3a3dba4dca..23a9af6887 100644 --- a/src/batchedlogger.h +++ b/src/batchedlogger.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_BATCHEDLOGGER_H -#define DASH_BATCHEDLOGGER_H +#ifndef BITCOIN_BATCHEDLOGGER_H +#define BITCOIN_BATCHEDLOGGER_H #include @@ -29,4 +29,4 @@ public: void Flush(); }; -#endif//DASH_BATCHEDLOGGER_H +#endif//BITCOIN_BATCHEDLOGGER_H diff --git a/src/bench/perf.h b/src/bench/perf.h index 681bd0c8a2..73ea8b9647 100644 --- a/src/bench/perf.h +++ b/src/bench/perf.h @@ -3,8 +3,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. /** Functions for measurement of CPU cycles */ -#ifndef H_PERF -#define H_PERF +#ifndef BITCOIN_BENCH_PERF_H +#define BITCOIN_BENCH_PERF_H #include @@ -34,4 +34,4 @@ uint64_t perf_cpucycles(void); void perf_init(void); void perf_fini(void); -#endif // H_PERF +#endif // BITCOIN_BENCH_PERF_H diff --git a/src/bip39.h b/src/bip39.h index 78fff0f7b3..9c6426b244 100644 --- a/src/bip39.h +++ b/src/bip39.h @@ -21,8 +21,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef DASH_BIP39_H -#define DASH_BIP39_H +#ifndef BITCOIN_BIP39_H +#define BITCOIN_BIP39_H #include @@ -36,4 +36,4 @@ public: static void ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet); }; -#endif +#endif // BITCOIN_BIP39_H diff --git a/src/bip39_english.h b/src/bip39_english.h index 233acc2f85..961157479c 100644 --- a/src/bip39_english.h +++ b/src/bip39_english.h @@ -21,6 +21,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#ifndef BITCOIN_BIP39_ENGLISH_H +#define BITCOIN_BIP39_ENGLISH_H + const char * const wordlist[] = { "abandon", "ability", @@ -2072,3 +2075,5 @@ const char * const wordlist[] = { "zoo", 0, }; + +#endif // BITCOIN_BIP39_ENGLISH_H diff --git a/src/blockencodings.h b/src/blockencodings.h index 4ad4424b60..4d09a75b38 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.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_BLOCK_ENCODINGS_H -#define BITCOIN_BLOCK_ENCODINGS_H +#ifndef BITCOIN_BLOCKENCODINGS_H +#define BITCOIN_BLOCKENCODINGS_H #include @@ -209,4 +209,4 @@ public: ReadStatus FillBlock(CBlock& block, const std::vector& vtx_missing); }; -#endif +#endif // BITCOIN_BLOCKENCODINGS_H diff --git a/src/cachemap.h b/src/cachemap.h index 4abd9465f8..94c32d8176 100644 --- a/src/cachemap.h +++ b/src/cachemap.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef CACHEMAP_H_ -#define CACHEMAP_H_ +#ifndef BITCOIN_CACHEMAP_H +#define BITCOIN_CACHEMAP_H #include #include @@ -186,4 +186,4 @@ private: } }; -#endif /* CACHEMAP_H_ */ +#endif // BITCOIN_CACHEMAP_H diff --git a/src/cachemultimap.h b/src/cachemultimap.h index 50085751a4..7f6e3ed370 100644 --- a/src/cachemultimap.h +++ b/src/cachemultimap.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef CACHEMULTIMAP_H_ -#define CACHEMULTIMAP_H_ +#ifndef BITCOIN_CACHEMULTIMAP_H +#define BITCOIN_CACHEMULTIMAP_H #include #include @@ -245,4 +245,4 @@ private: } }; -#endif /* CACHEMULTIMAP_H_ */ +#endif // BITCOIN_CACHEMULTIMAP_H diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 4f13479b90..02b38fdbd9 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -1,5 +1,5 @@ -#ifndef DASH_CHAINPARAMSSEEDS_H -#define DASH_CHAINPARAMSSEEDS_H +#ifndef BITCOIN_CHAINPARAMSSEEDS_H +#define BITCOIN_CHAINPARAMSSEEDS_H /** * List of fixed seed nodes for the dash network * AUTOGENERATED by contrib/seeds/generate-seeds.py @@ -283,4 +283,4 @@ static SeedSpec6 pnSeed6_test[] = { {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x01}, 19999}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x02}, 19999} }; -#endif // DASH_CHAINPARAMSSEEDS_H +#endif // BITCOIN_CHAINPARAMSSEEDS_H diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 1b6b474d16..e650436c83 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.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_MERKLE -#define BITCOIN_MERKLE +#ifndef BITCOIN_CONSENSUS_MERKLE_H +#define BITCOIN_CONSENSUS_MERKLE_H #include #include @@ -20,4 +20,4 @@ uint256 ComputeMerkleRoot(std::vector hashes, bool* mutated = nullptr); */ uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = nullptr); -#endif +#endif // BITCOIN_CONSENSUS_MERKLE_H diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h index b7a749a5b3..ac307e077a 100644 --- a/src/evo/cbtx.h +++ b/src/evo/cbtx.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 DASH_CBTX_H -#define DASH_CBTX_H +#ifndef BITCOIN_EVO_CBTX_H +#define BITCOIN_EVO_CBTX_H #include #include @@ -60,4 +60,4 @@ bool CheckCbTxMerkleRoots(const CBlock& block, const CBlockIndex* pindex, CValid bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state); bool CalcCbTxMerkleRootQuorums(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state); -#endif //DASH_CBTX_H +#endif // BITCOIN_EVO_CBTX_H diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h index c5dfe60b4a..49bed84b4b 100644 --- a/src/evo/deterministicmns.h +++ b/src/evo/deterministicmns.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 DASH_DETERMINISTICMNS_H -#define DASH_DETERMINISTICMNS_H +#ifndef BITCOIN_EVO_DETERMINISTICMNS_H +#define BITCOIN_EVO_DETERMINISTICMNS_H #include #include @@ -682,4 +682,4 @@ private: extern std::unique_ptr deterministicMNManager; -#endif //DASH_DETERMINISTICMNS_H +#endif // BITCOIN_EVO_DETERMINISTICMNS_H diff --git a/src/evo/evodb.h b/src/evo/evodb.h index 83db92391f..229d17768e 100644 --- a/src/evo/evodb.h +++ b/src/evo/evodb.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 DASH_EVODB_H -#define DASH_EVODB_H +#ifndef BITCOIN_EVO_EVODB_H +#define BITCOIN_EVO_EVODB_H #include #include @@ -110,4 +110,4 @@ private: extern std::unique_ptr evoDb; -#endif //DASH_EVODB_H +#endif // BITCOIN_EVO_EVODB_H diff --git a/src/evo/mnauth.h b/src/evo/mnauth.h index d6a931fced..d4657b906b 100644 --- a/src/evo/mnauth.h +++ b/src/evo/mnauth.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 DASH_MNAUTH_H -#define DASH_MNAUTH_H +#ifndef BITCOIN_EVO_MNAUTH_H +#define BITCOIN_EVO_MNAUTH_H #include #include @@ -55,4 +55,4 @@ public: }; -#endif //DASH_MNAUTH_H +#endif // BITCOIN_EVO_MNAUTH_H diff --git a/src/evo/providertx.h b/src/evo/providertx.h index 2ba7967fdc..da72ebb170 100644 --- a/src/evo/providertx.h +++ b/src/evo/providertx.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 DASH_PROVIDERTX_H -#define DASH_PROVIDERTX_H +#ifndef BITCOIN_EVO_PROVIDERTX_H +#define BITCOIN_EVO_PROVIDERTX_H #include #include @@ -240,4 +240,4 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state); bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state); -#endif //DASH_PROVIDERTX_H +#endif // BITCOIN_EVO_PROVIDERTX_H diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h index 6b1b30fb98..7cd6e3414d 100644 --- a/src/evo/simplifiedmns.h +++ b/src/evo/simplifiedmns.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 DASH_SIMPLIFIEDMNS_H -#define DASH_SIMPLIFIEDMNS_H +#ifndef BITCOIN_EVO_SIMPLIFIEDMNS_H +#define BITCOIN_EVO_SIMPLIFIEDMNS_H #include #include @@ -147,4 +147,4 @@ public: bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& blockHash, CSimplifiedMNListDiff& mnListDiffRet, std::string& errorRet); -#endif //DASH_SIMPLIFIEDMNS_H +#endif // BITCOIN_EVO_SIMPLIFIEDMNS_H diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h index 8c02d4c3f5..e1acef0857 100644 --- a/src/evo/specialtx.h +++ b/src/evo/specialtx.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 DASH_SPECIALTX_H -#define DASH_SPECIALTX_H +#ifndef BITCOIN_EVO_SPECIALTX_H +#define BITCOIN_EVO_SPECIALTX_H #include #include @@ -49,4 +49,4 @@ void SetTxPayload(CMutableTransaction& tx, const T& payload) uint256 CalcTxInputsHash(const CTransaction& tx); -#endif //DASH_SPECIALTX_H +#endif // BITCOIN_EVO_SPECIALTX_H diff --git a/src/flat-database.h b/src/flat-database.h index 59c19d9752..8075198479 100644 --- a/src/flat-database.h +++ b/src/flat-database.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef FLAT_DATABASE_H -#define FLAT_DATABASE_H +#ifndef BITCOIN_FLAT-DATABASE_H +#define BITCOIN_FLAT-DATABASE_H #include #include @@ -225,4 +225,4 @@ public: }; -#endif +#endif // BITCOIN_FLAT-DATABASE_H diff --git a/src/governance/governance-classes.h b/src/governance/governance-classes.h index a3661ab7e5..5541223ac9 100644 --- a/src/governance/governance-classes.h +++ b/src/governance/governance-classes.h @@ -1,8 +1,8 @@ // Copyright (c) 2014-2020 The Dash Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_CLASSES_H -#define GOVERNANCE_CLASSES_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H #include #include @@ -173,4 +173,4 @@ public: bool IsExpired() const; }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H diff --git a/src/governance/governance-exceptions.h b/src/governance/governance-exceptions.h index c570a16283..6ce9354b00 100644 --- a/src/governance/governance-exceptions.h +++ b/src/governance/governance-exceptions.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_EXCEPTIONS_H -#define GOVERNANCE_EXCEPTIONS_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H #include #include @@ -97,4 +97,4 @@ public: } }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H diff --git a/src/governance/governance-object.h b/src/governance/governance-object.h index cc89a6a37e..31692b8ee4 100644 --- a/src/governance/governance-object.h +++ b/src/governance/governance-object.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_OBJECT_H -#define GOVERNANCE_OBJECT_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H #include #include @@ -356,4 +356,4 @@ public: }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H diff --git a/src/governance/governance-validators.h b/src/governance/governance-validators.h index d17766345a..5149e3e547 100644 --- a/src/governance/governance-validators.h +++ b/src/governance/governance-validators.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_VALIDATORS_H -#define GOVERNANCE_VALIDATORS_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H #include @@ -44,4 +44,4 @@ private: bool CheckURL(const std::string& strURLIn); }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H diff --git a/src/governance/governance-vote.h b/src/governance/governance-vote.h index fd6d79802b..f8290435e4 100644 --- a/src/governance/governance-vote.h +++ b/src/governance/governance-vote.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_VOTE_H -#define GOVERNANCE_VOTE_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H #include #include @@ -133,4 +133,4 @@ public: } }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H diff --git a/src/governance/governance-votedb.h b/src/governance/governance-votedb.h index 1417e14124..29a908cc3e 100644 --- a/src/governance/governance-votedb.h +++ b/src/governance/governance-votedb.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_VOTEDB_H -#define GOVERNANCE_VOTEDB_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H +#define BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H #include #include @@ -92,4 +92,4 @@ private: void RebuildIndex(); }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H diff --git a/src/governance/governance.h b/src/governance/governance.h index d4bae11da9..a85d57daa5 100644 --- a/src/governance/governance.h +++ b/src/governance/governance.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef GOVERNANCE_H -#define GOVERNANCE_H +#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_H +#define BITCOIN_GOVERNANCE_GOVERNANCE_H #include #include @@ -432,4 +432,4 @@ private: }; -#endif +#endif // BITCOIN_GOVERNANCE_GOVERNANCE_H diff --git a/src/hdchain.h b/src/hdchain.h index ddee51e453..ae5b914fd2 100644 --- a/src/hdchain.h +++ b/src/hdchain.h @@ -1,7 +1,7 @@ // Copyright (c) 2014-2019 The Dash Core developers // Distributed under the MIT software license, see the accompanying -#ifndef DASH_HDCHAIN_H -#define DASH_HDCHAIN_H +#ifndef BITCOIN_HDCHAIN_H +#define BITCOIN_HDCHAIN_H #include #include @@ -147,4 +147,4 @@ public: std::string GetKeyPath() const; }; -#endif // DASH_HDCHAIN_H +#endif // BITCOIN_HDCHAIN_H diff --git a/src/keepass.h b/src/keepass.h index 28210f3577..5a0658be27 100644 --- a/src/keepass.h +++ b/src/keepass.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef _KEEPASS_H_ -#define _KEEPASS_H_ +#ifndef BITCOIN_KEEPASS_H +#define BITCOIN_KEEPASS_H #include @@ -130,4 +130,4 @@ public: }; -#endif \ No newline at end of file +#endif // BITCOIN_KEEPASS_H \ No newline at end of file diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h index 542ee8a66f..f112143865 100644 --- a/src/llmq/quorums.h +++ b/src/llmq/quorums.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_H -#define DASH_QUORUMS_H +#ifndef BITCOIN_LLMQ_QUORUMS_H +#define BITCOIN_LLMQ_QUORUMS_H #include #include @@ -117,4 +117,4 @@ extern CQuorumManager* quorumManager; } // namespace llmq -#endif //DASH_QUORUMS_H +#endif // BITCOIN_LLMQ_QUORUMS_H diff --git a/src/llmq/quorums_blockprocessor.h b/src/llmq/quorums_blockprocessor.h index 4fb8ec29f4..46b47d846b 100644 --- a/src/llmq/quorums_blockprocessor.h +++ b/src/llmq/quorums_blockprocessor.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_BLOCKPROCESSOR_H -#define DASH_QUORUMS_BLOCKPROCESSOR_H +#ifndef BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H +#define BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H #include #include @@ -68,4 +68,4 @@ extern CQuorumBlockProcessor* quorumBlockProcessor; } // namespace llmq -#endif//DASH_QUORUMS_BLOCKPROCESSOR_H +#endif // BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H diff --git a/src/llmq/quorums_chainlocks.h b/src/llmq/quorums_chainlocks.h index 033f8041f7..d0a6ce8572 100644 --- a/src/llmq/quorums_chainlocks.h +++ b/src/llmq/quorums_chainlocks.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_CHAINLOCKS_H -#define DASH_QUORUMS_CHAINLOCKS_H +#ifndef BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H +#define BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H #include #include @@ -125,4 +125,4 @@ extern CChainLocksHandler* chainLocksHandler; } // namespace llmq -#endif //DASH_QUORUMS_CHAINLOCKS_H +#endif // BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H diff --git a/src/llmq/quorums_commitment.h b/src/llmq/quorums_commitment.h index 30f30334dd..2f2e83f059 100644 --- a/src/llmq/quorums_commitment.h +++ b/src/llmq/quorums_commitment.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_COMMITMENT_H -#define DASH_QUORUMS_COMMITMENT_H +#ifndef BITCOIN_LLMQ_QUORUMS_COMMITMENT_H +#define BITCOIN_LLMQ_QUORUMS_COMMITMENT_H #include @@ -143,4 +143,4 @@ bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev, } // namespace llmq -#endif //DASH_QUORUMS_COMMITMENT_H +#endif // BITCOIN_LLMQ_QUORUMS_COMMITMENT_H diff --git a/src/llmq/quorums_debug.h b/src/llmq/quorums_debug.h index 50c87c15d4..dfad178639 100644 --- a/src/llmq/quorums_debug.h +++ b/src/llmq/quorums_debug.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_DEBUG_H -#define DASH_QUORUMS_DEBUG_H +#ifndef BITCOIN_LLMQ_QUORUMS_DEBUG_H +#define BITCOIN_LLMQ_QUORUMS_DEBUG_H #include #include @@ -108,4 +108,4 @@ extern CDKGDebugManager* quorumDKGDebugManager; } // namespace llmq -#endif //DASH_QUORUMS_DEBUG_H +#endif // BITCOIN_LLMQ_QUORUMS_DEBUG_H diff --git a/src/llmq/quorums_dkgsession.h b/src/llmq/quorums_dkgsession.h index b70f7d7942..d04dad54f2 100644 --- a/src/llmq/quorums_dkgsession.h +++ b/src/llmq/quorums_dkgsession.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_DKGSESSION_H -#define DASH_QUORUMS_DKGSESSION_H +#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSION_H +#define BITCOIN_LLMQ_QUORUMS_DKGSESSION_H #include #include @@ -345,4 +345,4 @@ void SetSimulatedDKGErrorRate(const std::string& type, double rate); } // namespace llmq -#endif //DASH_QUORUMS_DKGSESSION_H +#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSION_H diff --git a/src/llmq/quorums_dkgsessionhandler.h b/src/llmq/quorums_dkgsessionhandler.h index 1b7430ae2a..b32ff41c8e 100644 --- a/src/llmq/quorums_dkgsessionhandler.h +++ b/src/llmq/quorums_dkgsessionhandler.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_DKGSESSIONHANDLER_H -#define DASH_QUORUMS_DKGSESSIONHANDLER_H +#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H +#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H #include @@ -145,4 +145,4 @@ private: } // namespace llmq -#endif //DASH_QUORUMS_DKGSESSIONHANDLER_H +#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H diff --git a/src/llmq/quorums_dkgsessionmgr.h b/src/llmq/quorums_dkgsessionmgr.h index 4e0d20d2f1..26df8a8de7 100644 --- a/src/llmq/quorums_dkgsessionmgr.h +++ b/src/llmq/quorums_dkgsessionmgr.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_DKGSESSIONMGR_H -#define DASH_QUORUMS_DKGSESSIONMGR_H +#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H +#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H #include @@ -75,4 +75,4 @@ extern CDKGSessionManager* quorumDKGSessionManager; } // namespace llmq -#endif //DASH_QUORUMS_DKGSESSIONMGR_H +#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H diff --git a/src/llmq/quorums_init.h b/src/llmq/quorums_init.h index d6e1622263..f3e55f0869 100644 --- a/src/llmq/quorums_init.h +++ b/src/llmq/quorums_init.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_INIT_H -#define DASH_QUORUMS_INIT_H +#ifndef BITCOIN_LLMQ_QUORUMS_INIT_H +#define BITCOIN_LLMQ_QUORUMS_INIT_H class CDBWrapper; class CEvoDB; @@ -24,4 +24,4 @@ void StopLLMQSystem(); void InterruptLLMQSystem(); } // namespace llmq -#endif //DASH_QUORUMS_INIT_H +#endif // BITCOIN_LLMQ_QUORUMS_INIT_H diff --git a/src/llmq/quorums_instantsend.h b/src/llmq/quorums_instantsend.h index e3d7dce0ad..033acf9124 100644 --- a/src/llmq/quorums_instantsend.h +++ b/src/llmq/quorums_instantsend.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 DASH_QUORUMS_INSTANTSEND_H -#define DASH_QUORUMS_INSTANTSEND_H +#ifndef BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H +#define BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H #include @@ -177,4 +177,4 @@ bool IsInstantSendEnabled(); } // namespace llmq -#endif//DASH_QUORUMS_INSTANTSEND_H +#endif // BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H diff --git a/src/llmq/quorums_signing.h b/src/llmq/quorums_signing.h index 6ec050f48e..7ffb33b4e2 100644 --- a/src/llmq/quorums_signing.h +++ b/src/llmq/quorums_signing.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_SIGNING_H -#define DASH_QUORUMS_SIGNING_H +#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_H +#define BITCOIN_LLMQ_QUORUMS_SIGNING_H #include @@ -191,4 +191,4 @@ extern CSigningManager* quorumSigningManager; } // namespace llmq -#endif //DASH_QUORUMS_SIGNING_H +#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_H diff --git a/src/llmq/quorums_signing_shares.h b/src/llmq/quorums_signing_shares.h index 59de650173..2b04eca042 100644 --- a/src/llmq/quorums_signing_shares.h +++ b/src/llmq/quorums_signing_shares.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_QUORUMS_SIGNING_SHARES_H -#define DASH_QUORUMS_SIGNING_SHARES_H +#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H +#define BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H #include #include @@ -460,4 +460,4 @@ extern CSigSharesManager* quorumSigSharesManager; } // namespace llmq -#endif //DASH_QUORUMS_SIGNING_SHARES_H +#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H diff --git a/src/llmq/quorums_utils.h b/src/llmq/quorums_utils.h index e960e9f916..2dea1a15da 100644 --- a/src/llmq/quorums_utils.h +++ b/src/llmq/quorums_utils.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 DASH_QUORUMS_UTILS_H -#define DASH_QUORUMS_UTILS_H +#ifndef BITCOIN_LLMQ_QUORUMS_UTILS_H +#define BITCOIN_LLMQ_QUORUMS_UTILS_H #include #include @@ -83,4 +83,4 @@ public: } // namespace llmq -#endif//DASH_QUORUMS_UTILS_H +#endif // BITCOIN_LLMQ_QUORUMS_UTILS_H diff --git a/src/masternode/activemasternode.h b/src/masternode/activemasternode.h index e78fa0c093..9ba60d78a8 100644 --- a/src/masternode/activemasternode.h +++ b/src/masternode/activemasternode.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef ACTIVEMASTERNODE_H -#define ACTIVEMASTERNODE_H +#ifndef BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H +#define BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H #include #include @@ -63,4 +63,4 @@ private: bool GetLocalAddress(CService& addrRet); }; -#endif +#endif // BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H diff --git a/src/masternode/masternode-meta.h b/src/masternode/masternode-meta.h index 92a64f5067..8d9e74b366 100644 --- a/src/masternode/masternode-meta.h +++ b/src/masternode/masternode-meta.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef MASTERNODE_META_H -#define MASTERNODE_META_H +#ifndef BITCOIN_MASTERNODE_MASTERNODE-META_H +#define BITCOIN_MASTERNODE_MASTERNODE-META_H #include @@ -158,4 +158,4 @@ public: extern CMasternodeMetaMan mmetaman; -#endif//MASTERNODE_META_H +#endif // BITCOIN_MASTERNODE_MASTERNODE-META_H diff --git a/src/masternode/masternode-payments.h b/src/masternode/masternode-payments.h index dade5c484b..a2bb7c6a20 100644 --- a/src/masternode/masternode-payments.h +++ b/src/masternode/masternode-payments.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef MASTERNODE_PAYMENTS_H -#define MASTERNODE_PAYMENTS_H +#ifndef BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H +#define BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H #include #include @@ -37,4 +37,4 @@ public: bool GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector& voutMasternodePaymentsRet) const; }; -#endif +#endif // BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H diff --git a/src/masternode/masternode-sync.h b/src/masternode/masternode-sync.h index 987dfd0423..db6b2af298 100644 --- a/src/masternode/masternode-sync.h +++ b/src/masternode/masternode-sync.h @@ -1,8 +1,8 @@ // Copyright (c) 2014-2019 The Dash Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef MASTERNODE_SYNC_H -#define MASTERNODE_SYNC_H +#ifndef BITCOIN_MASTERNODE_MASTERNODE-SYNC_H +#define BITCOIN_MASTERNODE_MASTERNODE-SYNC_H #include #include @@ -71,4 +71,4 @@ public: void DoMaintenance(CConnman &connman); }; -#endif +#endif // BITCOIN_MASTERNODE_MASTERNODE-SYNC_H diff --git a/src/masternode/masternode-utils.h b/src/masternode/masternode-utils.h index 5c9445a4d7..af6c7283ef 100644 --- a/src/masternode/masternode-utils.h +++ b/src/masternode/masternode-utils.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef MASTERNODE_UTILS_H -#define MASTERNODE_UTILS_H +#ifndef BITCOIN_MASTERNODE_MASTERNODE-UTILS_H +#define BITCOIN_MASTERNODE_MASTERNODE-UTILS_H #include @@ -16,4 +16,4 @@ public: static void DoMaintenance(CConnman &connman); }; -#endif//MASTERNODE_UTILS_H +#endif // BITCOIN_MASTERNODE_MASTERNODE-UTILS_H diff --git a/src/messagesigner.h b/src/messagesigner.h index 804bb4920a..b0923ff041 100644 --- a/src/messagesigner.h +++ b/src/messagesigner.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef MESSAGESIGNER_H -#define MESSAGESIGNER_H +#ifndef BITCOIN_MESSAGESIGNER_H +#define BITCOIN_MESSAGESIGNER_H #include @@ -35,4 +35,4 @@ public: static bool VerifyHash(const uint256& hash, const CKeyID& keyID, const std::vector& vchSig, std::string& strErrorRet); }; -#endif +#endif // BITCOIN_MESSAGESIGNER_H diff --git a/src/netfulfilledman.h b/src/netfulfilledman.h index 5e16e3f397..9e79ccdc42 100644 --- a/src/netfulfilledman.h +++ b/src/netfulfilledman.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef NETFULFILLEDMAN_H -#define NETFULFILLEDMAN_H +#ifndef BITCOIN_NETFULFILLEDMAN_H +#define BITCOIN_NETFULFILLEDMAN_H #include #include @@ -50,4 +50,4 @@ public: void DoMaintenance(); }; -#endif +#endif // BITCOIN_NETFULFILLEDMAN_H diff --git a/src/policy/fees.h b/src/policy/fees.h index 345832218d..9b5f5793b6 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -2,8 +2,8 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_POLICYESTIMATOR_H -#define BITCOIN_POLICYESTIMATOR_H +#ifndef BITCOIN_POLICY_FEES_H +#define BITCOIN_POLICY_FEES_H #include #include @@ -273,4 +273,4 @@ private: unsigned int MaxUsableEstimate() const; }; -#endif /*BITCOIN_POLICYESTIMATOR_H */ +#endif // BITCOIN_POLICY_FEES_H diff --git a/src/privatesend/privatesend-client.h b/src/privatesend/privatesend-client.h index 67bc26c3ac..33314b0da8 100644 --- a/src/privatesend/privatesend-client.h +++ b/src/privatesend/privatesend-client.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PRIVATESENDCLIENT_H -#define PRIVATESENDCLIENT_H +#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H +#define BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H #include #include @@ -261,4 +261,4 @@ public: void GetJsonInfo(UniValue& obj) const; }; -#endif +#endif // BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H diff --git a/src/privatesend/privatesend-server.h b/src/privatesend/privatesend-server.h index 2cced3bae9..0c361d2ede 100644 --- a/src/privatesend/privatesend-server.h +++ b/src/privatesend/privatesend-server.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PRIVATESENDSERVER_H -#define PRIVATESENDSERVER_H +#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H +#define BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H #include #include @@ -82,4 +82,4 @@ public: void GetJsonInfo(UniValue& obj) const; }; -#endif +#endif // BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H diff --git a/src/privatesend/privatesend-util.h b/src/privatesend/privatesend-util.h index 94f4ebb7bb..7c9b84f808 100644 --- a/src/privatesend/privatesend-util.h +++ b/src/privatesend/privatesend-util.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PRIVATESENDUTIL_H -#define PRIVATESENDUTIL_H +#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H +#define BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H #include @@ -34,4 +34,4 @@ public: void KeepAll(); void ReturnAll(); }; -#endif //PRIVATESENDUTIL_H +#endif // BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H diff --git a/src/privatesend/privatesend.h b/src/privatesend/privatesend.h index caf154417d..fccd7ba5e4 100644 --- a/src/privatesend/privatesend.h +++ b/src/privatesend/privatesend.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PRIVATESEND_H -#define PRIVATESEND_H +#ifndef BITCOIN_PRIVATESEND_PRIVATESEND_H +#define BITCOIN_PRIVATESEND_PRIVATESEND_H #include #include @@ -475,4 +475,4 @@ public: }; -#endif +#endif // BITCOIN_PRIVATESEND_PRIVATESEND_H diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h index 344fae7f99..83486ac600 100644 --- a/src/qt/masternodelist.h +++ b/src/qt/masternodelist.h @@ -1,5 +1,5 @@ -#ifndef MASTERNODELIST_H -#define MASTERNODELIST_H +#ifndef BITCOIN_QT_MASTERNODELIST_H +#define BITCOIN_QT_MASTERNODELIST_H #include #include @@ -76,4 +76,4 @@ private Q_SLOTS: void handleMasternodeListChanged(); void updateDIP3ListScheduled(); }; -#endif // MASTERNODELIST_H +#endif // BITCOIN_QT_MASTERNODELIST_H diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index 74a2db8ea2..8e5a259f68 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -2,6 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H +#define BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H + // // Data for paymentservertests.cpp // @@ -458,3 +461,5 @@ iEBFUrBDJZU+UEezGwr7/zoECjo5ZY3PmtZcM2sILNjyweJF6XVzGqTxUw6pN6sW\ XR2T3Gy2LzRvhVA25QgGqpz0/juS2BtmNbsZPkN9gMMwKimgzc+PuCzmEKwPK9cQ\ YQ==\ "; + +#endif // BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h index 04a9d124aa..98e56abb8e 100644 --- a/src/qt/test/rpcnestedtests.h +++ b/src/qt/test/rpcnestedtests.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_QT_TEST_RPC_NESTED_TESTS_H -#define BITCOIN_QT_TEST_RPC_NESTED_TESTS_H +#ifndef BITCOIN_QT_TEST_RPCNESTEDTESTS_H +#define BITCOIN_QT_TEST_RPCNESTEDTESTS_H #include #include @@ -19,4 +19,4 @@ class RPCNestedTests : public QObject void rpcNestedTests(); }; -#endif // BITCOIN_QT_TEST_RPC_NESTED_TESTS_H +#endif // BITCOIN_QT_TEST_RPCNESTEDTESTS_H diff --git a/src/qt/test/trafficgraphdatatests.h b/src/qt/test/trafficgraphdatatests.h index a9fc8ff5a4..c7032f0198 100644 --- a/src/qt/test/trafficgraphdatatests.h +++ b/src/qt/test/trafficgraphdatatests.h @@ -1,5 +1,5 @@ -#ifndef TRAFFICGRAPHDATATESTS_H -#define TRAFFICGRAPHDATATESTS_H +#ifndef BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H +#define BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H #include #include @@ -20,4 +20,4 @@ private Q_SLOTS: }; -#endif // TRAFFICGRAPHDATATESTS_H +#endif // BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H diff --git a/src/qt/trafficgraphdata.h b/src/qt/trafficgraphdata.h index 77e87bca05..7a401dea39 100644 --- a/src/qt/trafficgraphdata.h +++ b/src/qt/trafficgraphdata.h @@ -1,5 +1,5 @@ -#ifndef TRAFFICGRAPHDATA_H -#define TRAFFICGRAPHDATA_H +#ifndef BITCOIN_QT_TRAFFICGRAPHDATA_H +#define BITCOIN_QT_TRAFFICGRAPHDATA_H #include #include @@ -88,4 +88,4 @@ private: TrafficGraphData& operator=(TrafficGraphData const&); }; -#endif // TRAFFICGRAPHDATA_H +#endif // BITCOIN_QT_TRAFFICGRAPHDATA_H diff --git a/src/rpc/client.h b/src/rpc/client.h index 0b9fa648f7..0db79f2564 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_RPCCLIENT_H -#define BITCOIN_RPCCLIENT_H +#ifndef BITCOIN_RPC_CLIENT_H +#define BITCOIN_RPC_CLIENT_H #include @@ -19,4 +19,4 @@ UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector @@ -104,4 +104,4 @@ void DeleteAuthCookie(); /** Parse JSON-RPC batch reply into a vector */ std::vector JSONRPCProcessBatchReply(const UniValue &in, size_t num); -#endif // BITCOIN_RPCPROTOCOL_H +#endif // BITCOIN_RPC_PROTOCOL_H diff --git a/src/rpc/register.h b/src/rpc/register.h index 9a2a383aba..9368baf3e8 100644 --- a/src/rpc/register.h +++ b/src/rpc/register.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_RPCREGISTER_H -#define BITCOIN_RPCREGISTER_H +#ifndef BITCOIN_RPC_REGISTER_H +#define BITCOIN_RPC_REGISTER_H /** These are in one header file to avoid creating tons of single-function * headers for everything under src/rpc/ */ @@ -44,4 +44,4 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &t) RegisterQuorumsRPCCommands(t); } -#endif +#endif // BITCOIN_RPC_REGISTER_H diff --git a/src/rpc/server.h b/src/rpc/server.h index c4876b1223..1a8128703b 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_RPCSERVER_H -#define BITCOIN_RPCSERVER_H +#ifndef BITCOIN_RPC_SERVER_H +#define BITCOIN_RPC_SERVER_H #include #include @@ -195,4 +195,4 @@ void InterruptRPC(); void StopRPC(); std::string JSONRPCExecBatch(const JSONRPCRequest& jreq, const UniValue& vReq); -#endif // BITCOIN_RPCSERVER_H +#endif // BITCOIN_RPC_SERVER_H diff --git a/src/saltedhasher.h b/src/saltedhasher.h index 62c78f0f55..05304f208a 100644 --- a/src/saltedhasher.h +++ b/src/saltedhasher.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 SALTEDHASHER_H -#define SALTEDHASHER_H +#ifndef BITCOIN_SALTEDHASHER_H +#define BITCOIN_SALTEDHASHER_H #include #include @@ -72,4 +72,4 @@ struct StaticSaltedHasher } }; -#endif//SALTEDHASHER_H +#endif // BITCOIN_SALTEDHASHER_H diff --git a/src/script/dashconsensus.h b/src/script/dashconsensus.h index 6c2354f6c8..e8a2ecff8a 100644 --- a/src/script/dashconsensus.h +++ b/src/script/dashconsensus.h @@ -3,8 +3,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_BITCOINCONSENSUS_H -#define BITCOIN_BITCOINCONSENSUS_H +#ifndef BITCOIN_SCRIPT_DASHCONSENSUS_H +#define BITCOIN_SCRIPT_DASHCONSENSUS_H #include @@ -74,4 +74,4 @@ EXPORT_SYMBOL unsigned int dashconsensus_version(); #undef EXPORT_SYMBOL -#endif // BITCOIN_BITCOINCONSENSUS_H +#endif // BITCOIN_SCRIPT_DASHCONSENSUS_H diff --git a/src/spork.h b/src/spork.h index e5142f3b6a..46f2eb5a4a 100644 --- a/src/spork.h +++ b/src/spork.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef SPORK_H -#define SPORK_H +#ifndef BITCOIN_SPORK_H +#define BITCOIN_SPORK_H #include #include @@ -300,4 +300,4 @@ public: std::string ToString() const; }; -#endif +#endif // BITCOIN_SPORK_H diff --git a/src/stacktraces.h b/src/stacktraces.h index ff34cd6ccc..debf8427ad 100644 --- a/src/stacktraces.h +++ b/src/stacktraces.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef DASH_STACKTRACES_H -#define DASH_STACKTRACES_H +#ifndef BITCOIN_STACKTRACES_H +#define BITCOIN_STACKTRACES_H #include #include @@ -39,4 +39,4 @@ inline std::string GetExceptionWhat(const T& e) void RegisterPrettyTerminateHander(); void RegisterPrettySignalHandlers(); -#endif//DASH_STACKTRACES_H +#endif//BITCOIN_STACKTRACES_H diff --git a/src/unordered_lru_cache.h b/src/unordered_lru_cache.h index dc75b18f43..385da8246b 100644 --- a/src/unordered_lru_cache.h +++ b/src/unordered_lru_cache.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 DASH_UNORDERED_LRU_CACHE_H -#define DASH_UNORDERED_LRU_CACHE_H +#ifndef BITCOIN_UNORDERED_LRU_CACHE_H +#define BITCOIN_UNORDERED_LRU_CACHE_H #include @@ -107,4 +107,4 @@ private: } }; -#endif // DASH_UNORDERED_LRU_CACHE_H +#endif // BITCOIN_UNORDERED_LRU_CACHE_H diff --git a/src/versionbits.h b/src/versionbits.h index 0877fe5eab..ea09cd9af2 100644 --- a/src/versionbits.h +++ b/src/versionbits.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_CONSENSUS_VERSIONBITS -#define BITCOIN_CONSENSUS_VERSIONBITS +#ifndef BITCOIN_VERSIONBITS_H +#define BITCOIN_VERSIONBITS_H #include #include @@ -79,4 +79,4 @@ BIP9Stats VersionBitsStatistics(const CBlockIndex* pindexPrev, const Consensus:: int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache); uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos); -#endif +#endif // BITCOIN_VERSIONBITS_H diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index 028604749f..845e168cf0 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.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_WALLET_TEST_FIXTURE_H -#define BITCOIN_WALLET_TEST_FIXTURE_H +#ifndef BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H +#define BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H #include @@ -20,5 +20,4 @@ struct WalletTestingSetup: public TestingSetup { CWallet m_wallet; }; -#endif - +#endif // BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h index 50ff736402..f12acacd00 100644 --- a/src/wallet/walletutil.h +++ b/src/wallet/walletutil.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_WALLET_UTIL_H -#define BITCOIN_WALLET_UTIL_H +#ifndef BITCOIN_WALLET_WALLETUTIL_H +#define BITCOIN_WALLET_WALLETUTIL_H #include #include @@ -11,4 +11,4 @@ //! Get the path of the wallet directory. fs::path GetWalletDir(); -#endif // BITCOIN_WALLET_UTIL_H +#endif // BITCOIN_WALLET_WALLETUTIL_H diff --git a/src/walletinitinterface.h b/src/walletinitinterface.h index f83bc342a1..770ec41c9f 100644 --- a/src/walletinitinterface.h +++ b/src/walletinitinterface.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 WALLETINITINTERFACE_H -#define WALLETINITINTERFACE_H +#ifndef BITCOIN_WALLETINITINTERFACE_H +#define BITCOIN_WALLETINITINTERFACE_H #include @@ -40,4 +40,4 @@ public: virtual ~WalletInitInterface() {} }; -#endif // WALLETINITINTERFACE_H +#endif // BITCOIN_WALLETINITINTERFACE_H