Rename a number of classes to enhance compatibility with KDE4

4 files changed, 18 insertions, 18 deletions

diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index cc906447..eb601ffc 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -43,15 +43,15 @@ TestbedAccount::~TestbedAccount()
 	delete m_server;
 }
 
-KActionMenu* TestbedAccount::actionMenu()
+TDEActionMenu* TestbedAccount::actionMenu()
 {
-	KActionMenu *mActionMenu = Kopete::Account::actionMenu();
+	TDEActionMenu *mActionMenu = Kopete::Account::actionMenu();
 
 	mActionMenu->popupMenu()->insertSeparator();
 
-	KAction *action;
+	TDEAction *action;
 	
-	action = new KAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo");
+	action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo");
 	mActionMenu->insert(action);
 	action->setEnabled( isConnected() );
 
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index f57d41d1..7eb319b8 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -20,7 +20,7 @@
 #include <kopeteaccount.h>
 #include "testbedwebcamdialog.h"
 
-class KActionMenu;
+class TDEActionMenu;
 namespace Kopete { class Contact; }
 namespace Kopete { class MetaContact; }
 
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Construct the context menu used for the status bar icon
 	 */
-	virtual KActionMenu* actionMenu();
+	virtual TDEActionMenu* actionMenu();
 
 	/**
 	 * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
@@ -85,19 +85,19 @@ protected:
 
 protected slots:
 	/**
-	 * Change the account's status.  Called by KActions and internally.
+	 * Change the account's status.  Called by TDEActions and internally.
 	 */
 	void slotGoOnline();
 	/**
-	 * Change the account's status.  Called by KActions and internally.
+	 * Change the account's status.  Called by TDEActions and internally.
 	 */
 	void slotGoAway();
 	/**
-	 * Change the account's status.  Called by KActions and internally.
+	 * Change the account's status.  Called by TDEActions and internally.
 	 */
 	void slotGoOffline();
 	/**
-	 * Show webcam.  Called by KActions and internally.
+	 * Show webcam.  Called by TDEActions and internally.
 	 */
 	void slotShowVideo();
 
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index bf110872..d383c04c 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -82,11 +82,11 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags )
 }
 
 
-TQPtrList<KAction> *TestbedContact::customContextMenuActions() //OBSOLETE
+TQPtrList<TDEAction> *TestbedContact::customContextMenuActions() //OBSOLETE
 {
 	//FIXME!!!  this function is obsolete, we should use XMLGUI instead
-	/*m_actionCollection = new KActionCollection( this, "userColl" );
-	m_actionPrefs = new KAction(i18n( "&Contact Settings" ), 0, this,
+	/*m_actionCollection = new TDEActionCollection( this, "userColl" );
+	m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this,
 			TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
 
 	return m_actionCollection;*/
diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h
index 3ad16124..c4fb17dd 100644
--- a/kopete/protocols/testbed/testbedcontact.h
+++ b/kopete/protocols/testbed/testbedcontact.h
@@ -21,8 +21,8 @@
 #include "kopetecontact.h"
 #include "kopetemessage.h"
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 namespace Kopete { class Account; }
 namespace Kopete { class ChatSession; }
 namespace Kopete { class MetaContact; }
@@ -56,7 +56,7 @@ public:
 	/**
 	 * Return the actions for this contact
 	 */
-	virtual TQPtrList<KAction> *customContextMenuActions();
+	virtual TQPtrList<TDEAction> *customContextMenuActions();
 	/**
 	 * Returns a Kopete::ChatSession associated with this contact
 	 */
@@ -88,9 +88,9 @@ protected slots:
 	
 protected:
 	Kopete::ChatSession* m_msgManager;
-	KActionCollection* m_actionCollection;
+	TDEActionCollection* m_actionCollection;
 	TestbedContactType m_type;
-	KAction* m_actionPrefs;
+	TDEAction* m_actionPrefs;
 };
 
 #endif