Changeset 6189

Timestamp:

05/10/08 23:03:16 (4 months ago)

Author:

flynd

Message:

Don't send updates while reloading the contact list. reset() at the end will force views to reload anyway.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactlist.cpp (modified) (6 diffs)
• contactlist.h (modified) (1 diff)

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

@@ -39 +39 @@
 
 ContactListModel::ContactListModel(QObject* parent)
-  : QAbstractItemModel(parent)
+  : QAbstractItemModel(parent),
+    myBlockUpdates(false)
 {
   // Create the system groups
@@ -157 +158 @@
 void ContactListModel::slot_userDataChanged(const ContactUserData* user)
 {
+  if (myBlockUpdates)
+    return;
+
   // Emit signal that the user has changed in all groups
   foreach (ContactUser* u, user->groupList())
@@ -167 +171 @@
 void ContactListModel::groupDataChanged(ContactGroup* group)
 {
+  if (myBlockUpdates)
+    return;
+
   int groupRow = (group->groupId() < SystemGroupOffset
       ? myUserGroups.indexOf(group)
@@ -176 +183 @@
 void ContactListModel::slot_barDataChanged(ContactBar* bar, int row)
 {
+  if (myBlockUpdates)
+    return;
+
   emit dataChanged(createIndex(row, 0, bar), createIndex(row, myColumnCount - 1, bar));
 }
@@ -181 +191 @@
 void ContactListModel::reloadAll()
 {
+  // Don't send out signals while reloading, the reset at the end will be enough
+  myBlockUpdates = true;
+
   // Clear the list of all old groups and users
   clear();
@@ -217 +230 @@
 
   // Tell views that we have done major changes
+  myBlockUpdates = false;
   reset();
 }

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

@@ -408 +408 @@
   QList<ContactUserData*> myUsers;
   int myColumnCount;
+  bool myBlockUpdates;
 };