Changeset 6430 for trunk/qt-gui

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/qt-gui/src

Files:

• mainwin.cpp (modified) (3 diffs)
• mmsenddlg.cpp (modified) (2 diffs)
• mmsenddlg.h (modified) (2 diffs)
• usereventdlg.cpp (modified) (3 diffs)

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)
-        free(*i);
 
       break;
@@ -3394 +3390 @@
   tmrSendTyping->stop();
   server->ProtoTypingNotification(m_lUsers.front().c_str(), m_nPPID, false, m_nConvoId);
-  
+
   CMMUserViewItem *i = static_cast<CMMUserViewItem*>(lstContacts->firstChild());
-  UserStringList users;
+  StringList users;
 
   while (i)