Changeset 6363 for trunk/licq/include/licq_user.h

Timestamp:

07/01/08 02:41:30 (5 months ago)

Author:

flynd

Message:

Replaced CUserHashTable with std::map. A custom hash map shouldn't make any significant improvement with the number of items in a normal contact list so better and easier to use a std class instead. Also added some missing mutex locks on the user list.

Files:

• trunk/licq/include/licq_user.h (modified) (3 diffs)

trunk/licq/include/licq_user.h

@@ -234 +234 @@
 class LicqGroup;
 
+typedef std::pair<std::string, unsigned long> UserMapKey;
+typedef std::map<UserMapKey, class ICQUser*> UserMap;
 typedef std::list<ICQUser *> UserList;
 typedef std::list<class ICQOwner *> OwnerList;
@@ -1152 +1154 @@
 };
 
-
-//=====CUsers===================================================================
-
-class CUserHashTable
-{
-public:
-  CUserHashTable(unsigned short _nSize);
-  ~CUserHashTable();
-
-  // For protocol plugins
-  ICQUser *Retrieve(const char *, unsigned long);
-  void Store(ICQUser *, const char *, unsigned long);
-  void Remove(const char *, unsigned long);
-
-protected:
-  // For protocol plugin
-  unsigned short HashValue(const char *);
-
-  void Lock(unsigned short _nLockType);
-  void Unlock();
-
-  std::vector < UserList > m_vlTable;
-
-  pthread_rdwr_t mutex_rw;
-  unsigned short m_nLockType;
-};
-
 /**
  * Class holding data for a user group in the contact list.
@@ -1512 +1487 @@
   GroupMap myGroups;
   UserList m_vpcUsers;
+  UserMap myUsers;
   OwnerList m_vpcOwners;
-  CUserHashTable m_hUsers;
   ICQOwner *m_xOwner;
   unsigned long m_nOwnerUin;