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

5 files changed, 11 insertions, 11 deletions

diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 4e762921..87ce672c 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -736,10 +736,10 @@ void Kanagram::randomHintImage()
 
 void Kanagram::showSettings()
 {
-	if(KConfigDialog::showDialog("settings"))
+	if(TDEConfigDialog::showDialog("settings"))
 		return;
 
-	KConfigDialog *configDialog = new KConfigDialog( this, "settings", KanagramSettings::self() );
+	TDEConfigDialog *configDialog = new TDEConfigDialog( this, "settings", KanagramSettings::self() );
 	configDialog->addPage( new MainSettings( configDialog ), i18n( "General" ), "configure" );
 	m_vocabSettings = new VocabSettings( configDialog );
 	configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" );
diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h
index fcf10a26..2587e62f 100644
--- a/kanagram/src/kanagram.h
+++ b/kanagram/src/kanagram.h
@@ -49,7 +49,7 @@ namespace KDE
 using namespace std;
 
 class KHelpMenu;
-class KConfigDialog;
+class TDEConfigDialog;
 class KRandomSequence;
 class KanagramGame;
 class VocabSettings;
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 6d4eeaea..ffb95e2d 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -102,7 +102,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
-  if (KIO::NetAccess::download( url, tmpfile, 0 ))
+  if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
   {
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
@@ -174,7 +174,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
       }
     }
     f.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
   }
   return true;
 }
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index eb3a83d3..0e14a207 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -37,7 +37,7 @@
 
 MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 {
-	m_parent = (KConfigDialog*)parent;
+	m_parent = (TDEConfigDialog*)parent;
 
 	connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
 	connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
@@ -49,7 +49,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 	cboxTranslation->insertStringList(languageNames);
 	
 	//the language code/name
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	TQString code = KanagramSettings::dataLanguage();
 	entry.setGroup(code);
 	if (code == "sr")
@@ -117,7 +117,7 @@ void MainSettings::setupTranslations()
 		return;
 
 	//the language code/name
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	const TQStringList::ConstIterator itEnd = languages.end();
 	for (TQStringList::ConstIterator it = languages.begin(); it != itEnd; ++it) {
 		entry.setGroup(*it);
@@ -135,7 +135,7 @@ void MainSettings::setupTranslations()
 
 void MainSettings::getAndInstallFont()
 {
-	bool success = KIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
+	bool success = TDEIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
 	if (success)
 	{
 		getFontsButton->hide();
diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h
index d9f2015b..2ee07649 100644
--- a/kanagram/src/mainsettings.h
+++ b/kanagram/src/mainsettings.h
@@ -25,7 +25,7 @@
 
 #include "mainsettingswidget.h"
 
-class KConfigDialog;
+class TDEConfigDialog;
 
 class MainSettings : public MainSettingsWidget
 {
@@ -46,7 +46,7 @@ Q_OBJECT
 		TQMap<TQString, TQString> m_languageCodeMap;
 		void setupTranslations();
 		
-		KConfigDialog *m_parent;
+		TDEConfigDialog *m_parent;
 };
 
 #endif