Rename a number of classes to enhance compatibility with KDE4

36 files changed, 146 insertions, 146 deletions

diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 967a47eb..ccecf81a 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -135,17 +135,17 @@ void KPixmapRegionSelectorWidget::updatePixmap()
 }
 
 
-KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
+TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
 {
-   KPopupMenu *popup=new KPopupMenu(this, "PixmapRegionSelectorPopup");
+   TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
    popup->insertTitle(i18n("Image Operations"));
    
-   KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw",
+   TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
                                 0, this, TQT_SLOT(rotateClockwise()),
                                 popup, "rotateclockwise");
    action->plug(popup);
 
-   action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
+   action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
                                 0, this, TQT_SLOT(rotateCounterclockwise()),
                                 popup, "rotatecounterclockwise");
    action->plug(popup);
@@ -215,7 +215,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
 
       if ( mev->button() == RightButton )
       {
-         KPopupMenu *popup = createPopupMenu( );
+         TDEPopupMenu *popup = createPopupMenu( );
          popup->exec( mev->globalPos() );
          delete popup;
          return TRUE;
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
index db95ee37..0eb626ed 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <kimageeffect.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 #include "kopete_export.h"
 
@@ -136,9 +136,9 @@ public slots:
 
 protected:
    /**
-    * Creates a KPopupMenu with the menu that appears when clicking with the right button on the label
+    * Creates a TDEPopupMenu with the menu that appears when clicking with the right button on the label
     */
-   virtual KPopupMenu *createPopupMenu();
+   virtual TDEPopupMenu *createPopupMenu();
 
 private:
    bool eventFilter(TQObject *obj, TQEvent *ev);
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index e1fcf210..b3595516 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -163,15 +163,15 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){
 
     // KDE
     changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int)));
-    changedMap.insert( TQString::fromLatin1("KFontCombo"), TQT_SIGNAL(activated (int)));
-    changedMap.insert( TQString::fromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( TQString::fromLatin1("KFontChooser"),  TQT_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( TQString::fromLatin1("TDEFontCombo"), TQT_SIGNAL(activated (int)));
+    changedMap.insert( TQString::fromLatin1("TDEFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( TQString::fromLatin1("TDEFontChooser"),  TQT_SIGNAL(fontSelected(const TQFont &)));
     changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int)));
 
     changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &)));
     changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate)));
     changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed()));
-    changedMap.insert( TQString::fromLatin1("KListBox"), TQT_SIGNAL(selectionChanged()));
+    changedMap.insert( TQString::fromLatin1("TDEListBox"), TQT_SIGNAL(selectionChanged()));
     changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &)));
     changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &)));
     changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &)));
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index ccca93be..08f7a95e 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -358,10 +358,10 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod
 	return success;
 }
 
-KActionMenu * Account::actionMenu()
+TDEActionMenu * Account::actionMenu()
 {
 	//default implementation
-	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ),  this );
+	TDEActionMenu *menu = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ),  this );
 	TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
 
 	menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
@@ -370,7 +370,7 @@ KActionMenu * Account::actionMenu()
 
 	OnlineStatusManager::self()->createAccountStatusActions(this, menu);
 	menu->popupMenu()->insertSeparator();
-	menu->insert( new KAction ( i18n( "Properties" ),  0, this, TQT_SLOT( editAccount() ), menu, "actionAccountProperties" ) );
+	menu->insert( new TDEAction ( i18n( "Properties" ),  0, this, TQT_SLOT( editAccount() ), menu, "actionAccountProperties" ) );
 
 	return menu;
 }
diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h
index 1cf045d2..a8cd087c 100644
--- a/kopete/libkopete/kopeteaccount.h
+++ b/kopete/libkopete/kopeteaccount.h
@@ -27,7 +27,7 @@
 #include <tqdict.h>
 
 class TQDomNode;
-class KActionMenu;
+class TDEActionMenu;
 class TDEConfigGroup;
 
 namespace Kopete
@@ -221,7 +221,7 @@ public:
 	 *
 	 * @see OnlineStatusManager::registerOnlineStatus
 	 */
-	virtual KActionMenu* actionMenu() ;
+	virtual TDEActionMenu* actionMenu() ;
 
 	/**
 	 * @brief Retrieve the list of contacts for this account
diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h
index 4f8f3bc2..70aaad9d 100644
--- a/kopete/libkopete/kopeteaccountmanager.h
+++ b/kopete/libkopete/kopeteaccountmanager.h
@@ -160,7 +160,7 @@ public slots:
 	 * Make all accounts Available, by setting status, and connecting if necessary.
 	 * Accounts are connected based on their excludeConnect() setting.
 	 * Accounts which are already connected are controlled regardless of their excludeConnect() setting.
-	 * This is a slot, so you can connect directly to it from e.g. a KAction.
+	 * This is a slot, so you can connect directly to it from e.g. a TDEAction.
 	 * @param awayReason is the away(status) message that will be set.
 	 */
 	void setAvailableAll( const TQString &awayReason = TQString() );
diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp
index 537b01fd..12c133f9 100644
--- a/kopete/libkopete/kopeteawayaction.cpp
+++ b/kopete/libkopete/kopeteawayaction.cpp
@@ -36,9 +36,9 @@ public:
 };
 
 
-AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut,
+AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const TDEShortcut &cut,
 	const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
-	: KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) )
+	: TDESelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) )
 {
 	TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ),
 		this, TQT_SLOT( slotAwayChanged() ) );
@@ -52,9 +52,9 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortc
 	slotAwayChanged();
 }
 
-AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const KShortcut &cut,
+AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const TDEShortcut &cut,
 					   const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
-	: KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) )
+	: TDESelectAction(text, pix, cut, parent, name ) , d(new Private( status ) )
 {
 	TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ),
 					  this, TQT_SLOT( slotAwayChanged() ) );
diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h
index 23680ed4..805d6c89 100644
--- a/kopete/libkopete/kopeteawayaction.h
+++ b/kopete/libkopete/kopeteawayaction.h
@@ -32,12 +32,12 @@ class OnlineStatus;
 /**
  * @class Kopete::AwayAction
  *
- * Kopete::AwayAction is a KAction that lets you select an away message
+ * Kopete::AwayAction is a TDEAction that lets you select an away message
  * from the list of predefined away messages, or enter a custom one.
  *
  * @author Jason Keirstead   <[email protected]>
  */
-class KOPETE_EXPORT AwayAction : public KSelectAction
+class KOPETE_EXPORT AwayAction : public TDESelectAction
 {
 	Q_OBJECT
   
@@ -45,10 +45,10 @@ class KOPETE_EXPORT AwayAction : public KSelectAction
 		/**
 		 * Constructor
 		 * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and
-		 * @p name are all handled by KSelectAction.
+		 * @p name are all handled by TDESelectAction.
 		 **/
 		AwayAction(const TQString &text, const TQIconSet &pix,
-				   const KShortcut &cut, const TQObject *receiver, const char *slot,
+				   const TDEShortcut &cut, const TQObject *receiver, const char *slot,
 				   TQObject *parent, const char *name = 0);
 
 		/**
@@ -56,10 +56,10 @@ class KOPETE_EXPORT AwayAction : public KSelectAction
 		 * @param status the OnlineStatus that appears in the signal
 		 * @param slot must have the following signature:  ( const OnlineStatus &, const TQString & )
 		 * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and
-		 * @p name are all handled by KSelectAction.
+		 * @p name are all handled by TDESelectAction.
 		 **/
 		AwayAction(const OnlineStatus &status, const TQString &text, const TQIconSet &pix,
-				   const KShortcut &cut, const TQObject *receiver, const char *slot,
+				   const TDEShortcut &cut, const TQObject *receiver, const char *slot,
 				   TQObject *parent, const char *name = 0);
 
 		/**
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index eba7c4ed..63269c4b 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -55,7 +55,7 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient
 
 			for( TQDictIterator<Kopete::Command> it( mCommands ); it.current(); ++it )
 			{
-				KAction *a = static_cast<KAction*>( it.current() );
+				TDEAction *a = static_cast<TDEAction*>( it.current() );
 				actionCollection()->insert( a );
 				TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") );
 				newNode.setAttribute( TQString::fromLatin1("name"),
@@ -89,7 +89,7 @@ struct CommandHandlerPrivate
 	Kopete::CommandHandler *s_handler;
 	TQMap<TDEProcess*,ManagerPair> processMap;
 	bool inCommand;
-	TQPtrList<KAction> m_commands;
+	TQPtrList<TDEAction> m_commands;
 };
 
 CommandHandlerPrivate *Kopete::CommandHandler::p = 0L;
@@ -157,7 +157,7 @@ Kopete::CommandHandler *Kopete::CommandHandler::commandHandler()
 }
 
 void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot,
-	const TQString &help, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix )
+	const TQString &help, uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
 {
 	TQString lowerCommand = command.lower();
 
@@ -173,7 +173,7 @@ void Kopete::CommandHandler::unregisterCommand( TQObject *parent, const TQString
 }
 
 void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString,
-	const TQString &help, CommandType type, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix )
+	const TQString &help, CommandType type, uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
 {
 	TQString lowerAlias = alias.lower();
 
diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h
index 7c26ace5..ebaae2c1 100644
--- a/kopete/libkopete/kopetecommandhandler.h
+++ b/kopete/libkopete/kopetecommandhandler.h
@@ -88,7 +88,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject
 		 */
 		void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot,
 			const TQString &help = TQString(), uint minArgs = 0, int maxArgs = -1,
-			const KShortcut &cut = 0, const TQString &pix = TQString() );
+			const TDEShortcut &cut = 0, const TQString &pix = TQString() );
 
 		/**
 		 * \brief Register a command alias.
@@ -114,7 +114,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject
 			CommandType = SystemAlias,
 			uint minArgs = 0,
 			int maxArgs = -1,
-			const KShortcut &cut = 0,
+			const TDEShortcut &cut = 0,
 			const TQString &pix = TQString() );
 
 		/**
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 85387709..28266e28 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -193,10 +193,10 @@ void Contact::slotAddContact()
 	}
 }
 
-KPopupMenu* Contact::popupMenu( ChatSession *manager )
+TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
 {
 	// Build the menu
-	KPopupMenu *menu = new KPopupMenu();
+	TDEPopupMenu *menu = new TDEPopupMenu();
 
 	// insert title
 	TQString titleText;
@@ -209,7 +209,7 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
 
 	if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() )
 	{
-		KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ),
+		TDEAction *actionAddContact = new TDEAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ),
 		                                         0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" );
 		actionAddContact->plug( menu );
 		menu->insertSeparator();
@@ -219,15 +219,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
 	bool reach = account()->isConnected() && isReachable();
 	bool myself = (this == account()->myself());
 
-	KAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" );
+	TDEAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" );
 	actionSendMessage->setEnabled( reach && !myself );
 	actionSendMessage->plug( menu );
 
-	KAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" );
+	TDEAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" );
 	actionChat->setEnabled( reach && !myself );
 	actionChat->plug( menu );
 
-	KAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" );
+	TDEAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" );
 	actionSendFile->setEnabled( reach && d->fileCapable && !myself );
 	actionSendFile->plug( menu );
 
@@ -235,12 +235,12 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
 	// through the use of the customContextMenuActions() function
 
 	// Get the custom actions from the protocols ( pure virtual function )
-	TQPtrList<KAction> *customActions = customContextMenuActions( manager );
+	TQPtrList<TDEAction> *customActions = customContextMenuActions( manager );
 	if( customActions && !customActions->isEmpty() )
 	{
 		menu->insertSeparator();
 
-		for( KAction *a = customActions->first(); a; a = customActions->next() )
+		for( TDEAction *a = customActions->first(); a; a = customActions->next() )
 			a->plug( menu );
 	}
 	delete customActions;
@@ -511,12 +511,12 @@ void Contact::setIcon( const TQString& icon )
 	return;
 }
 
-TQPtrList<KAction> *Contact::customContextMenuActions()
+TQPtrList<TDEAction> *Contact::customContextMenuActions()
 {
 	return 0L;
 }
 
-TQPtrList<KAction> *Contact::customContextMenuActions( ChatSession * /* manager */ )
+TQPtrList<TDEAction> *Contact::customContextMenuActions( ChatSession * /* manager */ )
 {
 	return customContextMenuActions();
 }
diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h
index a268920f..f8a6052d 100644
--- a/kopete/libkopete/kopetecontact.h
+++ b/kopete/libkopete/kopetecontact.h
@@ -28,8 +28,8 @@
 #include "kopete_export.h"
 
 class TQImage;
-class KPopupMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEAction;
 
 namespace Kopete
 {
@@ -223,12 +223,12 @@ public:
 	 * @return Collection of menu items to be show on the context menu
 	 * @todo if possible, try to use KXMLGUI
 	 */
-	virtual TQPtrList<KAction> *customContextMenuActions();
+	virtual TQPtrList<TDEAction> *customContextMenuActions();
 
 	/**
 	 * @todo  What is this function for ?
 	 */
-	virtual TQPtrList<KAction> *customContextMenuActions( ChatSession *manager );
+	virtual TQPtrList<TDEAction> *customContextMenuActions( ChatSession *manager );
 
 	/**
 	 * @brief Get the Context Menu for this contact
@@ -236,7 +236,7 @@ public:
 	 * This menu includes generic actions common to each protocol, and action defined in
 	 * @ref customContextMenuActions()
 	 */
-	KPopupMenu *popupMenu( ChatSession *manager = 0L );
+	TDEPopupMenu *popupMenu( ChatSession *manager = 0L );
 
 	/**
 	 * \brief Get whether or not this contact is capable of file transfers
@@ -426,7 +426,7 @@ public slots:
 
 	/**
 	 * Changes the MetaContact that this contact is a part of.  This function
-	 * is called by the KAction changeMetaContact that is part of the context
+	 * is called by the TDEAction changeMetaContact that is part of the context
 	 * menu.
 	 */
 	void changeMetaContact();
diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h
index c929ac13..742c9c67 100644
--- a/kopete/libkopete/kopetecontactlist.h
+++ b/kopete/libkopete/kopetecontactlist.h
@@ -224,7 +224,7 @@ signals:
 	/**
 	 * This signal is emitted each time the selection has changed. the bool is set to true if only one meta contact has been selected,
 	 * and set to false if none, or several contacts are selected
-	 * you can connect this signal to KAction::setEnabled if you have an action which is applied to only one contact
+	 * you can connect this signal to TDEAction::setEnabled if you have an action which is applied to only one contact
 	 */
 	void metaContactSelected(bool);
 
diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h
index b1308131..6ad34c55 100644
--- a/kopete/libkopete/kopeteonlinestatus.h
+++ b/kopete/libkopete/kopeteonlinestatus.h
@@ -181,7 +181,7 @@ public:
 	 * Constructor.
 	 *
 	 * @p Creates a new OnlineStatus object and registers it with the @ref Kopete::OnlineStatusManager.
-	 * Registration allows you to generate a KActionMenu filled with KActions for changing to this OnlineStatus,
+	 * Registration allows you to generate a TDEActionMenu filled with TDEActions for changing to this OnlineStatus,
 	 * using Kopete::Account::accountMenu().
 	 *
 	 * @p Note that weight has an additional significance for registered protocols when used for menu generation.
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 07b23e81..c583198a 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -368,7 +368,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 	return basis;
 }
 
-void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent)
+void OnlineStatusManager::createAccountStatusActions( Account *account , TDEActionMenu *parent)
 {
 	Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()];
 	Private::ProtocolMap::Iterator it;
@@ -380,14 +380,14 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction
 
 		OnlineStatus status=it.key();
 		TQString caption=it.data().caption;
-		KAction *action;
+		TDEAction *action;
 
 		// Any existing actions owned by the account are reused by recovering them
 		// from the parent's child list.
 		// The description of the onlinestatus is used as the qobject name
 		// This is safe as long as OnlineStatus are immutable
 		TQCString actionName = status.description().ascii();
-		if ( !( action = static_cast<KAction*>( account->child( actionName ) ) ) )
+		if ( !( action = static_cast<TDEAction*>( account->child( actionName ) ) ) )
 		{
 			if(options & OnlineStatusManager::HasAwayMessage)
 			{
@@ -417,7 +417,7 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction
 
 
 OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name)
-		: KAction( text, pix, KShortcut() , parent, name) , m_status(status)
+		: TDEAction( text, pix, TDEShortcut() , parent, name) , m_status(status)
 {
 	connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated()));
 }
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h
index 92650fce..0ddd0745 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.h
+++ b/kopete/libkopete/kopeteonlinestatusmanager.h
@@ -26,7 +26,7 @@
 class TQString;
 class TQPixmap;
 class TQColor;
-class KActionMenu;
+class TDEActionMenu;
 
 namespace Kopete
 {
@@ -115,7 +115,7 @@ public:
 	 * @param account the account
 	 * @param parent  the ActionMenu where action are inserted
 	 */
-	void createAccountStatusActions( Account *account , KActionMenu *parent);
+	void createAccountStatusActions( Account *account , TDEActionMenu *parent);
 
 	/**
 	 * return the status of the @p protocol which is in the category @p category
@@ -149,7 +149,7 @@ private:
 /**
  * @internal
  */
-class OnlineStatusAction : public KAction
+class OnlineStatusAction : public TDEAction
 {
 	Q_OBJECT
   
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h
index c3dacdac..54edc414 100644
--- a/kopete/libkopete/kopeteplugin.h
+++ b/kopete/libkopete/kopeteplugin.h
@@ -28,7 +28,7 @@
 
 #include <kopetemessage.h> //TODO: remove
 namespace DOM  { class Node; }  //TODO: remove
-class KAction; //TODO: remove
+class TDEAction; //TODO: remove
 
 
 class KPluginInfo;
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index d86313d8..116fee30 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -27,8 +27,8 @@
 
 Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot,
 	const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString,
-	uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix )
-	: KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent,
+	uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
+	: TDEAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent,
 	( command.lower() + TQString::fromLatin1("_command") ).latin1() )
 {
 	init( command, handlerSlot, help, type, formatString, minArgs, maxArgs );
@@ -88,7 +88,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession
 			"\"%1\" has a maximum of %n arguments.", m_minArgs)
 			.arg( text() ), manager, gui );
 	}
-	else if( !TDEApplication::kApplication()->authorizeKAction( name() ) )
+	else if( !TDEApplication::kApplication()->authorizeTDEAction( name() ) )
 	{
 		printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui );
 	}
diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h
index 80e68fea..177f3b80 100644
--- a/kopete/libkopete/private/kopetecommand.h
+++ b/kopete/libkopete/private/kopetecommand.h
@@ -27,7 +27,7 @@ namespace Kopete
 
 class ChatSession;
 
-class Command : public KAction
+class Command : public TDEAction
 {
 	Q_OBJECT
   
@@ -52,7 +52,7 @@ class Command : public KAction
 		 */
 		 Command( TQObject *parent, const TQString &command, const char* handlerSlot,
 		 	const TQString &help = TQString(), CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString(),
-			uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0,
+			uint minArgs = 0, int maxArgs = -1, const TDEShortcut &cut = 0,
 			const TQString &pix = TQString() );
 
 		/**
diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index 345e9ab4..f6cd3855 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -26,14 +26,14 @@
 #include <kdebug.h>
 #include <klistview.h>
 
-class AccountListViewItem : public KListViewItem
+class AccountListViewItem : public TDEListViewItem
 {
 	private:
 		Kopete::Account *mAccount;
 
 	public:
 		AccountListViewItem(TQListView *parent, Kopete::Account *acc)
-			: KListViewItem(parent)
+			: TDEListViewItem(parent)
 		{
 			if (acc==0)
 				return;
@@ -57,7 +57,7 @@ class AccountListViewItem : public KListViewItem
 class AccountSelectorPrivate
 {
 	public:
-		KListView *lv;
+		TDEListView *lv;
 		Kopete::Protocol *proto;
 };
 
@@ -93,7 +93,7 @@ void AccountSelector::initUI()
 {
 	kdDebug(14010) << k_funcinfo << endl;
 	(new TQVBoxLayout(this))->setAutoAdd(true);
-	d->lv = new KListView(this);
+	d->lv = new TDEListView(this);
 	d->lv->setFullWidth(true);
 	d->lv->addColumn(TQString::fromLatin1(""));
 	d->lv->header()->hide();
diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h
index f675603f..6beb35c9 100644
--- a/kopete/libkopete/ui/accountselector.h
+++ b/kopete/libkopete/ui/accountselector.h
@@ -25,7 +25,7 @@
 class AccountSelectorPrivate;
 class TQListViewItem;
 /**
- * \brief widget to select an account, based on KListView
+ * \brief widget to select an account, based on TDEListView
  * @author Stefan Gehn <metz AT gehn.net>
  */
 class KOPETE_EXPORT AccountSelector : public TQWidget
@@ -38,7 +38,7 @@ Q_OBJECT
 		 * Constructor.
 		 *
 		 * The parameters @p parent and @p name are handled by
-		 * KListView.
+		 * TDEListView.
 		 */
 		AccountSelector(TQWidget *parent=0, const char *name=0);
 
@@ -46,7 +46,7 @@ Q_OBJECT
 		 * Constructor for a list of accounts for one protocol only
 		 *
 		 * The parameters @p parent and @p name are handled by
-		 * KListView. @p proto defines the protocol whose accounts are
+		 * TDEListView. @p proto defines the protocol whose accounts are
 		 * shown in the list
 		 */
 		AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0);
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 5a75bbf9..16009ee5 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -72,7 +72,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch
 	
 	connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
 	
-	//We should add a clear KAction here.  But we can't really do that with a designer file :\  this sucks
+	//We should add a clear TDEAction here.  But we can't really do that with a designer file :\  this sucks
 
 	addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email"));
 
diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
index 423b2047..ee4c2016 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui
+++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
@@ -71,7 +71,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="KListView" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TDEListView" row="2" column="0" rowspan="1" colspan="2">
             <column>
                 <property name="text">
                     <string>Photo</string>
@@ -153,7 +153,7 @@
                         <cstring>kListViewSearchLine</cstring>
                     </property>
                 </widget>
-                <widget class="KListViewSearchLine">
+                <widget class="TDEListViewSearchLine">
                     <property name="name">
                         <cstring>kListViewSearchLine</cstring>
                     </property>
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 9fa9f023..724f277c 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -28,7 +28,7 @@
 #include "addresseeitem.h"
 
 AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) :
-  KListViewItem( parent ),
+  TDEListViewItem( parent ),
   mAddressee( addressee )
 {
   //We can't save showphoto because we don't have a d pointer
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index 36d1d284..29546ebc 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -32,7 +32,7 @@
 /**
   @short Special ListViewItem
 */
-class AddresseeItem : public KListViewItem
+class AddresseeItem : public TDEListViewItem
 {
   public:
 
diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp
index cc6754d2..b2e8dba0 100644
--- a/kopete/libkopete/ui/kopetecontactaction.cpp
+++ b/kopete/libkopete/ui/kopetecontactaction.cpp
@@ -1,5 +1,5 @@
 /*
-    kopetecontactaction.cpp - KAction for selecting a Kopete::Contact
+    kopetecontactaction.cpp - TDEAction for selecting a Kopete::Contact
 
     Copyright (c) 2003 by Martijn Klingens       <[email protected]>
 
@@ -22,8 +22,8 @@
 #include "kopeteonlinestatus.h"
 
 KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver,
-	const char *slot, KAction *parent )
-: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(),
+	const char *slot, TDEAction *parent )
+: TDEAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), TDEShortcut(),
 	parent, contact->contactId().latin1() )
 {
 	m_contact = contact;
diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h
index 15143697..3b370916 100644
--- a/kopete/libkopete/ui/kopetecontactaction.h
+++ b/kopete/libkopete/ui/kopetecontactaction.h
@@ -1,5 +1,5 @@
 /*
-    kopetecontactaction.cpp - KAction for selecting a Kopete::Contact
+    kopetecontactaction.cpp - TDEAction for selecting a Kopete::Contact
 
     Copyright (c) 2003 by Martijn Klingens       <[email protected]>
 
@@ -29,7 +29,7 @@ class Contact;
 /**
  * @author Martijn Klingens <[email protected]>
  */
-class KOPETE_EXPORT KopeteContactAction : public KAction
+class KOPETE_EXPORT KopeteContactAction : public TDEAction
 {
 	Q_OBJECT
   
@@ -38,7 +38,7 @@ public:
 	/**
 	 * Create a new KopeteContactAction
 	 */
-	KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent );
+	KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, TDEAction* parent );
 	~KopeteContactAction();
 
 	Kopete::Contact * contact() const;
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index b0f7e787..44b2a8d9 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -103,7 +103,7 @@ struct ListView::Private
 };
 
 ListView::ListView( TQWidget *parent, const char *name )
- : KListView( parent, name ), d( new Private )
+ : TDEListView( parent, name ), d( new Private )
 {
 	connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) );
 
@@ -111,8 +111,8 @@ ListView::ListView( TQWidget *parent, const char *name )
 	setShowToolTips( false );
 	d->toolTip.reset( new ToolTip( viewport(), this ) );
 
-	connect( this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ),
-	         TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) );
+	connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
+	         TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 	connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
 	         TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
 
@@ -147,7 +147,7 @@ void ListView::slotDoubleClicked( TQListViewItem *item )
 		setOpen( item, !isOpen( item ) );
 }
 
-void ListView::slotContextMenu( KListView * /*listview*/,
+void ListView::slotContextMenu( TDEListView * /*listview*/,
 	TQListViewItem *item, const TQPoint &/*point*/ )
 {
 	if ( item && !item->isSelected() )
@@ -197,7 +197,7 @@ void ListView::keyPressEvent( TQKeyEvent *e )
 		emitExecute( currentItem(), p, 0 );
 	}
 	else
-		KListView::keyPressEvent(e);
+		TDEListView::keyPressEvent(e);
 }
 
 void ListView::delayedSort()
diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h
index 79a96dbb..98ae4b19 100644
--- a/kopete/libkopete/ui/kopetelistview.h
+++ b/kopete/libkopete/ui/kopetelistview.h
@@ -29,7 +29,7 @@ namespace ListView {
  * @author Engin AYDOGAN <[email protected]>
  * @author Richard Smith <[email protected]>
  */
-class ListView : public KListView
+class ListView : public TDEListView
 {
 	Q_OBJECT
   
@@ -59,7 +59,7 @@ public slots:
 protected:
 	virtual void keyPressEvent( TQKeyEvent *e );
 private slots:
-	void slotContextMenu(KListView*,TQListViewItem *item, const TQPoint &point );
+	void slotContextMenu(TDEListView*,TQListViewItem *item, const TQPoint &point );
 	void slotDoubleClicked( TQListViewItem *item );
 private:
 	struct Private;
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 03616908..6a0cfae4 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1280,13 +1280,13 @@ bool Item::Private::fadeVisibility = true;
 bool Item::Private::foldVisibility = true;
 
 Item::Item( TQListViewItem *parent, TQObject *owner, const char *name )
- : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) )
+ : TQObject( owner, name ), TDEListViewItem( parent ), d( new Private(this) )
 {
 	initLVI();
 }
 
 Item::Item( TQListView *parent, TQObject *owner, const char *name )
- : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) )
+ : TQObject( owner, name ), TDEListViewItem( parent ), d( new Private(this) )
 {
 	initLVI();
 }
@@ -1469,7 +1469,7 @@ void Item::relayout()
 
 void Item::setup()
 {
-	KListViewItem::setup();
+	TDEListViewItem::setup();
 	slotLayoutItems();
 }
 
@@ -1484,7 +1484,7 @@ void Item::setHeight( int )
 		int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps );
 		minHeight = (minHeight * vis) / Private::visibilityFoldSteps;
 	}
-	KListViewItem::setHeight( minHeight );
+	TDEListViewItem::setHeight( minHeight );
 }
 
 int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const
@@ -1498,15 +1498,15 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
 {
 	TQPixmap back( width, height() );
 	TQPainter paint( &back );
-	//KListViewItem::paintCell( &paint, cg, column, width, align );
+	//TDEListViewItem::paintCell( &paint, cg, column, width, align );
 	// PASTED FROM KLISTVIEWITEM:
 	// set the alternate cell background colour if necessary
 	TQColorGroup _cg = cg;
 	if (isAlternate())
 		if (listView()->viewport()->backgroundMode()==TQt::FixedColor)
-			_cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground());
+			_cg.setColor(TQColorGroup::Background, static_cast< TDEListView* >(listView())->alternateBackground());
 		else
-			_cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground());
+			_cg.setColor(TQColorGroup::Base, static_cast< TDEListView* >(listView())->alternateBackground());
 	// PASTED FROM TQLISTVIEWITEM
 	{
 		TQPainter *p = &paint;
diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index 8285047a..871f1a6d 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -451,7 +451,7 @@ public:
  *
  * @author Richard Smith <[email protected]>
  */
-class Item : public TQObject, public KListViewItem, public ComponentBase
+class Item : public TQObject, public TDEListViewItem, public ComponentBase
 {
 	Q_OBJECT
   
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
index edb63ffc..24acfb08 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp
@@ -25,12 +25,12 @@ namespace UI {
 namespace ListView {
 
 SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name )
-	: KListViewSearchLine( parent, listView, name )
+	: TDEListViewSearchLine( parent, listView, name )
 {
 }
 
 SearchLine::SearchLine(TQWidget *parent, const char *name)
-	: KListViewSearchLine( parent, 0, name )
+	: TDEListViewSearchLine( parent, 0, name )
 {
 }
 
@@ -58,9 +58,9 @@ void SearchLine::updateSearch( const TQString &s )
 	
 	switch( listView()->selectionMode() )
 	{
-	case KListView::NoSelection:
+	case TDEListView::NoSelection:
 		break;
-	case KListView::Single:
+	case TDEListView::Single:
 		currentItem = listView()->selectedItem();
 		break;
 	default:
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h
index 55d3ce91..70b419d5 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.h
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.h
@@ -26,7 +26,7 @@ namespace ListView {
 
 class ListView;
 
-class SearchLine : public KListViewSearchLine
+class SearchLine : public TDEListViewSearchLine
 {
 	Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 	SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 );
 	/**
 	 * Constructs a SearchLine without any ListView to filter. The
-	 * KListView object has to be set later with setListView().
+	 * TDEListView object has to be set later with setListView().
 	 */
 	SearchLine(TQWidget *parent, const char *name);
 	/**
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index f69adcfc..5a589293 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -36,11 +36,11 @@
 
 KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L;
 
-KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name )
+KopetePreferencesAction::KopetePreferencesAction( TDEActionCollection *parent, const char *name )
 #if KDE_IS_VERSION( 3, 3, 90 )
-: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
+: TDEAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
 #else
-: KAction( KGuiItem( i18n( "&Configure Kopete..." ),
+: TDEAction( KGuiItem( i18n( "&Configure Kopete..." ),
 	TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name )
 #endif
 {
@@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences()
 	KWin::activateWindow( s_settingsDialog->dialog()->winId() );
 }
 
-KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name )
+TDEAction * KopeteStdAction::preferences( TDEActionCollection *parent, const char *name )
 {
 	return new KopetePreferencesAction( parent, name );
 }
 
-KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
+	return new TDEAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
+TDEAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
 {
-	return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
+TDEAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
 }
 
-KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
+TDEAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
 {
-	return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
+	return new TDEAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
 }
 
 #include "kopetestdaction.moc"
diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h
index 895ad180..376548b9 100644
--- a/kopete/libkopete/ui/kopetestdaction.h
+++ b/kopete/libkopete/ui/kopetestdaction.h
@@ -34,57 +34,57 @@ public:
 	/**
 	 * Standard action to start a chat
 	 */
-	static KAction *chat( const TQObject *recvr, const char *slot,
+	static TDEAction *chat( const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0 );
 	/**
 	 * Standard action to send a single message
 	 */
-	static KAction *sendMessage(const TQObject *recvr, const char *slot,
+	static TDEAction *sendMessage(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to open a user info dialog
 	 */
-	static KAction *contactInfo(const TQObject *recvr, const char *slot,
+	static TDEAction *contactInfo(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to open a history dialog or something similar
 	 */
-	static KAction *viewHistory(const TQObject *recvr, const char *slot,
+	static TDEAction *viewHistory(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to initiate sending a file to a contact
 	 */
-	static KAction *sendFile(const TQObject *recvr, const char *slot,
+	static TDEAction *sendFile(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to change a contacts @ref Kopete::MetaContact
 	 */
-	static KAction *changeMetaContact(const TQObject *recvr, const char *slot,
+	static TDEAction *changeMetaContact(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to add a group
 	 */
-	static KAction *addGroup(const TQObject *recvr, const char *slot,
+	static TDEAction *addGroup(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to delete a contact
 	 */
-	static KAction *deleteContact(const TQObject *recvr, const char *slot,
+	static TDEAction *deleteContact(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to change a contact alias/nickname in your contactlist
 	 */
-	static KAction *changeAlias(const TQObject *recvr, const char *slot,
+	static TDEAction *changeAlias(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to block a contact
 	 */
-	static KAction *blockContact(const TQObject *recvr, const char *slot,
+	static TDEAction *blockContact(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 	/**
 	 * Standard action to unblock a contact
 	 */
-	static KAction *unblockContact(const TQObject *recvr, const char *slot,
+	static TDEAction *unblockContact(const TQObject *recvr, const char *slot,
 		TQObject* parent, const char *name = 0);
 
 	/**
@@ -92,7 +92,7 @@ public:
 	 *
 	 * The object has no signal/slot, the prefs are automatically shown
 	 */
-	static KAction *preferences(KActionCollection *parent, const char *name = 0);
+	static TDEAction *preferences(TDEActionCollection *parent, const char *name = 0);
 };
 
 
@@ -101,13 +101,13 @@ namespace KSettings
 	  class Dialog;
 }
 
-class KOPETE_EXPORT KopetePreferencesAction : public KAction
+class KOPETE_EXPORT KopetePreferencesAction : public TDEAction
 {
 	  Q_OBJECT
   
 
 	  public:
-			 KopetePreferencesAction( KActionCollection *parent, const char *name = 0 );
+			 KopetePreferencesAction( TDEActionCollection *parent, const char *name = 0 );
 			 ~KopetePreferencesAction();
 
 	  protected slots:
diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h
index c54b1dba..b1daf472 100644
--- a/kopete/libkopete/ui/kopeteview.h
+++ b/kopete/libkopete/ui/kopeteview.h
@@ -136,7 +136,7 @@ class KOPETE_EXPORT KopeteView
 		 * menus that can be extended
 		 *
 		 * @param target A target TQObject for the contextMenuEvent signal of the view
-		 * @param slot A slot that matches the signature ( TQString&, KPopupMenu *)
+		 * @param slot A slot that matches the signature ( TQString&, TDEPopupMenu *)
 		 */
 		virtual void registerContextMenuHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); };
 
@@ -152,7 +152,7 @@ class KOPETE_EXPORT KopeteView
 		* to show tooltips
 		*
 		* @param target A target TQObject for the contextMenuEvent signal of the view
-		* @param slot A slot that matches the signature ( TQString&, KPopupMenu *)
+		* @param slot A slot that matches the signature ( TQString&, TDEPopupMenu *)
 		*/
 		virtual void registerTooltipHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); };