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

9 files changed, 25 insertions, 25 deletions

diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp
index d0b8480e..2de8990a 100644
--- a/knewsticker/common/configaccess.cpp
+++ b/knewsticker/common/configaccess.cpp
@@ -398,12 +398,12 @@ bool ArticleFilter::matches(Article::Ptr a) const
 }
 	
 ConfigAccess::ConfigAccess()
-	: m_defaultCfg(new KConfig(TQString(), true, false))
+	: m_defaultCfg(new TDEConfig(TQString(), true, false))
 {
 	m_cfg = m_defaultCfg;
 }
 
-ConfigAccess::ConfigAccess(KConfig *config)
+ConfigAccess::ConfigAccess(TDEConfig *config)
 	: m_cfg(config), m_defaultCfg(0L)
 {
 	m_cfg->setGroup("KNewsTicker");
diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h
index 9416e4e4..cebce895 100644
--- a/knewsticker/common/configaccess.h
+++ b/knewsticker/common/configaccess.h
@@ -71,7 +71,7 @@ class ConfigAccess : public ConfigIface
 {
 	public:
 		ConfigAccess();
-		ConfigAccess(KConfig *);
+		ConfigAccess(TDEConfig *);
 		virtual ~ConfigAccess();
 
 		virtual unsigned int interval() const;
@@ -128,8 +128,8 @@ class ConfigAccess : public ConfigIface
 		void reparseConfiguration() { m_cfg->reparseConfiguration(); }
 	
 	private:
-		KConfig *m_cfg;
-		KConfig *m_defaultCfg;
+		TDEConfig *m_cfg;
+		TDEConfig *m_defaultCfg;
 };
 
 #endif // CONFIGACCESS_H
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index d37a9227..200c3375 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -88,10 +88,10 @@ void NewsIconMgr::getIcon(const KURL &url)
 							TQString::fromLatin1("favicons/%1.png").arg(url.host()))));
 		}
 	} else {
-		KIO::Job *job = KIO::get(url, true, 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 *)));
+		TDEIO::Job *job = TDEIO::get(url, true, 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 *)));
 		
 		KIODownload download;
 		download.url = url;
@@ -108,7 +108,7 @@ bool NewsIconMgr::isStdIcon(const TQPixmap &pixmap) const
 		return false;
 }
 
-void NewsIconMgr::slotData(KIO::Job *job, const TQByteArray &data)
+void NewsIconMgr::slotData(TDEIO::Job *job, const TQByteArray &data)
 {
 	TQBuffer buf(m_kioDownload[job].data);
 	buf.open(IO_WriteOnly);
@@ -117,7 +117,7 @@ void NewsIconMgr::slotData(KIO::Job *job, const TQByteArray &data)
 	m_kioDownload[job].dataOffset = buf.at();
 }
 
-void NewsIconMgr::slotResult(KIO::Job *job)
+void NewsIconMgr::slotResult(TDEIO::Job *job)
 {
 	emit gotIcon(m_kioDownload[job].url, TQPixmap(m_kioDownload[job].data));
 	m_kioDownload.remove(job);
diff --git a/knewsticker/common/newsiconmgr.h b/knewsticker/common/newsiconmgr.h
index 2c351b83..f2997479 100644
--- a/knewsticker/common/newsiconmgr.h
+++ b/knewsticker/common/newsiconmgr.h
@@ -21,7 +21,7 @@
 class DCOPClient;
 
 struct KIODownload;
-typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
 
 class NewsIconMgr : public TQObject, public DCOPObject
 {
@@ -46,8 +46,8 @@ class NewsIconMgr : public TQObject, public DCOPObject
 		~NewsIconMgr();
 		
 	private slots:
-		void slotData(KIO::Job *, const TQByteArray &);
-		void slotResult(KIO::Job *);
+		void slotData(TDEIO::Job *, const TQByteArray &);
+		void slotResult(TDEIO::Job *);
 
 	private:
 		TQString favicon(const KURL &) const;
diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp
index 96933414..742c1ad1 100644
--- a/knewsticker/common/xmlnewsaccess.cpp
+++ b/knewsticker/common/xmlnewsaccess.cpp
@@ -59,20 +59,20 @@ void XMLNewsSource::loadFrom(const KURL &url)
 	m_downloadData = new TQBuffer;
 	m_downloadData->open(IO_WriteOnly);
 
-	KIO::Job *job = KIO::get(url, false, false);
+	TDEIO::Job *job = TDEIO::get(url, false, false);
 	job->addMetaData(TQString::fromLatin1("UserAgent"),
 	                 TQString::fromLatin1("KNewsTicker v0.2"));
-	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(data(TDEIO::Job *, const TQByteArray &)),
+			TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
 }
 
-void XMLNewsSource::slotData(KIO::Job *, const TQByteArray &data)
+void XMLNewsSource::slotData(TDEIO::Job *, const TQByteArray &data)
 {
 	m_downloadData->writeBlock(data.data(), data.size());
 }
 
-void XMLNewsSource::slotResult(KIO::Job *job)
+void XMLNewsSource::slotResult(TDEIO::Job *job)
 {
 	kdDebug(5005) << "XMLNewsSource::slotResult(): Finished downloading data (" << job->error() << ")." << endl;
 	processData(m_downloadData->buffer(), !job->error());
diff --git a/knewsticker/common/xmlnewsaccess.h b/knewsticker/common/xmlnewsaccess.h
index 2a14208e..4af60fcf 100644
--- a/knewsticker/common/xmlnewsaccess.h
+++ b/knewsticker/common/xmlnewsaccess.h
@@ -76,8 +76,8 @@ class XMLNewsSource : public TQObject
 		TQString m_description;
 
 	private slots:
-		void slotData(KIO::Job *, const TQByteArray &);
-		void slotResult(KIO::Job *);
+		void slotData(TDEIO::Job *, const TQByteArray &);
+		void slotResult(TDEIO::Job *);
 	
 	private:
 		XMLNewsArticle::List m_articles;
diff --git a/knewsticker/knewstickerconfig.h b/knewsticker/knewstickerconfig.h
index 80fb0433..057372cf 100644
--- a/knewsticker/knewstickerconfig.h
+++ b/knewsticker/knewstickerconfig.h
@@ -23,7 +23,7 @@
 
 class KNewsTickerConfig;
 class KNewsTickerConfigWidget;
-class KConfig;
+class TDEConfig;
 class NewsIconMgr;
 class ConfigAccess;
 
diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp
index a50e8244..30046809 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.cpp
+++ b/knewsticker/knewstickerstub/knewstickerstub.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	DCOPClient *dcopClient = app.dcopClient();
 	dcopClient->attach();
 
-	KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
+	TDEConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
 	ConfigAccess configFrontend(&cfg);
 
 	if (args->isSet("addrdf")) {
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index c06be284..1cb992fd 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -185,7 +185,7 @@ void NewsScroller::dropEvent(TQDropEvent* event)
 		if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to"
 				" the list of news sources?</p>")
 					.arg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) {
-			KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
+			TDEConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
 			ConfigAccess configFrontend(&cfg);
 			TQStringList newsSources = configFrontend.newsSources();