[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-06-04 19:45:03
Message-ID: 20130604194503.3D20FAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1356889 by pali:

Remove overloaded function Contact::customContextMenuActions(ChatSession*) which is not used


 M  +1 -6      libkopete/kopetecontact.cpp  
 M  +0 -5      libkopete/kopetecontact.h  
 M  +0 -4      protocols/skype/skypecontact.cpp  
 M  +0 -1      protocols/skype/skypecontact.h  


--- trunk/KDE/kdenetwork/kopete/libkopete/kopetecontact.cpp #1356888:1356889
@@ -274,7 +274,7 @@
 	// through the use of the customContextMenuActions() function
 
 	// Get the custom actions from the protocols ( pure virtual function )
-	QList<KAction*> *customActions = customContextMenuActions( manager );
+	QList<KAction*> *customActions = customContextMenuActions();
 	if( customActions && !customActions->isEmpty() )
 	{
 		menu->addSeparator();
@@ -518,11 +518,6 @@
 	return 0L;
 }
 
-QList<KAction*> *Contact::customContextMenuActions( ChatSession * /* manager */ )
-{
-	return customContextMenuActions();
-}
-
 bool Contact::isOnline() const
 {
 	return onlineStatus().isDefinitelyOnline();
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetecontact.h #1356888:1356889
@@ -232,11 +232,6 @@
 	virtual QList<KAction *> *customContextMenuActions();
 
 	/**
-	 * @todo  What is this function for ?
-	 */
-	virtual QList<KAction *> *customContextMenuActions( ChatSession *manager );
-
-	/**
 	 * @brief Get the Context Menu for this contact
 	 *
 	 * This menu includes generic actions common to each protocol, and action defined in
--- trunk/KDE/kdenetwork/kopete/protocols/skype/skypecontact.cpp #1356888:1356889
@@ -361,10 +361,6 @@
 	return actions;
 }
 
-QList<KAction*> *SkypeContact::customContextMenuActions(Kopete::ChatSession *) {
-	return customContextMenuActions();
-}
-
 void SkypeContact::enableActions(bool value) {
 	d->callContactAction->setEnabled(value);
 	d->authorizeAction->setEnabled(value);
--- trunk/KDE/kdenetwork/kopete/protocols/skype/skypecontact.h #1356888:1356889
@@ -83,7 +83,6 @@
 		bool hasChat() const;
 		///Tell kopete which actions to show in the contact pop-up menu
 		virtual QList<KAction*> *customContextMenuActions();
-		virtual QList<KAction*> *customContextMenuActions(Kopete::ChatSession *);
 		///Give me actually existing chat session
 		SkypeChatSession *getChatSession();
 		///Can this contact be called now?
[prev in list] [next in list] [prev in thread] [next in thread]