From 0889370e3050561372c3816dfb2902771ca83765 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:15:01 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 apps/ktorrent/fileselectdlg.cpp                           | 2 +-
 apps/ktorrent/fileselectdlgbase.ui                        | 2 +-
 apps/ktorrent/filterbar.cpp                               | 2 +-
 apps/ktorrent/groups/groupview.cpp                        | 6 +++---
 apps/ktorrent/groups/groupview.h                          | 2 +-
 apps/ktorrent/ipfilterwidget.cpp                          | 2 +-
 apps/ktorrent/ipfilterwidgetbase.ui                       | 2 +-
 apps/ktorrent/ktorrent.cpp                                | 8 ++++----
 apps/ktorrent/ktorrentview.cpp                            | 2 +-
 apps/ktorrent/ktorrentview.h                              | 2 +-
 apps/ktorrent/ktorrentviewitem.h                          | 2 +-
 apps/ktorrent/ktorrentviewmenu.h                          | 2 +-
 apps/ktorrent/newui/button.cpp                            | 4 ++--
 apps/ktorrent/torrentcreatordlg.cpp                       | 2 +-
 apps/ktorrent/torrentcreatordlgbase.ui                    | 2 +-
 apps/ktorrent/trayicon.cpp                                | 2 +-
 apps/ktorrent/trayicon.h                                  | 2 +-
 apps/ktupnptest/upnptestapp.h                             | 2 +-
 libktorrent/interfaces/filetreediritem.h                  | 2 +-
 libktorrent/interfaces/filetreeitem.h                     | 2 +-
 libktorrent/pluginmanagerprefpage.cpp                     | 2 +-
 libktorrent/torrent/Makefile.am                           | 4 ++--
 libktorrent/torrent/chuntdeselector.cpp                   | 4 ++--
 libktorrent/torrent/downloader.cpp                        | 2 +-
 .../torrent/{ipbloctdelist.cpp => ipblocklist.cpp}        | 0
 libktorrent/torrent/{ipbloctdelist.h => ipblocklist.h}    | 0
 plugins/infowidget/chunkdownloadview.h                    | 2 +-
 plugins/infowidget/chunkdownloadviewbase.ui               | 2 +-
 plugins/infowidget/fileview.cpp                           | 2 +-
 plugins/infowidget/fileview.h                             | 2 +-
 plugins/infowidget/peerview.cpp                           | 2 +-
 plugins/infowidget/peerview.h                             | 4 ++--
 plugins/infowidget/trackerview.cpp                        | 2 +-
 plugins/infowidget/trackerviewbase.ui                     | 2 +-
 plugins/partfileimport/partfileimportplugin.cpp           | 2 +-
 plugins/search/searchplugin.cpp                           | 2 +-
 plugins/search/searchprefpage.cpp                         | 2 +-
 plugins/search/searchtab.h                                | 2 +-
 plugins/search/searchwidget.cpp                           | 2 +-
 plugins/upnp/upnpplugin.cpp                               | 2 +-
 plugins/upnp/upnpprefwidget.cpp                           | 2 +-
 plugins/upnp/upnpwidget.ui                                | 2 +-
 translations/sv/messages/ktorrent.po                      | 4 ++--
 43 files changed, 51 insertions(+), 51 deletions(-)
 rename libktorrent/torrent/{ipbloctdelist.cpp => ipblocklist.cpp} (100%)
 rename libktorrent/torrent/{ipbloctdelist.h => ipblocklist.h} (100%)

diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 2c29bdc..377cfd3 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
index a703c18..1d82e3e 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/apps/ktorrent/fileselectdlgbase.ui
@@ -374,7 +374,7 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index f159a60..78dde74 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index c3fc584..dc1cc47 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -20,12 +20,12 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqheader.h>
 #include <util/log.h>
 #include <interfaces/torrentinterface.h>
diff --git a/apps/ktorrent/groups/groupview.h b/apps/ktorrent/groups/groupview.h
index 1fd9772..5b5d053 100644
--- a/apps/ktorrent/groups/groupview.h
+++ b/apps/ktorrent/groups/groupview.h
@@ -20,7 +20,7 @@
 #ifndef KTGROUPVIEW_H
 #define KTGROUPVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <util/ptrmap.h>
 
 class TDEPopupMenu;
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index 5cbab72..5ddf3bc 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tdesocketaddress.h>
 #include <tdefiledialog.h>
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
index d2fe5c3..36ab42c 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/apps/ktorrent/ipfilterwidgetbase.ui
@@ -355,7 +355,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 4572b56..dbdefbf 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -36,7 +36,7 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
@@ -44,14 +44,14 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kprogress.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <ksqueezedtextlabel.h>
 #include <kpushbutton.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <interfaces/torrentinterface.h>
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index de31c2c..d55db7d 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h
index b8b1252..a388c87 100644
--- a/apps/ktorrent/ktorrentview.h
+++ b/apps/ktorrent/ktorrentview.h
@@ -23,7 +23,7 @@
 #ifndef _KTORRENTVIEW_H_
 #define _KTORRENTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 typedef TQValueList<TQCString> QCStringList;
 
diff --git a/apps/ktorrent/ktorrentviewitem.h b/apps/ktorrent/ktorrentviewitem.h
index adf6b3a..575844d 100644
--- a/apps/ktorrent/ktorrentviewitem.h
+++ b/apps/ktorrent/ktorrentviewitem.h
@@ -20,7 +20,7 @@
 #ifndef KTORRENTVIEWITEM_H
 #define KTORRENTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <dcopclient.h>
 #include <util/constants.h>
 
diff --git a/apps/ktorrent/ktorrentviewmenu.h b/apps/ktorrent/ktorrentviewmenu.h
index 1809941..fd850a6 100644
--- a/apps/ktorrent/ktorrentviewmenu.h
+++ b/apps/ktorrent/ktorrentviewmenu.h
@@ -20,7 +20,7 @@
 #ifndef KTORRENTVIEWMENU_H
 #define KTORRENTVIEWMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 		
 class KTorrentView;
 
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 621561a..e591009 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index 02e0132..491acda 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -21,7 +21,7 @@
 #include <kpushbutton.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include "torrentcreatordlg.h"
 #include "ktorrentcore.h"
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
index 2b62af7..5e9f0e0 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/apps/ktorrent/torrentcreatordlgbase.ui
@@ -531,6 +531,6 @@
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 4fec304..c9864d4 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -18,7 +18,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include "ktorrent.h"
diff --git a/apps/ktorrent/trayicon.h b/apps/ktorrent/trayicon.h
index 06adbc6..a277f79 100644
--- a/apps/ktorrent/trayicon.h
+++ b/apps/ktorrent/trayicon.h
@@ -23,7 +23,7 @@
 
 
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqpainter.h>
 
 #include "ktorrentcore.h"
diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h
index 4885ef2..17aae8d 100644
--- a/apps/ktupnptest/upnptestapp.h
+++ b/apps/ktupnptest/upnptestapp.h
@@ -20,7 +20,7 @@
 #ifndef UPNPTESTAPP_H
 #define UPNPTESTAPP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <libktorrent/util/log.h>
 #include <libktorrent/torrent/globals.h>
 #include <plugins/upnp/upnprouter.h>
diff --git a/libktorrent/interfaces/filetreediritem.h b/libktorrent/interfaces/filetreediritem.h
index 640916e..6b35031 100644
--- a/libktorrent/interfaces/filetreediritem.h
+++ b/libktorrent/interfaces/filetreediritem.h
@@ -20,7 +20,7 @@
 #ifndef KTFILETREEDIRITEM_H
 #define KTFILETREEDIRITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <util/constants.h>
 #include <util/ptrmap.h>
 
diff --git a/libktorrent/interfaces/filetreeitem.h b/libktorrent/interfaces/filetreeitem.h
index 9d32253..5cc17f9 100644
--- a/libktorrent/interfaces/filetreeitem.h
+++ b/libktorrent/interfaces/filetreeitem.h
@@ -20,7 +20,7 @@
 #ifndef KTFILETREEITEM_H
 #define KTFILETREEITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <util/constants.h>
 
 using namespace bt;
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 145d4de..54f5aaa 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h> 
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/libktorrent/torrent/Makefile.am b/libktorrent/torrent/Makefile.am
index d546228..92a170d 100644
--- a/libktorrent/torrent/Makefile.am
+++ b/libktorrent/torrent/Makefile.am
@@ -8,7 +8,7 @@ libtorrent_la_LDFLAGS = $(all_libraries)
 noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \
 	authenticatebase.h authenticationmonitor.h bdecoder.h bencoder.h bnode.h cache.h \
 	cachefile.h cap.h choker.h chunk.h chunkcounter.h chunkdownload.h chunkmanager.h \
-	chunkselector.h dndfile.h downloadcap.h downloader.h globals.h httptracker.h \
+	chuntdeselector.h dndfile.h downloadcap.h downloader.h globals.h httptracker.h \
 	ipblocklist.h movedatafilesjob.h multifilecache.h newchokealgorithm.h \
 	oldchokealgorithm.h packet.h packetreader.h packetwriter.h peer.h peerdownloader.h peerid.h \
 	peermanager.h peersourcemanager.h peeruploader.h piece.h preallocationthread.h \
@@ -20,7 +20,7 @@ noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \
 libtorrent_la_SOURCES = advancedchokealgorithm.cpp announcelist.cpp \
 	authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp \
 	bencoder.cpp bnode.cpp cache.cpp cachefile.cpp cap.cpp choker.cpp chunk.cpp \
-	chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chunkselector.cpp dndfile.cpp \
+	chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chuntdeselector.cpp dndfile.cpp \
 	downloadcap.cpp downloader.cpp globals.cpp httptracker.cpp ipblocklist.cpp \
 	movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp \
 	packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp \
diff --git a/libktorrent/torrent/chuntdeselector.cpp b/libktorrent/torrent/chuntdeselector.cpp
index b1c42fa..5bbd140 100644
--- a/libktorrent/torrent/chuntdeselector.cpp
+++ b/libktorrent/torrent/chuntdeselector.cpp
@@ -23,7 +23,7 @@
 #include <util/log.h>
 #include <util/bitset.h>
 #include "chunkcounter.h"
-#include "chunkselector.h"
+#include "chuntdeselector.h"
 #include "chunkmanager.h"
 #include "downloader.h"
 #include "peerdownloader.h"
@@ -158,7 +158,7 @@ namespace bt
 		// lets do a safety check first
 		if (from >= cman.getNumChunks() || to >= cman.getNumChunks())
 		{
-			Out(SYS_DIO|LOG_NOTICE) << "Internal error in chunkselector" << endl;
+			Out(SYS_DIO|LOG_NOTICE) << "Internal error in chuntdeselector" << endl;
 			return;
 		}
 		
diff --git a/libktorrent/torrent/downloader.cpp b/libktorrent/torrent/downloader.cpp
index 582fa7e..4b81f1b 100644
--- a/libktorrent/torrent/downloader.cpp
+++ b/libktorrent/torrent/downloader.cpp
@@ -33,7 +33,7 @@
 #include <interfaces/functions.h>
 #include <interfaces/monitorinterface.h>
 #include "packetwriter.h"
-#include "chunkselector.h"
+#include "chuntdeselector.h"
 #include "ipblocklist.h"
 #include "ktversion.h"
 
diff --git a/libktorrent/torrent/ipbloctdelist.cpp b/libktorrent/torrent/ipblocklist.cpp
similarity index 100%
rename from libktorrent/torrent/ipbloctdelist.cpp
rename to libktorrent/torrent/ipblocklist.cpp
diff --git a/libktorrent/torrent/ipbloctdelist.h b/libktorrent/torrent/ipblocklist.h
similarity index 100%
rename from libktorrent/torrent/ipbloctdelist.h
rename to libktorrent/torrent/ipblocklist.h
diff --git a/plugins/infowidget/chunkdownloadview.h b/plugins/infowidget/chunkdownloadview.h
index cb30800..070b8ea 100644
--- a/plugins/infowidget/chunkdownloadview.h
+++ b/plugins/infowidget/chunkdownloadview.h
@@ -20,7 +20,7 @@
 #ifndef BTCHUNKDOWNLOADVIEW_H
 #define BTCHUNKDOWNLOADVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 #include "chunkdownloadviewbase.h"
 
diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/plugins/infowidget/chunkdownloadviewbase.ui
index 6ad04d8..21f139d 100644
--- a/plugins/infowidget/chunkdownloadviewbase.ui
+++ b/plugins/infowidget/chunkdownloadviewbase.ui
@@ -340,6 +340,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index b61afaa..7776ec7 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/plugins/infowidget/fileview.h b/plugins/infowidget/fileview.h
index 604b710..01443dd 100644
--- a/plugins/infowidget/fileview.h
+++ b/plugins/infowidget/fileview.h
@@ -20,7 +20,7 @@
 #ifndef KTFILEVIEW_H
 #define KTFILEVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <util/constants.h>
 #include <tqtimer.h>
 
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index a304193..26628cd 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -29,7 +29,7 @@
 #include <tdesocketaddress.h>
 #include <tqpoint.h>
 #include <tqlistview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <interfaces/peerinterface.h>
 #include <interfaces/functions.h>
 #include <torrent/ipblocklist.h>
diff --git a/plugins/infowidget/peerview.h b/plugins/infowidget/peerview.h
index 6b5af44..9c4289a 100644
--- a/plugins/infowidget/peerview.h
+++ b/plugins/infowidget/peerview.h
@@ -21,9 +21,9 @@
 #define PEERVIEW_H
 
 #include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlistview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqpoint.h>
 #include <util/constants.h>
 
diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp
index d7ac0b8..1e3d6e2 100644
--- a/plugins/infowidget/trackerview.cpp
+++ b/plugins/infowidget/trackerview.cpp
@@ -36,7 +36,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <torrent/globals.h>
 #include <util/log.h>
diff --git a/plugins/infowidget/trackerviewbase.ui b/plugins/infowidget/trackerviewbase.ui
index 0f951bf..deb8d7e 100644
--- a/plugins/infowidget/trackerviewbase.ui
+++ b/plugins/infowidget/trackerviewbase.ui
@@ -315,6 +315,6 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp
index f54358b..e74ae13 100644
--- a/plugins/partfileimport/partfileimportplugin.cpp
+++ b/plugins/partfileimport/partfileimportplugin.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <interfaces/guiinterface.h>
 #include <interfaces/coreinterface.h>
 #include "partfileimportplugin.h"
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 30893ea..bd4efca 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <krun.h>
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index 8eea5ba..cc39647 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <tdeio/netaccess.h>
diff --git a/plugins/search/searchtab.h b/plugins/search/searchtab.h
index 27ee3c9..2f63ab1 100644
--- a/plugins/search/searchtab.h
+++ b/plugins/search/searchtab.h
@@ -21,7 +21,7 @@
 #ifndef SEARCHTAB_H
 #define SEARCHTAB_H
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 		
 class KComboBox;
 class KPushButton;
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index fc72a3d..ed5141e 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h> 
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeparts/partmanager.h>
 #include <tdeio/job.h>
 #include <kmessagebox.h>
diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index 8d2ff8f..b2195d6 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <interfaces/guiinterface.h>
 #include <util/fileops.h>
 #include "upnpplugin.h"
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index fba0c34..b44c43d 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <torrent/udptrackersocket.h>
diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui
index 3bc2408..d38b269 100644
--- a/plugins/upnp/upnpwidget.ui
+++ b/plugins/upnp/upnpwidget.ui
@@ -132,7 +132,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/translations/sv/messages/ktorrent.po b/translations/sv/messages/ktorrent.po
index e067da2..e3e4f77 100644
--- a/translations/sv/messages/ktorrent.po
+++ b/translations/sv/messages/ktorrent.po
@@ -4813,7 +4813,7 @@ msgstr ""
 "Använd din webbläsare för att söka efter strängen %1 (stora bokstäver) med "
 "söktjänsten du vill lägga till. "
 "<br>Kopiera därefter webbadressen i adressraden när sökningen är färdig, och "
-"klistra in den här."
+"tdelistra in den här."
 "<br>"
 "<br>Att till exempel söka efter %1 på Google, ger resultatet "
 "http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. "
@@ -4843,7 +4843,7 @@ msgid ""
 "the exact URL here."
 msgstr ""
 "Felaktig webbadress. Du måste söka efter FOOBAR med din webbläsare och "
-"kopiera/klistra in exakt webbadress här."
+"kopiera/tdelistra in exakt webbadress här."
 
 #: plugins/search/searchprefpage.cpp:247
 msgid ""