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

4 files changed, 5 insertions, 5 deletions

diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 2a8bf4be..b60c3949 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -156,10 +156,10 @@ void KLatin::loadRevision()
 
 void KLatin::loadSettings()
 {
-	if (KConfigDialog::showDialog("settings")) 
+	if (TDEConfigDialog::showDialog("settings")) 
 		return; 
 
-	KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
+	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self());
 	
 	vocabPage = new VocabPage(0); 
 	vocabPage->kcfg_DefaultFile->setMode(KFile::File | KFile::LocalOnly);
diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h
index 38c6569f..fc1c736b 100644
--- a/klatin/klatin/klatin.h
+++ b/klatin/klatin/klatin.h
@@ -61,7 +61,7 @@ public slots:
 	void resetGUI();
 	
 private slots:
-	/// Slot for when settings are changed in the KConfig XT dialog
+	/// Slot for when settings are changed in the TDEConfig XT dialog
 	void settingsChanged();
 	
 	void slotWriteMsg(const TQString&);
diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg
index 53ca9a55..38431aa5 100644
--- a/klatin/klatin/klatin.kcfg
+++ b/klatin/klatin/klatin.kcfg
@@ -8,7 +8,7 @@
 			<entry name="UserLanguage" type="String">
 				<label>The language selected by the user</label>
 					<code>
-						KConfigBase *globalConf = TDEGlobal::config();
+						TDEConfigBase *globalConf = TDEGlobal::config();
 						globalConf->setGroup("Locale");
 						TQString m_language = globalConf->readEntry("Language", "en");
 						//keep only the first 2 characters
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 5ff27ef7..1d577b57 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -87,7 +87,7 @@ void KLatinVocab::parseVocab(TQString customFile)
 	// Check whether file exists or not
 	// If not then regenerate working default
 	if (TQFile::exists(fileName) == FALSE) {
-		KConfigBase *globalConf = TDEGlobal::config();
+		TDEConfigBase *globalConf = TDEGlobal::config();
 		globalConf->setGroup("Locale");
 		
 		TQString language = globalConf->readEntry("Language", "en");