Merge pull request #379 from svost/c++11

[novacoin.git] / src / wallet.h

diff --git a/src/wallet.h b/src/wallet.h
index 8298f78..fbcd5c1 100644 (file)
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -7,8 +7,7 @@
 
 #include <string>
 #include <vector>
-
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "main.h"
 #include "key.h"
@@ -21,12 +20,16 @@
 
 extern bool fWalletUnlockMintOnly;
 extern bool fConfChange;
+
 class CAccountingEntry;
 class CWalletTx;
 class CReserveKey;
 class COutput;
 class CCoinControl;
 
+//Settings
+extern int64_t nTransactionFee;
+
 // Set of selected transactions
 typedef std::set<std::pair<const CWalletTx*,unsigned int> > CoinsSet;
 
@@ -216,7 +219,6 @@ public:
 
     bool NewKeyPool(unsigned int nSize = 0);
     bool TopUpKeyPool(unsigned int nSize = 0);
-    int64_t AddReserveKey(const CKeyPool& keypool);
     void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool);
     void KeepKey(int64_t nIndex);
     void ReturnKey(int64_t nIndex);