From 771d500283129cf19d14045a58d0e2fb0ce2cba1 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 31 Oct 2014 09:36:30 +0100 Subject: [PATCH] minor cleanup: include orders, end comments etc. - no code changes --- src/Makefile.test.include | 8 ++++---- src/ecwrapper.cpp | 2 +- src/ecwrapper.h | 4 ++-- src/main.h | 16 +++++++--------- src/qt/optionsdialog.h | 5 ++++- src/rpcblockchain.cpp | 2 +- src/rpcserver.h | 2 +- src/txmempool.cpp | 6 +++--- src/utilstrencodings.cpp | 4 ++-- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 340eb9f1a..6a8d9e58a 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -42,8 +42,8 @@ BITCOIN_TESTS =\ test/bloom_tests.cpp \ test/checkblock_tests.cpp \ test/Checkpoints_tests.cpp \ - test/compress_tests.cpp \ test/coins_tests.cpp \ + test/compress_tests.cpp \ test/crypto_tests.cpp \ test/DoS_tests.cpp \ test/getarg_tests.cpp \ @@ -58,7 +58,9 @@ BITCOIN_TESTS =\ test/rpc_tests.cpp \ test/script_P2SH_tests.cpp \ test/script_tests.cpp \ + test/scriptnum_tests.cpp \ test/serialize_tests.cpp \ + test/sighash_tests.cpp \ test/sigopcount_tests.cpp \ test/skiplist_tests.cpp \ test/test_bitcoin.cpp \ @@ -66,9 +68,7 @@ BITCOIN_TESTS =\ test/transaction_tests.cpp \ test/uint256_tests.cpp \ test/univalue_tests.cpp \ - test/util_tests.cpp \ - test/scriptnum_tests.cpp \ - test/sighash_tests.cpp + test/util_tests.cpp if ENABLE_WALLET BITCOIN_TESTS += \ diff --git a/src/ecwrapper.cpp b/src/ecwrapper.cpp index e5db67092..ebaa35026 100644 --- a/src/ecwrapper.cpp +++ b/src/ecwrapper.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Distributed under the MIT/X11 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. #include "ecwrapper.h" diff --git a/src/ecwrapper.h b/src/ecwrapper.h index 072da4a94..e2d1e7edc 100644 --- a/src/ecwrapper.h +++ b/src/ecwrapper.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Distributed under the MIT/X11 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. #ifndef BITCOIN_EC_WRAPPER_H @@ -43,4 +43,4 @@ public: static bool SanityCheck(); }; -#endif +#endif // BITCOIN_EC_WRAPPER_H diff --git a/src/main.h b/src/main.h index 1941ca705..e5ce924a4 100644 --- a/src/main.h +++ b/src/main.h @@ -39,8 +39,15 @@ #include class CBlockIndex; +class CBlockTreeDB; class CBloomFilter; class CInv; +class CScriptCheck; +class CValidationInterface; +class CValidationState; + +struct CBlockTemplate; +struct CNodeStateStats; /** The maximum allowed size for a serialized block, in bytes (network rule) */ static const unsigned int MAX_BLOCK_SIZE = 1000000; @@ -128,15 +135,6 @@ extern CBlockIndex *pindexBestHeader; // Minimum disk space required - used in CheckDiskSpace() static const uint64_t nMinDiskSpace = 52428800; - -class CBlockTreeDB; -class CScriptCheck; -class CValidationState; -class CValidationInterface; -struct CNodeStateStats; - -struct CBlockTemplate; - /** Register a wallet to receive updates from core */ void RegisterValidationInterface(CValidationInterface* pwalletIn); /** Unregister a wallet from core */ diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index 39c53f439..2abd92cae 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -7,10 +7,13 @@ #include -class QDataWidgetMapper; class OptionsModel; class QValidatedLineEdit; +QT_BEGIN_NAMESPACE +class QDataWidgetMapper; +QT_END_NAMESPACE + namespace Ui { class OptionsDialog; } diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 78f556989..a7cd63bd9 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -474,7 +474,7 @@ struct CompareBlocksByHeight bool operator()(const CBlockIndex* a, const CBlockIndex* b) const { /* Make sure that unequal blocks with the same height do not compare - equal. Use the pointers themselves to make a distinction. */ + equal. Use the pointers themselves to make a distinction. */ if (a->nHeight != b->nHeight) return (a->nHeight > b->nHeight); diff --git a/src/rpcserver.h b/src/rpcserver.h index cc444cef1..dc4663739 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -7,8 +7,8 @@ #define _BITCOINRPC_SERVER_H_ #include "amount.h" -#include "uint256.h" #include "rpcprotocol.h" +#include "uint256.h" #include #include diff --git a/src/txmempool.cpp b/src/txmempool.cpp index d3d9cb8a0..b5070d510 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -332,7 +332,7 @@ public: size_t numEntries; filein >> numEntries; if (numEntries <= 0 || numEntries > 10000) - throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires."); + throw runtime_error("Corrupt estimates file. Must have between 1 and 10k entires."); std::vector fileHistory; @@ -343,8 +343,8 @@ public: fileHistory.push_back(entry); } - //Now that we've processed the entire fee estimate data file and not - //thrown any errors, we can copy it to our history + // Now that we've processed the entire fee estimate data file and not + // thrown any errors, we can copy it to our history nBestSeenHeight = nFileBestSeenHeight; history = fileHistory; assert(history.size() > 0); diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp index 81e156f43..15094e599 100644 --- a/src/utilstrencodings.cpp +++ b/src/utilstrencodings.cpp @@ -7,10 +7,10 @@ #include "tinyformat.h" -#include -#include #include #include +#include +#include using namespace std;