Changeset 6190

Show
Ignore:
Timestamp:
2008-05-10 23:14:58 (2 months ago)
Author:
flynd
Message:

Adjusted function names in contactlist to no have slot_ prefix.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6189 r6190  
    5050        SLOT(groupDataChanged(ContactGroup*))); 
    5151    connect(mySystemGroups[i], SIGNAL(barDataChanged(ContactBar*, int)), 
    52         SLOT(slot_barDataChanged(ContactBar*, int))); 
     52        SLOT(barDataChanged(ContactBar*, int))); 
    5353  } 
    5454 
    …… 
    7070} 
    7171 
    72 void ContactListModel::slot_updatedList(CICQSignal* sig) 
     72void ContactListModel::listUpdated(CICQSignal* sig) 
    7373{ 
    7474  switch(sig->SubSignal()) 
    …… 
    8383      if (u == NULL) 
    8484      { 
    85         gLog.Warn("%sContactList::slot_updatedList(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id()); 
     85        gLog.Warn("%sContactList::listUpdated(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id()); 
    8686        break; 
    8787      } 
    …… 
    9696} 
    9797 
    98 void ContactListModel::slot_updatedUser(CICQSignal* sig) 
     98void ContactListModel::userUpdated(CICQSignal* sig) 
    9999{ 
    100100  // Skip events for owners 
    …… 
    105105  if (user == NULL) 
    106106  { 
    107     gLog.Warn("%sContactList::slot_updatedUser(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id()); 
     107    gLog.Warn("%sContactList::userUpdated(): Invalid user received: %lu, %s\n", L_ERRORxSTR, sig->PPID(), sig->Id()); 
    108108    return; 
    109109  } 
    …… 
    156156} 
    157157 
    158 void ContactListModel::slot_userDataChanged(const ContactUserData* user) 
     158void ContactListModel::userDataChanged(const ContactUserData* user) 
    159159{ 
    160160  if (myBlockUpdates) 
    …… 
    181181} 
    182182 
    183 void ContactListModel::slot_barDataChanged(ContactBar* bar, int row) 
     183void ContactListModel::barDataChanged(ContactBar* bar, int row) 
    184184{ 
    185185  if (myBlockUpdates) 
    …… 
    206206      SLOT(groupDataChanged(ContactGroup*))); 
    207207  connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)), 
    208       SLOT(slot_barDataChanged(ContactBar*, int))); 
     208      SLOT(barDataChanged(ContactBar*, int))); 
    209209  myUserGroups.append(newGroup); 
    210210 
    …… 
    215215        SLOT(groupDataChanged(ContactGroup*))); 
    216216    connect(newGroup, SIGNAL(barDataChanged(ContactBar*, int)), 
    217         SLOT(slot_barDataChanged(ContactBar*, int))); 
     217        SLOT(barDataChanged(ContactBar*, int))); 
    218218    myUserGroups.append(newGroup); 
    219219  } 
    …… 
    248248  ContactUserData* newUser = new ContactUserData(licqUser, this); 
    249249  connect(newUser, SIGNAL(dataChanged(const ContactUserData*)), 
    250       SLOT(slot_userDataChanged(const ContactUserData*))); 
     250      SLOT(userDataChanged(const ContactUserData*))); 
    251251  connect(newUser, SIGNAL(updateUserGroups(ContactUserData*, ICQUser*)), 
    252252      SLOT(updateUserGroups(ContactUserData*, ICQUser*))); 

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

    r6189 r6190  
    330330   * @param sig Signal data from the daemon with information on what has changed 
    331331   */ 
    332   void slot_updatedList(CICQSignal* sig); 
     332  void listUpdated(CICQSignal* sig); 
    333333 
    334334  /** 
    …… 
    337337   * @param sig Signal data from the daemon with information on what has changed 
    338338   */ 
    339   void slot_updatedUser(CICQSignal* sig); 
     339  void userUpdated(CICQSignal* sig); 
    340340 
    341341  /** 
    …… 
    356356   * @param user The user data object that has changed 
    357357   */ 
    358   void slot_userDataChanged(const ContactUserData* user); 
     358  void userDataChanged(const ContactUserData* user); 
    359359 
    360360  /** 
    …… 
    373373   * @param row The row of the bar in it's group 
    374374   */ 
    375   void slot_barDataChanged(ContactBar* bar, int row); 
     375  void barDataChanged(ContactBar* bar, int row); 
    376376 
    377377  /** 

  • trunk/qt4-gui/src/core/licqgui.cpp

    r6185 r6190  
    500500  myContactList = new ContactListModel(this); 
    501501  connect(mySignalManager, SIGNAL(updatedList(CICQSignal*)), 
    502       myContactList, SLOT(slot_updatedList(CICQSignal*))); 
     502      myContactList, SLOT(listUpdated(CICQSignal*))); 
    503503  connect(mySignalManager, SIGNAL(updatedUser(CICQSignal*)), 
    504       myContactList, SLOT(slot_updatedUser(CICQSignal*))); 
     504      myContactList, SLOT(userUpdated(CICQSignal*))); 
    505505 
    506506  connect(mySignalManager, SIGNAL(updatedList(CICQSignal*)),