Changeset 6323

Timestamp:

06/17/08 03:34:46 (4 months ago)

Author:

flynd

Message:

Fixed missing connects for group signals. This caused view to not update when changing group memberships for users.

Location:

trunk/qt4-gui/src/contactlist

Files:

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

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

@@ -45 +45 @@
   for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
   {
-    mySystemGroups[i] = createGroup(SystemGroupOffset + i,
+    mySystemGroups[i] = new ContactGroup(SystemGroupOffset + i,
         LicqStrings::getSystemGroupName(i));
+    connectGroup(mySystemGroups[i]);
   }
 
@@ -56 +57 @@
 }
 
-ContactGroup* ContactListModel::createGroup(unsigned short id, QString name)
-{
-  ContactGroup* group = new ContactGroup(id, name);
+void ContactListModel::connectGroup(ContactGroup* group)
+{
   connect(group, SIGNAL(dataChanged(ContactGroup*)),
       SLOT(groupDataChanged(ContactGroup*)));
@@ -69 +69 @@
       SLOT(groupBeginRemove(ContactGroup*, int)));
   connect(group, SIGNAL(endRemove()), SLOT(groupEndRemove()));
-  return group;
 }
 
@@ -113 +112 @@
       Config::ContactList::instance()->setGroupState(gid, true);
 
-      ContactGroup* newGroup = createGroup(gid);
+      ContactGroup* newGroup = new ContactGroup(gid);
+      connectGroup(newGroup);
       beginInsertRows(QModelIndex(), myUserGroups.size(), myUserGroups.size());
       myUserGroups.append(newGroup);
@@ -287 +287 @@
 
   // Add all groups
-  ContactGroup* newGroup = createGroup(0, tr("Other Users"));
+  ContactGroup* newGroup = new ContactGroup(0, tr("Other Users"));
+  connectGroup(newGroup);
   myUserGroups.append(newGroup);
 
@@ -293 +294 @@
   {
     ContactGroup* group = new ContactGroup(pGroup);
-    connect(group, SIGNAL(dataChanged(ContactGroup*)),
-        SLOT(groupDataChanged(ContactGroup*)));
-    connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
-        SLOT(barDataChanged(ContactBar*, int)));
+    connectGroup(group);
     myUserGroups.append(group);
   }

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

@@ -416 +416 @@
 private:
   /**
-   * Create a group object and connect signals for it
-   *
-   * @param id Id for the new group
-   * @param name Name for the new group (only for non standard groups)
-   * @return The created group
-   */
-  ContactGroup* createGroup(unsigned short id, QString name = QString());
+   * Connect signals for a newly created group object
+   *
+   * @param group Group object to connect signals from
+   */
+  void connectGroup(ContactGroup* group);
 
   /**