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

7 files changed, 20 insertions, 20 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;
diff --git a/kspread/kspread_autofill.cc b/kspread/kspread_autofill.cc
index 38cca433..8927d360 100644
--- a/kspread/kspread_autofill.cc
+++ b/kspread/kspread_autofill.cc
@@ -201,7 +201,7 @@ AutoFillSequenceItem::AutoFillSequenceItem( const TQString &_str )
     if( other==0L)
       {
 	//	other=new TQStringList();
-	KConfig *config = Factory::global()->config();
+	TDEConfig *config = Factory::global()->config();
 	config->setGroup( "Parameters" );
 	other=new TQStringList(config->readListEntry("Other list"));
       }
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 983e75ef..ad28bb78 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -284,7 +284,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 
     if (flags==KoDocument::InitDocEmpty)
     {
-        KConfig *config = Factory::global()->config();
+        TDEConfig *config = Factory::global()->config();
         int _page=1;
         if( config->hasGroup("Parameters" ))
         {
@@ -329,7 +329,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 
     if ( ret == KoTemplateChooseDia::Empty )
     {
-  KConfig *config = Factory::global()->config();
+  TDEConfig *config = Factory::global()->config();
   int _page=1;
   if( config->hasGroup("Parameters" ))
   {
@@ -377,7 +377,7 @@ void Doc::openTemplate (const TQString& file)
 
 void Doc::initEmpty()
 {
-    KConfig *config = Factory::global()->config();
+    TDEConfig *config = Factory::global()->config();
     int _page=1;
     if( config->hasGroup("Parameters" ))
     {
@@ -434,7 +434,7 @@ void Doc::saveConfig()
 {
     if ( isEmbedded() ||!isReadWrite())
         return;
-    KConfig *config = Factory::global()->config();
+    TDEConfig *config = Factory::global()->config();
     config->setGroup( "Parameters" );
     config->writeEntry( "Zoom", m_zoom );
 
@@ -442,7 +442,7 @@ void Doc::saveConfig()
 
 void Doc::initConfig()
 {
-    KConfig *config = Factory::global()->config();
+    TDEConfig *config = Factory::global()->config();
 
     if( config->hasGroup("KSpread Page Layout" ))
     {
@@ -1478,7 +1478,7 @@ KSpellConfig * Doc::getKSpellConfig()
     {
     	KSpellConfig ksconfig;
 
-    	KConfig *config = Factory::global()->config();
+    	TDEConfig *config = Factory::global()->config();
     	if( config->hasGroup("KSpell kspread" ) )
     	{
         	config->setGroup( "KSpell kspread" );
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index cb86e1a0..a76bd3d8 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -2099,7 +2099,7 @@ Sheet* View::activeSheet()
 
 void View::initConfig()
 {
-    KConfig *config = Factory::global()->config();
+    TDEConfig *config = Factory::global()->config();
     if ( config->hasGroup("Parameters" ))
     {
         config->setGroup( "Parameters" );
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index eb654706..7733cedf 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -1587,7 +1587,7 @@ void TQtCalculator::readSettings()
     TQColor tmpC(189, 255, 180);
     TQColor blackC(0,0,0);
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 	config->setGroup("CalcPlugin");
     kcalcdefaults.forecolor = config->readColorEntry("ForeColor", &blackC);
 	kcalcdefaults.backcolor = config->readColorEntry("BackColor", &tmpC);
@@ -1606,7 +1606,7 @@ void TQtCalculator::readSettings()
 
 void TQtCalculator::writeSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
 	config->setGroup("CalcPlugin");
 	config->writeEntry("ForeColor",kcalcdefaults.forecolor);