Renamed internal variables to make more sense

1 files changed, 14 insertions, 14 deletions

diff --git a/sigcore/Hat.h b/sigcore/Hat.h
index 3ef768ca..7c6cff89 100644
--- a/sigcore/Hat.h
+++ b/sigcore/Hat.h
@@ -99,7 +99,7 @@ template<class T> class SIGCORE_EXPORT Hat
          */
         Fraction chance(const T& key) const;
     private:
-        QMap<T, int> m_objects;
+        QMap<T, int> m_items;
         int m_count;
 };
 
@@ -111,10 +111,10 @@ template<class T> inline Hat<T>::Hat() :
 template<class T> inline T Hat<T>::pick() const
 {
     int choice = qrand() % m_count;
-    QList<T> keys = m_objects.keys();
+    QList<T> keys = m_items.keys();
     foreach (const T& key, keys)
     {
-        choice -= m_objects[key];
+        choice -= m_items[key];
         if (choice < 0)
             return key;
     }
@@ -124,8 +124,8 @@ template<class T> inline T Hat<T>::pick() const
 template<class T> inline T Hat<T>::take()
 {
     T chosen = pick();
-    if (!(--m_objects[chosen]))
-        m_objects.remove(chosen);
+    if (!(--m_items[chosen]))
+        m_items.remove(chosen);
     --m_count;
     return chosen;
 }
@@ -133,18 +133,18 @@ template<class T> inline T Hat<T>::take()
 template<class T> inline T Hat<T>::takeAndClear()
 {
     T chosen = pick();
-    m_count -= m_objects[chosen];
-    m_objects.remove(chosen);
+    m_count -= m_items[chosen];
+    m_items.remove(chosen);
     return chosen;
 }
 
 template<class T> inline void Hat<T>::setCount(const T& key, const int weight)
 {
-    if (m_objects.contains(key))
+    if (m_items.contains(key))
     {
-        m_count -= m_objects[key];
+        m_count -= m_items[key];
         if (!weight)
-            m_objects.remove(key);
+            m_items.remove(key);
     }
     add(key, weight);
 }
@@ -153,14 +153,14 @@ template<class T> inline void Hat<T>::add(const T& key, const int weight)
 {
     if (weight)
     {
-        m_objects[key] += weight;
+        m_items[key] += weight;
         m_count += weight;
     }
 }
 
 template<class T> inline int Hat<T>::distinctCount() const
 {
-    return m_objects.size();
+    return m_items.size();
 }
 
 template<class T> inline int Hat<T>::count() const
@@ -170,8 +170,8 @@ template<class T> inline int Hat<T>::count() const
 
 template<class T> inline int Hat<T>::count(const T& key) const
 {
-    if (m_objects.contains(key))
-        return m_objects[key];
+    if (m_items.contains(key))
+        return m_items[key];
     return 0;
 }