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

1 files changed, 14 insertions, 14 deletions

diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 44bea619..b0e406b5 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -77,8 +77,8 @@ void kpMainWindow::setupTextToolBarActions ()
 // private
 void kpMainWindow::readAndApplyTextSettings ()
 {
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
 
     m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
     m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
@@ -141,8 +141,8 @@ void kpMainWindow::slotTextFontFamilyChanged ()
     if (m_mainView)
         m_mainView->setFocus ();
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingFontFamily, m_actionTextFontFamily->font ());
     cfg->sync ();
 
@@ -174,8 +174,8 @@ void kpMainWindow::slotTextFontSizeChanged ()
     if (m_mainView)
         m_mainView->setFocus ();
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingFontSize, m_actionTextFontSize->fontSize ());
     cfg->sync ();
 
@@ -199,8 +199,8 @@ void kpMainWindow::slotTextBoldChanged ()
     if (m_toolText && m_toolText->hasBegun ())
         m_toolText->slotBoldChanged (m_actionTextBold->isChecked ());
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingBold, m_actionTextBold->isChecked ());
     cfg->sync ();
 }
@@ -222,8 +222,8 @@ void kpMainWindow::slotTextItalicChanged ()
     if (m_toolText && m_toolText->hasBegun ())
         m_toolText->slotItalicChanged (m_actionTextItalic->isChecked ());
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingItalic, m_actionTextItalic->isChecked ());
     cfg->sync ();
 }
@@ -245,8 +245,8 @@ void kpMainWindow::slotTextUnderlineChanged ()
     if (m_toolText && m_toolText->hasBegun ())
         m_toolText->slotUnderlineChanged (m_actionTextUnderline->isChecked ());
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingUnderline, m_actionTextUnderline->isChecked ());
     cfg->sync ();
 }
@@ -268,8 +268,8 @@ void kpMainWindow::slotTextStrikeThruChanged ()
     if (m_toolText && m_toolText->hasBegun ())
         m_toolText->slotStrikeThruChanged (m_actionTextStrikeThru->isChecked ());
 
-    KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
-    KConfigBase *cfg = cfgGroupSaver.config ();
+    TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
+    TDEConfigBase *cfg = cfgGroupSaver.config ();
     cfg->writeEntry (kpSettingStrikeThru, m_actionTextStrikeThru->isChecked ());
     cfg->sync ();
 }