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

58 files changed, 175 insertions, 175 deletions

diff --git a/korganizer/README b/korganizer/README
index 31508d9e7..0b443a9f8 100644
--- a/korganizer/README
+++ b/korganizer/README
@@ -73,7 +73,7 @@ QUICK NOTES ON WHAT'S NEW IN THE DIFFERENT VERSIONS:
        notification. This also provides a plugin interface for adding resources
        which makes it possible to easily extend Korganizer for example to access
        groupware servers or other ways to store calendar data. 
-     - KOrganizer configuration is now based on KConfig XT. That means that
+     - KOrganizer configuration is now based on TDEConfig XT. That means that
        there is an abstract XML based description of the configuration which is
        used for generating the needed code to access the configuration data and
        serves as base for external configuration tools.
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 741a04f86..68fd6b4d1 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -77,7 +77,7 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 
-// FIXME: Several places in the file don't use KConfigXT yet!
+// FIXME: Several places in the file don't use TDEConfigXT yet!
 KOWindowList *ActionManager::mWindowList = 0;
 
 ActionManager::ActionManager( KXMLGUIClient *client, CalendarView *widget,
@@ -573,7 +573,7 @@ void ActionManager::initActions()
   mEventViewerShowAction = new KToggleAction ( i18n("Show Item Viewer"), 0,
                       TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ),
                       mACollection, "show_eventviewer" );
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
   config->setGroup( "Settings" );
   mDateNavigatorShowAction->setChecked(
       config->readBoolEntry( "DateNavigatorVisible", true ) );
@@ -655,10 +655,10 @@ void ActionManager::initActions()
 
 void ActionManager::readSettings()
 {
-  // read settings from the KConfig, supplying reasonable
+  // read settings from the TDEConfig, supplying reasonable
   // defaults where none are to be found
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
   if ( mRecent ) mRecent->loadEntries( config );
   mCalendarView->readSettings();
 }
@@ -667,7 +667,7 @@ void ActionManager::writeSettings()
 {
   kdDebug(5850) << "ActionManager::writeSettings" << endl;
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
   mCalendarView->writeSettings();
 
   config->setGroup( "Settings" );
@@ -847,7 +847,7 @@ void ActionManager::file_close()
   if ( !saveModifiedURL() ) return;
 
   mCalendarView->closeCalendar();
-  KIO::NetAccess::removeTempFile( mFile );
+  TDEIO::NetAccess::removeTempFile( mFile );
   mURL="";
   mFile="";
 
@@ -883,19 +883,19 @@ bool ActionManager::openURL( const KURL &url,bool merge )
     setTitle();
   } else {
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, view() ) ) {
+    if( TDEIO::NetAccess::download( url, tmpFile, view() ) ) {
       kdDebug(5850) << "--- Downloaded to " << tmpFile << endl;
       bool success = mCalendarView->openCalendar( tmpFile, merge );
       if ( merge ) {
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
         if ( success )
           showStatusMessageOpen( url, merge );
       } else {
         if ( success ) {
-          KIO::NetAccess::removeTempFile( mFile );
+          TDEIO::NetAccess::removeTempFile( mFile );
           mURL = url;
           mFile = tmpFile;
-          KConfig *config = KOGlobals::self()->config();
+          TDEConfig *config = KOGlobals::self()->config();
           config->setGroup( "General" );
           setTitle();
           kdDebug(5850) << "-- Add recent URL: " << url.prettyURL() << endl;
@@ -1016,7 +1016,7 @@ bool ActionManager::saveURL()
   }
 
   if ( !mURL.isLocalFile() ) {
-    if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) {
+    if ( !TDEIO::NetAccess::upload( mFile, mURL, view() ) ) {
       TQString msg = i18n("Cannot upload calendar to '%1'")
                     .arg( mURL.prettyURL() );
       KMessageBox::error( dialogParent() ,msg );
@@ -1093,7 +1093,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings )
     TQString tfile = tf.name();
     tf.close();
     mExport.save( tfile );
-    if ( !KIO::NetAccess::upload( tfile, dest, view() ) ) {
+    if ( !TDEIO::NetAccess::upload( tfile, dest, view() ) ) {
       KNotifyClient::event ( view()->winId(),
                             i18n("Could not upload file.") );
     }
@@ -1130,8 +1130,8 @@ bool ActionManager::saveAsURL( const KURL &url )
   if ( success ) {
     delete mTempFile;
     mTempFile = tempFile;
-    KIO::NetAccess::removeTempFile( fileOrig );
-    KConfig *config = KOGlobals::self()->config();
+    TDEIO::NetAccess::removeTempFile( fileOrig );
+    TDEConfig *config = KOGlobals::self()->config();
     config->setGroup( "General" );
     setTitle();
     if ( mRecent ) mRecent->addURL( mURL );
@@ -1208,7 +1208,7 @@ KURL ActionManager::getSaveURL()
   return url;
 }
 
-void ActionManager::saveProperties( KConfig *config )
+void ActionManager::saveProperties( TDEConfig *config )
 {
   kdDebug(5850) << "ActionManager::saveProperties" << endl;
 
@@ -1218,7 +1218,7 @@ void ActionManager::saveProperties( KConfig *config )
   }
 }
 
-void ActionManager::readProperties( KConfig *config )
+void ActionManager::readProperties( TDEConfig *config )
 {
   kdDebug(5850) << "ActionManager::readProperties" << endl;
 
@@ -2055,9 +2055,9 @@ void ActionManager::slotAutoArchive()
 void ActionManager::loadProfile( const TQString & path )
 {
   KOPrefs::instance()->writeConfig();
-  KConfig* const cfg = KOPrefs::instance()->config();
+  TDEConfig* const cfg = KOPrefs::instance()->config();
 
-  const KConfig profile( path+"/korganizerrc", /*read-only=*/false, /*useglobals=*/false );
+  const TDEConfig profile( path+"/korganizerrc", /*read-only=*/false, /*useglobals=*/false );
   const TQStringList groups = profile.groupList();
   for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it )
   {
@@ -2075,7 +2075,7 @@ void ActionManager::loadProfile( const TQString & path )
 }
 
 namespace {
-    void copyConfigEntry( KConfig* source, KConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
+    void copyConfigEntry( TDEConfig* source, TDEConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
     {
         source->setGroup( group );
         dest->setGroup( group );
@@ -2086,9 +2086,9 @@ namespace {
 void ActionManager::saveToProfile( const TQString & path ) const
 {
   KOPrefs::instance()->writeConfig();
-  KConfig* const cfg = KOPrefs::instance()->config();
+  TDEConfig* const cfg = KOPrefs::instance()->config();
 
-  KConfig profile( path+"/korganizerrc", /*read-only=*/false, /*useglobals=*/false );
+  TDEConfig profile( path+"/korganizerrc", /*read-only=*/false, /*useglobals=*/false );
   ::copyConfigEntry( cfg, &profile, "Views", "Agenda View Calendar Display" );
 }
 
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 8c6a44026..1d7d99157 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -50,7 +50,7 @@ class KActionCollection;
 class KRecentFilesAction;
 class KSelectAction;
 class KToggleAction;
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KTempFile;
 class KXMLGUIClient;
@@ -259,7 +259,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void keyBindings();
 
     /**
-      Using the KConfig associated with the kapp variable, read in the
+      Using the TDEConfig associated with the kapp variable, read in the
       settings from the config file.
     */
     void readSettings();
@@ -270,8 +270,8 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void writeSettings();
 
     /* Session management */
-    void saveProperties( KConfig * );
-    void readProperties( KConfig * );
+    void saveProperties( TDEConfig * );
+    void readProperties( TDEConfig * );
 
     void loadParts();
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2f31310b1..77f8f80b3 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -537,10 +537,10 @@ void CalendarView::readSettings()
 
   TQString str;
 
-  // read settings from the KConfig, supplying reasonable
+  // read settings from the TDEConfig, supplying reasonable
   // defaults where none are to be found
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
 
 #ifndef KORG_NOSPLITTER
   config->setGroup( "KOrganizer Geometry" );
@@ -577,7 +577,7 @@ void CalendarView::writeSettings()
 {
 //  kdDebug(5850) << "CalendarView::writeSettings" << endl;
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
 
 #ifndef KORG_NOSPLITTER
   config->setGroup( "KOrganizer Geometry" );
@@ -602,7 +602,7 @@ void CalendarView::writeSettings()
   config->sync();
 }
 
-void CalendarView::readFilterSettings( KConfig *config )
+void CalendarView::readFilterSettings( TDEConfig *config )
 {
 //  kdDebug(5850) << "CalendarView::readFilterSettings()" << endl;
 
@@ -639,7 +639,7 @@ void CalendarView::readFilterSettings( KConfig *config )
   updateFilter();
 }
 
-void CalendarView::writeFilterSettings( KConfig *config )
+void CalendarView::writeFilterSettings( TDEConfig *config )
 {
 //  kdDebug(5850) << "CalendarView::writeFilterSettings()" << endl;
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 1baaf16e5..3df3046e8 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -378,7 +378,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     void checkClipboard();
 
     /**
-      Using the KConfig associated with the kapp variable, read in the
+      Using the TDEConfig associated with the kapp variable, read in the
       settings from the config file.
 
       You have to call setCalendar before calling readSettings.
@@ -389,10 +389,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     void writeSettings();
 
     /** read settings for calendar filters */
-    void readFilterSettings( KConfig *config );
+    void readFilterSettings( TDEConfig *config );
 
     /** write settings for calendar filters */
-    void writeFilterSettings( KConfig *config );
+    void writeFilterSettings( TDEConfig *config );
 
     /** passes on the message that an event has changed to the currently
      * activated view so that it can make appropriate display changes. */
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 536c37f73..d4afada2f 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -199,8 +199,8 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
   KURL archiveURL( KOPrefs::instance()->mArchiveFile );
   TQString archiveFile;
 
-  if ( KIO::NetAccess::exists( archiveURL, true, widget ) ) {
-    if( !KIO::NetAccess::download( archiveURL, archiveFile, widget ) ) {
+  if ( TDEIO::NetAccess::exists( archiveURL, true, widget ) ) {
+    if( !TDEIO::NetAccess::download( archiveURL, archiveFile, widget ) ) {
       kdDebug(5850) << "EventArchiver::archiveEvents(): Can't download archive file" << endl;
       return;
     }
@@ -224,13 +224,13 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
   KURL srcUrl;
   srcUrl.setPath(archiveFile);
   if (srcUrl != archiveURL) {
-    if ( !KIO::NetAccess::upload( archiveFile, archiveURL, widget ) ) {
+    if ( !TDEIO::NetAccess::upload( archiveFile, archiveURL, widget ) ) {
       KMessageBox::error(widget,i18n("Cannot write archive to final destination."));
       return;
     }
   }
 
-  KIO::NetAccess::removeTempFile(archiveFile);
+  TDEIO::NetAccess::removeTempFile(archiveFile);
 
   // Delete archived events from calendar
   for( it = incidences.begin(); it != incidences.end(); ++it ) {
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 59775f070..ee0c38a05 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -77,16 +77,16 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
                                           const char *name )
   : TQObject( manager, name ), mManager( manager ), mEmail( email )
 {
-  KIO::TransferJob *job = KIO::get( url, false, false );
+  TDEIO::TransferJob *job = TDEIO::get( url, false, false );
   //pass the mainwindow to the job so any prompts are active
   KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
   job->setWindow( korg->topLevelWidget() );
 
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
-  connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-  KIO::Scheduler::scheduleJob( job );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+  TDEIO::Scheduler::scheduleJob( job );
 }
 
 FreeBusyDownloadJob::~FreeBusyDownloadJob()
@@ -94,7 +94,7 @@ FreeBusyDownloadJob::~FreeBusyDownloadJob()
 }
 
 
-void FreeBusyDownloadJob::slotData( KIO::Job *, const TQByteArray &data )
+void FreeBusyDownloadJob::slotData( TDEIO::Job *, const TQByteArray &data )
 {
   TQByteArray tmp = data;
   tmp.resize( tmp.size() + 1 );
@@ -102,7 +102,7 @@ void FreeBusyDownloadJob::slotData( KIO::Job *, const TQByteArray &data )
   mFreeBusyData += tmp;
 }
 
-void FreeBusyDownloadJob::slotResult( KIO::Job *job )
+void FreeBusyDownloadJob::slotResult( TDEIO::Job *job )
 {
   DEBUG_5850 << "FreeBusyDownloadJob::slotResult() " << mEmail << endl;
 
@@ -331,7 +331,7 @@ void FreeBusyManager::publishFreeBusy()
 
     DEBUG_5850 << "FreeBusyManager::publishFreeBusy(): " << targetURL << endl;
 
-    KIO::Job * job = KIO::file_copy( src, targetURL, -1,
+    TDEIO::Job * job = TDEIO::file_copy( src, targetURL, -1,
                                      true /*overwrite*/,
                                      false /*don't resume*/,
                                      false /*don't show progress info*/ );
@@ -339,14 +339,14 @@ void FreeBusyManager::publishFreeBusy()
     KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
     job->setWindow( korg->topLevelWidget() );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) );
   }
 }
 
-void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job)
+void FreeBusyManager::slotUploadFreeBusyResult(TDEIO::Job *_job)
 {
-    KIO::FileCopyJob* job = static_cast<KIO::FileCopyJob *>(_job);
+    TDEIO::FileCopyJob* job = static_cast<TDEIO::FileCopyJob *>(_job);
     if ( job->error() )
         KMessageBox::sorry( 0,
           i18n( "<qt>The software could not upload your free/busy list to the "
@@ -459,14 +459,14 @@ KURL replaceVariablesURL( const KURL &url, const TQString &email )
 
 bool fbExists( const KURL &url )
 {
-  // We need this function because using KIO::NetAccess::exists()
+  // We need this function because using TDEIO::NetAccess::exists()
   // is useless for the http and https protocols. And getting back
   // arbitrary data is also useless because a server can respond back
   // with a "no such document" page.  So we need smart checking.
 
-  KIO::Job *job = KIO::get( url, false, false );
+  TDEIO::Job *job = TDEIO::get( url, false, false );
   TQByteArray data;
-  if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) {
+  if ( TDEIO::NetAccess::synchronousRun( job, 0, &data ) ) {
     TQString dataStr ( data );
     if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) {
       return true;
@@ -481,7 +481,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
 
   // First check if there is a specific FB url for this email
   TQString configFile = locateLocal( "data", "korganizer/freebusyurls" );
-  KConfig cfg( configFile );
+  TDEConfig cfg( configFile );
 
   cfg.setGroup( email );
   TQString url = cfg.readEntry( "url" );
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index b6b93d046..124dbdb3e 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -42,7 +42,7 @@
 #include <tqstring.h>
 #include <tqobject.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 namespace KCal {
 class Calendar;
 class FreeBusy;
@@ -63,8 +63,8 @@ class FreeBusyDownloadJob : public TQObject
     virtual ~FreeBusyDownloadJob();
 
   protected slots:
-    void slotResult( KIO::Job * );
-    void slotData(  KIO::Job *, const TQByteArray &data );
+    void slotResult( TDEIO::Job * );
+    void slotData(  TDEIO::Job *, const TQByteArray &data );
 
   signals:
     void freeBusyDownloaded( KCal::FreeBusy *, const TQString& email );
@@ -161,7 +161,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
     bool processRetrieveQueue();
 
   private slots:
-    void slotUploadFreeBusyResult( KIO::Job * );
+    void slotUploadFreeBusyResult( TDEIO::Job * );
     void slotFreeBusyDownloadError( const TQString& email );
 
   private:
diff --git a/korganizer/interfaces/korganizer/printplugin.h b/korganizer/interfaces/korganizer/printplugin.h
index a1414cdb8..f22279990 100644
--- a/korganizer/interfaces/korganizer/printplugin.h
+++ b/korganizer/interfaces/korganizer/printplugin.h
@@ -60,7 +60,7 @@ class PrintPlugin : public KOrg::Plugin
     static TQString serviceType() { return "KOrganizer/PrintPlugin"; }
 
     virtual void setKOrgCoreHelper( KOrg::CoreHelper*helper ) { mCoreHelper = helper; }
-    virtual void setConfig( KConfig *cfg ) { mConfig = cfg; }
+    virtual void setConfig( TDEConfig *cfg ) { mConfig = cfg; }
     virtual void setCalendar( KCal::Calendar *cal ) { mCalendar = cal; }
     virtual void setSelectedIncidences( KCal::Incidence::List inc ) { mSelectedIncidences = inc; }
     virtual KCal::Incidence::List selectedIncidences() const { return mSelectedIncidences; }
@@ -156,7 +156,7 @@ class PrintPlugin : public KOrg::Plugin
     KPrinter *mPrinter;
     KCal::Calendar *mCalendar;
     KCal::Incidence::List mSelectedIncidences;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 class PrintPluginFactory : public PluginFactory
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 06550bfe0..05a0af9d9 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -34,7 +34,7 @@
 class TQPopupMenu;
 class TQTime;
 class TQLabel;
-class KConfig;
+class TDEConfig;
 class KOAgenda;
 class KOAgendaItem;
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 91cf417dd..c156b7a57 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1598,7 +1598,7 @@ void KOAgendaView::readSettings()
   readSettings(KOGlobals::self()->config());
 }
 
-void KOAgendaView::readSettings(KConfig *config)
+void KOAgendaView::readSettings(TDEConfig *config)
 {
 //  kdDebug(5850) << "KOAgendaView::readSettings()" << endl;
 
@@ -1614,7 +1614,7 @@ void KOAgendaView::readSettings(KConfig *config)
   updateConfig();
 }
 
-void KOAgendaView::writeSettings(KConfig *config)
+void KOAgendaView::writeSettings(TDEConfig *config)
 {
 //  kdDebug(5850) << "KOAgendaView::writeSettings()" << endl;
 
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 00e8b699c..887cc9573 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -42,7 +42,7 @@ class TQBoxLayout;
 class KOAgenda;
 class KOAgendaItem;
 class TimeLabels;
-class KConfig;
+class TDEConfig;
 
 namespace KOrg {
   class IncidenceChangerBase;
@@ -174,8 +174,8 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     void startDrag( Incidence * );
 
     void readSettings();
-    void readSettings( KConfig * );
-    void writeSettings( KConfig * );
+    void readSettings( TDEConfig * );
+    void writeSettings( TDEConfig * );
 
     void setContentsPos( int y );
 
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 83ceec0ea..20ed0259c 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -119,9 +119,9 @@ void KODialogManager::showOptionsDialog()
 {
   if (!mOptionsDialog) {
 #if 0
-    mOptionsDialog = new KConfigureDialog();
-//    mOptionsDialog = new KConfigureDialog( KConfigureDialog::Configurable );
-//    mOptionsDialog = new KConfigureDialog( mMainView );
+    mOptionsDialog = new TDEConfigureDialog();
+//    mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable );
+//    mOptionsDialog = new TDEConfigureDialog( mMainView );
     connect( mOptionsDialog->dialog(),
              TQT_SIGNAL( configCommitted( const TQCString & ) ),
              mMainView, TQT_SLOT( updateConfig() ) );
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index 7cabd6ad3..4fbb70560 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -31,7 +31,7 @@
 namespace KCal{class CalFilter; }
 class CalendarView;
 class KCMultiDialog;
-class KConfigureDialog;
+class TDEConfigureDialog;
 namespace KPIM { class CategoryEditDialog; }
 class KOIncidenceEditor;
 class KOEventEditor;
@@ -86,7 +86,7 @@ class KODialogManager : public TQObject
     CalendarView *mMainView;
 
     KCMultiDialog *mOptionsDialog;
-//    KConfigureDialog *mOptionsDialog;
+//    TDEConfigureDialog *mOptionsDialog;
     KPIM::CategoryEditDialog *mCategoryEditDialog;
     SearchDialog *mSearchDialog;
     ArchiveDialog *mArchiveDialog;
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index cf10b9fd0..24cf57306 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -233,7 +233,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
     uint size = item->attachment()->size();
     grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 );
     grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ).
-                                 arg( KIO::convertSize( size ) ).
+                                 arg( TDEIO::convertSize( size ) ).
                                  arg( TDEGlobal::locale()->formatNumber(
                                         size, 0 ) ), topFrame ), 4, 2 );
   }
@@ -278,7 +278,7 @@ void AttachmentEditDialog::slotApply()
 
     if ( mInline->isChecked() ) {
       TQString tmpFile;
-      if ( KIO::NetAccess::download( correctedUrl, tmpFile, this ) ) {
+      if ( TDEIO::NetAccess::download( correctedUrl, tmpFile, this ) ) {
         TQFile f( tmpFile );
         if ( !f.open( IO_ReadOnly ) ) {
           return;
@@ -287,7 +287,7 @@ void AttachmentEditDialog::slotApply()
         f.close();
         mItem->setData( data );
       }
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     } else {
       mItem->setUri( url.url() );
     }
@@ -802,7 +802,7 @@ void KOEditorAttachments::addUriAttachment( const TQString &uri,
     }
   } else {
     TQString tmpFile;
-    if ( KIO::NetAccess::download( uri, tmpFile, this ) ) {
+    if ( TDEIO::NetAccess::download( uri, tmpFile, this ) ) {
       TQFile f( tmpFile );
       if ( !f.open( IO_ReadOnly ) ) {
         return;
@@ -811,7 +811,7 @@ void KOEditorAttachments::addUriAttachment( const TQString &uri,
       f.close();
       addDataAttachment( data, mimeType, label );
     }
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 }
 
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 2596f0b66..388e35699 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -79,7 +79,7 @@ void KOEventViewer::message( const TQString &link )
   TQToolTip::add( this, ttStr );
 }
 
-void KOEventViewer::readSettings( KConfig * config )
+void KOEventViewer::readSettings( TDEConfig * config )
 {
   if ( config ) {
 // With each restart of KOrganizer the font site gets halfed. What should this
@@ -94,7 +94,7 @@ void KOEventViewer::readSettings( KConfig * config )
   }
 }
 
-void KOEventViewer::writeSettings( KConfig * config )
+void KOEventViewer::writeSettings( TDEConfig * config )
 {
   if ( config ) {
     kdDebug(5850) << " KOEventViewer: saving the zoomFactor: "<< pointSize() << endl;
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index fa787f4e6..9f9b816e9 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -75,8 +75,8 @@ class KDE_EXPORT KOEventViewer : public TQTextBrowser
     */
     void setDefaultText( const TQString &text );
 
-    void readSettings( KConfig *config );
-    void writeSettings ( KConfig *config );
+    void readSettings( TDEConfig *config );
+    void writeSettings ( TDEConfig *config );
 
   public slots:
     /**
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 3c1c8e4f7..a5f5a60f8 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -77,7 +77,7 @@ KOGlobals::KOGlobals()
   mAlarmClient = new AlarmClient;
 }
 
-KConfig* KOGlobals::config() const
+TDEConfig* KOGlobals::config() const
 {
   return mOwnInstance->config();
 }
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 4c1c5474b..678426fd6 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -32,7 +32,7 @@ class TQIconSet;
 class KCalendarSystem;
 class AlarmClient;
 
-class KConfig;
+class TDEConfig;
 class TDEInstance;
 class KHolidays;
 
@@ -77,7 +77,7 @@ class KDE_EXPORT KOGlobals
     };
 
     static void fitDialogToScreen( TQWidget *widget, bool force=false );
-    KConfig *config() const;
+    TDEConfig *config() const;
 
     static bool reverseLayout();
 
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index bb535a95b..ea3f5e7ea 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -334,9 +334,9 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i )
       // TODO: Allow more mime-types, but add security checks!
 /*      if ( a->mimeType() == "application/x-designer" ) {
         TQString tmpFile;
-        if ( KIO::NetAccess::download( a->uri(), tmpFile, this ) ) {
+        if ( TDEIO::NetAccess::download( a->uri(), tmpFile, this ) ) {
           mAttachedDesignerFields.append( addDesignerTab( tmpFile ) );
-          KIO::NetAccess::removeTempFile( tmpFile );
+          TDEIO::NetAccess::removeTempFile( tmpFile );
         }
       } else*/
       // TODO: Enable that check again!
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index fb333674c..189a43b7f 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -459,12 +459,12 @@ void KOListView::popupMenu( TQListViewItem *item,const TQPoint &, int )
   }
 }
 
-void KOListView::readSettings( KConfig *config )
+void KOListView::readSettings( TDEConfig *config )
 {
   mListView->restoreLayout( config,"KOListView Layout" );
 }
 
-void KOListView::writeSettings( KConfig *config )
+void KOListView::writeSettings( TDEConfig *config )
 {
   mListView->saveLayout( config, "KOListView Layout" );
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index d234c98fe..bee6eb4a0 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -86,8 +86,8 @@ class KOListView : public KOEventView
     // Shows all incidences of the calendar
     void showAll();
 
-    void readSettings(KConfig *config);
-    void writeSettings(KConfig *config);
+    void readSettings(TDEConfig *config);
+    void writeSettings(TDEConfig *config);
 
     void clear();
     TQSize sizeHint() const;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 58248ba49..ead4f7e8d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -81,7 +81,7 @@ KOPrefs::KOPrefs() :
   // make it a bit smaller
   mDefaultMonthViewFont.setPointSize( mDefaultMonthViewFont.pointSize() - 2 );
 
-  KConfigSkeleton::setCurrentGroup( "General" );
+  TDEConfigSkeleton::setCurrentGroup( "General" );
 
   addItemPath( "Html Export File", mHtmlExportFile,
    TQDir::homeDirPath() + "/" + i18n( "Default export file", "calendar.html" ) );
@@ -240,12 +240,12 @@ void KOPrefs::usrWriteConfig()
   }
 
   if( !mFreeBusyPublishSavePassword ) {
-    KConfigSkeleton::ItemPassword *i = freeBusyPublishPasswordItem();
+    TDEConfigSkeleton::ItemPassword *i = freeBusyPublishPasswordItem();
     i->setValue( "" );
     i->writeConfig( config() );
   }
   if( !mFreeBusyRetrieveSavePassword ) {
-    KConfigSkeleton::ItemPassword *i = freeBusyRetrievePasswordItem();
+    TDEConfigSkeleton::ItemPassword *i = freeBusyRetrievePasswordItem();
     i->setValue( "" );
     i->writeConfig( config() );
   }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 4d96b5b3b..0fa1eb21d 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -30,7 +30,7 @@
 
 #include "koprefs_base.h"
 
-class KConfig;
+class TDEConfig;
 class TQFont;
 class TQColor;
 class TQStringList;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 54ca4dfc8..06ecccd33 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -138,7 +138,7 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on )
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_korganizerconfigmain( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogMain( parent, "kcmkorganizermain" );
   }
@@ -479,7 +479,7 @@ class KOPrefsDialogTime : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigtime( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigtime( TQWidget *parent, const char * )
   {
     TDEGlobal::locale()->insertCatalogue( "timezones" );
     return new KOPrefsDialogTime( parent, "kcmkorganizertime" );
@@ -579,7 +579,7 @@ class KOPrefsDialogViews : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigviews( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigviews( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogViews( parent, "kcmkorganizerviews" );
   }
@@ -639,7 +639,7 @@ class KOPrefsDialogFonts : public KPrefsModule
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfonts( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigfonts( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogFonts( parent, "kcmkorganizerfonts" );
   }
@@ -842,7 +842,7 @@ void KOPrefsDialogColors::updateResourceColor()
 }
 extern "C"
 {
-  KCModule *create_korganizerconfigcolors( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigcolors( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogColors( parent, "kcmkorganizercolors" );
   }
@@ -1005,7 +1005,7 @@ void KOPrefsDialogGroupScheduling::updateInput()
 
 extern "C"
 {
-  KCModule *create_korganizerconfiggroupscheduling( TQWidget *parent,
+  TDECModule *create_korganizerconfiggroupscheduling( TQWidget *parent,
                                                      const char * )
   {
     return new KOPrefsDialogGroupScheduling( parent,
@@ -1063,13 +1063,13 @@ void KOPrefsDialogGroupwareScheduling::usrWriteConfig()
 
   // clear the url cache for our user
   TQString configFile = locateLocal( "data", "korganizer/freebusyurls" );
-  KConfig cfg( configFile );
+  TDEConfig cfg( configFile );
   cfg.deleteGroup( KOPrefs::instance()->email() );
 }
 
 extern "C"
 {
-  KCModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogGroupwareScheduling( parent,
                                                  "kcmkorganizerfreebusy" );
@@ -1210,7 +1210,7 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i )
 
 extern "C"
 {
-  KCModule *create_korganizerconfigplugins( TQWidget *parent, const char * )
+  TDECModule *create_korganizerconfigplugins( TQWidget *parent, const char * )
   {
     return new KOPrefsDialogPlugins( parent,
                                      "kcmkorganizerplugins" );
@@ -1220,7 +1220,7 @@ extern "C"
 
 extern "C"
 {
-  KCModule *create_korgdesignerfields( TQWidget *parent, const char * ) {
+  TDECModule *create_korgdesignerfields( TQWidget *parent, const char * ) {
     return new KOPrefsDesignerFields( parent, "kcmkorgdesignerfields" );
   }
 }
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 8cac3182e..fbf4cf95d 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary )
 
 void AlarmDialog::readLayout()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Layout" );
   TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
   if ( sizes.count() == 2 ) {
@@ -215,7 +215,7 @@ void AlarmDialog::readLayout()
 
 void AlarmDialog::writeLayout()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Layout" );
   TQValueList<int> list = mSplitter->sizes();
   config->writeEntry( "SplitterSizes", list );
@@ -552,7 +552,7 @@ void AlarmDialog::wakeUp()
 
 void AlarmDialog::slotSave()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   KLockFile::Ptr lock = config->lockFile();
   if ( lock.data()->lock() != KLockFile::LockOK )
     return;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 301f058a8..d5d8dddb9 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -48,7 +48,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
   : KSystemTray( 0, name )
 {
   // Read the autostart status from the config file
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("General");
   bool autostart = config->readBoolEntry( "Autostart", true );
   bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
@@ -110,7 +110,7 @@ void AlarmDockWindow::resizeEvent ( TQResizeEvent * )
 	mPixmapEnabled  = loadSizedIcon( "korgac", width() );
 	mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() );
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
 	setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled );
 }
@@ -137,7 +137,7 @@ void AlarmDockWindow::toggleAlarmsEnabled()
 {
   kdDebug(5890) << "AlarmDockWindow::toggleAlarmsEnabled()" << endl;
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "General" );
 
   bool enabled = !contextMenu()->isItemChecked( mAlarmsEnabledId );
@@ -167,7 +167,7 @@ void AlarmDockWindow::slotDismissAll()
 
 void AlarmDockWindow::enableAutostart( bool enable )
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "General" );
   config->writeEntry( "Autostart", enable );
   config->sync();
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index a2eacaf0d..be9205bea 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -49,7 +49,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
   connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) );
   connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) );
 
-  KConfig c( locate( "config", "korganizerrc" ) );
+  TDEConfig c( locate( "config", "korganizerrc" ) );
   c.setGroup( "Time & Date" );
   TQString tz = c.readEntry( "TimeZoneId" );
   kdDebug(5890) << "TimeZone: " << tz << endl;
@@ -60,7 +60,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
 
   connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) );
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Alarms" );
   int interval = config->readNumEntry( "Interval", 60 );
   kdDebug(5890) << "KOAlarmClient check interval: " << interval << " seconds."
@@ -102,7 +102,7 @@ KOAlarmClient::~KOAlarmClient()
 
 void KOAlarmClient::checkAlarms()
 {
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
 
   cfg->setGroup( "General" );
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
@@ -152,7 +152,7 @@ void KOAlarmClient::slotQuit()
 
 void KOAlarmClient::saveLastCheckTime()
 {
-  KConfigGroup cg( TDEGlobal::config(), "Alarms");
+  TDEConfigGroup cg( TDEGlobal::config(), "Alarms");
   cg.writeEntry( "CalendarsLastChecked", mLastChecked );
   TDEGlobal::config()->sync();
 }
@@ -178,7 +178,7 @@ void KOAlarmClient::forceAlarmCheck()
 
 void KOAlarmClient::dumpDebug()
 {
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
 
   cfg->setGroup( "Alarms" );
   TQDateTime lastChecked = cfg->readDateTimeEntry( "CalendarsLastChecked" );
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 833e6b34f..f3f6493dc 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -41,7 +41,7 @@ int main(int argc,char **argv)
 
   TDEApplication app;
 
-  KConfig c( locate( "config", "korganizerrc" ) );
+  TDEConfig c( locate( "config", "korganizerrc" ) );
   c.setGroup( "Time & Date" );
   TQString tz = c.readEntry( "TimeZoneId" );
   CalendarResources *mCalendar = new CalendarResources( tz );
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index dba9c2c8b..f2ec01f2c 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -177,10 +177,10 @@ void KOrganizer::newMainWindow( const KURL &url )
 
 void KOrganizer::readSettings()
 {
-  // read settings from the KConfig, supplying reasonable
+  // read settings from the TDEConfig, supplying reasonable
   // defaults where none are to be found
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
 
   mActionManager->readSettings();
 
@@ -192,7 +192,7 @@ void KOrganizer::writeSettings()
 {
   kdDebug(5850) << "KOrganizer::writeSettings" << endl;
 
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
 
   mActionManager->writeSettings();
   config->sync();
@@ -266,12 +266,12 @@ KURL KOrganizer::getCurrentURL() const
   return mActionManager->url();
 }
 
-void KOrganizer::saveProperties( KConfig *config )
+void KOrganizer::saveProperties( TDEConfig *config )
 {
   return mActionManager->saveProperties( config );
 }
 
-void KOrganizer::readProperties( KConfig *config )
+void KOrganizer::readProperties( TDEConfig *config )
 {
   return mActionManager->readProperties( config );
 }
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index e43c06a8c..b4c2e9b28 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -104,7 +104,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 
   protected slots:
 
-    /** using the KConfig associated with the kapp variable, read in the
+    /** using the TDEConfig associated with the kapp variable, read in the
      * settings from the config file.
      */
     void readSettings();
@@ -128,8 +128,8 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
     bool queryExit();
 
     /* Session management */
-    void saveProperties( KConfig * );
-    void readProperties( KConfig * );
+    void saveProperties( TDEConfig * );
+    void readProperties( TDEConfig * );
 
   private:
     CalendarView *mCalendarView;  // Main view widget
diff --git a/korganizer/korganizer_configcolors.desktop b/korganizer/korganizer_configcolors.desktop
index ebff5e121..8e40fbcdf 100644
--- a/korganizer/korganizer_configcolors.desktop
+++ b/korganizer/korganizer_configcolors.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=colors
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configdesignerfields.desktop b/korganizer/korganizer_configdesignerfields.desktop
index 0cdc7bc12..b73fd148e 100644
--- a/korganizer/korganizer_configdesignerfields.desktop
+++ b/korganizer/korganizer_configdesignerfields.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=dlgedit
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=korganizer/preferences.html
 
 X-TDE-ModuleType=Library
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index 0207dc5d7..485c0312a 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=fonts
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop
index d03a952b5..b99319934 100644
--- a/korganizer/korganizer_configfreebusy.desktop
+++ b/korganizer/korganizer_configfreebusy.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop
index 46b86663d..25ead864c 100644
--- a/korganizer/korganizer_configgroupautomation.desktop
+++ b/korganizer/korganizer_configgroupautomation.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop
index 01bc0a822..bd270fdc9 100644
--- a/korganizer/korganizer_configgroupscheduling.desktop
+++ b/korganizer/korganizer_configgroupscheduling.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configmain.desktop b/korganizer/korganizer_configmain.desktop
index c452545be..f3e0d58aa 100644
--- a/korganizer/korganizer_configmain.desktop
+++ b/korganizer/korganizer_configmain.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configplugins.desktop b/korganizer/korganizer_configplugins.desktop
index 0fc7d0607..413f61742 100644
--- a/korganizer/korganizer_configplugins.desktop
+++ b/korganizer/korganizer_configplugins.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configtime.desktop b/korganizer/korganizer_configtime.desktop
index 6cb654811..9ab7a478e 100644
--- a/korganizer/korganizer_configtime.desktop
+++ b/korganizer/korganizer_configtime.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=clock
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configviews.desktop b/korganizer/korganizer_configviews.desktop
index eaa32d71e..c651529d1 100644
--- a/korganizer/korganizer_configviews.desktop
+++ b/korganizer/korganizer_configviews.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=viewmag
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index b6fb3a442..f065d5777 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1079,12 +1079,12 @@ void KOTodoView::processDelayedNewPercentage()
   mPercentChangedMap.clear();
 }
 
-void KOTodoView::saveLayout(KConfig *config, const TQString &group) const
+void KOTodoView::saveLayout(TDEConfig *config, const TQString &group) const
 {
   mTodoListView->saveLayout(config,group);
 }
 
-void KOTodoView::restoreLayout(KConfig *config, const TQString &group)
+void KOTodoView::restoreLayout(TDEConfig *config, const TQString &group)
 {
   mTodoListView->restoreLayout(config,group);
 }
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 48777e588..a7728159e 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -132,8 +132,8 @@ class KOTodoView : public KOrg::BaseView
 
     void setDocumentId( const TQString & );
 
-    void saveLayout( KConfig *config, const TQString &group ) const;
-    void restoreLayout( KConfig *config, const TQString &group );
+    void saveLayout( TDEConfig *config, const TQString &group ) const;
+    void restoreLayout( TDEConfig *config, const TQString &group );
     /** Create a popup menu to set categories */
     TQPopupMenu *getCategoryPopupMenu( KOTodoViewItem *todoItem );
     void setIncidenceChanger( IncidenceChangerBase *changer );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 69bf88b66..9a308fcfd 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -80,7 +80,7 @@ KOrg::BaseView *KOViewManager::currentView()
   return mCurrentView;
 }
 
-void KOViewManager::readSettings(KConfig *config)
+void KOViewManager::readSettings(TDEConfig *config)
 {
   config->setGroup("General");
   TQString view = config->readEntry("Current View");
@@ -116,7 +116,7 @@ void KOViewManager::readSettings(KConfig *config)
   }
 }
 
-void KOViewManager::writeSettings(KConfig *config)
+void KOViewManager::writeSettings(TDEConfig *config)
 {
   config->setGroup("General");
 
@@ -361,7 +361,7 @@ void KOViewManager::showAgendaView()
              this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
     parent = mAgendaViewTabs;
 
-    KConfig *config = KOGlobals::self()->config();
+    TDEConfig *config = KOGlobals::self()->config();
     config->setGroup( "Views" );
     mAgendaViewTabIndex = config->readNumEntry( "Agenda View Tab Index", 0 );
   }
@@ -471,7 +471,7 @@ void KOViewManager::showTodoView()
     addView( mTodoView );
     connectTodoView( mTodoView );
 
-    KConfig *config = KOGlobals::self()->config();
+    TDEConfig *config = KOGlobals::self()->config();
     mTodoView->restoreLayout( config, "Todo View" );
   }
 
@@ -550,7 +550,7 @@ TQWidget* KOViewManager::widgetForView( KOrg::BaseView* view ) const
 
 void KOViewManager::currentAgendaViewTabChanged( TQWidget* widget )
 {
-  KConfig *config = KOGlobals::self()->config();
+  TDEConfig *config = KOGlobals::self()->config();
   config->setGroup( "Views" );
   config->writeEntry( "Agenda View Tab Index", mAgendaViewTabs->currentPageIndex() );
 
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index d33e9b32c..fe41d5bbc 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -70,13 +70,13 @@ class KOViewManager : public TQObject
     /** changes the view to be the currently selected view */
     void showView( KOrg::BaseView * );
 
-    void readSettings( KConfig *config );
-    void writeSettings( KConfig *config );
+    void readSettings( TDEConfig *config );
+    void writeSettings( TDEConfig *config );
 
     /** Read which view was shown last from config file */
-    void readCurrentView( KConfig * );
+    void readCurrentView( TDEConfig * );
     /** Write which view is currently shown to config file */
-    void writeCurrentView( KConfig * );
+    void writeCurrentView( TDEConfig * );
 
     KOrg::BaseView *currentView();
 
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 3766e2ffd..6b8746db5 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 af022837e..9ef6068b9 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 54a118523..b580c2feb 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 742c7849d..c65691d3e 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 6c45ff424..b65efde63 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 be0e1ee92..5415d3812 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 eb924c74d..4c43444fb 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 ae4074437..b9dec86a5 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();
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index 23671bd92..dd42e1632 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -81,7 +81,7 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent )
 PreviewDialog::~PreviewDialog()
 {
   if ( mLocalUrl && !mOriginalUrl.isLocalFile() ) {
-    KIO::NetAccess::removeTempFile( mLocalUrl->path() );
+    TDEIO::NetAccess::removeTempFile( mLocalUrl->path() );
     delete mLocalUrl;
   }
 
@@ -94,12 +94,12 @@ bool PreviewDialog::loadCalendar()
   if ( !mOriginalUrl.isLocalFile() ) {
     if ( mLocalUrl ) {
       // loadCalendar already called.. remove old one.
-      KIO::NetAccess::removeTempFile( mLocalUrl->path() );
+      TDEIO::NetAccess::removeTempFile( mLocalUrl->path() );
       delete mLocalUrl;
     }
 
     TQString tmpFile;
-    if ( KIO::NetAccess::download( mOriginalUrl, tmpFile, 0 ) ) {
+    if ( TDEIO::NetAccess::download( mOriginalUrl, tmpFile, 0 ) ) {
       mLocalUrl = new KURL( tmpFile );
     } else {
       mLocalUrl = 0;
@@ -112,7 +112,7 @@ bool PreviewDialog::loadCalendar()
     const bool success = mCalendar->load( mLocalUrl->path() );
 
     if ( !success && !mOriginalUrl.isLocalFile() ) {
-      KIO::NetAccess::removeTempFile( mLocalUrl->path() );
+      TDEIO::NetAccess::removeTempFile( mLocalUrl->path() );
     } else {
       mListView->showAll();
     }
@@ -142,8 +142,8 @@ void PreviewDialog::slotAdd()
 
     finalUrl = KURL( fileName );
 
-    if ( !KIO::NetAccess::copy( mOriginalUrl, finalUrl, this ) && KIO::NetAccess::lastError() ) {
-      KMessageBox::error( this, KIO::NetAccess::lastErrorString() );
+    if ( !TDEIO::NetAccess::copy( mOriginalUrl, finalUrl, this ) && TDEIO::NetAccess::lastError() ) {
+      KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() );
       return;
     }
   }
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index a6d3d3cba..29b925a67 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -41,7 +41,7 @@ using namespace KCal;
 class TQVButtonGroup;
 class TQWidgetStack;
 class CalPrintDialog;
-class KConfig;
+class TDEConfig;
 class TQComboBox;
 class TQLabel;
 
@@ -92,7 +92,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
                 Incidence::List selectedIncidences = Incidence::List(), bool preview = false );
 
     Calendar *calendar() const;
-    KConfig *config() const;
+    TDEConfig *config() const;
 
   protected:
     KOrg::PrintPlugin::List mPrintPlugins;
@@ -100,7 +100,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
   private:
     Calendar *mCalendar;
     TQWidget *mParent;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
     KOrg::CoreHelper *mCoreHelper;
 };
 
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 50436228b..50b533bf6 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -180,7 +180,7 @@ void CalPrintPluginBase::doPrint( KPrinter *printer )
 void CalPrintPluginBase::doLoadConfig()
 {
   if ( mConfig ) {
-    KConfigGroupSaver saver( mConfig, description() );
+    TDEConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
     TQDateTime currDate( TQDate::currentDate() );
     mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date();
@@ -196,7 +196,7 @@ void CalPrintPluginBase::doLoadConfig()
 void CalPrintPluginBase::doSaveConfig()
 {
   if ( mConfig ) {
-    KConfigGroupSaver saver( mConfig, description() );
+    TDEConfigGroupSaver saver( mConfig, description() );
     saveConfig();
     mConfig->writeEntry( "FromDate", TQDateTime( mFromDate ) );
     mConfig->writeEntry( "ToDate", TQDateTime( mToDate ) );
diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp
index 507016b29..0d2748699 100644
--- a/korganizer/stdcalendar.cpp
+++ b/korganizer/stdcalendar.cpp
@@ -51,7 +51,7 @@ StdCalendar::StdCalendar()
 
   KCal::CalendarResourceManager *manager = resourceManager();
   if ( manager->isEmpty() ) {
-    KConfig config( "korganizerrc" );
+    TDEConfig config( "korganizerrc" );
     config.setGroup( "General" );
     TQString fileName = config.readPathEntry( "Active Calendar" );
 
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 3b44dbfe1..8153742fb 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -34,7 +34,7 @@ class TQBoxLayout;
 
 class KOAgenda;
 class KOAgendaItem;
-class KConfig;
+class TDEConfig;
 
 class TimeLabels : public TQScrollView
 {