fix headers

peercoin · Feb 27, 2019 · 96545e8 · 96545e8
1 parent 9fdfba4
commit 96545e8
Show file tree

Hide file tree

Showing 22 changed files with 91 additions and 59 deletions.
diff --git a/src/bech32.h b/src/bech32.h
@@ -9,6 +9,9 @@
 //
 // For more information, see BIP 173.
 
+#ifndef BITCOIN_BECH32_H
+#define BITCOIN_BECH32_H
+
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ -23,3 +26,5 @@ std::string Encode(const std::string& hrp, const std::vector<uint8_t>& values);
 std::pair<std::string, std::vector<uint8_t>> Decode(const std::string& str);
 
 } // namespace bech32
+
+#endif // BITCOIN_BECH32_H
diff --git 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 <stdint.h>
 
@@ -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/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 <primitives/block.h>
 
@@ -206,4 +206,4 @@ class PartiallyDownloadedBlock {
     ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
 };
 
-#endif
+#endif // BITCOIN_BLOCKENCODINGS_H
diff --git a/src/checkpointsync.h b/src/checkpointsync.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2012-2019 The Peercoin developers
 // Distributed under conditional MIT/X11 open source software license
 // see the accompanying file COPYING
-#ifndef PPCOIN_CHECKPOINTSYNC_H
-#define  PPCOIN_CHECKPOINTSYNC_H
+#ifndef PEERCOIN_CHECKPOINTSYNC_H
+#define PEERCOIN_CHECKPOINTSYNC_H
 
 #define CHECKPOINT_MAX_SPAN (60 * 60 * 4) // max 4 hours before latest block
 
@@ -126,4 +126,4 @@ class CSyncCheckpoint : public CUnsignedSyncCheckpoint
     bool ProcessSyncCheckpoint(CNode* pfrom);
 };
 
-#endif
+#endif // PEERCOIN_CHECKPOINTSYNC_H
diff --git 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 <stdint.h>
 #include <vector>
@@ -35,4 +35,4 @@ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = nullptr);
  */
 std::vector<uint256> BlockMerkleBranch(const CBlock& block, uint32_t position);
 
-#endif
+#endif // BITCOIN_CONSENSUS_MERKLE_H
diff --git a/src/kernel.h b/src/kernel.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2012-2019 The Peercoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef PPCOIN_KERNEL_H
-#define PPCOIN_KERNEL_H
+#ifndef PEERCOIN_KERNEL_H
+#define PEERCOIN_KERNEL_H
 
 #include <primitives/transaction.h> // CTransaction(Ref)
 
@@ -59,4 +59,4 @@ bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRe
 // peercoin: entropy bit for stake modifier if chosen by modifier
 unsigned int GetStakeEntropyBit(const CBlock& block);
 
-#endif // PPCOIN_KERNEL_H
+#endif // PEERCOIN_KERNEL_H
diff --git a/src/kernelrecord.h b/src/kernelrecord.h
@@ -1,5 +1,8 @@
-#ifndef KERNELRECORD_H
-#define KERNELRECORD_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_KERNELRECORD_H
+#define PEERCOIN_KERNELRECORD_H
 
 #include <uint256.h>
 
@@ -49,4 +52,4 @@ class KernelRecord
     double prevProbability;
 };
 
-#endif // KERNELRECORD_H
+#endif // PEERCOIN_KERNELRECORD_H
diff --git a/src/qt/mintingfilterproxy.h b/src/qt/mintingfilterproxy.h
@@ -1,5 +1,8 @@
-#ifndef MINTINGFILTERPROXY_H
-#define MINTINGFILTERPROXY_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MINTINGFILTERPROXY_H
+#define PEERCOIN_QT_MINTINGFILTERPROXY_H
 
 #include <QSortFilterProxyModel>
 
@@ -10,4 +13,4 @@ class MintingFilterProxy : public QSortFilterProxyModel
     explicit MintingFilterProxy(QObject *parent = 0);
 };
 
-#endif // MINTINGFILTERPROXY_H
+#endif // PEERCOIN_QT_MINTINGFILTERPROXY_H
diff --git a/src/qt/mintingtablemodel.h b/src/qt/mintingtablemodel.h
@@ -1,5 +1,8 @@
-#ifndef MINTINGTABLEMODEL_H
-#define MINTINGTABLEMODEL_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MINTINGTABLEMODEL_H
+#define PEERCOIN_QT_MINTINGTABLEMODEL_H
 
 #include <QAbstractTableModel>
 #include <QStringList>
@@ -66,4 +69,4 @@ public Q_SLOTS:
     friend class MintingTablePriv;
 };
 
-#endif // MINTINGTABLEMODEL_H
+#endif // PEERCOIN_QT_MINTINGTABLEMODEL_H
diff --git a/src/qt/mintingview.h b/src/qt/mintingview.h
@@ -1,5 +1,8 @@
-#ifndef MINTINGVIEW_H
-#define MINTINGVIEW_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MINTINGVIEW_H
+#define PEERCOIN_QT_MINTINGVIEW_H
 
 #include <QWidget>
 #include <QComboBox>
@@ -47,4 +50,4 @@ public Q_SLOTS:
     void chooseMintingInterval(int idx);
 };
 
-#endif // MINTINGVIEW_H
+#endif // PEERCOIN_QT_MINTINGVIEW_H
diff --git a/src/qt/multisigaddressentry.h b/src/qt/multisigaddressentry.h
@@ -1,5 +1,8 @@
-#ifndef MULTISIGADDRESSENTRY_H
-#define MULTISIGADDRESSENTRY_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MULTISIGADDRESSENTRY_H
+#define PEERCOIN_QT_MULTISIGADDRESSENTRY_H
 
 #include <QFrame>
 
@@ -42,4 +45,4 @@ class MultisigAddressEntry : public QFrame
     void on_addressBookButton_clicked();
 };
 
-#endif // MULTISIGADDRESSENTRY_H
+#endif // PEERCOIN_QT_MULTISIGADDRESSENTRY_H
diff --git a/src/qt/multisigdialog.h b/src/qt/multisigdialog.h
@@ -1,5 +1,8 @@
-#ifndef MULTISIGDIALOG_H
-#define MULTISIGDIALOG_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MULTISIGDIALOG_H
+#define PEERCOIN_QT_MULTISIGDIALOG_H
 
 //#include "multisigaddressentry.h"
 //#include "multisiginputentry.h"
@@ -60,4 +63,4 @@ class MultisigDialog : public QDialog
     void updateAmounts();
 };
 
-#endif // MULTISIGDIALOG_H
+#endif // PEERCOIN_QT_MULTISIGDIALOG_H
diff --git a/src/qt/multisiginputentry.h b/src/qt/multisiginputentry.h
@@ -1,5 +1,8 @@
-#ifndef MULTISIGINPUTENTRY_H
-#define MULTISIGINPUTENTRY_H
+// Copyright (c) 2012-2019 The Peercoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef PEERCOIN_QT_MULTISIGINPUTENTRY_H
+#define PEERCOIN_QT_MULTISIGINPUTENTRY_H
 
 #include <uint256.h>
 
@@ -49,4 +52,4 @@ class MultisigInputEntry : public QFrame
     void on_pasteRedeemScriptButton_clicked();
 };
 
-#endif // MULTISIGINPUTENTRY_H
+#endif // PEERCOIN_QT_MULTISIGINPUTENTRY_H
diff --git 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,6 @@ 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
@@ -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 <QObject>
 #include <QTest>
@@ -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/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 <univalue.h>
 
@@ -19,4 +19,4 @@ UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<s
  */
 UniValue ParseNonRFCJSONValue(const std::string& strVal);
 
-#endif // BITCOIN_RPCCLIENT_H
+#endif // BITCOIN_RPC_CLIENT_H
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.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_RPCPROTOCOL_H
-#define BITCOIN_RPCPROTOCOL_H
+#ifndef BITCOIN_RPC_PROTOCOL_H
+#define BITCOIN_RPC_PROTOCOL_H
 
 #include <fs.h>
 
@@ -104,4 +104,4 @@ void DeleteAuthCookie();
 /** Parse JSON-RPC batch reply into a vector */
 std::vector<UniValue> 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
@@ -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/ */

diff --git 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 <amount.h>
 #include <rpc/protocol.h>
@@ -196,4 +196,4 @@ std::string JSONRPCExecBatch(const JSONRPCRequest& jreq, const UniValue& vReq);
 // Retrieves any serialization flags requested in command line argument
 int RPCSerializationFlags();
 
-#endif // BITCOIN_RPCSERVER_H
+#endif // BITCOIN_RPC_SERVER_H
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.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_BITCOINCONSENSUS_H
+#define BITCOIN_SCRIPT_BITCOINCONSENSUS_H
 
 #include <stdint.h>
 
@@ -80,4 +80,4 @@ EXPORT_SYMBOL unsigned int bitcoinconsensus_version();
 
 #undef EXPORT_SYMBOL
 
-#endif // BITCOIN_BITCOINCONSENSUS_H
+#endif // BITCOIN_SCRIPT_BITCOINCONSENSUS_H
diff --git 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 <test/test_bitcoin.h>
 
@@ -20,5 +20,5 @@ struct WalletTestingSetup: public TestingSetup {
     std::unique_ptr<CWallet> pwalletMain;
 };
 
-#endif
+#endif // BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H
 
diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h
@@ -2,13 +2,13 @@
 // 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 <chainparamsbase.h>
 #include <util.h>
 
 //! Get the path of the wallet directory.
 fs::path GetWalletDir();
 
-#endif // BITCOIN_WALLET_UTIL_H
+#endif // BITCOIN_WALLET_WALLETUTIL_H