Changeset 6430

Timestamp:

07/06/08 20:30:57 (5 months ago)

Author:

flynd

Message:

Redefined UserStringList? to use std::string instead of char* so we don't have to keep track of freeing the strings when we're done.

Location:

trunk

Files:

• licq/include/licq_icqd.h (modified) (3 diffs)
• licq/include/licq_packets.h (modified) (4 diffs)
• licq/include/licq_user.h (modified) (1 diff)
• licq/src/icqd-srv.cpp (modified) (19 diffs)
• licq/src/icqd-tcp.cpp (modified) (3 diffs)
• licq/src/icqpacket.cpp (modified) (12 diffs)
• qt-gui/src/mainwin.cpp (modified) (3 diffs)
• qt-gui/src/mmsenddlg.cpp (modified) (2 diffs)
• qt-gui/src/mmsenddlg.h (modified) (2 diffs)
• qt-gui/src/usereventdlg.cpp (modified) (3 diffs)
• qt4-gui/src/core/licqgui.cpp (modified) (3 diffs)
• qt4-gui/src/dialogs/mmsenddlg.cpp (modified) (2 diffs)
• qt4-gui/src/dialogs/mmsenddlg.h (modified) (2 diffs)
• qt4-gui/src/userevents/usersendcommon.cpp (modified) (2 diffs)
• qt4-gui/src/userevents/usersendcontactevent.cpp (modified) (1 diff)

trunk/licq/include/licq_icqd.h

@@ -61 +61 @@
     }
 
+typedef std::list<std::string> StringList;
+
 /* Forward declarations for friend functions */
 void *Ping_tep(void *p);
@@ -348 +350 @@
      bool bMultipleRecipients = false, CICQColor *pColor = NULL);
   // Contact List
-  unsigned long icqSendContactList(const char *szId, UserStringList &users,
+  unsigned long icqSendContactList(const char *szId, const StringList& users,
      bool bOnline, unsigned short nLevel, bool bMultipleRecipients = false,
      CICQColor *pColor = NULL);
@@ -467 +469 @@
   void icqRenameGroup(const char *_szNewName, unsigned short _nGSID);
   void icqRenameUser(const char *_szId);
-  void icqExportUsers(UserStringList &, unsigned short);
+  void icqExportUsers(const StringList& users, unsigned short);
   void icqExportGroups(const GroupNameMap& groups);
   void icqUpdateServerGroups();

trunk/licq/include/licq_packets.h

@@ -9 +9 @@
 class CBuffer;
 class INetSocket;
+
+typedef std::list<std::string> StringList;
 
 // values of extra info to identify plugin request
@@ -375 +377 @@
 public:
    CPU_GenericUinList(const char *szId, unsigned short Family, unsigned short Subtype);
-   CPU_GenericUinList(UserStringList &, unsigned short, unsigned short);
+   CPU_GenericUinList(const StringList& users, unsigned short, unsigned short);
    CPU_GenericUinList(unsigned long _nUin, unsigned short Family, unsigned short Subtype);
 };
@@ -401 +403 @@
 {
 public:
-  CPU_ExportToServerList(UserStringList &, unsigned short);
+  CPU_ExportToServerList(const StringList& users, unsigned short);
 };
 
@@ -453 +455 @@
 {
 public:
-  CPU_ClearServerList(UserStringList &, unsigned short);
+  CPU_ClearServerList(const StringList& users, unsigned short);
 };
 

trunk/licq/include/licq_user.h

@@ -241 +241 @@
 typedef std::map<unsigned short, std::string> GroupNameMap;
 typedef std::list<unsigned long> UinList;
-typedef std::list<char *> UserStringList;
 typedef std::vector <class CUserEvent *> UserEventList;
 

trunk/licq/src/icqd-srv.cpp

@@ -133 +133 @@
 
   // Just upload all of the users now
-  UserStringList doneUsers;
-  UserStringList users;
+  StringList doneUsers;
+  StringList users;
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
@@ -141 +141 @@
     if (pUser->GetSID() == 0 && !pUser->IgnoreList())
     {
-      UserStringList::const_iterator p = std::find(doneUsers.begin(), doneUsers.end(),
+      StringList::const_iterator p = std::find(doneUsers.begin(), doneUsers.end(),
         pUser->IdString());
 
@@ -147 +147 @@
       {
         // Keep track of who has been done
-        users.push_back(strdup(pUser->IdString()));
-        doneUsers.push_back(strdup(pUser->IdString()));
+        users.push_back(pUser->IdString());
+        doneUsers.push_back(pUser->IdString());
       }
     }
@@ -159 +159 @@
     icqUpdateServerGroups();
   }
-  
-  UserStringList::iterator it;
-  for (it = doneUsers.begin(); it != doneUsers.end(); ++it)
-    free(*it);
 
   // Export visible/invisible/ignore list
-  UserStringList visibleUsers, invisibleUsers, ignoredUsers;
+  StringList visibleUsers, invisibleUsers, ignoredUsers;
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->IgnoreList() && pUser->GetSID() == 0)
     {
-      ignoredUsers.push_back(strdup(pUser->IdString()));
+      ignoredUsers.push_back(pUser->IdString());
     }
     else
@@ -176 +172 @@
       if (pUser->InvisibleList() && pUser->GetInvisibleSID() == 0)
       {
-        invisibleUsers.push_back(strdup(pUser->IdString()));
+        invisibleUsers.push_back(pUser->IdString());
       }
 
       if (pUser->VisibleList() && pUser->GetVisibleSID() == 0)
       {
-        visibleUsers.push_back(strdup(pUser->IdString()));
+        visibleUsers.push_back(pUser->IdString());
       }
     }
@@ -198 +194 @@
 
 //-----icqExportUsers----------------------------------------------------------
-void CICQDaemon::icqExportUsers(UserStringList &users, unsigned short _nType)
+void CICQDaemon::icqExportUsers(const StringList& users, unsigned short _nType)
 {
   if (!UseServerContactList())  return;
@@ -1226 +1222 @@
 {
   unsigned short n = 0;
-  UserStringList users;
+  StringList users;
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_W)
   {
     n++;
-    users.push_back(strdup(pUser->IdString()));
+    users.push_back(pUser->IdString());
     if (n == m_nMaxUsersPerPacket)
     {
@@ -1236 +1232 @@
       gLog.Info(tr("%sUpdating contact list (#%hu)...\n"), L_SRVxSTR, p->Sequence());
       SendEvent_Server(p);
-      users.erase(users.begin(), users.end());
+      users.clear();
       n = 0;
     }
@@ -1273 +1269 @@
   // Go through the entire list of users, checking if each one is on
   // the visible list
-  UserStringList users;
+  StringList users;
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->GetInGroup(GROUPS_SYSTEM, GROUP_VISIBLE_LIST) )
-      users.push_back(strdup(pUser->IdString()));
+      users.push_back(pUser->IdString());
   }
   FOR_EACH_PROTO_USER_END
@@ -1289 +1285 @@
 void CICQDaemon::icqSendInvisibleList()
 {
-  UserStringList users;
+  StringList users;
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->GetInGroup(GROUPS_SYSTEM, GROUP_INVISIBLE_LIST) )
-      users.push_back(strdup(pUser->IdString()));
+      users.push_back(pUser->IdString());
   }
   FOR_EACH_PROTO_USER_END
@@ -1583 +1579 @@
 {
   if (!UseServerContactList()) return;
-  
+
   unsigned short n = 0;
-  UserStringList users;
-  
+  StringList users;
+
   // Delete all the users in groups
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_W)
   {
     n++;
-    users.push_back(strdup(pUser->IdString()));
+    users.push_back(pUser->IdString());
     if (n == m_nMaxUsersPerPacket)
     {
@@ -1598 +1594 @@
       gLog.Info(tr("%sDeleting server list users (#%hu)...\n"), L_SRVxSTR, p->Sequence());
       SendEvent_Server(p);
-      users.erase(users.begin(), users.end());
+      users.clear();
       n = 0;
     }
   }
   FOR_EACH_PROTO_USER_END
-  
+
   if (n != 0)
   {
@@ -1610 +1606 @@
     SendEvent_Server(p);
   }
-  
+
   // Delete all the groups
 
-  
+
   // Delete invisible users
   n = 0;
-  users.erase(users.begin(), users.end());
-    
+  users.clear();
+
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_W)
   {
@@ -1623 +1619 @@
     {
       n++;
-      users.push_back(strdup(pUser->IdString()));
-    }
-    
+      users.push_back(pUser->IdString());
+    }
+
     if (n == m_nMaxUsersPerPacket)
     {
@@ -1633 +1629 @@
         L_SRVxSTR, p->Sequence());
       SendEvent_Server(p);
-      users.erase(users.begin(), users.end());
+      users.clear();
       n = 0;
+      continue;
     }
   }
   FOR_EACH_PROTO_USER_END
-  
+
   if (n != 0)
   {
@@ -1646 +1643 @@
     SendEvent_Server(p);
   }
-  
+
   // Delete visible users
   n = 0;
-  users.erase(users.begin(), users.end());
-  
+  users.clear();
+
   FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_W)
   {
@@ -1656 +1653 @@
     {
       n++;
-      users.push_back(strdup(pUser->IdString()));
-    }
-    
+      users.push_back(pUser->IdString());
+    }
+
     if (n == m_nMaxUsersPerPacket)
     {
@@ -1666 +1663 @@
         L_SRVxSTR, p->Sequence());
       SendEvent_Server(p);
-      users.erase(users.begin(), users.end());
+      users.clear();
       n = 0;
+      continue;
     }
   }
   FOR_EACH_PROTO_USER_END
-  
+
   if (n != 0)
   {
@@ -1678 +1676 @@
       L_SRVxSTR, p->Sequence());
     SendEvent_Server(p);
-  }  
-  
+  }
 }
 

trunk/licq/src/icqd-tcp.cpp

@@ -457 +457 @@
 //-----CICQDaemon::sendContactList-------------------------------------------
 unsigned long CICQDaemon::icqSendContactList(const char *szId,
-   UserStringList &users, bool online, unsigned short nLevel,
+   const StringList& users, bool online, unsigned short nLevel,
    bool bMultipleRecipients, CICQColor *pColor)
 {
@@ -467 +467 @@
 
   ICQUser *u = NULL;
-  UserStringList::iterator iter;
+  StringList::const_iterator iter;
   for (iter = users.begin(); iter != users.end(); ++iter)
   {
-    u = gUserManager.FetchUser(*iter, LICQ_PPID, LOCK_R);
-    p += sprintf(&m[p], "%s%c%s%c", *iter, char(0xFE),
+    u = gUserManager.FetchUser(iter->c_str(), LICQ_PPID, LOCK_R);
+    p += sprintf(&m[p], "%s%c%s%c", iter->c_str(), char(0xFE),
        u == NULL ? "" : u->GetAlias(), char(0xFE));
-    vc.push_back(new CContact(*iter, LICQ_PPID, u == NULL ? "" : u->GetAlias()));
+    vc.push_back(new CContact(iter->c_str(), LICQ_PPID, u == NULL ? "" : u->GetAlias()));
     gUserManager.DropUser(u);
   }
@@ -532 +532 @@
    CICQColor *pColor)
 {
-  UserStringList users;
+  StringList users;
   char szUin[24];
 

trunk/licq/src/icqpacket.cpp

@@ -1300 +1300 @@
 
 //-----GenericUinList-----------------------------------------------------------
-CPU_GenericUinList::CPU_GenericUinList(UserStringList &users, unsigned short family, unsigned short Subtype)
+CPU_GenericUinList::CPU_GenericUinList(const StringList& users, unsigned short family, unsigned short Subtype)
   : CPU_CommonFamily(family, Subtype)
 {
@@ -1306 +1306 @@
   len[1] = '\0';
   int nLen = 0;
-  UserStringList::iterator it;
+  StringList::const_iterator it;
   for (it = users.begin(); it != users.end(); ++it)
-    nLen += strlen(*it)+1;
+    nLen += it->size() + 1;
 
   char *contacts = new char[nLen+1];
@@ -1314 +1314 @@
 
   for (it = users.begin(); it != users.end(); ++it) {
-    len[0] = strlen(*it);
+    len[0] = it->size();
     strcat(contacts, len);
-    strcat(contacts, *it);
-    free (*it);
+    strcat(contacts, it->c_str());
   }
 
@@ -2747 +2746 @@
 
 //-----ExportToServerList-------------------------------------------------------
-CPU_ExportToServerList::CPU_ExportToServerList(UserStringList &users,
+CPU_ExportToServerList::CPU_ExportToServerList(const StringList& users,
                                                unsigned short _nType)
   : CPU_CommonFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_ROSTxADD)
@@ -2755 +2754 @@
   int nSize = 0;
 
-  UserStringList::iterator i;
+  StringList::const_iterator i;
   for (i = users.begin(); i != users.end(); ++i)
   {
-    ICQUser *pUser = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_R);
+    ICQUser* pUser = gUserManager.FetchUser(i->c_str(), LICQ_PPID, LOCK_R);
     if (pUser)
     {
-      nSize += strlen(*i);
+      nSize += i->size();
       nSize += 10;
 
@@ -2786 +2785 @@
 
     // Save the SID
-    ICQUser *u = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_W);
+    ICQUser* u = gUserManager.FetchUser(i->c_str(), LICQ_PPID, LOCK_W);
     switch (_nType)
     {
@@ -2836 +2835 @@
     SetExtraInfo(m_nGSID);
 
-    nLen = strlen(*i);
+    nLen = i->size();
     buffer->PackUnsignedShortBE(nLen);
-    buffer->Pack(*i, nLen);
+    buffer->Pack(i->c_str(), nLen);
     buffer->PackUnsignedShortBE(m_nGSID);
     buffer->PackUnsignedShortBE(m_nSID);
@@ -2855 +2854 @@
     if (szUnicodeName)
       free(szUnicodeName);
-
-    free(*i);
   }
 }
@@ -3176 +3173 @@
 
 //-----ClearServerList------------------------------------------------------
-CPU_ClearServerList::CPU_ClearServerList(UserStringList &uins,
+CPU_ClearServerList::CPU_ClearServerList(const StringList& uins,
                                          unsigned short _nType)
   : CPU_CommonFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_ROSTxREM)
 {
   int nSize = 0;
-  UserStringList::iterator i;
-    
+  StringList::const_iterator i;
+
   if (_nType == ICQ_ROSTxGROUP)
-  {
-
-       
     return;
-  }
-  
 
   for (i = uins.begin(); i != uins.end(); ++i)
   {
-    ICQUser *pUser = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_R);
+    ICQUser* pUser = gUserManager.FetchUser(i->c_str(), LICQ_PPID, LOCK_R);
     if (pUser)
     {
-      nSize += strlen(*i) + 2;
+      nSize += i->size() + 2;
       nSize += 8;
       if (pUser->GetAwaitingAuth())
@@ -3203 +3195 @@
     }
   }
-  
+
   m_nSize += nSize;
   InitBuffer();
-  
+
   for (i = uins.begin(); i != uins.end(); i++)
   {
-    ICQUser *pUser = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_W);
+    ICQUser* pUser = gUserManager.FetchUser(i->c_str(), LICQ_PPID, LOCK_W);
     if (pUser)
     {
@@ -3217 +3209 @@
       if (_nType == ICQ_ROSTxNORMAL)
         nGSID = pUser->GetGSID();
-        
-      buffer->PackUnsignedShortBE(strlen(*i));
-      buffer->Pack(*i, strlen(*i));
+
+      buffer->PackUnsignedShortBE(i->size());
+      buffer->Pack(i->c_str(), i->size());
       buffer->PackUnsignedShortBE(nGSID);
       buffer->PackUnsignedShortBE(pUser->GetSID());
@@ -3245 +3237 @@
       gUserManager.DropUser(pUser);
     }
-    free(*i);
   }
 }

trunk/qt-gui/src/mainwin.cpp

@@ -22 +22 @@
 #include "config.h"
 #endif
+
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+#include <list>
+#include <map>
 
 #ifdef USE_KDE
@@ -136 +142 @@
 }
 
-#include <map>
-#include <cctype>
-
-using std::isdigit;
+using namespace std;
 
 #undef Bool
@@ -4810 +4813 @@
   }
 
-  UserStringList users;
-  std::list<unsigned long> ppids;
+  list<pair<QString, unsigned long> > users;
   FOR_EACH_USER_START(LOCK_R)
   {
     if (pUser->NewMessages() > 0)
-    {
-      users.push_back(pUser->IdString());
-      ppids.push_back(pUser->PPID());
-    }
+      users.push_back(pair<QString, unsigned long>(pUser->IdString(), pUser->PPID()));
   }
   FOR_EACH_USER_END
 
-  for (UserStringList::iterator iter = users.begin(); iter != users.end(); iter++)
-  {
-    callDefaultFunction(*iter, ppids.front());
-    ppids.pop_front();
-  }
+  list<pair<QString, unsigned long> >::iterator iter;
+  for (iter = users.begin(); iter != users.end(); iter++)
+    callDefaultFunction(iter->first, iter->second);
 }
 

trunk/qt-gui/src/mmsenddlg.cpp

@@ -104 +104 @@
 
 
-int CMMSendDlg::go_contact(UserStringList &_users)
+int CMMSendDlg::go_contact(StringList& users)
 {
   m_nEventType = ICQ_CMDxSUB_CONTACTxLIST;
-  users = &_users;
+  myUsers = &users;
 
   setCaption(tr("Multiple Recipient Contact List"));
@@ -257 +257 @@
       gUserManager.DropUser(u);
 
-      icqEventTag = server->icqSendContactList(m_szId, *users, false,
+      icqEventTag = server->icqSendContactList(m_szId, *myUsers, false,
         ICQ_TCPxMSG_NORMAL);
       break;

trunk/qt-gui/src/mmsenddlg.h

@@ -29 +29 @@
 
 #include "licqdialog.h"
-#include "licq_user.h"
+#include "licq_icqd.h"
 
 class QPushButton;
@@ -51 +51 @@
   int go_message(QString);
   int go_url(QString, QString);
-  int go_contact(UserStringList &_users);
+  int go_contact(StringList& users);
 
 protected:
   QString s1, s2;
-  UserStringList *users;
+  StringList* myUsers;
 
   unsigned long m_nEventType;

trunk/qt-gui/src/usereventdlg.cpp

@@ -2545 +2545 @@
       CEventContactList* ue = (CEventContactList *) e->UserEvent();
       const ContactList& clist = ue->Contacts();
-      UserStringList users;
+      StringList users;
 
       // ContactList is const but string list holds "char*" so we have to copy each string
       for(ContactList::const_iterator i = clist.begin(); i != clist.end(); i++)
-        users.push_back(strdup((*i)->IdString()));
+        users.push_back((*i)->IdString());
 
       if(users.size() == 0)
@@ -2556 +2556 @@
       icqEventTag = server->icqSendContactList(m_lUsers.front().c_str(),
           users, bOnline, nLevel, false, &icqColor);
-
-      // Free the strings in the list
-      for (UserStringList::iterator i = users.begin(); i != users.end(); ++i)