Changeset 6430 for trunk/qt4-gui/src

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

Files:

• core/licqgui.cpp (modified) (3 diffs)
• dialogs/mmsenddlg.cpp (modified) (2 diffs)
• dialogs/mmsenddlg.h (modified) (2 diffs)
• userevents/usersendcommon.cpp (modified) (2 diffs)
• userevents/usersendcontactevent.cpp (modified) (1 diff)

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

@@ -23 +23 @@
 #include "config.h"
 
+#include <list>
 #include <stdio.h> // for snprintf
 #include <unistd.h> // for getopt
@@ -118 +119 @@
 #include "usermenu.h"
 
+using namespace std;
 using namespace LicqQtGui;
 /* TRANSLATOR LicqQtGui::LicqGui */
-
 
 #if defined(USE_SCRNSAVER)
@@ -1283 +1284 @@
     showAllOwnerEvents();
 
-  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++)
-  {
-    showDefaultEventDialog(*iter, ppids.front());
-    ppids.pop_front();
-  }
+  list<pair<QString, unsigned long> >::iterator iter;
+  for (iter = users.begin(); iter != users.end(); iter++)
+    showDefaultEventDialog(iter->first, iter->second);
 }
 

trunk/qt4-gui/src/dialogs/mmsenddlg.cpp

@@ -113 +113 @@
 }
 
-int MMSendDlg::go_contact(UserStringList& _users)
+int MMSendDlg::go_contact(StringList& users)
 {
   m_nEventType = ICQ_CMDxSUB_CONTACTxLIST;
-  users = &_users;
+  myUsers = &users;
 
   setWindowTitle(tr("Multiple Recipient Contact List"));
@@ -258 +258 @@
 
       icqEventTag = gLicqDaemon->icqSendContactList(
-          myId.toLatin1(), *users, false, ICQ_TCPxMSG_NORMAL);
+          myId.toLatin1(), *myUsers, false, ICQ_TCPxMSG_NORMAL);
       break;
     }

trunk/qt4-gui/src/dialogs/mmsenddlg.h

@@ -26 +26 @@
 #include <QString>
 
-#include <licq_user.h>
+#include <licq_icqd.h>
 
 class QGroupBox;
@@ -47 +47 @@
   int go_message(QString);
   int go_url(QString, QString);
-  int go_contact(UserStringList& _users);
+  int go_contact(StringList& users);
 
 private:
   QString s1, s2;
-  UserStringList* users;
+  StringList* myUsers;
 
   unsigned long m_nEventType;

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;