Changeset 6309 for trunk/qt4-gui/src/contactlist/contactgroup.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/contactgroup.cpp (modified) (4 diffs)

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

@@ -133 +133 @@
 void ContactGroup::addUser(ContactUser* user, ContactListModel::SubGroupType subGroup)
 {
+  // Signal that we are about to add a row
+  emit beginInsert(this, rowCount());
+
   myUsers.append(user);
   if (user->visibility())
@@ -139 +142 @@
   myEvents += user->numEvents();
   myBars[subGroup]->updateNumEvents(user->numEvents());
+
+  // Signal that we're done adding
+  emit endInsert();
+
+  // Update group and bar as counters may have changed
   emit barDataChanged(myBars[subGroup], subGroup);
-
   emit dataChanged(this);
 }
@@ -146 +153 @@
 void ContactGroup::removeUser(ContactUser* user, ContactListModel::SubGroupType subGroup)
 {
+  // Signal that we are about to remove a row
+  emit beginRemove(this, indexOf(user));
+
   myUsers.removeAll(user);
   if (user->visibility())
@@ -152 +162 @@
   myEvents -= user->numEvents();
   myBars[subGroup]->updateNumEvents(-user->numEvents());
+
+  // Signal that we're done removing
+  emit endRemove();
+
+  // Update group and bar as counters may have changed
   emit barDataChanged(myBars[subGroup], subGroup);
-
   emit dataChanged(this);
 }