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

4 files changed, 22 insertions, 22 deletions

diff --git a/librss/image.cpp b/librss/image.cpp
index 242c65aa..aca4ba3b 100644
--- a/librss/image.cpp
+++ b/librss/image.cpp
@@ -110,18 +110,18 @@ void Image::getPixmap()
 	d->pixmapBuffer = new TQBuffer;
 	d->pixmapBuffer->open(IO_WriteOnly);
 
-	KIO::Job *job = KIO::get(d->url, false, false);
-	connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
+	TDEIO::Job *job = TDEIO::get(d->url, false, false);
+	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(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/librss/image.h b/librss/image.h
index 9035d763..d8213c1f 100644
--- a/librss/image.h
+++ b/librss/image.h
@@ -17,7 +17,7 @@
 
 class TQDomNode;
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -160,8 +160,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/librss/loader.cpp b/librss/loader.cpp
index b34799da..4eab3cc5 100644
--- a/librss/loader.cpp
+++ b/librss/loader.cpp
@@ -64,12 +64,12 @@ void FileRetriever::retrieveData(const KURL &url)
 	d->buffer = new TQBuffer;
 	d->buffer->open(IO_WriteOnly);
 
-	KIO::Job *job = KIO::get(url, false, false);
-	connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-	             TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
-	connect(job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
-	             TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
+	TDEIO::Job *job = TDEIO::get(url, false, false);
+	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	             TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+	connect(job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+	             TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 int FileRetriever::errorCode() const
@@ -77,12 +77,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();
@@ -94,7 +94,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/librss/loader.h b/librss/loader.h
index e541b020..1f6ac05b 100644
--- a/librss/loader.h
+++ b/librss/loader.h
@@ -17,7 +17,7 @@ class KURL;
 
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -129,9 +129,9 @@ namespace RSS
 			void permanentRedirection(const KURL &url);
 
 		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: