Rename a number of classes to enhance compatibility with KDE4

25 files changed, 119 insertions, 119 deletions

diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 98d927a..2c29bdc 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -248,7 +248,7 @@ void FileSelectDlg::setupMultifileTorrent()
 void FileSelectDlg::setupSinglefileTorrent()
 {
 	m_file_view->clear();
-	KListViewItem* single_root = new KListViewItem(m_file_view);
+	TDEListViewItem* single_root = new TDEListViewItem(m_file_view);
 	single_root->setText(0,tc->getStats().torrent_name);
 	single_root->setText(1,BytesToString(tc->getStats().total_bytes));
 	single_root->setText(2,i18n("Yes"));
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
index 546d72c..a703c18 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/apps/ktorrent/fileselectdlgbase.ui
@@ -132,7 +132,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView" row="0" column="0" rowspan="4" colspan="1">
+                <widget class="TDEListView" row="0" column="0" rowspan="4" colspan="1">
                     <column>
                         <property name="text">
                             <string>File</string>
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 708cb17..f159a60 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -45,7 +45,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
 	TQHBoxLayout* layout = new TQHBoxLayout(foo);
 	layout->addSpacing(gap);
 	
-	m_close = new KToolBarButton("fileclose",0,this);
+	m_close = new TDEToolBarButton("fileclose",0,this);
 	connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide()));
 	layout->addWidget(m_close);
 	
diff --git a/apps/ktorrent/filterbar.h b/apps/ktorrent/filterbar.h
index 7cb4282..5164587 100644
--- a/apps/ktorrent/filterbar.h
+++ b/apps/ktorrent/filterbar.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 class TDEConfig;
 class KLineEdit;
 class KPushButton;
-class KToolBarButton;
+class TDEToolBarButton;
 
 namespace kt
 {
@@ -64,7 +64,7 @@ private:
 	KLineEdit* m_filterInput;
 	KPushButton* m_clear;
 	TQCheckBox* m_case_sensitive;
-	KToolBarButton* m_close;
+	TDEToolBarButton* m_close;
 	TQString m_name_filter;
 };
 
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index 0b6af06..c3fc584 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -41,13 +41,13 @@ using namespace bt;
 
 namespace kt
 {
-	GroupViewItem::GroupViewItem(GroupView* parent,Group* g) : KListViewItem(parent),gview(parent)
+	GroupViewItem::GroupViewItem(GroupView* parent,Group* g) : TDEListViewItem(parent),gview(parent)
 	{
 		setText(0,g->groupName());
 		setPixmap(0,g->groupIcon());
 	}
 	
-	GroupViewItem::GroupViewItem(GroupView* gview,KListViewItem* parent,Group* g) : KListViewItem(parent),gview(gview)
+	GroupViewItem::GroupViewItem(GroupView* gview,TDEListViewItem* parent,Group* g) : TDEListViewItem(parent),gview(gview)
 	{
 		setText(0,g->groupName());
 		setPixmap(0,g->groupIcon());
@@ -65,8 +65,8 @@ namespace kt
 			return TQString::compare(text(1),i->text(1));
 	}
 
-	GroupView::GroupView(ViewManager* view,KActionCollection* col,TQWidget *parent, const char *name)
-	: KListView(parent, name),view(view),custom_root(0)
+	GroupView::GroupView(ViewManager* view,TDEActionCollection* col,TQWidget *parent, const char *name)
+	: TDEListView(parent, name),view(view),custom_root(0)
 	{
 		setFullWidth(true);
 		setRootIsDecorated(true);
@@ -81,8 +81,8 @@ namespace kt
 		current = gman->allGroup();
 		
 		connect(this,TQT_SIGNAL(clicked(TQListViewItem*)),this,TQT_SLOT(onExecuted( TQListViewItem* )));
-		connect(this,TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint & )),
-				this,TQT_SLOT(showContextMenu( KListView*, TQListViewItem*, const TQPoint& )));
+		connect(this,TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )),
+				this,TQT_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& )));
 		connect(this,TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)),
 				this,TQT_SLOT(onDropped( TQDropEvent*, TQListViewItem* )));	
 		
@@ -104,7 +104,7 @@ namespace kt
 		addGroup(gman->activeDownloadsGroup(), active);
 		addGroup(gman->activeUploadsGroup(), active);
 		
-		custom_root = new KListViewItem(all,i18n("Custom Groups"));
+		custom_root = new TDEListViewItem(all,i18n("Custom Groups"));
 		custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
 		setOpen(custom_root,true);
 	}
@@ -131,20 +131,20 @@ namespace kt
 		sort();
 	}
 	
-	void GroupView::createMenu(KActionCollection* col)
+	void GroupView::createMenu(TDEActionCollection* col)
 	{
-		menu = new KPopupMenu(this);
+		menu = new TDEPopupMenu(this);
 		
-		new_group = new KAction(i18n("New Group"),"filenew",0,
+		new_group = new TDEAction(i18n("New Group"),"filenew",0,
 							 TQT_TQOBJECT(this), TQT_SLOT(addGroup()),col, "New Group");
 		
-		edit_group = new KAction(i18n("Edit Name"),"edit",0,
+		edit_group = new TDEAction(i18n("Edit Name"),"edit",0,
 							 TQT_TQOBJECT(this), TQT_SLOT(editGroupName()),col,"Edit Group Name");
 		
-		remove_group = new KAction(i18n("Remove Group"),"remove",0,
+		remove_group = new TDEAction(i18n("Remove Group"),"remove",0,
 							 TQT_TQOBJECT(this), TQT_SLOT(removeGroup()),col,"Remove Group");
 		
-		open_in_new_tab = new KAction(i18n("Open Tab"),"fileopen",0,
+		open_in_new_tab = new TDEAction(i18n("Open Tab"),"fileopen",0,
 							 TQT_TQOBJECT(this) ,TQT_SLOT(openView()),col,"Open Tab");
 		
 		open_in_new_tab->plug(menu);
@@ -226,7 +226,7 @@ namespace kt
 		}
 	}
 
-	GroupViewItem* GroupView::addGroup(Group* g,KListViewItem* parent)
+	GroupViewItem* GroupView::addGroup(Group* g,TDEListViewItem* parent)
 	{
 		GroupViewItem* li = 0;
 		if (parent)
@@ -246,7 +246,7 @@ namespace kt
 		return li;
 	}
 	
-	void GroupView::showContextMenu(KListView* ,TQListViewItem* item,const TQPoint & p)
+	void GroupView::showContextMenu(TDEListView* ,TQListViewItem* item,const TQPoint & p)
 	{
 		current_item = dynamic_cast<GroupViewItem*>(item);
 		
@@ -318,7 +318,7 @@ namespace kt
 		saveGroups();
 	}
 	
-	void GroupView::updateGroupsSubMenu(KPopupMenu* gsm)
+	void GroupView::updateGroupsSubMenu(TDEPopupMenu* gsm)
 	{
 		gsm->clear();
 		for (GroupManager::iterator i = gman->begin();i != gman->end();i++)
diff --git a/apps/ktorrent/groups/groupview.h b/apps/ktorrent/groups/groupview.h
index 3243487..1fd9772 100644
--- a/apps/ktorrent/groups/groupview.h
+++ b/apps/ktorrent/groups/groupview.h
@@ -23,8 +23,8 @@
 #include <klistview.h>
 #include <util/ptrmap.h>
 
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
 class ViewManager;
 class KTorrentView;
 
@@ -35,13 +35,13 @@ namespace kt
 	class GroupManager;
 	class TorrentInterface;
 	
-	class GroupViewItem : public KListViewItem
+	class GroupViewItem : public TDEListViewItem
 	{
 		Group* g;
 		GroupView* gview;
 	public:
 		GroupViewItem(GroupView* parent,Group* g);
-		GroupViewItem(GroupView* gview,KListViewItem* parent,Group* g);
+		GroupViewItem(GroupView* gview,TDEListViewItem* parent,Group* g);
 		virtual ~GroupViewItem();
 		
 		virtual int compare(TQListViewItem* i,int col,bool ascending) const; 
@@ -50,12 +50,12 @@ namespace kt
 	/**
 		@author Joris Guisson <joris.guisson@gmail.com>
 	*/
-	class GroupView : public KListView
+	class GroupView : public TDEListView
 	{
 		Q_OBJECT
   
 	public:
-		GroupView(ViewManager* view,KActionCollection* col,TQWidget *parent = 0, const char *name = 0);
+		GroupView(ViewManager* view,TDEActionCollection* col,TQWidget *parent = 0, const char *name = 0);
 		virtual ~GroupView();
 		
 		/// Get the current group
@@ -76,14 +76,14 @@ namespace kt
 		void onTorrentRemoved(kt::TorrentInterface* tc);
 		
 		/// Update a groups sub menu
-		void updateGroupsSubMenu(KPopupMenu* gsm);
+		void updateGroupsSubMenu(TDEPopupMenu* gsm);
 		
 		/// An item was activated in the groups sub menu of a KTorrentView
 		void onGroupsSubMenuItemActivated(KTorrentView* v,const TQString & group);
 		
 	private slots:
 		void onExecuted(TQListViewItem* item);
-		void showContextMenu(KListView* ,TQListViewItem* item,const TQPoint & p);
+		void showContextMenu(TDEListView* ,TQListViewItem* item,const TQPoint & p);
 		void addGroup();
 		void removeGroup();
 		void editGroupName();
@@ -99,12 +99,12 @@ namespace kt
 		void groupRemoved(kt::Group* g);
 		
 	private:
-		void createMenu(KActionCollection* col);
-		GroupViewItem* addGroup(Group* g,KListViewItem* parent);
+		void createMenu(TDEActionCollection* col);
+		GroupViewItem* addGroup(Group* g,TDEListViewItem* parent);
 			
 	private:
 		ViewManager* view;
-		KListViewItem* custom_root;
+		TDEListViewItem* custom_root;
 		bt::PtrMap<GroupViewItem*,Group> groups;
 		GroupManager* gman;
 		TQString save_file;
@@ -112,11 +112,11 @@ namespace kt
 		Group* current;
 		
 		GroupViewItem* current_item;
-		KPopupMenu* menu;
-		KAction* new_group;
-		KAction* edit_group;
-		KAction* remove_group;
-		KAction* open_in_new_tab;
+		TDEPopupMenu* menu;
+		TDEAction* new_group;
+		TDEAction* edit_group;
+		TDEAction* remove_group;
+		TDEAction* open_in_new_tab;
 		
 		friend class GroupViewItem;
 	};
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index a8e2af6..5cbab72 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -48,7 +48,7 @@ IPFilterWidget::IPFilterWidget(TQWidget *parent, const char *name)
 	
 	for (TQStringList::Iterator it = blocklist->begin(); it != blocklist->end(); ++it)
 	{
-		new KListViewItem(lstPeers, *it);
+		new TDEListViewItem(lstPeers, *it);
 	}
 	
 	delete blocklist;
@@ -66,7 +66,7 @@ void IPFilterWidget::btnAdd_clicked()
 	if(v.validate( ip, var ) == TQValidator::Acceptable)
 	{
 		if(lstPeers->findItem(ip, 0) == 0)
-			new KListViewItem(lstPeers, ip);
+			new TDEListViewItem(lstPeers, ip);
 	}
 	else
 		KMessageBox::sorry(0, i18n("You must enter IP in format 'XXX.XXX.XXX.XXX'. You can also use wildcards for ranges like '127.0.0.*'."));
@@ -181,7 +181,7 @@ void IPFilterWidget::loadFilter(TQString& fn)
 			continue;
 		}
 				
-		new KListViewItem(lstPeers, line);
+		new TDEListViewItem(lstPeers, line);
 		++i;
 	}
 	
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
index 7d8c383..d2fe5c3 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/apps/ktorrent/ipfilterwidgetbase.ui
@@ -44,7 +44,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView" row="2" column="0">
+                <widget class="TDEListView" row="2" column="0">
                     <column>
                         <property name="text">
                             <string>Peer IP address</string>
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index c60f616..4572b56 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -295,8 +295,8 @@ void KTorrent::openView(kt::Group* g)
 	connect(v, TQT_SIGNAL(queue( kt::TorrentInterface* )), 
 			m_core, TQT_SLOT(queue( kt::TorrentInterface* )));
 	
-	connect(v,TQT_SIGNAL(updateGroupsSubMenu(KPopupMenu*)),
-			m_group_view,TQT_SLOT(updateGroupsSubMenu(KPopupMenu*)));
+	connect(v,TQT_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)),
+			m_group_view,TQT_SLOT(updateGroupsSubMenu(TDEPopupMenu*)));
 	
 	connect(v,TQT_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)),
 			m_group_view,TQT_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&)));
@@ -509,52 +509,52 @@ void KTorrent::setupActions()
 	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
 	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
-	KAction* pref = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+	TDEAction* pref = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
 
-	m_start = new KAction(
+	m_start = new TDEAction(
 			i18n("to start", "Start"), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(startDownload()),
 			actionCollection(), "Start");
 
-	m_stop = new KAction(
+	m_stop = new TDEAction(
 			i18n("to stop", "Stop"), "ktstop",0,TQT_TQOBJECT(this), TQT_SLOT(stopDownload()),
 			actionCollection(), "Stop");
 
-	m_remove = new KAction(
+	m_remove = new TDEAction(
 			i18n("Remove"), "ktremove",0,TQT_TQOBJECT(this), TQT_SLOT(removeDownload()),
 			actionCollection(), "Remove");
 	
-	m_startall = new KAction(
+	m_startall = new TDEAction(
 			i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloadsCurrentView()),
 			actionCollection(), "Start all");
 	
-	m_startall_systray = new KAction(i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloads()),actionCollection());
+	m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloads()),actionCollection());
 	
-	m_stopall = new KAction(
+	m_stopall = new TDEAction(
 			i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloadsCurrentView()),
 			actionCollection(), "Stop all");
 	
-	m_stopall_systray = new KAction(i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloads()),actionCollection());
+	m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloads()),actionCollection());
 	
-	m_pasteurl = new KAction(
+	m_pasteurl = new TDEAction(
 			i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(torrentPaste()),
 			actionCollection(), "paste_url");
 	
-	m_queuemgr = new KAction(
+	m_queuemgr = new TDEAction(
 			i18n("to open Queue Manager", "Open Queue Manager..."),
 			"ktqueuemanager", 0, TQT_TQOBJECT(this), TQT_SLOT(queueManagerShow()),
 			actionCollection(), "Queue manager");
 	
-	m_queueaction = new KAction(
+	m_queueaction = new TDEAction(
 			i18n("Enqueue/Dequeue"),
 			"player_playlist", 0, m_view_man, TQT_SLOT(queueAction()),
 			actionCollection(), "queue_action");
 	
-	m_ipfilter = new KAction(
+	m_ipfilter = new TDEAction(
 			i18n("IPFilter"),
 			"filter", 0, TQT_TQOBJECT(this), TQT_SLOT(showIPFilter()),
 			actionCollection(), "ipfilter_action");
 	
-	m_datacheck = new KAction(
+	m_datacheck = new TDEAction(
 			i18n("Check Data Integrity"),
 	TQString(),0,m_view_man,TQT_SLOT(checkDataIntegrity()),actionCollection(),"check_data");
 	
@@ -962,12 +962,12 @@ void KTorrent::openDefaultView()
 	openView(i18n("All Torrents"));
 }
 
-KToolBar* KTorrent::addToolBar(const char* name)
+TDEToolBar* KTorrent::addToolBar(const char* name)
 {
 	return toolBar(name);
 }
 
-void KTorrent::removeToolBar(KToolBar* tb)
+void KTorrent::removeToolBar(TDEToolBar* tb)
 {
 	delete tb;
 }
diff --git a/apps/ktorrent/ktorrent.h b/apps/ktorrent/ktorrent.h
index fff305f..5fa219e 100644
--- a/apps/ktorrent/ktorrent.h
+++ b/apps/ktorrent/ktorrent.h
@@ -33,8 +33,8 @@
 
 typedef TQValueList<TQCString> QCStringList;
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class KURL;
 class KTorrentCore;
 class KTorrentView;
@@ -104,8 +104,8 @@ public:
 	virtual void addToolWidget(TQWidget* w,const TQString & icon,const TQString & caption,ToolDock dock);
 	virtual void removeToolWidget(TQWidget* w);
 	virtual const kt::TorrentInterface* getCurrentTorrent() const;
-	virtual KToolBar* addToolBar(const char* name);
-	virtual void removeToolBar(KToolBar* tb);
+	virtual TDEToolBar* addToolBar(const char* name);
+	virtual void removeToolBar(TDEToolBar* tb);
 	virtual KProgress* addProgressBarToStatusBar();
 	virtual void removeProgressBarFromStatusBar(KProgress* p);
 	
@@ -198,8 +198,8 @@ private:
 private:
 	kt::GroupView* m_group_view;
 	ViewManager* m_view_man;
-	KToggleAction *m_statusbarAction;
-	KToggleAction* m_menubarAction;
+	TDEToggleAction *m_statusbarAction;
+	TDEToggleAction* m_menubarAction;
 	
 	KTorrentCore* m_core;
 	TrayIcon* m_systray_icon;
@@ -219,19 +219,19 @@ private:
 	TQLabel* m_statusDHT;
 	TQLabel* m_statusFirewall;
 	
-	KAction* m_start;
-	KAction* m_stop;
-	KAction* m_remove;
-	KAction* m_startall;
-	KAction* m_startall_systray;
-	KAction* m_stopall;
-	KAction* m_stopall_systray;
-	KAction* m_pasteurl;
-	KAction* m_queuemgr; 
-	KAction* m_queueaction;
-	KAction* m_datacheck;
-	KAction* m_ipfilter;
-	KAction* m_find;
+	TDEAction* m_start;
+	TDEAction* m_stop;
+	TDEAction* m_remove;
+	TDEAction* m_startall;
+	TDEAction* m_startall_systray;
+	TDEAction* m_stopall;
+	TDEAction* m_stopall_systray;
+	TDEAction* m_pasteurl;
+	TDEAction* m_queuemgr; 
+	TDEAction* m_queueaction;
+	TDEAction* m_datacheck;
+	TDEAction* m_ipfilter;
+	TDEAction* m_find;
 	
 	KProgress* m_status_prog;
 };
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index aa3cd26..de31c2c 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -55,7 +55,7 @@ using namespace bt;
 using namespace kt;
 
 
-TorrentView::TorrentView(KTorrentView* parent) : KListView(parent),ktview(parent)
+TorrentView::TorrentView(KTorrentView* parent) : TDEListView(parent),ktview(parent)
 {}
 	
 TorrentView::~TorrentView() 
@@ -79,7 +79,7 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e)
 		}
 	}
 
-	return KListView::eventFilter(watched, e);
+	return TDEListView::eventFilter(watched, e);
 }
 
 KTorrentView::KTorrentView(TQWidget *parent)
@@ -99,8 +99,8 @@ KTorrentView::KTorrentView(TQWidget *parent)
 	connect(view,TQT_SIGNAL(currentChanged(TQListViewItem* )),
 			this,TQT_SLOT(onExecuted(TQListViewItem* )));
 	
-	connect(view,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint& )),
-			this,TQT_SLOT(showContextMenu(KListView*, TQListViewItem*, const TQPoint& )));
+	connect(view,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )),
+			this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& )));
 	
 	connect(view,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(onSelectionChanged()));
 
@@ -127,7 +127,7 @@ void KTorrentView::insertColumn(TQString label, TQt::AlignmentFlags align)
 void KTorrentView::setupColumns()
 {
 		//Header menu
-	m_headerMenu = new KPopupMenu(view);
+	m_headerMenu = new TDEPopupMenu(view);
 	m_headerMenu->setCheckable(true);
 	m_headerMenu->insertTitle(i18n("Visible columns"));
 	
@@ -461,7 +461,7 @@ void KTorrentView::onExecuted(TQListViewItem* item)
 	}
 }
 
-void KTorrentView::showContextMenu(KListView* ,TQListViewItem*,const TQPoint & p)
+void KTorrentView::showContextMenu(TDEListView* ,TQListViewItem*,const TQPoint & p)
 {
 	updateGroupsSubMenu(menu->getGroupsSubMenu());
 	menu->show(p);
diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h
index b822a77..b8b1252 100644
--- a/apps/ktorrent/ktorrentview.h
+++ b/apps/ktorrent/ktorrentview.h
@@ -29,7 +29,7 @@ typedef TQValueList<TQCString> QCStringList;
 
 class KURL;
 class KTorrentViewItem;
-class KPopupMenu;
+class TDEPopupMenu;
 class KTorrentCore;
 class KTorrentViewMenu;
 class KTorrentView;
@@ -45,7 +45,7 @@ namespace kt
 
 using namespace bt;
 
-class TorrentView : public KListView
+class TorrentView : public TDEListView
 {
 public:
 	TorrentView(KTorrentView* parent);
@@ -131,7 +131,7 @@ public:
 	
 	TQPtrList<TQListViewItem> selectedItems() {return view->selectedItems();}
 		
-	KListView* listView() {return view;}
+	TDEListView* listView() {return view;}
 	
 	/**
 	 * Toggle the visibility of the filter bar
@@ -165,7 +165,7 @@ public slots:
 
 private slots:
 	void onExecuted(TQListViewItem* item);
-	void showContextMenu(KListView* ,TQListViewItem* item,const TQPoint & p);
+	void showContextMenu(TDEListView* ,TQListViewItem* item,const TQPoint & p);
 	void onColumnVisibilityChange(int);
 	void gsmItemActived(const TQString & group);
 	
@@ -185,7 +185,7 @@ signals:
 	void updateActions(int flags);
 	void queue(kt::TorrentInterface* tc);
 	void needsDataCheck(kt::TorrentInterface* tc);
-	void updateGroupsSubMenu(KPopupMenu* gsm);
+	void updateGroupsSubMenu(TDEPopupMenu* gsm);
 	void groupsSubMenuItemActivated(KTorrentView* v,const TQString & group);
 
 private:
@@ -204,7 +204,7 @@ private:
 private:
 	TQMap<kt::TorrentInterface*,KTorrentViewItem*> items;
 	KTorrentViewMenu* menu;
-	KPopupMenu* m_headerMenu;
+	TDEPopupMenu* m_headerMenu;
 	kt::Group* current_group;
 	Uint32 running;
 	Uint32 total;
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
index ff21871..81ccc99 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/apps/ktorrent/ktorrentviewitem.cpp
@@ -117,7 +117,7 @@ static double Percentage(const TorrentStats & s)
 
 
 KTorrentViewItem::KTorrentViewItem(KTorrentView* parent,TorrentInterface* tc)
-	: KListViewItem(parent->listView()),tc(tc)
+	: TDEListViewItem(parent->listView()),tc(tc)
 {
 	m_parent = parent;
 	update();
@@ -350,5 +350,5 @@ void KTorrentViewItem::paintCell(TQPainter* p,const TQColorGroup & cg,
 		_cg.setColor(TQColorGroup::Text, ratioToColor(kt::ShareRatio(tc->getStats())));
 
 
-	KListViewItem::paintCell(p,_cg,column,width,align);
+	TDEListViewItem::paintCell(p,_cg,column,width,align);
 }
diff --git a/apps/ktorrent/ktorrentviewitem.h b/apps/ktorrent/ktorrentviewitem.h
index 65ca29b..adf6b3a 100644
--- a/apps/ktorrent/ktorrentviewitem.h
+++ b/apps/ktorrent/ktorrentviewitem.h
@@ -34,7 +34,7 @@ class KTorrentView;
 /**
  * @author Joris Guisson
 */
-class KTorrentViewItem : public KListViewItem
+class KTorrentViewItem : public TDEListViewItem
 {
 	kt::TorrentInterface* tc;
 	bt::Int64 eta;
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index 7ebb62d..2b9578c 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -29,7 +29,7 @@
 using namespace kt;
 
 KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
-		: KPopupMenu ( parent, name ),view(parent)
+		: TDEPopupMenu ( parent, name ),view(parent)
 {
 	KIconLoader* iload = TDEGlobal::iconLoader();
 	
@@ -59,7 +59,7 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 			iload->loadIconSet("add", KIcon::Small), i18n("Add Peers"),
 			parent, TQT_SLOT(showAddPeersWidget())); 
 	
-	peer_sources_menu = new KPopupMenu(this);
+	peer_sources_menu = new TDEPopupMenu(this);
 	peer_sources_id = insertItem(i18n("Additional Peer Sources"), peer_sources_menu);
 	peer_sources_menu->insertTitle(i18n("Torrent Peer Sources:"));
 	peer_sources_menu->setCheckable(true);
@@ -77,7 +77,7 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 			parent, TQT_SLOT(previewFiles()));
 	
 	insertSeparator();
-	dirs_sub_menu = new KPopupMenu(this);
+	dirs_sub_menu = new TDEPopupMenu(this);
 	dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu);
 	outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Data Directory"), 
 											 parent, TQT_SLOT(openOutputDirectory()));
@@ -88,7 +88,7 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
 	
 	insertSeparator();
 	remove_from_group_id =  insertItem(i18n("Remove From Group"),parent, TQT_SLOT(removeFromGroup()));
-	groups_sub_menu = new KPopupMenu(this);
+	groups_sub_menu = new TDEPopupMenu(this);
 	
 	add_to_group_id = insertItem(i18n("Add to Group"),groups_sub_menu);
 	
diff --git a/apps/ktorrent/ktorrentviewmenu.h b/apps/ktorrent/ktorrentviewmenu.h
index c8cdbc5..1809941 100644
--- a/apps/ktorrent/ktorrentviewmenu.h
+++ b/apps/ktorrent/ktorrentviewmenu.h
@@ -27,7 +27,7 @@ class KTorrentView;
 /**
 	@author Joris Guisson <joris.guisson@gmail.com>
 */
-class KTorrentViewMenu : public KPopupMenu
+class KTorrentViewMenu : public TDEPopupMenu
 {
 	Q_OBJECT
   
@@ -39,7 +39,7 @@ public:
 	void show(const TQPoint & p);
 	
 	/// Get the group sub menu
-	KPopupMenu* getGroupsSubMenu() {return groups_sub_menu;}
+	TDEPopupMenu* getGroupsSubMenu() {return groups_sub_menu;}
 	
 public slots:
 	void gsmItemActived(int id);
@@ -50,9 +50,9 @@ signals:
 
 private:
 	KTorrentView* view;
-	KPopupMenu* groups_sub_menu;
-	KPopupMenu* dirs_sub_menu;
-	KPopupMenu* peer_sources_menu;
+	TDEPopupMenu* groups_sub_menu;
+	TDEPopupMenu* dirs_sub_menu;
+	TDEPopupMenu* peer_sources_menu;
 	int stop_id;
 	int start_id;
 	int remove_id;
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 4fcf150..621561a 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -55,9 +55,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 
     TQToolTip::add(this, m_realText);
 
-    m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0,
+    m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
         TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
-    m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
+    m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
         TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
 
     TDEConfig *config = kapp->config();
diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h
index 8656692..00a31de 100644
--- a/apps/ktorrent/newui/button.h
+++ b/apps/ktorrent/newui/button.h
@@ -25,7 +25,7 @@
 
 #include "comdefs.h"
 
-class KAction;
+class TDEAction;
 
 namespace Ideal {
 
@@ -98,8 +98,8 @@ private:
     TQString m_realText;
     TQIconSet m_realIconSet;
 
-    KAction *m_assignAccelAction;
-    KAction *m_clearAccelAction;
+    TDEAction *m_assignAccelAction;
+    TDEAction *m_clearAccelAction;
 
 friend class ButtonBar;
 };
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index b2ac81d..f63c0c7 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
-    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
-    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
 
     setVisible(m_visible);
 
@@ -320,7 +320,7 @@ void DDockWindow::showWidget(TQWidget *widget)
 
 void DDockWindow::setMovingEnabled(bool)
 {
-    //some operations on KMainWindow cause moving to be enabled
+    //some operations on TDEMainWindow cause moving to be enabled
     //but we always don't want DDockWindow instances to be movable
     TQDockWindow::setMovingEnabled(false);
 }
diff --git a/apps/ktorrent/newui/ddockwindow.h b/apps/ktorrent/newui/ddockwindow.h
index 5bee0a8..3012e02 100644
--- a/apps/ktorrent/newui/ddockwindow.h
+++ b/apps/ktorrent/newui/ddockwindow.h
@@ -29,7 +29,7 @@ class TQWidgetStack;
 class TQPopupMenu;
 
 class KComboBox;
-class KAction;
+class TDEAction;
 
 class DMainWindow;
 
@@ -109,9 +109,9 @@ private:
     TQBoxLayout *m_internalLayout;
 
 
-    KAction * m_moveToDockLeft;
-    KAction * m_moveToDockRight;
-    KAction * m_moveToDockBottom;
+    TDEAction * m_moveToDockLeft;
+    TDEAction * m_moveToDockRight;
+    TDEAction * m_moveToDockBottom;
 };
 
 #endif
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
index 7b81420..2b62af7 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/apps/ktorrent/torrentcreatordlgbase.ui
@@ -379,7 +379,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="KListView" row="1" column="0" rowspan="3" colspan="1">
+                <widget class="TDEListView" row="1" column="0" rowspan="3" colspan="1">
                     <column>
                         <property name="text">
                             <string>IP or hostname</string>
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 05b9817..4fec304 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -282,7 +282,7 @@ void TrayIcon::lowDiskSpace(kt::TorrentInterface * tc, bool stopped)
 	showPassivePopup(msg,i18n("Device running out of space"));
 }
 
-SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *name):KPopupMenu(parent, name)
+SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *name):TDEPopupMenu(parent, name)
 {
 	m_core = tc;
 	type=t;
diff --git a/apps/ktorrent/trayicon.h b/apps/ktorrent/trayicon.h
index 00ea664..06adbc6 100644
--- a/apps/ktorrent/trayicon.h
+++ b/apps/ktorrent/trayicon.h
@@ -121,7 +121,7 @@ private:
 	TQPixmap m_kt_pix;
 };
 
-class SetMaxRate : public KPopupMenu
+class SetMaxRate : public TDEPopupMenu
 {
 		Q_OBJECT
   
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index 0d14228..58f1ff7 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -30,7 +30,7 @@ using namespace bt;
 using namespace kt;
 
 UPnPTestApp::UPnPTestApp(TQWidget *parent, const char *name)
-		: KMainWindow(parent, name)
+		: TDEMainWindow(parent, name)
 {
 	sock = new UPnPMCastSocket(true);
 	connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* )));
diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h
index 8d34213..4885ef2 100644
--- a/apps/ktupnptest/upnptestapp.h
+++ b/apps/ktupnptest/upnptestapp.h
@@ -35,7 +35,7 @@ using kt::UPnPRouter;
 /**
 	@author Joris Guisson <joris.guisson@gmail.com>
 */
-class UPnPTestApp : public KMainWindow, public kt::LogMonitorInterface
+class UPnPTestApp : public TDEMainWindow, public kt::LogMonitorInterface
 {
 	Q_OBJECT