Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index f475859b..2a8bf4be 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -184,7 +184,7 @@ void KLatin::resetGUI()
 	// various options that are available to choose
 	// and setCentralWidget it.
 	klatinchoose = new KLatinChoose(this);
-	klatinchoose->QuitButton->setIconSet(KGlobal::iconLoader()->loadIconSet("exit", KIcon::Small));
+	klatinchoose->QuitButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("exit", KIcon::Small));
 	klatinchoose->show();
 	setCentralWidget(klatinchoose);
 
diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg
index ec8fa52f..53ca9a55 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 = KGlobal::config();
+						KConfigBase *globalConf = TDEGlobal::config();
 						globalConf->setGroup("Locale");
 						TQString m_language = globalConf->readEntry("Language", "en");
 						//keep only the first 2 characters
diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp
index 0598547f..b8037c95 100644
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@@ -38,8 +38,8 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name)
 	m_totalCorrect = 0;
 	m_numWrong = 0;
 
-	OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
-	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
+	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
 
 	// Set connections
 	connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack()));
diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp
index 70d42ed8..e0ec76fa 100644
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@@ -33,9 +33,9 @@
 KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name)
 	: KLatinVerbsWidget(parent, name)
 {
-	OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
-	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
-	ChangeButton->setIconSet(KGlobal::iconLoader()->loadIconSet("apply", KIcon::Small));
+	OKButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
+	ChangeButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("apply", KIcon::Small));
 
 	ChooseConjugation->insertItem(i18n("1st"));
 	ChooseConjugation->insertItem(i18n("2nd"));
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 8abbc0b3..5ff27ef7 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -35,7 +35,7 @@
 KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
 	: KLatinVocabWidget(parent, name)
 {
-	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
+	BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
 
 	m_vocabFile = TQString();
 	
@@ -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 = KGlobal::config();
+		KConfigBase *globalConf = TDEGlobal::config();
 		globalConf->setGroup("Locale");
 		
 		TQString language = globalConf->readEntry("Language", "en");