Changeset 6259 for branches/qt4-gui_group/src/core/usermenu.cpp

Timestamp:

06/11/08 08:25:24 (6 months ago)

Author:

eugene

Message:

Applied the latest version of flynd's qt4-gui patch.

Files:

• branches/qt4-gui_group/src/core/usermenu.cpp (modified) (1 diff)

branches/qt4-gui_group/src/core/usermenu.cpp

@@ -204 +204 @@
     delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
-  {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
 
     a = myServerGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu