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

6 files changed, 38 insertions, 38 deletions

diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index ec3485e..15e0520 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -28,7 +28,7 @@
 
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -36,7 +36,7 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const TQString &dir
 	)
 {
@@ -44,13 +44,13 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &dir
+		TDEConfig *config, const TQString &group, const TQString &dir
 	)
 {
 	init(config, group, dir, "appdata", dir);
 }
 
-KDataCollection::KDataCollection(KConfig *config, const TQString &dir)
+KDataCollection::KDataCollection(TDEConfig *config, const TQString &dir)
 {
 	init(config, "KDataCollection", dir, "appdata", dir);
 }
@@ -61,7 +61,7 @@ KDataCollection::KDataCollection(const TQString &dir)
 }
 
 void KDataCollection::init(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -74,7 +74,7 @@ void KDataCollection::init(
 
 TQStringList KDataCollection::names() const
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 
 	// these are the entries I have
 	TQStringList n = g.readListEntry(mEntry);
@@ -96,7 +96,7 @@ TQStringList KDataCollection::names() const
 
 void KDataCollection::remove(const TQString &name)
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 	TQString location = file(name);
 	if (location.isEmpty()) return;
 	if (location == saveFile(name, false))
diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h
index 6230ddb..71a9ea7 100644
--- a/noatun-plugins/oblique/kdatacollection.h
+++ b/noatun-plugins/oblique/kdatacollection.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This class allows you to have a set of files.  Some of which can be included
@@ -45,7 +45,7 @@ class KConfig;
  **/
 class KDataCollection
 {
-	KConfig *mConfig;
+	TDEConfig *mConfig;
 	TQString mGroup, mEntry, mDir;
 	const char *mDatadir;
 
@@ -60,7 +60,7 @@ public:
 	 * @param datadir is what is passed to locate, this is "appdata" by default
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 
@@ -69,32 +69,32 @@ public:
 	 * settings, @p dir is the second argument to locate("appdata", ...)
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const TQString &dir
 		);
 
 	/**
-	 * constructor.  The entry in the KConfig group will be named the same as
+	 * constructor.  The entry in the TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group,
+			TDEConfig *config, const TQString &group,
 			const TQString &dir
 		);
 
 	/**
 	 * constructor.  The group will be "KDataCollection", The entry in the
-	 * KConfig group will be named the same as
+	 * TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
-	KDataCollection(KConfig *config, const TQString &dir);
+	KDataCollection(TDEConfig *config, const TQString &dir);
 
 	/**
-	 * constructor.  the KConfig is assumed to be TDEGlobal::config()
+	 * constructor.  the TDEConfig is assumed to be TDEGlobal::config()
 	 *
 	 * otherwise the same as the previous function
 	 **/
@@ -136,7 +136,7 @@ public:
 
 private:
 	void init(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 };
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 4b2b543..f25338a 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -30,7 +30,7 @@ Oblique::Oblique()
 	mView = 0;
 	mAdder = 0;
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 
 	mBase = new Base(::locate("data", "noatun/")+"/oblique-list");
 
@@ -263,25 +263,25 @@ void DirectoryAdder::addNextPending()
 	if (!listJob &&	(pendingIt!= pendingAddDirectories.end()))
 	{
 		currentJobURL= *pendingIt;
-		listJob = KIO::listDir(currentJobURL, false, false);
+		listJob = TDEIO::listDir(currentJobURL, false, false);
 		connect(
-				listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))
+				listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
 			);
 		connect(
-				listJob, TQT_SIGNAL(result(KIO::Job *)),
-				TQT_SLOT(slotResult(KIO::Job *))
+				listJob, TQT_SIGNAL(result(TDEIO::Job *)),
+				TQT_SLOT(slotResult(TDEIO::Job *))
 			);
 		connect(
-				listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)),
-				TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))
+				listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+				TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
 			);
 		pendingAddDirectories.remove(pendingIt);
 		lastAddedSubDirectory = pendingAddDirectories.begin();
 	}
 }
 
-void DirectoryAdder::slotResult(KIO::Job *job)
+void DirectoryAdder::slotResult(TDEIO::Job *job)
 {
 	listJob= 0;
 	if (job && job->error())
@@ -291,12 +291,12 @@ void DirectoryAdder::slotResult(KIO::Job *job)
 		emit done();
 }
 
-void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
+void DirectoryAdder::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &entries)
 {
 	TQMap<TQString,KURL> __list; // temp list to sort entries
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	for (; it != end; ++it)
 	{
@@ -316,7 +316,7 @@ void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
 	}
 }
 
-void DirectoryAdder::slotRedirection(KIO::Job *, const KURL & url)
+void DirectoryAdder::slotRedirection(TDEIO::Job *, const KURL & url)
 {
 	currentJobURL= url;
 }
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index ad068f1..f5c1798 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -18,7 +18,7 @@ class Selector;
 class TreeItem;
 class DirectoryAdder;
 
-namespace KIO
+namespace TDEIO
 {
 	class ListJob;
 	class Job;
@@ -118,7 +118,7 @@ class DirectoryAdder : public TQObject
 	Oblique *mOblique;
 	KURL::List pendingAddDirectories;
 	KURL::List::Iterator lastAddedSubDirectory;
-	KIO::ListJob *listJob;
+	TDEIO::ListJob *listJob;
 	KURL currentJobURL;
 
 public:
@@ -133,9 +133,9 @@ signals:
 	void done();
 
 private slots:
-	void slotResult(KIO::Job *job);
-	void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-	void slotRedirection(KIO::Job *, const KURL & url);
+	void slotResult(TDEIO::Job *job);
+	void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+	void slotRedirection(TDEIO::Job *, const KURL & url);
 
 private:
 	
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index b8909a1..04c9cdd 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent)
 
 	mSlice = oblique->base()->defaultSlice();
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	mFileOfQuery = g.readEntry("schema", "standard");
 	if (!setSchema(mFileOfQuery))
 	{
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 15b15e5..c769603 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -92,7 +92,7 @@ View::View(Oblique *oblique)
 	applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	TQStringList tabids = g.readListEntry("tabids");
 	
 	for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i)
@@ -142,7 +142,7 @@ View::~View()
 		tabids.append(t);
 	}
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	g.writeEntry("tabids", tabids);
 	g.sync();
 }