From 9f2c757e1a1694373c11427a00502c2ff4c2d403 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:32:27 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 klettres/AUTHORS               | 2 +-
 klettres/klettres/klettres.cpp | 8 ++++----
 klettres/klettres/main.cpp     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'klettres')

diff --git a/klettres/AUTHORS b/klettres/AUTHORS
index 25f799a8..55626169 100644
--- a/klettres/AUTHORS
+++ b/klettres/AUTHORS
@@ -35,4 +35,4 @@ Peter Hedlund
 Code for generating special characters icons
 
 Waldo Bastian
-Port to KConfig XT, coding help
+Port to TDEConfig XT, coding help
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index a4836f58..97a8bf0e 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -121,7 +121,7 @@ void KLettres::findLanguages()
 //TODO TEST in FRENCH
     m_languages.sort();
     //write the present languages in config so they cannot be downloaded
-    KConfig *config=kapp->config();
+    TDEConfig *config=kapp->config();
     config->setGroup("KNewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++)
     {
@@ -132,7 +132,7 @@ void KLettres::findLanguages()
     //we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages
     //to find the name of the country
     //corresponding to the code and the language the user set
-    KConfig entry(locate("locale", "all_languages"));
+    TDEConfig entry(locate("locale", "all_languages"));
     const TQStringList::ConstIterator itEnd = m_languages.end();
     for (TQStringList::Iterator it = m_languages.begin(); it != m_languages.end(); ++it) {
         if (*it == "hi-ro")
@@ -264,10 +264,10 @@ void KLettres::setupToolbars()
 
 void KLettres::optionsPreferences()
 {
-    if(KConfigDialog::showDialog("settings"))
+    if(TDEConfigDialog::showDialog("settings"))
         return;
 
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self());
+    TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self());
     dialog->addPage(new fontsdlg(0, "mFont"), i18n("Font Settings"), "fonts");
     //fontsdlg is the page name, mFont is the widget name, Font Settings is the page display string
     //fonts is the icon
diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp
index 6f728051..832f5476 100644
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
     about.addCredit("Peter Hedlund",
                     I18N_NOOP("Code for generating special characters' icons"), "peter.hedlund AT kdemail.net");
     about.addCredit("Waldo Bastian",
-                    I18N_NOOP("Port to KConfig XT, coding help"), "bastian AT kde.org");
+                    I18N_NOOP("Port to TDEConfig XT, coding help"), "bastian AT kde.org");
     about.addCredit("Danny Allen",
                     I18N_NOOP("Kids and grown-up SVG icons"), "danny AT dannyallen.co.uk");
     about.addCredit("Michael Goettsche",
-- 
cgit v1.2.1