From 4d9684c7861eb9664f8c02f6f2e8e76945a17ed0 Mon Sep 17 00:00:00 2001 From: svost Date: Sun, 11 Feb 2024 01:08:00 +0300 Subject: [PATCH] Includes cleanup --- src/checkpoints.cpp | 2 -- src/init.cpp | 1 - src/kernel.cpp | 1 - src/keystore.cpp | 2 +- src/noui.cpp | 2 -- src/ntp.cpp | 2 -- src/rpcblockchain.cpp | 3 +-- src/rpcnet.cpp | 1 - src/script.cpp | 1 - src/stun.cpp | 7 ------- src/timedata.cpp | 1 - src/txdb-leveldb.h | 2 +- src/uint256.cpp | 2 -- src/walletdb.cpp | 3 --- 14 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index ab3c7f7..777f179 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -6,8 +6,6 @@ #include "main.h" #include "txdb-leveldb.h" -#include - namespace Checkpoints { diff --git a/src/init.cpp b/src/init.cpp index 5b1ee2a..dddb575 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -15,7 +15,6 @@ #include "interface.h" #include "checkpoints.h" -#include #include #include #include diff --git a/src/kernel.cpp b/src/kernel.cpp index 639547c..a1feab8 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -6,7 +6,6 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "kernel.h" -#include "wallet.h" #include "kernel_worker.h" #include "txdb-leveldb.h" diff --git a/src/keystore.cpp b/src/keystore.cpp index 69dfb6e..b5d3d0c 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -266,7 +266,7 @@ bool CCryptoKeyStore::CreatePrivKey(const CPubKey &pubKeyVariant, const CPubKey return false; CMalleableKey mKey = mi->first.GetMalleableKey(vchSecretH); - return mKey.CheckKeyVariant(R, pubKeyVariant, privKey);; + return mKey.CheckKeyVariant(R, pubKeyVariant, privKey); } } diff --git a/src/noui.cpp b/src/noui.cpp index 8643715..50422d3 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -5,8 +5,6 @@ #include "interface.h" -#include - static int noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style) { printf("%s: %s\n", caption.c_str(), message.c_str()); diff --git a/src/ntp.cpp b/src/ntp.cpp index 4dfcb7c..65d6f50 100644 --- a/src/ntp.cpp +++ b/src/ntp.cpp @@ -4,8 +4,6 @@ #include #include #include -#include -#include #endif #ifndef WIN32 #include diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 5dec626..c537a46 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -8,7 +8,6 @@ #include #include #include -#include using namespace json_spirit; using namespace std; @@ -77,7 +76,7 @@ double GetPoSKernelPS() double dStakeKernelsTriedAvg = 0; int nStakesHandled = 0, nStakesTime = 0; - CBlockIndex* pindex = pindexBest;; + CBlockIndex* pindex = pindexBest; CBlockIndex* pindexPrevStake = NULL; while (pindex && nStakesHandled < nPoSInterval) diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 4bb82a7..f4519b9 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -6,7 +6,6 @@ #include "alert.h" #include "wallet.h" #include "db.h" -#include "walletdb.h" #include "net.h" #include "ntp.h" diff --git a/src/script.cpp b/src/script.cpp index aa3fe8c..3acda33 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -8,7 +8,6 @@ #include "key.h" #include "main.h" #include "random.h" -#include "sync.h" #include "util.h" #include "base58.h" diff --git a/src/stun.cpp b/src/stun.cpp index 746c72c..16e55bc 100644 --- a/src/stun.cpp +++ b/src/stun.cpp @@ -28,10 +28,8 @@ * Of course all fields are in network format. */ -#include #include #include -#include #include #include #ifdef WIN32 @@ -39,14 +37,9 @@ #else #include #include -#include #include #endif -#ifndef WIN32 -#include -#endif #include -#include #include "ministun.h" #include "netbase.h" diff --git a/src/timedata.cpp b/src/timedata.cpp index 8e5162f..c609f81 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -3,7 +3,6 @@ #include "sync.h" #include "interface.h" -#include static CCriticalSection cs_nTimeOffset; static uint32_t NOVACOIN_TIMEDATA_MAX_SAMPLES = 200; diff --git a/src/txdb-leveldb.h b/src/txdb-leveldb.h index ef8b1fd..8dbd952 100644 --- a/src/txdb-leveldb.h +++ b/src/txdb-leveldb.h @@ -213,4 +213,4 @@ public: }; -#endif // BITCOIN_DB_H +#endif // BITCOIN_LEVELDB_H diff --git a/src/uint256.cpp b/src/uint256.cpp index 8faf052..7e140a0 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -6,9 +6,7 @@ #include "uint256.h" #include -#include #include -#include ////////////////////////////////////////////////////////////////////////////// diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 2353df9..de2eb7a 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -10,9 +10,6 @@ #include #include -#include -#include - static uint64_t nAccountingEntryNumber = 0; extern bool fWalletUnlockMintOnly; -- 1.7.1