Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 8 insertions, 8 deletions

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
index f524d6b..f524d6b 100644
--- a/libktorrent/torrent/ipbloctdelist.cpp
+++ b/libktorrent/torrent/ipblocklist.cpp
diff --git a/libktorrent/torrent/ipbloctdelist.h b/libktorrent/torrent/ipblocklist.h
index 6439972..6439972 100644
--- a/libktorrent/torrent/ipbloctdelist.h
+++ b/libktorrent/torrent/ipblocklist.h