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

7 files changed, 23 insertions, 23 deletions

diff --git a/libktorrent/util/autorotatelogjob.cpp b/libktorrent/util/autorotatelogjob.cpp
index c703026..dd1424b 100644
--- a/libktorrent/util/autorotatelogjob.cpp
+++ b/libktorrent/util/autorotatelogjob.cpp
@@ -27,7 +27,7 @@ namespace bt
 {
 
 	AutoRotateLogJob::AutoRotateLogJob(const TQString & file,Log* lg)
-		: KIO::Job(false),file(file),cnt(10),lg(lg)
+		: TDEIO::Job(false),file(file),cnt(10),lg(lg)
 	{
 		update();
 	}
@@ -50,8 +50,8 @@ namespace bt
 			TQString curr = TQString("%1-%2.gz").arg(file).arg(cnt);
 			if (bt::Exists(prev)) // if file exists start the move job
 			{
-				KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false);
-				connect(sj,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(moveJobDone(KIO::Job* )));	
+				TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false);
+				connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* )));	
 				return;
 			}
 			else
@@ -64,8 +64,8 @@ namespace bt
 		{
 				// move current log to 1 and zip it
 			bt::Move(file,file + "-1",true);
-			KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(file),KURL::fromPathOrURL(file + "-1"),-1,true,false,false);
-			connect(sj,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(moveJobDone(KIO::Job* )));
+			TDEIO::Job* sj = TDEIO::file_move(KURL::fromPathOrURL(file),KURL::fromPathOrURL(file + "-1"),-1,true,false,false);
+			connect(sj,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveJobDone(TDEIO::Job* )));
 		}
 		else
 		{
@@ -78,7 +78,7 @@ namespace bt
 	}
 		
 	
-	void AutoRotateLogJob::moveJobDone(KIO::Job*)
+	void AutoRotateLogJob::moveJobDone(TDEIO::Job*)
 	{
 		cnt--; // decrease counter so the newt file will be moved in update
 		update(); // don't care about result of job
diff --git a/libktorrent/util/autorotatelogjob.h b/libktorrent/util/autorotatelogjob.h
index 37e82a7..b1e4af1 100644
--- a/libktorrent/util/autorotatelogjob.h
+++ b/libktorrent/util/autorotatelogjob.h
@@ -33,7 +33,7 @@ namespace bt
 		Job which handles the rotation of the log file. 
 		This Job must do several move jobs which must be done sequentially.
 	*/
-	class AutoRotateLogJob : public KIO::Job
+	class AutoRotateLogJob : public TDEIO::Job
 	{
 		Q_OBJECT
   
@@ -44,7 +44,7 @@ namespace bt
 		virtual void kill(bool quietly=true);
 		
 	private slots:
-		void moveJobDone(KIO::Job*);
+		void moveJobDone(TDEIO::Job*);
 		
 	private:
 		void update();
diff --git a/libktorrent/util/fileops.cpp b/libktorrent/util/fileops.cpp
index d9ef172..5aadae3 100644
--- a/libktorrent/util/fileops.cpp
+++ b/libktorrent/util/fileops.cpp
@@ -102,48 +102,48 @@ namespace bt
 	void Move(const TQString & src,const TQString & dst,bool nothrow)
 	{
 	//	Out() << "Moving " << src << " -> " << dst << endl;
-		if (!KIO::NetAccess::move(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst),0))
+		if (!TDEIO::NetAccess::move(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst),0))
 		{
 			if (!nothrow)
 				throw Error(i18n("Cannot move %1 to %2: %3")
 					.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()));
+						.arg(TDEIO::NetAccess::lastErrorString()));
 			else
 				Out() << TQString("Error : Cannot move %1 to %2: %3")
 						.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()) << endl;
+						.arg(TDEIO::NetAccess::lastErrorString()) << endl;
 		
 		}
 	}
 
 	void CopyFile(const TQString & src,const TQString & dst,bool nothrow)
 	{
-		if (!KIO::NetAccess::file_copy(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst)))
+		if (!TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst)))
 		{
 			if (!nothrow)
 				throw Error(i18n("Cannot copy %1 to %2: %3")
 						.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()));
+						.arg(TDEIO::NetAccess::lastErrorString()));
 			else
 				Out() << TQString("Error : Cannot copy %1 to %2: %3")
 						.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()) << endl;
+						.arg(TDEIO::NetAccess::lastErrorString()) << endl;
 	
 		}
 	}
 	
 	void CopyDir(const TQString & src,const TQString & dst,bool nothrow)
 	{
-		if (!KIO::NetAccess::dircopy(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst),0))
+		if (!TDEIO::NetAccess::dircopy(KURL::fromPathOrURL(src),KURL::fromPathOrURL(dst),0))
 		{
 			if (!nothrow)
 				throw Error(i18n("Cannot copy %1 to %2: %3")
 						.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()));
+						.arg(TDEIO::NetAccess::lastErrorString()));
 			else
 				Out() << TQString("Error : Cannot copy %1 to %2: %3")
 						.arg(src).arg(dst)
-						.arg(KIO::NetAccess::lastErrorString()) << endl;
+						.arg(TDEIO::NetAccess::lastErrorString()) << endl;
 	
 		}
 	}
diff --git a/libktorrent/util/fileops.h b/libktorrent/util/fileops.h
index 067bd03..d1c3437 100644
--- a/libktorrent/util/fileops.h
+++ b/libktorrent/util/fileops.h
@@ -32,7 +32,7 @@ namespace bt
 
 	/**
 	 * Creates a directory. Convenience function around
-	 * KIO::NetAccess::mkdir .
+	 * TDEIO::NetAccess::mkdir .
 	 * @param dir The url of the dir
 	 * @param nothrow wether or not we shouldn't throw an Error upon failure
 	 * @throw Error upon error
diff --git a/libktorrent/util/httprequest.cpp b/libktorrent/util/httprequest.cpp
index a52788e..4c869a5 100644
--- a/libktorrent/util/httprequest.cpp
+++ b/libktorrent/util/httprequest.cpp
@@ -103,7 +103,7 @@ namespace bt
 	
 	void HTTPRequest::onError(int)
 	{
-		Out() << "HTTPRequest error : " << sock->KSocketBase::errorString() << endl;
+		Out() << "HTTPRequest error : " << sock->TDESocketBase::errorString() << endl;
 		error(this,false);
 		sock->close();
 		operationFinished(this);
diff --git a/libktorrent/util/waitjob.cpp b/libktorrent/util/waitjob.cpp
index 9fec771..ed00f89 100644
--- a/libktorrent/util/waitjob.cpp
+++ b/libktorrent/util/waitjob.cpp
@@ -25,7 +25,7 @@
 namespace bt
 {
 
-	WaitJob::WaitJob(Uint32 millis) : KIO::Job(false)
+	WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false)
 	{
 		connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timerDone()));
 		timer.start(millis,true);
@@ -70,14 +70,14 @@ namespace bt
 	
 	void WaitJob::execute(WaitJob* job)
 	{
-		KIO::NetAccess::synchronousRun(job,0);
+		TDEIO::NetAccess::synchronousRun(job,0);
 	}
 	
 	void SynchronousWait(Uint32 millis)
 	{
 		Out() << "SynchronousWait" << endl;
 		WaitJob* j = new WaitJob(millis);
-		KIO::NetAccess::synchronousRun(j,0);
+		TDEIO::NetAccess::synchronousRun(j,0);
 	}
 
 }
diff --git a/libktorrent/util/waitjob.h b/libktorrent/util/waitjob.h
index c0754d6..232546a 100644
--- a/libktorrent/util/waitjob.h
+++ b/libktorrent/util/waitjob.h
@@ -35,7 +35,7 @@ namespace bt
 	 * Job to wait for a certain amount of time or until one or more ExitOperation's have
 	 * finished.
 	*/
-	class WaitJob : public KIO::Job
+	class WaitJob : public TDEIO::Job
 	{
 		Q_OBJECT