masternodeconfig files code styling cleanup.

furszy · furszy · commit fbf7efb56bb8 · 2020-11-05T10:48:15.000-03:00
diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2014-2015 The Dash developers
 // Copyright (c) 2015-2019 The PIVX developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include "netbase.h"
 #include "masternodeconfig.h"
diff --git a/src/masternodeconfig.h b/src/masternodeconfig.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2014-2015 The Dash developers
 // Copyright (c) 2015-2019 The PIVX developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #ifndef SRC_MASTERNODECONFIG_H_
 #define SRC_MASTERNODECONFIG_H_
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-
 class CMasternodeConfig;
 extern CMasternodeConfig masternodeConfig;
 
@@ -28,88 +27,31 @@ class CMasternodeConfig
         std::string outputIndex;
 
     public:
-        CMasternodeEntry(std::string alias, std::string ip, std::string privKey, std::string txHash, std::string outputIndex)
-        {
-            this->alias = alias;
-            this->ip = ip;
-            this->privKey = privKey;
-            this->txHash = txHash;
-            this->outputIndex = outputIndex;
-        }
-
-        const std::string& getAlias() const
-        {
-            return alias;
-        }
-
-        void setAlias(const std::string& alias)
-        {
-            this->alias = alias;
-        }
-
-        const std::string& getOutputIndex() const
-        {
-            return outputIndex;
-        }
+        CMasternodeEntry(std::string& _alias, std::string& _ip, std::string& _privKey, std::string& _txHash, std::string& _outputIndex) :
+            alias(_alias), ip(_ip), privKey(_privKey), txHash(_txHash), outputIndex(_outputIndex) { }
 
+        const std::string& getAlias() const { return alias; }
+        const std::string& getOutputIndex() const { return outputIndex; }
         bool castOutputIndex(int& n) const;
-
-        void setOutputIndex(const std::string& outputIndex)
-        {
-            this->outputIndex = outputIndex;
-        }
-
-        const std::string& getPrivKey() const
-        {
-            return privKey;
-        }
-
-        void setPrivKey(const std::string& privKey)
-        {
-            this->privKey = privKey;
-        }
-
-        const std::string& getTxHash() const
-        {
-            return txHash;
-        }
-
-        void setTxHash(const std::string& txHash)
-        {
-            this->txHash = txHash;
-        }
-
-        const std::string& getIp() const
-        {
-            return ip;
-        }
-
-        void setIp(const std::string& ip)
-        {
-            this->ip = ip;
-        }
+        const std::string& getPrivKey() const { return privKey; }
+        const std::string& getTxHash() const { return txHash; }
+        const std::string& getIp() const { return ip; }
     };
 
-    CMasternodeConfig()
-    {
-        entries = std::vector<CMasternodeEntry>();
-    }
+    CMasternodeConfig() { entries = std::vector<CMasternodeEntry>(); }
 
-    void clear();
+    void clear() { entries.clear(); }
     bool read(std::string& strErr);
     CMasternodeConfig::CMasternodeEntry* add(std::string alias, std::string ip, std::string privKey, std::string txHash, std::string outputIndex);
     void remove(std::string alias);
 
-    std::vector<CMasternodeEntry>& getEntries()
-    {
-        return entries;
-    }
+    std::vector<CMasternodeEntry>& getEntries() { return entries; }
 
     int getCount()
     {
         int c = -1;
-        for (CMasternodeEntry e : entries) {
-            if (e.getAlias() != "") c++;
+        for (const auto& e : entries) {
+            if (!e.getAlias().empty()) c++;
         }
         return c;
     }
