Rename a number of libraries and executables to avoid conflicts with KDE4

52 files changed, 70 insertions, 70 deletions

diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index a8667126..59daa828 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -196,7 +196,7 @@ kde_services_DATA = korganizer_configmain.desktop \
                     webcal.protocol
 
 update_DATA = korganizer.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 DOXYGEN_REFERENCES=libkcal tdeui
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 68fd6b4d..e4c906fa 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -56,9 +56,9 @@
 
 #include <dcopclient.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
@@ -1038,7 +1038,7 @@ bool ActionManager::saveURL()
 void ActionManager::exportHTML()
 {
   HTMLExportSettings settings( "KOrganizer" );
-  // Manually read in the config, because parametrized kconfigxt objects don't
+  // Manually read in the config, because parametrized tdeconfigxt objects don't
   // seem to load the config theirselves
   settings.readConfig();
 
@@ -1291,7 +1291,7 @@ void ActionManager::setDestinationPolicy()
 void ActionManager::configureDateTime()
 {
   TDEProcess *proc = new TDEProcess;
-  *proc << "kcmshell" << "language";
+  *proc << "tdecmshell" << "language";
 
   connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
           TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp
index 6609b183..76985d1a 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 77f8f80b..3ef70ea7 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -85,10 +85,10 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <kdirwatch.h>
 
@@ -1798,7 +1798,7 @@ void CalendarView::exportWeb()
 {
   // FIXME: Get rid of the settings object. When can I delete it???
   HTMLExportSettings *settings = new HTMLExportSettings( "KOrganizer" );
-  // Manually read in the config, because parametrized kconfigxt objects don't
+  // Manually read in the config, because parametrized tdeconfigxt objects don't
   // seem to load the config theirselves
   if ( settings ) settings->readConfig();
   ExportWebDialog *dlg = new ExportWebDialog( settings, this );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 3df3046e..469eddaf 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <korganizer/koeventviewer.h>
 #include <libkcal/scheduler.h>
 #include <tdepimmacros.h>
diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp
index 8981255f..1ac91835 100644
--- a/korganizer/docprefs.cpp
+++ b/korganizer/docprefs.cpp
@@ -33,7 +33,7 @@ KSimpleConfig *DocPrefs::mConfig = 0;
 DocPrefs::DocPrefs( const TQString &type )
 {
     if ( !mConfig ) {
-        mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".kconfig" ) );
+        mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) );
     }
 }
 
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index d4afada2..739dc905 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kglobal.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/calendarlocal.h>
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index c5868f14..0cece663 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -38,15 +38,15 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "koglobals.h"
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index ee0c38a0..5d479e88 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -49,15 +49,15 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kabc/stdaddressbook.h>
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c156b7a5..a1828671 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -44,7 +44,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kholidays.h>
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index eed2cd2c..49e2ec3a 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -29,7 +29,7 @@
 
 #include <kglobal.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <twin.h>
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 0096b149..ace67c18 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -34,7 +34,7 @@
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kxmlguifactory.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 24cf5730..74e90888 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -28,7 +28,7 @@
 #include <libkcal/attachmenthandler.h>
 #include <libkcal/incidence.h>
 #include <libtdepim/kpimurlrequesterdlg.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/tdepimprotocols.h>
 #include <libtdepim/maillistdrag.h>
 #include <libtdepim/kvcarddrag.h>
@@ -42,10 +42,10 @@
 #include <kurldrag.h>
 #include <ktempfile.h>
 #include <ktempdir.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdaction.h>
 #include <kactioncollection.h>
 #include <kpopupmenu.h>
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index fb8b4bc5..0ab854a9 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index dc54a526..67c0654b 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 54822c83..22667c46 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -41,7 +41,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktextedit.h>
 
 #include <libkcal/incidenceformatter.h>
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 9f9b816e..91fb0d4d 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -25,7 +25,7 @@
 #define KOEVENTVIEWER_H
 
 #include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtextbrowser.h>
 
 namespace KCal {
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index a5f5a60f..b3fd073b 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index a9372b04..ce253dfc 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -43,7 +43,7 @@
 #include <libkcal/icalformat.h>
 #include <libkcal/scheduler.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index ea3f5e7e..74ad2855 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -36,7 +36,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kabc/addressee.h>
 
 #include <libtdepim/designerfields.h>
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index fb52f4b6..a741d7f2 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kwordwrap.h>
 
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index ead4f7e8..a8f6acc3 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -35,7 +35,7 @@
 
 #include <kglobalsettings.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
diff --git a/korganizer/koprefs_base.kcfgc b/korganizer/koprefs_base.kcfgc
index c5f26759..8d59a50b 100644
--- a/korganizer/koprefs_base.kcfgc
+++ b/korganizer/koprefs_base.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=korganizer.kcfg
 ClassName=KOPrefsBase
 Singleton=false
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index fbf4cf95..e85f630e 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -37,7 +37,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index d5d8dddb..051fe446 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -30,7 +30,7 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index f3f6493d..8f21106a 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "alarmdialog.h"
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index f2ec01f2..89014c46 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -59,12 +59,12 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kstdaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <kprocess.h>
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 184e142c..22a6e3ec 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -47,7 +47,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <ktempfile.h>
 #include <kstatusbar.h>
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 9a308fcf..e69d61ad 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -28,7 +28,7 @@
 
 #include <libkcal/calendarresources.h>
 #include <kactioncollection.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "actionmanager.h"
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 6b8746db..3fbf8410 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -27,7 +27,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index 9ef6068b..468095a9 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -19,7 +19,7 @@
 
 #include "datenums.h"
 #include "koglobals.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "configdialog.h"
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index ca3c4c49..e84ae08b 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <kurl.h>
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index fe01324a..91e4670e 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqcombobox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index b580c2fe..668fad5a 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index c65691d3..06518853 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kcalendarsystem.h>
diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp
index edf1fc93..5ff71e66 100644
--- a/korganizer/plugins/printing/journal/journalprint.cpp
+++ b/korganizer/plugins/printing/journal/journalprint.cpp
@@ -30,7 +30,7 @@
 #include <libkcal/journal.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>
diff --git a/korganizer/plugins/printing/list/listprint.cpp b/korganizer/plugins/printing/list/listprint.cpp
index 9607de8e..e15939a1 100644
--- a/korganizer/plugins/printing/list/listprint.cpp
+++ b/korganizer/plugins/printing/list/listprint.cpp
@@ -31,7 +31,7 @@
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
index 4f58eed0..57622716 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
@@ -31,7 +31,7 @@
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index f22e1b17..bf039d2d 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -29,7 +29,7 @@
 
 #include <libkcal/calendar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 #include <klocale.h>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index b65efde6..5847d0c2 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -34,7 +34,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <libkcal/vcaldrag.h>
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index da7d5f48..f7e35eff 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 4c43444f..8445edf4 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -24,9 +24,9 @@
 
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <libkcal/calendar.h>
 
 #include "timespanwidget.h"
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index bd910677..d43cd8e6 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index dd42e163..2753475f 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -37,9 +37,9 @@
 #include <libkcal/calendarlocal.h>
 
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/korganizer/printing/CMakeLists.txt b/korganizer/printing/CMakeLists.txt
index 67ff0485..bb4fce14 100644
--- a/korganizer/printing/CMakeLists.txt
+++ b/korganizer/printing/CMakeLists.txt
@@ -46,7 +46,7 @@ tde_add_library( korg_stdprinting SHARED AUTOMOC
   SOURCES
     calprinter.cpp calprintpluginbase.cpp calprintdefaultplugins.cpp
     calprintdayconfig_base.ui calprintmonthconfig_base.ui
-    calprinttodoconfig_base.ui calprintweekconfig_base.ui
+    calprinttodoconfig_base.ui calprintweetdeconfig_base.ui
     calprintincidenceconfig_base.ui
   VERSION 1.0.0
   LINK kocorehelper-shared tdeprint-shared
diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am
index 10170ca7..45fd37be 100644
--- a/korganizer/printing/Makefile.am
+++ b/korganizer/printing/Makefile.am
@@ -18,7 +18,7 @@ libkocorehelper_la_SOURCES = cellitem.cpp
 libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \
         calprintdefaultplugins.cpp \
         calprintdayconfig_base.ui calprintmonthconfig_base.ui \
-        calprinttodoconfig_base.ui calprintweekconfig_base.ui \
+        calprinttodoconfig_base.ui calprintweetdeconfig_base.ui \
         calprintincidenceconfig_base.ui
 libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                                  -no-undefined -version-info 1:0
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index e6701554..8ed37660 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcalendarsystem.h>
 #include <knuminput.h>
 #include <kcombobox.h>
@@ -45,7 +45,7 @@
 
 #include "calprintincidenceconfig_base.h"
 #include "calprintdayconfig_base.h"
-#include "calprintweekconfig_base.h"
+#include "calprintweetdeconfig_base.h"
 #include "calprintmonthconfig_base.h"
 #include "calprinttodoconfig_base.h"
 
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 50b533bf..f754e52d 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcalendarsystem.h>
 #include <kwordwrap.h>
 
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui
index 0be844ab..0be844ab 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweetdeconfig_base.ui
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index a325add5..c9291571 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -40,7 +40,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configdialog.h>
 #include <libkcal/calendarresources.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqhbox.h>
 #include <tqheader.h>
diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp
index 0d274869..a7fcd544 100644
--- a/korganizer/stdcalendar.cpp
+++ b/korganizer/stdcalendar.cpp
@@ -25,7 +25,7 @@
 #include <libtdepim/kpimprefs.h>
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 6e4819a8..09edb36c 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -38,14 +38,14 @@ using namespace KCal;
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <ktempfile.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfile.h>