Changeset 6365 for trunk/qt4-gui/src

Timestamp:

07/01/08 03:39:13 (5 months ago)

Author:

flynd

Message:

Removed some uin calls in qt4-gui.

Location:

trunk/qt4-gui/src

Files:

• core/licqkimiface.cpp (modified) (1 diff)
• userevents/usersendcommon.cpp (modified) (1 diff)

trunk/qt4-gui/src/core/licqkimiface.cpp

@@ -296 +296 @@
 
     FOR_EACH_PROTO_USER_START(PPID, LOCK_R)
-    QString uin = pUser->UinString();
+    QString uin = pUser->IdString();
     if (!uin.isEmpty() && uin == contactId)
     {

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

@@ -849 +849 @@
       const CEventContactList* ue = dynamic_cast<const CEventContactList*>(e->UserEvent());
       const ContactList& clist = ue->Contacts();
-      UinList uins;
-
+      UserStringList 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++)
-        uins.push_back((*i)->Uin());
-
-      if (uins.size() == 0)
+        users.push_back(strdup((*i)->IdString()));
+
+      if (users.size() == 0)
         break;
 
-      icqEventTag = gLicqDaemon->icqSendContactList(strtoul(myUsers.front().c_str(), NULL, 10),
-          uins, online, level, false, &myIcqColor);
+      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;