Changeset 6364 for trunk/licq/src/user.cpp

Timestamp:

07/01/08 03:07:09 (5 months ago)

Author:

flynd

Message:

Removed the user list since there is no need to have both a list and a map.

Files:

• trunk/licq/src/user.cpp (modified) (7 diffs)

trunk/licq/src/user.cpp

@@ -510 +510 @@
 CUserManager::~CUserManager()
 {
-  UserList::iterator iter;
-  for (iter = m_vpcUsers.begin(); iter != m_vpcUsers.end(); ++iter)
-  {
-    delete *iter;
-  }
+  UserMap::iterator iter;
+  for (iter = myUsers.begin(); iter != myUsers.end(); ++iter)
+    delete iter->second;
 
   GroupMap::iterator g_iter;
@@ -681 +679 @@
     u->AddToContactList();
     myUsers[UserMapKey(szId, nPPID)] = u;
-    m_vpcUsers.push_back(u);
   }
   UnlockUserList();
@@ -715 +712 @@
   // Store the user in the lookup map
   myUsers[UserMapKey(_szId, _nPPID)] = pUser;
-  // Reorder the user to the correct place
-  m_vpcUsers.push_back(pUser);
 
   UnlockUserList();
@@ -728 +723 @@
     u->RemoveFiles();
   LockUserList(LOCK_W);
-  UserList::iterator iter = m_vpcUsers.begin();
-  while (iter != m_vpcUsers.end() && u != (*iter)) ++iter;
-  if (iter == m_vpcUsers.end())
-    gLog.Warn("%sInteral Error: CUserManager::RemoveUser():\n"
-              "%sUser \"%s\" (%s) not found in vector.\n",
-              L_WARNxSTR, L_BLANKxSTR, u->GetAlias(), u->IdString());
-  else
-    m_vpcUsers.erase(iter);
-  DropUser(u);
   myUsers.erase(UserMapKey(_szId, _nPPID));
   UnlockUserList();
+  DropUser(u);
   delete u;
 }
@@ -1440 +1427 @@
 {
   //LockUserList(LOCK_R);
-  unsigned short n = m_vpcUsers.size();
+  unsigned short n = myUsers.size();
   //UnlockUserList();
   return n;
@@ -1472 +1459 @@
  * Locks the entire user list for iterating through...
  *-------------------------------------------------------------------------*/
-UserList *CUserManager::LockUserList(unsigned short _nLockType)
+UserMap* CUserManager::LockUserList(unsigned short _nLockType)
 {
   switch (_nLockType)
@@ -1487 +1474 @@
   }
   m_nUserListLockType = _nLockType;
-  return &m_vpcUsers;
+  return &myUsers;
 }