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

4 files changed, 14 insertions, 14 deletions

diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 1dbed289..32efad60 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -332,8 +332,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
   if( sizeIsRelativeState && sizeIsRelativeCheckBox )
     setSizeIsRelative( *sizeIsRelativeState );
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, TQString::fromLatin1("General"));
   showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 7ca6f1a7..84ec27d5 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -251,8 +251,8 @@ void KoAutoFormat::updateMaxWords()
 
 void KoAutoFormat::loadListOfWordCompletion()
 {
-    KConfig* config = KoGlobal::kofficeConfig();
-    KConfigGroupSaver cgs( config, "Completion Word" );
+    TDEConfig* config = KoGlobal::kofficeConfig();
+    TDEConfigGroupSaver cgs( config, "Completion Word" );
     m_listCompletion->insertItems(config->readListEntry( "list" ));
 }
 
@@ -263,8 +263,8 @@ void KoAutoFormat::readConfig(bool force)
     // so that loading is faster and to avoid doing it for readonly documents.
     if ( m_configRead && !force )
         return;
-    KConfig* config = KoGlobal::kofficeConfig();
-    KConfigGroupSaver cgs( config, "AutoFormat" );
+    TDEConfig* config = KoGlobal::kofficeConfig();
+    TDEConfigGroupSaver cgs( config, "AutoFormat" );
     //when we force don't load format language.
     if ( !force)
         m_autoFormatLanguage = config->readEntry("formatLanguage", TQString());
@@ -615,10 +615,10 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages)
 
 void KoAutoFormat::saveConfig()
 {
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     KLocale klocale(m_doc->instance()->instanceName());
 
-    KConfigGroupSaver cgs( config, "AutoFormat" );
+    TDEConfigGroupSaver cgs( config, "AutoFormat" );
     config->writeEntry( "ConvertUpperCase", m_convertUpperCase );
     config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage);
 
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 09e12f0d..8464bf4d 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -189,8 +189,8 @@ void KoCompletion::saveSettings() {
 }
 
 void KoCompletion::slotSaveCompletionEntry() {
-    KConfig config("kofficerc");
-    KConfigGroupSaver cgs( &config, "Completion Word" );
+    TDEConfig config("kofficerc");
+    TDEConfigGroupSaver cgs( &config, "Completion Word" );
     config.writeEntry( "list", m_listCompletion );
     config.sync();
     KMessageBox::information( this, i18n(
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 6b040905..770c1da2 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -1390,10 +1390,10 @@ TQCString KoDateVariable::formatStr(int & correct)
     DateFormatWidget* widget=new DateFormatWidget(dialog);
     int count=0;
     dialog->setMainWidget(widget);
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     if( config->hasGroup("Date format history") )
     {
-        KConfigGroupSaver cgs( config, "Date format history");
+        TDEConfigGroupSaver cgs( config, "Date format history");
         const int noe=config->readNumEntry("Number Of Entries", 5);
         for(int i=0;i<noe;i++)
         {
@@ -1601,11 +1601,11 @@ TQCString KoTimeVariable::formatStr(int & _correct)
     KDialogBase* dialog=new KDialogBase(0, 0, true, i18n("Time Format"), KDialogBase::Ok|KDialogBase::Cancel);
     TimeFormatWidget* widget=new TimeFormatWidget(dialog);
     dialog->setMainWidget(widget);
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     int count=0;
     if( config->hasGroup("Time format history") )
     {
-        KConfigGroupSaver cgs( config, "Time format history" );
+        TDEConfigGroupSaver cgs( config, "Time format history" );
         const int noe=config->readNumEntry("Number Of Entries", 5);
         for(int i=0;i<noe;i++)
         {