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

12 files changed, 19 insertions, 19 deletions

diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp
index 46bcb9fa..5c24bc23 100644
--- a/kiten/asyndeta.cpp
+++ b/kiten/asyndeta.cpp
@@ -60,7 +60,7 @@ Dict::Index *Asyndeta::retrieveIndex()
 void Asyndeta::readKitenConfiguration()
 {
 	KStandardDirs *dirs = TDEGlobal::dirs();
-	KConfig config(dirs->findResource("config", "kitenrc"));
+	TDEConfig config(dirs->findResource("config", "kitenrc"));
 
 	TQString globaledict = dirs->findResource("data", "kiten/edict");
 	TQString globalkanjidic = dirs->findResource("data", "kiten/kanjidic");
diff --git a/kiten/asyndeta.h b/kiten/asyndeta.h
index aa02cff1..d4946e17 100644
--- a/kiten/asyndeta.h
+++ b/kiten/asyndeta.h
@@ -21,7 +21,7 @@
 #ifndef ASYNDETA_H
 #define ASYNDETA_H
 
-class KConfig;
+class TDEConfig;
 
 namespace Dict
 {
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index cb81b13f..4b9e2203 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -94,7 +94,7 @@ void ConfigDictionaries::readDictionaryList(const TQString& group)
 	{
 		TQString name = group + "_" + *it;
 		if (!config->findItem(name))
-			config->addItem(new KConfigSkeleton::ItemString(group, *it, *new TQString()), name);
+			config->addItem(new TDEConfigSkeleton::ItemString(group, *it, *new TQString()), name);
 	}
 	config->readConfig();
 	list->clear();
@@ -117,10 +117,10 @@ void ConfigDictionaries::writeDictionaryList(const TQString& group)
 	{
 		names.append(it.current()->text(0));
 		TQString name = group + "_" + it.current()->text(0);
-		KConfigSkeletonItem* item = config->findItem(name);
+		TDEConfigSkeletonItem* item = config->findItem(name);
 		if (!item)
 		{
-			item = new KConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
+			item = new TDEConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
 			config->addItem(item, name);
 		}
 		item->setProperty(it.current()->text(1));
diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h
index d6171edd..22933ed3 100644
--- a/kiten/configdictionaries.h
+++ b/kiten/configdictionaries.h
@@ -32,13 +32,13 @@ public:
 	ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
 	void readDictionaries();
         
-	// KConfig stuff
+	// TDEConfig stuff
 	void updateWidgets();
 	void updateWidgetsDefault();
 	void updateSettings();
 	bool hasChanged();
 	bool isDefault();
-	// KConfig stuff
+	// TDEConfig stuff
 
 signals:
 	void widgetChanged();
diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp
index 6ae2da6c..a0fa1d60 100644
--- a/kiten/kloader.cpp
+++ b/kiten/kloader.cpp
@@ -85,7 +85,7 @@ bool KLoader::open(void)
 	}
 	else
 	{
-		if(!KIO::NetAccess::download(d->url, d->tempFile))
+		if(!TDEIO::NetAccess::download(d->url, d->tempFile))
 		{
 			d->error = i18n("Could not read from %1.").arg(d->url.prettyURL());
 			return false;
@@ -110,7 +110,7 @@ void KLoader::close(void)
 	d->file = 0;
 
 	if(!d->isLocal)
-		KIO::NetAccess::removeTempFile(d->tempFile);
+		TDEIO::NetAccess::removeTempFile(d->tempFile);
 }
 
 TQString KLoader::error(void)
diff --git a/kiten/kloader.h b/kiten/kloader.h
index 816d29c3..f6f61506 100644
--- a/kiten/kloader.h
+++ b/kiten/kloader.h
@@ -35,7 +35,7 @@ class KLoader
 public:
 	/**
 	 * The constructor takes the url and decides the best way to save,
-	 * which will mean using something like KIO::NetAccess or TQFile.
+	 * which will mean using something like TDEIO::NetAccess or TQFile.
 	 */
 	KLoader(const KURL &_target);
 
diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp
index 8e36f6d1..5a92e2b0 100644
--- a/kiten/ksaver.cpp
+++ b/kiten/ksaver.cpp
@@ -118,7 +118,7 @@ bool KSaver::close(void)
 
 		d->tempFile->close();
 
-		bool retval = KIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
+		bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
 
 		delete d->tempFile;
 		d->tempFile = 0;
diff --git a/kiten/ksaver.h b/kiten/ksaver.h
index 8c73f7c1..b7a05d89 100644
--- a/kiten/ksaver.h
+++ b/kiten/ksaver.h
@@ -35,7 +35,7 @@ class KSaver
 public:
 	/**
 	 * The constructor takes the url and decides the best way to save,
-	 * which will mean using something like KIO::NetAccess or TQFile.
+	 * which will mean using something like TDEIO::NetAccess or TQFile.
 	 */
 	KSaver(const KURL &_target);
 
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index cc65cd35..b834e643 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -461,7 +461,7 @@ void Learn::write(const KURL &url)
 
 void Learn::saveScores()
 {
-	KConfig &config = *Config::self()->config();
+	TDEConfig &config = *Config::self()->config();
 	config.setGroup("Learn Scores");
 	for (TQListViewItemIterator it(List); it.current(); ++it)
 		config.writeEntry(it.current()->text(0), it.current()->text(4).toInt());
@@ -493,7 +493,7 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
 
 	statusBar()->message(i18n("%1 added to your list").arg(kanji));
 
-	KConfig &config = *Config::self()->config();
+	TDEConfig &config = *Config::self()->config();
 	int score = 0;
 	config.setGroup("Learn Scores");
 	score = config.readNumEntry(kanji, score);
@@ -633,7 +633,7 @@ void Learn::answerClicked(int i)
 		return;
 		
 	int newscore = 0;
-//	KConfig &config = *Config::self()->config();
+//	TDEConfig &config = *Config::self()->config();
 //	config.setGroup("Learn");
 	bool donew = false;
 
diff --git a/kiten/main.cpp b/kiten/main.cpp
index c4bd017b..e391ec50 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 	aboutData.addCredit("Jim Breen", I18N_NOOP("Wrote xjdic, of which Kiten borrows code, and the xjdic index file generator.\nAlso is main author of edict and kanjidic, which Kiten essentially require."), "jwb@csse.monash.edu.au");
 	aboutData.addAuthor("Neil Stevens", I18N_NOOP("Code simplification, UI suggestions."), "neil@qualityassistant.com");
 	aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
-	aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to KConfig XT, bug fixing"), "paul.temple@gmx.net");
+	aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to TDEConfig XT, bug fixing"), "paul.temple@gmx.net");
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index 35c48b6e..823b99a7 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -40,7 +40,7 @@
 #include "configlearn.h"
 #include "configsearching.h"
 
-ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self())
+ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self())
 {
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
 	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
@@ -71,7 +71,7 @@ void ConfigureDialog::updateWidgets()
 {
 	bool changed = hasChanged();
 	configDic->updateSettings();
-	if (changed) KConfigDialog::settingsChangedSlot();
+	if (changed) TDEConfigDialog::settingsChangedSlot();
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h
index 8169a853..7dc1574b 100644
--- a/kiten/optiondialog.h
+++ b/kiten/optiondialog.h
@@ -38,7 +38,7 @@ class DictList;
 #include "kitenconfig.h"
 #include "configdictionaries.h"
 
-class ConfigureDialog : public KConfigDialog
+class ConfigureDialog : public TDEConfigDialog
 {
 	Q_OBJECT