Changeset 6259 for branches/qt4-gui_group/src/contactlist/contactgroup.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/contactlist/contactgroup.cpp (modified) (3 diffs)

branches/qt4-gui_group/src/contactlist/contactgroup.cpp

@@ -36 +36 @@
 {
   if (myGroupId != 0)
-  {
-    mySortKey.sprintf("%10i", myGroupId);
-  }
+    mySortKey = myGroupId;
   else
-  {
     // Put "Other Users" last when sorting
-    mySortKey = QString("9999999999");
-  }
-
+    mySortKey = 65535;
+
+  update();
+
+  for (int i = 0; i < 3; ++i)
+    myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
+}
+
+ContactGroup::ContactGroup(const LicqGroup* group)
+  : ContactItem(ContactListModel::GroupItem),
+    myGroupId(group->id()),
+    myName(group->name().c_str()),
+    mySortKey(group->sortIndex()),
+    myEvents(0),
+    myVisibleContacts(0)
+{
   for (int i = 0; i < 3; ++i)
     myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
@@ -61 +71 @@
 void ContactGroup::update()
 {
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  myName = QString::fromLocal8Bit((*g)[myGroupId-1]);
-  gUserManager.UnlockGroupList();
-
-  emit dataChanged(this);
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  myName = QString::fromLocal8Bit(g->name().c_str());
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
+
+  emit dataChanged(this);
+}
+
+void ContactGroup::updateSortKey()
+{
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
 }
 
@@ -214 +246 @@
 
   // Don't save new name here, daemon will signal us when name has changed
-  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit());
+  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit().data());
 
   return true;