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

3 files changed, 10 insertions, 10 deletions

diff --git a/kspread/dialogs/kspread_dlg_list.h b/kspread/dialogs/kspread_dlg_list.h
index f9b3e033..84f27d8d 100644
--- a/kspread/dialogs/kspread_dlg_list.h
+++ b/kspread/dialogs/kspread_dlg_list.h
@@ -30,7 +30,7 @@ class TQLineEdit;
 class TQMultiLineEdit;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 
 namespace KSpread
 {
@@ -55,7 +55,7 @@ public slots:
   void slotCopy();
 
 protected:
-  KConfig *config;
+  TDEConfig *config;
 
   TQListBox * list;
   TQMultiLineEdit *entryList;
diff --git a/kspread/dialogs/kspread_dlg_preference.h b/kspread/dialogs/kspread_dlg_preference.h
index 971f13f4..bdd2af09 100644
--- a/kspread/dialogs/kspread_dlg_preference.h
+++ b/kspread/dialogs/kspread_dlg_preference.h
@@ -29,7 +29,7 @@
 
 #include <kdialogbase.h>
 
-class KConfig;
+class TDEConfig;
 class KIntNumInput;
 class KDoubleNumInput;
 class KSpellConfig;
@@ -88,7 +88,7 @@ protected:
     TQCheckBox *m_createBackupFile;
   bool m_oldBackupFile;
 
-  KConfig* config;
+  TDEConfig* config;
   int oldRecent;
   int oldAutoSaveValue;
 } ;
@@ -116,7 +116,7 @@ protected:
    * Needed to ensure the same unit for loading and saving.
    */
   KoUnit::Unit indentUnit;
-  KConfig* config;
+  TDEConfig* config;
   TQComboBox *typeCompletion;
   TQComboBox *typeCalc;
   TQComboBox *typeOfMove;
@@ -138,7 +138,7 @@ protected:
   View* m_pView;
   KColorButton* gridColor;
   KColorButton* pageBorderColor;
-  KConfig* config;
+  TDEConfig* config;
 } ;
 
 class configureLayoutPage : public TQObject
@@ -160,7 +160,7 @@ protected:
   int orientation;
   int unit;
 
-  KConfig* config;
+  TDEConfig* config;
 } ;
 
 class configureSpellPage : public TQObject
@@ -173,7 +173,7 @@ public:
   void slotDefault();
 protected:
   View * m_pView;
-  KConfig * config;
+  TDEConfig * config;
     KSpellConfig *m_spellConfigWidget;
     TQCheckBox *dontCheckUpperWord;
     TQCheckBox *dontCheckTitleCase;
@@ -190,7 +190,7 @@ public:
 private slots:
   void screenReaderOptionChanged();
 private:
-  KConfig* config;
+  TDEConfig* config;
   TQCheckBox* m_cbSpeakPointerWidget;
   TQCheckBox* m_cbSpeakFocusWidget;
   TQVGroupBox* m_gbScreenReaderOptions;
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 9a7c6e33..5ee35bb2 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -303,7 +303,7 @@ void SortDialog::init()
     lst<<i18n("Saturday");
     lst<<i18n("Sunday");
 
-  KConfig * config = Factory::global()->config();
+  TDEConfig * config = Factory::global()->config();
   config->setGroup( "Parameters" );
   TQStringList other = config->readListEntry("Other list");
   TQString tmp;