Initial TDE conversion

5 files changed, 25 insertions, 25 deletions

diff --git a/src/upnp/exitoperation.cpp b/src/upnp/exitoperation.cpp
index 8eedb7a..6df1224 100644
--- a/src/upnp/exitoperation.cpp
+++ b/src/upnp/exitoperation.cpp
@@ -29,16 +29,16 @@ namespace kt
 	ExitOperation::~ExitOperation()
 	{}
 
-	ExitJobOperation::ExitJobOperation(KIO::Job* j)
+	ExitJobOperation::ExitJobOperation(TDEIO::Job* j)
 	{
-		connect(j,SIGNAL(result(KIO::Job*)),this,SLOT(onResult( KIO::Job* )));
+		connect(j,SIGNAL(result(TDEIO::Job*)),this,SLOT(onResult( TDEIO::Job* )));
 	}
 	
 	ExitJobOperation::~ExitJobOperation()
 	{
 	}
 	
-	void ExitJobOperation::onResult(KIO::Job* )
+	void ExitJobOperation::onResult(TDEIO::Job* )
 	{
 		operationFinished(this);
 	}
diff --git a/src/upnp/exitoperation.h b/src/upnp/exitoperation.h
index 4a27911..d969c6c 100644
--- a/src/upnp/exitoperation.h
+++ b/src/upnp/exitoperation.h
@@ -21,7 +21,7 @@
 #define KTEXITOPERATION_H
 
 #include <ntqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace kt
 {
@@ -49,18 +49,18 @@ namespace kt
 	};
 
 	/**
-	 * Exit operation which waits for a KIO::Job
+	 * Exit operation which waits for a TDEIO::Job
 	 */
 	class ExitJobOperation : public ExitOperation
 	{
 		Q_OBJECT
 	public:
-		ExitJobOperation(KIO::Job* j);
+		ExitJobOperation(TDEIO::Job* j);
 		virtual ~ExitJobOperation();
 		
 		virtual bool deleteAllowed() const {return false;}
 	private slots:
-		virtual void onResult(KIO::Job* j);
+		virtual void onResult(TDEIO::Job* j);
 	};
 }
 
diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp
index 70853de..ff87432 100644
--- a/src/upnp/upnpmcastsocket.cpp
+++ b/src/upnp/upnpmcastsocket.cpp
@@ -28,8 +28,8 @@
 #include <arpa/inet.h>
 #include <netinet/ip.h>
 #include <ntqstringlist.h>
-#include <ksocketdevice.h>
-#include <ksocketaddress.h>
+#include <tdesocketdevice.h>
+#include <tdesocketaddress.h>
 /*#include <util/log.h>
 #include <torrent/globals.h>*/
 #include <ntqfile.h>
diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp
index 8e39f33..e5764b5 100644
--- a/src/upnp/upnprouter.cpp
+++ b/src/upnp/upnprouter.cpp
@@ -18,13 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ntqstringlist.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include "httprequest.h"
 #include "upnprouter.h"
 #include "upnpdescriptionparser.h"
@@ -139,7 +139,7 @@ namespace kt
 		services.append(s);
 	}
 	
-	void UPnPRouter::downloadFinished(KIO::Job* j)
+	void UPnPRouter::downloadFinished(TDEIO::Job* j)
 	{
 		if (j->error())
 		{
@@ -154,8 +154,8 @@ namespace kt
 		if (!ret)
 		{
 			kdDebug()  << "Error parsing router description !" << endl;
-			TQString dest = KGlobal::dirs()->saveLocation("data","tork") + "upnp_failure";
-			KIO::file_copy(target,dest,-1,true,false,false);
+			TQString dest = TDEGlobal::dirs()->saveLocation("data","tork") + "upnp_failure";
+			TDEIO::file_copy(target,dest,-1,true,false,false);
 		}
 		else
 		{
@@ -169,8 +169,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,SIGNAL(result(KIO::Job *)),this,SLOT(downloadFinished( KIO::Job* )));
+		TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false);
+		connect(job,SIGNAL(result(TDEIO::Job *)),this,SLOT(downloadFinished( TDEIO::Job* )));
 	}
 	
 	void UPnPRouter::debugPrintData()
@@ -465,7 +465,7 @@ namespace kt
 namespace bt
 {
 
-	WaitJob::WaitJob(Uint32 millis) : KIO::Job(false)
+	WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false)
 	{
 		connect(&timer,SIGNAL(timeout()),this,SLOT(timerDone()));
 		timer.start(millis,true);
@@ -510,14 +510,14 @@ namespace bt
 	
 	void WaitJob::execute(WaitJob* job)
 	{
-		KIO::NetAccess::synchronousRun(job,0);
+		TDEIO::NetAccess::synchronousRun(job,0);
 	}
 	
 	void SynchronousWait(Uint32 millis)
 	{
 		kdDebug() << "SynchronousWait" << endl;
 		WaitJob* j = new WaitJob(millis);
-		KIO::NetAccess::synchronousRun(j,0);
+		TDEIO::NetAccess::synchronousRun(j,0);
 	}
 
 
diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h
index 8ae321e..d0590b9 100644
--- a/src/upnp/upnprouter.h
+++ b/src/upnp/upnprouter.h
@@ -21,7 +21,7 @@
 #define KTUPNPROUTER_H
 
 #include <ntqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ntqvaluelist.h>
 #include "exitoperation.h"
 #include <kurl.h>
@@ -41,7 +41,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
 	public:
@@ -90,7 +90,7 @@ namespace net
 {
     class ForwardPortList;
 }
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -265,7 +265,7 @@ namespace kt
 		void onReplyOK(bt::HTTPRequest* r,const TQString &,bool);
 		void onReplyError(bt::HTTPRequest* r,const TQString &,bool);
 		void onError(bt::HTTPRequest* r,bool);
-		void downloadFinished(KIO::Job* j);
+		void downloadFinished(TDEIO::Job* j);