Index: kmess/grouplistviewitem.cpp =================================================================== --- kmess/grouplistviewitem.cpp (revisione 2200) +++ kmess/grouplistviewitem.cpp (copia locale) @@ -170,9 +170,9 @@ if(! group_->isSpecialGroup()) { moveAction_ = new KAction(); - connect(moveAction_, SIGNAL(activated()), this, SLOT(slotForwardActivated())); + connect(moveAction_, SIGNAL(activated()), this, SIGNAL(moveToGroup(group_))); copyAction_ = new KAction(); - connect(copyAction_, SIGNAL(activated()), this, SLOT(slotForwardCopyActivated())); + connect(copyAction_, SIGNAL(activated()), this, SIGNAL(copyToGroup(group_))); } // Attach group signals @@ -328,20 +328,6 @@ } - -// Forward when moveAction_ is activated -void GroupListViewItem::slotForwardActivated() -{ - emit moveToGroup(group_); -} - - -void GroupListViewItem::slotForwardCopyActivated() -{ - emit copyToGroup(group_); -} - - // Update the appearance of the item void GroupListViewItem::slotUpdateAppearance() { Index: kmess/grouplistviewitem.h =================================================================== --- kmess/grouplistviewitem.h (revisione 2199) +++ kmess/grouplistviewitem.h (copia locale) @@ -84,10 +84,6 @@ void slotContactOffline(); // Update the online/offline counters void slotContactOnline(); - // Forward when moveAction_ is activated - void slotForwardActivated(); - // Forward when copyAction_ is activated - void slotForwardCopyActivated(); // Update the appearance of the item void slotUpdateAppearance(); Index: kmess/contact/contact.h =================================================================== --- kmess/contact/contact.h (revisione 2199) +++ kmess/contact/contact.h (copia locale) @@ -173,12 +173,6 @@ // The contact's online status QString status_; - private slots: // Slots - // Forward the "changed friendlyname" signal - void forwardChangedFriendlyName(); - // Forward the "changed picture" signal - void forwardChangedPicture(); - signals: // Public signals // Signal that the contact may have changed list affiliation void changedList(Contact *contact); Index: kmess/contact/contactlist.cpp =================================================================== --- kmess/contact/contactlist.cpp (revisione 2199) +++ kmess/contact/contactlist.cpp (copia locale) @@ -114,15 +114,15 @@ // Attach the signals connect( contact, SIGNAL( changedMsnObject(Contact*) ), // Contact changed msnobject. - this, SLOT ( slotForwardContactChangedMsnObject(Contact*) )); + this, SIGNAL( contactChangedMsnObject(Contact*) )); connect( contact, SIGNAL( contactOffline(Contact*,bool) ), // Contact went offline this, SLOT ( slotForwardContactOffline(Contact*,bool) )); connect( contact, SIGNAL( contactOnline(Contact*,bool) ), // Contact went online this, SLOT ( slotForwardContactOnline(Contact*,bool) )); connect( contact, SIGNAL( changedGroup(Contact*) ), // Contact moved - this, SLOT ( slotForwardContactMoved(Contact*) )); + this, SIGNAL( contactMoved(Contact*) )); connect( contact, SIGNAL( changedList(Contact*) ), // Contact was added/removed from certain lists - this, SLOT ( slotForwardContactMoved(Contact*) )); + this, SIGNAL( contactMoved(Contact*) )); // HACK: It would be nicer if the GUI desided whether a contact-item should be moved if it's lists changed. // Currently these signal connection of changedList() assumes the GUI uses "groups to sort various lists". @@ -365,22 +365,6 @@ -// Forward from a contact that it's msn object changed -void ContactList::slotForwardContactChangedMsnObject(Contact *contact) -{ - emit contactChangedMsnObject( contact ); -} - - - -// Forward from a contact that is has moved -void ContactList::slotForwardContactMoved(Contact *contact) -{ - emit contactMoved(contact); -} - - - // Forward from a contact that it is offline void ContactList::slotForwardContactOffline(Contact *contact, bool showBaloon) { Index: kmess/contact/contact.cpp =================================================================== --- kmess/contact/contact.cpp (revisione 2199) +++ kmess/contact/contact.cpp (copia locale) @@ -78,10 +78,10 @@ // also there. extension_ = new ContactExtension( handle ); - connect ( extension_, SIGNAL( changedFriendlyName() ), - this, SLOT( forwardChangedFriendlyName() ) ); - connect ( extension_, SIGNAL( changedPicture() ), - this, SLOT( forwardChangedPicture() ) ); + connect ( extension_, SIGNAL( changedFriendlyName() ), + this, SIGNAL( changedFriendlyName() ) ); + connect ( extension_, SIGNAL( changedPicture() ), + this, SIGNAL( changedPicture() ) ); } @@ -139,22 +139,6 @@ -// Slot to pass on the changedFriendlyName() -void Contact::forwardChangedFriendlyName() -{ - emit changedFriendlyName(); -} - - - -// Forward the "changed picture" signal -void Contact::forwardChangedPicture() -{ - emit changedPicture(); -} - - - // Return the path to the contact's picture QString Contact::getContactPicturePath() const { Index: kmess/contact/contactlist.h =================================================================== --- kmess/contact/contactlist.h (revisione 2199) +++ kmess/contact/contactlist.h (copia locale) @@ -105,10 +105,6 @@ bool groupExists( QString groupId ); private slots: // Private slots - // Forward from a contact that it's msn object changed - void slotForwardContactChangedMsnObject(Contact *contact); - // Forward from a contact that is has moved - void slotForwardContactMoved(Contact *contact); // Forward from a contact that it is offline void slotForwardContactOffline(Contact *contact, bool showBaloon); // Forward from a contact that it is contact is online Index: kmess/chat/chatwindow.h =================================================================== --- kmess/chat/chatwindow.h (revisione 2199) +++ kmess/chat/chatwindow.h (copia locale) @@ -174,8 +174,6 @@ void contactTyping(QString handle, QString friendlyName); // The emoticon button was pressed. void emoticonButtonPressed(); - // Forward the application command to the ChatMaster - void forwardAppCommand(QString cookie, QString contact, QString command); // Invite a contact to the chat void inviteContact(QString handle); // Notify the user of a received nudge Index: kmess/chat/chatmaster.h =================================================================== --- kmess/chat/chatmaster.h (revisione 2199) +++ kmess/chat/chatmaster.h (copia locale) @@ -84,8 +84,6 @@ void forwardRequestNewSwitchboard( QString handle ); // Forward a request to add or remove a contact from the contactlist, which comes from the ContactFrame. void forwardSetContactAdded( QString handle, bool isAdded ); - // Forward a request to allow a contact, which comes from the ContactFrame. - void forwardSetContactAllowed( QString handle ); // Forward a request to block or unblock a contact, which comes from the ContactFrame. void forwardSetContactBlocked( QString handle, bool isBlocked ); // A chat window is closing Index: kmess/chat/chatwindow.cpp =================================================================== --- kmess/chat/chatwindow.cpp (revisione 2199) +++ kmess/chat/chatwindow.cpp (copia locale) @@ -538,14 +538,6 @@ -// Forward the application command to the ChatMaster -void ChatWindow::forwardAppCommand(QString cookie, QString contact, QString command) -{ - emit appCommand(cookie, contact, command); -} - - - // Return the contact action with the given handle ContactAction* ChatWindow::getContactActionByHandle(const QString& handle) { @@ -651,7 +643,7 @@ connect( chatView_, SIGNAL( sendFiles(QStringList) ), this, SLOT( slotStartFileTransfer(QStringList) ) ); connect( chatView_, SIGNAL( appCommand(QString, QString, QString) ), - this, SLOT( forwardAppCommand(QString, QString, QString) ) ); + this, SIGNAL( appCommand(QString, QString, QString) ) ); connect( chatView_, SIGNAL( sendMessageToContact(QString) ), this, SLOT( userSentMessage() ) ); Index: kmess/chat/chatmaster.cpp =================================================================== --- kmess/chat/chatmaster.cpp (revisione 2199) +++ kmess/chat/chatmaster.cpp (copia locale) @@ -155,14 +155,6 @@ -// Forward a request to allow a contact, which comes from the ContactFrame. -void ChatMaster::forwardSetContactAllowed( QString handle ) -{ - emit allowContact( handle ); -} - - - // Forward a request to block or unblock a contact, which comes from the ContactFrame. void ChatMaster::forwardSetContactBlocked( QString handle, bool isBlocked ) { @@ -1306,7 +1298,7 @@ connect( chatWindow, SIGNAL( newChatMessage(const ChatMessage&, ChatWindow*) ), this, SLOT ( forwardNewChatMessage(const ChatMessage&, ChatWindow*) )); connect( chatWindow, SIGNAL( setContactAllowed( QString ) ), - this, SLOT ( forwardSetContactAllowed( QString ) ) ); + this, SIGNAL( allowContact( QString ) ) ); connect( chatWindow, SIGNAL( setContactAdded( QString, bool ) ), this, SLOT ( forwardSetContactAdded( QString, bool ) ) ); connect( chatWindow, SIGNAL( setContactBlocked( QString, bool ) ),