Rename a number of classes to enhance compatibility with KDE4

41 files changed, 319 insertions, 319 deletions

diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
index 04ab9f9a..5c722a0e 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
@@ -66,7 +66,7 @@
                 </spacer>
             </vbox>
         </widget>
-        <widget class="KListView" row="1" column="1">
+        <widget class="TDEListView" row="1" column="1">
             <column>
                 <property name="text">
                     <string>Name</string>
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
index 26d3b909..ff9ec4dc 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
@@ -250,7 +250,7 @@
                     <cstring>groupList</cstring>
                 </property>
             </widget>
-            <widget class="KListView" row="6" column="0" rowspan="1" colspan="2">
+            <widget class="TDEListView" row="6" column="0" rowspan="1" colspan="2">
                 <column>
                     <property name="text">
                         <string>Groups</string>
@@ -343,7 +343,7 @@
                     <string>&lt;p&gt;&lt;i&gt;Note&lt;/i&gt;: If a messaging service is missing from the list, please make sure you have created an account for it in Kopete, and that it ready to add new contacts.&lt;/p&gt;</string>
                 </property>
             </widget>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <column>
                     <property name="text">
                         <string>Account</string>
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
index cc8d9ce0..5bd2f3a8 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
@@ -80,7 +80,7 @@
                             <string>&lt;p&gt;&lt;h2&gt;Select IM Accounts&lt;/h2&gt;&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>Account</string>
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
index eed962f9..15b9fb56 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
@@ -40,7 +40,7 @@
 class ChatMembersListWidget::ToolTip : public TQToolTip
 {
 public:
-	ToolTip( KListView *parent )
+	ToolTip( TDEListView *parent )
 		: TQToolTip( parent->viewport() ), m_listView ( parent )
 	{
 	}
@@ -61,7 +61,7 @@ public:
 	}
 
 private:
-	KListView *m_listView;
+	TDEListView *m_listView;
 };
 
 //END ChatMembersListWidget::ToolTip
@@ -70,7 +70,7 @@ private:
 //BEGIN ChatMembersListWidget::ContactItem
 
 ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, Kopete::Contact *contact )
-	: KListViewItem( parent ), m_contact( contact )
+	: TDEListViewItem( parent ), m_contact( contact )
 {
 	TQString nick = m_contact->property(Kopete::Global::Properties::self()->nickName().key()).value().toString();
 	if ( nick.isEmpty() )
@@ -111,7 +111,7 @@ void ChatMembersListWidget::ContactItem::reposition()
 	int ourWeight = session->contactOnlineStatus(m_contact).weight();
 	TQListViewItem *after = 0;
 
-	for ( TQListViewItem *it = KListViewItem::listView()->firstChild(); it; it = it->nextSibling() )
+	for ( TQListViewItem *it = TDEListViewItem::listView()->firstChild(); it; it = it->nextSibling() )
 	{
 		ChatMembersListWidget::ContactItem *item = static_cast<ChatMembersListWidget::ContactItem*>(it);
 		int theirWeight = session->contactOnlineStatus(item->m_contact).weight();
@@ -134,7 +134,7 @@ void ChatMembersListWidget::ContactItem::reposition()
 //BEGIN ChatMembersListWidget
 
 ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name )
-	 : KListView( parent, name ), m_session( session )
+	 : TDEListView( parent, name ), m_session( session )
 {
 	// use our own custom tooltips
 	setShowToolTips( false );
@@ -154,8 +154,8 @@ ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWi
 	for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it )
 		slotContactAdded( *it );
 
-	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( executed( TQListViewItem* ) ),
 	         TQT_SLOT( slotExecute( TQListViewItem * ) ) );
 
@@ -171,11 +171,11 @@ ChatMembersListWidget::~ChatMembersListWidget()
 {
 }
 
-void ChatMembersListWidget::slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &point )
+void ChatMembersListWidget::slotContextMenu( TDEListView*, TQListViewItem *item, const TQPoint &point )
 {
 	if ( ContactItem *contactItem = dynamic_cast<ContactItem*>(item) )
 	{
-		KPopupMenu *p = contactItem->contact()->popupMenu( session() );
+		TDEPopupMenu *p = contactItem->contact()->popupMenu( session() );
 		connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) );
 		p->popup( point );
 	}
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h
index 0c1668fa..5108ae5c 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.h
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h
@@ -32,7 +32,7 @@ class OnlineStatus;
 /**
  * @author Richard Smith <kde@metafoo.co.uk>
  */
-class ChatMembersListWidget : public KListView
+class ChatMembersListWidget : public TDEListView
 {
 	Q_OBJECT
   
@@ -61,7 +61,7 @@ private slots:
 	/**
 	 * Show the context menu for @p item at @p point
 	 */
-	void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &point );
+	void slotContextMenu( TDEListView*, TQListViewItem *item, const TQPoint &point );
 
 	/**
 	 * Called when a contact is added to the chat session.
@@ -96,7 +96,7 @@ private:
 	ToolTip *m_toolTip;
 };
 
-class ChatMembersListWidget::ContactItem : public TQObject, public KListViewItem
+class ChatMembersListWidget::ContactItem : public TQObject, public TDEListViewItem
 {
 	Q_OBJECT
   
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 8b7d5e3e..52d5e99e 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -142,12 +142,12 @@ public:
 
 	DOM::HTMLElement activeElement;
 
-	KAction *copyAction;
-	KAction *saveAction;
-	KAction *printAction;
-	KAction *closeAction;
-	KAction *copyURLAction;
-        KAction *importEmoticon;
+	TDEAction *copyAction;
+	TDEAction *saveAction;
+	TDEAction *printAction;
+	TDEAction *closeAction;
+	TDEAction *copyURLAction;
+        TDEAction *importEmoticon;
 
 	ChatWindowStyle *currentChatStyle;
 	Kopete::Contact *latestContact;
@@ -263,8 +263,8 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
 	d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() );
 	d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() );
 	d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() );
-        d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() );
-	d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
+        d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() );
+	d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
 
 	// read formatting override flags
 	readOverrides();
@@ -710,7 +710,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
 	if ( d->activeElement.isNull() )
 		return;
 
-	KPopupMenu *chatWindowPopup = 0L;
+	TDEPopupMenu *chatWindowPopup = 0L;
 
 	if ( Kopete::Contact *contact = contactFromNode( d->activeElement ) )
 	{
@@ -719,7 +719,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
 	}
 	else
 	{
-		chatWindowPopup = new KPopupMenu();
+		chatWindowPopup = new TDEPopupMenu();
 
 		if ( d->activeElement.className() == "KopeteDisplayName" )
 		{
diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h
index 278291bb..dc94a799 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.h
+++ b/kopete/kopete/chatwindow/chatmessagepart.h
@@ -30,7 +30,7 @@ namespace Kopete
 	class ChatSession; 
 	class Contact; 
 }
-class KPopupMenu;
+class TDEPopupMenu;
 class ChatWindowStyle;
 
 /**
@@ -128,7 +128,7 @@ signals:
 	/**
 	 * Emits before the context menu is about to show
 	 */
-	void contextMenuEvent(  const TQString &textUnderMouse, KPopupMenu *popupMenu );
+	void contextMenuEvent(  const TQString &textUnderMouse, TDEPopupMenu *popupMenu );
 
 	/**
 	 * Emits before the tooltip is about to show
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index 487f80c5..bf40970a 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -1067,7 +1067,7 @@ void ChatView::dropEvent ( TQDropEvent * event )
 void ChatView::registerContextMenuHandler( TQObject *target, const char* slot )
 {
 	connect( m_messagePart,
-		TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, KPopupMenu * ) ),
+		TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ),
 		target,
 		slot
 	);
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index a330dc43..5d1d2d11 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -287,7 +287,7 @@ void KopeteChatWindow::slotTabContextMenu( TQWidget *tab, const TQPoint &pos )
 {
 	m_popupView = static_cast<ChatView*>( tab );
 
-	KPopupMenu *popup = new KPopupMenu;
+	TDEPopupMenu *popup = new TDEPopupMenu;
 	popup->insertTitle( KStringHandler::rsqueeze( m_popupView->caption() ) );
 
 	actionContactMenu->plug( popup );
@@ -309,42 +309,42 @@ ChatView *KopeteChatWindow::activeView()
 
 void KopeteChatWindow::initActions(void)
 {
-	KActionCollection *coll = actionCollection();
+	TDEActionCollection *coll = actionCollection();
 
 	createStandardStatusBarAction();
 
-	chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) ,
+	chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) ,
 		TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
 	chatSend->setEnabled( false );
 
  	KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll );
  	KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll );
-	KAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll );
+	TDEAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll );
 	quitAction->setText( i18n("Close All Chats") );
 
 	tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
 
-	tabRight=new KAction( i18n( "&Activate Next Tab" ), 0, KStdAccel::tabNext(),
+	tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
 		TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
-	tabLeft=new KAction( i18n( "&Activate Previous Tab" ), 0, KStdAccel::tabPrev(),
+	tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
 		TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
 	tabLeft->setEnabled( false );
 	tabRight->setEnabled( false );
 
-	nickComplete = new KAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
+	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
 	nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
 
-	tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
+	tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
 	tabDetach->setEnabled( false );
 
-	actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
+	actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
 	actionDetachMenu->setDelayed( false );
 
 	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) );
 	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) );
 
-	actionTabPlacementMenu = new KActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" );
+	actionTabPlacementMenu = new TDEActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" );
 	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) );
 	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) );
 
@@ -354,15 +354,15 @@ void KopeteChatWindow::initActions(void)
 	KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
 	KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll);
 
-	new KAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" );
-	new KAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
-	new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
+	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" );
+	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
+	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
 
-	historyUp = new KAction( i18n( "Previous History" ), TQString(), 0,
+	historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
 	historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
 
-	historyDown = new KAction( i18n( "Next History" ), TQString(), 0,
+	historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
 	historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
 
@@ -371,14 +371,14 @@ void KopeteChatWindow::initActions(void)
 
 	KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll );
 
-	membersLeft = new KToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
+	membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
-	membersRight = new KToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
+	membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
-	toggleMembers = new KToggleAction( i18n( "Show" ), TQString(), 0,
+	toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
 	toggleMembers->setCheckedState(i18n("Hide"));
-	toggleAutoSpellCheck = new KToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
+	toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
 	toggleAutoSpellCheck->setChecked( true );
 
@@ -386,7 +386,7 @@ void KopeteChatWindow::initActions(void)
 	actionSmileyMenu->setDelayed( false );
 	connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &)));
 
-	actionContactMenu = new KActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" );
+	actionContactMenu = new TDEActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" );
 	actionContactMenu->setDelayed( false );
 	connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) );
 
@@ -981,7 +981,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 
 	for ( contact = m_them.first(); contact; contact = m_them.next() )
 	{
-		KPopupMenu *p = contact->popupMenu();
+		TDEPopupMenu *p = contact->popupMenu();
 		connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
 			p, TQT_SLOT(deleteLater() ) );
 
@@ -993,7 +993,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 		//FIXME: This number should be a config option
 		if( ++contactCount == 15 && contact != m_them.getLast() )
 		{
-			KActionMenu *moreMenu = new KActionMenu( i18n("More..."),
+			TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
 				 TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) );
 			connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
 				moreMenu, TQT_SLOT(deleteLater() ) );
@@ -1176,7 +1176,7 @@ void KopeteChatWindow::closeEvent( TQCloseEvent * e )
 	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
 	if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
 //		hide();
-		// BEGIN of code borrowed from KMainWindow::closeEvent
+		// BEGIN of code borrowed from TDEMainWindow::closeEvent
 		// Save settings if auto-save is enabled, and settings have changed
 		if ( settingsDirty() && autoSaveSettings() )
 			saveAutoSaveSettings();
@@ -1184,10 +1184,10 @@ void KopeteChatWindow::closeEvent( TQCloseEvent * e )
 		if ( queryClose() ) {
 			e->accept();
 		}
-		// END of code borrowed from KMainWindow::closeEvent
+		// END of code borrowed from TDEMainWindow::closeEvent
 	}
 	else
-		KMainWindow::closeEvent( e );
+		TDEMainWindow::closeEvent( e );
 }
 
 void KopeteChatWindow::slotConfKeys()
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h
index 70c72b94..edee0b51 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/kopete/chatwindow/kopetechatwindow.h
@@ -24,9 +24,9 @@
 #include "kopetecontact.h"
 #include "tdeversion.h"
 
-class KAction;
-class KToggleAction;
-class KActionMenu;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionMenu;
 class KTempFile;
 class TQPixmap;
 class TQTabWidget;
@@ -39,7 +39,7 @@ class KTabWidget;
 class TQLabel;
 class KopeteEmoticonAction;
 class KopeteView;
-class KSelectAction;
+class TDESelectAction;
 class ChatView;
 
 namespace Kopete
@@ -96,7 +96,7 @@ public:
 	void setStatus( const TQString & );
 
 	/**
-	 * Reimplemented from KMainWindow - asks each ChatView in the window if it is ok to close the window
+	 * Reimplemented from TDEMainWindow - asks each ChatView in the window if it is ok to close the window
 	 * @return true if no ChatView objects to closing.
 	 */
 	virtual bool queryClose();
@@ -140,28 +140,28 @@ private:
 	TQMovie animIcon;
 	TQPixmap normalIcon;
 
-	KAction *chatSend;
-	KAction *historyUp;
-	KAction *historyDown;
-	KAction *nickComplete;
+	TDEAction *chatSend;
+	TDEAction *historyUp;
+	TDEAction *historyDown;
+	TDEAction *nickComplete;
 
-	KToggleAction *mStatusbarAction;
+	TDEToggleAction *mStatusbarAction;
 
-	KAction *tabLeft;
-	KAction *tabRight;
-	KAction *tabDetach;
-	KAction* tabClose;
+	TDEAction *tabLeft;
+	TDEAction *tabRight;
+	TDEAction *tabDetach;
+	TDEAction* tabClose;
 
-	KToggleAction* membersLeft;
-	KToggleAction* membersRight;
-	KToggleAction* toggleMembers;
-	KToggleAction* toggleAutoSpellCheck;
+	TDEToggleAction* membersLeft;
+	TDEToggleAction* membersRight;
+	TDEToggleAction* toggleMembers;
+	TDEToggleAction* toggleAutoSpellCheck;
 
 	KopeteEmoticonAction *actionSmileyMenu;
-	KActionMenu *actionActionMenu;
-	KActionMenu *actionContactMenu;
-	KActionMenu *actionDetachMenu;
-	KActionMenu *actionTabPlacementMenu;
+	TDEActionMenu *actionActionMenu;
+	TDEActionMenu *actionContactMenu;
+	TDEActionMenu *actionDetachMenu;
+	TDEActionMenu *actionTabPlacementMenu;
 	TQString statusMsg;
 
 signals:
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index b70313b9..cc4e6fa9 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -86,14 +86,14 @@ public:
 	TQSplitter *split;
 	ChatMessagePart *messagePart;
 	KopeteEmailWindow::WindowMode mode;
-	KAction *chatSend;
+	TDEAction *chatSend;
 	TQLabel *anim;
 	TQMovie animIcon;
 	TQPixmap normalIcon;
 	TQString unreadMessageFrom;
 	ChatTextEditPart *editPart;
 
-	KActionMenu *actionActionMenu;
+	TDEActionMenu *actionActionMenu;
 	KopeteEmoticonAction *actionSmileyMenu;
 };
 
@@ -204,9 +204,9 @@ KopeteEmailWindow::~KopeteEmailWindow()
 
 void KopeteEmailWindow::initActions(void)
 {
-	KActionCollection *coll = actionCollection();
+	TDEActionCollection *coll = actionCollection();
 
-	d->chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0,
+	d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" );
 	//Default to 'Return' for sending messages
 	d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
@@ -217,11 +217,11 @@ void KopeteEmailWindow::initActions(void)
 	KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
 	KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll );
 
-	new KAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
+	new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
 	             d->editPart, TQT_SLOT( setFont() ), coll, "format_font" );
-	new KAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0,
+	new TDEAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0,
 	             d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" );
-	new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
+	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
 	             d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" );
 
 	KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll );
@@ -509,7 +509,7 @@ void KopeteEmailWindow::raise(bool activate)
 	if ( !KWin::windowInfo( winId(), NET::WMDesktop ).onAllDesktops() )
 		KWin::setOnDesktop( winId(), KWin::currentDesktop() );
 
-	KMainWindow::raise();
+	TDEMainWindow::raise();
 
 	/* Removed Nov 2003
 	According to Zack, the user double-clicking a contact is not valid reason for a non-pager
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 4be23dd4..8c2811c9 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -1,7 +1,7 @@
 /*
     kopeteemoticonaction.cpp
 
-    KAction to show the emoticon selector
+    TDEAction to show the emoticon selector
 
     Copyright (c) 2002      by Stefan Gehn            <metz AT gehn.net>
     Copyright (c) 2003      by Martijn Klingens       <klingens@kde.org>
@@ -42,7 +42,7 @@ public:
 	{
 		m_delayed = true;
 		m_stickyMenu = true;
-		m_popup = new KPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup");
+		m_popup = new TDEPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup");
 		emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector");
 		m_popup->insertItem( emoticonSelector );
 		// TODO: Maybe connect to kopeteprefs and redo list only on config changes
@@ -55,14 +55,14 @@ public:
 		m_popup = 0;
 	}
 
-	KPopupMenu *m_popup;
+	TDEPopupMenu *m_popup;
 	EmoticonSelector *emoticonSelector;
 	bool m_delayed;
 	bool m_stickyMenu;
 };
 
 KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name )
-  : KAction( i18n( "Add Smiley" ), 0, parent, name )
+  : TDEAction( i18n( "Add Smiley" ), 0, parent, name )
 {
 	d = new KopeteEmoticonActionPrivate;
 
@@ -103,7 +103,7 @@ void KopeteEmoticonAction::popup( const TQPoint& global )
 	popupMenu()->popup( global );
 }
 
-KPopupMenu* KopeteEmoticonAction::popupMenu() const
+TDEPopupMenu* KopeteEmoticonAction::popupMenu() const
 {
 	return d->m_popup;
 }
@@ -130,7 +130,7 @@ void KopeteEmoticonAction::setStickyMenu(bool sticky)
 
 int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 {
-	if (kapp && !kapp->authorizeKAction(name()))
+	if (kapp && !kapp->authorizeTDEAction(name()))
 		return -1;
 
 //	kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
@@ -157,11 +157,11 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		return containerCount() - 1;
 	}
 	// KDE4/TQt TODO: Use qobject_cast instead.
-	else if ( widget->inherits( "KToolBar" ) )
+	else if ( widget->inherits( "TDEToolBar" ) )
 	{
-		KToolBar *bar = static_cast<KToolBar *>( widget );
+		TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
-		int id_ = KAction::getToolButtonID();
+		int id_ = TDEAction::getToolButtonID();
 
 		if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() )
 		{
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h
index eb77a84b..bc1a9859 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.h
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h
@@ -1,7 +1,7 @@
 /*
     kopeteemoticonaction.h
 
-    KAction to show the emoticon selector
+    TDEAction to show the emoticon selector
 
     Copyright (c) 2002      by Stefan Gehn            <metz AT gehn.net>
     Copyright (c) 2003      by Martijn Klingens       <klingens@kde.org>
@@ -23,7 +23,7 @@
 
 #include <kaction.h>
 
-class KopeteEmoticonAction : public KAction
+class KopeteEmoticonAction : public TDEAction
 {
 	Q_OBJECT
   
@@ -35,18 +35,18 @@ public:
 	KopeteEmoticonAction( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KopeteEmoticonAction();
 
-	KPopupMenu * popupMenu() const;
+	TDEPopupMenu * popupMenu() const;
 	void popup( const TQPoint &global );
 
 	/**
 	* Returns true if this action creates a delayed popup menu
-	* when plugged in a KToolbar.
+	* when plugged in a TDEToolbar.
 	*/
 	bool delayed() const;
 
 	/**
 	* If set to true, this action will create a delayed popup menu
-	* when plugged in a KToolbar. Otherwise it creates a normal popup.
+	* when plugged in a TDEToolbar. Otherwise it creates a normal popup.
 	* Default: delayed
 	*
 	* Remember that if the "main" action (the toolbar button itself)
@@ -55,7 +55,7 @@ public:
 	* On the opposite, if the main action can be clicked, it can only happen
 	* in a toolbar: in a menu, the parent of a submenu can't be activated.
 	* To get a "normal" menu item when plugged a menu (and no submenu)
-	* use KToolBarPopupAction.
+	* use TDEToolBarPopupAction.
 	*/
 	void setDelayed( bool delayed );
 
@@ -67,7 +67,7 @@ public:
 
 	/**
 	* If set to true, this action will create a sticky popup menu
-	* when plugged in a KToolbar.
+	* when plugged in a TDEToolbar.
 	* "Sticky", means it's visible until a selection is made or the mouse is
 	* clicked elsewhere. This feature allows you to make a selection without
 	* having to press and hold down the mouse while making a selection.
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 152570a8..4d8a0f8d 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -122,51 +122,51 @@ TDEAboutData *KopeteRichTextEditPart::createAboutData()
 	return aboutData;
 }
 
-void KopeteRichTextEditPart::createActions( KActionCollection *ac )
+void KopeteRichTextEditPart::createActions( TDEActionCollection *ac )
 {
-	enableRichText = new KToggleAction(i18n("Enable &Rich Text"), "pencil", 0,
+	enableRichText = new TDEToggleAction(i18n("Enable &Rich Text"), "pencil", 0,
 				ac, "enableRichText" );
 	enableRichText->setCheckedState(i18n("Disable &Rich Text"));
 	connect( enableRichText, TQT_SIGNAL( toggled(bool) ),
 			this, TQT_SLOT( slotSetRichTextEnabled(bool) ) );
 
-	checkSpelling = new KAction( i18n("Check &Spelling"), "spellcheck", 0,
+	checkSpelling = new TDEAction( i18n("Check &Spelling"), "spellcheck", 0,
 				TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
 
 	//Fg Color
-	actionFgColor = new KAction( i18n("Text &Color..."), "color_line", 0,
+	actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0,
 		this, TQT_SLOT( setFgColor() ),
 		ac, "format_color" );
 
 	//BG Color
-	actionBgColor = new KAction( i18n("Background Co&lor..."), "color_fill", 0,
+	actionBgColor = new TDEAction( i18n("Background Co&lor..."), "color_fill", 0,
 		this, TQT_SLOT( setBgColor() ),
 		ac, "format_bgcolor" );
 
 	//Font Family
-	action_font = new KFontAction( i18n("&Font"), 0,
+	action_font = new TDEFontAction( i18n("&Font"), 0,
 			ac, "format_font" );
 	connect( action_font, TQT_SIGNAL( activated( const TQString & ) ),
 		this, TQT_SLOT( setFont( const TQString & ) ) );
 
 	//Font Size
-	action_font_size = new KFontSizeAction( i18n("Font &Size"), 0,
+	action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0,
 			ac, "format_font_size" );
 	connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ),
 		this, TQT_SLOT( setFontSize(int) ) );
 
 	//Formatting
-	action_bold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+	action_bold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
 			ac, "format_bold" );
 	connect( action_bold, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setBold(bool) ) );
 
-	action_italic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+	action_italic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
 			ac, "format_italic" );
 	connect( action_italic, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setItalic(bool) ) );
 
-	action_underline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+	action_underline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
 				ac, "format_underline" );
 	connect( action_underline, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setUnderline(bool) ) );
@@ -180,22 +180,22 @@ void KopeteRichTextEditPart::createActions( KActionCollection *ac )
 	updateFont();
 
 	//Alignment
-	action_align_left = new KToggleAction( i18n("Align &Left"), "text_left", 0,
+	action_align_left = new TDEToggleAction( i18n("Align &Left"), "text_left", 0,
 			ac, "format_align_left" );
 	connect( action_align_left, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setAlignLeft(bool) ) );
 
-	action_align_center = new KToggleAction( i18n("Align &Center"), "text_center", 0,
+	action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
 			ac, "format_align_center" );
 	connect( action_align_center, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setAlignCenter(bool) ) );
 
-	action_align_right = new KToggleAction( i18n("Align &Right"), "text_right", 0,
+	action_align_right = new TDEToggleAction( i18n("Align &Right"), "text_right", 0,
 			ac, "format_align_right" );
 	connect( action_align_right, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setAlignRight(bool) ) );
 
-	action_align_justify = new KToggleAction( i18n("&Justify"), "text_block", 0,
+	action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
 			ac, "format_align_justify" );
 	connect( action_align_justify, TQT_SIGNAL( toggled(bool) ),
 		this, TQT_SLOT( setAlignJustify(bool) ) );
@@ -448,7 +448,7 @@ void KopeteRichTextEditPart::setFontSize( int size )
 
 void KopeteRichTextEditPart::setFont()
 {
-	KFontDialog::getFont(mFont, false, editor);
+	TDEFontDialog::getFont(mFont, false, editor);
 	setFont(mFont);
 	writeConfig();
 }
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h
index e5159d0f..470369ad 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.h
+++ b/kopete/kopete/chatwindow/krichtexteditpart.h
@@ -10,9 +10,9 @@
 
 class TDEAboutData;
 class KTextEdit;
-class KFontAction;
-class KFontSizeAction;
-class KToggleAction;
+class TDEFontAction;
+class TDEFontSizeAction;
+class TDEToggleAction;
 class KopeteTextEdit;
 
 /**
@@ -89,7 +89,7 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
 		/**
 		* Creates the part's actions in the specified action collection.
 		*/
-		virtual void createActions( KActionCollection *ac );
+		virtual void createActions( TDEActionCollection *ac );
 
 	protected slots:
 
@@ -108,23 +108,23 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
 		void writeConfig();
 
 		KopeteTextEdit *editor;
-		KAction *checkSpelling;
-		KToggleAction *enableRichText;
+		TDEAction *checkSpelling;
+		TDEToggleAction *enableRichText;
 
-		KAction *actionFgColor;
-		KAction *actionBgColor;
+		TDEAction *actionFgColor;
+		TDEAction *actionBgColor;
 
-		KToggleAction *action_bold;
-		KToggleAction *action_italic;
-		KToggleAction *action_underline;
+		TDEToggleAction *action_bold;
+		TDEToggleAction *action_italic;
+		TDEToggleAction *action_underline;
 
-		KFontAction *action_font;
-		KFontSizeAction *action_font_size;
+		TDEFontAction *action_font;
+		TDEFontSizeAction *action_font_size;
 
-		KToggleAction *action_align_left;
-		KToggleAction *action_align_right;
-		KToggleAction *action_align_center;
-		KToggleAction *action_align_justify;
+		TDEToggleAction *action_align_left;
+		TDEToggleAction *action_align_right;
+		TDEToggleAction *action_align_center;
+		TDEToggleAction *action_align_justify;
 
 		int m_capabilities;
 		bool m_richTextAvailable;
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
index 28af94f6..d779eac0 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -39,10 +39,10 @@
 #include "kopeteprotocol.h"
 #include "kopeteaccount.h"
 
-class KopeteAccountLVI : public KListViewItem
+class KopeteAccountLVI : public TDEListViewItem
 {
 	public:
-		KopeteAccountLVI( Kopete::Account *a, KListView *p ) : KListViewItem( p ){  m_account = a; }
+		KopeteAccountLVI( Kopete::Account *a, TDEListView *p ) : TDEListViewItem( p ){  m_account = a; }
 		Kopete::Account *account() { return m_account; }
 
 	private:
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index 321adac8..8162208c 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -62,7 +62,7 @@
                 <string>Remove selected account</string>
             </property>
         </widget>
-        <widget class="KListView" row="0" column="0" rowspan="8" colspan="1">
+        <widget class="TDEListView" row="0" column="0" rowspan="8" colspan="1">
             <column>
                 <property name="text">
                     <string>Protocol</string>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
index 67dbaa07..ed7d5cf9 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
@@ -61,7 +61,7 @@
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
-                    <widget class="KListBox">
+                    <widget class="TDEListBox">
                         <property name="name">
                             <cstring>styleList</cstring>
                         </property>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
index 8943bc6c..a4adb253 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
@@ -138,7 +138,7 @@
                         <string>Background color:</string>
                     </property>
                 </widget>
-                <widget class="KFontRequester" row="0" column="1" rowspan="1" colspan="3">
+                <widget class="TDEFontRequester" row="0" column="1" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>fontFace</cstring>
                     </property>
@@ -253,7 +253,7 @@
                                                 <string>Group font:</string>
                                     </property>
                                 </widget>
-                                        <widget class="KFontRequester">
+                                        <widget class="TDEFontRequester">
                                     <property name="name">
                                                 <cstring>mGroupFont</cstring>
                                     </property>
@@ -282,7 +282,7 @@
                                         <string>Normal font:</string>
                                     </property>
                                 </widget>
-                                        <widget class="KFontRequester">
+                                        <widget class="TDEFontRequester">
                                             <property name="name">
                                                 <cstring>mNormalFont</cstring>
                                             </property>
@@ -311,7 +311,7 @@
                                                 <string>Small font:</string>
                                             </property>
                                         </widget>
-                                        <widget class="KFontRequester">
+                                        <widget class="TDEFontRequester">
                                     <property name="name">
                                         <cstring>mSmallFont</cstring>
                                     </property>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
index 6af82e16..1cc3153d 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
@@ -55,7 +55,7 @@
                 <string>Select emoticon theme:</string>
             </property>
         </widget>
-        <widget class="KListBox">
+        <widget class="TDEListBox">
             <property name="name">
                 <cstring>icon_theme_list</cstring>
             </property>
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index 1330b566..ce252a8f 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -101,7 +101,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const
 
     for(TQMap<TQString, TQStringList>::Iterator it = smileys.begin(); it != smileys.end(); ++it )
     {
-        KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons);
+        TDEListViewItem *itm = new TDEListViewItem(mMainWidget->klvEmoticons);
         itm->setPixmap(0, TQPixmap(it.key()));
         itm->setText(2, TQFileInfo(it.key()).baseName());
         TQString text = *it.data().at(0);
@@ -228,7 +228,7 @@ void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy)
     if(copy)
         TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ));
 
-    KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons);
+    TDEListViewItem *itm = new TDEListViewItem(mMainWidget->klvEmoticons);
     itm->setPixmap(0, TQPixmap(emo));
     itm->setText(1, text);
     itm->setText(2, TQFileInfo(emo).baseName());
diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui
index e5a23692..a90031d2 100644
--- a/kopete/kopete/config/appearance/emoticonseditwidget.ui
+++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui
@@ -70,7 +70,7 @@
                 </spacer>
             </vbox>
         </widget>
-        <widget class="KListView" row="0" column="0">
+        <widget class="TDEListView" row="0" column="0">
             <property name="name">
                 <cstring>klvEmoticons</cstring>
             </property>
diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
index eef1ccb0..e5fb0b16 100644
--- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp
+++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
@@ -30,17 +30,17 @@
 #include <klistview.h>
 #include <klocale.h>
 
-class TooltipItem : public KListViewItem
+class TooltipItem : public TDEListViewItem
 {
 	public:
-		TooltipItem(KListView *parent, const TQString& label, const TQString& propertyName)
-			: KListViewItem(parent, label),
+		TooltipItem(TDEListView *parent, const TQString& label, const TQString& propertyName)
+			: TDEListViewItem(parent, label),
 				mPropName(propertyName)
 		{
 		}
 
-		TooltipItem(KListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName)
-			: KListViewItem(parent, item, label),
+		TooltipItem(TDEListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName)
+			: TDEListViewItem(parent, item, label),
 				mPropName(propertyName)
 		{
 		}
diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui
index 8a2021fd..ec250cea 100644
--- a/kopete/kopete/config/appearance/tooltipeditwidget.ui
+++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui
@@ -65,7 +65,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string></string>
@@ -179,7 +179,7 @@
                         </spacer>
                     </vbox>
                 </widget>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string></string>
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
index 11ec93d0..fd2b5c18 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
+++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
@@ -107,7 +107,7 @@ void KopeteAddressBookExport::fetchKABCData()
 	}
 }
 
-void KopeteAddressBookExport::fetchPhoneNumbers( KListBox * listBox, int type, uint& counter )
+void KopeteAddressBookExport::fetchPhoneNumbers( TDEListBox * listBox, int type, uint& counter )
 {
 	KABC::PhoneNumber::List phones = mAddressee.phoneNumbers( type );
 	counter = phones.count();
@@ -156,7 +156,7 @@ void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const
 	}	
 }
 
-void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const TQPixmap &icon, KListBox *listBox, const Kopete::ContactPropertyTmpl &property )
+void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const TQPixmap &icon, TDEListBox *listBox, const Kopete::ContactPropertyTmpl &property )
 {
 	Kopete::ContactProperty prop = contact->property( property );
 	if ( !prop.isNull() )
@@ -274,7 +274,7 @@ bool KopeteAddressBookExport::newValue( TQComboBox *combo )
 			( combo->text( combo->currentItem() ) == combo->text( 0 ) ) );
 }
 
-TQStringList KopeteAddressBookExport::newValues( KListBox *listBox, uint counter )
+TQStringList KopeteAddressBookExport::newValues( TDEListBox *listBox, uint counter )
 {
 	TQStringList newValues;
 	// need to iterate all items except those from KABC and check if selected and not same as the first
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h
index 62f1858d..587de5c9 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexport.h
+++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h
@@ -28,7 +28,7 @@
 
 class AddressBookExportUI;
 class KDialogBase;
-class KListBox;
+class TDEListBox;
 class KComboBox;
 
 namespace Kopete
@@ -65,7 +65,7 @@ protected:
 	/**
 	 * Populate a listbox with a given type of phone number
 	 */
-	void fetchPhoneNumbers( KListBox * listBox, int type, uint& counter );
+	void fetchPhoneNumbers( TDEListBox * listBox, int type, uint& counter );
 	/**
 	 * Populate the GUI with data from IM systems
 	 */
@@ -79,11 +79,11 @@ protected:
 	 * Populate a listbox with a contact's IM data
 	 */
 	void populateIM( const Kopete::Contact *contact, const TQPixmap &icon, 
-			KListBox *combo, const Kopete::ContactPropertyTmpl &property );
+			TDEListBox *combo, const Kopete::ContactPropertyTmpl &property );
 	
 	/** Check the selected item is not the first (existing KABC) item, or the same as it */
 	bool newValue( TQComboBox *combo );
-	TQStringList newValues( KListBox *listBox, uint counter );
+	TQStringList newValues( TDEListBox *listBox, uint counter );
 	
 	// the GUI
 	TQWidget *mParent;
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
index 8afccb19..a1827dc9 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
+++ b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
@@ -41,7 +41,7 @@
                 <cstring>mPhones</cstring>
             </property>
         </widget>
-        <widget class="KListBox" row="5" column="1">
+        <widget class="TDEListBox" row="5" column="1">
             <property name="name">
                 <cstring>mWorkPhones</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <enum>Extended</enum>
             </property>
         </widget>
-        <widget class="KListBox" row="6" column="1">
+        <widget class="TDEListBox" row="6" column="1">
             <property name="name">
                 <cstring>mMobilePhones</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <enum>Extended</enum>
             </property>
         </widget>
-        <widget class="KListBox" row="4" column="1">
+        <widget class="TDEListBox" row="4" column="1">
             <property name="name">
                 <cstring>mHomePhones</cstring>
             </property>
@@ -124,7 +124,7 @@
                 <cstring>comboBox2</cstring>
             </property>
         </widget>
-        <widget class="KListBox" row="2" column="1">
+        <widget class="TDEListBox" row="2" column="1">
             <property name="name">
                 <cstring>mEmails</cstring>
             </property>
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index e271801e..54f52528 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -81,19 +81,19 @@ class KopeteContactListViewPrivate
 public:
 	std::auto_ptr<ContactListViewStrategy> viewStrategy;
 
-	void updateViewStrategy( KListView *view );
+	void updateViewStrategy( TDEListView *view );
 };
 
 class ContactListViewStrategy
 {
 public:
-	ContactListViewStrategy( KListView *view )
+	ContactListViewStrategy( TDEListView *view )
 	 : _listView( view )
 	{
 		view->clear();
 	}
 	virtual ~ContactListViewStrategy() {}
-	KListView *listView() { return _listView; }
+	TDEListView *listView() { return _listView; }
 	void addCurrentItems()
 	{
 		// Add the already existing groups now
@@ -147,13 +147,13 @@ protected:
 	}
 
 private:
-	KListView *_listView;
+	TDEListView *_listView;
 };
 
 class ArrangeByGroupsViewStrategy : public ContactListViewStrategy
 {
 public:
-	ArrangeByGroupsViewStrategy( KListView *view )
+	ArrangeByGroupsViewStrategy( TDEListView *view )
 	 : ContactListViewStrategy( view )
 	{
 		addCurrentItems();
@@ -242,7 +242,7 @@ private:
 class ArrangeByPresenceViewStrategy : public ContactListViewStrategy
 {
 public:
-	ArrangeByPresenceViewStrategy( KListView *view )
+	ArrangeByPresenceViewStrategy( TDEListView *view )
 	 : ContactListViewStrategy( view )
 	 , m_onlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Online, listView() ) )
 	 , m_offlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Offline, listView() ) )
@@ -357,7 +357,7 @@ private:
 	TQGuardedPtr<KopeteGroupViewItem> m_temporaryItem;
 };
 
-void KopeteContactListViewPrivate::updateViewStrategy( KListView *view )
+void KopeteContactListViewPrivate::updateViewStrategy( TDEListView *view )
 {
 	// this is a bit nasty, but this function needs changing if we add
 	// more view strategies anyway, so it should be fine.
@@ -411,8 +411,8 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
 
 	setFullWidth( true );
 
-	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( expanded( TQListViewItem * ) ),
 	         TQT_SLOT( slotExpanded( TQListViewItem * ) ) );
 	connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
@@ -459,7 +459,7 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
 	slotSettingsChanged();
 }
 
-void KopeteContactListView::initActions( KActionCollection *ac )
+void KopeteContactListView::initActions( TDEActionCollection *ac )
 {
 	actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac );
 	actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac );
@@ -467,7 +467,7 @@ void KopeteContactListView::initActions( KActionCollection *ac )
 	actionRedo->setEnabled(false);
 
 
-	new KAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
+	new TDEAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
 		ac, "AddGroup" );
 
 	actionSendMessage = KopeteStdAction::sendMessage(
@@ -482,19 +482,19 @@ void KopeteContactListView::initActions( KActionCollection *ac )
 
 	actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ),
 		ac, "contactRemove" );
-	actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
+	actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
 		0, TQT_TQOBJECT(this), TQT_SLOT(  slotSendEmail() ), ac, "contactSendEmail" );
 	/* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/
-	actionRename = new KAction( i18n( "Rename" ), "filesaveas", 0,
+	actionRename = new TDEAction( i18n( "Rename" ), "filesaveas", 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" );
 	actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ),
 		ac, "contactSendFile" );
 
-	actionAddContact = new KActionMenu( i18n( "&Add Contact" ),
+	actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ),
 		TQString::fromLatin1( "add_user" ), ac , "contactAddContact" );
 	actionAddContact->popupMenu()->insertTitle( i18n("Select Account") );
 
-	actionAddTemporaryContact = new KAction( i18n( "Add to Your Contact List" ), "add_user", 0,
+	actionAddTemporaryContact = new TDEAction( i18n( "Add to Your Contact List" ), "add_user", 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
 
 	connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) );
@@ -502,7 +502,7 @@ void KopeteContactListView::initActions( KActionCollection *ac )
 	connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*)));
 	connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *)));
 
-	actionProperties = new KAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return,
+	actionProperties = new TDEAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return,
 		TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" );
 
 	// Update enabled/disabled actions
@@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView()
 
 void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account)
 {
-	KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account);
+	TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account);
 	m_accountAddContactMap.insert( account, action);
 	actionAddContact->insert( action );
 }
@@ -526,7 +526,7 @@ void KopeteContactListView::slotAddSubContactActionAccountDeleted(const Kopete::
 	kdDebug(14000) << k_funcinfo << endl;
 	if ( m_accountAddContactMap.contains( account ) )
 	{
-		KAction *action = m_accountAddContactMap[account];
+		TDEAction *action = m_accountAddContactMap[account];
 		m_accountAddContactMap.remove( account );
 		actionAddContact->remove( action );
 	}
@@ -636,7 +636,7 @@ void KopeteContactListView::slotCollapsed( TQListViewItem *item )
 	}
 }
 
-void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
+void KopeteContactListView::slotContextMenu( TDEListView * /*listview*/,
 	TQListViewItem *item, const TQPoint &point )
 {
 	// FIXME: this code should be moved to the various list view item classes.
@@ -659,7 +659,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
 	int nb = Kopete::ContactList::self()->selectedMetaContacts().count() +
 		Kopete::ContactList::self()->selectedGroups().count();
 
-	KMainWindow *window = dynamic_cast<KMainWindow *>(topLevelWidget());
+	TDEMainWindow *window = dynamic_cast<TDEMainWindow *>(topLevelWidget());
 	if ( !window )
 	{
 		kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; "
@@ -677,13 +677,13 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
 		Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ;
 		if ( c )
 		{
-			KPopupMenu *p = c->popupMenu();
+			TDEPopupMenu *p = c->popupMenu();
 			connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) );
 			p->popup( point );
 		}
 		else
 		{
-			KPopupMenu *popup = dynamic_cast<KPopupMenu *>(
+			TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
 				window->factory()->container( "contact_popup", window ) );
 			if ( popup )
 			{
@@ -709,7 +709,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
 						sep = false;
 					}
 
-					KPopupMenu *contactMenu = it.current()->popupMenu();
+					TDEPopupMenu *contactMenu = it.current()->popupMenu();
 					connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) );
 					TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString();
 					TQString text= nick.isEmpty() ?  c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick );
@@ -727,7 +727,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
 	}
 	else if ( groupvi && nb == 1 )
 	{
-		KPopupMenu *popup = dynamic_cast<KPopupMenu *>(
+		TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
 			window->factory()->container( "group_popup", window ) );
 		if ( popup )
 		{
@@ -745,14 +745,14 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
 	}
 	else if ( nb >= 1 )
 	{
-		KPopupMenu *popup = dynamic_cast<KPopupMenu *>(
+		TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
 			window->factory()->container( "contactlistitems_popup", window ) );
 		if ( popup )
 			popup->popup( point );
 	}
 	else
 	{
-		KPopupMenu *popup = dynamic_cast<KPopupMenu *>(
+		TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
 			window->factory()->container( "contactlist_popup", window ) );
 		if ( popup )
 		{
@@ -1066,7 +1066,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const
 	TQListViewItem *source=currentItem();
 	TQListViewItem *parent;
 	TQListViewItem *afterme;
-	// Due to a little design problem in KListView::findDrop() we can't
+	// Due to a little design problem in TDEListView::findDrop() we can't
 	// call it directly from a const method until KDE 4.0, but as the
 	// method is in fact const we can of course get away with a
 	// const_cast...
@@ -1204,7 +1204,7 @@ void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent
 
 void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e )
 {
-	KListView::contentsMousePressEvent( e );
+	TDEListView::contentsMousePressEvent( e );
 	if (e->button() == Qt::LeftButton )
 	{
 		TQPoint p=contentsToViewport(e->pos());
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.h b/kopete/kopete/contactlist/kopetecontactlistview.h
index eb9cb690..09e71524 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.h
+++ b/kopete/kopete/contactlist/kopetecontactlistview.h
@@ -38,10 +38,10 @@ class KopeteMetaContactLVI;
 class KopeteGroupViewItem;
 class KopeteStatusGroupViewItem;
 class KRootPixmap;
-class KActionCollection;
-class KAction;
-class KListAction;
-class KActionMenu;
+class TDEActionCollection;
+class TDEAction;
+class TDEListAction;
+class TDEActionMenu;
 
 class KopeteContactListViewPrivate;
 
@@ -68,7 +68,7 @@ public:
 	/**
 	 * Init MetaContact related actions
 	 */
-	void initActions(KActionCollection*);
+	void initActions(TDEActionCollection*);
 
 	/**
 	 * Add a given group name and return it
@@ -127,7 +127,7 @@ private slots:
 
 	void slotViewSelectionChanged();
 	void slotListSelectionChanged();
-	void slotContextMenu(KListView*,TQListViewItem *item, const TQPoint &point );
+	void slotContextMenu(TDEListView*,TQListViewItem *item, const TQPoint &point );
 	void slotExpanded( TQListViewItem *item );
 	void slotCollapsed( TQListViewItem *item );
 
@@ -192,18 +192,18 @@ private:
 	TQPoint m_startDragPos;
 
 	/* ACTIONS */
-	KAction *actionSendMessage;
-	KAction *actionStartChat;
-	KAction *actionSendFile;
-	KAction *actionSendEmail;
-	KListAction *actionMove;
-	KListAction *actionCopy;
-	KAction *actionRename;
-	KAction *actionRemove;
-	KAction *actionAddTemporaryContact;
-	KAction *actionProperties;
-	KAction *actionUndo;
-	KAction *actionRedo;
+	TDEAction *actionSendMessage;
+	TDEAction *actionStartChat;
+	TDEAction *actionSendFile;
+	TDEAction *actionSendEmail;
+	TDEListAction *actionMove;
+	TDEListAction *actionCopy;
+	TDEAction *actionRename;
+	TDEAction *actionRemove;
+	TDEAction *actionAddTemporaryContact;
+	TDEAction *actionProperties;
+	TDEAction *actionUndo;
+	TDEAction *actionRedo;
 
 	KopeteContactListViewPrivate *d;
 
@@ -223,8 +223,8 @@ public:
 public:
 	// This is public so the chatwinodw can handle sub actions
 	// FIXME: do we not believe in accessor functions any more?
-	KActionMenu *actionAddContact;
-	TQMap<const Kopete::Account *, KAction *> m_accountAddContactMap;
+	TDEActionMenu *actionAddContact;
+	TQMap<const Kopete::Account *, TDEAction *> m_accountAddContactMap;
 };
 
 struct KopeteContactListView::UndoItem
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
index 142e4090..a2606ab9 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
@@ -29,9 +29,9 @@
 #include "kopetecontactlist.h"
 #include "kopetegroup.h"
 
-KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const KShortcut &cut, const TQObject *receiver,
+KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver,
 	const char *slot, TQObject *parent, const char *name )
-: KListAction( text, pix, cut, parent, name )
+: TDEListAction( text, pix, cut, parent, name )
 {
 	connect( this, TQT_SIGNAL( activated() ), receiver, slot );
 
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h
index 2d4bb985..a9c1a502 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.h
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.h
@@ -26,13 +26,13 @@
 /**
  * Action used for Copy To  and  Move To
  */
-class KopeteGroupListAction : public KListAction
+class KopeteGroupListAction : public TDEListAction
 {
 	Q_OBJECT
   
 
 public:
-	KopeteGroupListAction( const TQString &, const TQString &, const KShortcut &,
+	KopeteGroupListAction( const TQString &, const TQString &, const TDEShortcut &,
 		const TQObject *, const char *, TQObject *, const char * );
 	~KopeteGroupListAction();
 
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index b28b7cb3..988ef1d8 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -192,20 +192,20 @@ TQString KopeteGroupViewItem::key( int, bool ) const
 void KopeteGroupViewItem::startRename( int /*col*/ )
 {
 	//kdDebug(14000) << k_funcinfo << endl;
-	KListViewItem::startRename( 0 );
+	TDEListViewItem::startRename( 0 );
 }
 
 void KopeteGroupViewItem::okRename( int col )
 {
 	//kdDebug(14000) << k_funcinfo << endl;
-	KListViewItem::okRename(col);
+	TDEListViewItem::okRename(col);
 	setRenameEnabled( 0, false );
 }
 
 void KopeteGroupViewItem::cancelRename( int col )
 {
 	//kdDebug(14000) << k_funcinfo << endl;
-	KListViewItem::cancelRename(col);
+	TDEListViewItem::cancelRename(col);
 	setRenameEnabled( 0, false );
 }
 
@@ -265,7 +265,7 @@ TQString KopeteGroupViewItem::text( int column ) const
 	if ( column == 0 )
 		return d->name->text();
 	else
-		return KListViewItem::text( column );
+		return TDEListViewItem::text( column );
 }
 
 void KopeteGroupViewItem::setText( int column, const TQString &text )
@@ -282,7 +282,7 @@ void KopeteGroupViewItem::setText( int column, const TQString &text )
 		group()->setDisplayName( text );
 	}
 	else
-		KListViewItem::setText( column, text );
+		TDEListViewItem::setText( column, text );
 }
 
 #include "kopetegroupviewitem.moc"
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.h b/kopete/kopete/contactlist/kopetegroupviewitem.h
index 0447d809..f42b614c 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.h
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.h
@@ -46,7 +46,7 @@ public:
 	virtual void startRename( int col );
 
 	/**
-	 * reimplemented from KListViewItem to take into account our alternate text storage
+	 * reimplemented from TDEListViewItem to take into account our alternate text storage
 	 */
 	virtual TQString text( int column ) const;
 	virtual void setText( int column, const TQString &text );
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 3f2165c4..19529351 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -1,5 +1,5 @@
 /*
-    kopetemetacontactlvi.cpp - Kopete Meta Contact KListViewItem
+    kopetemetacontactlvi.cpp - Kopete Meta Contact TDEListViewItem
 
     Copyright (c) 2004      by Richard Smith          <kde@metafoo.co.uk>
     Copyright (c) 2002-2004 by Martijn Klingens       <klingens@kde.org>
@@ -169,7 +169,7 @@ public:
 
 KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent )
 : ListView::Item( parent, contact, "MetaContactLVI" )
-//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent )
+//: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
 {
 	m_metaContact = contact;
 	m_isTopLevel = false;
@@ -182,7 +182,7 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, Kopete
 
 KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent )
 : ListView::Item( parent, contact, "MetaContactLVI" )
-//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent )
+//: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
 {
 	m_metaContact = contact;
 
@@ -195,7 +195,7 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQList
 
 KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent )
 : ListView::Item( parent, contact, "MetaContactLVI" )
-//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent )
+//: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
 {
 	m_metaContact = contact;
 
@@ -280,13 +280,13 @@ void KopeteMetaContactLVI::movedToDifferentGroup()
 	// create a spacer if wanted
 	// I assume that the safety property that allows the delete in slotConfigChanged holds here - Will
 	delete d->spacerBox->component( 0 );
-	if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
+	if ( TDEListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
 	                !KopetePrefs::prefs()->treeView() )
 	{
 		new ListView::SpacerComponent( d->spacerBox, 20, 0 );
 	}
 
-	KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::parent());
+	KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(TDEListViewItem::parent());
 	if ( group_item )
 	{
 		m_isTopLevel = false;
@@ -582,18 +582,18 @@ void KopeteMetaContactLVI::slotRemoveFromGroup()
 
 void KopeteMetaContactLVI::startRename( int /*col*/ )
 {
-	KListViewItem::startRename( 0 );
+	TDEListViewItem::startRename( 0 );
 }
 
 void KopeteMetaContactLVI::okRename( int col )
 {
-	KListViewItem::okRename( col );
+	TDEListViewItem::okRename( col );
 	setRenameEnabled( 0, false );
 }
 
 void KopeteMetaContactLVI::cancelRename( int col )
 {
-	KListViewItem::cancelRename( col );
+	TDEListViewItem::cancelRename( col );
 	setRenameEnabled( 0, false );
 }
 
@@ -658,7 +658,7 @@ void KopeteMetaContactLVI::slotConfigChanged()
 
 	// create a spacer if wanted
 	delete d->spacerBox->component( 0 );
-	if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
+	if ( TDEListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
 	                !KopetePrefs::prefs()->treeView() )
 	{
 		new ListView::SpacerComponent( d->spacerBox, 20, 0 );
@@ -1094,7 +1094,7 @@ TQString KopeteMetaContactLVI::text( int column ) const
 	if ( column == 0 )
 		return d->nameText->text();
 	else
-		return KListViewItem::text( column );
+		return TDEListViewItem::text( column );
 }
 
 void KopeteMetaContactLVI::setText( int column, const TQString &text )
@@ -1102,7 +1102,7 @@ void KopeteMetaContactLVI::setText( int column, const TQString &text )
 	if ( column == 0 )
 		rename( text );
 	else
-		KListViewItem::setText( column, text );
+		TDEListViewItem::setText( column, text );
 }
 
 #include "kopetemetacontactlvi.moc"
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h
index ba0e28f0..1b766b44 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.h
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h
@@ -1,5 +1,5 @@
 /*
-    kopetemetacontactlvi.h - Kopete Meta Contact KListViewItem
+    kopetemetacontactlvi.h - Kopete Meta Contact TDEListViewItem
 
     Copyright (c) 2004      by Richard Smith          <kde@metafoo.co.uk>
     Copyright (c) 2002-2003 by Olivier Goffart        <ogoffart @ kde.org>
@@ -31,8 +31,8 @@
 
 class TQVariant;
 
-class KAction;
-class KListAction;
+class TDEAction;
+class TDEListAction;
 
 namespace Kopete
 {
@@ -116,7 +116,7 @@ public:
 	bool isGrouped() const;
 
 	/**
-	 * reimplemented from KListViewItem to take into account our alternate text storage
+	 * reimplemented from TDEListViewItem to take into account our alternate text storage
 	 */
 	virtual TQString text( int column ) const;
 	virtual void setText( int column, const TQString &text );
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 2e469bf5..5b07089f 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -72,7 +72,7 @@ KopeteApplication::KopeteApplication()
 	 * TQApplication thinks the application shuts down (this is usually the case
 	 * when the loop_level goes down to zero) . So it emits aboutToQuit(), to
 	 * which TDEApplication is connected and re-emits shutdown() , to which again
-	 * KMainWindow (a KopeteWindow instance exists already) is connected. KMainWindow's
+	 * TDEMainWindow (a KopeteWindow instance exists already) is connected. TDEMainWindow's
 	 * shuttingDown() slot calls queryExit() which results in KopeteWindow::queryExit()
 	 * calling unloadPlugins() . This of course is wrong and just shouldn't happen.
 	 * The workaround is to simply delay the initialization of all this to a point
@@ -316,7 +316,7 @@ void KopeteApplication::quitKopete()
 	m_isShuttingDown = true;
 
 	// close all windows
-	TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+	TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
 	for (it.toFirst(); it.current(); ++it)
 	{
 		if ( !it.current()->close() )
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index c1f181be..97bd1732 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -107,7 +107,7 @@ void KopeteEditGlobalIdentityWidget::iconSizeChanged()
 {
 	kdDebug(14000) << k_funcinfo << "Changing icon size (i.e the picture size)" << endl;
 
-	KToolBar *tb = (KToolBar*)sender();
+	TDEToolBar *tb = (TDEToolBar*)sender();
 	if(tb)
 	{
 		// Update the picture (change the size of it)
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 5e4c7bd0..a631f304 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -96,12 +96,12 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event )
 }
 //END GlobalStatusMessageIconLabel
 
-/* KMainWindow is very broken from our point of view - it deref()'s the app
- * when the last visible KMainWindow is destroyed. But when our main window is
+/* TDEMainWindow is very broken from our point of view - it deref()'s the app
+ * when the last visible TDEMainWindow is destroyed. But when our main window is
  * hidden when it's in the tray,closing the last chatwindow would cause the app
  * to quit. - Richard
  *
- * Fortunately KMainWindow checks queryExit before deref()ing the Kapplication.
+ * Fortunately TDEMainWindow checks queryExit before deref()ing the Kapplication.
  * KopeteWindow reimplements queryExit() and only returns true if it is shutting down
  * (either because the user quit Kopete, or the session manager did).
  *
@@ -121,7 +121,7 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event )
  */
  
 KopeteWindow::KopeteWindow( TQWidget *parent, const char *name )
-: KMainWindow( parent, name, WType_TopLevel )
+: TDEMainWindow( parent, name, WType_TopLevel )
 {
 	// Applications should ensure that their StatusBar exists before calling createGUI()
 	// so that the StatusBar is always correctly positioned when KDE is configured to use
@@ -205,7 +205,7 @@ void KopeteWindow::initView()
 void KopeteWindow::initActions()
 {
 	// this action menu contains one action per account and is updated when accounts are registered/unregistered
-	actionAddContact = new KActionMenu( i18n( "&Add Contact" ), "add_user",
+	actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ), "add_user",
 		actionCollection(), "AddContact" );
 	actionAddContact->setDelayed( false );
 	// this signal mapper is needed to call slotAddContact with the correct arguments
@@ -214,20 +214,20 @@ void KopeteWindow::initActions()
 		 this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) );
 
 	/* ConnectAll is now obsolete.  "Go online" has replaced it.
-	actionConnect = new KAction( i18n( "&Connect Accounts" ), "connect_creating",
+	actionConnect = new TDEAction( i18n( "&Connect Accounts" ), "connect_creating",
 		0, Kopete::AccountManager::self(), TQT_SLOT( connectAll() ),
 		actionCollection(), "ConnectAll" );
 	*/
 
-	actionDisconnect = new KAction( i18n( "O&ffline" ), "connect_no",
+	actionDisconnect = new TDEAction( i18n( "O&ffline" ), "connect_no",
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ),
 		actionCollection(), "DisconnectAll" );
 
-	actionExportContacts = new KAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this),
+	actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this),
 		TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" );
 
 	/* the connection menu has been replaced by the set status menu
-	actionConnectionMenu = new KActionMenu( i18n("Connection"),"connect_established",
+	actionConnectionMenu = new TDEActionMenu( i18n("Connection"),"connect_established",
 							actionCollection(), "Connection" );
 
 	actionConnectionMenu->setDelayed( false );
@@ -237,32 +237,32 @@ void KopeteWindow::initActions()
 	*/
 	actionDisconnect->setEnabled(false);
 
-	selectAway = new KAction( i18n("&Away"), SmallIcon("kopeteaway"), 0,
+	selectAway = new TDEAction( i18n("&Away"), SmallIcon("kopeteaway"), 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(),
 		"SetAwayAll" );
 
-	selectBusy = new KAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0,
+	selectBusy = new TDEAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0,
 					 TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(),
 					 "SetBusyAll" );
 
 
-	actionSetInvisible = new KAction( i18n( "&Invisible" ), "kopeteavailable", 0 ,
+	actionSetInvisible = new TDEAction( i18n( "&Invisible" ), "kopeteavailable", 0 ,
 		  TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
 		  "SetInvisibleAll" );
 
 
 
-	/*actionSetAvailable = new KAction( i18n( "&Online" ),
+	/*actionSetAvailable = new TDEAction( i18n( "&Online" ),
 		"kopeteavailable", 0 , Kopete::AccountManager::self(),
 		TQT_SLOT( setAvailableAll() ), actionCollection(),
 		"SetAvailableAll" );*/
 
-	actionSetAvailable = new KAction( i18n("&Online"),
+	actionSetAvailable = new TDEAction( i18n("&Online"),
 		SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this),
 		TQT_SLOT( slotGlobalAvailable() ), actionCollection(),
 		"SetAvailableAll" );
 
-	actionAwayMenu = new KActionMenu( i18n("&Set Status"), "kopeteavailable",
+	actionAwayMenu = new TDEActionMenu( i18n("&Set Status"), "kopeteavailable",
 							actionCollection(), "Status" );
 	actionAwayMenu->setDelayed( false );
 	actionAwayMenu->insert(actionSetAvailable);
@@ -280,17 +280,17 @@ void KopeteWindow::initActions()
 	statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
 
 	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" );
-	new KAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this),
+	new TDEAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this),
 		TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" );
-	new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+	new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
 		TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" );
 
 	KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() );
 	KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
 
-	actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U,
+	actionShowOffliners = new TDEToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U,
 			TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
-	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
+	actionShowEmptyGroups = new TDEToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
 			TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
 
 	actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
@@ -304,7 +304,7 @@ void KopeteWindow::initActions()
 	new KWidgetAction( searchLabel, i18n( "Search:" ), 0, 0, 0, actionCollection(), "quicksearch_label" );
 	quickSearch->setAutoSized( true );
 	// quick search bar - clear button
-	KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
+	TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ),
 		TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
 		0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
 	resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
@@ -316,8 +316,8 @@ void KopeteWindow::initActions()
 	KWidgetAction *editGlobalAction = new KWidgetAction( editGlobalIdentityWidget, i18n("Edit Global Identity Widget"), 0, 0, 0, actionCollection(), "editglobal_widget");
 	editGlobalAction->setAutoSized( true );
 
-	// KActionMenu for selecting the global status message(kopeteonlinestatus_0)
-	KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" );
+	// TDEActionMenu for selecting the global status message(kopeteonlinestatus_0)
+	TDEActionMenu * setStatusMenu = new TDEActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" );
 	setStatusMenu->setDelayed( false );
 	connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) );
 	connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) );
@@ -380,7 +380,7 @@ void KopeteWindow::initSystray()
 {
 	m_tray = KopeteSystemTray::systemTray( this, "KopeteSystemTray" );
 	Kopete::UI::Global::setSysTrayWId( m_tray->winId() );
-	KPopupMenu *tm = m_tray->contextMenu();
+	TDEPopupMenu *tm = m_tray->contextMenu();
 
 	// NOTE: This is in reverse order because we insert
 	// at the top of the menu, not at bottom!
@@ -391,8 +391,8 @@ void KopeteWindow::initSystray()
 	//actionConnectionMenu->plug ( tm, 1 );
 	tm->insertSeparator( 1 );
 
-	TQObject::connect( m_tray, TQT_SIGNAL( aboutToShowMenu( KPopupMenu * ) ),
-		this, TQT_SLOT( slotTrayAboutToShowMenu( KPopupMenu * ) ) );
+	TQObject::connect( m_tray, TQT_SIGNAL( aboutToShowMenu( TDEPopupMenu * ) ),
+		this, TQT_SLOT( slotTrayAboutToShowMenu( TDEPopupMenu * ) ) );
 	TQObject::connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( slotQuit() ) );
 }
 
@@ -403,8 +403,8 @@ KopeteWindow::~KopeteWindow()
 
 bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
 {
-    KToolBar* toolBar = dynamic_cast<KToolBar*>( target );
-    KAction* resetAction = actionCollection()->action( "quicksearch_reset" );
+    TDEToolBar* toolBar = dynamic_cast<TDEToolBar*>( target );
+    TDEAction* resetAction = actionCollection()->action( "quicksearch_reset" );
 
     if ( toolBar && resetAction && resetAction->isPlugged( toolBar ) )
     {
@@ -414,10 +414,10 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
             resetAction->activate();
             return true;
         }
-        return KMainWindow::eventFilter( target, event );
+        return TDEMainWindow::eventFilter( target, event );
     }
 
-    return KMainWindow::eventFilter( target, event );
+    return TDEMainWindow::eventFilter( target, event );
 }
 
 void KopeteWindow::loadOptions()
@@ -657,7 +657,7 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
 	// window is closed.
 	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
 	if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
-		// BEGIN of code borrowed from KMainWindow::closeEvent
+		// BEGIN of code borrowed from TDEMainWindow::closeEvent
 		// Save settings if auto-save is enabled, and settings have changed
 		if ( settingsDirty() && autoSaveSettings() )
 			saveAutoSaveSettings();
@@ -665,13 +665,13 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
 		if ( queryClose() ) {
 			e->accept();
 		}
-		// END of code borrowed from KMainWindow::closeEvent
+		// END of code borrowed from TDEMainWindow::closeEvent
 		kdDebug( 14000 ) << k_funcinfo << "just closing because we have a system tray icon" << endl;
 	}
 	else
 	{
-		kdDebug( 14000 ) << k_funcinfo << "delegating to KMainWindow::closeEvent()" << endl;
-		KMainWindow::closeEvent( e );
+		kdDebug( 14000 ) << k_funcinfo << "delegating to TDEMainWindow::closeEvent()" << endl;
+		TDEMainWindow::closeEvent( e );
 	}
 }
 
@@ -728,7 +728,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account )
 	// add an item for this account to the add contact actionmenu
 	TQString s = "actionAdd%1Contact";
 	s.arg( account->accountId() );
-	KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() );
+	TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() );
 	addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() );
 	actionAddContact->insert( action );
 }
@@ -757,12 +757,12 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account)
 	// update add contact actionmenu
 	TQString s = "actionAdd%1Contact";
 	s.arg( account->accountId() );
-// 	KAction * action = actionCollection()->action( account->accountId() );
+// 	TDEAction * action = actionCollection()->action( account->accountId() );
 	Kopete::Account * myAccount = const_cast< Kopete::Account * > ( account );
-	KAction * action = static_cast< KAction *>( myAccount->child( s.latin1() ) );
+	TDEAction * action = static_cast< TDEAction *>( myAccount->child( s.latin1() ) );
 	if ( action )
 	{
-		kdDebug(14000) << " found KAction " << action << " with name: " << action->name() << endl;
+		kdDebug(14000) << " found TDEAction " << action << " with name: " << action->name() << endl;
 		addContactMapper->removeMappings( action );
 		actionAddContact->remove( action );
 	}
@@ -878,7 +878,7 @@ void KopeteWindow::makeTrayToolTip()
 
 void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account, const TQPoint &p )
 {
-	KActionMenu *actionMenu = account->actionMenu();
+	TDEActionMenu *actionMenu = account->actionMenu();
 	if ( !actionMenu )
 		return;
 
@@ -886,12 +886,12 @@ void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account,
 	actionMenu->popupMenu()->popup( p );
 }
 
-void KopeteWindow::slotTrayAboutToShowMenu( KPopupMenu * popup )
+void KopeteWindow::slotTrayAboutToShowMenu( TDEPopupMenu * popup )
 {
 	TQPtrList<Kopete::Account>  accounts = Kopete::AccountManager::self()->accounts();
 	for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() )
 	{
-		KActionMenu *menu = a->actionMenu();
+		TDEActionMenu *menu = a->actionMenu();
 		if( menu )
 			menu->plug(popup, 1 );
 
@@ -907,7 +907,7 @@ void KopeteWindow::slotTrayAboutToShowMenu( KPopupMenu * popup )
 	//kdDebug( 14000 ) << k_funcinfo << endl;
 	if ( Kopete::AccountManager::self()->accounts( proto ).count() > 0 )
 	{
-		KActionMenu *menu = proto->protocolActions();
+		TDEActionMenu *menu = proto->protocolActions();
 
 		connect( menu->popupMenu(), TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
 		menu->popupMenu()->popup( p );
@@ -969,11 +969,11 @@ void KopeteWindow::setStatusMessage( const TQString & message )
 void KopeteWindow::slotBuildStatusMessageMenu()
 {
 	TQObject * senderObj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
-	m_globalStatusMessageMenu = static_cast<KPopupMenu *>( TQT_TQWIDGET(senderObj) );
+	m_globalStatusMessageMenu = static_cast<TDEPopupMenu *>( TQT_TQWIDGET(senderObj) );
 	m_globalStatusMessageMenu->clear();
 // pop up a menu containing the away messages, and a lineedit
 // see kopeteaway
-	//messageMenu = new KPopupMenu( this );
+	//messageMenu = new TDEPopupMenu( this );
 //	messageMenu->insertTitle( i18n( "Status Message" ) );
 	TQHBox * newMessageBox = new TQHBox( 0 );
 	newMessageBox->setMargin( 1 );
@@ -1033,7 +1033,7 @@ void KopeteWindow::slotNewStatusMessageEntered()
 
 void KopeteWindow::slotGlobalStatusMessageIconClicked( const TQPoint &position )
 {
-	KPopupMenu *statusMessageIconMenu = new KPopupMenu(this, "statusMessageIconMenu");
+	TDEPopupMenu *statusMessageIconMenu = new TDEPopupMenu(this, "statusMessageIconMenu");
 	connect(statusMessageIconMenu, TQT_SIGNAL( aboutToShow() ),
 		this, TQT_SLOT(slotBuildStatusMessageMenu()));
 	connect( statusMessageIconMenu, TQT_SIGNAL( activated( int ) ),
diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h
index a9625931..881382c0 100644
--- a/kopete/kopete/kopetewindow.h
+++ b/kopete/kopete/kopetewindow.h
@@ -32,13 +32,13 @@ class TQSignalMapper;
 class TQMouseEvent;
 class TQPoint;
 
-class KAction;
-class KActionMenu;
+class TDEAction;
+class TDEActionMenu;
 
 class TDEGlobalAccel;
-class KSelectAction;
+class TDESelectAction;
 class KSqueezedTextLabel;
-class KToggleAction;
+class TDEToggleAction;
 
 class KopeteAccountStatusBarIcon;
 class KopeteContactListView;
@@ -58,7 +58,7 @@ class Protocol;
 /**
  * @author Duncan Mac-Vicar P. <duncan@kde.org>
  */
-class KopeteWindow : public KMainWindow
+class KopeteWindow : public TDEMainWindow
 {
 	Q_OBJECT
   
@@ -155,7 +155,7 @@ private slots:
 	void slotAccountStatusIconRightClicked( Kopete::Account *a,
 		const TQPoint &p );
 
-	void slotTrayAboutToShowMenu(KPopupMenu *);
+	void slotTrayAboutToShowMenu(TDEPopupMenu *);
 
 	/**
 	 * Show the Add Contact wizard
@@ -198,28 +198,28 @@ public:
 	KopeteContactListView *contactlist;
 
 	// Some Actions
-	KActionMenu* actionAddContact;
-
-	//KActionMenu* actionConnectionMenu;
-	//KAction* actionConnect;
-	KAction* actionDisconnect;
-	KAction* actionExportContacts;
-
-	KActionMenu* actionAwayMenu;
-	KActionMenu* actionDockMenu;
-	KAction* selectAway;
-	KAction* selectBusy;
-	KAction* actionSetAvailable;
-	KAction* actionSetInvisible;
-
-
-	KAction* actionPrefs;
-	KAction* actionQuit;
-	KAction* actionSave;
-	KToggleAction *menubarAction;
-	KToggleAction *statusbarAction;
-	KToggleAction *actionShowOffliners;
-	KToggleAction *actionShowEmptyGroups;
+	TDEActionMenu* actionAddContact;
+
+	//TDEActionMenu* actionConnectionMenu;
+	//TDEAction* actionConnect;
+	TDEAction* actionDisconnect;
+	TDEAction* actionExportContacts;
+
+	TDEActionMenu* actionAwayMenu;
+	TDEActionMenu* actionDockMenu;
+	TDEAction* selectAway;
+	TDEAction* selectBusy;
+	TDEAction* actionSetAvailable;
+	TDEAction* actionSetInvisible;
+
+
+	TDEAction* actionPrefs;
+	TDEAction* actionQuit;
+	TDEAction* actionSave;
+	TDEToggleAction *menubarAction;
+	TDEToggleAction *statusbarAction;
+	TDEToggleAction *actionShowOffliners;
+	TDEToggleAction *actionShowEmptyGroups;
 	TDEGlobalAccel *globalAccel;
 
 	KopeteEditGlobalIdentityWidget *editGlobalIdentityWidget;
@@ -257,7 +257,7 @@ private:
 	 */
 	TQPtrDict<TQObject> m_accountStatusBarIcons;
 	KSqueezedTextLabel * m_globalStatusMessage;
-	KPopupMenu * m_globalStatusMessageMenu;
+	TDEPopupMenu * m_globalStatusMessageMenu;
 	TQLineEdit * m_newMessageEdit;
 	TQString m_globalStatusMessageStored;
 };
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index 75fef262..009ac09d 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -78,7 +78,7 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name)
  	// in the close widget click case, we only want to hide the parent window
 	// so instead, we make it call our general purpose quit slot on the window, which causes a window close and everything else we need
 	// KDE4 - app will have to listen for quitSelected instead
-	KAction *quit = actionCollection()->action( "file_quit" );
+	TDEAction *quit = actionCollection()->action( "file_quit" );
 	quit->disconnect();
 	KopeteWindow *myParent = static_cast<KopeteWindow *>( parent );
     connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) );
@@ -124,7 +124,7 @@ void KopeteSystemTray::mouseDoubleClickEvent( TQMouseEvent *me )
 	}
 }
 
-void KopeteSystemTray::contextMenuAboutToShow( KPopupMenu *me )
+void KopeteSystemTray::contextMenuAboutToShow( TDEPopupMenu *me )
 {
 	//kdDebug(14010) << k_funcinfo << "Called." << endl;
 	emit aboutToShowMenu( me );
diff --git a/kopete/kopete/systemtray.h b/kopete/kopete/systemtray.h
index 496e438d..2f483600 100644
--- a/kopete/kopete/systemtray.h
+++ b/kopete/kopete/systemtray.h
@@ -29,8 +29,8 @@
 
 class TQTimer;
 class TQPoint;
-class KPopupMenu;
-class KActionMenu;
+class TDEPopupMenu;
+class TDEActionMenu;
 class KopeteBalloon;
 
 /**
@@ -60,15 +60,15 @@ public:
 
 	void stopBlink();
 	bool isBlinking() const { return mIsBlinking; };
-	KPopupMenu *contextMenu() const { return KSystemTray::contextMenu(); };
+	TDEPopupMenu *contextMenu() const { return KSystemTray::contextMenu(); };
 
 protected:
 	virtual void mousePressEvent( TQMouseEvent *e );
 	virtual void mouseDoubleClickEvent( TQMouseEvent *me );
-	virtual void contextMenuAboutToShow( KPopupMenu * );
+	virtual void contextMenuAboutToShow( TDEPopupMenu * );
 
 signals:
-	void aboutToShowMenu(KPopupMenu *am);
+	void aboutToShowMenu(TDEPopupMenu *am);
 
 private slots:
 	void slotBlink();