Changeset 6430 for trunk/qt4-gui/src/userevents

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/qt4-gui/src/userevents

Files:

• usersendcommon.cpp (modified) (2 diffs)
• usersendcontactevent.cpp (modified) (1 diff)

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -849 +849 @@
       const CEventContactList* ue = dynamic_cast<const 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)
@@ -860 +860 @@
       icqEventTag = gLicqDaemon->icqSendContactList(myUsers.front().c_str(),
           users, online, level, false, &myIcqColor);
-
-      // Free the strings in the list
-      for (UserStringList::iterator i = users.begin(); i != users.end(); ++i)
-        free(*i);
 
       break;

trunk/qt4-gui/src/userevents/usersendcontactevent.cpp

@@ -132 +132 @@
   gLicqDaemon->ProtoTypingNotification(myUsers.front().c_str(), myPpid, false, myConvoId);
 
-  UserStringList users;
+  StringList users;
 
   QPair<QString, unsigned long> i;