Changeset 6197 for trunk/qt4-gui/src/contactlist

Timestamp:

05/25/08 06:14:27 (6 months ago)

Author:

flynd

Message:

Moved some copy+paste code to separate function.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactlist.cpp (modified) (4 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] = new ContactGroup(SystemGroupOffset + i,
+    mySystemGroups[i] = createGroup(SystemGroupOffset + i,
         LicqStrings::getSystemGroupName(i));
-    connect(mySystemGroups[i], SIGNAL(dataChanged(ContactGroup*)),
-        SLOT(groupDataChanged(ContactGroup*)));
-    connect(mySystemGroups[i], SIGNAL(barDataChanged(ContactBar*, int)),
-        SLOT(barDataChanged(ContactBar*, int)));
   }
 
@@ -68 +64 @@
   for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
     delete mySystemGroups[i];
+}
+
+ContactGroup* ContactListModel::createGroup(unsigned short id, QString name)
+{
+  ContactGroup* group = new ContactGroup(id, name);
+  connect(group, SIGNAL(dataChanged(ContactGroup*)),
+      SLOT(groupDataChanged(ContactGroup*)));
+  connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
+      SLOT(barDataChanged(ContactBar*, int)));
+  return group;
 }
 
@@ -202 +208 @@
   beginInsertRows(QModelIndex(), 0, g->size());
 
-  ContactGroup* newGroup = new ContactGroup(0, tr("Other Users"));
-  connect(newGroup, SIGNAL(dataChanged(ContactGroup*)),
-      SLOT(groupDataChanged(ContactGroup*)));
-  connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)),
-      SLOT(barDataChanged(ContactBar*, int)));
-  myUserGroups.append(newGroup);
+  ContactGroup* newGroup = createGroup(0, tr("Other Users"));
 
   for (unsigned short i = 0; i < g->size(); ++i)
   {
-    newGroup = new ContactGroup(i+1, QString::fromLocal8Bit((*g)[i]));
-    connect(newGroup, SIGNAL(dataChanged(ContactGroup*)),
-        SLOT(groupDataChanged(ContactGroup*)));
-    connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)),
-        SLOT(barDataChanged(ContactBar*, int)));
+    newGroup = createGroup(i+1, QString::fromLocal8Bit((*g)[i]));
     myUserGroups.append(newGroup);
   }
@@ -327 +324 @@
     delete myUsers.takeFirst();
 
+  beginRemoveRows(QModelIndex(), 0, myUserGroups.size()-1);
   while (!myUserGroups.isEmpty())
     delete myUserGroups.takeFirst();
+  endRemoveRows();
 }
 

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

@@ -386 +386 @@
 private:
   /**
+   * Create a group object and connect signals for it
+   *
+   * @param id Id for the new group
+   * @param name Name for the new group
+   * @return The created group
+   */
+  ContactGroup* createGroup(unsigned short id, QString name);
+
+  /**
    * Get the user object that represents an licq contact
    *