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

---
 developer-doc/phb/settings.docbook     |  2 +-
 developer-doc/phb/src-examples.docbook | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'developer-doc')

diff --git a/developer-doc/phb/settings.docbook b/developer-doc/phb/settings.docbook
index 7bc592d..5c47bf9 100644
--- a/developer-doc/phb/settings.docbook
+++ b/developer-doc/phb/settings.docbook
@@ -96,7 +96,7 @@ That should be it.
 <title>References</title>
 
 <para>
-A more complete - but generic version - can be found on <ulink url="http://techbase.kde.org/Development/Tutorials/Using_KConfig_XT">http://techbase.kde.org/Development/Tutorials/Using_KConfig_XT</ulink> . Currently, &app; does not use the <filename>CMakeLists.txt</filename> file but the above mentioned <filename>Makefile.am</filename> approach. You can safely skip the section about CMakeLists.txt.
+A more complete - but generic version - can be found on <ulink url="http://techbase.kde.org/Development/Tutorials/Using_TDEConfig_XT">http://techbase.kde.org/Development/Tutorials/Using_TDEConfig_XT</ulink> . Currently, &app; does not use the <filename>CMakeLists.txt</filename> file but the above mentioned <filename>Makefile.am</filename> approach. You can safely skip the section about CMakeLists.txt.
 </para>
 </sect1>
 
diff --git a/developer-doc/phb/src-examples.docbook b/developer-doc/phb/src-examples.docbook
index 78c26fa..84db1ac 100644
--- a/developer-doc/phb/src-examples.docbook
+++ b/developer-doc/phb/src-examples.docbook
@@ -53,7 +53,7 @@ This appendix contains an example of a
   *
   * It uses KDialogBase to implement it's interface.
   *
-  * It uses the global KConfig object to read and write the application
+  * It uses the global TDEConfig object to read and write the application
   * settings.
   *
   * @see KDialogBase
@@ -398,12 +398,12 @@ void KSettingsDlg::setPageList()
   qtabwidget->addTab(qvboxInsideTab2, i18n("Cell Font"));
 }
 
-/** Read all the settings in from the global KConfig object and set all the
+/** Read all the settings in from the global TDEConfig object and set all the
   * widgets appropriately.
 **/
 void KSettingsDlg::configRead()
 {
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   kconfig->setGroup("Settings Dialog");
   QSize *qsizeDefaultSize = new QSize(470,470);
   this->resize(kconfig->readSizeEntry("Geometry", qsizeDefaultSize));
@@ -445,11 +445,11 @@ void KSettingsDlg::configRead()
   m_qradiobuttonOtherRow->setChecked(!m_bTempColourPerTransaction);
 }
 
-/** Write out all the settings to the global KConfig object.
+/** Write out all the settings to the global TDEConfig object.
 **/
 void KSettingsDlg::configWrite()
 {
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   kconfig->setGroup("Settings Dialog");
   kconfig->writeEntry("Geometry", this->size() );
 
@@ -505,7 +505,7 @@ and 3"));
 void KSettingsDlg::slotCancel()
 {
   // make sure the config object is the same as we left it
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   kconfig->setGroup("List Options");
   kconfig->writeEntry("listColor", m_qcolorTempList);
   kconfig->writeEntry("listBGColor", m_qcolorTempListBG);
-- 
cgit v1.2.1