UI: replace vector with set for wallet property list (thanks @dexX7)

zathras-crypto · zathras-crypto · commit a0f3a143a38e · 2015-06-12T14:01:11.000+10:00
diff --git a/src/omnicore/omnicore.cpp b/src/omnicore/omnicore.cpp
@@ -110,7 +110,7 @@ std::map<uint32_t, int64_t> global_balance_money;
 //! Reserved balances of wallet propertiess
 std::map<uint32_t, int64_t> global_balance_reserved;
 //! Vector containing a list of properties relative to the wallet
-std::vector<uint32_t> global_wallet_property_list;
+std::set<uint32_t> global_wallet_property_list;
 
 /**
  * Used to indicate, whether to automatically commit created transactions.
@@ -620,10 +620,8 @@ void mastercore::set_wallet_totals()
         my_it->second.init();
         uint32_t propertyId;
         while (0 != (propertyId = (my_it->second).next())) {
-            // add to the global wallet property list (avoiding duplicates)
-            if (std::find(global_wallet_property_list.begin(), global_wallet_property_list.end(), propertyId) == global_wallet_property_list.end()) {
-                global_wallet_property_list.push_back(propertyId);
-            }
+            // add to the global wallet property list
+            global_wallet_property_list.insert(propertyId);
 
             // check if the address is spendable (only spendable balances are included in totals)
             if (addressIsMine != ISMINE_SPENDABLE) continue;
@@ -635,9 +633,6 @@ void mastercore::set_wallet_totals()
             global_balance_reserved[propertyId] += getMPbalance(address, propertyId, ACCEPT_RESERVE);
         }
     }
-
-    // sort the global wallet property list
-    std::sort (global_wallet_property_list.begin(), global_wallet_property_list.end());
 }
 
 int TXExodusFundraiser(const CTransaction &wtx, const string &sender, int64_t ExodusHighestValue, int nBlock, unsigned int nTime)
diff --git a/src/omnicore/omnicore.h b/src/omnicore/omnicore.h
@@ -28,6 +28,7 @@ class CTransaction;
 #include <map>
 #include <string>
 #include <vector>
+#include <set>
 
 using json_spirit::Array;
 
@@ -387,7 +388,7 @@ extern std::map<uint32_t, int64_t> global_balance_money;
 //! Reserved balances of wallet propertiess
 extern std::map<uint32_t, int64_t> global_balance_reserved;
 //! Vector containing a list of properties relative to the wallet
-extern std::vector<uint32_t> global_wallet_property_list;
+extern std::set<uint32_t> global_wallet_property_list;
 
 
 int64_t getMPbalance(const string &Address, uint32_t property, TallyType ttype);
diff --git a/src/qt/balancesdialog.cpp b/src/qt/balancesdialog.cpp
@@ -137,7 +137,7 @@ void BalancesDialog::UpdatePropSelector()
     ui->propSelectorWidget->clear();
     ui->propSelectorWidget->addItem("Wallet Totals (Summary)","2147483646"); //use last possible ID for summary for now
     // populate property selector
-    for (std::vector<uint32_t>::iterator it = global_wallet_property_list.begin() ; it != global_wallet_property_list.end(); ++it) {
+    for (std::set<uint32_t>::iterator it = global_wallet_property_list.begin() ; it != global_wallet_property_list.end(); ++it) {
         uint32_t propertyId = *it;
         std::string spId = static_cast<ostringstream*>( &(ostringstream() << propertyId) )->str();
         std::string spName = getPropertyName(propertyId).c_str();
@@ -176,7 +176,7 @@ void BalancesDialog::PopulateBalances(unsigned int propertyId)
         ui->balancesTable->setHorizontalHeaderItem(1, new QTableWidgetItem("Property Name"));
 
         // loop over the wallet property list and add the wallet totals
-        for (std::vector<uint32_t>::iterator it = global_wallet_property_list.begin() ; it != global_wallet_property_list.end(); ++it) {
+        for (std::set<uint32_t>::iterator it = global_wallet_property_list.begin() ; it != global_wallet_property_list.end(); ++it) {
             uint32_t propertyId = *it;
             std::string spId = static_cast<ostringstream*>( &(ostringstream() << propertyId) )->str();
             std::string spName = getPropertyName(propertyId).c_str();
