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

8 files changed, 14 insertions, 14 deletions

diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 3766e2ff..6b8746db 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -58,7 +58,7 @@ ConfigDialog::~ConfigDialog()
 
 void ConfigDialog::load()
 {
-  KConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
+  TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
   config.setGroup("Calendar/DateNum Plugin");
 	int datenum = config.readNumEntry( "ShowDayNumbers", 0 );
   mDayNumGroup->setButton( datenum );
@@ -66,7 +66,7 @@ void ConfigDialog::load()
 
 void ConfigDialog::save()
 {
-  KConfig config( "korganizerrc", false, false); // Open read-write, no kdeglobals
+  TDEConfig config( "korganizerrc", false, false); // Open read-write, no kdeglobals
   config.setGroup("Calendar/DateNum Plugin");
   config.writeEntry("ShowDayNumbers", mDayNumGroup->selectedId() );
   config.sync();
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index af022837..9ef6068b 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_datenums, DatenumsFactory )
 
 Datenums::Datenums()
 {
-  KConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
+  TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
   config.setGroup("Calendar/DateNum Plugin");
   mDateNum = config.readNumEntry( "ShowDayNumbers", 0 );
 }
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 54a11852..b580c2fe 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -58,7 +58,7 @@ ConfigDialog::~ConfigDialog()
 
 void ConfigDialog::load()
 {
-  KConfig config("korganizerrc", true, false); // Open read-only, no kdeglobals
+  TDEConfig config("korganizerrc", true, false); // Open read-only, no kdeglobals
 
   config.setGroup("Calendar/Hebrew Calendar Plugin");
   israel_box->setChecked(config.
@@ -73,7 +73,7 @@ void ConfigDialog::load()
 
 void ConfigDialog::save()
 {
-  KConfig config("korganizerrc", false, false); // Open read-write, no kdeglobals
+  TDEConfig config("korganizerrc", false, false); // Open read-write, no kdeglobals
 
   config.setGroup("Calendar/Hebrew Calendar Plugin");
   config.writeEntry("Israel", israel_box->isChecked());
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 742c7849..c65691d3 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_hebrew, HebrewFactory )
 TQString Hebrew::shortText(const TQDate & date)
 {
 
-  KConfig config("korganizerrc", true, false); // Open read-only, no kdeglobals
+  TDEConfig config("korganizerrc", true, false); // Open read-only, no kdeglobals
 
   config.setGroup("Calendar/Hebrew Calendar Plugin");
   IsraelP =
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 6c45ff42..b65efde6 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -118,8 +118,8 @@ void KOProjectView::readSettings()
 {
   kdDebug(5850) << "KOProjectView::readSettings()" << endl;
 
-  //KConfig *config = kapp->config();
-  KConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
+  //TDEConfig *config = kapp->config();
+  TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
   config.setGroup("Views");
 
   TQValueList<int> sizes = config.readIntListEntry("Separator ProjectView");
@@ -128,7 +128,7 @@ void KOProjectView::readSettings()
   }
 }
 
-void KOProjectView::writeSettings(KConfig *config)
+void KOProjectView::writeSettings(TDEConfig *config)
 {
   kdDebug(5850) << "KOProjectView::writeSettings()" << endl;
 
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index be0e1ee9..5415d381 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -78,7 +78,7 @@ class KOProjectView : public KOrg::BaseView
     int currentDateCount() { return 0; }
 
     void readSettings();
-    void writeSettings(KConfig *);
+    void writeSettings(TDEConfig *);
 
   public slots:
     void updateView();
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index eb924c74..4c43444f 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -55,7 +55,7 @@ void KOTimeSpanView::readSettings()
 {
   kdDebug(5850) << "KOTimeSpanView::readSettings()" << endl;
 
-  KConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
+  TDEConfig config( "korganizerrc", true, false); // Open read-only, no kdeglobals
   config.setGroup("Views");
 
   TQValueList<int> sizes = config.readIntListEntry("Separator TimeSpanView");
@@ -64,7 +64,7 @@ void KOTimeSpanView::readSettings()
   }
 }
 
-void KOTimeSpanView::writeSettings(KConfig *config)
+void KOTimeSpanView::writeSettings(TDEConfig *config)
 {
 //  kdDebug(5850) << "KOTimeSpanView::writeSettings()" << endl;
 
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index ae407443..b9dec86a 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -26,7 +26,7 @@
 
 #include "koeventview.h"
 
-class KConfig;
+class TDEConfig;
 class TimeSpanWidget;
 
 class KOTimeSpanView : public KOEventView
@@ -44,7 +44,7 @@ class KOTimeSpanView : public KOEventView
     DateList selectedDates() { return DateList(); }
 
     void readSettings();
-    void writeSettings( KConfig * );
+    void writeSettings( TDEConfig * );
 
   public slots:
     virtual void updateView();