Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

21 files changed, 85 insertions, 85 deletions

diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp
index 90595bd..a19dc78 100644
--- a/plugins/infowidget/chunkdownloadview.cpp
+++ b/plugins/infowidget/chunkdownloadview.cpp
@@ -143,12 +143,12 @@ namespace kt
 			m_size_chunks->setText(TQString::number(s.chunk_size / 1024 / 1024) + "." + TQString::number(((s.chunk_size / 1024) % 1024) / 100) + " MB");
 	}
 	
-	void ChunkDownloadView::saveLayout(KConfig* cfg,const TQString & group_name)
+	void ChunkDownloadView::saveLayout(TDEConfig* cfg,const TQString & group_name)
 	{
 		m_list_view->saveLayout(cfg,group_name);
 	}
 	
-	void ChunkDownloadView::restoreLayout(KConfig* cfg,const TQString & group_name)
+	void ChunkDownloadView::restoreLayout(TDEConfig* cfg,const TQString & group_name)
 	{
 		m_list_view->restoreLayout(cfg,group_name);
 	}
diff --git a/plugins/infowidget/chunkdownloadview.h b/plugins/infowidget/chunkdownloadview.h
index e43044a..af6b109 100644
--- a/plugins/infowidget/chunkdownloadview.h
+++ b/plugins/infowidget/chunkdownloadview.h
@@ -54,8 +54,8 @@ namespace kt
 		ChunkDownloadView(TQWidget *parent = 0, const char *name = 0);
 		virtual ~ChunkDownloadView();
 		
-		void saveLayout(KConfig* cfg,const TQString & group_name);
-		void restoreLayout(KConfig* cfg,const TQString & group_name);
+		void saveLayout(TDEConfig* cfg,const TQString & group_name);
+		void restoreLayout(TDEConfig* cfg,const TQString & group_name);
 		void clear();
 		void update();
 		void changeTC(kt::TorrentInterface* tc);
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index 5812453..a6cf3c7 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -94,7 +94,7 @@ namespace kt
 		if(target.exists())
 		{
 			//make backup
-			KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true);
+			TDEIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true);
 		}
 
 		/*    READ INPUT FILE  */
@@ -245,7 +245,7 @@ namespace kt
 			TQFile temp( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp");
 			if(temp.exists())
 			{
-				KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true);
+				TDEIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true);
 				temp.remove();
 			}
 			
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index 6c9b46f..fb1cd9d 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -107,8 +107,8 @@ namespace kt
 		KURL url(m_url->url());
 		KURL dest(target);
 		KURL temp(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.tmp");
-		if(KIO::NetAccess::exists(temp,false, this))
-			KIO::NetAccess::del(temp,this);
+		if(TDEIO::NetAccess::exists(temp,false, this))
+			TDEIO::NetAccess::del(temp,this);
 
 		bool download = true;
 
@@ -117,26 +117,26 @@ namespace kt
 			if((KMessageBox::questionYesNo(this, i18n("Selected file already exists, do you want to download it again?"),i18n("File Exists")) == 4))
 				download = false;
 			else
-				KIO::NetAccess::move(target, temp);
+				TDEIO::NetAccess::move(target, temp);
 		}
 
 		if(download)
 		{
 			if(!url.isLocalFile())
 			{
-				if (KIO::NetAccess::download(url,target,NULL))
+				if (TDEIO::NetAccess::download(url,target,NULL))
 				{
 					//Level1 list successfully downloaded, remove temporary file
-					KIO::NetAccess::removeTempFile(target);
-					KIO::NetAccess::del(temp, this);
+					TDEIO::NetAccess::removeTempFile(target);
+					TDEIO::NetAccess::del(temp, this);
 				}
 				else
 				{
-					TQString err = KIO::NetAccess::lastErrorString();
+					TQString err = TDEIO::NetAccess::lastErrorString();
 					if(err != TQString())
-						KMessageBox::error(0,KIO::NetAccess::lastErrorString(),i18n("Error"));
+						KMessageBox::error(0,TDEIO::NetAccess::lastErrorString(),i18n("Error"));
 					else
-						KIO::NetAccess::move(temp, target);
+						TDEIO::NetAccess::move(temp, target);
 					
 					
 					//we don't want to convert since download failed
@@ -145,9 +145,9 @@ namespace kt
 			}
 			else
 			{
-				if (!KIO::NetAccess::file_copy(url,dest, -1, true))
+				if (!TDEIO::NetAccess::file_copy(url,dest, -1, true))
 				{
-					KMessageBox::error(0,KIO::NetAccess::lastErrorString(),i18n("Error"));
+					KMessageBox::error(0,TDEIO::NetAccess::lastErrorString(),i18n("Error"));
 					return;
 				}
 			}
@@ -158,13 +158,13 @@ namespace kt
 			{
 				KURL zipfile("zip:" + target + "/splist.txt");
 				KURL destinationfile(target + ".txt");
-				KIO::NetAccess::file_copy(zipfile,destinationfile, -1, true);
+				TDEIO::NetAccess::file_copy(zipfile,destinationfile, -1, true);
 			}
 			else
 			{
 				KURL zipfile(target);
 				KURL destinationfile(target + ".txt");
-				KIO::NetAccess::file_copy(zipfile,destinationfile, -1, true);
+				TDEIO::NetAccess::file_copy(zipfile,destinationfile, -1, true);
 			}
 			
 		}
@@ -194,7 +194,7 @@ namespace kt
 			if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4))
 				return;
 // 			else
-// 				KIO::NetAccess::del(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL);
+// 				TDEIO::NetAccess::del(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL);
 		}
 		ConvertDialog dlg(m_plugin);
 		dlg.exec();
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index ba43ac9..23b383f 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -185,7 +185,7 @@ namespace kt
 		accept();
 	}
 	
-	void ImportDialog::onTorrentGetReult(KIO::Job* j)
+	void ImportDialog::onTorrentGetReult(TDEIO::Job* j)
 	{
 		if (j->error())
 		{
@@ -194,7 +194,7 @@ namespace kt
 		}
 		else
 		{
-			KIO::StoredTransferJob* stj = (KIO::StoredTransferJob*)j;
+			TDEIO::StoredTransferJob* stj = (TDEIO::StoredTransferJob*)j;
 			Torrent tor;
 		
 			// try to load the torrent
@@ -225,8 +225,8 @@ namespace kt
 		if (!tor_url.isLocalFile())
 		{
 			// download the torrent file
-			KIO::StoredTransferJob* j = KIO::storedGet(tor_url);
-			connect(j,TQT_SIGNAL(result(KIO::Job* )),this,TQT_SLOT(onTorrentGetReult(KIO::Job*)));
+			TDEIO::StoredTransferJob* j = TDEIO::storedGet(tor_url);
+			connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onTorrentGetReult(TDEIO::Job*)));
 		}
 		else
 		{
diff --git a/plugins/partfileimport/importdialog.h b/plugins/partfileimport/importdialog.h
index 4a34483..1f1a82a 100644
--- a/plugins/partfileimport/importdialog.h
+++ b/plugins/partfileimport/importdialog.h
@@ -33,7 +33,7 @@ namespace bt
 	class Torrent;
 }
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -54,7 +54,7 @@ namespace kt
 		
 	public slots:
 		void onImport();
-		void onTorrentGetReult(KIO::Job* j);
+		void onTorrentGetReult(TDEIO::Job* j);
 	
 	private:
 		void writeIndex(const TQString & file,const bt::BitSet & chunks);
diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
index cb8d7c8..4dff982 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/plugins/rssfeed/rss/image.cpp
@@ -32,7 +32,7 @@ struct Image::Private : public Shared
 	unsigned int height;
 	unsigned int width;
 	TQBuffer *pixmapBuffer;
-	KIO::Job *job;
+	TDEIO::Job *job;
 };
 
 Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
 	d->pixmapBuffer = new TQBuffer;
 	d->pixmapBuffer->open(IO_WriteOnly);
 
-	d->job = KIO::get(d->url, false, false);
-	connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-	connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
+	d->job = TDEIO::get(d->url, false, false);
+	connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
 }
 
-void Image::slotData(KIO::Job *, const TQByteArray &data)
+void Image::slotData(TDEIO::Job *, const TQByteArray &data)
 {
 	d->pixmapBuffer->writeBlock(data.data(), data.size());
 }
 
-void Image::slotResult(KIO::Job *job)
+void Image::slotResult(TDEIO::Job *job)
 {
 	TQPixmap pixmap;
 	if (!job->error())
diff --git a/plugins/rssfeed/rss/image.h b/plugins/rssfeed/rss/image.h
index bba2d6e..42074dd 100644
--- a/plugins/rssfeed/rss/image.h
+++ b/plugins/rssfeed/rss/image.h
@@ -17,7 +17,7 @@
 
 class TQDomNode;
 
-namespace KIO
+namespace TDEIO
 {
    class Job;
 }
@@ -161,8 +161,8 @@ namespace RSS
          void gotPixmap(const TQPixmap &pixmap);
 
       private slots:
-         void slotData(KIO::Job *job, const TQByteArray &data);
-         void slotResult(KIO::Job *job);
+         void slotData(TDEIO::Job *job, const TQByteArray &data);
+         void slotResult(TDEIO::Job *job);
 
       private:
          struct Private;
diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index f725186..d9766d4 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -47,7 +47,7 @@ struct FileRetriever::Private
 
    TQBuffer *buffer;
    int lastError;
-   KIO::Job *job;
+   TDEIO::Job *job;
 };
 
 FileRetriever::FileRetriever()
@@ -80,16 +80,16 @@ void FileRetriever::retrieveData(const KURL &url)
    if (u.protocol()=="feed")
        u.setProtocol("http");
 
-   d->job = KIO::get(u, !m_useCache, false);
+   d->job = TDEIO::get(u, !m_useCache, false);
 
    
    TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
    
-   connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-                TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-   connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
-   connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
-                TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
+   connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+   connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+   connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+                TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 void FileRetriever::slotTimeout()
@@ -99,7 +99,7 @@ void FileRetriever::slotTimeout()
     delete d->buffer;
     d->buffer = NULL;
 
-    d->lastError = KIO::ERR_SERVER_TIMEOUT;
+    d->lastError = TDEIO::ERR_SERVER_TIMEOUT;
     
     emit dataRetrieved(TQByteArray(), false);
 }
@@ -109,12 +109,12 @@ int FileRetriever::errorCode() const
    return d->lastError;
 }
 
-void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
+void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
 {
    d->buffer->writeBlock(data.data(), data.size());
 }
 
-void FileRetriever::slotResult(KIO::Job *job)
+void FileRetriever::slotResult(TDEIO::Job *job)
 {
    TQByteArray data = d->buffer->buffer();
    data.detach();
@@ -126,7 +126,7 @@ void FileRetriever::slotResult(KIO::Job *job)
    emit dataRetrieved(data, d->lastError == 0);
 }
 
-void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
+void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
 {
    emit permanentRedirection(newUrl);
 }
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index ae2a3b9..f563782 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -17,7 +17,7 @@ class KURL;
 
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -137,9 +137,9 @@ namespace RSS
             void slotTimeout();
                 
 		private slots:
-			void slotData(KIO::Job *job, const TQByteArray &data);
-			void slotResult(KIO::Job *job);
-			void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
+			void slotData(TDEIO::Job *job, const TQByteArray &data);
+			void slotResult(TDEIO::Job *job);
+			void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
 			                                             const KURL &toUrl);
 
 		private:
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index 4c11bb9..b17bec8 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -49,8 +49,8 @@ namespace kt
 			{
 				//first let's download the link so we can process it to check for the actual torrent
 				curLink = curSubLink = link;
-				curFile = KIO::storedGet(link,false,false);
-				connect(curFile, TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(processLink( KIO::Job* )));
+				curFile = TDEIO::storedGet(link,false,false);
+				connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* )));
 			}
 		}
 	
@@ -59,7 +59,7 @@ namespace kt
 			
 		}
 		
-	void RssLinkDownloader::processLink(KIO::Job* jobStatus)
+	void RssLinkDownloader::processLink(TDEIO::Job* jobStatus)
 		{
 		
 		if (!jobStatus->error())
@@ -188,8 +188,8 @@ namespace kt
 			{
 			curSubLink = subLinks.first();
 			subLinks.pop_front();
-			curFile = KIO::storedGet(curSubLink,false,false);
-			connect(curFile, TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(processLink( KIO::Job* )));
+			curFile = TDEIO::storedGet(curSubLink,false,false);
+			connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* )));
 			}
 		}
 	
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index a47afd0..7fb6d85 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -59,14 +59,14 @@ namespace kt
  			
 
 		public slots:
-			void processLink(KIO::Job* jobStatus);
+			void processLink(TDEIO::Job* jobStatus);
 			void suicide();
 			
 		signals:
 			void linkDownloaded( TQString link, int downloaded );
 			
 		private:
-			KIO::StoredTransferJob * curFile;
+			TDEIO::StoredTransferJob * curFile;
 			TQString curLink, curSubLink;
 			TQStringList subLinks;
 			RssFilter * curFilter;
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index fbac691..b5872f1 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -164,7 +164,7 @@ namespace kt
 					TQFile::remove(dirname + "/." + name);
 
 				// NetAccess considered harmfull !!!
-				KIO::file_move(url, destination);
+				TDEIO::file_move(url, destination);
 				break;
 			case defaultAction:
 				TQFile f(dirname + "/." + name);
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index d4b39e1..ffaeb5d 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -74,12 +74,12 @@ namespace kt
 			active_job = 0;
 		}
 		
-		KIO::TransferJob* j = KIO::get(u,false,false);
-		connect(j,TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)),
-				this,TQT_SLOT(dataRecieved(KIO::Job*, const TQByteArray& )));
-		connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(jobDone(KIO::Job* )));
-		connect(j,TQT_SIGNAL(mimetype(KIO::Job*, const TQString &)),
-				this,TQT_SLOT(mimetype(KIO::Job*, const TQString& )));
+		TDEIO::TransferJob* j = TDEIO::get(u,false,false);
+		connect(j,TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)),
+				this,TQT_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& )));
+		connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(jobDone(TDEIO::Job* )));
+		connect(j,TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString &)),
+				this,TQT_SLOT(mimetype(TDEIO::Job*, const TQString& )));
 	
 		active_job = j;
 		curr_data.resize(0);
@@ -115,7 +115,7 @@ namespace kt
 		openURL(url());
 	}
 	
-	void HTMLPart::dataRecieved(KIO::Job* job,const TQByteArray & data)
+	void HTMLPart::dataRecieved(TDEIO::Job* job,const TQByteArray & data)
 	{
 		if (job != active_job)
 		{
@@ -134,7 +134,7 @@ namespace kt
 		}
 	}
 	
-	void HTMLPart::mimetype(KIO::Job* job,const TQString & mt)
+	void HTMLPart::mimetype(TDEIO::Job* job,const TQString & mt)
 	{
 		if (job != active_job)
 		{
@@ -145,7 +145,7 @@ namespace kt
 		mime_type = mt;
 	}
 	
-	void HTMLPart::jobDone(KIO::Job* job)
+	void HTMLPart::jobDone(TDEIO::Job* job)
 	{
 		if (job != active_job)
 		{
@@ -185,7 +185,7 @@ namespace kt
 		else
 		{
 			begin(curr_url);
-			write(KIO::buildErrorString(job->error(),job->errorText()));/*,&curr_url));**/
+			write(TDEIO::buildErrorString(job->error(),job->errorText()));/*,&curr_url));**/
 			end();
 		}
 		active_job = 0;
diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h
index 433a2e2..f4a3454 100644
--- a/plugins/search/htmlpart.h
+++ b/plugins/search/htmlpart.h
@@ -22,7 +22,7 @@
 
 #include <khtml_part.h>
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -50,9 +50,9 @@ namespace kt
 	
 	private slots:
 		void addToHistory(const KURL & url);
-		void dataRecieved(KIO::Job* job,const TQByteArray & data);
-		void mimetype(KIO::Job* job,const TQString & mt);
-		void jobDone(KIO::Job* job);
+		void dataRecieved(TDEIO::Job* job,const TQByteArray & data);
+		void mimetype(TDEIO::Job* job,const TQString & mt);
+		void jobDone(TDEIO::Job* job);
 		
 	
 	signals:
@@ -63,7 +63,7 @@ namespace kt
 	
 	private:
 		KURL::List history;
-		KIO::Job* active_job;
+		TDEIO::Job* active_job;
 		TQByteArray curr_data;
 		TQString mime_type;
 		KURL curr_url;
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index 8de3e28..d31a037 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -188,12 +188,12 @@ namespace kt
 		TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp";
 		KURL source("http://www.ktorrent.org/downloads/search_engines");
 		
-		if (KIO::NetAccess::download(source,fn,NULL))
+		if (TDEIO::NetAccess::download(source,fn,NULL))
 		{
 			//list successfully downloaded, remove temporary file
 			updateList(fn);
 			saveSearchEngines();
-			KIO::NetAccess::removeTempFile(fn);
+			TDEIO::NetAccess::removeTempFile(fn);
 		}
 	}
 	
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index 0cf99a9..f0fefe0 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -213,7 +213,7 @@ namespace kt
 		{
 			KURL save_url = fdlg.selectedURL();
 			// start a copy job
-			KIO::Job* j = KIO::file_copy(url,save_url,-1,true);
+			TDEIO::Job* j = TDEIO::file_copy(url,save_url,-1,true);
 			// let it deal with the errors
 			j->setAutoErrorHandlingEnabled(true,0);
 		}
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 809d934..3b8be45 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -222,7 +222,7 @@ namespace kt
 	
 	void UPnPMCastSocket::onError(int)
 	{
-		Out(SYS_PNP|LOG_IMPORTANT) << "UPnPMCastSocket Error : " << KSocketBase::errorString() << endl;
+		Out(SYS_PNP|LOG_IMPORTANT) << "UPnPMCastSocket Error : " << TDESocketBase::errorString() << endl;
 	}
 	
 	void UPnPMCastSocket::saveRouters(const TQString & file)
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index a5d1212..d924526 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -140,7 +140,7 @@ namespace kt
 		services.append(s);
 	}
 	
-	void UPnPRouter::downloadFinished(KIO::Job* j)
+	void UPnPRouter::downloadFinished(TDEIO::Job* j)
 	{
 		if (j->error())
 		{
@@ -156,7 +156,7 @@ namespace kt
 		{
 			Out(SYS_PNP|LOG_IMPORTANT) << "Error parsing router description !" << endl;
 			TQString dest = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "upnp_failure";
-			KIO::file_copy(target,dest,-1,true,false,false);
+			TDEIO::file_copy(target,dest,-1,true,false,false);
 		}
 		else
 		{
@@ -170,8 +170,8 @@ namespace kt
 	void UPnPRouter::downloadXMLFile()
 	{
 		// downlaod XML description into a temporary file in /tmp
-		KIO::Job* job = KIO::file_copy(location,tmp_file,-1,true,false,false);
-		connect(job,TQT_SIGNAL(result(KIO::Job *)),this,TQT_SLOT(downloadFinished( KIO::Job* )));
+		TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false);
+		connect(job,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* )));
 	}
 	
 	void UPnPRouter::debugPrintData()
diff --git a/plugins/upnp/upnprouter.h b/plugins/upnp/upnprouter.h
index 1cbac0b..081d958 100644
--- a/plugins/upnp/upnprouter.h
+++ b/plugins/upnp/upnprouter.h
@@ -33,7 +33,7 @@ namespace bt
 	class WaitJob;
 }
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -191,7 +191,7 @@ namespace kt
 		void onReplyOK(bt::HTTPRequest* r,const TQString &);
 		void onReplyError(bt::HTTPRequest* r,const TQString &);
 		void onError(bt::HTTPRequest* r,bool);
-		void downloadFinished(KIO::Job* j);
+		void downloadFinished(TDEIO::Job* j);
 		
 		
 		
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index 41693f3..4df085d 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -140,7 +140,7 @@ namespace kt
 					TorrentFileInterface & file = (*i)->getTorrentFile(j);
 					out << TQString("\"%1\" => array(\n").arg(j);
 					out << TQString("\"name\" => \"%1\",\n").arg(file.getPath());
-					out << TQString("\"size\" => \"%1\",\n").arg(KIO::convertSize(file.getSize()));
+					out << TQString("\"size\" => \"%1\",\n").arg(TDEIO::convertSize(file.getSize()));
 					out << TQString("\"perc_done\" => \"%1\",\n").arg(file.getDownloadPercentage());
 					out << TQString("\"status\" => \"%1\"\n").arg(file.getPriority());
 					out << TQString(")\n");