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

Timestamp:

05/10/08 23:14:58 (7 months ago)

Author:

flynd

Message:

Adjusted function names in contactlist to no have slot_ prefix.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactlist.cpp (modified) (10 diffs)
• contactlist.h (modified) (4 diffs)

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

@@ -50 +50 @@
         SLOT(groupDataChanged(ContactGroup*)));
     connect(mySystemGroups[i], SIGNAL(barDataChanged(ContactBar*, int)),
-        SLOT(slot_barDataChanged(ContactBar*, int)));
+        SLOT(barDataChanged(ContactBar*, int)));
   }
 
@@ -70 +70 @@
 }
 
-void ContactListModel::slot_updatedList(CICQSignal* sig)
+void ContactListModel::listUpdated(CICQSignal* sig)
 {
   switch(sig->SubSignal())
@@ -83 +83 @@
       if (u == NULL)
       {
-        gLog.Warn("%sContactList::slot_updatedList(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id());
+        gLog.Warn("%sContactList::listUpdated(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id());
         break;
       }
@@ -96 +96 @@
 }
 
-void ContactListModel::slot_updatedUser(CICQSignal* sig)
+void ContactListModel::userUpdated(CICQSignal* sig)
 {
   // Skip events for owners
@@ -105 +105 @@
   if (user == NULL)
   {
-    gLog.Warn("%sContactList::slot_updatedUser(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id());
+    gLog.Warn("%sContactList::userUpdated(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id());
     return;
   }
@@ -156 +156 @@
 }
 
-void ContactListModel::slot_userDataChanged(const ContactUserData* user)
+void ContactListModel::userDataChanged(const ContactUserData* user)
 {
   if (myBlockUpdates)
@@ -181 +181 @@
 }
 
-void ContactListModel::slot_barDataChanged(ContactBar* bar, int row)
+void ContactListModel::barDataChanged(ContactBar* bar, int row)
 {
   if (myBlockUpdates)
@@ -206 +206 @@
       SLOT(groupDataChanged(ContactGroup*)));
   connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)),
-      SLOT(slot_barDataChanged(ContactBar*, int)));
+      SLOT(barDataChanged(ContactBar*, int)));
   myUserGroups.append(newGroup);
 
@@ -215 +215 @@
         SLOT(groupDataChanged(ContactGroup*)));
     connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)),
-        SLOT(slot_barDataChanged(ContactBar*, int)));
+        SLOT(barDataChanged(ContactBar*, int)));
     myUserGroups.append(newGroup);
   }
@@ -248 +248 @@
   ContactUserData* newUser = new ContactUserData(licqUser, this);
   connect(newUser, SIGNAL(dataChanged(const ContactUserData*)),
-      SLOT(slot_userDataChanged(const ContactUserData*)));
+      SLOT(userDataChanged(const ContactUserData*)));
   connect(newUser, SIGNAL(updateUserGroups(ContactUserData*, ICQUser*)),
       SLOT(updateUserGroups(ContactUserData*, ICQUser*)));

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

@@ -330 +330 @@
    * @param sig Signal data from the daemon with information on what has changed
    */
-  void slot_updatedList(CICQSignal* sig);
+  void listUpdated(CICQSignal* sig);
 
   /**
@@ -337 +337 @@
    * @param sig Signal data from the daemon with information on what has changed
    */
-  void slot_updatedUser(CICQSignal* sig);
+  void userUpdated(CICQSignal* sig);
 
   /**
@@ -356 +356 @@
    * @param user The user data object that has changed
    */
-  void slot_userDataChanged(const ContactUserData* user);
+  void userDataChanged(const ContactUserData* user);
 
   /**
@@ -373 +373 @@
    * @param row The row of the bar in it's group
    */
-  void slot_barDataChanged(ContactBar* bar, int row);
+  void barDataChanged(ContactBar* bar, int row);
 
   /**