Merge pull request #5186

771d500 minor cleanup: include orders, end comments etc. (Philip Kaufmann)

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 += \

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"

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

src/main.h

@@ -39,8 +39,15 @@
 #include <boost/unordered_map.hpp>
 
 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 */

src/qt/optionsdialog.h

@@ -7,10 +7,13 @@
 
 #include <QDialog>
 
-class QDataWidgetMapper;
 class OptionsModel;
 class QValidatedLineEdit;
 
+QT_BEGIN_NAMESPACE
+class QDataWidgetMapper;
+QT_END_NAMESPACE
+
 namespace Ui {
 class OptionsDialog;
 }

src/rpcserver.h

@@ -7,8 +7,8 @@
 #define _BITCOINRPC_SERVER_H_
 
 #include "amount.h"
-#include "uint256.h"
 #include "rpcprotocol.h"
+#include "uint256.h"
 
 #include <list>
 #include <map>

src/utilstrencodings.cpp

@@ -7,10 +7,10 @@
 
 #include "tinyformat.h"
 
-#include <errno.h>
-#include <limits>
 #include <cstdlib>
 #include <cstring>
+#include <errno.h>
+#include <limits>
 
 using namespace std;