Perform member initialization in initialization lists where possible

practicalswift · practicalswift · commit 656dbd871ae5 · 2017-06-04T01:09:48.000+02:00
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -129,10 +129,7 @@ struct CBlockLocator
 
     CBlockLocator() {}
 
-    CBlockLocator(const std::vector<uint256>& vHaveIn)
-    {
-        vHave = vHaveIn;
-    }
+    CBlockLocator(const std::vector<uint256>& vHaveIn) : vHave(vHaveIn) {}
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -151,11 +151,7 @@ CInv::CInv()
     hash.SetNull();
 }
 
-CInv::CInv(int typeIn, const uint256& hashIn)
-{
-    type = typeIn;
-    hash = hashIn;
-}
+CInv::CInv(int typeIn, const uint256& hashIn) : type(typeIn), hash(hashIn) {}
 
 bool operator<(const CInv& a, const CInv& b)
 {
diff --git a/src/rpc/server.h b/src/rpc/server.h
@@ -50,7 +50,7 @@ class JSONRPCRequest
     std::string URI;
     std::string authUser;
 
-    JSONRPCRequest() { id = NullUniValue; params = NullUniValue; fHelp = false; }
+    JSONRPCRequest() : id(NullUniValue), params(NullUniValue), fHelp(false) {}
     void parse(const UniValue& valRequest);
 };
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -136,10 +136,7 @@ class CAddressBookData
     std::string name;
     std::string purpose;
 
-    CAddressBookData()
-    {
-        purpose = "unknown";
-    }
+    CAddressBookData() : purpose("unknown") {}
 
     typedef std::map<std::string, std::string> StringMap;
     StringMap destdata;

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,7 @@ CInv::CInv()`
`151`	`151`	`hash.SetNull();`
`152`	`152`	`}`
`153`	`153`
`154`		`-CInv::CInv(int typeIn, const uint256& hashIn)`
`155`		`-{`
`156`		`- type = typeIn;`
`157`		`- hash = hashIn;`
`158`		`-}`
	`154`	`+CInv::CInv(int typeIn, const uint256& hashIn) : type(typeIn), hash(hashIn) {}`
`159`	`155`
`160`	`156`	`bool operator<(const CInv& a, const CInv& b)`
`161`	`157`	`{`