Changeset 6309 for trunk/qt4-gui/src/contactlist/contactlist.cpp

Timestamp:

06/14/08 23:21:57 (6 months ago)

Author:

flynd

Message:

dataChanged signal cannot be sent between beginInsertRow and endInsertRow. Revised signalling when adding and removing users in groups to fix this. This fixes the empty rows sometimes seen first in groups after users have been added.

Files:

• trunk/qt4-gui/src/contactlist/contactlist.cpp (modified) (11 diffs)

trunk/qt4-gui/src/contactlist/contactlist.cpp

@@ -63 +63 @@
   connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
       SLOT(barDataChanged(ContactBar*, int)));
+  connect(group, SIGNAL(beginInsert(ContactGroup*, int)),
+      SLOT(groupBeginInsert(ContactGroup*, int)));
+  connect(group, SIGNAL(endInsert()), SLOT(groupEndInsert()));
+  connect(group, SIGNAL(beginRemove(ContactGroup*, int)),
+      SLOT(groupBeginRemove(ContactGroup*, int)));
+  connect(group, SIGNAL(endRemove()), SLOT(groupEndRemove()));
   return group;
 }
@@ -236 +242 @@
     return;
 
-  int groupRow = (group->groupId() < SystemGroupOffset
-      ? myUserGroups.indexOf(group)
-      : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-
-  emit dataChanged(createIndex(groupRow, 0, group), createIndex(groupRow, myColumnCount - 1, group));
+  int row = groupRow(group);
+  emit dataChanged(createIndex(row, 0, group), createIndex(row, myColumnCount - 1, group));
 }
 
@@ -249 +252 @@
 
   emit dataChanged(createIndex(row, 0, bar), createIndex(row, myColumnCount - 1, bar));
+}
+
+void ContactListModel::groupBeginInsert(ContactGroup* group, int row)
+{
+  beginInsertRows(createIndex(groupRow(group), 0, group), row, row);
+}
+
+void ContactListModel::groupEndInsert()
+{
+  endInsertRows();
+}
+
+void ContactListModel::groupBeginRemove(ContactGroup* group, int row)
+{
+  beginRemoveRows(createIndex(groupRow(group), 0, group), row, row);
+}
+
+void ContactListModel::groupEndRemove()
+{
+  endRemoveRows();
 }
 
@@ -261 +284 @@
 
   // Add all groups
-  beginInsertRows(QModelIndex(), 0, gUserManager.NumGroups() + 1);
-
   ContactGroup* newGroup = createGroup(0, tr("Other Users"));
   myUserGroups.append(newGroup);
@@ -277 +298 @@
   FOR_EACH_GROUP_END
 
-  endInsertRows();
-
   // Add all users
   FOR_EACH_USER_START(LOCK_R)
@@ -299 +318 @@
   }
   return 0;
+}
+
+int ContactListModel::groupRow(ContactGroup* group) const
+{
+  unsigned short groupId = group->groupId();
+
+  if (groupId < SystemGroupOffset)
+    return myUserGroups.indexOf(group);
+  else if (groupId <= SystemGroupOffset + NUM_GROUPS_SYSTEM_ALL)
+    return myUserGroups.size() + groupId - SystemGroupOffset;
+  else
+    return -1;
 }
 
@@ -322 +353 @@
     bool shouldBeMember = (gid != 0 && licqUser->GetInGroup(GROUPS_USER, gid)) ||
         (gid == 0 && licqUser->GetGroups().empty() && !licqUser->IgnoreList());
-    updateUserGroup(user, group, i, shouldBeMember);
+    updateUserGroup(user, group, shouldBeMember);
   }
 
@@ -328 +359 @@
   for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
   {
-    updateUserGroup(user, mySystemGroups[i], myUserGroups.size()+i, licqUser->GetInGroup(GROUPS_SYSTEM, i));
-  }
-}
-
-void ContactListModel::updateUserGroup(ContactUserData* user, ContactGroup* group, int groupRow, bool shouldBeMember)
+    updateUserGroup(user, mySystemGroups[i], licqUser->GetInGroup(GROUPS_SYSTEM, i));
+  }
+}
+
+void ContactListModel::updateUserGroup(ContactUserData* user, ContactGroup* group, bool shouldBeMember)
 {
   ContactUser* member = group->user(user);
@@ -340 +371 @@
     return;
 
+  // Adding or removing the user is enough here, signals will be sent from group
   if (shouldBeMember)
-  {
-    // Add user to group
-    beginInsertRows(createIndex(groupRow, 0, group), group->rowCount(), group->rowCount());
     new ContactUser(user, group);
-    endInsertRows();
-  }
   else
-  {
-    // Remove user from the group
-    int index = group->indexOf(member);
-    beginRemoveRows(createIndex(groupRow, 0, group), index, index);
     delete member;
-    endRemoveRows();
-  }
 }
 
@@ -367 +388 @@
     ContactGroup* group = u->group();
     int pos = group->indexOf(u);
-    int groupRow = (group->groupId() < SystemGroupOffset ? myUserGroups.indexOf(group) : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-    beginRemoveRows(createIndex(groupRow, 0, group), pos, pos);
+    beginRemoveRows(createIndex(groupRow(group), 0, group), pos, pos);
     delete u;
     endRemoveRows();
@@ -436 +456 @@
       return QModelIndex();
   }
-  int groupRow = (group->groupId() < SystemGroupOffset ? myUserGroups.indexOf(group) : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-  return createIndex(groupRow, 0, group);
+  return createIndex(groupRow(group), 0, group);
 }