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

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.

Files:

• trunk/qt4-gui/src/core/licqgui.cpp (modified) (3 diffs)

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);
 }