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

730 files changed, 4105 insertions, 4105 deletions

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index cab78590a..41632adb9 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -197,7 +197,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
     connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
     connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
     connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
+    connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*)));
     connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed()));
 
     // notify the part that this is our internal widget
@@ -308,7 +308,7 @@ Part::~Part()
     delete m_applyFiltersInterceptor;
 }
 
-void Part::readProperties(KConfig* config)
+void Part::readProperties(TDEConfig* config)
 {
     m_backedUpList = false;
     openStandardFeedList();
@@ -317,7 +317,7 @@ void Part::readProperties(KConfig* config)
         m_view->readProperties(config);
 }
 
-void Part::saveProperties(KConfig* config)
+void Part::saveProperties(TDEConfig* config)
 {
     if (m_view)
     {
@@ -619,9 +619,9 @@ void Part::importFile(const KURL& url)
     {
         isRemote = true;
 
-        if (!KIO::NetAccess::download(url, filename, m_view) )
+        if (!TDEIO::NetAccess::download(url, filename, m_view) )
         {
-            KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
+            KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
             return;
         }
     }
@@ -640,7 +640,7 @@ void Part::importFile(const KURL& url)
         KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
 
     if (isRemote)
-        KIO::NetAccess::removeTempFile(filename);
+        TDEIO::NetAccess::removeTempFile(filename);
 }
 
 void Part::exportFile(const KURL& url)
@@ -680,8 +680,8 @@ void Part::exportFile(const KURL& url)
         stream << m_view->feedListToOPML().toString() << "\n";
         tmpfile.close();
 
-        if (!KIO::NetAccess::upload(tmpfile.name(), url, m_view))
-            KMessageBox::error(m_view, KIO::NetAccess::lastErrorString() );
+        if (!TDEIO::NetAccess::upload(tmpfile.name(), url, m_view))
+            KMessageBox::error(m_view, TDEIO::NetAccess::lastErrorString() );
     }
 }
 
@@ -780,10 +780,10 @@ void Part::showKNotifyOptions()
 
 void Part::showOptions()
 {
-    if ( KConfigDialog::showDialog( "settings" ) )
+    if ( TDEConfigDialog::showDialog( "settings" ) )
         return;
 
-    KConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
+    TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() );
 
     connect( dialog, TQT_SIGNAL(settingsChanged()),
              this, TQT_SLOT(slotSettingsChanged()) );
@@ -848,10 +848,10 @@ void Part::initFonts()
     if (Settings::serifFont().isEmpty())
         Settings::setSerifFont(fonts[3]);
 
-    KConfig* conf = Settings::self()->config();
+    TDEConfig* conf = Settings::self()->config();
     conf->setGroup("HTML Settings");
 
-    KConfig konq("konquerorrc", true, false);
+    TDEConfig konq("konquerorrc", true, false);
     konq.setGroup("HTML Settings");
 
     if (!conf->hasKey("MinimumFontSize"))
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 276fb14c0..68062a0ca 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -38,7 +38,7 @@ class TQDomDocument;
 class TQTimer;
 
 class TDEAboutData;
-class KConfig;
+class TDEConfig;
 class KURL;
 
 namespace Akregator
@@ -117,17 +117,17 @@ namespace Akregator
             virtual void addFeed();
 
             /**
-             This method is called when this app is restored.  The KConfig
+             This method is called when this app is restored.  The TDEConfig
              object points to the session management config file that was saved
              with @ref saveProperties
              Calls AkregatorView's saveProperties.
              */
-            virtual void readProperties(KConfig* config);
+            virtual void readProperties(TDEConfig* config);
 
             /** This method is called when it is time for the app to save its
              properties for session management purposes.
              Calls AkregatorView's readProperties. */
-            virtual void saveProperties(KConfig* config);
+            virtual void saveProperties(TDEConfig* config);
 
             /** merges a nested part's GUI into the gui of this part
             @return true iff merging was successful, i.e. the GUI factory was not NULL */
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 605ae738b..e1ed5a1dc 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -328,7 +328,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
     if ( sp2sizes.count() >= m_articleSplitter->sizes().count() )
         m_articleSplitter->setSizes( sp2sizes );
 
-    KConfig *conf = Settings::self()->config();
+    TDEConfig *conf = Settings::self()->config();
     conf->setGroup("General");
     if(!conf->readBoolEntry("Disable Introduction", false))
     {
@@ -1445,7 +1445,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
     }
 }
 
-void View::readProperties(KConfig* config)
+void View::readProperties(TDEConfig* config)
 {
 
     if (!Settings::resetQuickFilterOnNodeChange())
@@ -1474,7 +1474,7 @@ void View::readProperties(KConfig* config)
     }
 }
 
-void View::saveProperties(KConfig* config)
+void View::saveProperties(TDEConfig* config)
 {
     // save filter settings
     config->writeEntry("searchLine", m_searchBar->text());
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 989500084..939b7aa49 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -42,7 +42,7 @@ class TQHBox;
 class TQToolButton;
 class TQListViewItem;
 class KComboBox;
-class KConfig;
+class TDEConfig;
 class KFileItem;
 class KLineEdit;
 class KListView;
@@ -50,7 +50,7 @@ class KListViewItem;
 class KTabWidget;
 class Viewer;
 
-namespace KIO {
+namespace TDEIO {
 
     class Job;
 }
@@ -124,8 +124,8 @@ namespace Akregator {
             void addFeedToGroup(const TQString& url, const TQString& group);
 
             /** session management **/
-            virtual void readProperties(KConfig* config);
-            virtual void saveProperties(KConfig* config);
+            virtual void readProperties(TDEConfig* config);
+            virtual void saveProperties(TDEConfig* config);
 
 	         Frame* currentFrame() const { return m_currentFrame; }
 
@@ -136,7 +136,7 @@ namespace Akregator {
             void setWindowCaption(const TQString&);
             void setStatusBarText(const TQString&);
             void setProgress(int);
-            void signalStarted(KIO::Job*);
+            void signalStarted(TDEIO::Job*);
             void signalCompleted();
             void signalCanceled(const TQString&);
 
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 080d61e7d..27ecd64e8 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -122,7 +122,7 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
 
 }
 
-void Criterion::writeConfig(KConfig* config) const
+void Criterion::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
 
@@ -133,7 +133,7 @@ void Criterion::writeConfig(KConfig* config) const
     config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
 }
 
-void Criterion::readConfig(KConfig* config)
+void Criterion::readConfig(TDEConfig* config)
 {
     m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
     m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
@@ -267,7 +267,7 @@ bool ArticleMatcher::matches( const Article &a ) const
     return true;
 }
 
-void ArticleMatcher::writeConfig(KConfig* config) const
+void ArticleMatcher::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
     
@@ -283,7 +283,7 @@ void ArticleMatcher::writeConfig(KConfig* config) const
     }
 }
 
-void ArticleMatcher::readConfig(KConfig* config)
+void ArticleMatcher::readConfig(TDEConfig* config)
 {
     m_criteria.clear();
     m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
@@ -406,13 +406,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
     *this = other;
 }
 
-void TagMatcher::writeConfig(KConfig* config) const
+void TagMatcher::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
     config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
 }
 
-void TagMatcher::readConfig(KConfig* config)
+void TagMatcher::readConfig(TDEConfig* config)
 {
     d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
 }
@@ -462,13 +462,13 @@ void SetStatusAction::setStatus(int status)
     m_status = status;
 }
 
-void SetStatusAction::writeConfig(KConfig* config) const
+void SetStatusAction::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
     config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
 }
 
-void SetStatusAction::readConfig(KConfig* config)
+void SetStatusAction::readConfig(TDEConfig* config)
 {
     m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
 }
@@ -579,7 +579,7 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
     return *(d->matcher) == *(other.d->matcher) && *(d->action) == *(other.d->action) && d->name == other.d->name;
 }
 
-void ArticleFilterList::writeConfig(KConfig* config) const
+void ArticleFilterList::writeConfig(TDEConfig* config) const
 {
     config->setGroup(TQString::fromLatin1("Filters"));
     config->writeEntry(TQString::fromLatin1("count"), count());
@@ -592,7 +592,7 @@ void ArticleFilterList::writeConfig(KConfig* config) const
     }
 }
 
-void ArticleFilterList::readConfig(KConfig* config)
+void ArticleFilterList::readConfig(TDEConfig* config)
 {
     clear();
     config->setGroup(TQString::fromLatin1("Filters"));
@@ -607,12 +607,12 @@ void ArticleFilterList::readConfig(KConfig* config)
 }
 
 
-void AssignTagAction::readConfig(KConfig* config)
+void AssignTagAction::readConfig(TDEConfig* config)
 {
     m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
 }
 
-void AssignTagAction::writeConfig(KConfig* config) const
+void AssignTagAction::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
     config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
@@ -638,11 +638,11 @@ void AssignTagAction::setTagID(const TQString& tagID)
     m_tagID = tagID;
 }
 
-void DeleteAction::readConfig(KConfig* /*config*/)
+void DeleteAction::readConfig(TDEConfig* /*config*/)
 {
 }
 
-void DeleteAction::writeConfig(KConfig* config) const
+void DeleteAction::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
 }
@@ -654,7 +654,7 @@ bool DeleteAction::operator==(const AbstractAction& other)
     return o != 0;
 }
 
-void ArticleFilter::readConfig(KConfig* config)
+void ArticleFilter::readConfig(TDEConfig* config)
 {
     delete d->matcher;
     d->matcher = 0;
@@ -688,7 +688,7 @@ void ArticleFilter::readConfig(KConfig* config)
         d->action->readConfig(config);
 }
 
-void ArticleFilter::writeConfig(KConfig* config) const
+void ArticleFilter::writeConfig(TDEConfig* config) const
 {
     config->writeEntry(TQString::fromLatin1("name"), d->name);
     config->writeEntry(TQString::fromLatin1("id"), d->id);
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index d0bd00e71..5f1e7af37 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 #include <tqvariant.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace Akregator {
 
@@ -77,8 +77,8 @@ class ArticleFilter
         ArticleFilter& operator=(const ArticleFilter& other);
         bool operator==(const ArticleFilter& other) const;
 
-        void writeConfig(KConfig* config) const;
-        void readConfig(KConfig* config);
+        void writeConfig(TDEConfig* config) const;
+        void readConfig(TDEConfig* config);
 
     private:
         class ArticleFilterPrivate;
@@ -90,8 +90,8 @@ class ArticleFilterList : public TQValueList<ArticleFilter>
 {
 public:
     
-    void writeConfig(KConfig* config) const;
-    void readConfig(KConfig* config);
+    void writeConfig(TDEConfig* config) const;
+    void readConfig(TDEConfig* config);
 };
 
 /** Abstract base class for matchers, a matcher just takes an article and checks whether the article matches some criterion or not. 
@@ -107,8 +107,8 @@ class AbstractMatcher
 
         virtual bool matches(const Article& article) const = 0;
 
-        virtual void writeConfig(KConfig* config) const = 0;
-        virtual void readConfig(KConfig* config) = 0;
+        virtual void writeConfig(TDEConfig* config) const = 0;
+        virtual void readConfig(TDEConfig* config) = 0;
 
         virtual bool operator==(const AbstractMatcher&) const = 0;
         virtual bool operator!=(const AbstractMatcher &other) const = 0;
@@ -129,8 +129,8 @@ class TagMatcher : public AbstractMatcher
 
         virtual TagMatcher* clone() const;
 
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
         TagMatcher& operator=(const TagMatcher& other);
         virtual bool operator==(const AbstractMatcher&) const;
@@ -147,8 +147,8 @@ class AbstractAction
     public:
         virtual void exec(Article& article) = 0;
 
-        virtual void writeConfig(KConfig* config) const = 0;
-        virtual void readConfig(KConfig* config) = 0;
+        virtual void writeConfig(TDEConfig* config) const = 0;
+        virtual void readConfig(TDEConfig* config) = 0;
 
         virtual AbstractAction* clone() const = 0;
         virtual bool operator==(const AbstractAction& other) = 0;
@@ -159,8 +159,8 @@ class DeleteAction : public AbstractAction
     public:
         virtual void exec(Article& article);
         
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
         virtual DeleteAction* clone() const { return new DeleteAction; }
         virtual bool operator==(const AbstractAction& other);
@@ -176,8 +176,8 @@ class SetStatusAction : public AbstractAction
         int status() const;
         void setStatus(int status);
 
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
         virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
         virtual bool operator==(const AbstractAction& other);
@@ -196,8 +196,8 @@ class AssignTagAction : public AbstractAction
         const TQString& tagID() const;
         void setTagID(const TQString& tagID);
 
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
         virtual AssignTagAction* clone() const { return new AssignTagAction(*this); }
         virtual bool operator==(const AbstractAction& other);
@@ -236,8 +236,8 @@ class ArticleMatcher : public AbstractMatcher
         virtual bool operator!=(const AbstractMatcher &other) const;
         
         
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
     private:
 
@@ -280,8 +280,8 @@ class Criterion
         
         bool satisfiedBy( const Article &article ) const;
 
-        virtual void writeConfig(KConfig* config) const;
-        virtual void readConfig(KConfig* config);
+        virtual void writeConfig(TDEConfig* config) const;
+        virtual void readConfig(TDEConfig* config);
 
         Subject subject() const;
         Predicate predicate() const;
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index b9dee41a2..32d931f86 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -484,7 +484,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         //TQString url = article.enclosure().url();
         //TQString type = article.enclosure().type();
         //int length = article.enclosure().length();
-        //TQString lengthStr = KIO::convertSize(length);
+        //TQString lengthStr = TDEIO::convertSize(length);
 
         //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
     }
@@ -744,7 +744,7 @@ void ArticleViewer::urlSelected(const TQString &url, int button, int state, cons
 {
     if(url == "config:/disable_introduction") {
         if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), i18n("Disable"), i18n("Keep Enabled") ) == KMessageBox::Yes) {
-            KConfig *conf = Settings::self()->config();
+            TDEConfig *conf = Settings::self()->config();
             conf->setGroup("General");
             conf->writeEntry("Disable Introduction", "true");
         }
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index 4c3d43506..b88272b4c 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -41,7 +41,7 @@
 namespace Akregator
 {
 
-ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : KConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
+ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, TDEConfigSkeleton* config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal) : TDEConfigDialog(parent, name, config, dialogType, dialogButtons, defaultButton, modal)
 {
     addPage(new SettingsGeneral(this, "General"), i18n("General"), "package_settings");
     addPage(new SettingsArchive(this, "Archive"), i18n("Archive"), "package_settings");
@@ -57,7 +57,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, const char* name, KConfigSkeleton*
 void ConfigDialog::updateSettings()
 {
     Settings::setArchiveBackend(m_settingsAdvanced->selectedFactory());
-    KConfigDialog::updateSettings();
+    TDEConfigDialog::updateSettings();
 }
         
 void ConfigDialog::updateWidgets()
@@ -67,7 +67,7 @@ void ConfigDialog::updateWidgets()
     m_settingsAppearance->slider_mediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
     m_settingsAppearance->lbl_MinimumFontSize->setDisabled(m_config->isImmutable("MinimumFontSize"));
     m_settingsAppearance->lbl_MediumFontSize->setDisabled(m_config->isImmutable("MediumFontSize"));
-    KConfigDialog::updateWidgets();
+    TDEConfigDialog::updateWidgets();
 }
         
 ConfigDialog::~ConfigDialog() {}
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index a2842c3f5..db2161cb8 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -32,13 +32,13 @@ namespace Akregator {
 class SettingsAdvanced;
 class SettingsAppearance;
 
-class ConfigDialog : public KConfigDialog
+class ConfigDialog : public TDEConfigDialog
 {
     Q_OBJECT
   
     public:
     
-        ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
+        ConfigDialog(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
         
         virtual ~ConfigDialog();
 
@@ -49,7 +49,7 @@ class ConfigDialog : public KConfigDialog
         virtual void updateWidgets();
 
     private:
-        KConfigSkeleton* m_config;
+        TDEConfigSkeleton* m_config;
         SettingsAdvanced* m_settingsAdvanced;
         SettingsAppearance* m_settingsAppearance;
         
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index baa472fd2..14b325220 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -57,7 +57,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
         if (ext)
             connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) );
 
-        connect(p, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(setStarted()));
+        connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted()));
         connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted()));
         connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&)));
         connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted()));
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index cb8d7c86b..4dff98227 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -32,7 +32,7 @@ struct Image::Private : public Shared
 	unsigned int height;
 	unsigned int width;
 	TQBuffer *pixmapBuffer;
-	KIO::Job *job;
+	TDEIO::Job *job;
 };
 
 Image::Image() : TQObject(), d(new Private)
@@ -111,18 +111,18 @@ void Image::getPixmap()
 	d->pixmapBuffer = new TQBuffer;
 	d->pixmapBuffer->open(IO_WriteOnly);
 
-	d->job = KIO::get(d->url, false, false);
-	connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-	connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
+	d->job = TDEIO::get(d->url, false, false);
+	connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
 }
 
-void Image::slotData(KIO::Job *, const TQByteArray &data)
+void Image::slotData(TDEIO::Job *, const TQByteArray &data)
 {
 	d->pixmapBuffer->writeBlock(data.data(), data.size());
 }
 
-void Image::slotResult(KIO::Job *job)
+void Image::slotResult(TDEIO::Job *job)
 {
 	TQPixmap pixmap;
 	if (!job->error())
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 350253b48..ab0cf6879 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -17,7 +17,7 @@
 
 class TQDomNode;
 
-namespace KIO
+namespace TDEIO
 {
    class Job;
 }
@@ -161,8 +161,8 @@ namespace RSS
          void gotPixmap(const TQPixmap &pixmap);
 
       private slots:
-         void slotData(KIO::Job *job, const TQByteArray &data);
-         void slotResult(KIO::Job *job);
+         void slotData(TDEIO::Job *job, const TQByteArray &data);
+         void slotResult(TDEIO::Job *job);
 
       private:
          struct Private;
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 95f75e60d..12036ec97 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -52,7 +52,7 @@ class FileRetriever::Private
 
    TQBuffer *buffer;
    int lastError;
-   KIO::Job *job;
+   TDEIO::Job *job;
    static KStaticDeleter<TQString> userAgentsd;
    static TQString* userAgent;
 };
@@ -103,7 +103,7 @@ void FileRetriever::retrieveData(const KURL &url)
    if (u.protocol()=="feed")
        u.setProtocol("http");
 
-   d->job = KIO::get(u, false, false);
+   d->job = TDEIO::get(u, false, false);
    d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");
 
    TQString ua = userAgent();
@@ -113,11 +113,11 @@ void FileRetriever::retrieveData(const KURL &url)
 
    TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
 
-   connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-                TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-   connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
-   connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
-                TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
+   connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+   connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+   connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+                TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 void FileRetriever::slotTimeout()
@@ -127,7 +127,7 @@ void FileRetriever::slotTimeout()
     delete d->buffer;
     d->buffer = NULL;
 
-    d->lastError = KIO::ERR_SERVER_TIMEOUT;
+    d->lastError = TDEIO::ERR_SERVER_TIMEOUT;
 
     emit dataRetrieved(TQByteArray(), false);
 }
@@ -137,12 +137,12 @@ int FileRetriever::errorCode() const
    return d->lastError;
 }
 
-void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
+void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
 {
    d->buffer->writeBlock(data.data(), data.size());
 }
 
-void FileRetriever::slotResult(KIO::Job *job)
+void FileRetriever::slotResult(TDEIO::Job *job)
 {
    TQByteArray data = d->buffer->buffer();
    data.detach();
@@ -154,7 +154,7 @@ void FileRetriever::slotResult(KIO::Job *job)
    emit dataRetrieved(data, d->lastError == 0);
 }
 
-void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
+void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
 {
    emit permanentRedirection(newUrl);
 }
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 0f463d773..a0c9f29dc 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -17,7 +17,7 @@ class KURL;
 
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -139,9 +139,9 @@ namespace RSS
             void slotTimeout();
 
 		private slots:
-			void slotData(KIO::Job *job, const TQByteArray &data);
-			void slotResult(KIO::Job *job);
-			void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
+			void slotData(TDEIO::Job *job, const TQByteArray &data);
+			void slotResult(TDEIO::Job *job);
+			void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
 			                                             const KURL &toUrl);
 
 		private:
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 275a7a916..3e5208429 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -163,7 +163,7 @@ void MainWindow::setupActions()
     KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void MainWindow::saveProperties(KConfig* config)
+void MainWindow::saveProperties(TDEConfig* config)
 {
     if (!m_part)
         loadPart();
@@ -174,7 +174,7 @@ void MainWindow::saveProperties(KConfig* config)
     //delete m_part;
 }
 
-void MainWindow::readProperties(KConfig* config)
+void MainWindow::readProperties(TDEConfig* config)
 {
     if (!m_part)
         loadPart();
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index c076cb330..c7321dbd3 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -102,14 +102,14 @@ protected:
      * This method is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This method is called when this app is restored.  The KConfig
+     * This method is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
     /** 
      *  Reimplemented to save settings
      */
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 4baef48cb..0506906b3 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -144,7 +144,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
     connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)),
             this, TQT_SLOT(slotSetCaption (const TQString &)) );
 
-    connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
+    connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
     connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
     connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
 
@@ -337,7 +337,7 @@ void PageViewer::addHistoryEntry(const KURL& url)
 }
 
 // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
-void PageViewer::slotStarted( KIO::Job * )
+void PageViewer::slotStarted( TDEIO::Job * )
 {
     d->stopAction->setEnabled(true);
 }
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index 352a5914e..8b4b59e40 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -63,7 +63,7 @@ namespace Akregator
 
             virtual void slotPaletteOrFontChanged();
 
-            void slotStarted(KIO::Job *);
+            void slotStarted(TDEIO::Job *);
             void slotCompleted();
             void slotCancelled(const TQString &errMsg);
             void slotBackAboutToShow();
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 153fb8aec..fa62e128f 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -57,8 +57,8 @@ Viewer::Viewer(TQWidget *parent, const char *name)
     setStatusMessagesEnabled(true);
 
     // change the cursor when loading stuff...
-    connect( this, TQT_SIGNAL(started(KIO::Job *)),
-             this, TQT_SLOT(slotStarted(KIO::Job *)));
+    connect( this, TQT_SIGNAL(started(TDEIO::Job *)),
+             this, TQT_SLOT(slotStarted(TDEIO::Job *)));
     connect( this, TQT_SIGNAL(completed()),
              this, TQT_SLOT(slotCompleted()));
 
@@ -256,7 +256,7 @@ void Viewer::slotSaveLinkAs()
     KParts::BrowserRun::simpleSave(tmp, tmp.fileName());
 }
 
-void Viewer::slotStarted(KIO::Job *)
+void Viewer::slotStarted(TDEIO::Job *)
 {
    widget()->setCursor( waitCursor );
 }
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index 41a2250e9..e7e0722db 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -29,7 +29,7 @@
 
 class KURL;
 
-namespace KIO
+namespace TDEIO
 {
     class MetaData;
 }
@@ -107,7 +107,7 @@ namespace Akregator
             virtual void slotSaveLinkAs();
 
             /** This changes cursor to wait cursor */
-            void slotStarted(KIO::Job *);
+            void slotStarted(TDEIO::Job *);
 
             /** This reverts cursor back to normal one */
             void slotCompleted();
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 789f24b06..364c5cd05 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* nam
     connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
              this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
 
-    const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+    const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
     caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
 
     connect( this, TQT_SIGNAL( helpClicked() ),
@@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage()
   TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1,
 				       KDialog::marginHint(), KDialog::spacingHint() );
 
-  KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
+  TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
   TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" );
   if ( attrOrder.empty() )
     attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!";
@@ -477,7 +477,7 @@ void CertificateWizardImpl::accept()
     // Save in file/URL
     KURL url = saveFileUrl();
     bool overwrite = false;
-    if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) {
+    if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) {
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
                                                                      this,
                                                                      i18n( "A file named \"%1\" already exists. "
@@ -488,10 +488,10 @@ void CertificateWizardImpl::accept()
       overwrite = true;
     }
 
-    KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
+    TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
     uploadJob->setWindow( this );
-    connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-             this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+    connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
     // Can't press finish again during the upload
     setFinishEnabled( finishPage, false );
   }
@@ -501,7 +501,7 @@ void CertificateWizardImpl::accept()
    This slot is invoked by the KIO job used in newCertificate
    to save/upload the certificate, when finished (success or error).
 */
-void CertificateWizardImpl::slotUploadResult( KIO::Job* job )
+void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index b22562978..9ac52f7a7 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -42,7 +42,7 @@
 namespace GpgME {
   class KeyGenerationResult;
 }
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -75,7 +75,7 @@ private slots:
 
     void slotHelpClicked();
 
-    void slotUploadResult( KIO::Job* );
+    void slotUploadResult( TDEIO::Job* );
 
 private:
     void createPersonalDataPage();
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 66f53fe19..7c86e8b24 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -218,7 +218,7 @@ CertManager::~CertManager() {
 }
 
 void CertManager::readConfig( bool noQueryGiven ) {
-  KConfig config( "kleopatrarc" );
+  TDEConfig config( "kleopatrarc" );
   config.setGroup( "Display Options" );
   mHierarchicalView = config.readBoolEntry( "hierarchicalView", false );
   if ( noQueryGiven ) {
@@ -227,7 +227,7 @@ void CertManager::readConfig( bool noQueryGiven ) {
 }
 
 void CertManager::writeConfig() {
-  KConfig config( "kleopatrarc" );
+  TDEConfig config( "kleopatrarc" );
   config.setGroup( "Display Options" );
   config.writeEntry( "hierarchicalView", mKeyListView->hierarchical() );
   config.writeEntry( "startInRemoteMode", mNextFindRemote );
@@ -685,10 +685,10 @@ void CertManager::slotImportCertFromFile( const KURL & certURL )
   // Download the cert
   KIOext::StoredTransferJob* importJob = KIOext::storedGet( certURL );
   importJob->setWindow( this );
-  connect( importJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotImportResult(KIO::Job*)) );
+  connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) );
 }
 
-void CertManager::slotImportResult( KIO::Job* job )
+void CertManager::slotImportResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
@@ -904,17 +904,17 @@ void CertManager::importCRLFromFile() {
       KTempFile tempFile;
       KURL destURL;
       destURL.setPath( tempFile.name() );
-      KIO::Job* copyJob = KIO::file_copy( url, destURL, 0600, true, false );
+      TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false );
       copyJob->setWindow( this );
-      connect( copyJob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotImportCRLJobFinished( KIO::Job * ) ) );
+      connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) );
     }
   }
 }
 
-void CertManager::slotImportCRLJobFinished( KIO::Job *job )
+void CertManager::slotImportCRLJobFinished( TDEIO::Job *job )
 {
-  KIO::FileCopyJob* fcjob = static_cast<KIO::FileCopyJob*>( job );
+  TDEIO::FileCopyJob* fcjob = static_cast<TDEIO::FileCopyJob*>( job );
   TQString tempFilePath = fcjob->destURL().path();
   if ( job->error() ) {
     job->showErrorDialog();
@@ -1234,7 +1234,7 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) {
 // return true if we should proceed, false if we should abort
 static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
 {
-  if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
+  if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
     if ( KMessageBox::Cancel ==
          KMessageBox::warningContinueCancel(
                                             w,
@@ -1269,10 +1269,10 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
   if ( !checkOverwrite( url, overwrite, this ) )
     return;
 
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( this );
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
 }
 
 
@@ -1388,13 +1388,13 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB
   if ( !checkOverwrite( url, overwrite, this ) )
     return;
 
-  KIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job* uploadJob = KIOext::put( data, url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( this );
-  connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) );
+  connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
 }
 
-void CertManager::slotUploadResult( KIO::Job* job )
+void CertManager::slotUploadResult( TDEIO::Job* job )
 {
   if ( job->error() )
     job->showErrorDialog();
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 835f408c5..2ecc5e9d6 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -51,7 +51,7 @@ namespace Kleo {
   class Job;
 }
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 class TDEProcess;
@@ -99,11 +99,11 @@ private slots:
     void slotDeleteCertificate();
     void slotExportSecretKey();
     void slotExportCertificate();
-    void slotUploadResult( KIO::Job* job );
+    void slotUploadResult( TDEIO::Job* job );
 
     void slotImportCertFromFile();
     void slotImportCertFromFile( const KURL & filename );
-    void slotImportResult( KIO::Job* );
+    void slotImportResult( TDEIO::Job* );
 
     void slotCertificateImportResult( const GpgME::ImportResult & result );
     void slotCertificateDownloadResult( const GpgME::Error & error, const TQByteArray & keyData );
@@ -115,7 +115,7 @@ private slots:
 
     void importCRLFromFile();
     void importCRLFromLDAP();
-    void slotImportCRLJobFinished( KIO::Job * );
+    void slotImportCRLJobFinished( TDEIO::Job * );
 
     void slotDirmngrExited();
     void slotStderr( TDEProcess*, char*, int );
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74a..53030bbd7 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -39,7 +39,7 @@
 #include <tdepimmacros.h>
 
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+    : TDECModule( parent, name )
 {
   TQVBoxLayout* lay = new TQVBoxLayout( this );
   mWidget = new Kleo::AppearanceConfigWidget( this );
@@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * )
   {
     AppearanceConfigurationPage *page =
       new AppearanceConfigurationPage( parent, "kleopatra_config_appear" );
@@ -78,7 +78,7 @@ extern "C"
   }
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void AppearanceConfigurationPage::slotChanged()
 {
   emit changed(true);
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 89c56cfcb..9425e1e68 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
 /**
  * "Appearance" configuration page for kleopatra's configuration dialog
  */
-class AppearanceConfigurationPage : public KCModule {
+class AppearanceConfigurationPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 57a767419..96c0bfffc 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -66,7 +66,7 @@ using namespace Kleo;
 class CategoryListViewItem : public TQListViewItem
 {
 public:
-  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const KConfigBase& config )
+  CategoryListViewItem( TQListView* lv, TQListViewItem* prev, const TDEConfigBase& config )
     : TQListViewItem( lv, prev ) {
 
     setName( config.readEntry( "Name", i18n("<unnamed>") ) );
@@ -85,7 +85,7 @@ public:
     mDirty = false;
   }
 
-  void save( KConfigBase& config ) {
+  void save( TDEConfigBase& config ) {
     config.writeEntry( "Name", text( 0 ) );
     config.writeEntry( "foreground-color", mForegroundColor );
     config.writeEntry( "background-color", mBackgroundColor );
@@ -235,19 +235,19 @@ void AppearanceConfigWidget::slotDefaultClicked()
 void AppearanceConfigWidget::load()
 {
   categoriesLV->clear();
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-    KConfigGroup cfg( config, *it );
+    TDEConfigGroup cfg( config, *it );
     (void) new CategoryListViewItem( categoriesLV, categoriesLV->lastItem(), cfg );
   }
 }
 
 void AppearanceConfigWidget::save()
 {
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   // We know (assume) that the groups in the config object haven't changed,
@@ -263,7 +263,7 @@ void AppearanceConfigWidget::save()
   TQListViewItemIterator lvit( categoriesLV );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() && lvit.current(); ++it, ++lvit ) {
     CategoryListViewItem* item = static_cast<CategoryListViewItem*>(lvit.current() );
-    KConfigGroup cfg( config, *it );
+    TDEConfigGroup cfg( config, *it );
     item->save( cfg );
   }
   config->sync();
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 3840df131..f6ca9c8e6 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -36,7 +36,7 @@
 
 #include "appearanceconfigwidgetbase.h"
 #include <tqstringlist.h>
-class KConfig;
+class TDEConfig;
 
 namespace Kleo {
 
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 57ed0ee41..fde9df9db 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,7 +52,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  const KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+  const TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
   const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
   const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
@@ -62,7 +62,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
-  KConfigGroup geometry( TDEGlobal::config(), "Geometry" );
+  TDEConfigGroup geometry( TDEGlobal::config(), "Geometry" );
   geometry.writeEntry( "ConfigureDialogWidth", width() );
   geometry.writeEntry( "ConfigureDialogHeight",height() );
 }
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 9d82d86e7..40ab0998d 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -116,7 +116,7 @@ public:
   }
 
 private:
-  KConfig mConfig;
+  TDEConfig mConfig;
 };
 
 #endif
@@ -138,7 +138,7 @@ static const char s_addnewservers_groupName[] = "LDAP";
 static const char s_addnewservers_entryName[] = "add-servers";
 
 DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget * parent, const char * name )
-    : KCModule( parent, name )
+    : TDECModule( parent, name )
 {
   mConfig = Kleo::CryptoBackendFactory::instance()->config();
   TQVBoxLayout* lay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * )
   {
     DirectoryServicesConfigurationPage *page =
       new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" );
@@ -267,7 +267,7 @@ extern "C"
   }
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void DirectoryServicesConfigurationPage::slotChanged()
 {
   emit changed(true);
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index c5ebcad1d..536cf76ef 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -50,7 +50,7 @@ namespace Kleo {
  * The user can configure LDAP servers in this page, to be used for listing/fetching
  * remote certificates in kleopatra.
  */
-class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
+class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7a..a802a06fe 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -39,7 +39,7 @@
 #include <tqlayout.h>
 
 DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout * vlay = new TQVBoxLayout( this );
   mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
@@ -65,12 +65,12 @@ void DNOrderConfigPage::defaults() {
   mWidget->defaults();
 }
 
-// tdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in TDECModule...
 void DNOrderConfigPage::slotChanged() {
   emit changed(true);
 }
 
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
+extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) {
     return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" );
 }
 
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index b053c5cb0..b183b1f21 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -41,7 +41,7 @@ namespace Kleo {
 /**
  * "DN Order" configuration page for kleopatra's configuration dialog
  */
-class DNOrderConfigPage : public KCModule {
+class DNOrderConfigPage : public TDECModule {
   Q_OBJECT
   
 public:
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index 1fb2cc719..b0ee2ac70 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration-appearance.html
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index f645cffb5..33e65a7a7 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration.html#configuration-directory-services
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index beec7945d..f77761ac4 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kleopatra/configuration-dn-order.html
 
 X-TDE-ModuleType=Library
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 5a49f134d..200175b2d 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
 
 void KWatchGnuPGConfig::loadConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
   mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
 
 void KWatchGnuPGConfig::saveConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   config->writeEntry( "Executable", mExeED->url() );
   config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 242643196..9bcd0b390 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -138,7 +138,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   *mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
   *mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
   if ( !cconfig )
     return;
   //Q_ASSERT( cconfig );
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("WatchGnuPG");
   TQStringList comps = cconfig->componentList();
   for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
 
 void KWatchGnuPGMainWindow::slotReadConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("LogWindow");
   mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
 							   ?TQTextEdit::WidgetWidth
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index b3e751400..da875e303 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -197,13 +197,13 @@ namespace {
 
     TQVariant value() const { return mValue; }
 
-    void sync( KConfigBase * config ) {
+    void sync( TDEConfigBase * config ) {
       if ( !mDirty )
         return;
       mDirty = false;
       config->writeEntry( kleo_chiasmus_config_entries[mIdx].name, mValue );
     }
-    void read( const KConfigBase * config ) {
+    void read( const TDEConfigBase * config ) {
       mDirty = false;
       mValue = config->readPropertyEntry( kleo_chiasmus_config_entries[mIdx].name, defaultValue() );
     }
@@ -254,7 +254,7 @@ namespace {
 
   class ChiasmusGeneralGroup : public Kleo::CryptoConfigGroup {
     mutable std::map<TQString,ChiasmusConfigEntry*> mCache;
-    mutable KConfig * mConfigObject;
+    mutable TDEConfig * mConfigObject;
   public:
     ChiasmusGeneralGroup() : Kleo::CryptoConfigGroup(), mConfigObject( 0 ) {}
     ~ChiasmusGeneralGroup() { clear(); delete mConfigObject; }
@@ -271,7 +271,7 @@ namespace {
     Kleo::CryptoConfigEntry * entry( const TQString & name ) const {
       if ( ChiasmusConfigEntry * entry = mCache[name] )
         return entry;
-      const KConfigGroup group( configObject(), "Chiasmus" );
+      const TDEConfigGroup group( configObject(), "Chiasmus" );
       for ( unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i )
         if ( name == kleo_chiasmus_config_entries[i].name ) {
           ChiasmusConfigEntry * entry = new ChiasmusConfigEntry( i );
@@ -282,17 +282,17 @@ namespace {
     }
 
     void sync() {
-      KConfigGroup group( configObject(), "Chiasmus" );
+      TDEConfigGroup group( configObject(), "Chiasmus" );
       for ( std::map<TQString,ChiasmusConfigEntry*>::const_iterator it = mCache.begin(), end = mCache.end() ; it != end ; ++it )
         it->second->sync( &group );
       group.sync();
       clear();
     }
   private:
-    KConfig * configObject() const {
+    TDEConfig * configObject() const {
       if ( !mConfigObject )
         // this is unsafe. We're a lib, used by concurrent apps.
-        mConfigObject = new KConfig( "chiasmusbackendrc" );
+        mConfigObject = new TDEConfig( "chiasmusbackendrc" );
       return mConfigObject;
     }
     void clear() {
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 6f07c954b..f997e9309 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -133,7 +133,7 @@ public:
     _unknownAttrsHandling = unknownAttrsInfix;
     _unknownAttrsHandlingChar = "INFIX";
   }
-  DNBeautifier( KConfig* config,
+  DNBeautifier( TDEConfig* config,
                 const TQString& cfgGroup,
                 const TQString& cfgAttributeOrderEntry,
                 const TQString& cfgUnknownAttrsEntry,
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index bf1976700..39fd680a4 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -57,7 +57,7 @@
 #include <tdepimmacros.h>
 
 
-class KConfigBase;
+class TDEConfigBase;
 class QGpgMECryptoConfig;
 
 namespace GpgME {
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 295c05c60..f67343ca8 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -178,10 +178,10 @@ Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget *
   return new Kleo::BackendConfigWidget( mSelf, parent, name );
 }
 
-KConfig* Kleo::CryptoBackendFactory::configObject() const {
+TDEConfig* Kleo::CryptoBackendFactory::configObject() const {
   if ( !mConfigObject )
     // this is unsafe. We're a lib, used by concurrent apps.
-    mConfigObject = new KConfig( "libkleopatrarc" );
+    mConfigObject = new TDEConfig( "libkleopatrarc" );
   return mConfigObject;
 }
 
@@ -195,7 +195,7 @@ void Kleo::CryptoBackendFactory::setOpenPGPBackend( const CryptoBackend* backend
 
 void Kleo::CryptoBackendFactory::setProtocolBackend( const char * protocol, const CryptoBackend * backend ) {
   const TQString name = backend ? backend->name() : TQString() ;
-  KConfigGroup group( configObject(), "Backends" );
+  TDEConfigGroup group( configObject(), "Backends" );
   group.writeEntry( protocol, name );
   configObject()->sync();
   mBackends[protocol] = backend;
@@ -218,7 +218,7 @@ static const char * defaultBackend( const char * proto ) {
 
 void Kleo::CryptoBackendFactory::readConfig() {
   mBackends.clear();
-  const KConfigGroup group( configObject(), "Backends" );
+  const TDEConfigGroup group( configObject(), "Backends" );
   for ( ProtocolSet::const_iterator it = mAvailableProtocols.begin(), end = mAvailableProtocols.end() ; it != end ; ++it ) {
     const TQString backend = group.readEntry( *it, defaultBackend( *it ) );
     mBackends[*it] = backendByName( backend );
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index da1743f95..09012da3d 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -46,7 +46,7 @@ namespace Kleo {
 }
 
 class TQString;
-class KConfig;
+class TDEConfig;
 
 namespace Kleo {
 
@@ -76,7 +76,7 @@ namespace Kleo {
 
     Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const;
 
-    KConfig* configObject() const;
+    TDEConfig* configObject() const;
 
     // The preferred backend for smime (can be 0) - currently unused
     //const CryptoBackend* smimeBackend() const;
@@ -97,7 +97,7 @@ namespace Kleo {
 
   protected:
     std::vector<CryptoBackend*> mBackendList;
-    mutable KConfig* mConfigObject;
+    mutable TDEConfig* mConfigObject;
     typedef std::map<const char *, const CryptoBackend*, lt_i_str> BackendMap;
     BackendMap mBackends;
     typedef std::vector<const char *> ProtocolSet;
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 774302ba7..3249cc73b 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
 
 Kleo::DNAttributeMapper::DNAttributeMapper() {
   d = new Private();
-  const KConfigGroup config( kapp->config(), "DN" );
+  const TDEConfigGroup config( kapp->config(), "DN" );
   d->attributeOrder = config.readListEntry( "AttributeOrder" );
   if ( d->attributeOrder.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
   if ( order.empty() )
     std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
 	       std::back_inserter( d->attributeOrder ) );
-  KConfigGroup config( kapp->config(), "DN" );
+  TDEConfigGroup config( kapp->config(), "DN" );
   config.writeEntry( "AttributeOrder", order );
 }
 
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
index 47e1548ee..4ed6ab37d 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
@@ -67,7 +67,7 @@ static GpgME::UserID::Validity map2Validity( const TQString & s ) {
 }
 
 
-Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
+Kleo::TDEConfigBasedKeyFilter::TDEConfigBasedKeyFilter( const TDEConfigBase & config )
   : KeyFilter(),
     mSpecificity( 0 ),
     mItalic( false ),
@@ -151,11 +151,11 @@ Kleo::KConfigBasedKeyFilter::KConfigBasedKeyFilter( const KConfigBase & config )
   }
 }
 
-Kleo::KConfigBasedKeyFilter::~KConfigBasedKeyFilter() {
+Kleo::TDEConfigBasedKeyFilter::~TDEConfigBasedKeyFilter() {
 
 }
 
-bool Kleo::KConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
+bool Kleo::TDEConfigBasedKeyFilter::matches( const GpgME::Key & key ) const {
 #ifdef MATCH
 #undef MATCH
 #endif
@@ -243,7 +243,7 @@ static inline TQFont adapt( TQFont font, bool it, bool b, bool strike ) {
   return font;
 }
 
-TQFont Kleo::KConfigBasedKeyFilter::font( const TQFont & f ) const {
+TQFont Kleo::TDEConfigBasedKeyFilter::font( const TQFont & f ) const {
   if ( mUseFullFont )
     return resizedFont( mFont, f.pointSize(), mStrikeOut );
   else
diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
index 98050cc6b..487b3791a 100644
--- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h
+++ b/certmanager/lib/kleo/kconfigbasedkeyfilter.h
@@ -41,14 +41,14 @@
 
 #include <gpgmepp/key.h>
 
-class KConfigBase;
+class TDEConfigBase;
 
 namespace Kleo {
 
-  class KConfigBasedKeyFilter : public KeyFilter {
+  class TDEConfigBasedKeyFilter : public KeyFilter {
   public:
-    explicit KConfigBasedKeyFilter( const KConfigBase & config );
-    ~KConfigBasedKeyFilter();
+    explicit TDEConfigBasedKeyFilter( const TDEConfigBase & config );
+    ~TDEConfigBasedKeyFilter();
     bool matches( const GpgME::Key & key ) const;
 
     unsigned int specificity() const { return mSpecificity; }
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 6edc7c571..1276f9fd3 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -104,13 +104,13 @@ static inline bool by_increasing_specificity( const Kleo::KeyFilter * left, cons
 void Kleo::KeyFilterManager::reload() {
   d->clear();
 
-  KConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
+  TDEConfig * config = Kleo::CryptoBackendFactory::instance()->configObject();
   if ( !config )
     return;
   const TQStringList groups = config->groupList().grep( TQRegExp( "^Key Filter #\\d+$" ) );
   for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-    const KConfigGroup cfg( config, *it );
-    d->filters.push_back( new KConfigBasedKeyFilter( cfg ) );
+    const TDEConfigGroup cfg( config, *it );
+    d->filters.push_back( new TDEConfigBasedKeyFilter( cfg ) );
   }
   std::stable_sort( d->filters.begin(), d->filters.end(), by_increasing_specificity );
 }
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index 4d5042f58..2902423c8 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -43,7 +43,7 @@ namespace Kleo {
 
   /**
    * Crypto Config Module widget, dynamically generated from CryptoConfig
-   * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule.
+   * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule.
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 35a97611c..adb257493 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -449,14 +449,14 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
     TQSize dialogSize( 500, 400 );
 
-    KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+    TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
     dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
     resize( dialogSize );
   }
 }
 
 Kleo::KeySelectionDialog::~KeySelectionDialog() {
-  KConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
+  TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
   dialogConfig.writeEntry( "Dialog size", size() );
   dialogConfig.sync();
 }
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index fd9e601b8..e2e9ea951 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -19,7 +19,7 @@
 
 #include "storedtransferjob.h"
 
-using namespace KIOext;
+using namespace TDEIOext;
 
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
@@ -27,13 +27,13 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
                                      const TQByteArray &packedArgs,
                                      const TQByteArray &_staticData,
                                      bool showProgressInfo)
-    : KIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
+    : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
       m_uploadOffset( 0 )
 {
-    connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-    connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
-             TQT_SLOT( slotDataReq( KIO::Job *, TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+             TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) );
 }
 
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -43,7 +43,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
     m_data = arr;
 }
 
-void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotData( TDEIO::Job *, const TQByteArray &data )
 {
   // check for end-of-data marker:
   if ( data.size() == 0 )
@@ -53,7 +53,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
   memcpy( m_data.data() + oldSize, data.data(), data.size() );
 }
 
-void StoredTransferJob::slotDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
 {
   // Inspired from kmail's KMKernel::byteArrayToRemoteFile
   // send the data in 64 KB chunks
@@ -80,7 +80,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
     if (reload)
        job->addMetaData("cache", "reload");
     return job;
@@ -90,7 +90,7 @@ StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int per
                                 bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
-    StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
+    StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
 }
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index ddc687fcf..7fab77069 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -23,28 +23,28 @@
 #include <kio/job.h>
 
 // To be moved to KIO?
-namespace KIOext {
+namespace TDEIOext {
 
 /**
  * StoredTransferJob is a TransferJob (for downloading or uploading data) that
  * also stores a TQByteArray with the data, making it simpler to use than the
  * standard TransferJob.
  *
- * For KIO::get it puts the data into the member TQByteArray, so the user
+ * For TDEIO::get it puts the data into the member TQByteArray, so the user
  * of this class can get hold of the whole data at once by calling data()
  * when the result signal is emitted.
  * You should only use StoredTransferJob to download data if you cannot
  * process the data by chunks while it's being downloaded, since storing
  * everything in a TQByteArray can potentially require a lot of memory.
  *
- * For KIO::put the user of this class simply provides the bytearray from
+ * For TDEIO::put the user of this class simply provides the bytearray from
  * the start, and the job takes care of uploading it.
  * You should only use StoredTransferJob to upload data if you cannot
  * provide the in chunks while it's being uploaded, since storing
  * everything in a TQByteArray can potentially require a lot of memory.
  *
  */
-class StoredTransferJob : public KIO::TransferJob {
+class StoredTransferJob : public TDEIO::TransferJob {
     Q_OBJECT
   
 
@@ -76,8 +76,8 @@ public:
     TQByteArray data() const { return m_data; }
 
 private slots:
-    void slotData( KIO::Job *job, const TQByteArray &data );
-    void slotDataReq( KIO::Job *job, TQByteArray &data );
+    void slotData( TDEIO::Job *job, const TQByteArray &data );
+    void slotDataReq( TDEIO::Job *job, TQByteArray &data );
 private:
     TQByteArray m_data;
     int m_uploadOffset;
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index d8f5e9969..99d7080da 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -85,7 +85,7 @@ int main( int argc, char **argv )
   if ( args->isSet( "disable-autostart" ) ) {
     kdDebug() << "Disable autostart." << endl;
 
-    KConfig *config = app.config();
+    TDEConfig *config = app.config();
     config->setGroup( "Startup" );
     config->writeEntry( "EnableAutostart", false );
   }
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index 98495c41e..81f5ceef5 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -48,7 +48,7 @@ Addressee AddresseeConfig::addressee()
 
 void AddresseeConfig::setAutomaticNameParsing( bool value )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "AutomaticNameParsing", value );
   config.sync();
@@ -56,7 +56,7 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )
 
 bool AddresseeConfig::automaticNameParsing()
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readBoolEntry( "AutomaticNameParsing",
                                KABPrefs::instance()->automaticNameParsing() );
@@ -64,7 +64,7 @@ bool AddresseeConfig::automaticNameParsing()
 
 void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "NoDefaultAddrTypes", types );
   config.sync();
@@ -72,14 +72,14 @@ void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
 
 TQValueList<int> AddresseeConfig::noDefaultAddrTypes() const
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readIntListEntry( "NoDefaultAddrTypes" );
 }
 
 void AddresseeConfig::setCustomFields( const TQStringList &fields )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "LocalCustomFields", fields );
   config.sync();
@@ -87,13 +87,13 @@ void AddresseeConfig::setCustomFields( const TQStringList &fields )
 
 TQStringList AddresseeConfig::customFields() const
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readListEntry( "LocalCustomFields" );
 }
 
 void AddresseeConfig::remove()
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.deleteGroup( mAddressee.uid() );
 }
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index cbb60bd26..d203e4ddc 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -60,7 +60,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
 
   enableButton( KDialogBase::Apply, false );
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "AddresseeEditor" );
   TQSize defaultSize( 750, 570 );
   resize( config.readSizeEntry( "Size", &defaultSize ) );
@@ -70,7 +70,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
 {
   kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "AddresseeEditor" );
   config.writeEntry( "Size", size() );
 
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index b875c99af..e4cd5a3af 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -519,7 +519,7 @@ void AddresseeEditorWidget::load()
   mNameEdit->blockSignals( false );
 
   if ( mAddressee.formattedName().isEmpty() ) {
-    KConfig config( "kaddressbookrc" );
+    TDEConfig config( "kaddressbookrc" );
     config.setGroup( "General" );
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f108..1872ecea0 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
   return mCategoryList;
 }
 
-void Filter::save( KConfig *config )
+void Filter::save( TDEConfig *config )
 {
   config->writeEntry( "Name", mName );
   config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
   config->writeEntry( "MatchRule", (int)mMatchRule );
 }
 
-void Filter::restore( KConfig *config )
+void Filter::restore( TDEConfig *config )
 {
   mName = config->readEntry( "Name", "<internal error>" );
   mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
   mIsEmpty = false;
 }
 
-void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
+void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
 {
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
 
     // remove the old filters
     uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
   Filter::List::Iterator iter;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     if ( !(*iter).mInternal ) {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
                                                      .arg( index ) );
       (*iter).save( config );
       index++;
     }
   }
 
-  KConfigGroupSaver s( config, baseGroup );
+  TDEConfigGroupSaver s( config, baseGroup );
   config->writeEntry( "Count", index );
 }
 
-Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
+Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
 {
   Filter::List list;
   int count = 0;
   Filter f;
 
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
     count = config->readNumEntry( "Count", 0 );
   }
 
   for ( int i = 0; i < count; i++ ) {
     {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
       f.restore( config );
     }
 
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index cb13ce536..e8518b8e8 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -102,12 +102,12 @@ class Filter
     /**
       Saves the filter to the config file. The group should already be set.
      */
-    void save( KConfig *config );
+    void save( TDEConfig *config );
 
     /**
       Loads the filter from the config file. The group should already be set.
      */
-    void restore( KConfig *config );
+    void restore( TDEConfig *config );
 
     /**
       Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
                        will be append for each filter saved.
       @param list The list of filters to be saved.
      */
-    static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
+    static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );
 
     /**
       Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter
 
       @return The list of filters.
      */
-    static Filter::List restore( KConfig *config, const TQString &baseGroup );
+    static Filter::List restore( TDEConfig *config, const TQString &baseGroup );
 
     /**
       Sets the filter rule. If the rule is Filter::Matching (default),
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 18180b801..8a45fc14d 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
 KABPrefs::KABPrefs()
   : KABPrefsBase()
 {
-  KConfigSkeleton::setCurrentGroup( "General" );
+  TDEConfigSkeleton::setCurrentGroup( "General" );
 
   TQStringList defaultMap;
   defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index c0c92bdcc..4ac486f78 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -28,7 +28,7 @@
 #include <tdepimmacros.h>
 #include "kabprefs_base.h"
 
-class KConfig;
+class TDEConfig;
 
 class KDE_EXPORT KABPrefs : public KABPrefsBase
 {
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index bb2064883..1d64fde3f 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -67,11 +67,11 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
     image.load( url.path() );
     picture.setData( image );
     (*ok) = true;
-  } else if ( KIO::NetAccess::download( url, tempFile, mParent ) ) {
+  } else if ( TDEIO::NetAccess::download( url, tempFile, mParent ) ) {
     image.load( tempFile );
     picture.setData( image );
     (*ok) = true;
-    KIO::NetAccess::removeTempFile( tempFile );
+    TDEIO::NetAccess::removeTempFile( tempFile );
   }
 
   if ( !(*ok) ) {
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index 16bec28a7..c5efa60aa 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
 {
 }
 
-void ConfigureWidget::restoreSettings( KConfig* )
+void ConfigureWidget::restoreSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
 
-void ConfigureWidget::saveSettings( KConfig* )
+void ConfigureWidget::saveSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 10eb3de88..d1d23c8c7 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       values from the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void restoreSettings( KConfig *cfg );
+    virtual void restoreSettings( TDEConfig *cfg );
 
     /**
       This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       the GUI to the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void saveSettings( KConfig *cfg );
+    virtual void saveSettings( TDEConfig *cfg );
 
 
     /**
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 996044f47..c291f208c 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -45,7 +45,7 @@ class Resource;
 class TQWidget;
 
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KURL;
 
 namespace KAB {
@@ -66,9 +66,9 @@ class KDE_EXPORT Core : public TQObject
     virtual KABC::AddressBook *addressBook() const = 0;
 
     /**
-      Returns a pointer to the KConfig object of the application.
+      Returns a pointer to the TDEConfig object of the application.
      */
-    virtual KConfig *config() const = 0;
+    virtual TDEConfig *config() const = 0;
 
     /**
       Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8d4dd2fda..0b517bf00 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -250,7 +250,7 @@ KABC::AddressBook *KABCore::addressBook() const
   return mAddressBook;
 }
 
-KConfig *KABCore::config() const
+TDEConfig *KABCore::config() const
 {
   return KABPrefs::instance()->config();
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d3ce562b4..c8d368722 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -49,7 +49,7 @@ class CategorySelectDialog;
 class TDEAboutData;
 class KAction;
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KPushButton;
 class KStatusBar;
 class KToggleAction;
@@ -106,9 +106,9 @@ class KDE_EXPORT KABCore : public KAB::Core
     KABC::AddressBook *addressBook() const;
 
     /**
-      Returns a pointer to the KConfig object of the application.
+      Returns a pointer to the TDEConfig object of the application.
      */
-    KConfig *config() const;
+    TDEConfig *config() const;
 
     /**
       Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 081ab2a5e..9c2d476e2 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -135,11 +135,11 @@ void KAddressBookMain::syncAllResources()
   mCore->load();
 }
 
-void KAddressBookMain::saveProperties( KConfig* )
+void KAddressBookMain::saveProperties( TDEConfig* )
 {
 }
 
-void KAddressBookMain::readProperties( KConfig* )
+void KAddressBookMain::readProperties( TDEConfig* )
 {
 }
 
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 2444b28e5..3e8ffb832 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -75,14 +75,14 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
       This function is called when it is time for the app to save its
       properties for session management purposes.
      */
-    void saveProperties( KConfig* );
+    void saveProperties( TDEConfig* );
 
     /**
-      This function is called when this app is restored.  The KConfig
+      This function is called when this app is restored.  The TDEConfig
       object points to the session management config file that was saved
       with @ref saveProperties
      */
-    void readProperties( KConfig* );
+    void readProperties( TDEConfig* );
 
     virtual bool queryClose();
 
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 028663e3e..15ea63bac 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -53,7 +53,7 @@ KAddressBookView::~KAddressBookView()
                 << name() << endl;
 }
 
-void KAddressBookView::readConfig( KConfig *config )
+void KAddressBookView::readConfig( TDEConfig *config )
 {
   mFieldList = KABC::Field::restoreFields( config, "KABCFields" );
 
@@ -64,7 +64,7 @@ void KAddressBookView::readConfig( KConfig *config )
   mDefaultFilterName = config->readEntry( "DefaultFilterName" );
 }
 
-void KAddressBookView::writeConfig( KConfig* )
+void KAddressBookView::writeConfig( TDEConfig* )
 {
   // Most of writing the config is handled by the ConfigureViewDialog
 }
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 86153200d..1f26ca71e 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -36,7 +36,7 @@
 #include "filter.h"
 #include "viewconfigurewidget.h"
 
-class KConfig;
+class TDEConfig;
 class KXMLGUIClient;
 
 class TQDropEvent;
@@ -80,10 +80,10 @@ class KDE_EXPORT KAddressBookView : public TQWidget
       If overloaded in the subclass, do not forget to call super class's
       method.
 
-      @param config The KConfig object to read from. The group will already
+      @param config The TDEConfig object to read from. The group will already
       be set, so do not change the group.
      */
-    virtual void readConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
 
     /**
       Called whenever this view should write the config. The view should not
@@ -94,9 +94,9 @@ class KDE_EXPORT KAddressBookView : public TQWidget
       If overloaded in the subclass, do not forget to call the super class's
       method.
      */
-    // The KConfig object is unused so we do not document it
+    // The TDEConfig object is unused so we do not document it
     // else doxygen will complain.
-    virtual void writeConfig( KConfig * );
+    virtual void writeConfig( TDEConfig * );
 
     /**
       Returns a TQString with all the selected email addresses concatenated
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 80af92274..6bbc45bec 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,28 +169,28 @@ AddresseeWidget::~AddresseeWidget()
 
 void AddresseeWidget::restoreSettings()
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
   mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
   mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
 
-  KConfig cfg( "kaddressbookrc" );
+  TDEConfig cfg( "kaddressbookrc" );
   cfg.setGroup( "General" );
   mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
 }
 
 void AddresseeWidget::saveSettings()
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
   config.writeEntry( "Inclusions", mInclusion->nameParts() );
   config.writeEntry( "Suffixes", mSuffix->nameParts() );
 
-  KConfig cfg( "kaddressbookrc" );
+  TDEConfig cfg( "kaddressbookrc" );
   cfg.setGroup( "General" );
   cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
 
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 97c8d0b2d..5bdec2f86 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -29,7 +29,7 @@
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 
-ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
                                               TQWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
                  name, true, true ), mWidget( 0 ), mConfig( config )
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 93a3c8501..0aa97f74f 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -38,7 +38,7 @@ class ExtensionConfigDialog : public KDialogBase
   
 
   public:
-    ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+    ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
                            TQWidget *parent, const char *name = 0 );
     ~ExtensionConfigDialog();
 
@@ -47,7 +47,7 @@ class ExtensionConfigDialog : public KDialogBase
 
   private:
     KAB::ConfigureWidget *mWidget;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 #endif
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index fdf752b07..fa84b328e 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaddressbook
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4c6e23da..18cb1a908 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
   mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
 
-  KConfig config( "kabcrc", false, false );
+  TDEConfig config( "kabcrc", false, false );
   config.setGroup( "General" );
   mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
   mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
 
   KABPrefs::instance()->writeConfig();
 
-  KConfig config( "kabcrc", false, false );
+  TDEConfig config( "kabcrc", false, false );
   config.setGroup( "General" );
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 2806171c9..c9cd4742c 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=dlgedit
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 321f9c81d..33eb263e4 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=find
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 296f79553..8f3bb5e58 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -35,13 +35,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
     return new KCMKabConfig( parent, "kcmkabconfig" );
   }
 }
 
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index ceadd6c94..c920d4099 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -28,7 +28,7 @@
 
 class KABConfigWidget;
 
-class KCMKabConfig : public KCModule
+class KCMKabConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 0a76b6d2c..dcbcd2c58 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
     return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
   }
 }
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 66fcde2f5..ba512b63a 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -36,13 +36,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
     return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
   }
 }
 
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 0325c88e2..8539c515c 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -30,7 +30,7 @@
 
 class LDAPOptionsWidget;
 
-class KCMKabLdapConfig : public KCModule
+class KCMKabLdapConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 92eda9910..0f33eca6a 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -197,8 +197,8 @@ void LDAPOptionsWidget::slotMoveDown()
 void LDAPOptionsWidget::restoreSettings()
 {
   mHostListView->clear();
-  KConfig *config = KPIM::LdapSearch::config();
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfig *config = KPIM::LdapSearch::config();
+  TDEConfigGroupSaver saver( config, "LDAP" );
 
   TQString host;
 
@@ -222,10 +222,10 @@ void LDAPOptionsWidget::restoreSettings()
 
 void LDAPOptionsWidget::saveSettings()
 {
-  KConfig *config = KPIM::LdapSearch::config();
+  TDEConfig *config = KPIM::LdapSearch::config();
   config->deleteGroup( "LDAP" );
 
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfigGroupSaver saver( config, "LDAP" );
 
   uint selected = 0; uint unselected = 0;
   TQListViewItemIterator it( mHostListView );
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 42920b3b6..b3fd9af25 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -118,7 +118,7 @@ void KeyWidget::addKey()
     return;
 
   TQString tmpFile;
-  if ( KIO::NetAccess::download( url, tmpFile, this ) ) {
+  if ( TDEIO::NetAccess::download( url, tmpFile, this ) ) {
     TQFile file( tmpFile );
     if ( !file.open( IO_ReadOnly ) ) {
       TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -140,7 +140,7 @@ void KeyWidget::addKey()
 
     emit changed();
 
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 
   updateKeyCombo();
@@ -175,7 +175,7 @@ void KeyWidget::exportKey()
   (*s) << key.textData();
   tempFile.close();
 
-  KIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
+  TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
 }
 
 void KeyWidget::updateKeyCombo()
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index cf7b1d5f8..6537bebe9 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -249,14 +249,14 @@ void LDAPSearchDialog::restoreSettings()
   mLdapClientList.setAutoDelete( true );
   mLdapClientList.clear();
 
-  KConfig kabConfig( "kaddressbookrc" );
+  TDEConfig kabConfig( "kaddressbookrc" );
   kabConfig.setGroup( "LDAPSearch" );
   mSearchType->setCurrentItem( kabConfig.readNumEntry( "SearchType", 0 ) );
 
   // then read the config file and register all selected
   // server in the list
-  KConfig* config = KPIM::LdapSearch::config();
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfig* config = KPIM::LdapSearch::config();
+  TDEConfigGroupSaver saver( config, "LDAP" );
   mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" );
   if ( !mNumHosts ) {
     KMessageBox::error( this, i18n( "You must select a LDAP server before searching.\nYou can do this from the menu Settings/Configure KAddressBook." ) );
@@ -316,7 +316,7 @@ void LDAPSearchDialog::restoreSettings()
 
 void LDAPSearchDialog::saveSettings()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "LDAPSearch" );
   config.writeEntry( "SearchType", mSearchType->currentItem() );
   config.sync();
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 718ce8e2b..8f70f0f82 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
   mFormattedNameEdit->setText( addr.formattedName() );
 
   // Prefix and suffix combos
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   TQStringList sTitle;
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 377669732..a80626519 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -69,7 +69,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
     mPainter( 0 ),
     mPrintProgress( 0 )
 {
-  KConfig *config;
+  TDEConfig *config;
   TQFont font;
   bool kdeFonts;
   TQFont standard = TDEGlobalSettings::generalFont();
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
   TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
 
   // store the configuration settings:
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( ConfigSectionName );
   useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
   config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index ec412aa35..f4558258e 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -147,7 +147,7 @@ void SoundWidget::loadSound()
 
   if ( url.isLocalFile() )
     fileName = url.path();
-  else if ( !KIO::NetAccess::download( url, fileName, this ) )
+  else if ( !TDEIO::NetAccess::download( url, fileName, this ) )
     return;
 
   TQFile file( fileName );
@@ -159,7 +159,7 @@ void SoundWidget::loadSound()
   file.close();
 
   if ( !url.isLocalFile() )
-    KIO::NetAccess::removeTempFile( fileName );
+    TDEIO::NetAccess::removeTempFile( fileName );
 }
 
 void SoundWidget::updateGUI()
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index bbe0f3f19..e3c9a81cf 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -61,7 +61,7 @@ ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
   initGUI();
 }
 
-void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
+void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config )
 {
   KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" );
 
@@ -75,7 +75,7 @@ void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
   slotShowFields( mCategoryCombo->currentItem() );
 }
 
-void ViewConfigureFieldsPage::saveSettings( KConfig *config )
+void ViewConfigureFieldsPage::saveSettings( TDEConfig *config )
 {
   KABC::Field::List fields;
 
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 0ac75709d..91bf6da72 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -44,8 +44,8 @@ class ViewConfigureFieldsPage : public TQWidget
     ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
                              const char *name = 0 );
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   public slots:
     void slotSelect();
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 39bab7c81..9602f2d31 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -79,7 +79,7 @@ ViewConfigureFilterPage::~ViewConfigureFilterPage()
   delete mFilterGroup;
 }
 
-void ViewConfigureFilterPage::restoreSettings( KConfig *config )
+void ViewConfigureFilterPage::restoreSettings( TDEConfig *config )
 {
   mFilterCombo->clear();
 
@@ -97,7 +97,7 @@ void ViewConfigureFilterPage::restoreSettings( KConfig *config )
     mFilterCombo->setCurrentText( config->readEntry( "DefaultFilterName" ) );
 }
 
-void ViewConfigureFilterPage::saveSettings( KConfig *config )
+void ViewConfigureFilterPage::saveSettings( TDEConfig *config )
 {
   config->writeEntry( "DefaultFilterName", mFilterCombo->currentText() );
   config->writeEntry( "DefaultFilterType", mFilterGroup->id( mFilterGroup->selected() ) );
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 7367d59d6..a29bf8808 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -29,7 +29,7 @@
 class TQButtonGroup;
 
 class KComboBox;
-class KConfig;
+class TDEConfig;
 
 class ViewConfigureFilterPage : public TQWidget
 {
@@ -40,8 +40,8 @@ class ViewConfigureFilterPage : public TQWidget
     ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
     ~ViewConfigureFilterPage();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void buttonClicked( int id );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 8278b2f1d..415430d92 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -66,13 +66,13 @@ ViewConfigureWidget::~ViewConfigureWidget()
 {
 }
 
-void ViewConfigureWidget::restoreSettings( KConfig *config )
+void ViewConfigureWidget::restoreSettings( TDEConfig *config )
 {
   mFieldsPage->restoreSettings( config );
   mFilterPage->restoreSettings( config );
 }
 
-void ViewConfigureWidget::saveSettings( KConfig *config )
+void ViewConfigureWidget::saveSettings( TDEConfig *config )
 {
   mFieldsPage->saveSettings( config );
   mFilterPage->saveSettings( config );
@@ -98,12 +98,12 @@ ViewConfigureDialog::~ViewConfigureDialog()
 {
 }
 
-void ViewConfigureDialog::restoreSettings( KConfig *config )
+void ViewConfigureDialog::restoreSettings( TDEConfig *config )
 {
   mConfigWidget->restoreSettings( config );
 }
 
-void ViewConfigureDialog::saveSettings( KConfig *config )
+void ViewConfigureDialog::saveSettings( TDEConfig *config )
 {
   mConfigWidget->saveSettings( config );
 }
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index e65e095d4..c13f0fab9 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -61,7 +61,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 
       Do not change the group of the config object in this method.
      */
-    virtual void restoreSettings( KConfig *config );
+    virtual void restoreSettings( TDEConfig *config );
 
     /**
       Writes the configuration from the GUI to the config object. If this
@@ -69,7 +69,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 
       Do not change the group of the config object in this method.
      */
-    virtual void saveSettings( KConfig *config );
+    virtual void saveSettings( TDEConfig *config );
 
 
     /**
@@ -95,8 +95,8 @@ class ViewConfigureDialog : public KDialogBase
                          TQWidget *parent, const char *name = 0 );
     ~ViewConfigureDialog();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void slotHelp();
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 3938c14a9..2616bf330 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -83,7 +83,7 @@ void ViewManager::restoreSettings()
   // been modified by global settings
   TQDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
-    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+    TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
     it.current()->readConfig( mCore->config() );
   }
 
@@ -96,7 +96,7 @@ void ViewManager::saveSettings()
 {
   TQDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
-    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+    TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
     (*it)->writeConfig( mCore->config() );
   }
 
@@ -199,8 +199,8 @@ void ViewManager::setActiveView( const TQString &name )
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
-    KConfig *config = mCore->config();
-    KConfigGroupSaver saver( config, name );
+    TDEConfig *config = mCore->config();
+    TDEConfigGroupSaver saver( config, name );
     TQString type = config->readEntry( "Type", "Table" );
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
@@ -278,7 +278,7 @@ void ViewManager::editView()
   if ( wdg ) {
     ViewConfigureDialog dlg( wdg, mActiveView->caption(), this );
 
-    KConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
+    TDEConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
     dlg.restoreSettings( mCore->config() );
 
     if ( dlg.exec() ) {
@@ -314,7 +314,7 @@ void ViewManager::deleteView()
     mViewNameList.remove( mActiveView->caption() );
 
     // remove the view from the config file
-    KConfig *config = mCore->config();
+    TDEConfig *config = mCore->config();
     config->deleteGroup( mActiveView->caption() );
 
     mViewDict.remove( mActiveView->caption() );
@@ -356,9 +356,9 @@ void ViewManager::addView()
     mViewNameList.append( newName );
 
     // write the view to the config file,
-    KConfig *config = mCore->config();
+    TDEConfig *config = mCore->config();
     config->deleteGroup( newName );
-    KConfigGroupSaver saver( config, newName );
+    TDEConfigGroupSaver saver( config, newName );
     config->writeEntry( "Type", type );
 
     // try to set the active view
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 0ffc5e5df..347bd4233 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -60,14 +60,14 @@ ConfigureCardViewWidget::~ConfigureCardViewWidget()
 {
 }
 
-void ConfigureCardViewWidget::restoreSettings( KConfig *config )
+void ConfigureCardViewWidget::restoreSettings( TDEConfig *config )
 {
   ViewConfigureWidget::restoreSettings( config );
 
   mAdvancedPage->restoreSettings( config );
 }
 
-void ConfigureCardViewWidget::saveSettings( KConfig *config )
+void ConfigureCardViewWidget::saveSettings( TDEConfig *config )
 {
   ViewConfigureWidget::saveSettings( config );
 
@@ -86,7 +86,7 @@ CardViewLookNFeelPage::~CardViewLookNFeelPage()
 {
 }
 
-void CardViewLookNFeelPage::restoreSettings( KConfig *config )
+void CardViewLookNFeelPage::restoreSettings( TDEConfig *config )
 {
   // colors
   cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
@@ -132,7 +132,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbShowEmptyFields->setChecked( config->readBoolEntry( "ShowEmptyFields", false ) );
 }
 
-void CardViewLookNFeelPage::saveSettings( KConfig *config )
+void CardViewLookNFeelPage::saveSettings( TDEConfig *config )
 {
   // colors
   config->writeEntry( "EnableCustomColors", cbEnableCustomColors->isChecked() );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 9c079d887..892532c5e 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -34,7 +34,7 @@ class TQString;
 class TQWidget;
 class TQCheckBox;
 class TQLabel;
-class KConfig;
+class TDEConfig;
 
 namespace KABC { class AddressBook; }
 
@@ -51,8 +51,8 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
     ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
     virtual ~ConfigureCardViewWidget();
 
-    virtual void restoreSettings( KConfig* );
-    virtual void saveSettings( KConfig* );
+    virtual void restoreSettings( TDEConfig* );
+    virtual void saveSettings( TDEConfig* );
 
   private:
     class CardViewLookNFeelPage *mAdvancedPage;
@@ -86,8 +86,8 @@ class CardViewLookNFeelPage : public TQVBox {
     CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
     ~CardViewLookNFeelPage();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   private slots:
     void setTextFont();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index a8359884b..987feb17d 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -56,14 +56,14 @@ ConfigureTableViewWidget::~ConfigureTableViewWidget()
 {
 }
 
-void ConfigureTableViewWidget::restoreSettings( KConfig *config )
+void ConfigureTableViewWidget::restoreSettings( TDEConfig *config )
 {
   ViewConfigureWidget::restoreSettings( config );
 
   mPage->restoreSettings( config );
 }
 
-void ConfigureTableViewWidget::saveSettings( KConfig *config )
+void ConfigureTableViewWidget::saveSettings( TDEConfig *config )
 {
   ViewConfigureWidget::saveSettings( config );
 
@@ -81,7 +81,7 @@ LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
   enableBackgroundToggled(mBackgroundBox->isChecked());
 }
 
-void LookAndFeelPage::restoreSettings( KConfig *config )
+void LookAndFeelPage::restoreSettings( TDEConfig *config )
 {
   mAlternateButton->setChecked(config->readBoolEntry("ABackground", true));
   mLineButton->setChecked(config->readBoolEntry("SingleLine", false));
@@ -97,7 +97,7 @@ void LookAndFeelPage::restoreSettings( KConfig *config )
 #endif
 }
 
-void LookAndFeelPage::saveSettings( KConfig *config )
+void LookAndFeelPage::saveSettings( TDEConfig *config )
 {
   config->writeEntry("ABackground", mAlternateButton->isChecked());
   config->writeEntry("SingleLine", mLineButton->isChecked());
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index d4a79a6f1..94fd2a687 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -31,7 +31,7 @@ class TQWidget;
 class TQRadioButton;
 class TQCheckBox;
 class KURLRequester;
-class KConfig;
+class TDEConfig;
 
 namespace KABC { class AddressBook; }
 
@@ -48,8 +48,8 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
     ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
     virtual ~ConfigureTableViewWidget();
 
-    virtual void restoreSettings( KConfig* );
-    virtual void saveSettings( KConfig* );
+    virtual void restoreSettings( TDEConfig* );
+    virtual void saveSettings( TDEConfig* );
 
   private:
     void initGUI();
@@ -69,8 +69,8 @@ class LookAndFeelPage : public TQWidget
     LookAndFeelPage( TQWidget *parent, const char *name = 0 );
     ~LookAndFeelPage() {}
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void enableBackgroundToggled( bool );
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 4656f62b1..30e1ca672 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -178,7 +178,7 @@ KABC::Field *KAddressBookCardView::sortField() const
   return KABC::Field::allFields()[ 0 ];
 }
 
-void KAddressBookCardView::readConfig( KConfig *config )
+void KAddressBookCardView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
@@ -238,7 +238,7 @@ void KAddressBookCardView::readConfig( KConfig *config )
              this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
 }
 
-void KAddressBookCardView::writeConfig( KConfig *config )
+void KAddressBookCardView::writeConfig( TDEConfig *config )
 {
   config->writeEntry( "ItemWidth", mCardView->itemWidth() );
   KAddressBookView::writeConfig( config );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index f14b12fc8..90b738d53 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -32,7 +32,7 @@
 
 class TQDragEntryEvent;
 class TQDropEvent;
-class KConfig;
+class TDEConfig;
 class AddresseeCardView;
 
 /**
@@ -54,8 +54,8 @@ class KAddressBookCardView : public KAddressBookView
     virtual TQString type() const { return "Card"; }
     virtual KABC::Field *sortField() const;
 
-    virtual void readConfig( KConfig *config );
-    virtual void writeConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     void scrollUp();
     void scrollDown();
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 42e315c50..adf3de0e2 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -167,7 +167,7 @@ KABC::Field *KAddressBookIconView::sortField() const
   return KABC::Field::allFields()[ 2 ];
 }
 
-void KAddressBookIconView::readConfig( KConfig *config )
+void KAddressBookIconView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 8cbc98a9d..56984cfc5 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -29,7 +29,7 @@
 #include "kaddressbookview.h"
 
 class TQIconViewItem;
-class KConfig;
+class TDEConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
 
@@ -52,7 +52,7 @@ class KAddressBookIconView : public KAddressBookView
     virtual TQStringList selectedUids();
     virtual TQString type() const { return "Icon"; }
     virtual KABC::Field *sortField() const;
-    virtual void readConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
 
     void scrollUp();
     void scrollDown();
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index de1ae2ec3..9432dafa2 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -173,14 +173,14 @@ KABC::Field *KAddressBookTableView::sortField() const
   return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] );
 }
 
-void KAddressBookTableView::writeConfig( KConfig *config )
+void KAddressBookTableView::writeConfig( TDEConfig *config )
 {
   KAddressBookView::writeConfig( config );
 
   mListView->saveLayout( config, config->group() );
 }
 
-void KAddressBookTableView::readConfig( KConfig *config )
+void KAddressBookTableView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 3b2e0df13..4ebdfd938 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -41,7 +41,7 @@
 class TQListViewItem;
 class TQListBox;
 class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
 class KIMProxy;
 
 class ContactListViewItem;
@@ -75,8 +75,8 @@ friend class ContactListView;
     virtual void setFirstSelected( bool selected = true );
     virtual KABC::Field *sortField() const;
 
-    virtual void readConfig( KConfig *config );
-    virtual void writeConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
+    virtual void writeConfig( TDEConfig *config );
     virtual TQString type() const { return "Table"; }
 
     void scrollUp();
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 9c270a2e3..f3d47bfc3 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -66,7 +66,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 728823019..40c209dce 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -866,7 +866,7 @@ void CSVImportDialog::saveTemplate()
   if ( name.isEmpty() )
     return;
 
-  KConfig config( fileName );
+  TDEConfig config( fileName );
   config.setGroup( "General" );
   config.writeEntry( "DatePattern", mDatePatternEdit->text() );
   config.writeEntry( "Columns", mTable->numCols() );
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 30718a9f0..f0c13e610 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -114,7 +114,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index ad85389fe..34a6809fa 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
           else
             testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
 
-          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+          if ( TDEIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
             counter++;
             url = testUrl + TQString::number( counter ) + ".vcf";
           } else
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     bool anyFailures = false;
     KURL::List::Iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
-      if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+      if ( TDEIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
 
         TQFile file( fileName );
 
@@ -247,7 +247,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
             addrList += parseVCard( vCardText );
           }
 #endif
-          KIO::NetAccess::removeTempFile( fileName );
+          TDEIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
           text = text.arg( (*it).url() );
@@ -258,7 +258,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
         }
       } else {
         TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
-        text = text.arg( KIO::NetAccess::lastErrorString() );
+        text = text.arg( TDEIO::NetAccess::lastErrorString() );
         KMessageBox::error( parentWidget(), text, caption );
         anyFailures = true;
       }
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   tmpFile.file()->writeBlock( data.data(), data.size() );
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #else
 KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
   stream << data;
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #endif
 
@@ -561,7 +561,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
   layout->addWidget( mEncryptionKeys );
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   mPrivateBox->setChecked( config.readBoolEntry( "ExportPrivateFields", true ) );
@@ -572,7 +572,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 
 VCardExportSelectionDialog::~VCardExportSelectionDialog()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   config.writeEntry( "ExportPrivateFields", mPrivateBox->isChecked() );
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index f17cd7495..1e64b046b 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 */
 bool AlarmCalendar::initialiseCalendars()
 {
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	TQString activeKey   = TQString::fromLatin1("Calendar");
 	TQString expiredKey  = TQString::fromLatin1("ExpiredCalendar");
@@ -150,7 +150,7 @@ bool AlarmCalendar::initialiseCalendars()
 * Create an alarm calendar instance.
 * If 'configKey' is non-null, the calendar will be converted to ICal format.
 */
-AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey)
+AlarmCalendar* AlarmCalendar::createCalendar(CalID type, TDEConfig* config, TQString& writePath, const TQString& configKey)
 {
 	static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$"));
 	static TQString ical = TQString::fromLatin1(".ics");
@@ -266,7 +266,7 @@ bool AlarmCalendar::open()
 
 	// Check for file's existence, assuming that it does exist when uncertain,
 	// to avoid overwriting it.
-	if (!KIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow()))
+	if (!TDEIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow()))
 	{
 		// The calendar file doesn't yet exist, so create it
 		if (create())
@@ -318,7 +318,7 @@ int AlarmCalendar::load()
 
 	kdDebug(5950) << "AlarmCalendar::load(): " << mUrl.prettyURL() << endl;
 	TQString tmpFile;
-	if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
+	if (!TDEIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
 	{
 		kdError(5950) << "AlarmCalendar::load(): Load failure" << endl;
 		KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL()));
@@ -331,9 +331,9 @@ int AlarmCalendar::load()
 	if (!loaded)
 	{
 		// Check if the file is zero length
-		KIO::NetAccess::removeTempFile(tmpFile);
-		KIO::UDSEntry uds;
-		KIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow());
+		TDEIO::NetAccess::removeTempFile(tmpFile);
+		TDEIO::UDSEntry uds;
+		TDEIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow());
 		KFileItem fi(uds, mUrl);
 		if (!fi.size())
 			return 0;     // file is zero length
@@ -346,7 +346,7 @@ int AlarmCalendar::load()
 		return -1;
 	}
 	if (!mLocalFile.isEmpty())
-		KIO::NetAccess::removeTempFile(mLocalFile);   // removes it only if it IS a temporary file
+		TDEIO::NetAccess::removeTempFile(mLocalFile);   // removes it only if it IS a temporary file
 	mLocalFile = tmpFile;
 
 	CalendarCompat::fix(*mCalendar, mLocalFile);   // convert events to current KAlarm format for when calendar is saved
@@ -389,7 +389,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 
 	if (!mICalUrl.isLocalFile())
 	{
-		if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
+		if (!TDEIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
 		{
 			kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n";
 			KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL()));
@@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 		// Save the change in the config file.
 		if (!mConfigKey.isNull())
 		{
-			KConfig* config = kapp->config();
+			TDEConfig* config = kapp->config();
 			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
@@ -424,7 +424,7 @@ void AlarmCalendar::close()
 {
 	if (!mLocalFile.isEmpty())
 	{
-		KIO::NetAccess::removeTempFile(mLocalFile);   // removes it only if it IS a temporary file
+		TDEIO::NetAccess::removeTempFile(mLocalFile);   // removes it only if it IS a temporary file
 		mLocalFile = "";
 	}
 	if (mCalendar)
@@ -474,7 +474,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 	}
 	else
 	{
-		if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
+		if (!TDEIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
 		{
 			kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
 			KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
@@ -561,7 +561,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 			templat->saveCal();
 	}
 	if (!local)
-		KIO::NetAccess::removeTempFile(filename);
+		TDEIO::NetAccess::removeTempFile(filename);
 	return success;
 }
 
@@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal()
 	{
 		if (!mConfigKey.isNull())
 		{
-			KConfig* config = kapp->config();
+			TDEConfig* config = kapp->config();
 			config->setGroup(TQString::fromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index cebd64605..91977ea97 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -26,7 +26,7 @@
 #include <libkcal/calendarlocal.h>
 #include "alarmevent.h"
 
-class KConfig;
+class TDEConfig;
 
 
 /** Provides read and write access to calendar files.
@@ -93,7 +93,7 @@ class AlarmCalendar : public TQObject
 		bool                  saveCal(const TQString& newFile = TQString());
 		void                  purge(int daysToKeep);
 		void                  startPurgeTimer();
-		static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString());
+		static AlarmCalendar* createCalendar(CalID, TDEConfig*, TQString& writePath, const TQString& configKey = TQString());
 		static AlarmCalendar* calendarOpen(CalID);
 
 		static AlarmCalendar* mCalendars[NCALS];   // the calendars
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index b12a41cfb..0727507f2 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -80,7 +80,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	// Prefix and suffix to the name in the alarm text
 	// Get default prefix and suffix texts from config file
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
 	mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
@@ -343,7 +343,7 @@ TQValueList<KAEvent> BirthdayDlg::events() const
 void BirthdayDlg::slotOk()
 {
 	// Save prefix and suffix texts to use as future defaults
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup(TQString::fromLatin1("General"));
 	config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
 	config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 29ac67d4a..707865f87 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -413,7 +413,7 @@ void Daemon::enableAutoStart(bool enable)
 
 	// The return status doesn't report failure even if the daemon isn't running,
 	// so in case of failure, rewrite the config file in any case.
-	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
+	TDEConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
 	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
 	adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable);
 	adconfig.sync();
@@ -436,7 +436,7 @@ void Daemon::notifyTimeChanged()
 */
 bool Daemon::autoStart()
 {
-	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
+	TDEConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
 	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
 	return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true);
 }
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index b0da44714..62c445ad1 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -1954,8 +1954,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 			url = alarmtext;
 			url.cleanPath();
 			alarmtext = url.prettyURL();
-			KIO::UDSEntry uds;
-			if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
+			TDEIO::UDSEntry uds;
+			if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
 				err = NONEXISTENT;
 			else
 			{
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index da43fdad6..4723c342a 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -745,7 +745,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 */
 bool readConfigWindowSize(const char* window, TQSize& result)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(TQString::fromLatin1(window));
 	TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
 	TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
@@ -762,7 +762,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
 */
 void writeConfigWindowSize(const char* window, const TQSize& size)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(TQString::fromLatin1(window));
 	TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop());
 	config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 1d315e342..29f498fc9 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -120,7 +120,7 @@ KAlarmApp::KAlarmApp()
 	{
 		connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged()));
 
-		KConfig* config = kapp->config();
+		TDEConfig* config = kapp->config();
 		config->setGroup(TQString::fromLatin1("General"));
 		mNoSystemTray           = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
 		mSavedNoSystemTray      = mNoSystemTray;
@@ -1042,7 +1042,7 @@ bool KAlarmApp::checkSystemTray()
 		// daemon with the correct NOTIFY type. If that happened when there was no system
 		// tray and alarms are disabled when KAlarm is not running, registering with
 		// NO_START_NOTIFY could result in alarms never being seen.
-		KConfig* config = kapp->config();
+		TDEConfig* config = kapp->config();
 		config->setGroup(TQString::fromLatin1("General"));
 		config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
 		config->sync();
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 3b9c9f55a..db2e4e3d7 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -95,13 +95,13 @@ bool ADCalendar::loadFile(bool reset)
 		mTempFileName = tempFile.name();
 		KURL dest;
 		dest.setPath(mTempFileName);
-		KIO::FileCopyJob* job = KIO::file_copy(url, dest, -1, true);
-		connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotDownloadJobResult(KIO::Job*)));
+		TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true);
+		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*)));
 	}
 	return true;
 }
 
-void ADCalendar::slotDownloadJobResult(KIO::Job *job)
+void ADCalendar::slotDownloadJobResult(TDEIO::Job *job)
 {
 	if (job->error())
 	{
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 965be1051..bbc962140 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -22,7 +22,7 @@
 #define ADCALENDAR_H
 
 #include <libkcal/calendarlocal.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 class ADCalendar;
 
 
@@ -72,7 +72,7 @@ class ADCalendar : public KCal::CalendarLocal
 		ADCalendar(const TQString& url, const TQCString& appname);
 
 	private slots:
-		void            slotDownloadJobResult(KIO::Job*);
+		void            slotDownloadJobResult(TDEIO::Job*);
 
 	private:
 		struct EventKey
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index e6211076e..0253e320a 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -48,7 +48,7 @@ void ADConfigData::readConfig()
 {
 	kdDebug(5900) << "ADConfigData::readConfig()" << endl;
 	ClientInfo::clear();
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	TQStringList clients = config->groupList().grep(CLIENT_GROUP_SEARCH);
 	for (TQStringList::Iterator cl = clients.begin();  cl != clients.end();  ++cl)
 	{
@@ -101,7 +101,7 @@ void ADConfigData::readConfig()
 */
 void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->writeEntry(TITLE_KEY, cinfo->title());
 	config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
@@ -115,7 +115,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
 */
 void ADConfigData::removeClient(const TQCString& appName)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->deleteGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->sync();
 }
@@ -125,7 +125,7 @@ void ADConfigData::removeClient(const TQCString& appName)
 */
 void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
 	config->writePathEntry(CALENDAR_KEY, cal->urlString());
         config->sync();
@@ -137,7 +137,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal)
 void ADConfigData::enableAutoStart(bool on)
 {
         kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
-        KConfig* config = TDEGlobal::config();
+        TDEConfig* config = TDEGlobal::config();
 	config->reparseConfiguration();
         config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
         config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 8fd34b114..75bb4d2df 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -83,7 +83,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		 * come in the wrong order, KAlarm won't know that it is supposed to restore
 		 * itself and instead will simply open a new window.
 		 */
-		KConfig kaconfig(locate("config", "kalarmrc"));
+		TDEConfig kaconfig(locate("config", "kalarmrc"));
 		kaconfig.setGroup(TQString::fromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
@@ -594,7 +594,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 */
 void AlarmDaemon::readKAlarmConfig()
 {
-	KConfig config(locate("config", "kalarmrc"));
+	TDEConfig config(locate("config", "kalarmrc"));
 	config.setGroup(TQString::fromLatin1("General"));
 	TQDateTime defTime(TQDate(1900,1,1), TQTime());
 	mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index a9eabaf49..e0c50d3cf 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -443,8 +443,8 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 			TQString attachment = (*at).local8Bit();
 			KURL url(attachment);
 			url.cleanPath();
-			KIO::UDSEntry uds;
-			if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
+			TDEIO::UDSEntry uds;
+			if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
 				kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl;
 				return i18n("Attachment not found:\n%1").arg(attachment);
 			}
@@ -470,7 +470,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 
 			// Read the file contents
 			TQString tmpFile;
-			if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
+			if (!TDEIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
 				kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl;
 				return attachError.arg(attachment);
 			}
@@ -831,8 +831,8 @@ int KAMail::checkAttachment(TQString& attachment, KURL* url)
 */
 bool KAMail::checkAttachment(const KURL& url)
 {
-	KIO::UDSEntry uds;
-	if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
+	TDEIO::UDSEntry uds;
+	if (!TDEIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow()))
 		return false;       // doesn't exist
 	KFileItem fi(uds, url);
 	if (fi.isDir()  ||  !fi.isReadable())
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index c58287bec..721ee5ea0 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -23,7 +23,7 @@
 #include "messagebox.h"
 
 
-KConfig* MessageBox::mConfig = 0;
+TDEConfig* MessageBox::mConfig = 0;
 TQMap<TQString, KMessageBox::ButtonCode> MessageBox::mContinueDefaults;
 
 
@@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
     if (dontShowAgainName.isEmpty())
 		return false;
 	// First check whether there is an existing setting
-	KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+	TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
 	config->setGroup(TQString::fromLatin1("Notification Messages"));
 	if (config->hasKey(dontShowAgainName))
 		return false;
@@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
 {
 	if (dontShowAgainName.isEmpty())
 		return;
-	KConfig* config = mConfig ? mConfig : TDEGlobal::config();
+	TDEConfig* config = mConfig ? mConfig : TDEGlobal::config();
 	config->setGroup(TQString::fromLatin1("Notification Messages"));
 	bool global = (dontShowAgainName[0] == ':');
 	if (yesno)
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 7a84cf202..b0cae2939 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -113,12 +113,12 @@ class MessageBox : public KMessageBox
 		 *  @param dontShow If true, the message box will be suppressed and will return Continue.
 		 */
 		static void saveDontShowAgainContinue(const TQString& dontShowAgainName, bool dontShow = true);
-		/** Sets the KConfig object to be used by the MessageBox class. */
-		static void setDontShowAskAgainConfig(KConfig* cfg)    { mConfig = cfg; }
+		/** Sets the TDEConfig object to be used by the MessageBox class. */
+		static void setDontShowAskAgainConfig(TDEConfig* cfg)    { mConfig = cfg; }
 
 	private:
 		static void saveDontShowAgain(const TQString& dontShowAgainName, bool yesno, bool dontShow, const char* yesnoResult = 0);
-		static KConfig*                  mConfig;
+		static TDEConfig*                  mConfig;
 		static TQMap<TQString, ButtonCode> mContinueDefaults;
 };
 
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index e4462db5c..765678c60 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -125,7 +125,7 @@ MainWindow::MainWindow(bool restored)
 	kdDebug(5950) << "MainWindow::MainWindow()\n";
 	setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME));    // save window sizes etc.
 	setPlainCaption(kapp->aboutData()->programName());
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(VIEW_GROUP);
 	mShowExpired = config->readBoolEntry(SHOW_ARCHIVED_KEY, false);
 	mShowTime    = config->readBoolEntry(SHOW_TIME_KEY, true);
@@ -199,7 +199,7 @@ MainWindow::~MainWindow()
 * Save settings to the session managed config file, for restoration
 * when the program is restored.
 */
-void MainWindow::saveProperties(KConfig* config)
+void MainWindow::saveProperties(TDEConfig* config)
 {
 	config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
 	config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired);
@@ -212,7 +212,7 @@ void MainWindow::saveProperties(KConfig* config)
 * This function is automatically called whenever the app is being
 * restored. Read in whatever was saved in saveProperties().
 */
-void MainWindow::readProperties(KConfig* config)
+void MainWindow::readProperties(TDEConfig* config)
 {
 	mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent"));
 	mShowExpired      = config->readBoolEntry(TQString::fromLatin1("ShowExpired"));
@@ -314,7 +314,7 @@ void MainWindow::hideEvent(TQHideEvent* he)
 */
 void MainWindow::columnsReordered()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
 	config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
 	config->sync();
@@ -792,7 +792,7 @@ void MainWindow::slotShowTime()
 	else
 	{
 		mListView->selectTimeColumns(mShowTime, mShowTimeTo);
-		KConfig* config = TDEGlobal::config();
+		TDEConfig* config = TDEGlobal::config();
 		config->setGroup(VIEW_GROUP);
 		config->writeEntry(SHOW_TIME_KEY, mShowTime);
 		config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -811,7 +811,7 @@ void MainWindow::slotShowTimeTo()
 	else
 	{
 		mListView->selectTimeColumns(mShowTime, mShowTimeTo);
-		KConfig* config = TDEGlobal::config();
+		TDEConfig* config = TDEGlobal::config();
 		config->setGroup(VIEW_GROUP);
 		config->writeEntry(SHOW_TIME_KEY, mShowTime);
 		config->writeEntry(SHOW_TIME_TO_KEY, mShowTimeTo);
@@ -829,7 +829,7 @@ void MainWindow::slotShowExpired()
 	mActionShowExpired->setToolTip(mShowExpired ? i18n_HideExpiredAlarms() : i18n_ShowExpiredAlarms());
 	mListView->showExpired(mShowExpired);
 	mListView->refresh();
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(VIEW_GROUP);
 	config->writeEntry(SHOW_ARCHIVED_KEY, mShowExpired);
 }
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index d8ca5181c..47a02447d 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -87,8 +87,8 @@ class MainWindow : public MainWindowBase
 		virtual void   closeEvent(TQCloseEvent*);
 		virtual void   dragEnterEvent(TQDragEnterEvent*);
 		virtual void   dropEvent(TQDropEvent*);
-		virtual void   saveProperties(KConfig*);
-		virtual void   readProperties(KConfig*);
+		virtual void   saveProperties(TDEConfig*);
+		virtual void   readProperties(TDEConfig*);
 
 	private slots:
 		void           slotNew();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 3e63853ea..0315b8f44 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -348,7 +348,7 @@ void MessageWin::initView()
 				bool dir = false;
 				TQString tmpFile;
 				KURL url(mMessage);
-				if (KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow()))
+				if (TDEIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow()))
 				{
 					TQFile qfile(tmpFile);
 					TQFileInfo info(qfile);
@@ -368,12 +368,12 @@ void MessageWin::initView()
 						view->resize(TQSize(h, h).expandedTo(view->sizeHint()));
 						TQWhatsThis::add(view, i18n("The contents of the file to be displayed"));
 					}
-					KIO::NetAccess::removeTempFile(tmpFile);
+					TDEIO::NetAccess::removeTempFile(tmpFile);
 				}
 				if (!opened)
 				{
 					// File couldn't be opened
-					bool exists = KIO::NetAccess::exists(url, true, MainWindow::mainMainWindow());
+					bool exists = TDEIO::NetAccess::exists(url, true, MainWindow::mainMainWindow());
 					mErrorMsgs += dir ? i18n("File is a folder") : exists ? i18n("Failed to open file") : i18n("File not found");
 				}
 				break;
@@ -658,7 +658,7 @@ void MessageWin::setRemainingTextMinute()
 * Save settings to the session managed config file, for restoration
 * when the program is restored.
 */
-void MessageWin::saveProperties(KConfig* config)
+void MessageWin::saveProperties(TDEConfig* config)
 {
 	if (mShown  &&  !mErrorWindow)
 	{
@@ -701,7 +701,7 @@ void MessageWin::saveProperties(KConfig* config)
 * This function is automatically called whenever the app is being restored.
 * Read in whatever was saved in saveProperties().
 */
-void MessageWin::readProperties(KConfig* config)
+void MessageWin::readProperties(TDEConfig* config)
 {
 	mInvalid             = config->readBoolEntry(TQString::fromLatin1("Invalid"), false);
 	mEventID             = config->readEntry(TQString::fromLatin1("EventID"));
@@ -853,8 +853,8 @@ void MessageWin::slotPlayAudio()
 	// First check that it exists, to avoid possible crashes if the filename is badly specified
 	MainWindow* mmw = MainWindow::mainMainWindow();
 	KURL url(mAudioFile);
-	if (!url.isValid()  ||  !KIO::NetAccess::exists(url, true, mmw)
-	||  !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
+	if (!url.isValid()  ||  !TDEIO::NetAccess::exists(url, true, mmw)
+	||  !TDEIO::NetAccess::download(url, mLocalAudioFile, mmw))
 	{
 		kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl;
 		if (!haveErrorMessage(ErrMsg_AudioFile))
@@ -1057,7 +1057,7 @@ void MessageWin::stopPlay()
 	delete mArtsDispatcher;  mArtsDispatcher = 0;
 	if (!mLocalAudioFile.isEmpty())
 	{
-		KIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
+		TDEIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
 		mLocalAudioFile = TQString();
 	}
 	if (mSilenceButton)
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index 03deea6b7..96f8b1f98 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -66,8 +66,8 @@ class MessageWin : public MainWindowBase
 		virtual void        moveEvent(TQMoveEvent*);
 		virtual void        resizeEvent(TQResizeEvent*);
 		virtual void        closeEvent(TQCloseEvent*);
-		virtual void        saveProperties(KConfig*);
-		virtual void        readProperties(KConfig*);
+		virtual void        saveProperties(TDEConfig*);
+		virtual void        readProperties(TDEConfig*);
 
 	private slots:
 		void                slotEdit();
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index c77c72f1c..24669fbe5 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -37,7 +37,7 @@
 #include "preferences.moc"
 
 
-static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write);
+static TQString translateXTermPath(TDEConfig*, const TQString& cmdline, bool write);
 
 Preferences* Preferences::mInstance = 0;
 
@@ -252,7 +252,7 @@ void Preferences::read()
 {
 	initialise();
 
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(GENERAL_SECTION);
 	TQStringList cols = config->readListEntry(MESSAGE_COLOURS);
 	if (!cols.count())
@@ -358,7 +358,7 @@ void Preferences::read()
 */
 void Preferences::save(bool syncToDisc)
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(GENERAL_SECTION);
 	config->writeEntry(VERSION_NUM, KALARM_VERSION);
 	TQStringList colours;
@@ -433,7 +433,7 @@ void Preferences::syncToDisc()
 
 void Preferences::updateStartOfDayCheck()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(GENERAL_SECTION);
 	config->writeEntry(START_OF_DAY_CHECK, startOfDayCheck());
 	config->sync();
@@ -549,7 +549,7 @@ bool Preferences::notifying(const TQString& messageID)
 */
 void Preferences::convertOldPrefs()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup(GENERAL_SECTION);
 	int version = KAlarm::getVersionNumber(config->readEntry(VERSION_NUM));
 	if (version >= KAlarm::Version(1,4,22))
@@ -647,11 +647,11 @@ void Preferences::convertOldPrefs()
 * Note that only a home directory specification at the start of the path is
 * translated, so there's no need to worry about missing out some of the
 * executable's path due to quotes etc.
-* N.B. Calling KConfig::read/writePathEntry() on the entire command line
+* N.B. Calling TDEConfig::read/writePathEntry() on the entire command line
 *      causes a crash on some systems, so it's necessary to extract the
 *      executable path first before processing.
 */
-TQString translateXTermPath(KConfig* config, const TQString& cmdline, bool write)
+TQString translateXTermPath(TDEConfig* config, const TQString& cmdline, bool write)
 {
 	TQString params;
 	TQString cmd = cmdline;
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index bb89711a3..1f386f30e 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -295,8 +295,8 @@ void SoundDlg::playSound()
 		return;
 	KURL url(mFileName);
 	MainWindow* mmw = MainWindow::mainMainWindow();
-	if (!url.isValid()  ||  !KIO::NetAccess::exists(url, true, mmw)
-	||  !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
+	if (!url.isValid()  ||  !TDEIO::NetAccess::exists(url, true, mmw)
+	||  !TDEIO::NetAccess::download(url, mLocalAudioFile, mmw))
 	{
 		kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl;
 		KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName));
@@ -369,7 +369,7 @@ void SoundDlg::stopPlay()
 	delete mPlayTimer;       mPlayTimer = 0;
 	if (!mLocalAudioFile.isEmpty())
 	{
-		KIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
+		TDEIO::NetAccess::removeTempFile(mLocalAudioFile);   // removes it only if it IS a temporary file
 		mLocalAudioFile = TQString();
 	}
 	mFilePlay->setPixmap(SmallIcon("player_play"));
@@ -400,7 +400,7 @@ bool SoundDlg::checkFile()
 	{
 		// It's an absolute path or URL.
 		// Only allow local files for KAudioPlayer.
-		if (url.isLocalFile()  &&  KIO::NetAccess::exists(url, true, this))
+		if (url.isLocalFile()  &&  TDEIO::NetAccess::exists(url, true, this))
 		{
 			mFileName = url.path();
 			return true;
@@ -425,7 +425,7 @@ bool SoundDlg::checkFile()
 				{
 					url.setPath(*it);
 					url.addPath(mFileName);
-					if (KIO::NetAccess::exists(url, true, this))
+					if (TDEIO::NetAccess::exists(url, true, this))
 					{
 						mFileName = url.path();
 						return true;
@@ -435,7 +435,7 @@ bool SoundDlg::checkFile()
 		}
 		url.setPath(TQDir::homeDirPath());
 		url.addPath(mFileName);
-		if (KIO::NetAccess::exists(url, true, this))
+		if (TDEIO::NetAccess::exists(url, true, this))
 		{
 			mFileName = url.path();
 			return true;
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 6fb5fc2ac..f7c29d0c4 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -88,7 +88,7 @@ Kandy::Kandy(CommandScheduler *scheduler)
 
   connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
 
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
   TQString currentProfile = config->readEntry("CurrentProfile",
                                              locate("appdata","default.kandy"));
@@ -148,14 +148,14 @@ void Kandy::setupActions()
   createGUI();
 }
 
-void Kandy::saveProperties(KConfig */*config*/)
+void Kandy::saveProperties(TDEConfig */*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void Kandy::readProperties(KConfig */*config*/)
+void Kandy::readProperties(TDEConfig */*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 8a2cd0b32..05bd39b36 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -91,14 +91,14 @@ class Kandy : public KMainWindow
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 
   private slots:
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 662802f55..99336c921 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -283,7 +283,7 @@ bool KandyView::loadFile(const TQString& filename)
     new CommandItem(mCommandList,cmds->at(i));
   }
 
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
   config->writeEntry("CurrentProfile",filename);
 
@@ -296,7 +296,7 @@ bool KandyView::saveFile(const TQString& filename)
 {
   if (!mScheduler->saveProfile(filename)) return false;
 
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
   config->writeEntry("CurrentProfile",filename);
 
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 9a8003063..318b3eaa6 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -86,14 +86,14 @@ void MobileMain::setupActions()
   createGUI("kandymobileui.rc");
 }
 
-void MobileMain::saveProperties(KConfig */*config*/)
+void MobileMain::saveProperties(TDEConfig */*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void MobileMain::readProperties(KConfig */*config*/)
+void MobileMain::readProperties(TDEConfig */*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 7c7c48452..eeff40bba 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -78,14 +78,14 @@ class MobileMain : public KMainWindow
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 
   private slots:
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 85c1bab49..bda5831bc 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -686,7 +686,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
 
@@ -1043,7 +1043,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
   return err;
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 738924429..c7e717e45 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -214,14 +214,14 @@ void MainWindow::starStatusBar()
   statusBar()->insertItem( i18n("Total" ), 1, 0, true );
 }
 
-void MainWindow::saveProperties( KConfig* cfg )
+void MainWindow::saveProperties( TDEConfig* cfg )
 {
   _taskView->stopAllTimers();
   _taskView->save();
   cfg->writeEntry( "WindowShown", isVisible());
 }
 
-void MainWindow::readProperties( KConfig* cfg )
+void MainWindow::readProperties( TDEConfig* cfg )
 {
   if( cfg->readBoolEntry( "WindowShown", true ))
     show();
@@ -440,7 +440,7 @@ void MainWindow::loadGeometry()
   if (initialGeometrySet()) setAutoSaveSettings();
   else
   {
-    KConfig &config = *kapp->config();
+    TDEConfig &config = *kapp->config();
 
     config.setGroup( TQString::fromLatin1("Main Window Geometry") );
     int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
@@ -454,7 +454,7 @@ void MainWindow::loadGeometry()
 
 void MainWindow::saveGeometry()
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.setGroup( TQString::fromLatin1("Main Window Geometry"));
   config.writeEntry( TQString::fromLatin1("Width"), width());
   config.writeEntry( TQString::fromLatin1("Height"), height());
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index d5a53a20c..366af3d7e 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -109,8 +109,8 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 
   protected:
     void starStatusBar();
-    virtual void saveProperties( KConfig* );
-    virtual void readProperties( KConfig* );
+    virtual void saveProperties( TDEConfig* );
+    virtual void readProperties( TDEConfig* );
     void saveGeometry();
     void loadGeometry();
     bool queryClose();
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 6544931ae..1dd13625c 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -251,7 +251,7 @@ TQString Preferences::userRealName()                  const { return _userRealNa
 //---------------------------------------------------------------------------
 void Preferences::load()
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
 
   config.setGroup( TQString::fromLatin1("Idle detection") );
   _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
@@ -286,7 +286,7 @@ void Preferences::load()
 
 void Preferences::save()
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
 
   config.setGroup( TQString::fromLatin1("Idle detection"));
   config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
@@ -311,23 +311,23 @@ void Preferences::save()
   config.sync();
 }
 
-// HACK: this entire config dialog should be upgraded to KConfigXT
+// HACK: this entire config dialog should be upgraded to TDEConfigXT
 bool Preferences::readBoolEntry( const TQString& key )
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   return config.readBoolEntry ( key, true );
 }
 
 void Preferences::writeEntry( const TQString &key, bool value)
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.writeEntry( key, value );
   config.sync();
 }
 
 void Preferences::deleteEntry( const TQString &key )
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.deleteEntry( key );
   config.sync();
 }
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index e17808a0d..6654bb3dd 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -96,7 +96,7 @@ extern "C" {
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -768,14 +768,14 @@ void
 IMAP4Protocol::setSubURL (const KURL & _url)
 {
   kdDebug(7116) << "IMAP4::setSubURL - " << _url.prettyURL() << endl;
-  KIO::TCPSlaveBase::setSubURL (_url);
+  TDEIO::TCPSlaveBase::setSubURL (_url);
 }
 
 void
 IMAP4Protocol::put (const KURL & _url, int, bool, bool)
 {
   kdDebug(7116) << "IMAP4::put - " << _url.prettyURL() << endl;
-//  KIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
+//  TDEIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
   TQString aBox, aSequence, aLType, aSection, aValidity, aDelimiter, aInfo;
   enum IMAP_TYPE aType =
     parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
@@ -1823,7 +1823,7 @@ void
 IMAP4Protocol::dispatch (int command, const TQByteArray & data)
 {
   kdDebug(7116) << "IMAP4::dispatch - command=" << command << endl;
-  KIO::TCPSlaveBase::dispatch (command, data);
+  TDEIO::TCPSlaveBase::dispatch (command, data);
 }
 
 void
@@ -1884,7 +1884,7 @@ IMAP4Protocol::stat (const KURL & _url)
       if (found)
         error(ERR_COULD_NOT_STAT, aBox);
       else
-        error(KIO::ERR_DOES_NOT_EXIST, aBox);
+        error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
     if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
@@ -2126,7 +2126,7 @@ bool IMAP4Protocol::makeLogin ()
 
     kdDebug(7116) << "IMAP4::makeLogin - attempting login" << endl;
 
-    KIO::AuthInfo authInfo;
+    TDEIO::AuthInfo authInfo;
     authInfo.username = myUser;
     authInfo.password = myPass;
     authInfo.prompt = i18n ("Username and password for your IMAP account:");
@@ -2143,21 +2143,21 @@ bool IMAP4Protocol::makeLogin ()
         }
       }
       if (!clientLogin (myUser, myPass, resultInfo))
-        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
+        error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
         "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
     }
     else
     {
 #ifdef HAVE_LIBSASL2
       if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
-        error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
+        error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
 	"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
       else {
         myUser = authInfo.username;
         myPass = authInfo.password;
       }
 #else
-      error(KIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
+      error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
 #endif
     }
     if ( hasCapability("NAMESPACE") )
@@ -2326,7 +2326,7 @@ IMAP4Protocol::doListEntry (const TQString & encodedUrl, int stretch, imapCache
     atom.m_str = myUser;
     entry.append (atom);
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = (withFlags) ? cache->getFlags() : S_IRUSR | S_IXUSR | S_IWUSR;
     entry.append (atom);
 
@@ -2704,7 +2704,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
           error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
         }
       } else {
-        error(KIO::ERR_DOES_NOT_EXIST, aBox);
+        error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
       }
       return false;
     }
@@ -2726,7 +2726,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
   // if it is the mode we want
   if (!getSelected().readWrite() && !readonly)
   {
-    error(KIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
     return false;
   }
 
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index d03f8c0c8..164cf8556 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -45,7 +45,7 @@ enum IMAP_TYPE
 
 /** @brief IOSlave derived class */
 class IMAP4Protocol:public
-  KIO::TCPSlaveBase,
+  TDEIO::TCPSlaveBase,
   public
   imapParser,
   public
@@ -194,7 +194,7 @@ private:
   TQByteArray outputCache;
   TQBuffer outputBuffer;
   TQ_ULONG outputBufferIndex;
-  KIO::filesize_t mProcessedSize;
+  TDEIO::filesize_t mProcessedSize;
 
   char readBuffer[IMAP_BUFFER];
   ssize_t readBufferLen;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index d7ad8697e..8cb06e318 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -169,7 +169,7 @@ imapParser::clientLogin (const TQString & aUser, const TQString & aPass,
 }
 
 #ifdef HAVE_LIBSASL2
-static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
+static bool sasl_interact( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, void *in )
 {
   kdDebug(7116) << "sasl_interact" << endl;
   sasl_interact_t *interact = ( sasl_interact_t * ) in;
@@ -215,7 +215,7 @@ static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
 #endif
 
 bool
-imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
+imapParser::clientAuthenticate ( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai,
   const TQString & aFTQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
 {
   bool retVal = false;
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index d24e9c813..7c498b09d 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -248,7 +248,7 @@ public:
    * @param resultInfo The resultinfo from the command
    * @return success or failure
    */
-  bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFTQDN,
+  bool clientAuthenticate (TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, const TQString & aFTQDN,
     const TQString & aAuth, bool isSSL, TQString & resultInfo);
 
   /**
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc
index 3d56c09ff..0c4fca815 100644
--- a/kioslaves/mbox/mbox.cc
+++ b/kioslaves/mbox/mbox.cc
@@ -59,7 +59,7 @@ int kdemain( int argc, char * argv[] )
 }
 
 MBoxProtocol::MBoxProtocol( const TQCString& arg1, const TQCString& arg2 )
-	: KIO::SlaveBase( "mbox2", arg1, arg2 ),
+	: TDEIO::SlaveBase( "mbox2", arg1, arg2 ),
 	m_errorState( true )
 {
 	
@@ -79,7 +79,7 @@ void MBoxProtocol::get( const KURL& url )
 
 	if( info.type() == UrlInfo::invalid && !m_errorState )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
 		return;
 	}
 	
@@ -106,7 +106,7 @@ void MBoxProtocol::listDir( const KURL& url )
 {
 	m_errorState = false;
 	
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	UrlInfo info( url, UrlInfo::directory );
 	ReadMBox mbox( &info, this, hasMetaData( "onlynew" ), hasMetaData( "savetime" ) );
 
@@ -115,7 +115,7 @@ void MBoxProtocol::listDir( const KURL& url )
 	
 	if( info.type() != UrlInfo::directory )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, info.url() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, info.url() );
 		return;
 	}
 	
@@ -126,7 +126,7 @@ void MBoxProtocol::listDir( const KURL& url )
 			listEntry( entry, false );
 	}
 
-	listEntry( KIO::UDSEntry(), true );
+	listEntry( TDEIO::UDSEntry(), true );
 	finished();
 }
 
@@ -135,7 +135,7 @@ void MBoxProtocol::stat( const KURL& url )
 	UrlInfo info( url );
 	if( info.type() == UrlInfo::invalid )
 	{
-		error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+		error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
 		return;
 	} else
 	{
@@ -154,7 +154,7 @@ void MBoxProtocol::mimetype( const KURL& url )
 		return;
 	
 	if( info.type() == UrlInfo::invalid )
-		error( KIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
+		error( TDEIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) );
 	else
 		mimeType( info.mimetype() );
 	finished();
diff --git a/kioslaves/mbox/mbox.h b/kioslaves/mbox/mbox.h
index 6d207ab3c..159c4213e 100644
--- a/kioslaves/mbox/mbox.h
+++ b/kioslaves/mbox/mbox.h
@@ -28,11 +28,11 @@ class KURL;
  * This class is the main class and implements all function
  * which can be called through the user.
  */
-class MBoxProtocol : public KIO::SlaveBase
+class MBoxProtocol : public TDEIO::SlaveBase
 {
 public:
 	/**
-	 * Constructor, for the parameters,  See KIO::SlaveBase
+	 * Constructor, for the parameters,  See TDEIO::SlaveBase
 	 */
 	MBoxProtocol( const TQCString&, const TQCString& );
 	/**
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 280bb4615..3125fd747 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -53,14 +53,14 @@ ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, boo
 	
 {
 	if( m_info->type() == UrlInfo::invalid )
-		m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+		m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
 		
 	if( !open( savetime ) )
-		m_mbox->emitError( KIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
+		m_mbox->emitError( TDEIO::ERR_CANNOT_OPEN_FOR_READING, info->url() );
 
 	if( m_info->type() == UrlInfo::message )
 		if( !searchMessage( m_info->id() ) )
-			m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() );
+			m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() );
 }
 
 ReadMBox::~ReadMBox()
diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc
index 00285b149..c5d9a3bdf 100644
--- a/kioslaves/mbox/stat.cc
+++ b/kioslaves/mbox/stat.cc
@@ -26,20 +26,20 @@
 
 #include <sys/stat.h>
 
-KIO::UDSEntry Stat::stat( const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( const UrlInfo& info )
 {
 	if( info.type() == UrlInfo::message )
 		return Stat::statMessage( info );
 	else if( info.type() == UrlInfo::directory )
 		return Stat::statDirectory( info );
 	else
-		return KIO::UDSEntry();
+		return TDEIO::UDSEntry();
 }
 
-KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
+TDEIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
 {
 	kdDebug() << "Stat::stat()" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	TQString url;
 	
 	if( info.type() == UrlInfo::invalid )
@@ -47,54 +47,54 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info )
 	else if( info.type() == UrlInfo::message )
 		mbox.searchMessage( info.id() );
 
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
-        Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+        Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
 		        
 	url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() );
-	Stat::addAtom( entry, KIO::UDS_URL, url );
+	Stat::addAtom( entry, TDEIO::UDS_URL, url );
 	if( mbox.currentID().isEmpty() )
-		Stat::addAtom( entry, KIO::UDS_NAME, "foobar" );
+		Stat::addAtom( entry, TDEIO::UDS_NAME, "foobar" );
 	else
-	        Stat::addAtom( entry, KIO::UDS_NAME, mbox.currentID() );
+	        Stat::addAtom( entry, TDEIO::UDS_NAME, mbox.currentID() );
 	
 
-	Stat::addAtom( entry, KIO::UDS_SIZE, mbox.skipMessage() );
+	Stat::addAtom( entry, TDEIO::UDS_SIZE, mbox.skipMessage() );
 
 	return entry;
 }
 
-KIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statDirectory( const UrlInfo& info )
 {
 	kdDebug() << "statDirectory()" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 
 	//Specific things for a directory
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFDIR );
-	Stat::addAtom( entry, KIO::UDS_NAME, info.filename() );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFDIR );
+	Stat::addAtom( entry, TDEIO::UDS_NAME, info.filename() );
 
 	return entry;
 }
 
-KIO::UDSEntry Stat::statMessage( const UrlInfo& info )
+TDEIO::UDSEntry Stat::statMessage( const UrlInfo& info )
 {
 	kdDebug() << "statMessage( " << info.url()  << " )" << endl;
-	KIO::UDSEntry entry;
+	TDEIO::UDSEntry entry;
 	TQString url = TQString( "mbox:%1" ).arg( info.url() );
 
 	//Specific things for a message
-	Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG );
-	Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" );
+	Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG );
+	Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" );
 	
-	Stat::addAtom( entry, KIO::UDS_URL, url );
+	Stat::addAtom( entry, TDEIO::UDS_URL, url );
 	url = url.right( url.length() - url.findRev( "/" ) - 1 );
-	Stat::addAtom( entry, KIO::UDS_NAME, url );
+	Stat::addAtom( entry, TDEIO::UDS_NAME, url );
 
 	return entry;
 }
 
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, const TQString& str )
 {
-	KIO::UDSAtom atom;
+	TDEIO::UDSAtom atom;
 	atom.m_uds = uds;
 	atom.m_str = str;
 	atom.m_long = 0;
@@ -103,9 +103,9 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str
 }
 
 
-void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng )
+void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, long lng )
 {
-	KIO::UDSAtom atom;
+	TDEIO::UDSAtom atom;
 	atom.m_uds = uds;
 	atom.m_str = TQString();
 	atom.m_long = lng;
diff --git a/kioslaves/mbox/stat.h b/kioslaves/mbox/stat.h
index 3efbcaf64..8ce593cc0 100644
--- a/kioslaves/mbox/stat.h
+++ b/kioslaves/mbox/stat.h
@@ -50,7 +50,7 @@ public:
 	 * @param info The file information
 	 * @return The information of the file as destribed in UrlInfo.
 	 */
-	static KIO::UDSEntry stat( const UrlInfo& info );
+	static TDEIO::UDSEntry stat( const UrlInfo& info );
 	/**
 	 * This function gives information with a given ReadMBox and UrlInfo.
 	 * Through this, it is possible to ask the stats of the next message,
@@ -59,24 +59,24 @@ public:
 	 * @param info The url information.
 	 * @return The requesteds information.
 	 */
-	static KIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
+	static TDEIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info );
 	
 	/**
 	 * This function gets the stats of a given mbox-file in an UDSEntry.
 	 * @param info The location of the mbox-file.
 	 * @return A list of Atoms.
 	 */
-	static KIO::UDSEntry statDirectory( const UrlInfo& info );
+	static TDEIO::UDSEntry statDirectory( const UrlInfo& info );
 
 	/**
 	 * This function gets the stats of a geven mbox-message in a UDSEntry.
 	 * @param info The url of the mbox-message.
 	 * @return Information shipped in an UDSEntry.
 	 */
-	static KIO::UDSEntry statMessage( const UrlInfo& info );
+	static TDEIO::UDSEntry statMessage( const UrlInfo& info );
 private:
-	static void addAtom( KIO::UDSEntry& entry, unsigned int key, const TQString& value );
-	static void addAtom( KIO::UDSEntry& entry, unsigned int key, const long value );
+	static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const TQString& value );
+	static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const long value );
 };
 
 #endif
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 70ffd7dcc..b4c19b711 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -193,9 +193,9 @@ void OpenGroupware::getCalendar( const KURL &_url )
   kdDebug(7000) << "getCalendar: " << url.prettyURL() << endl;
 
   // FIXME do progress handling
-  mListEventsJob = KIO::davPropFind( url, props, "0", false );
-  connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotGetCalendarListingResult( KIO::Job * ) ) );
+  mListEventsJob = TDEIO::davPropFind( url, props, "0", false );
+  connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
 }
 
 void OpenGroupware::getAddressbook( const KURL &url )
@@ -205,7 +205,7 @@ void OpenGroupware::getAddressbook( const KURL &url )
 
 void OpenGroupware::errorMessage( const TQString &msg )
 {
-  error( KIO::ERR_SLAVE_DEFINED, msg );
+  error( TDEIO::ERR_SLAVE_DEFINED, msg );
 }
 
 void OpenGroupware::debugMessage( const TQString &msg )
@@ -218,7 +218,7 @@ void OpenGroupware::debugMessage( const TQString &msg )
 }
 
 
-void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarListingResult( TDEIO::Job *job )
 {
   
   kdDebug(7000) << k_funcinfo << endl;
@@ -242,7 +242,7 @@ void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job )
 }
 
 
-void OpenGroupware::slotGetCalendarResult( KIO::Job *job )
+void OpenGroupware::slotGetCalendarResult( TDEIO::Job *job )
 {
   Q_UNUSED( job );
 }
diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h
index 075af372a..da104c8cf 100644
--- a/kioslaves/opengroupware/opengroupware.h
+++ b/kioslaves/opengroupware/opengroupware.h
@@ -24,13 +24,13 @@
 
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class DavJob;
 }
 
 
-class OpenGroupware : public TQObject, public KIO::SlaveBase
+class OpenGroupware : public TQObject, public TDEIO::SlaveBase
 {
     Q_OBJECT
   
@@ -48,10 +48,10 @@ class OpenGroupware : public TQObject, public KIO::SlaveBase
     void getCalendar( const KURL &url );
     void getAddressbook( const KURL &url );
   protected slots:
-    void slotGetCalendarListingResult( KIO::Job* );
-    void slotGetCalendarResult( KIO::Job* );
+    void slotGetCalendarListingResult( TDEIO::Job* );
+    void slotGetCalendarResult( TDEIO::Job* );
   private:
-    KIO::DavJob *mListEventsJob;
+    TDEIO::DavJob *mListEventsJob;
 };
 
 #endif
diff --git a/kioslaves/sieve/configure.in.in b/kioslaves/sieve/configure.in.in
index a722cfebb..ffc1b4b7e 100644
--- a/kioslaves/sieve/configure.in.in
+++ b/kioslaves/sieve/configure.in.in
@@ -4,7 +4,7 @@ AC_ARG_ENABLE(broken-timsieved-workaround,
                 [versions <= 1.1.0 of the timsieved (part of the Cyrus
 		IMAP suite) do not interpret the HAVESPACE command of
 		the sieve protocol. This option makes the sieve
-		KIO::Slave simply omit that command.])],
+		TDEIO::Slave simply omit that command.])],
 [case "${enableval}" in
       yes) AC_MSG_RESULT(yes)
 	   need_broken_timsieved_support="yes" ;;
@@ -14,5 +14,5 @@ esac],[AC_MSG_RESULT(no)])
 
 if test "$need_broken_timsieved_support" = "yes"; then
    AC_SUBST(HAVE_BROKEN_TIMSIEVED)
-   AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve KIO::Slave must be able to talk to timsieved <= 1.1.0])
+   AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve TDEIO::Slave must be able to talk to timsieved <= 1.1.0])
 fi
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 4e95c5a16..9d373c2ad 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -77,7 +77,7 @@ static sasl_callback_t callbacks[] = {
 
 static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512;
 
-using namespace KIO;
+using namespace TDEIO;
 extern "C"
 {
 	KDE_EXPORT int kdemain(int argc, char **argv)
@@ -441,7 +441,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
 
 		// This crashes under certain conditions as described in
 		// http://intevation.de/roundup/kolab/issue2442
-		// Fixing KIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
+		// Fixing TDEIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support.
 		//if (!operationSuccessful())
 		//	ksDebug() << "Server did not logout cleanly." << endl;
 	}
@@ -745,7 +745,7 @@ void kio_sieveProtocol::get(const KURL& url)
 		do {
 		  // wait for data...
 		  if ( !waitForResponse( 600 ) ) {
-		    error( KIO::ERR_SERVER_TIMEOUT, m_sServer );
+		    error( TDEIO::ERR_SERVER_TIMEOUT, m_sServer );
 		    disconnect( true );
 		    return;
 		  }
@@ -757,7 +757,7 @@ void kio_sieveProtocol::get(const KURL& url)
 		  ssize_t this_recv_len = read( dat.data(), dat.size() );
 
 		  if ( this_recv_len < 1 && !isConnectionValid() ) {
-		    error( KIO::ERR_CONNECTION_BROKEN, m_sServer );
+		    error( TDEIO::ERR_CONNECTION_BROKEN, m_sServer );
 		    disconnect( true );
 		    return;
 		  }
@@ -856,15 +856,15 @@ void kio_sieveProtocol::stat(const KURL& url)
 
 	if (filename.isEmpty()) {
 		UDSAtom atom;
-		atom.m_uds = KIO::UDS_NAME;
+		atom.m_uds = TDEIO::UDS_NAME;
 		atom.m_str = "/";
 		entry.append(atom);
 
-		atom.m_uds = KIO::UDS_FILE_TYPE;
+		atom.m_uds = TDEIO::UDS_FILE_TYPE;
 		atom.m_long = S_IFDIR;
 		entry.append(atom);
 
-		atom.m_uds = KIO::UDS_ACCESS;
+		atom.m_uds = TDEIO::UDS_ACCESS;
 		atom.m_long = 0700;
 		entry.append(atom);
 
@@ -885,22 +885,22 @@ void kio_sieveProtocol::stat(const KURL& url)
 					entry.clear();
 
 					UDSAtom atom;
-					atom.m_uds = KIO::UDS_NAME;
+					atom.m_uds = TDEIO::UDS_NAME;
 					atom.m_str = TQString::fromUtf8(r.getKey());
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_FILE_TYPE;
+					atom.m_uds = TDEIO::UDS_FILE_TYPE;
 					atom.m_long = S_IFREG;
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_ACCESS;
+					atom.m_uds = TDEIO::UDS_ACCESS;
 					if ( r.getExtra() == "ACTIVE" )
 					  atom.m_long = 0700; // mark exec'able
 					else
 					  atom.m_long = 0600;
 					entry.append(atom);
 
-					atom.m_uds = KIO::UDS_MIME_TYPE;
+					atom.m_uds = TDEIO::UDS_MIME_TYPE;
 					atom.m_str = "application/sieve";
 					entry.append(atom);
 
@@ -937,22 +937,22 @@ void kio_sieveProtocol::listDir(const KURL& url)
 			entry.clear();
 
 			UDSAtom atom;
-			atom.m_uds = KIO::UDS_NAME;
+			atom.m_uds = TDEIO::UDS_NAME;
 			atom.m_str = TQString::fromUtf8(r.getKey());
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_FILE_TYPE;
+			atom.m_uds = TDEIO::UDS_FILE_TYPE;
 			atom.m_long = S_IFREG;
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_ACCESS;
+			atom.m_uds = TDEIO::UDS_ACCESS;
 			if ( r.getExtra() == "ACTIVE" )
 			  atom.m_long = 0700; // mark exec'able
 			else
 			  atom.m_long = 0600;
 			entry.append(atom);
 
-			atom.m_uds = KIO::UDS_MIME_TYPE;
+			atom.m_uds = TDEIO::UDS_MIME_TYPE;
 			atom.m_str = "application/sieve";
 			entry.append(atom);
 
diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h
index d435892ec..2168da723 100644
--- a/kioslaves/sieve/sieve.h
+++ b/kioslaves/sieve/sieve.h
@@ -58,7 +58,7 @@ protected:
 	TQCString	extra;
 };
 
-class kio_sieveProtocol : public KIO::TCPSlaveBase
+class kio_sieveProtocol : public TDEIO::TCPSlaveBase
 {
 
 public:
@@ -104,7 +104,7 @@ protected:
 	int operationResult();
 
 	bool parseCapabilities(bool requestCapabilities = false);
-  bool saslInteract( void *in, KIO::AuthInfo &ai );
+  bool saslInteract( void *in, TDEIO::AuthInfo &ai );
 
 	// IOSlave global data
 	uint				m_connMode;
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index d970bbe8a..927acc7ed 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -171,7 +171,7 @@ of which you have to reimplement at least the first two:
 
 - void installProfile()
   This is called when the user selected a profile and hit apply. A
-  profile is just another KConfig object. Therefore, this method
+  profile is just another TDEConfig object. Therefore, this method
   should be the same as setup(), except that you should only alter
   widgets for configs that really exist in the profile.
 
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index c655583c9..6e80f20de 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+    { "Sam Abed", 0, 0, 0 }, // TDEConfigXT porting, smileys->emoticons replacement
     { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
     { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
     { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f7..a2bb384ff 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -49,10 +49,10 @@ AccountManager::~AccountManager()
 //-----------------------------------------------------------------------------
 void AccountManager::writeConfig( bool withSync )
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQString groupName;
 
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   config->writeEntry("accounts", mAcctList.count());
 
   // first delete all account groups in the config file:
@@ -66,7 +66,7 @@ void AccountManager::writeConfig( bool withSync )
   int i = 1;
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it, ++i ) {
     groupName.sprintf("Account %d", i);
-    KConfigGroupSaver saver(config, groupName);
+    TDEConfigGroupSaver saver(config, groupName);
     (*it)->writeConfig(*config);
   }
   if (withSync) config->sync();
@@ -76,7 +76,7 @@ void AccountManager::writeConfig( bool withSync )
 //-----------------------------------------------------------------------------
 void AccountManager::readConfig(void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMAccount* acct;
   TQString acctType, acctName;
   TQCString groupName;
@@ -87,13 +87,13 @@ void AccountManager::readConfig(void)
       delete *it;
   mAcctList.clear();
 
-  KConfigGroup general(config, "General");
+  TDEConfigGroup general(config, "General");
   num = general.readNumEntry("accounts", 0);
 
   for (i=1; i<=num; i++)
   {
     groupName.sprintf("Account %d", i);
-    KConfigGroupSaver saver(config, groupName);
+    TDEConfigGroupSaver saver(config, groupName);
     acctType = config->readEntry("Type");
     // Provide backwards compatibility
     if (acctType == "advanced pop" || acctType == "experimental pop")
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 5ae16164b..89861527b 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -120,7 +120,7 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
 
 void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
 {
-  KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
+  TDEConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
 
   if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
     AccountWizard wizard( kernel, parent );
@@ -367,7 +367,7 @@ void AccountWizard::accept()
 void AccountWizard::createTransport()
 {
   // create outgoing account
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   uint numTransports = general.readNumEntry( "transports", 0 );
 
@@ -403,7 +403,7 @@ void AccountWizard::transportCreated()
 {
   mTransportInfoList.append( mTransportInfo );
 
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   general.writeEntry( "transports", mTransportInfoList.count() );
 
   for ( uint i = 0 ; i < mTransportInfoList.count() ; i++ )
@@ -411,12 +411,12 @@ void AccountWizard::transportCreated()
 
     // No default transport? => set the first transport as the default
   if ( GlobalSettings::self()->defaultTransport().isEmpty() ) {
-    KConfigGroup general( KMKernel::config(), "General" );
+    TDEConfigGroup general( KMKernel::config(), "General" );
 
     if ( mTransportInfoList.count() > 0 ) {
       KMTransportInfo info;
       info.readConfig( 1 );
-      KConfigGroup composer( KMKernel::config(), "Composer" );
+      TDEConfigGroup composer( KMKernel::config(), "Composer" );
       GlobalSettings::self()->setDefaultTransport( info.name );
       GlobalSettings::self()->setCurrentTransport( info.name );
     }
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1ad1a69be..2aa55b0c1 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -120,7 +120,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
 }
 #endif
 
-KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
+TDEIO::SimpleJob* ACLJobs::setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
 {
   TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
 
@@ -128,53 +128,53 @@ KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQStr
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'S' << url << user << perm;
 
-  KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::DeleteACLJob* ACLJobs::deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user )
+ACLJobs::DeleteACLJob* ACLJobs::deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'D' << url << user;
 
   ACLJobs::DeleteACLJob* job = new ACLJobs::DeleteACLJob( url, user, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::GetACLJob* ACLJobs::getACL( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetACLJob* ACLJobs::getACL( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'G' << url;
 
   ACLJobs::GetACLJob* job = new ACLJobs::GetACLJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'M' << url;
 
   ACLJobs::GetUserRightsJob* job = new ACLJobs::GetUserRightsJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs,
                                  bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList lst = TQStringList::split( "\"", str, true );
@@ -189,13 +189,13 @@ void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
 
 ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
                                                bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   m_permissions = IMAPRightsToPermission( str, url(), TQString() );
@@ -204,15 +204,15 @@ void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str
 ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId,
                                      const TQByteArray &packedArgs,
                                      bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
     mUserId( userId )
 {
 }
 
 ////
 
-ACLJobs::MultiSetACLJob::MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() )
 {
@@ -228,7 +228,7 @@ void ACLJobs::MultiSetACLJob::slotStart()
   if ( mACLListIterator != mACLList.end() )
   {
     const ACLListEntry& entry = *mACLListIterator;
-    KIO::Job* job = 0;
+    TDEIO::Job* job = 0;
     if ( entry.permissions > -1 )
       job = setACL( mSlave, mUrl, entry.userId, entry.permissions );
     else
@@ -240,10 +240,10 @@ void ACLJobs::MultiSetACLJob::slotStart()
   }
 }
 
-void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
+void ACLJobs::MultiSetACLJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove(job);
@@ -255,7 +255,7 @@ void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
   slotStart();
 }
 
-ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl )
+ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl )
 {
   return new MultiSetACLJob( slave, url, acl, false /*showProgressInfo*/ );
 }
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 6404a2287..b4bfd0dfb 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -86,26 +86,26 @@ namespace ACLJobs {
     All = List | Read | WriteFlags | Insert | Post | Create | Delete | Administer | WriteSeenFlag
   };
   /// Set the permissions for a given user on a given url
-  KIO::SimpleJob* setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
+  TDEIO::SimpleJob* setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
 
   class DeleteACLJob;
   /// Delete the permissions for a given user on a given url
-  DeleteACLJob* deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user );
+  DeleteACLJob* deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user );
 
   class GetACLJob;
   /// List all ACLs for a given url
-  GetACLJob* getACL( KIO::Slave* slave, const KURL& url );
+  GetACLJob* getACL( TDEIO::Slave* slave, const KURL& url );
 
   class GetUserRightsJob;
   /// Get the users' rights for a given url
-  GetUserRightsJob* getUserRights( KIO::Slave* slave, const KURL& url );
+  GetUserRightsJob* getUserRights( TDEIO::Slave* slave, const KURL& url );
 
   class MultiSetACLJob;
   /// Set and delete a list of permissions for different users on a given url
-  MultiSetACLJob* multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl );
+  MultiSetACLJob* multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl );
 
   /// List all ACLs for a given url
-  class GetACLJob : public KIO::SimpleJob
+  class GetACLJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -116,13 +116,13 @@ namespace ACLJobs {
     const ACLList& entries() const { return m_entries; }
 
   protected slots:
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
   private:
     ACLList m_entries;
   };
 
   /// Get the users' rights for a given url
-  class GetUserRightsJob : public KIO::SimpleJob
+  class GetUserRightsJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -132,14 +132,14 @@ namespace ACLJobs {
     unsigned int permissions() const { return m_permissions; }
 
   protected slots:
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
   private:
     unsigned int m_permissions;
   };
 
   /// Delete the permissions for a given user on a given url
   /// This class only exists to store the userid in the job
-  class DeleteACLJob : public KIO::SimpleJob
+  class DeleteACLJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -155,12 +155,12 @@ namespace ACLJobs {
   };
 
   /// Set and delete a list of permissions for different users on a given url
-  class MultiSetACLJob : public KIO::Job {
+  class MultiSetACLJob : public TDEIO::Job {
     Q_OBJECT
   
 
   public:
-    MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
+    MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
 
   signals:
     // Emitted when a given user's permissions were successfully changed.
@@ -169,10 +169,10 @@ namespace ACLJobs {
 
   protected slots:
     virtual void slotStart();
-    virtual void slotResult( KIO::Job *job );
+    virtual void slotResult( TDEIO::Job *job );
 
   private:
-    KIO::Slave* mSlave;
+    TDEIO::Slave* mSlave;
     const KURL mUrl;
     const ACLList mACLList;
     ACLList::const_iterator mACLListIterator;
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 215e54511..6f8e43b0d 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -544,7 +544,7 @@ void ActionScheduler::processMessage()
 
   bool mdnEnabled = true;
   {
-    KConfigGroup mdnConfig( kmkernel->config(), "MDN" );
+    TDEConfigGroup mdnConfig( kmkernel->config(), "MDN" );
     int mode = mdnConfig.readNumEntry( "default-policy", 0 );
     if (!mode || mode < 0 || mode > 3)
       mdnEnabled = false;
@@ -820,8 +820,8 @@ bool ActionScheduler::isEnabled()
 	return sEnabled;
 
     sEnabledChecked = true;
-    KConfig* config = KMKernel::config();
-    KConfigGroupSaver saver(config, "General");
+    TDEConfig* config = KMKernel::config();
+    TDEConfigGroupSaver saver(config, "General");
     sEnabled = config->readBoolEntry("action-scheduler", false);
     return sEnabled;
 }
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 6fb6645e9..6aa4d932d 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -34,21 +34,21 @@
 
 using namespace KMail;
 
-KIO::SimpleJob* AnnotationJobs::setAnnotation(
-    KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* AnnotationJobs::setAnnotation(
+    TDEIO::Slave* slave, const KURL& url, const TQString& entry,
     const TQMap<TQString,TQString>& attributes )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'M' << (int)'S' << url << entry << attributes;
 
-  KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
-    KIO::Slave* slave, const KURL& url, const TQString& entry,
+    TDEIO::Slave* slave, const KURL& url, const TQString& entry,
     const TQStringList& attributes )
 {
   TQByteArray packedArgs;
@@ -56,21 +56,21 @@ AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
   stream << (int)'M' << (int)'G' << url << entry << attributes;
 
   GetAnnotationJob* job = new GetAnnotationJob( url, entry, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQString& entry,
                                                     const TQByteArray &packedArgs,
                                                     bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
     mEntry( entry )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList lst = TQStringList::split( "\r", str );
@@ -83,8 +83,8 @@ void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQStrin
 }
 
 AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob(
-  KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+  TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() )
 {
@@ -97,17 +97,17 @@ void AnnotationJobs::MultiGetAnnotationJob::slotStart()
   if ( mEntryListIterator != mEntryList.end() ) {
     TQStringList attributes;
     attributes << "value";
-    KIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
+    TDEIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiGetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -130,7 +130,7 @@ void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
   slotStart();
 }
 
-AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries )
+AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries )
 {
   return new MultiGetAnnotationJob( slave, url, entries, false /*showProgressInfo*/ );
 }
@@ -138,8 +138,8 @@ AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::
 ////
 
 AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob(
-  KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+  TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() )
 {
@@ -156,17 +156,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotStart()
     TQMap<TQString, TQString> attributes;
     attributes.insert( attr.name, attr.value );
     kdDebug() << k_funcinfo << " setting annotation " << attr.entry << " " << attr.name << " " << attr.value << endl;
-    KIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
+    TDEIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiSetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -179,17 +179,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
 }
 
 AnnotationJobs::MultiSetAnnotationJob* AnnotationJobs::multiSetAnnotation(
-  KIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
+  TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
 {
   return new MultiSetAnnotationJob( slave, url, annotations, false /*showProgressInfo*/ );
 }
 
 
-AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave* slave,
                                                                     const KURL& baseUrl,
                                                                     const TQStringList& paths,
                                                                     const TQString& annotation )
-  : KIO::Job( false ),
+  : TDEIO::Job( false ),
     mSlave( slave ),
     mUrl( baseUrl ),
     mPathList( paths ),
@@ -207,17 +207,17 @@ void AnnotationJobs::MultiUrlGetAnnotationJob::slotStart()
     attributes << "value";
     KURL url(mUrl);
     url.setPath( *mPathListIterator );
-    KIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
+    TDEIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -241,7 +241,7 @@ TQMap<TQString, TQString> AnnotationJobs::MultiUrlGetAnnotationJob::annotations(
   return mAnnotations;
 }
 
-AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( TDEIO::Slave* slave,
                                                                                  const KURL& baseUrl,
                                                                                  const TQStringList& paths,
                                                                                  const TQString& annotation )
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 3972a80b0..8b50a025a 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -65,14 +65,14 @@ namespace AnnotationJobs {
  * @param entry the name of the annotation entry
  * @param attributes attribute name+value pairs
  */
-KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* setAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                const TQMap<TQString,TQString>& attributes );
 
 class MultiSetAnnotationJob;
 /**
  * Set multiple annotation entries
  */
-MultiSetAnnotationJob* multiSetAnnotation( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
+MultiSetAnnotationJob* multiSetAnnotation( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
 
 class GetAnnotationJob;
 /**
@@ -82,7 +82,7 @@ class GetAnnotationJob;
  * @param entry the name of the annotation entry
  * @param attributes attribute names
  */
-GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+GetAnnotationJob* getAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                  const TQStringList& attributes );
 
 class MultiGetAnnotationJob;
@@ -90,7 +90,7 @@ class MultiGetAnnotationJob;
  * Get multiple annotation entries
  * Currently we assume we want to get the "value" for each, to simplify the data structure.
  */
-MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries );
+MultiGetAnnotationJob* multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries );
 
 class MultiUrlGetAnnotationJob;
 /**
@@ -98,14 +98,14 @@ class MultiUrlGetAnnotationJob;
  * @param paths The paths to get the annotation for 
  * @param annotation The annotation to get
  */
-MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
+MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave,
                                               const KURL& baseUrl,
                                               const TQStringList& paths,
                                               const TQString& annotation );
 
 
 /// for getAnnotation()
-class GetAnnotationJob : public KIO::SimpleJob
+class GetAnnotationJob : public TDEIO::SimpleJob
 {
   Q_OBJECT
   
@@ -116,20 +116,20 @@ public:
   const AnnotationList& annotations() const { return mAnnotations; }
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const TQString& );
+  void slotInfoMessage( TDEIO::Job*, const TQString& );
 private:
   AnnotationList mAnnotations;
   TQString mEntry;
 };
 
 /// for multiGetAnnotation
-class MultiGetAnnotationJob : public KIO::Job
+class MultiGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
+  MultiGetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was found - or not found
@@ -137,33 +137,33 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mEntryList;
   TQStringList::const_iterator mEntryListIterator;
 };
 
 /// for multiUrlGetAnnotation
-class MultiUrlGetAnnotationJob : public KIO::Job
+class MultiUrlGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
+  MultiUrlGetAnnotationJob( TDEIO::Slave* slave, const KURL& baseUrl,
                             const TQStringList& paths, const TQString& annotation );
 
   TQMap<TQString, TQString> annotations() const;
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mPathList;
   TQStringList::const_iterator mPathListIterator;
@@ -172,13 +172,13 @@ private:
 };
 
 /// for multiSetAnnotation
-class MultiSetAnnotationJob : public KIO::Job
+class MultiSetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
+  MultiSetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was successfully changed
@@ -186,10 +186,10 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const AnnotationList mAnnotationList;
   AnnotationList::const_iterator mAnnotationListIterator;
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 0cb047fd4..9a1c8347f 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -54,12 +54,12 @@ AntiSpamConfig * AntiSpamConfig::instance() {
 void AntiSpamConfig::readConfig()
 {
   mAgents.clear();
-  KConfig config( "kmail.antispamrc", true );
+  TDEConfig config( "kmail.antispamrc", true );
   config.setReadDefaults( true );
-  KConfigGroup general( &config, "General" );
+  TDEConfigGroup general( &config, "General" );
   unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 );
   for ( unsigned int i = 1; i <= totalTools; ++i ) {
-    KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
+    TDEConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
     if ( tool.hasKey( "ScoreHeader" ) ) {
       TQString name      = tool.readEntry( "ScoreName" );
       TQCString header   = tool.readEntry( "ScoreHeader" ).latin1();
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 2f6750f2c..d83a19e1f 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -680,9 +680,9 @@ AntiSpamWizard::ConfigReader::ConfigReader( WizardMode mode,
     mMode( mode )
 {
   if ( mMode == AntiSpam )
-    mConfig = new KConfig( "kmail.antispamrc", true );
+    mConfig = new TDEConfig( "kmail.antispamrc", true );
   else
-    mConfig = new KConfig( "kmail.antivirusrc", true );
+    mConfig = new TDEConfig( "kmail.antivirusrc", true );
 }
 
 AntiSpamWizard::ConfigReader::~ConfigReader( )
@@ -698,11 +698,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
                       : TQString("Virustool #%1");
   // read the configuration from the global config file
   mConfig->setReadDefaults( true );
-  KConfigGroup general( mConfig, "General" );
+  TDEConfigGroup general( mConfig, "General" );
   int registeredTools = general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+    TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mToolList.append( readToolConfig( toolConfig ) );
   }
@@ -710,11 +710,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
   // read the configuration from the user config file
   // and merge newer config data
   mConfig->setReadDefaults( false );
-  KConfigGroup user_general( mConfig, "General" );
+  TDEConfigGroup user_general( mConfig, "General" );
   int user_registeredTools = user_general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= user_registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+    TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mergeToolConfig( readToolConfig( toolConfig ) );
   }
@@ -730,7 +730,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
 
 
 AntiSpamWizard::SpamToolConfig
-    AntiSpamWizard::ConfigReader::readToolConfig( KConfigGroup & configGroup )
+    AntiSpamWizard::ConfigReader::readToolConfig( TDEConfigGroup & configGroup )
 {
   TQString id = configGroup.readEntry( "Ident" );
   int version = configGroup.readNumEntry( "Version" );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e66d2f358..ed9e4a3b4 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -225,10 +225,10 @@ namespace KMail {
 
         private:
           TQValueList<SpamToolConfig> & mToolList;
-          KConfig *mConfig;
+          TDEConfig *mConfig;
           WizardMode mMode;
 
-          SpamToolConfig readToolConfig( KConfigGroup & configGroup );
+          SpamToolConfig readToolConfig( TDEConfigGroup & configGroup );
           SpamToolConfig createDummyConfig();
 
           void mergeToolConfig( SpamToolConfig config );
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 23bd05951..87157ed4f 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -211,7 +211,7 @@ static AttachmentStrategy::Display smartDisplay( const partNode *node )
     if ( lowerType == "hidden" )     return hidden();
     if ( lowerType == "headeronly" ) return headerOnly();
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return smart();
   }
 
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b3..132a8dba1 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -175,9 +175,9 @@ void BackupJob::finish()
                    .arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
   text += "\n" + i18n( "1 message of size %1 was archived.",
                        "%n messages with the total size of %1 were archived.", mArchivedMessages )
-                   .arg( KIO::convertSize( mArchivedSize ) );
+                   .arg( TDEIO::convertSize( mArchivedSize ) );
   text += "\n" + i18n( "The archive file has a size of %1." )
-                   .arg( KIO::convertSize( archiveFileInfo.size() ) );
+                   .arg( TDEIO::convertSize( archiveFileInfo.size() ) );
   KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) );
 
   if ( mDeleteFoldersAfterCompletion ) {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 5e5232d42..143c18c5b 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -167,8 +167,8 @@ void CachedImapJob::execute()
 
       ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
       jd.items << mFolder->label(); // for the err msg
-      KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-      KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+      TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+      TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
       mAccount->insertJob(simpleJob, jd);
 
       mAccount->setSentCustomLoginCommand( true );
@@ -195,19 +195,19 @@ void CachedImapJob::listMessages()
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() + ";UID=1:*;SECTION=FLAGS RFC822.SIZE");
 
-  KIO::SimpleJob *job = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotListMessagesResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
   // send the data directly for KMFolderCachedImap
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           mFolder, TQT_SLOT( slotGetMessagesData( KIO::Job* , const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
 }
 
-void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
+void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -236,12 +236,12 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
   url.setPath( mFolder->imapPath() +
                TQString::fromLatin1(";UID=%1").arg(uids) );
 
-  KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotDeleteNextMessages(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::expungeFolder()
@@ -250,15 +250,15 @@ void CachedImapJob::expungeFolder()
   // Special URL that means EXPUNGE
   url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
 
-  KIO::SimpleJob *job = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotExpungeResult(KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) );
 }
 
-void CachedImapJob::slotExpungeResult( KIO::Job * job )
+void CachedImapJob::slotExpungeResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -276,7 +276,7 @@ void CachedImapJob::slotExpungeResult( KIO::Job * job )
   delete this;
 }
 
-void CachedImapJob::slotGetNextMessage(KIO::Job * job)
+void CachedImapJob::slotGetNextMessage(TDEIO::Job * job)
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -346,18 +346,18 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect(simpleJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-          this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
-  connect(simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotGetNextMessage(KIO::Job *)));
-  connect(simpleJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+  connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *)));
+  connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotProcessedSize(KIO::Job *, KIO::filesize_t processed)
+void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed)
 {
   emit progress( mSentBytes + processed, mTotalBytes );
 }
@@ -417,23 +417,23 @@ void CachedImapJob::slotPutNextMessage()
   jd.msgList.append( mMsg );
 
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::put(url, 0, false, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotPutMessageResult(KIO::Job *) ) );
-  connect( simpleJob, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
-           TQT_SLOT( slotPutMessageDataReq(KIO::Job *, TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
-           mFolder, TQT_SLOT( slotSimpleData(KIO::Job *, const TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-             TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+           TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+           mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+             TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
 
 }
 
 //-----------------------------------------------------------------------------
-// TODO: port to KIO::StoredTransferJob once it's ok to require tdelibs-3.3
-void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
+// TODO: port to TDEIO::StoredTransferJob once it's ok to require tdelibs-3.3
+void CachedImapJob::slotPutMessageDataReq(TDEIO::Job *job, TQByteArray &data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -452,7 +452,7 @@ void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
 }
 
 //----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data )
+void CachedImapJob::slotPutMessageInfoData( TDEIO::Job *job, const TQString &data )
 {
   KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( mDestFolder->storage() );
   if ( imapFolder ) {
@@ -472,7 +472,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
 
 
 //-----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageResult(KIO::Job *job)
+void CachedImapJob::slotPutMessageResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -524,7 +524,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
 }
 
 
-void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
+void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -587,11 +587,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::mkdir(url);
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url);
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   } else {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -605,16 +605,16 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   }
 }
 
 
-void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
+void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -645,11 +645,11 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
   url.setPath(folderPath);
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.path = url.path();
-  KIO::SimpleJob *simpleJob = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotDeleteNextFolder(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::checkUidValidity()
@@ -660,16 +660,16 @@ void CachedImapJob::checkUidValidity()
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
 
-  KIO::SimpleJob *job = KIO::get( url, false, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get( url, false, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotCheckUidValidityResult(KIO::Job *)) );
-  connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-           mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) );
+  connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
+void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -749,11 +749,11 @@ void CachedImapJob::renameFolder( const TQString &newName )
   ImapAccountBase::jobData jd( newName, mFolder->folder() );
   jd.path = mNewImapPath;
 
-  KIO::SimpleJob *simpleJob = KIO::rename( urlSrc, urlDst, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotRenameFolderResult(KIO::Job *)) );
+  connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
 }
 
 static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
@@ -844,7 +844,7 @@ void CachedImapJob::slotSubscribtionChange2Done( const TQString&, bool )
   delete this;
 }
 
-void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
+void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -873,7 +873,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
   }
 }
 
-void CachedImapJob::slotListMessagesResult( KIO::Job * job )
+void CachedImapJob::slotListMessagesResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index f37953d35..592ba3928 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -109,19 +109,19 @@ protected:
   void listMessages();
 
 protected slots:
-  virtual void slotGetNextMessage( KIO::Job *job = 0 );
-  virtual void slotAddNextSubfolder( KIO::Job *job = 0 );
+  virtual void slotGetNextMessage( TDEIO::Job *job = 0 );
+  virtual void slotAddNextSubfolder( TDEIO::Job *job = 0 );
   virtual void slotPutNextMessage();
-  virtual void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
-  virtual void slotPutMessageResult( KIO::Job *job );
-  virtual void slotPutMessageInfoData(KIO::Job *, const TQString &data);
-  virtual void slotExpungeResult( KIO::Job *job );
-  virtual void slotDeleteNextFolder( KIO::Job *job = 0 );
-  virtual void slotCheckUidValidityResult( KIO::Job *job );
-  virtual void slotRenameFolderResult( KIO::Job *job );
-  virtual void slotListMessagesResult( KIO::Job * job );
-  void slotDeleteNextMessages( KIO::Job* job = 0 );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+  virtual void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+  virtual void slotPutMessageResult( TDEIO::Job *job );
+  virtual void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
+  virtual void slotExpungeResult( TDEIO::Job *job );
+  virtual void slotDeleteNextFolder( TDEIO::Job *job = 0 );
+  virtual void slotCheckUidValidityResult( TDEIO::Job *job );
+  virtual void slotRenameFolderResult( TDEIO::Job *job );
+  virtual void slotListMessagesResult( TDEIO::Job * job );
+  void slotDeleteNextMessages( TDEIO::Job* job = 0 );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
   void slotSubscribtionChange1Done( const TQString&, bool );
   void slotSubscribtionChange2Done( const TQString&, bool );
   void slotSubscribtionChange1Failed( const TQString &errorMessage );
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 7a7a583f2..9b6da633a 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -139,7 +139,7 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
 
   // Outlook will only understand the reply if the From: header is the
   // same as the To: header of the invitation message.
-  KConfigGroup options( KMKernel::config(), "Groupware" );
+  TDEConfigGroup options( KMKernel::config(), "Groupware" );
   if( !options.readBoolEntry( "LegacyMangleFromToHeaders", true ) ) {
     if( identity != KPIM::Identity::null() ) {
       msg->setFrom( identity.fullEmailAddr() );
diff --git a/kmail/composer.h b/kmail/composer.h
index 4bbad3165..3d86ec57a 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -19,7 +19,7 @@ class KMMessagePart;
 class TQListViewItem;
 class MailComposerIface;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4bad5bc5d..7b24e228d 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -156,7 +156,7 @@ namespace {
     I18N_NOOP("<qt><p>This setting has been fixed by your administrator.</p>"
               "<p>If you think this is an error, please contact him.</p></qt>");
 
-  void checkLockDown( TQWidget * w, const KConfigBase & c, const char * key ) {
+  void checkLockDown( TQWidget * w, const TDEConfigBase & c, const char * key ) {
     if ( c.entryIsImmutable( key ) ) {
       w->setEnabled( false );
       TQToolTip::add( w, i18n( lockedDownWarning ) );
@@ -176,13 +176,13 @@ namespace {
     b->setText( i18n( e.desc ) );
   }
 
-  void loadWidget( TQCheckBox * b, const KConfigBase & c, const BoolConfigEntry & e ) {
+  void loadWidget( TQCheckBox * b, const TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     checkLockDown( b, c, e.key );
     b->setChecked( c.readBoolEntry( e.key, e.defaultValue ) );
   }
 
-  void loadWidget( TQButtonGroup * g, const KConfigBase & c, const EnumConfigEntry & e ) {
+  void loadWidget( TQButtonGroup * g, const TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     checkLockDown( g, c, e.key );
@@ -195,19 +195,19 @@ namespace {
     g->setButton( e.defaultItem );
   }
 
-  void saveCheckBox( TQCheckBox * b, KConfigBase & c, const BoolConfigEntry & e ) {
+  void saveCheckBox( TQCheckBox * b, TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     c.writeEntry( e.key, b->isChecked() );
   }
 
-  void saveButtonGroup( TQButtonGroup * g, KConfigBase & c, const EnumConfigEntry & e ) {
+  void saveButtonGroup( TQButtonGroup * g, TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     c.writeEntry( e.key, e.items[ g->id( g->selected() ) ].key );
   }
 
   template <typename T_Widget, typename T_Entry>
-  inline void loadProfile( T_Widget * g, const KConfigBase & c, const T_Entry & e ) {
+  inline void loadProfile( T_Widget * g, const TDEConfigBase & c, const T_Entry & e ) {
     if ( c.hasKey( e.key ) )
       loadWidget( g, c, e );
   }
@@ -233,7 +233,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   int width = geometry.readNumEntry( "ConfigureDialogWidth" );
   int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
@@ -243,7 +243,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   geometry.writeEntry( "ConfigureDialogWidth", width() );
   geometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
@@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() {
     return;
   }
   mProfileDialog = new ProfileDialog( this, "mProfileDialog" );
-  connect( mProfileDialog, TQT_SIGNAL(profileSelected(KConfig*)),
-                this, TQT_SIGNAL(installProfile(KConfig*)) );
+  connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)),
+                this, TQT_SIGNAL(installProfile(TDEConfig*)) );
   mProfileDialog->show();
 }
 
@@ -359,7 +359,7 @@ void IdentityPage::save() {
   if( mOldNumberOfIdentities < 2 && mIdentityList->childCount() > 1 ) {
     // have more than one identity, so better show the combo in the
     // composer now:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders |= HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -367,7 +367,7 @@ void IdentityPage::save() {
   // and now the reverse
   if( mOldNumberOfIdentities > 1 && mIdentityList->childCount() < 2 ) {
     // have only one identity, so remove the combo in the composer:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders &= ~HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -970,8 +970,8 @@ void AccountsPage::SendingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::SendingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General");
-  KConfigGroup composer( KMKernel::config(), "Composer");
+  TDEConfigGroup general( KMKernel::config(), "General");
+  TDEConfigGroup composer( KMKernel::config(), "Composer");
 
   int numTransports = general.readNumEntry("transports", 0);
 
@@ -1032,8 +1032,8 @@ void AccountsPage::SendingTab::doLoadOther() {
 }
 
 void AccountsPage::SendingTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // Save transports:
   general.writeEntry( "transports", mTransportInfoList.count() );
@@ -1391,7 +1391,7 @@ void AccountsPage::ReceivingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::ReceivingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mAccountList->clear();
   TQListViewItem *top = 0;
@@ -1453,7 +1453,7 @@ void AccountsPage::ReceivingTab::save() {
   kmkernel->cleanupImapFolders();
 
   // Save Mail notification settings
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   general.writeEntry( "beep-on-mail", mBeepNewMailCheck->isChecked() );
   GlobalSettings::self()->setVerboseNewMailNotification( mVerboseNotificationCheck->isChecked() );
 
@@ -1644,7 +1644,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
 }
 
 void AppearancePage::FontsTab::doLoadOther() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   mFont[0] = TDEGlobalSettings::generalFont();
   TQFont fixedFont = TDEGlobalSettings::fixedFont();
@@ -1657,8 +1657,8 @@ void AppearancePage::FontsTab::doLoadOther() {
   slotFontSelectorChanged( 0 );
 }
 
-void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
-  KConfigGroup fonts( profile, "Fonts" );
+void AppearancePage::FontsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup fonts( profile, "Fonts" );
 
   // read fonts that are defined in the profile:
   bool needChange = false;
@@ -1678,7 +1678,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::FontsTab::save() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   // read the current font (might have been modified)
   if ( mActiveFontIndex >= 0 )
@@ -1786,7 +1786,7 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
 }
 
 void AppearancePage::ColorsTab::doLoadOther() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors", true ) );
   mRecycleColorCheck->setChecked( reader.readBoolEntry( "RecycleQuoteColors", false ) );
@@ -1827,8 +1827,8 @@ void AppearancePage::ColorsTab::doLoadOther() {
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 }
 
-void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
-  KConfigGroup reader( profile, "Reader" );
+void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup reader( profile, "Reader" );
 
   if ( reader.hasKey( "defaultColors" ) )
     mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors" ) );
@@ -1841,7 +1841,7 @@ void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::ColorsTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   bool customColors = mCustomColorCheck->isChecked();
   reader.writeEntry( "defaultColors", !customColors );
@@ -1940,8 +1940,8 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 }
 
 void AppearancePage::LayoutTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   loadWidget( mFolderListGroup, geometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1950,9 +1950,9 @@ void AppearancePage::LayoutTab::doLoadOther() {
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
-void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::LayoutTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup geometry( profile, "Geometry" );
 
   loadProfile( mFolderListGroup, geometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1961,8 +1961,8 @@ void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::LayoutTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   saveButtonGroup( mFolderListGroup, geometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -2114,8 +2114,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 }
 
 void AppearancePage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
   mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
@@ -2150,9 +2150,9 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
   mDateDisplay->setButton( numDateDisplayConfig - 2 ); // default
 }
 
-void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::HeadersTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
+  TDEConfigGroup geometry( profile, "Geometry" );
 
   if ( geometry.hasKey( "nestedMessages" ) )
     mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
@@ -2176,8 +2176,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   if ( geometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
@@ -2191,7 +2191,7 @@ void AppearancePage::HeadersTab::save() {
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
       for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-        KConfigGroup group( KMKernel::config(), *it );
+        TDEConfigGroup group( KMKernel::config(), *it );
         group.deleteEntry( "threadMessagesOverride" );
       }
     }
@@ -2433,14 +2433,14 @@ void AppearancePage::ReaderTab::doLoadFromGlobalSettings()
 
 void AppearancePage::ReaderTab::doLoadOther()
 {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadWidget( mShowColorbarCheck, reader, showColorbarMode );
   loadWidget( mShowSpamStatusCheck, reader, showSpamStatusMode );
 }
 
 
 void AppearancePage::ReaderTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   saveCheckBox( mShowColorbarCheck, reader, showColorbarMode );
   saveCheckBox( mShowSpamStatusCheck, reader, showSpamStatusMode );
   GlobalSettings::self()->setCloseAfterReplyOrForward( mCloseAfterReplyOrForwardCheck->isChecked() );
@@ -2459,8 +2459,8 @@ void AppearancePage::ReaderTab::save() {
 }
 
 
-void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+void AppearancePage::ReaderTab::installProfile( TDEConfig * /* profile */ ) {
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadProfile( mCloseAfterReplyOrForwardCheck, reader, closeAfterReplyOrForward );
   loadProfile( mShowColorbarCheck, reader, showColorbarMode );
   loadProfile( mShowSpamStatusCheck, reader, showSpamStatusMode );
@@ -2512,8 +2512,8 @@ void AppearancePage::SystemTrayTab::doLoadFromGlobalSettings() {
   mSystemTrayGroup->setEnabled( mSystemTrayCheck->isChecked() );
 }
 
-void AppearancePage::SystemTrayTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
+void AppearancePage::SystemTrayTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
 
   if ( general.hasKey( "SystemTrayEnabled" ) ) {
     mSystemTrayCheck->setChecked( general.readBoolEntry( "SystemTrayEnabled" ) );
@@ -2832,9 +2832,9 @@ void ComposerPage::GeneralTab::doLoadFromGlobalSettings() {
   mEditorRequester->setURL( GlobalSettings::self()->externalEditor() );
 }
 
-void ComposerPage::GeneralTab::installProfile( KConfig * profile ) {
-  KConfigGroup composer( profile, "Composer" );
-  KConfigGroup general( profile, "General" );
+void ComposerPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup composer( profile, "Composer" );
+  TDEConfigGroup general( profile, "General" );
 
   if ( composer.hasKey( "signature" ) ) {
     bool state = composer.readBoolEntry("signature");
@@ -3320,7 +3320,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 }
 
 void ComposerPage::CharsetTab::doLoadOther() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
@@ -3336,7 +3336,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
 }
 
 void ComposerPage::CharsetTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsetList = mCharsetListEditor->stringList();
   TQStringList::Iterator it = charsetList.begin();
@@ -3509,7 +3509,7 @@ void ComposerPage::HeadersTab::slotRemoveMimeHeader()
 }
 
 void ComposerPage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   TQString suffix = general.readEntry( "myMessageIdSuffix" );
   mMessageIdSuffixEdit->setText( suffix );
@@ -3525,7 +3525,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 
   int count = general.readNumEntry( "mime-header-count", 0 );
   for( int i = 0 ; i < count ; i++ ) {
-    KConfigGroup config( KMKernel::config(),
+    TDEConfigGroup config( KMKernel::config(),
                          TQCString("Mime #") + TQCString().setNum(i) );
     TQString name  = config.readEntry( "name" );
     TQString value = config.readEntry( "value" );
@@ -3543,7 +3543,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 }
 
 void ComposerPage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "useCustomMessageIdSuffix",
                       mCreateOwnMessageIdCheck->isChecked() );
@@ -3554,7 +3554,7 @@ void ComposerPage::HeadersTab::save() {
   TQListViewItem * item = mTagList->firstChild();
   for ( ; item ; item = item->itemBelow() )
     if( !item->text(0).isEmpty() ) {
-      KConfigGroup config( KMKernel::config(), TQCString("Mime #")
+      TDEConfigGroup config( KMKernel::config(), TQCString("Mime #")
                              + TQCString().setNum( numValidEntries ) );
       config.writeEntry( "name",  item->text( 0 ) );
       config.writeEntry( "value", item->text( 1 ) );
@@ -3708,7 +3708,7 @@ SecurityPage::SecurityPage( TQWidget * parent, const char * name )
 }
 
 
-void SecurityPage::installProfile( KConfig * profile ) {
+void SecurityPage::installProfile( TDEConfig * profile ) {
   mGeneralTab->installProfile( profile );
   mComposerCryptoTab->installProfile( profile );
   mWarningTab->installProfile( profile );
@@ -3910,7 +3910,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::GeneralTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail", false ) );
   mExternalReferences->setChecked( reader.readBoolEntry( "htmlLoadExternal", false ) );
@@ -3918,7 +3918,7 @@ void SecurityPage::GeneralTab::doLoadOther() {
 
   mAlwaysDecrypt->setChecked( GlobalSettings::self()->alwaysDecrypt() );
 
-  const KConfigGroup mdn( KMKernel::config(), "MDN" );
+  const TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   int num = mdn.readNumEntry( "default-policy", 0 );
   if ( num < 0 || num >= mMDNGroup->count() ) num = 0;
@@ -3929,9 +3929,9 @@ void SecurityPage::GeneralTab::doLoadOther() {
   mNoMDNsWhenEncryptedCheck->setChecked(mdn.readBoolEntry( "not-send-when-encrypted", true ));
 }
 
-void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup mdn( profile, "MDN" );
+void SecurityPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup mdn( profile, "MDN" );
 
   if ( reader.hasKey( "htmlMail" ) )
     mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail" ) );
@@ -3955,8 +3955,8 @@ void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::GeneralTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup mdn( KMKernel::config(), "MDN" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
   {
@@ -3976,7 +3976,7 @@ void SecurityPage::GeneralTab::save() {
       {
         if (*it)
         {
-          KConfigGroupSaver saver(KMKernel::config(),
+          TDEConfigGroupSaver saver(KMKernel::config(),
             "Folder-" + (*it)->idString());
           KMKernel::config()->writeEntry("htmlMailOverride", false);
         }
@@ -4014,7 +4014,7 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent,
 }
 
 void SecurityPage::ComposerCryptoTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // If you change default values, sync messagecomposer.cpp too
 
@@ -4031,8 +4031,8 @@ void SecurityPage::ComposerCryptoTab::doLoadOther() {
   mWidget->mStoreEncrypted->setChecked( composer.readBoolEntry( "crypto-store-encrypted", true ) );
 }
 
-void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::ComposerCryptoTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "pgp-auto-sign" ) )
     mWidget->mAutoSignature->setChecked( composer.readBoolEntry( "pgp-auto-sign" ) );
@@ -4053,7 +4053,7 @@ void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::ComposerCryptoTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "pgp-auto-sign", mWidget->mAutoSignature->isChecked() );
 
@@ -4097,7 +4097,7 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::WarningTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted", false ) );
   mWidget->mWarnUnsigned->setChecked( composer.readBoolEntry( "crypto-warning-unsigned", false ) );
@@ -4118,8 +4118,8 @@ void SecurityPage::WarningTab::doLoadOther() {
   mWidget->enableAllWarningsPB->setEnabled( true );
 }
 
-void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::WarningTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "crypto-warning-unencrypted" ) )
     mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted" ) );
@@ -4147,7 +4147,7 @@ void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::WarningTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "crypto-warn-recv-not-in-cert", mWidget->warnReceiverNotInCertificateCB->isChecked() );
   composer.writeEntry( "crypto-warning-unencrypted", mWidget->warnUnencryptedCB->isChecked() );
@@ -4390,7 +4390,7 @@ void SecurityPage::SMimeTab::slotUpdateHTTPActions() {
   mWidget->customHTTPProxy->setEnabled( enableProxySettings );
 }
 
-void SecurityPage::SMimeTab::installProfile( KConfig * ) {
+void SecurityPage::SMimeTab::installProfile( TDEConfig * ) {
 }
 
 static void saveCheckBoxToKleoEntry( TQCheckBox* cb, Kleo::CryptoConfigEntry* entry ) {
@@ -4758,7 +4758,7 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::FolderTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mEmptyTrashCheck->setChecked( general.readBoolEntry( "empty-trash-on-exit", true ) );
   mOnStartupOpenFolder->setFolder( general.readEntry( "startupFolder",
@@ -4775,7 +4775,7 @@ void MiscPage::FolderTab::doLoadOther() {
 }
 
 void MiscPage::FolderTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "empty-trash-on-exit", mEmptyTrashCheck->isChecked() );
   general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
@@ -5076,7 +5076,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::GroupwareTab::save() {
-  KConfigGroup groupware( KMKernel::config(), "Groupware" );
+  TDEConfigGroup groupware( KMKernel::config(), "Groupware" );
 
   // Write the groupware config
   if ( mEnableGwCB ) {
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index a3ffff0b7..265bc9570 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include <kcmultidialog.h>
 
-class KConfig;
+class TDEConfig;
 class ProfileDialog;
 namespace KMail {
     class ImapAccountBase;
@@ -48,7 +48,7 @@ signals:
       resp. Only keys that this profile is supposed to alter should be
       included in the file.
   */
-  void installProfile( KConfig *profile );
+  void installProfile( TDEConfig *profile );
   void configChanged();
 protected:
   void hideEvent( TQHideEvent *i );
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index daa326d2e..c430171ef 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -333,7 +333,7 @@ void ProfileDialog::setup() {
   TQListViewItem * listItem = 0;
   for ( TQStringList::const_iterator it = mProfileList.begin() ;
 	it != mProfileList.end() ; ++it ) {
-    KConfig profile( *it, true /* read-only */, false /* no KDE global */ );
+    TDEConfig profile( *it, true /* read-only */, false /* no KDE global */ );
     profile.setGroup("KMail Profile");
     TQString name = profile.readEntry( "Name" );
     if ( name.isEmpty() ) {
@@ -358,7 +358,7 @@ void ProfileDialog::slotOk() {
 
   assert( (unsigned int)index < mProfileList.count() );
 
-  KConfig profile( *mProfileList.at(index), true, false );
+  TDEConfig profile( *mProfileList.at(index), true, false );
   emit profileSelected( &profile );
   KDialogBase::slotOk();
 }
@@ -385,11 +385,11 @@ void ConfigModuleWithTabs::load() {
     if ( tab )
       tab->load();
   }
-  KCModule::load();
+  TDECModule::load();
 }
 
 void ConfigModuleWithTabs::save() {
-  KCModule::save();
+  TDECModule::save();
    for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
     ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
     if ( tab )
@@ -401,10 +401,10 @@ void ConfigModuleWithTabs::defaults() {
   ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->currentPage() );
   if ( tab )
     tab->defaults();
-  KCModule::defaults();
+  TDECModule::defaults();
 }
 
-void ConfigModuleWithTabs::installProfile(KConfig * /* profile */ ) {
+void ConfigModuleWithTabs::installProfile(TDEConfig * /* profile */ ) {
   for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
     ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
     if ( tab )
@@ -421,7 +421,7 @@ void ConfigModuleTab::load()
 void ConfigModuleTab::defaults()
 {
   // reset settings which are available via GlobalSettings to their defaults
-  // (stolen from KConfigDialogManager::updateWidgetsDefault())
+  // (stolen from TDEConfigDialogManager::updateWidgetsDefault())
   const bool bUseDefaults = GlobalSettings::self()->useDefaults( true );
   doLoadFromGlobalSettings();
   GlobalSettings::self()->useDefaults( bUseDefaults );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 0ed45d95e..7b05ddb3f 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -40,7 +40,7 @@ class ListView;
 class ConfigureDialog;
 class KIntSpinBox;
 class SimpleStringListEditor;
-class KConfig;
+class TDEConfig;
 class TQPoint;
 class ComposerCryptoConfiguration;
 class WarningConfiguration;
@@ -161,7 +161,7 @@ public:
   ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
 
 signals:
-  void profileSelected( KConfig * profile );
+  void profileSelected( TDEConfig * profile );
 
 private slots:
   void slotSelectionChanged();
@@ -176,12 +176,12 @@ private:
 };
 
 #include <kdialog.h>
-class ConfigModule : public KCModule {
+class ConfigModule : public TDECModule {
   Q_OBJECT
   
 public:
   ConfigModule( TQWidget * parent=0, const char * name=0 )
-     : KCModule ( parent, name )
+     : TDECModule ( parent, name )
      {}
   ~ConfigModule() {}
 
@@ -198,7 +198,7 @@ signals:
       from the profile only for those entries that
       really have keys defined in the profile.
    */
-   void installProfile( KConfig * profile );
+   void installProfile( TDEConfig * profile );
 
 };
 
@@ -230,7 +230,7 @@ private:
   // via GlobalSettings
   virtual void doLoadOther() {}
   // reimplement this for loading default values of settings which are
-  // not available via GlobalSettings (KConfigXT).
+  // not available via GlobalSettings (TDEConfigXT).
   virtual void doResetToDefaultsOther() {}
 };
 
@@ -250,7 +250,7 @@ public:
   virtual void load();
   virtual void save();
   virtual void defaults();
-  virtual void installProfile( KConfig * profile );
+  virtual void installProfile( TDEConfig * profile );
 
 protected:
   void addTab( ConfigModuleTab* tab, const TQString & title );
@@ -437,7 +437,7 @@ public:
   TQString helpAnchor() const;
   void save();
 
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotFontSelectorChanged( int );
@@ -465,7 +465,7 @@ public:
   TQString helpAnchor() const;
   void save();
 
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -487,7 +487,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -511,7 +511,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private: // methods
   //virtual void doLoadFromGlobalSettings();
@@ -538,7 +538,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   virtual void doLoadFromGlobalSettings();
@@ -570,7 +570,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   virtual void doLoadFromGlobalSettings();
@@ -619,7 +619,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 protected slots:
   void slotConfigureRecentAddresses();
   void slotConfigureCompletionOrder();
@@ -852,7 +852,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -879,7 +879,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -899,7 +899,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotReenableAllWarningsClicked();
@@ -925,7 +925,7 @@ public:
 
   // Can't use k_dcop here. dcopidl can't parse this file, dcopidlng has a namespace bug.
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotUpdateHTTPActions();
@@ -969,7 +969,7 @@ public:
   TQString helpAnchor() const;
 
   // OpenPGP tab is special:
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
   typedef SecurityPageGeneralTab GeneralTab;
   typedef SecurityPageComposerCryptoTab ComposerCryptoTab;
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index a83b1cd6c..21f475d63 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -171,8 +171,8 @@ void CopyFolderJob::slotCopyNextChild( bool success )
 bool CopyFolderJob::createTargetDir()
 {
   // get the default mailbox type
-  KConfig * const config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig * const config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int deftype = config->readNumEntry("default-mailbox-format", 1);
   if ( deftype < 0 || deftype > 1 ) deftype = 1;
 
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 3fe2fd78b..61bdbdd1b 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -44,11 +44,11 @@ namespace KMail {
   CSSHelper::CSSHelper( const TQPaintDeviceMetrics &pdm ) :
     KPIM::CSSHelper( pdm )
   {
-    KConfig * config = KMKernel::config();
+    TDEConfig * config = KMKernel::config();
 
-    KConfigGroup reader( config, "Reader" );
-    KConfigGroup fonts( config, "Fonts" );
-    KConfigGroup pixmaps( config, "Pixmaps" );
+    TDEConfigGroup reader( config, "Reader" );
+    TDEConfigGroup fonts( config, "Fonts" );
+    TDEConfigGroup pixmaps( config, "Pixmaps" );
 
     mRecycleQuoteColors = reader.readBoolEntry( "RecycleQuoteColors", false );
 
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index be5003b3d..2fcc323e2 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -205,7 +205,7 @@ void ExpireJob::done()
   if ( !str.isEmpty() )
     BroadcastStatus::instance()->setStatusMsg( str );
 
-  KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
+  TDEConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
 
   if ( !moving ) {
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index e1c7d6b80..8b629f832 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -435,9 +435,9 @@ void FavoriteFolderView::contentsDragEnterEvent(TQDragEnterEvent * e)
 void FavoriteFolderView::readColorConfig()
 {
   FolderTreeBase::readColorConfig();
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
   // Custom/System color support
-  KConfigGroupSaver saver(conf, "Reader");
+  TDEConfigGroupSaver saver(conf, "Reader");
   TQColor c = TDEGlobalSettings::alternateBackgroundColor();
   if ( !conf->readBoolEntry("defaultColors", true) )
     mPaintInfo.colBack = conf->readColorEntry( "AltBackgroundColor",&c );
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index d63278ad7..3f6208d6d 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -139,9 +139,9 @@ void FilterSelectionDialog::slotSelectAllButton()
 }
 
 /* static */
-TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* config, bool bPopFilter )
+TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( TDEConfig* config, bool bPopFilter )
 {
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     int numFilters = 0;
     if (bPopFilter)
       numFilters = config->readNumEntry("popfilters",0);
@@ -152,7 +152,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
     for ( int i=0 ; i < numFilters ; ++i ) {
       TQString grpName;
       grpName.sprintf("%s #%d", (bPopFilter ? "PopFilter" : "Filter") , i);
-      KConfigGroupSaver saver(config, grpName);
+      TDEConfigGroupSaver saver(config, grpName);
       KMFilter * filter = new KMFilter(config, bPopFilter);
       filter->purify();
       if ( filter->isEmpty() ) {
@@ -168,7 +168,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
 }
 
 /* static */
-void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter )
+void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter )
 {
     // first, delete all groups:
     TQStringList filterGroups =
@@ -186,12 +186,12 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>&
           grpName.sprintf("PopFilter #%d", i);
         else
           grpName.sprintf("Filter #%d", i);
-        KConfigGroupSaver saver(config, grpName);
+        TDEConfigGroupSaver saver(config, grpName);
         (*it)->writeConfig(config);
         ++i;
       }
     }
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     if (bPopFilter)
       config->writeEntry("popfilters", i);
     else
@@ -222,7 +222,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters()
         }
     }
 
-    KConfig config( fileName );
+    TDEConfig config( fileName );
     TQValueList<KMFilter*> imported = readFiltersFromConfig( &config, mPopFilter );
     FilterSelectionDialog dlg( mParent );
     dlg.setFilters( imported );
@@ -237,7 +237,7 @@ void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filter
     if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) )
       return;
 
-    KConfig config( saveUrl.path() );
+    TDEConfig config( saveUrl.path() );
     FilterSelectionDialog dlg( mParent );
     dlg.setFilters( filters );
     dlg.exec();
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 1b46ac02b..051288f55 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -33,7 +33,7 @@
 #include <tqvaluelist.h>
 #include <kdialogbase.h>
 class KMFilter;
-class KConfig;
+class TDEConfig;
 class TQWidget;
 class KPushButton;
 
@@ -41,7 +41,7 @@ namespace KMail
 {
 
 /**
-    @short Utility class that provides persisting of filters to/from KConfig.
+    @short Utility class that provides persisting of filters to/from TDEConfig.
     @author Till Adam <[email protected]>
  */
 class FilterImporterExporter
@@ -59,8 +59,8 @@ public:
        * and which filters to import. */
       TQValueList<KMFilter*> importFilters();
 
-      static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter );
-      static TQValueList<KMFilter*> readFiltersFromConfig( KConfig* config, bool bPopFilter );
+      static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter );
+      static TQValueList<KMFilter*> readFiltersFromConfig( TDEConfig* config, bool bPopFilter );
 private:
       TQWidget* mParent;
       bool mPopFilter;
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index b6c3e2c1d..65f656001 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -414,7 +414,7 @@ void KMail::FolderDiaACLTab::load()
   // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap...  (bug?)
   if ( mImapAccount && mImapAccount->login().find('@') == -1 )
     defaultFormat = "username"; // no @ found, so we assume it's just the username
-  KConfigGroup configGroup( kmkernel->config(), "IMAP" );
+  TDEConfigGroup configGroup( kmkernel->config(), "IMAP" );
   TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
   mUserIdFormat = FullEmail;
   if ( str == "username" )
@@ -474,7 +474,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
-      mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+      mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
     return;
   }
 
@@ -507,18 +507,18 @@ void KMail::FolderDiaACLTab::startListing()
 {
   // List ACLs of folder - or its parent, if creating a new folder
   mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
-  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-           this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+           this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 }
 
-void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
-    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 
     if ( job && job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
       else
         mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
@@ -752,18 +752,18 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
     return;
   mImapPath = folderImap->imapPath();
 
-  KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
+  TDEIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
   ImapAccountBase::jobData jd;
   jd.total = 1; jd.done = 0; jd.parent = 0;
   mImapAccount->insertJob(job, jd);
 
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
   connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
           TQT_SLOT(slotACLChanged( const TQString&, int )) );
 }
 
-void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
+void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)
 {
   ImapAccountBase::JobIterator it = mImapAccount->findJob( job );
   if ( it == mImapAccount->jobsEnd() ) return;
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index b5484d7c3..4f7f3ab4f 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -42,7 +42,7 @@ class TQWidgetStack;
 class TQHBox;
 class TQVButtonGroup;
 class KListView;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KMail {
 
@@ -101,8 +101,8 @@ public:
 private slots:
   // Network (KIO) slots
   void slotConnectionResult( int, const TQString& );
-  void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
-  void slotMultiSetACLResult(KIO::Job *);
+  void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
+  void slotMultiSetACLResult(TDEIO::Job *);
   void slotACLChanged( const TQString&, int );
   void slotReceivedUserRights( KMFolder* folder );
   void slotDirectoryListingFinished(KMFolderImap*);
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 133a2b1a5..3fdb308ff 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -139,27 +139,27 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
-      mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+      mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
     return;
   }
-  connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
-          this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
+  connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ),
+          this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) );
   KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   mImapAccount->getStorageQuotaInfo( folder, mImapPath );
 }
 
 void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
-                                                      KIO::Job* job,
+                                                      TDEIO::Job* job,
                                                       const KMail::QuotaInfo& info )
 {
   if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
     //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
 
-    disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
-                this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )),
+                this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) );
 
     if ( job && job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This account does not have support for quota information." ) );
       else
         mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 222b7efcd..dd36cf97a 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -70,7 +70,7 @@ private:
 private slots:
   // Network (KIO) slots
   void slotConnectionResult( int, const TQString& );
-  void slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& );
+  void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
 
 
 private:
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 655e18d7a..852082a9b 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -114,7 +114,7 @@ FolderJob::start()
 //----------------------------------------------------------------------------
 void FolderJob::kill()
 {
-  mErrorCode = KIO::ERR_USER_CANCELED;
+  mErrorCode = TDEIO::ERR_USER_CANCELED;
   delete this;
 }
 
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index bfc36b70a..00368e6d8 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -771,7 +771,7 @@ void FolderStorage::remove()
   needsCompact = false; //we are dead - no need to compact us
 
   // Erase settings, otherwise they might interfer when recreating the folder
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->deleteGroup( "Folder-" + folder()->idString() );
 
   emit closed(folder());
@@ -918,8 +918,8 @@ void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
 void FolderStorage::readConfig()
 {
   //kdDebug(5006)<<"#### READING CONFIG  = "<< name() <<endl;
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   if (mUnreadMsgs == -1)
     mUnreadMsgs = config->readNumEntry("UnreadMsgs", -1);
   if (mTotalMsgs == -1)
@@ -938,8 +938,8 @@ void FolderStorage::readConfig()
 //-----------------------------------------------------------------------------
 void FolderStorage::writeConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   config->writeEntry("UnreadMsgs",
       mGuessedUnreadMsgs == -1 ? mUnreadMsgs : mGuessedUnreadMsgs);
   config->writeEntry("TotalMsgs", mTotalMsgs);
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 2584f9258..b2f82ad92 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -105,9 +105,9 @@ bool FolderTreeBase::event(TQEvent * e)
 
 void FolderTreeBase::readColorConfig()
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
   // Custom/System color support
-  KConfigGroupSaver saver(conf, "Reader");
+  TDEConfigGroupSaver saver(conf, "Reader");
   TQColor c1=TQColor(kapp->palette().active().text());
   TQColor c2=TQColor("blue");
   TQColor c4=TQColor(kapp->palette().active().base());
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index dfc3bbbaf..f7e3953e2 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -35,7 +35,7 @@ class FolderViewToolTip : public TQToolTip
           .arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
           .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
           .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
-          .arg( KIO::convertSize( item->folderSize() ) );
+          .arg( TDEIO::convertSize( item->folderSize() ) );
       
       if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) {
           QuotaInfo info = imap->quotaInfo();
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index f0b16f0c0..dd8cd5b50 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -37,7 +37,7 @@ public:
 
   static GlobalSettings *self();
 
-  /** Call this slot instead of directly @ref KConfig::sync() to
+  /** Call this slot instead of directly @ref TDEConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index c63a1ba1d..3dbb2b9f0 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -199,9 +199,9 @@ TQString HeaderItem::text( int col) const
   } else if(col == headers->paintInfo()->sizeCol
       && headers->paintInfo()->showSize) {
     if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
-      tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
+      tmp = TDEIO::convertSize( mMsgBase->msgSizeServer() );
     } else {
-      tmp = KIO::convertSize( mMsgBase->msgSize() );
+      tmp = TDEIO::convertSize( mMsgBase->msgSize() );
     }
   }
   return tmp;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 239525d30..4bd068112 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -205,7 +205,7 @@ namespace KMail {
   CustomHeaderStrategy::CustomHeaderStrategy()
     : HeaderStrategy()
   {
-    KConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
+    TDEConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
     if ( customHeader.hasKey( "headers to display" ) ) {
       mHeadersToDisplay = customHeader.readListEntry( "headers to display" );
       for ( TQStringList::iterator it = mHeadersToDisplay.begin() ; it != mHeadersToDisplay.end() ; ++ it )
@@ -269,7 +269,7 @@ namespace KMail {
     if ( lowerType == "brief" ) return brief();
     if ( lowerType == "custom" )  return custom();
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return standard();
   }
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index c3a5b8b26..5c4108eed 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -423,7 +423,7 @@ namespace KMail {
     if ( !strategy )
       strategy = HeaderStrategy::rich();
 
-    KConfigGroup configReader( KMKernel::config(), "Reader" );
+    TDEConfigGroup configReader( KMKernel::config(), "Reader" );
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
@@ -1085,7 +1085,7 @@ namespace KMail {
     if ( lowerType == "enterprise" )  return enterprise();
     //if ( lowerType == "fancy" ) return fancy(); // not needed, see below
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return fancy();
   }
 
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index d8c002515..d2c35b42b 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -101,7 +101,7 @@ TQString KMail::HtmlStatusBar::message() const {
 }
 
 namespace {
-  inline KConfig * config() {
+  inline TDEConfig * config() {
 #ifndef KMAIL_TESTING
     return KMKernel::config();
 #else
@@ -111,7 +111,7 @@ namespace {
 }
 
 TQColor KMail::HtmlStatusBar::fgColor() const {
-  KConfigGroup conf( config(), "Reader" );
+  TDEConfigGroup conf( config(), "Reader" );
   switch ( mode() ) {
   case Html:
     return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white );
@@ -124,7 +124,7 @@ TQColor KMail::HtmlStatusBar::fgColor() const {
 }
 
 TQColor KMail::HtmlStatusBar::bgColor() const {
-  KConfigGroup conf( config(), "Reader" );
+  TDEConfigGroup conf( config(), "Reader" );
 
   switch ( mode() ) {
   case Html:
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index b37a400df..f180d61da 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -434,7 +434,7 @@ namespace KMail {
     mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
     if ( geometry.hasKey( "Identity Dialog size" ) )
       resize( geometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
@@ -444,7 +444,7 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
     geometry.writeEntry( "Identity Dialog size", size() );
   }
 
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 6380251e4..e97a260ed 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -55,16 +55,16 @@ using KPIM::ProgressManager;
 #include <kconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 #include <kio/passdlg.h>
-using KIO::PasswordDialog;
+using TDEIO::PasswordDialog;
 #include <kio/scheduler.h>
 #include <kio/slave.h>
 #include <mimelib/bodypart.h>
 #include <mimelib/body.h>
 #include <mimelib/headers.h>
 #include <mimelib/message.h>
-//using KIO::Scheduler; // use FQN below
+//using TDEIO::Scheduler; // use FQN below
 
 #include <tqregexp.h>
 #include <tqstylesheet.h>
@@ -105,10 +105,10 @@ namespace KMail {
   {
     mPort = imapDefaultPort;
     mBodyPartList.setAutoDelete(true);
-    KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-                            this, TQT_SLOT(slotSchedulerSlaveError(KIO::Slave *, int, const TQString &)));
-    KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave *)),
-                            this, TQT_SLOT(slotSchedulerSlaveConnected(KIO::Slave *)));
+    TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+                            this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &)));
+    TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)),
+                            this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *)));
     connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout()));
     connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout()));
   }
@@ -189,7 +189,7 @@ namespace KMail {
   //
   //
 
-  void ImapAccountBase::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+  void ImapAccountBase::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
     NetworkAccount::readConfig( config );
 
     setAutoExpunge( config.readBoolEntry( "auto-expunge", false ) );
@@ -229,7 +229,7 @@ namespace KMail {
     localBlacklistFromStringList( config.readListEntry( "locallyUnsubscribedFolders" ) );
   }
 
-  void ImapAccountBase::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+  void ImapAccountBase::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
     NetworkAccount::writeConfig( config );
 
     config.writeEntry( "auto-expunge", autoExpunge() );
@@ -288,7 +288,7 @@ namespace KMail {
       // "keep password" checkbox. Then, we set [Passwords]Keep to
       // storePasswd(), so that the checkbox in the dialog will be
       // init'ed correctly:
-      KConfigGroup passwords( TDEGlobal::config(), "Passwords" );
+      TDEConfigGroup passwords( TDEGlobal::config(), "Passwords" );
       passwords.writeEntry( "Keep", storePasswd() );
       TQString msg = i18n("You need to supply a username and a password to "
 			 "access this mailbox.");
@@ -301,7 +301,7 @@ namespace KMail {
       if (ret != TQDialog::Accepted ) {
         mPasswordDialogIsActive = false;
         mAskAgain = false;
-        emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+        emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
         return Error;
       }
       mPasswordDialogIsActive = false;
@@ -315,7 +315,7 @@ namespace KMail {
     if ( mSlave && !mSlaveConnected ) return Connecting;
 
     mSlaveConnected = false;
-    mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
+    mSlave = TDEIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
     if ( !mSlave ) {
       KMessageBox::error(0, i18n("Could not start process for %1.")
 			 .arg( getUrl().protocol() ) );
@@ -329,7 +329,7 @@ namespace KMail {
     return Connecting;
   }
 
-  bool ImapAccountBase::handleJobError( KIO::Job *job, const TQString& context, bool abortSync )
+  bool ImapAccountBase::handleJobError( TDEIO::Job *job, const TQString& context, bool abortSync )
   {
     JobIterator it = findJob( job );
     if ( it != jobsEnd() && (*it).progressItem )
@@ -376,8 +376,8 @@ namespace KMail {
     // create the KIO-job
     if ( makeConnection() != Connected )
       return;// ## doesn't handle Connecting
-    KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-    KIO::Scheduler::assignJobToSlave(mSlave, job);
+    TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+    TDEIO::Scheduler::assignJobToSlave(mSlave, job);
     jobData jd( url.url(), NULL );
     // a bit of a hack to save one slot
     if (subscribe) jd.onlySubscribed = true;
@@ -385,18 +385,18 @@ namespace KMail {
     jd.quiet = quiet;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotSubscriptionResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotSubscriptionResult(TDEIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSubscriptionResult( KIO::Job * job )
+  void ImapAccountBase::slotSubscriptionResult( TDEIO::Job * job )
   {
     // result of a subscription-job
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
     bool onlySubscribed = (*it).onlySubscribed;
-    TQString path = static_cast<KIO::SimpleJob*>(job)->url().path();
+    TQString path = static_cast<TDEIO::SimpleJob*>(job)->url().path();
     if (job->error())
     {
       if ( !(*it).quiet )
@@ -437,11 +437,11 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetUserRightsResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetUserRightsResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job )
   {
     ACLJobs::GetUserRightsJob* job = static_cast<ACLJobs::GetUserRightsJob *>( _job );
     JobIterator it = findJob( job );
@@ -449,7 +449,7 @@ namespace KMail {
 
     KMFolder* folder = (*it).parent;
     if ( job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
           mACLSupport = false;
       else
         kdWarning(5006) << "slotGetUserRightsResult: " << job->errorString() << endl;
@@ -481,11 +481,11 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetACLResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetACLResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetACLResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job )
   {
     ACLJobs::GetACLJob* job = static_cast<ACLJobs::GetACLJob *>( _job );
     JobIterator it = findJob( job );
@@ -509,16 +509,16 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetStorageQuotaInfoResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetStorageQuotaInfoResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job )
   {
     QuotaJobs::GetStorageQuotaJob* job = static_cast<QuotaJobs::GetStorageQuotaJob *>( _job );
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
-    if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+    if ( job->error() && job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
       setHasNoQuotaSupport();
 
     KMFolder* folder = (*it).parent; // can be 0
@@ -534,10 +534,10 @@ namespace KMail {
 
       stream << ( int ) 'N';
 
-      KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-      KIO::Scheduler::assignJobToSlave(mSlave, job);
-      connect( job, TQT_SIGNAL(result( KIO::Job * ) ),
-          this, TQT_SLOT( slotSimpleResult( KIO::Job * ) ) );
+      TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+      TDEIO::Scheduler::assignJobToSlave(mSlave, job);
+      connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ),
+          this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) );
     } else {
       /* Stop the timer, we have disconnected. We have to make sure it is
          started again when a new slave appears. */
@@ -548,7 +548,7 @@ namespace KMail {
   void ImapAccountBase::slotIdleTimeout()
   {
     if ( mSlave ) {
-      KIO::Scheduler::disconnectSlave(mSlave);
+      TDEIO::Scheduler::disconnectSlave(mSlave);
       mSlave = 0;
       mSlaveConnected = false;
       /* As for the noop timer, we need to make sure this one is started
@@ -566,7 +566,7 @@ namespace KMail {
 
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSchedulerSlaveError(KIO::Slave *aSlave, int errorCode,
+  void ImapAccountBase::slotSchedulerSlaveError(TDEIO::Slave *aSlave, int errorCode,
       const TQString &errorMsg)
   {
     if (aSlave != mSlave) return;
@@ -580,7 +580,7 @@ namespace KMail {
       resetConnectionList( this );
       if ( mSlave )
       {
-        KIO::Scheduler::disconnectSlave( slave() );
+        TDEIO::Scheduler::disconnectSlave( slave() );
         mSlave = 0;
       }
     }
@@ -588,7 +588,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSchedulerSlaveConnected(KIO::Slave *aSlave)
+  void ImapAccountBase::slotSchedulerSlaveConnected(TDEIO::Slave *aSlave)
   {
     if (aSlave != mSlave) return;
     mSlaveConnected = true;
@@ -605,14 +605,14 @@ namespace KMail {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly);
     stream << (int) 'c';
-    KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( mSlave, job );
-    connect( job, TQT_SIGNAL(infoMessage(KIO::Job*, const TQString&)),
-	   TQT_SLOT(slotCapabilitiesResult(KIO::Job*, const TQString&)) );
+    TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( mSlave, job );
+    connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)),
+	   TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) );
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotCapabilitiesResult( KIO::Job*, const TQString& result )
+  void ImapAccountBase::slotCapabilitiesResult( TDEIO::Job*, const TQString& result )
   {
     mCapabilities = TQStringList::split(' ', result.lower() );
     kdDebug(5006) << "capabilities:" << mCapabilities << endl;
@@ -649,15 +649,15 @@ namespace KMail {
         TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
         this,
         TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
-    KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( mSlave, job );
+    TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( mSlave, job );
     insertJob( job, jd );
-    connect( job, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&) ),
-        TQT_SLOT( slotNamespaceResult(KIO::Job*, const TQString&) ) );
+    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+        TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) );
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotNamespaceResult( KIO::Job* job, const TQString& str )
+  void ImapAccountBase::slotNamespaceResult( TDEIO::Job* job, const TQString& str )
   {
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
@@ -847,7 +847,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSimpleResult(KIO::Job * job)
+  void ImapAccountBase::slotSimpleResult(TDEIO::Job * job)
   {
     JobIterator it = findJob( job );
     bool quiet = false;
@@ -860,20 +860,20 @@ namespace KMail {
       if (!quiet)
         handleJobError(job, TQString() );
       else {
-        if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) {
+        if ( job->error() == TDEIO::ERR_CONNECTION_BROKEN && slave() ) {
           // make sure ERR_CONNECTION_BROKEN is properly handled and the slave
           // disconnected even when quiet()
-          KIO::Scheduler::disconnectSlave( slave() );
+          TDEIO::Scheduler::disconnectSlave( slave() );
           mSlave = 0;
         }
-        if (job->error() == KIO::ERR_SLAVE_DIED)
+        if (job->error() == TDEIO::ERR_SLAVE_DIED)
           slaveDied();
       }
     }
   }
 
   //-----------------------------------------------------------------------------
-  bool ImapAccountBase::handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder )
+  bool ImapAccountBase::handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder )
   {
     Q_ASSERT( !jd.msgList.isEmpty() );
     KMMessage* msg = jd.msgList.first();
@@ -891,7 +891,7 @@ namespace KMail {
     return handleJobError( job, myError );
   }
 
-  TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
+  TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, TDEIO::Job * job )
   {
       TQString error = _error;
       if ( error.find( "quota", 0, false ) == -1 ) return error;
@@ -917,27 +917,27 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+  bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
   {
     // Copy job's data before a possible killAllJobs
     TQStringList errors;
-    if ( job && job->error() != KIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
+    if ( job && job->error() != TDEIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
       errors = job->detailedErrorStrings();
 
     bool jobsKilled = true;
     switch( errorCode ) {
-    case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
-    case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
+    case TDEIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
+    case TDEIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
       mAskAgain = true;
       // fallthrough intended
-    case KIO::ERR_CONNECTION_BROKEN:
-    case KIO::ERR_COULD_NOT_CONNECT:
-    case KIO::ERR_SERVER_TIMEOUT:
+    case TDEIO::ERR_CONNECTION_BROKEN:
+    case TDEIO::ERR_COULD_NOT_CONNECT:
+    case TDEIO::ERR_SERVER_TIMEOUT:
       // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
       killAllJobs( true );
       break;
-    case KIO::ERR_COULD_NOT_LOGIN:
-    case KIO::ERR_USER_CANCELED:
+    case TDEIO::ERR_COULD_NOT_LOGIN:
+    case TDEIO::ERR_USER_CANCELED:
       killAllJobs( false );
       break;
     default:
@@ -949,21 +949,21 @@ namespace KMail {
     }
 
     // check if we still display an error
-    if ( !mErrorDialogIsActive && errorCode != KIO::ERR_USER_CANCELED ) {
+    if ( !mErrorDialogIsActive && errorCode != TDEIO::ERR_USER_CANCELED ) {
       mErrorDialogIsActive = true;
-      TQString msg = context + '\n' + prettifyQuotaError( KIO::buildErrorString( errorCode, errorMsg ), job );
+      TQString msg = context + '\n' + prettifyQuotaError( TDEIO::buildErrorString( errorCode, errorMsg ), job );
       TQString caption = i18n("Error");
 
-      if ( jobsKilled || errorCode == KIO::ERR_COULD_NOT_LOGIN ) {
-        if ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) {
+      if ( jobsKilled || errorCode == TDEIO::ERR_COULD_NOT_LOGIN ) {
+        if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
           msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
             arg( name() );
           KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
-          if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
+          if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
             KPIM::BroadcastStatus::instance()->setStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
-          else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
+          else if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT )
             KPIM::BroadcastStatus::instance()->setStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
@@ -997,12 +997,12 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::cancelMailCheck()
   {
-    TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+    TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
     while ( it != mapJobData.end() ) {
       kdDebug(5006) << "cancelMailCheck: job is cancellable: " << (*it).cancellable << endl;
       if ( (*it).cancellable ) {
         it.key()->kill();
-        TQMap<KIO::Job*, jobData>::Iterator rmit = it;
+        TQMap<TDEIO::Job*, jobData>::Iterator rmit = it;
         ++it;
         mapJobData.remove( rmit );
         // We killed a job -> this kills the slave
@@ -1209,13 +1209,13 @@ namespace KMail {
      if ( makeConnection() != Connected )
        return; // can't happen with dimap
 
-     KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-     KIO::Scheduler::assignJobToSlave(slave(), job);
+     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+     TDEIO::Scheduler::assignJobToSlave(slave(), job);
      ImapAccountBase::jobData jd( url.url(), folder );
      jd.path = path;
      insertJob(job, jd);
-     connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+     connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
   }
 
   void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1231,24 +1231,24 @@ namespace KMail {
      if ( makeConnection() != Connected )
        return; // can't happen with dimap
 
-     KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-     KIO::Scheduler::assignJobToSlave(slave(), job);
+     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+     TDEIO::Scheduler::assignJobToSlave(slave(), job);
      ImapAccountBase::jobData jd( url.url(), folder );
      jd.path = path;
      insertJob(job, jd);
-     connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+     connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+  void ImapAccountBase::slotSetStatusResult(TDEIO::Job * job)
   {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
      int errorCode = job->error();
      KMFolder * const parent = (*it).parent;
      const TQString path = (*it).path;
-     if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
+     if (errorCode && errorCode != TDEIO::ERR_CANNOT_OPEN_FOR_WRITING)
      {
        bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
        emit imapStatusChanged( parent, path, cont );
@@ -1282,7 +1282,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void KMail::ImapAccountBase::removeJob( KIO::Job* job )
+  void KMail::ImapAccountBase::removeJob( TDEIO::Job* job )
   {
     mapJobData.remove( job );
   }
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 26e5f5e3d..ec08ea5f4 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -34,14 +34,14 @@
 
 class AccountManager;
 class KMFolder;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KMMessagePart;
 class DwBodyPart;
 class DwMessage;
 class FolderStorage;
 template <typename T> class TQValueVector;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -97,10 +97,10 @@ namespace KMail {
     virtual void setListOnlyOpenFolders( bool only );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( KConfig& config );
-    virtual void writeConfig( KConfig& config );
+    virtual void readConfig( TDEConfig& config );
+    virtual void writeConfig( TDEConfig& config );
 
     /**
      * The state of the kioslave connection
@@ -119,7 +119,7 @@ namespace KMail {
     /**
      * Connect to the server, if no connection is active
      * Returns Connected (ok), Error (ko) or Connecting - which means
-     * that one should wait for the slaveConnected signal from KIO::Scheduler
+     * that one should wait for the slaveConnected signal from TDEIO::Scheduler
      * before proceeding.
      */
     ConnectionState makeConnection();
@@ -164,17 +164,17 @@ namespace KMail {
       bool onlySubscribed, quiet, cancellable;
     };
 
-    typedef TQMap<KIO::Job *, jobData>::Iterator JobIterator;
+    typedef TQMap<TDEIO::Job *, jobData>::Iterator JobIterator;
     /**
      * Call this when starting a new job
      */
-    void insertJob( KIO::Job* job, const jobData& data ) {
+    void insertJob( TDEIO::Job* job, const jobData& data ) {
       mapJobData.insert( job, data );
     }
     /**
      * Look for the jobData related to a given job. Compare with end()
      */
-    JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+    JobIterator findJob( TDEIO::Job* job ) { return mapJobData.find( job ); }
     JobIterator jobsEnd() { return mapJobData.end(); }
     /**
      * Call this when a job is finished.
@@ -182,7 +182,7 @@ namespace KMail {
      */
     void removeJob( JobIterator& it );
 
-    void removeJob( KIO::Job* job );
+    void removeJob( TDEIO::Job* job );
 
     /**
      * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
@@ -322,7 +322,7 @@ namespace KMail {
      * React to an error from the job. Uses job->error and job->errorString and calls
      * the protected virtual handleJobError with them. See handleError below for details.
      */
-    bool handleJobError( KIO::Job* job, const TQString& context, bool abortSync = false );
+    bool handleJobError( TDEIO::Job* job, const TQString& context, bool abortSync = false );
 
     /**
      * Returns the root folder of this account
@@ -425,29 +425,29 @@ namespace KMail {
      * is called when the changeSubscription has finished
      * emits subscriptionChanged
      */
-    void slotSubscriptionResult(KIO::Job * job);
+    void slotSubscriptionResult(TDEIO::Job * job);
 
   protected slots:
     virtual void slotCheckQueuedFolders();
 
     /// Handle a message coming from the KIO scheduler saying that the slave is now connected
-    void slotSchedulerSlaveConnected(KIO::Slave *aSlave);
+    void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
     /// Handle an error coming from the KIO scheduler
-    void slotSchedulerSlaveError(KIO::Slave *aSlave, int, const TQString &errorMsg);
+    void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
 
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSetStatusResult(TDEIO::Job * job);
 
     /// Result of getUserRights() job
-    void slotGetUserRightsResult( KIO::Job* _job );
+    void slotGetUserRightsResult( TDEIO::Job* _job );
 
     /// Result of getACL() job
-    void slotGetACLResult( KIO::Job* _job );
+    void slotGetACLResult( TDEIO::Job* _job );
 
     /// Result of getStorageQuotaInfo() job
-    void slotGetStorageQuotaInfoResult( KIO::Job* _job );
+    void slotGetStorageQuotaInfoResult( TDEIO::Job* _job );
 
     /**
      * Send a NOOP command regularly to keep the slave from disconnecting
@@ -466,10 +466,10 @@ namespace KMail {
     /**
      * Only delete information about the job
      */
-    void slotSimpleResult(KIO::Job * job);
+    void slotSimpleResult(TDEIO::Job * job);
 
     /** Gets and parses the namespaces */
-    void slotNamespaceResult( KIO::Job*, const TQString& str );
+    void slotNamespaceResult( TDEIO::Job*, const TQString& str );
 
     /**
      * Saves the fetched namespaces
@@ -479,7 +479,7 @@ namespace KMail {
     /**
      * Saves the capabilities list
      */
-    void slotCapabilitiesResult( KIO::Job*, const TQString& result );
+    void slotCapabilitiesResult( TDEIO::Job*, const TQString& result );
 
   protected:
 
@@ -499,10 +499,10 @@ namespace KMail {
      * @param abortSync if true, abort sync in all cases (see above). If false, ask the user (when possible).
      * @return false when aborting, true when continuing
      */
-    virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+    virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
 
-    /** Handle an error during KIO::put - helper method */
-    bool handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder );
+    /** Handle an error during TDEIO::put - helper method */
+    bool handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder );
 
     virtual TQString protocol() const;
     virtual unsigned short int defaultPort() const;
@@ -519,13 +519,13 @@ namespace KMail {
     // used for writing the blacklist out to the config file
     TQStringList locallyBlacklistedFolders() const;
     void localBlacklistFromStringList( const TQStringList & );
-    TQString prettifyQuotaError( const TQString& _error, KIO::Job * job );
+    TQString prettifyQuotaError( const TQString& _error, TDEIO::Job * job );
 
   protected:
     TQPtrList<TQGuardedPtr<KMFolder> > mOpenFolders;
     TQStringList mSubfolderNames, mSubfolderPaths,
         mSubfolderMimeTypes, mSubfolderAttributes;
-    TQMap<KIO::Job *, jobData> mapJobData;
+    TQMap<TDEIO::Job *, jobData> mapJobData;
     /** used to detect when the slave has not been used for a while */
     TQTimer mIdleTimer;
     /** used to send a noop to the slave in regular intervals to keep it from disonnecting */
@@ -579,7 +579,7 @@ namespace KMail {
      * Emitted when the slave managed or failed to connect
      * This is always emitted at some point after makeConnection returned Connecting.
      * @param errorCode 0 for success, != 0 in case of error
-     * @param errorMsg if errorCode is != 0, this goes with errorCode to call KIO::buildErrorString
+     * @param errorMsg if errorCode is != 0, this goes with errorCode to call TDEIO::buildErrorString
      */
     void connectionResult( int errorCode, const TQString& errorMsg );
 
@@ -617,7 +617,7 @@ namespace KMail {
      * @param job the job that was used for doing so (can be used to display errors)
      * @param entries the ACL list. Make your copy of it, it comes from the job.
      */
-    void receivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& entries );
+    void receivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& entries );
 
     /**
      * Emitted when the getQuotaInfo job is done,
@@ -627,7 +627,7 @@ namespace KMail {
      * @param info The quota information for this folder. Make your copy of it,
      * it comes from the job.
      */
-    void receivedStorageQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& entries );
+    void receivedStorageQuotaInfo( KMFolder* folder, TDEIO::Job* job, const KMail::QuotaInfo& entries );
 
     /**
      * Emitted when we got the namespaces
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index ab57da23a..2fee6acf1 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -157,17 +157,17 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       jd.progressItem->setTotalItems( jd.total );
       connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
           account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
-      KIO::SimpleJob *job = KIO::put( url, 0, false, false, false );
-      KIO::Scheduler::assignJobToSlave( account->slave(), job );
+      TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false );
+      TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
       account->insertJob( job, jd );
-      connect( job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotPutMessageResult(KIO::Job *)) );
-      connect( job, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)),
-          TQT_SLOT(slotPutMessageDataReq(KIO::Job *, TQByteArray &)) );
-      connect( job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-          TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
-      connect( job, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-          TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) );
+      connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+          TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
+      connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+          TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
+      connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
     }
   }
   else if ( jt == tCopyMessage || jt == tMoveMessage )
@@ -198,16 +198,16 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
     jd.progressItem->setTotalItems( jd.total );
     connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
               account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
-    KIO::SimpleJob *simpleJob = KIO::special( url, packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+    TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
     mJob = simpleJob;
     account->insertJob( mJob, jd );
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             TQT_SLOT(slotCopyMessageResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
     if ( jt == tMoveMessage )
     {
-      connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-               TQT_SLOT(slotCopyMessageInfoData(KIO::Job *, const TQString &)) );
+      connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+               TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
     }
   }
   else {
@@ -321,30 +321,30 @@ void ImapJob::slotGetNextMessage()
             account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
   jd.progressItem->setTotalItems( jd.total );
 
-  KIO::SimpleJob *simpleJob = KIO::get( url, false, false );
-  KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false );
+  TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
   mJob = simpleJob;
   account->insertJob( mJob, jd );
   if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
   {
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
   } else {
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotGetMessageResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) );
   }
-  connect( mJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-           msgParent, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)) );
+  connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
   if ( jd.total > 1 )
   {
-    connect(mJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-        this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+    connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+        this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotGetMessageResult( KIO::Job * job )
+void ImapJob::slotGetMessageResult( TDEIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !msg->parent() || !job) {
@@ -461,7 +461,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
+void ImapJob::slotGetBodyStructureResult( TDEIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !msg->parent() || !job) {
@@ -499,7 +499,7 @@ void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
+void ImapJob::slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -525,7 +525,7 @@ void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageResult( KIO::Job *job )
+void ImapJob::slotPutMessageResult( TDEIO::Job *job )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -570,7 +570,7 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
+void ImapJob::slotCopyMessageInfoData(TDEIO::Job * job, const TQString & data)
 {
   KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
   KMAcctImap *account = imapFolder->account();
@@ -609,7 +609,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
 }
 
 //----------------------------------------------------------------------------
-void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
+void ImapJob::slotPutMessageInfoData(TDEIO::Job *job, const TQString &data)
 {
   KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
   KMAcctImap *account = imapFolder->account();
@@ -634,7 +634,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageResult( KIO::Job *job )
+void ImapJob::slotCopyMessageResult( TDEIO::Job *job )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -684,7 +684,7 @@ void ImapJob::setParentFolder( const KMFolderImap* parent )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
+void ImapJob::slotProcessedSize(TDEIO::Job * job, TDEIO::filesize_t processed)
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !job) {
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 5cbbd69ee..2f7a04010 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -69,23 +69,23 @@ public:
   void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
 
 private slots:
-  void slotGetMessageResult( KIO::Job * job );
-  void slotGetBodyStructureResult( KIO::Job * job );
+  void slotGetMessageResult( TDEIO::Job * job );
+  void slotGetBodyStructureResult( TDEIO::Job * job );
   void slotGetNextMessage();
   /** Feeds the message in pieces to the server */
-  void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
-  void slotPutMessageResult( KIO::Job *job );
-  void slotPutMessageInfoData(KIO::Job *, const TQString &data);
+  void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+  void slotPutMessageResult( TDEIO::Job *job );
+  void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
   /** result of a copy-operation */
-  void slotCopyMessageResult( KIO::Job *job );
-  void slotCopyMessageInfoData( KIO::Job *, const TQString &data );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+  void slotCopyMessageResult( TDEIO::Job *job );
+  void slotCopyMessageInfoData( TDEIO::Job *, const TQString &data );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
 
 private:
   void execute();
   void init( JobType jt, TQString sets, KMFolderImap *folder,
              TQPtrList<KMMessage>& msgList );
-  KIO::Job *mJob;
+  TDEIO::Job *mJob;
   TQByteArray mData;
   const AttachmentStrategy *mAttachmentStrategy;
   KMFolderImap *mParentFolder;
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 9a4d73b1d..17de11d78 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -100,7 +100,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
 
 #ifdef HAVE_INDEXLIB
-	KConfigGroup cfg( KMKernel::config(), "text-index" );
+	TDEConfigGroup cfg( KMKernel::config(), "text-index" );
 	if ( !cfg.readBoolEntry( "enabled", false ) ) {
 		indexlib::remove( mIndexPath );
 		mLockFile.force_unlock();
@@ -138,7 +138,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 KMMsgIndex::~KMMsgIndex() {
 	kdDebug( 5006 ) << "KMMsgIndex::~KMMsgIndex()" << endl;
 #ifdef HAVE_INDEXLIB
-	KConfigGroup cfg( KMKernel::config(), "text-index" );
+	TDEConfigGroup cfg( KMKernel::config(), "text-index" );
 	cfg.writeEntry( "creating", mState == s_creating );
 	TQValueList<int> pendingMsg;
 	if ( mState == s_processing ) {
@@ -159,15 +159,15 @@ bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
 
 bool KMMsgIndex::isIndexed( KMFolder* folder ) const {
 	if ( !isIndexable( folder ) ) return false;
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
 	return !config->readBoolEntry( folderIndexDisabledKey, false );
 }
 
 void KMMsgIndex::setEnabled( bool e ) {
 	kdDebug( 5006 ) << "KMMsgIndex::setEnabled( " << e << " )" << endl;
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "text-index" );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "text-index" );
 	if ( config->readBoolEntry( "enabled", !e ) == e ) return;
 	config->writeEntry( "enabled", e );
 	if ( e ) {
@@ -191,8 +191,8 @@ void KMMsgIndex::setEnabled( bool e ) {
 }
 
 void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
 	if ( config->readBoolEntry( folderIndexDisabledKey, e ) == e ) return; // nothing to do
 	config->writeEntry( folderIndexDisabledKey, e );
 
@@ -328,8 +328,8 @@ void KMMsgIndex::act() {
 			f->open("msgindex");
 		}
 		const KMMsgDict* dict = KMMsgDict::instance();
-		KConfig* config = KMKernel::config();
-		KConfigGroupSaver saver( config, "Folder-" + f->idString() );
+		TDEConfig* config = KMKernel::config();
+		TDEConfigGroupSaver saver( config, "Folder-" + f->idString() );
 		if ( config->readBoolEntry( folderIndexDisabledKey, true ) ) {
 			for ( int i = 0; i < f->count(); ++i ) {
 				mPendingMsgs.push_back( dict->getMsgSerNum( f, i ) );
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 3ba43637d..eaea2b500 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,7 +31,7 @@
 //----------------------------
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * )
   {
     MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
     return page;
@@ -40,7 +40,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * )
   {
     AppearancePage *page =
        new AppearancePage( parent, "kcmkmail_config_appearance" );
@@ -50,7 +50,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * )
   {
     ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
     return page;
@@ -59,7 +59,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * )
   {
     IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
     return page;
@@ -68,7 +68,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * )
   {
     AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
     return page;
@@ -77,7 +77,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * )
   {
     SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
     return page;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index e7d884101..64f13d76f 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -142,7 +142,7 @@ void KMAccount::setFolder(KMFolder* aFolder, bool addAccount)
 
 
 //-----------------------------------------------------------------------------
-void KMAccount::readConfig(KConfig& config)
+void KMAccount::readConfig(TDEConfig& config)
 {
   TQString folderName;
   mFolder = 0;
@@ -175,7 +175,7 @@ void KMAccount::readTimerConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMAccount::writeConfig(KConfig& config)
+void KMAccount::writeConfig(TDEConfig& config)
 {
   // ID, Name
   KAccount::writeConfig(config);
@@ -196,10 +196,10 @@ void KMAccount::writeConfig(KConfig& config)
 //-----------------------------------------------------------------------------
 void KMAccount::sendReceipt(KMMessage* aMsg)
 {
-  KConfig* cfg = KMKernel::config();
+  TDEConfig* cfg = KMKernel::config();
   bool sendReceipts;
 
-  KConfigGroupSaver saver(cfg, "General");
+  TDEConfigGroupSaver saver(cfg, "General");
 
   sendReceipts = cfg->readBoolEntry("send-receipts", false);
   if (!sendReceipts) return;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 258fe9c02..f0455b3b9 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -33,7 +33,7 @@ class TQTimer;
 
 class KMFolder;
 class KMAcctFolder;
-class KConfig;
+class TDEConfig;
 class KMFolderJob;
 class KMFolderCachedImap;
 class AccountsPageReceivingTab;
@@ -143,14 +143,14 @@ public:
    * manager when a new account is created. The config group is
    * already properly set by the caller.
    */
-  virtual void readConfig(KConfig& config);
+  virtual void readConfig(TDEConfig& config);
   void readTimerConfig();
 
   /**
    * Write all account information to given config file. The config group
    * is already properly set by the caller.
    */
-  virtual void writeConfig(KConfig& config);
+  virtual void writeConfig(TDEConfig& config);
 
   /**
    * Set/get interval for checking if new mail arrived (in minutes).
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 2a797acbb..473b0b99c 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -132,7 +132,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   // Make list of folders to reset. This must be done last, since folderComplete
   // can trigger the next queued mail check already.
   TQValueList<KMFolderCachedImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ((*it).parent)
       folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -150,7 +150,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   KMAccount::deleteFolderJobs();
 
   if ( disconnectSlave && mSlave ) {
-    KIO::Scheduler::disconnectSlave( mSlave );
+    TDEIO::Scheduler::disconnectSlave( mSlave );
     mSlave = 0;
   }
   return folderList;
@@ -161,7 +161,7 @@ void KMAcctCachedImap::cancelMailCheck()
 {
   // Make list of folders to reset, like in killAllJobs
   TQValueList<KMFolderCachedImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ( (*it).cancellable && (*it).parent )
       folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -308,7 +308,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
 //
 //
 
-void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+void KMAcctCachedImap::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
   ImapAccountBase::readConfig( config );
   // Apparently this method is only ever called once (from KMKernel::init) so this is ok
   mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
@@ -323,7 +323,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
 }
 
-void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+void KMAcctCachedImap::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
   ImapAccountBase::writeConfig( config );
   config.writeEntry( "deleted-folders", mDeletedFolders + mPreviouslyDeletedFolders );
   config.writeEntry( "renamed-folders-paths", mRenamedFolders.keys() );
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
   killAllJobs( abortConnection );
   if ( abortConnection ) {
     // If we were trying to connect, tell kmfoldercachedimap so that it moves on
-    emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+    emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
   }
 }
 
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index a896fc42b..a580b90cf 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -47,7 +47,7 @@ namespace KMail {
 using KMail::ImapJob;
 using KMail::CachedImapJob;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -92,8 +92,8 @@ public:
   virtual void setImapFolder(KMFolderCachedImap *);
   KMFolderCachedImap* imapFolder() const { return mFolder; }
 
-  virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
-  virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+  virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+  virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
 
   /**
    * Invalidate the local cache.
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index e57543d30..a70091e79 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -70,7 +70,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
 				   TQString("%1").arg(KAccount::id()) );
-  KConfig config( serNumUri );
+  TDEConfig config( serNumUri );
   TQStringList serNums = config.readListEntry( "unfiltered" );
   mFilterSerNumsToSave.setAutoDelete( false );
 
@@ -89,7 +89,7 @@ KMAcctImap::~KMAcctImap()
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
 				   TQString("%1").arg(KAccount::id()) );
-  KConfig config( serNumUri );
+  TDEConfig config( serNumUri );
   TQStringList serNums;
   TQDictIterator<int> it( mFilterSerNumsToSave );
   for( ; it.current(); ++it )
@@ -125,10 +125,10 @@ void KMAcctImap::setImapFolder(KMFolderImap *aFolder)
 
 //-----------------------------------------------------------------------------
 
-bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
 {
   /* TODO check where to handle this one better. */
-  if ( errorCode == KIO::ERR_DOES_NOT_EXIST ) {
+  if ( errorCode == TDEIO::ERR_DOES_NOT_EXIST ) {
     // folder is gone, so reload the folderlist
     if ( mFolder )
       mFolder->listDirectory();
@@ -141,7 +141,7 @@ bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job*
 //-----------------------------------------------------------------------------
 void KMAcctImap::killAllJobs( bool disconnectSlave )
 {
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for ( ; it != mapJobData.end(); ++it)
   {
     TQPtrList<KMMessage> msgList = (*it).msgList;
@@ -193,7 +193,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
     mCountRemainChecks = 0;
   }
   if ( disconnectSlave && slave() ) {
-    KIO::Scheduler::disconnectSlave( slave() );
+    TDEIO::Scheduler::disconnectSlave( slave() );
     mSlave = 0;
   }
 }
@@ -233,9 +233,9 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
 void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
 {
   // Make sure the folder is not referenced in any kio slave jobs
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   while ( it != mapJobData.end() ) {
-     TQMap<KIO::Job*, jobData>::Iterator i = it;
+     TQMap<TDEIO::Job*, jobData>::Iterator i = it;
      it++;
      if ( (*i).parent ) {
         if ( (*i).parent == folder ) {
@@ -250,7 +250,7 @@ void KMAcctImap::cancelMailCheck()
 {
   // Make list of folders to reset, like in killAllJobs
   TQValueList<KMFolderImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ( (*it).cancellable && (*it).parent ) {
       folderList << static_cast<KMFolderImap*>((*it).parent->storage());
@@ -533,7 +533,7 @@ void KMAcctImap::listDirectory()
 }
 
 //-----------------------------------------------------------------------------
-void KMAcctImap::readConfig(KConfig& config)
+void KMAcctImap::readConfig(TDEConfig& config)
 {
   ImapAccountBase::readConfig( config );
 }
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 455ab931a..99f07f168 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -31,7 +31,7 @@ namespace KMail {
   class ImapJob;
   class ActionScheduler;
 }
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 class FolderStorage;
@@ -83,7 +83,7 @@ public:
    * manager when a new account is created. The config group is
    * already properly set by the caller.
    */
-  virtual void readConfig(KConfig& config);
+  virtual void readConfig(TDEConfig& config);
 
   /**
    * Returns the root folder of this account
@@ -109,7 +109,7 @@ protected:
    * Handle an error coming from a KIO job
    * See ImapAccountBase::handleJobError for details.
    */
-  virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+  virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
   virtual void cancelMailCheck();
 
   TQPtrList<KMail::ImapJob> mJobList;
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83a..813d180cb 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -270,7 +270,7 @@ void KMAcctLocal::postProcess()
 
 
 //-----------------------------------------------------------------------------
-void KMAcctLocal::readConfig(KConfig& config)
+void KMAcctLocal::readConfig(TDEConfig& config)
 {
   KMAccount::readConfig(config);
   mLocation = config.readPathEntry("Location", mLocation);
@@ -291,7 +291,7 @@ void KMAcctLocal::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctLocal::writeConfig(KConfig& config)
+void KMAcctLocal::writeConfig(TDEConfig& config)
 {
   KMAccount::writeConfig(config);
 
diff --git a/kmail/kmacctlocal.h b/kmail/kmacctlocal.h
index 2abe34f5b..398dd16ef 100644
--- a/kmail/kmacctlocal.h
+++ b/kmail/kmacctlocal.h
@@ -34,8 +34,8 @@ public:
 
   virtual TQString type(void) const;
   virtual void processNewMail(bool);
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
 
 private:
   bool preProcess();
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index b3c5d31c7..5a203c2d1 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -213,7 +213,7 @@ void KMAcctMaildir::processNewMail(bool)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctMaildir::readConfig(KConfig& config)
+void KMAcctMaildir::readConfig(TDEConfig& config)
 {
   KMAccount::readConfig(config);
   mLocation = config.readPathEntry("Location", mLocation);
@@ -221,7 +221,7 @@ void KMAcctMaildir::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctMaildir::writeConfig(KConfig& config)
+void KMAcctMaildir::writeConfig(TDEConfig& config)
 {
   KMAccount::writeConfig(config);
   config.writePathEntry("Location", mLocation);
diff --git a/kmail/kmacctmaildir.h b/kmail/kmacctmaildir.h
index 1c655861a..e62796069 100644
--- a/kmail/kmacctmaildir.h
+++ b/kmail/kmacctmaildir.h
@@ -26,8 +26,8 @@ public:
 
   virtual TQString type(void) const;
   virtual void processNewMail(bool);
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
 
 protected:
   TQString mLocation;
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index e510c7d4c..ca6099e01 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 753a66bb9..4ffe54b13 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index bdb44e282..b40fd5c9e 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=edit
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index cba142ff3..bf489e60e 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 3cc3e3201..79a646e74 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=misc
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index a99d19536..a4d385cc4 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index abf480c99..fbafbc1b5 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -1073,7 +1073,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
   // pretend the folder just changed back to the mail type, which
   // does the right thing, namely remove resource
   folderContentsTypeChanged( folder, KMail::ContentsTypeMail );
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.deleteEntry( folder->idString() + "-storageFormat" );
   configGroup.deleteEntry( folder->idString() + "-changes" );
 }
@@ -1493,7 +1493,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
     FolderInfo info( format, NoChange );
     mFolderInfoMap.insert( folder, info );
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-storageFormat",
                           format == StorageXML ? "xml" : "icalvcard" );
 }
@@ -1506,13 +1506,13 @@ void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges change
   } else { // Otherwise, well, it's a folder we don't care about.
     kdDebug(5006) << "addFolderChange: nothing known about folder " << folder->location() << endl;
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-changes", (*it).mChanges );
 }
 
 KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolder * const folder ) const
 {
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   TQString str = configGroup.readEntry( folder->idString() + "-storageFormat", "unset" );
   FolderInfo info;
   if ( str == "unset" ) {
@@ -1591,7 +1591,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
   kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
   // "Fire and forget". No need for error handling, nor for explicit deletion.
   // Maybe we should try to prevent launching it if it's already running (for this URL) though.
-  /*KIO::Job* job =*/ KIO::get( httpURL, false, false /*no progress info*/ );
+  /*TDEIO::Job* job =*/ TDEIO::get( httpURL, false, false /*no progress info*/ );
 }
 
 void KMailICalIfaceImpl::slotFolderPropertiesChanged( KMFolder* folder )
@@ -1660,7 +1660,7 @@ void KMailICalIfaceImpl::changeResourceUIName( const TQString &folderPath, const
   if ( f ) {
     KMailICalIfaceImpl::getResourceMap()->insert( folderPath, newName );
     kmkernel->folderMgr()->renameFolder( f, newName );
-    KConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
+    TDEConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
     configGroup.writeEntry( folderPath, newName );
   }
 }
@@ -1950,7 +1950,7 @@ void KMailICalIfaceImpl::readConfig()
     subresourceAdded( folderContentsType( KMail::ContentsTypeNote ), mNotes->location(), mNotes->label(), true, false );
   }
 
-  KConfig *config = kmkernel->config();
+  TDEConfig *config = kmkernel->config();
   config->setGroup("Resource UINames");
   *KMailICalIfaceImpl::mSubResourceUINamesMap =  config->entryMap( "Resource UINames" );
 
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7108fff65..9c1d25f96 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -636,7 +636,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
                                          parentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
-  if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+  if ( TDEIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
         i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
@@ -644,13 +644,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
         != KMessageBox::Continue)
       return Canceled;
   }
-  KIO::Job *job = KIO::file_copy(mUrl, saveUrl, -1, true);
-  connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotUrlSaveResult(KIO::Job*)));
+  TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true);
+  connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*)));
   setEmitsCompletedItself( true );
   return OK;
 }
 
-void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
+void KMUrlSaveCommand::slotUrlSaveResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
@@ -841,14 +841,14 @@ KURL KMSaveMsgCommand::url()
 
 KMCommand::Result KMSaveMsgCommand::execute()
 {
-  mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
+  mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
   mJob->slotTotalSize( mTotalSize );
   mJob->setAsyncDataEnabled( true );
   mJob->setReportDataSent( true );
-  connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+  connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
     TQT_SLOT(slotSaveDataReq()));
-  connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
-    TQT_SLOT(slotSaveResult(KIO::Job*)));
+  connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+    TQT_SLOT(slotSaveResult(TDEIO::Job*)));
   setEmitsCompletedItself( true );
   return OK;
 }
@@ -904,7 +904,7 @@ void KMSaveMsgCommand::slotSaveDataReq()
         }
       }
     } else {
-      mJob->slotError( KIO::ERR_ABORTED,
+      mJob->slotError( TDEIO::ERR_ABORTED,
                        i18n("The message was removed while saving it. "
                             "It has not been saved.") );
     }
@@ -955,11 +955,11 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   }
 }
 
-void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
+void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job)
 {
   if (job->error())
   {
-    if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+    if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
@@ -967,14 +967,14 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
         == KMessageBox::Continue) {
         mOffset = 0;
 
-        mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
+        mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
         mJob->slotTotalSize( mTotalSize );
         mJob->setAsyncDataEnabled( true );
         mJob->setReportDataSent( true );
-        connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+        connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
             TQT_SLOT(slotSaveDataReq()));
-        connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
-            TQT_SLOT(slotSaveResult(KIO::Job*)));
+        connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+            TQT_SLOT(slotSaveResult(TDEIO::Job*)));
       }
     }
     else
@@ -1012,17 +1012,17 @@ KMCommand::Result KMOpenMsgCommand::execute()
     setDeletesItself( false );
     return Canceled;
   }
-  mJob = KIO::get( mUrl, false, false );
+  mJob = TDEIO::get( mUrl, false, false );
   mJob->setReportDataSent( true );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           this, TQT_SLOT( slotDataArrived( KIO::Job*, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
   setEmitsCompletedItself( true );
   return OK;
 }
 
-void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
+void KMOpenMsgCommand::slotDataArrived( TDEIO::Job *, const TQByteArray & data )
 {
   if ( data.isEmpty() )
     return;
@@ -1030,7 +1030,7 @@ void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
   mMsgString.append( data.data(), data.size() );
 }
 
-void KMOpenMsgCommand::slotResult( KIO::Job *job )
+void KMOpenMsgCommand::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     // handle errors
@@ -1607,7 +1607,7 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
   if ( GlobalSettings::useDefaultFonts() )
     mOverrideFont = TDEGlobalSettings::generalFont();
   else {
-    KConfigGroup fonts( KMKernel::config(), "Fonts" );
+    TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
     TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() );
     mOverrideFont.fromString( tmp );
   }
@@ -2641,7 +2641,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      }
 
 
-      if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
+      if ( TDEIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
         if ( KMessageBox::warningContinueCancel( parentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
               .arg( curUrl.fileName() ),
@@ -2773,7 +2773,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   if ( !url.isLocalFile() )
   {
     tf.close();
-    if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+    if ( !TDEIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
     {
       KMessageBox::error( parentWidget(),
           i18n( "Could not write the file %1." )
@@ -3334,13 +3334,13 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     return;
 
   d.setDisabled( true ); // we got this far, don't delete yet
-  KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( parentWidget() );
-  connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
-           this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
+  connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)),
+           this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) );
 }
 
-void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job * job )
+void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job )
 {
   if ( job->error() )
     job->showErrorDialog();
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 698ae64b9..3bb209882 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -34,7 +34,7 @@ class KMReaderWin;
 class partNode;
 class DwBodyPart;
 class DwEntity;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 namespace KMail {
   class Composer;
   class FolderJob;
@@ -290,7 +290,7 @@ public:
   KMUrlSaveCommand( const KURL &url, TQWidget *parent );
 
 private slots:
-  void slotUrlSaveResult( KIO::Job *job );
+  void slotUrlSaveResult( TDEIO::Job *job );
 
 private:
   virtual Result execute();
@@ -352,7 +352,7 @@ private:
 
 private slots:
   void slotSaveDataReq();
-  void slotSaveResult(KIO::Job *job);
+  void slotSaveResult(TDEIO::Job *job);
   /** the message has been transferred for saving */
   void slotMessageRetrievedForSaving(KMMessage *msg);
 
@@ -366,7 +366,7 @@ private:
   TQByteArray mData;
   int mOffset;
   size_t mTotalSize;
-  KIO::TransferJob *mJob;
+  TDEIO::TransferJob *mJob;
 };
 
 class KDE_EXPORT KMOpenMsgCommand : public KMCommand
@@ -382,14 +382,14 @@ private:
   virtual Result execute();
 
 private slots:
-  void slotDataArrived( KIO::Job *job, const TQByteArray & data );
-  void slotResult( KIO::Job *job );
+  void slotDataArrived( TDEIO::Job *job, const TQByteArray & data );
+  void slotResult( TDEIO::Job *job );
 
 private:
   static const int MAX_CHUNK_SIZE = 64*1024;
   KURL mUrl;
   DwString mMsgString;
-  KIO::TransferJob *mJob;
+  TDEIO::TransferJob *mJob;
   const TQString mEncoding;
 };
 
@@ -1075,7 +1075,7 @@ private slots:
   void slotPartComplete();
 
   void slotAtmDecryptWithChiasmusResult( const GpgME::Error &, const TQVariant & );
-  void slotAtmDecryptWithChiasmusUploadResult( KIO::Job * );
+  void slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * );
 
 private:
   partNode* mNode;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 31d36b4d3..0857ae2bd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -344,7 +344,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setAlignment( TQt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
-      KConfigGroup reader( KMKernel::config(), "Reader" );
+      TDEConfigGroup reader( KMKernel::config(), "Reader" );
       TQPalette p( mSignatureStateIndicator->palette() );
 
       TQColor defaultSignedColor( 0x40, 0xFF, 0x40 ); // light green // pgp ok, trusted key
@@ -505,10 +505,10 @@ KMComposeWin::~KMComposeWin()
     delete mMsg;
     mMsg = 0;
   }
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
   while ( it != mMapAtmLoadData.end() )
   {
-    KIO::Job *job = it.key();
+    TDEIO::Job *job = it.key();
     mMapAtmLoadData.remove( it );
     job->kill();
     it = mMapAtmLoadData.begin();
@@ -797,7 +797,7 @@ void KMComposeWin::writeConfig(void)
   GlobalSettings::self()->setComposerSize( size() );
   GlobalSettings::self()->setShowSnippetManager( mSnippetAction->isChecked() );
 
-  KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
+  TDEConfigGroupSaver saver( KMKernel::config(), "Geometry" );
   saveMainWindowSettings( KMKernel::config(), "Composer" );
   GlobalSettings::setSnippetSplitterPosition( mSnippetSplitter->sizes() );
 
@@ -2384,7 +2384,7 @@ Kleo::CryptoMessageFormat KMComposeWin::cryptoMessageFormat() const {
 
 bool KMComposeWin::encryptToSelf() const {
 //   return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-encrypt-to-self", true );
 }
 
@@ -2410,8 +2410,8 @@ bool KMComposeWin::addAttach(const KURL aUrl)
     return false;
   }
 
-  KIO::TransferJob *job = KIO::get(aUrl);
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::TransferJob *job = TDEIO::get(aUrl);
+  TDEIO::Scheduler::scheduleJob( job );
   atmLoadData ld;
   ld.url = aUrl;
   ld.data = TQByteArray();
@@ -2421,10 +2421,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
 
   mMapAtmLoadData.insert(job, ld);
   mAttachJobs[job] = aUrl;
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
   return true;
 }
 
@@ -2496,7 +2496,7 @@ void KMComposeWin::msgPartToItem(const KMMessagePart* msgPart,
     lvi->setText(0, msgPart->fileName());
   else
     lvi->setText(0, msgPart->name());
-  lvi->setText(1, KIO::convertSize( msgPart->decodedSize()));
+  lvi->setText(1, TDEIO::convertSize( msgPart->decodedSize()));
   lvi->setText(2, msgPart->contentTransferEncodingStr());
   lvi->setText(3, prettyMimeType(msgPart->typeStr() + "/" + msgPart->subtypeStr()));
   lvi->setAttachmentSize(msgPart->decodedSize());
@@ -2753,7 +2753,7 @@ void KMComposeWin::slotAttachFile()
   TQString recent;
   KURL recentURL = KFileDialog::getStartURL( TQString(), recent );
   if ( !recentURL.url().isEmpty() &&
-       !KIO::NetAccess::exists( recentURL, true, this ) ) {
+       !TDEIO::NetAccess::exists( recentURL, true, this ) ) {
     recentURL = KURL( TQDir::homeDirPath() );
   }
 
@@ -2771,9 +2771,9 @@ void KMComposeWin::slotAttachFile()
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
+void KMComposeWin::slotAttachFileData(TDEIO::Job *job, const TQByteArray &data)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
   assert(it != mMapAtmLoadData.end());
   TQBuffer buff((*it).data);
   buff.open(IO_WriteOnly | IO_Append);
@@ -2783,12 +2783,12 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileResult(KIO::Job *job)
+void KMComposeWin::slotAttachFileResult(TDEIO::Job *job)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
   assert(it != mMapAtmLoadData.end());
   KURL attachURL;
-  TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
+  TQMap<TDEIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
   bool attachURLfound = (jit != mAttachJobs.end());
   if (attachURLfound)
   {
@@ -2834,7 +2834,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
   KCursorSaver busy(KBusyPtr::busy());
   TQString name( (*it).url.fileName() );
   // ask the job for the mime type of the file
-  TQString mimeType = static_cast<KIO::MimetypeJob*>(job)->mimetype();
+  TQString mimeType = static_cast<TDEIO::MimetypeJob*>(job)->mimetype();
 
   if ( name.isEmpty() ) {
     // URL ends with '/' (e.g. http://www.kde.org/)
@@ -2901,7 +2901,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
   }
 
   // show message part dialog, if not configured away (default):
-  KConfigGroup composer(KMKernel::config(), "Composer");
+  TDEConfigGroup composer(KMKernel::config(), "Composer");
   if ( GlobalSettings::self()->showMessagePartDialogOnAttach() ) {
     const KCursorSaver saver( TQCursor::ArrowCursor );
     KMMsgPartDialogCompat dlg(mMainWidget);
@@ -2955,8 +2955,8 @@ void KMComposeWin::slotInsertFile()
   mRecentAction->addURL(u);
   // Prevent race condition updating list when multiple composers are open
   {
-    KConfig *config = KMKernel::config();
-    KConfigGroupSaver saver( config, "Composer" );
+    TDEConfig *config = KMKernel::config();
+    TDEConfigGroupSaver saver( config, "Composer" );
     TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1();
     TQStringList urls = config->readListEntry( "recent-urls" );
     TQStringList encodings = config->readListEntry( "recent-encodings" );
@@ -2987,15 +2987,15 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
 {
   if (u.fileName().isEmpty()) return;
 
-  KIO::Job *job = KIO::get(u);
+  TDEIO::Job *job = TDEIO::get(u);
   atmLoadData ld;
   ld.url = u;
   ld.data = TQByteArray();
   ld.insert = true;
   // Get the encoding previously used when inserting this file
   {
-    KConfig *config = KMKernel::config();
-    KConfigGroupSaver saver( config, "Composer" );
+    TDEConfig *config = KMKernel::config();
+    TDEConfigGroupSaver saver( config, "Composer" );
     TQStringList urls = config->readListEntry( "recent-urls" );
     TQStringList encodings = config->readListEntry( "recent-encodings" );
     int index = urls.findIndex( u.prettyURL() );
@@ -3005,10 +3005,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
     }
   }
   mMapAtmLoadData.insert(job, ld);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
 }
 
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 02f92154c..840d34347 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -488,8 +488,8 @@ private slots:
   /**
    * KIO slots for attachment insertion
    */
-  void slotAttachFileData(KIO::Job *, const TQByteArray &);
-  void slotAttachFileResult(KIO::Job *);
+  void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
+  void slotAttachFileResult(TDEIO::Job *);
 
   void slotListAction(const TQString &);
   void slotFontAction(const TQString &);
@@ -829,7 +829,7 @@ private:
 
   TQStringList mFolderNames;
   TQValueList<TQGuardedPtr<KMFolder> > mFolderList;
-  TQMap<KIO::Job*, KURL> mAttachJobs;
+  TQMap<TDEIO::Job*, KURL> mAttachJobs;
   KURL::List mAttachFilesPending;
   int mAttachFilesSend;
 
@@ -893,7 +893,7 @@ private:
     bool insert;
     TQCString encoding;
   };
-  TQMap<KIO::Job *, atmLoadData> mMapAtmLoadData;
+  TQMap<TDEIO::Job *, atmLoadData> mMapAtmLoadData;
 
   // These are for passing on methods over the applyChanges calls
   KMail::MessageSender::SendMethod mSendMethod;
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index e4fb46896..044e0541c 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -254,7 +254,7 @@ void KMEdit::initializeAutoSpellChecking()
   TQColor defaultForeground( kapp->palette().active().text() );
 
   TQColor c = TQt::red;
-  KConfigGroup readerConfig( KMKernel::config(), "Reader" );
+  TDEConfigGroup readerConfig( KMKernel::config(), "Reader" );
   TQColor col1;
   if ( !readerConfig.readBoolEntry(  "defaultColors", true ) )
       col1 = readerConfig.readColorEntry( "ForegroundColor", &defaultForeground );
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633d..e9e9f3790 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -39,7 +39,7 @@ using KMail::FilterLog;
 #include <assert.h>
 
 
-KMFilter::KMFilter( KConfig* aConfig, bool popFilter )
+KMFilter::KMFilter( TDEConfig* aConfig, bool popFilter )
   : bPopFilter(popFilter)
 {
   if (!bPopFilter)
@@ -210,7 +210,7 @@ bool KMFilter::applyOnAccount( uint id ) const
 
 
 //-----------------------------------------------------------------------------
-void KMFilter::readConfig(KConfig* config)
+void KMFilter::readConfig(TDEConfig* config)
 {
   // MKSearchPattern::readConfig ensures
   // that the pattern is purified.
@@ -295,7 +295,7 @@ void KMFilter::readConfig(KConfig* config)
 }
 
 
-void KMFilter::writeConfig(KConfig* config) const
+void KMFilter::writeConfig(TDEConfig* config) const
 {
   mPattern.writeConfig(config);
 
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 4414f59d8..109e491eb 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 class TQString;
-class KConfig;
+class TDEConfig;
 class KMMessage;
 class KMFilterAction;
 class KMFolder;
@@ -67,7 +67,7 @@ public:
   /** Constructor that initializes from given config file, if given.
     * Filters are stored one by one in config groups, i.e. one filter, one group.
     * The config group has to be preset if config is not 0. */
-  KMFilter( KConfig* aConfig=0 , bool popFilter = false);
+  KMFilter( TDEConfig* aConfig=0 , bool popFilter = false);
 
   /** Copy constructor. Constructs a deep copy of @p aFilter. */
   KMFilter( const KMFilter & other );
@@ -107,13 +107,13 @@ public:
       constructor above) has to be preset.  The config object will be
       deleted by higher levels, so it is not allowed to store a
       pointer to it anywhere inside this function. */
-  void writeConfig( KConfig* config ) const;
+  void writeConfig( TDEConfig* config ) const;
 
   /** Initialize from given config file. The config group (see
       constructor above) has to be preset. The config object will be
       deleted by higher levels, so it is not allowed to store a
       pointer to it anywhere inside this function. */
-  void readConfig( KConfig* config );
+  void readConfig( TDEConfig* config );
 
   /** Remove empty rules (and actions one day). */
   void purify();
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 4ba4422cb..fd00a3cce 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -339,7 +339,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
   if ( geometry.hasKey( configKey ) )
@@ -356,7 +356,7 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 9118d14c8..1f5d9ad5c 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -67,11 +67,11 @@ void KMFilterMgr::clear()
 //-----------------------------------------------------------------------------
 void KMFilterMgr::readConfig(void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   clear();
   
   if (bPopFilter) {
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     mShowLater = config->readNumEntry("popshowDLmsgs",0);
   } 
   mFilters = FilterImporterExporter::readFiltersFromConfig( config, bPopFilter );
@@ -80,11 +80,11 @@ void KMFilterMgr::readConfig(void)
 //-----------------------------------------------------------------------------
 void KMFilterMgr::writeConfig(bool withSync)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
   // Now, write out the new stuff:  
   FilterImporterExporter::writeFiltersToConfig( mFilters, config, bPopFilter );
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   if (bPopFilter)
       config->writeEntry("popshowDLmsgs", mShowLater);
 
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index de6814ca9..5c4af4050 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -158,7 +158,7 @@ KMFolder::~KMFolder()
   delete mStorage;
 }
 
-void KMFolder::readConfig( KConfig* config )
+void KMFolder::readConfig( TDEConfig* config )
 {
   if ( !config->readEntry("SystemLabel").isEmpty() )
     mSystemLabel = config->readEntry("SystemLabel");
@@ -197,7 +197,7 @@ void KMFolder::readConfig( KConfig* config )
   }
 }
 
-void KMFolder::writeConfig( KConfig* config ) const
+void KMFolder::writeConfig( TDEConfig* config ) const
 {
   config->writeEntry("SystemLabel", mSystemLabel);
   config->writeEntry("ExpireMessages", mExpireMessages);
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index fe2900008..87be58407 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -128,10 +128,10 @@ public:
   bool hasAccounts() const { return (mAcctList != 0); }
 
   /** This is used by the storage to read the folder specific configuration */
-  void readConfig( KConfig* config );
+  void readConfig( TDEConfig* config );
 
   /** This is used by the storage to save the folder specific configuration */
-  void writeConfig( KConfig* config ) const;
+  void writeConfig( TDEConfig* config ) const;
 
   FolderStorage* storage() { return mStorage; }
   /** if the folder is const, the storage should be as well */
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index e7009a237..4ce92cb1d 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -250,8 +250,8 @@ void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
 
 void KMFolderCachedImap::readConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
   if( mImapPath.isEmpty() ) mImapPath = config->readEntry( "ImapPath" );
   if( TQString( name() ).upper() == "INBOX" && mImapPath == "/INBOX/" )
   {
@@ -329,7 +329,7 @@ void KMFolderCachedImap::writeConfig()
   if ( mFolderRemoved )
     return;
 
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );
   configGroup.writeEntry( "ReadOnly", mReadOnly );
@@ -369,7 +369,7 @@ void KMFolderCachedImap::writeConfig()
 
 void KMFolderCachedImap::writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig()
 {
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   if ( !folder()->noContent() )
   {
     configGroup.writeEntry( "AnnotationFolderTypeChanged", mAnnotationFolderTypeChanged );
@@ -1148,13 +1148,13 @@ void KMFolderCachedImap::serverSyncInternal()
       annotations.append( attr );
 
       kdDebug(5006) << "Setting test attribute to "<< url << endl;
-      KIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
+      TDEIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
           url, annotations );
       ImapAccountBase::jobData jd( url.url(), folder() );
       jd.cancellable = true; // we can always do so later
       mAccount->insertJob(job, jd);
-       connect(job, TQT_SIGNAL(result(KIO::Job *)),
-              TQT_SLOT(slotTestAnnotationResult(KIO::Job *)));
+       connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+              TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
       break;
     }
 
@@ -1199,8 +1199,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
                  TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
-        connect( job, TQT_SIGNAL(result(KIO::Job *)),
-                 TQT_SLOT(slotGetAnnotationResult(KIO::Job *)) );
+        connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+                 TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
         break;
       }
     }
@@ -1232,7 +1232,7 @@ void KMFolderCachedImap::serverSyncInternal()
         kdDebug(5006) << k_funcinfo << "Setting sharedseen annotation for " << label() << " to " << val << endl;
       }
       if ( !annotations.isEmpty() ) {
-        KIO::Job* job =
+        TDEIO::Job* job =
           AnnotationJobs::multiSetAnnotation( mAccount->slave(), url, annotations );
         ImapAccountBase::jobData jd( url.url(), folder() );
         jd.cancellable = true; // we can always do so later
@@ -1240,8 +1240,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
                 TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotSetAnnotationResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
         break;
       }
     }
@@ -1260,12 +1260,12 @@ void KMFolderCachedImap::serverSyncInternal()
         newState( mProgress, i18n("Setting permissions"));
         KURL url = mAccount->getUrl();
         url.setPath( imapPath() );
-        KIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
+        TDEIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
         ImapAccountBase::jobData jd( url.url(), folder() );
         mAccount->insertJob(job, jd);
 
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
         connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
                 TQT_SLOT(slotACLChanged( const TQString&, int )) );
         break;
@@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal()
     if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) {
       newState( mProgress, i18n( "Retrieving permissions" ) );
       mAccount->getACL( folder(), mImapPath );
-      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-               this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+               this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
       break;
     }
   case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1306,13 +1306,13 @@ void KMFolderCachedImap::serverSyncInternal()
       newState( mProgress, i18n("Getting quota information"));
       KURL url = mAccount->getUrl();
       url.setPath( imapPath() );
-      KIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
+      TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
       ImapAccountBase::jobData jd( url.url(), folder() );
       mAccount->insertJob(job, jd);
       connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
           TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
-      connect( job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotQuotaResult(KIO::Job *)) );
+      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
       break;
     }
   case SYNC_STATE_CLOSE:
@@ -1437,7 +1437,7 @@ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& er
     serverSyncInternal();
   } else {
     // Error (error message already shown by the account)
-    newState( mProgress, KIO::buildErrorString( errorCode, errorMsg ));
+    newState( mProgress, TDEIO::buildErrorString( errorCode, errorMsg ));
     emit folderComplete(this, false);
   }
 }
@@ -1819,7 +1819,7 @@ void KMFolderCachedImap::slotGetLastMessagesResult(KMail::FolderJob *job)
 }
 
 // Connected to the listMessages job in CachedImapJob
-void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
     ImapAccountBase::jobData jd( TQString(), folder() );
     jd.cancellable = true;
     mAccount->insertJob(job, jd);
-    connect( job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotMultiUrlGetAnnotationResult(KIO::Job *)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
 
   } else {
     createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2449,7 +2449,7 @@ void KMFolderCachedImap::slotSubFolderCloseToQuotaChanged()
   }
 }
 
-void KMFolderCachedImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if (it == mAccount->jobsEnd()) return;
@@ -2513,11 +2513,11 @@ KMFolderCachedImap::setReadOnly( bool readOnly )
 }
 
 void
-KMFolderCachedImap::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder->storage() == this ) {
-    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
     mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
     mACLList = aclList;
     serverSyncInternal();
@@ -2551,7 +2551,7 @@ KMFolderCachedImap::setACLList( const ACLList& arr )
 }
 
 void
-KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job)
+KMFolderCachedImap::slotMultiSetACLResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2795,7 +2795,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
   }
 }
 
-void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2805,7 +2805,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
 
   AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2821,7 +2821,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
   serverSyncInternal();
 }
 
-void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2833,7 +2833,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   AnnotationJobs::MultiUrlGetAnnotationJob* annjob
     = static_cast<AnnotationJobs::MultiUrlGetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2873,7 +2873,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   createFoldersNewOnServerAndFinishListing( folders );
 }
 
-void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
+void KMFolderCachedImap::slotQuotaResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2884,7 +2884,7 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
   QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job );
   QuotaInfo empty;
   if ( quotajob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support quota
       mAccount->setHasNoQuotaSupport();
       setQuotaInfo( empty );
@@ -2916,7 +2916,7 @@ KMFolderCachedImap::slotAnnotationChanged( const TQString& entry, const TQString
   }
 }
 
-void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
+void KMFolderCachedImap::slotTestAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2936,7 +2936,7 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
 }
 
 void
-KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
+KMFolderCachedImap::slotSetAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2945,7 +2945,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
   bool cont = true;
   if ( job->error() ) {
     // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
       cont = mAccount->handleJobError( job, i18n( "Error while setting annotation: " ) + '\n' );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 59c444e6b..e82da6c3e 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -341,13 +341,13 @@ public:
   virtual bool mailCheckInProgress() const;
 
 protected slots:
-  void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+  void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
   void getMessagesResult(KMail::FolderJob *, bool lastSet);
   void slotGetLastMessagesResult(KMail::FolderJob *);
   void slotProgress(unsigned long done, unsigned long total);
   void slotPutProgress( unsigned long, unsigned long );
 
-  //virtual void slotCheckValidityResult(KIO::Job * job);
+  //virtual void slotCheckValidityResult(TDEIO::Job * job);
   void slotSubFolderComplete(KMFolderCachedImap*, bool);
   void slotSubFolderCloseToQuotaChanged();
 
@@ -356,21 +356,21 @@ protected slots:
 
   void slotCheckUidValidityResult( KMail::FolderJob* job );
   void slotPermanentFlags( int flags );
-  void slotTestAnnotationResult(KIO::Job *job);
-  void slotGetAnnotationResult( KIO::Job* );
-  void slotMultiUrlGetAnnotationResult( KIO::Job* );
-  void slotSetAnnotationResult(KIO::Job *job);
+  void slotTestAnnotationResult(TDEIO::Job *job);
+  void slotGetAnnotationResult( TDEIO::Job* );
+  void slotMultiUrlGetAnnotationResult( TDEIO::Job* );
+  void slotSetAnnotationResult(TDEIO::Job *job);
   void slotReceivedUserRights( KMFolder* );
-  void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
+  void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
 
-  void slotMultiSetACLResult(KIO::Job *);
+  void slotMultiSetACLResult(TDEIO::Job *);
   void slotACLChanged( const TQString&, int );
   void slotAnnotationResult(const TQString& entry, const TQString& value, bool found);
   void slotAnnotationChanged( const TQString& entry, const TQString& attribute, const TQString& value );
   void slotDeleteMessagesResult(KMail::FolderJob *);
   void slotImapStatusChanged(KMFolder* folder, const TQString&, bool);
   void slotStorageQuotaResult( const QuotaInfo& );
-  void slotQuotaResult( KIO::Job* job );
+  void slotQuotaResult( TDEIO::Job* job );
 
 protected:
   /* returns true if there were messages to delete
@@ -414,9 +414,9 @@ protected:
 
 public slots:
   /**
-   * Add the data a KIO::Job retrieves to the buffer
+   * Add the data a TDEIO::Job retrieves to the buffer
    */
-  void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+  void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * Troubleshoot the IMAP cache
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 161354bce..3f7208a97 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -225,7 +225,7 @@ void KMFolderDialog::slotCancelAccept()
 void KMFolderDialog::slotChanged( bool )
 {
   // TODO, support for 'changed', and Apply button.
-  // sample code for here: KCMultiDialog calls bool changed() on every KCModuleProxy...
+  // sample code for here: KCMultiDialog calls bool changed() on every TDECModuleProxy...
 }
 
 void KMFolderDialog::setFolder( KMFolder* folder )
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 6d3d468ec..07a52c5c6 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -186,8 +186,8 @@ void KMFolderImap::setAccount(KMAcctImap *aAccount)
 //-----------------------------------------------------------------------------
 void KMFolderImap::readConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   mCheckMail = config->readBoolEntry("checkmail", true);
 
   mUidValidity = config->readEntry("UidValidity");
@@ -210,8 +210,8 @@ void KMFolderImap::readConfig()
 //-----------------------------------------------------------------------------
 void KMFolderImap::writeConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   config->writeEntry("checkmail", mCheckMail);
   config->writeEntry("UidValidity", mUidValidity);
   config->writeEntry("ImapPath", mImapPath);
@@ -239,8 +239,8 @@ void KMFolderImap::remove()
     emit removed(folder(), false);
     return;
   }
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd(url.url());
   jd.progressItem = ProgressManager::createProgressItem(
                       "ImapFolderRemove" + ProgressManager::getUniqueID(),
@@ -249,12 +249,12 @@ void KMFolderImap::remove()
                       false,
                       account()->useSSL() || account()->useTLS() );
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotRemoveFolderResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *)));
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotRemoveFolderResult(KIO::Job *job)
+void KMFolderImap::slotRemoveFolderResult(TDEIO::Job *job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1076,13 +1076,13 @@ void KMFolderImap::checkValidity()
     account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
-  KIO::SimpleJob *job = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotCheckValidityResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotCheckValidityResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
   // Only check once at a time.
   mCheckingValidity = true;
 }
@@ -1105,14 +1105,14 @@ ulong KMFolderImap::lastUid()
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotCheckValidityResult(KIO::Job * job)
+void KMFolderImap::slotCheckValidityResult(TDEIO::Job * job)
 {
   kdDebug(5006) << "KMFolderImap::slotCheckValidityResult of: " << fileName() << endl;
   mCheckingValidity = false;
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
   if (job->error()) {
-    if ( job->error() != KIO::ERR_ACCESS_DENIED ) {
+    if ( job->error() != TDEIO::ERR_ACCESS_DENIED ) {
       // we suppress access denied messages because they are normally a result of
       // explicitely set ACLs. Do not save this information (e.g. setNoContent) so that
       // we notice when this changes
@@ -1233,37 +1233,37 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
     if ( mMailCheckProgressItem )
       mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
-    KIO::SimpleJob *job = KIO::listDir(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::listDir(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), folder() );
     jd.cancellable = true;
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
-    connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
-            this, TQT_SLOT(slotListFolderEntries(KIO::Job *,
-            const KIO::UDSEntryList &)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
+    connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+            this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *,
+            const TDEIO::UDSEntryList &)));
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
       mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
-    KIO::SimpleJob *newJob = KIO::get(url, false, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+    TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
     ImapAccountBase::jobData jd( url.url(), folder() );
     jd.cancellable = true;
     account()->insertJob(newJob, jd);
-    connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotGetLastMessagesResult(KIO::Job *)));
-    connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+    connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)));
+    connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderResult(KIO::Job * job)
+void KMFolderImap::slotListFolderResult(TDEIO::Job * job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1356,39 +1356,39 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mContentState = imapDownloadInProgress;
     KURL url = account()->getUrl();
     url.setPath(imapPath() + ";UID=" + *i + ";SECTION=ENVELOPE");
-    KIO::SimpleJob *newJob = KIO::get(url, false, false);
+    TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
     jd.url = url.url();
-    KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
     account()->insertJob(newJob, jd);
-    connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
+    connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
         this, (i == sets.at(sets.count() - 1))
-        ? TQT_SLOT(slotGetLastMessagesResult(KIO::Job *))
-        : TQT_SLOT(slotGetMessagesResult(KIO::Job *)));
-    connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-        this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+        ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))
+        : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *)));
+    connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+        this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderEntries(KIO::Job * job,
-  const KIO::UDSEntryList & uds)
+void KMFolderImap::slotListFolderEntries(TDEIO::Job * job,
+  const TDEIO::UDSEntryList & uds)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
   TQString mimeType, name;
   long int flags = 0;
-  for (KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
+  for (TDEIO::UDSEntryList::ConstIterator udsIt = uds.begin();
     udsIt != uds.end(); udsIt++)
   {
-    for (KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
+    for (TDEIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
       eIt != (*udsIt).end(); eIt++)
     {
-      if ((*eIt).m_uds == KIO::UDS_NAME)
+      if ((*eIt).m_uds == TDEIO::UDS_NAME)
         name = (*eIt).m_str;
-      else if ((*eIt).m_uds == KIO::UDS_MIME_TYPE)
+      else if ((*eIt).m_uds == TDEIO::UDS_MIME_TYPE)
         mimeType = (*eIt).m_str;
-      else if ((*eIt).m_uds == KIO::UDS_ACCESS)
+      else if ((*eIt).m_uds == TDEIO::UDS_ACCESS)
         flags = (*eIt).m_long;
     }
     if ((mimeType == "message/rfc822-imap" || mimeType == "message/rfc822") &&
@@ -1519,7 +1519,7 @@ KMFolderImap::ignoreJobsForMessage( KMMessage* msg )
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
 {
   if ( data.isEmpty() ) return; // optimization
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1687,7 +1687,7 @@ KMFolderImap::doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
+void KMFolderImap::getMessagesResult(TDEIO::Job * job, bool lastSet)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1704,14 +1704,14 @@ void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetLastMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetLastMessagesResult(TDEIO::Job * job)
 {
   getMessagesResult(job, true);
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetMessagesResult(TDEIO::Job * job)
 {
   getMessagesResult(job, false);
 }
@@ -1735,18 +1735,18 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath
   }
   url.setPath( path );
 
-  KIO::SimpleJob *job = KIO::mkdir(url);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::mkdir(url);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), folder() );
   jd.items = name;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotCreateFolderResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *)));
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
+void KMFolderImap::slotCreateFolderResult(TDEIO::Job * job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1757,7 +1757,7 @@ void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
 
   if (job->error())
   {
-    if ( job->error() == KIO::ERR_COULD_NOT_MKDIR ) {
+    if ( job->error() == TDEIO::ERR_COULD_NOT_MKDIR ) {
       // Creating a folder failed, remove it from the tree.
       account()->listDirectory( );
     }
@@ -1807,7 +1807,7 @@ bool KMFolderImap::autoExpunge()
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
 {
   if ( data.isEmpty() ) return; // optimization
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1837,12 +1837,12 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
   url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) );
   if ( account()->makeConnection() != ImapAccountBase::Connected )
     return;
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), 0 );
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
 }
 
 void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
@@ -1870,12 +1870,12 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
     url.setPath(msg_parent->imapPath() + ";UID=" + uid);
     if ( account()->makeConnection() != ImapAccountBase::Connected )
       return;
-    KIO::SimpleJob *job = KIO::file_delete(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), 0 );
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-        account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+        account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
   }
 }
 
@@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to
     // to make sure that we get the latest flags abort the current listing and
     // create a new one
     kdDebug(5006) << "Set status during folder listing, restarting listing." << endl;
-    disconnect(this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
+    disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
     quiet( false );
     reallyGetFolder( TQString() );
   }
@@ -2070,13 +2070,13 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet)
   url.setPath(aFolder->imapPath() + ";UID=*");
   if ( account()->makeConnection() != ImapAccountBase::Connected )
     return;
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), 0 );
   jd.quiet = quiet;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
 }
 
 //-----------------------------------------------------------------------------
@@ -2132,19 +2132,19 @@ bool KMFolderImap::processNewMail(bool)
               false,
               account()->useSSL() || account()->useTLS() );
 
-  KIO::SimpleJob *job = KIO::stat(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::stat(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd(url.url(), folder() );
   jd.cancellable = true;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotStatResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotStatResult(TDEIO::Job *)));
   return true;
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotStatResult(KIO::Job * job)
+void KMFolderImap::slotStatResult(TDEIO::Job * job)
 {
   slotCompleteMailCheckProgress();
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -2154,10 +2154,10 @@ void KMFolderImap::slotStatResult(KIO::Job * job)
   {
     account()->handleJobError( job, i18n("Error while getting folder information.") );
   } else {
-    KIO::UDSEntry uds = static_cast<KIO::StatJob*>(job)->statResult();
-    for (KIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
+    TDEIO::UDSEntry uds = static_cast<TDEIO::StatJob*>(job)->statResult();
+    for (TDEIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
     {
-      if ((*it).m_uds == KIO::UDS_SIZE)
+      if ((*it).m_uds == TDEIO::UDS_SIZE)
       {
         if (mReadOnly)
         {
@@ -2242,13 +2242,13 @@ int KMFolderImap::expungeContents()
   url.setPath( imapPath() + ";UID=1:*");
   if ( account()->makeConnection() == ImapAccountBase::Connected )
   {
-    KIO::SimpleJob *job = KIO::file_delete(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), 0 );
     jd.quiet = true;
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
   }
   /* Is the below correct? If we are expunging (in the folder sense, not the imap sense),
      why delete but not (imap-)expunge? Since the folder is not active there is no concept
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 059e1a4cb..490b13a69 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -372,9 +372,9 @@ public slots:
   virtual void take(TQPtrList<KMMessage>);
 
   /**
-   * Add the data a KIO::Job retrieves to the buffer
+   * Add the data a TDEIO::Job retrieves to the buffer
    */
-  void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+  void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * Convert IMAP flags to a message status
@@ -426,7 +426,7 @@ protected:
   virtual FolderJob* doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
                                   FolderJob::JobType jt, KMFolder *folder ) const;
 
-  void getMessagesResult(KIO::Job * job, bool lastSet);
+  void getMessagesResult(TDEIO::Job * job, bool lastSet);
 
   /** Called by KMFolder::expunge() to delete the actual contents.
     At the time of the call the folder has already been closed, and
@@ -452,7 +452,7 @@ protected slots:
    * Retrieve the whole folder or only the changes
    */
   void checkValidity();
-  void slotCheckValidityResult(KIO::Job * job);
+  void slotCheckValidityResult(TDEIO::Job * job);
 
   /**
    * Get the folder now (internal)
@@ -462,30 +462,30 @@ protected slots:
   /**
    * For listing the contents of a folder
    */
-  void slotListFolderResult(KIO::Job * job);
-  void slotListFolderEntries(KIO::Job * job, const KIO::UDSEntryList & uds);
+  void slotListFolderResult(TDEIO::Job * job);
+  void slotListFolderEntries(TDEIO::Job * job, const TDEIO::UDSEntryList & uds);
 
   /**
    * For retrieving a message digest
    */
-  void slotGetMessagesResult(KIO::Job * job);
-  void slotGetLastMessagesResult(KIO::Job * job);
-  void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+  void slotGetMessagesResult(TDEIO::Job * job);
+  void slotGetLastMessagesResult(TDEIO::Job * job);
+  void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * For creating a new subfolder
    */
-  void slotCreateFolderResult(KIO::Job * job);
+  void slotCreateFolderResult(TDEIO::Job * job);
 
   /**
    * Remove the folder also locally, if removing on the server succeeded
    */
-  void slotRemoveFolderResult(KIO::Job *job);
+  void slotRemoveFolderResult(TDEIO::Job *job);
 
   /**
    * Update the number of unseen messages
    */
-  void slotStatResult(KIO::Job *job);
+  void slotStatResult(TDEIO::Job *job);
 
   /**
    * notify the progress item that the mail check for this folder is
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index c12a58915..c6fa7be24 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1012,7 +1012,7 @@ static bool removeDirAndContentsRecursively( const TQString & path )
 //-----------------------------------------------------------------------------
 int KMFolderMaildir::removeContents()
 {
-  // NOTE: Don' use KIO::netaccess, it has reentrancy problems and multiple
+  // NOTE: Don' use TDEIO::netaccess, it has reentrancy problems and multiple
   // mailchecks going on trigger them, when removing dirs
   if ( !removeDirAndContentsRecursively( location() + "/new/" ) ) return 1;
   if ( !removeDirAndContentsRecursively( location() + "/cur/" ) ) return 1;
@@ -1132,14 +1132,14 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
     //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
     //  << location() << endl;
     KDirSize* job = KDirSize::dirSizeJob( list );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-             this, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
   }
 
   return -1;
 }
 
-void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
+void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job )
 {
     mCurrentlyCheckingFolderSize = false;
     KDirSize * dirsize = dynamic_cast<KDirSize*>( job );
@@ -1164,8 +1164,8 @@ void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
         //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
         //  << entry.first->location() << endl;
         KDirSize* job = KDirSize::dirSizeJob( entry.second );
-        connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-                 entry.first, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+                 entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
         break;
       }
       else
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 832638ad7..fc1990319 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -13,7 +13,7 @@ namespace KMail {
   class MaildirJob;
   class AttachmentStrategy;
 }
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -145,7 +145,7 @@ protected:
   int addMsgInternal( KMMessage* msg, int* index_return = 0, bool stripUid=false );
 
 private slots:
-  void slotDirSizeJobResult( KIO::Job* job );
+  void slotDirSizeJobResult( TDEIO::Job* job );
 
 private:
   void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status);
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 7e033523d..137996803 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -145,7 +145,7 @@ int KMFolderMbox::open(const char *owner)
         // message boxes don't have a "Don't ask again" checkbox.
         if (kmkernel->startingUp())
         {
-          KConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
+          TDEConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
           bool showMessage =
             configGroup.readBoolEntry( "showIndexRegenerationMessage", true );
           if (showMessage)
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 34958e5a7..2c3d10a5a 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -59,8 +59,8 @@ KMFolderMgr::~KMFolderMgr()
 
 //-----------------------------------------------------------------------------
 void KMFolderMgr::expireAll() {
-  KConfig             *config = KMKernel::config();
-  KConfigGroupSaver   saver(config, "General");
+  TDEConfig             *config = KMKernel::config();
+  TDEConfigGroupSaver   saver(config, "General");
   int                 ret = KMessageBox::Continue;
 
   if (config->readBoolEntry("warn-before-expire", true)) {
@@ -314,8 +314,8 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
     if (know_type == false)
     {
       know_type = true;
-      KConfig *config = KMKernel::config();
-      KConfigGroupSaver saver(config, "General");
+      TDEConfig *config = KMKernel::config();
+      TDEConfigGroupSaver saver(config, "General");
       if (config->hasKey("default-mailbox-format"))
       {
         if (config->readNumEntry("default-mailbox-format", 1) == 0)
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 819d5ff82..fa34f5b99 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -92,7 +92,7 @@ KMSearch::~KMSearch()
 
 bool KMSearch::write(TQString location) const
 {
-    KConfig config(location);
+    TDEConfig config(location);
     config.setGroup("Search Folder");
     if (mSearchPattern)
         mSearchPattern->writeConfig(&config);
@@ -106,7 +106,7 @@ bool KMSearch::write(TQString location) const
 
 bool KMSearch::read(TQString location)
 {
-    KConfig config( location );
+    TDEConfig config( location );
     config.setGroup( "Search Folder" );
     if ( !mSearchPattern )
         mSearchPattern = new KMSearchPattern();
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index 719dce4e0..f30ab4b3d 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -122,7 +122,7 @@ void KMFolderSelDlg::setFlags( bool mustBeReadWrite, bool showOutbox,
 
 void KMFolderSelDlg::readConfig()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup( "FolderSelectionDialog" );
 
   TQSize size = config->readSizeEntry( "Size" );
@@ -143,7 +143,7 @@ void KMFolderSelDlg::readConfig()
 
 void KMFolderSelDlg::writeConfig()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup( "FolderSelectionDialog" );
   config->writeEntry( "Size", size() );
 
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 7bec817b6..9d259f562 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -480,13 +480,13 @@ void KMFolderTree::connectSignals()
 //-----------------------------------------------------------------------------
 void KMFolderTree::readConfig (void)
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
 
   readColorConfig();
 
   // Custom/Ssystem font support
   {
-    KConfigGroupSaver saver(conf, "Fonts");
+    TDEConfigGroupSaver saver(conf, "Fonts");
     if (!conf->readBoolEntry("defaultFonts",true)) {
       TQFont folderFont( TDEGlobalSettings::generalFont() );
       setFont(conf->readFontEntry("folder-font", &folderFont));
@@ -1045,9 +1045,9 @@ void KMFolderTree::doFolderSelected( TQListViewItem* qlvi, bool keepSelection )
 //-----------------------------------------------------------------------------
 void KMFolderTree::resizeEvent(TQResizeEvent* e)
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
 
-  KConfigGroupSaver saver(conf, "Geometry");
+  TDEConfigGroupSaver saver(conf, "Geometry");
   conf->writeEntry(name(), size().width());
 
   KListView::resizeEvent(e);
@@ -1321,7 +1321,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
 // config file.
 bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMFolder *folder = fti->folder();
   TQString name;
   if (folder)
@@ -1338,7 +1338,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
   } else {
     return false;
   }
-  KConfigGroupSaver saver(config, name);
+  TDEConfigGroupSaver saver(config, name);
 
   return config->readBoolEntry("isOpen", false);
 }
@@ -1347,7 +1347,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
 // Saves open/closed state of a folder directory into the config file
 void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMFolder *folder = fti->folder();
   TQString name;
   if (folder && !folder->idString().isEmpty())
@@ -1364,7 +1364,7 @@ void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
   } else {
     return;
   }
-  KConfigGroupSaver saver(config, name);
+  TDEConfigGroupSaver saver(config, name);
   config->writeEntry("isOpen", fti->isOpen() );
 }
 
@@ -1374,7 +1374,7 @@ void KMFolderTree::cleanupConfigFile()
 {
   if ( childCount() == 0 )
     return; // just in case reload wasn't called before
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQStringList existingFolders;
   TQListViewItemIterator fldIt(this);
   TQMap<TQString,bool> folderMap;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bfe871945..8e142c91e 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -426,9 +426,9 @@ bool KMHeaders::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMHeaders::readColorConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   // Custom/System colors
-  KConfigGroupSaver saver(config, "Reader");
+  TDEConfigGroupSaver saver(config, "Reader");
   TQColor c1=TQColor(kapp->palette().active().text());
   TQColor c2=TQColor("red");
   TQColor c3=TQColor("blue");
@@ -468,11 +468,11 @@ void KMHeaders::readColorConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::readConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
   // Backing pixmap support
   { // area for config group "Pixmaps"
-    KConfigGroupSaver saver(config, "Pixmaps");
+    TDEConfigGroupSaver saver(config, "Pixmaps");
     TQString pixmapFile = config->readEntry("Headers");
     mPaintInfo.pixmapOn = false;
     if (!pixmapFile.isEmpty()) {
@@ -482,7 +482,7 @@ void KMHeaders::readConfig (void)
   }
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     bool show = config->readBoolEntry("showMessageSize");
     slotToggleColumn(KPaintInfo::COL_SIZE, show);
 
@@ -530,7 +530,7 @@ void KMHeaders::readConfig (void)
 
   // Custom/System fonts
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "Fonts");
+    TDEConfigGroupSaver saver(config, "Fonts");
     if (!(config->readBoolEntry("defaultFonts",true)))
     {
       TQFont listFont( TDEGlobalSettings::generalFont() );
@@ -551,13 +551,13 @@ void KMHeaders::readConfig (void)
 
   // Behavior
   {
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mReaderWindowActive = config->readEntry( "readerWindowMode", "below" ) != "hide";
   }
 }
 
 //-----------------------------------------------------------------------------
-void KMHeaders::restoreColumnLayout( KConfig *config, const TQString &group )
+void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group )
 {
   // KListView::restoreLayout() will call setSorting(), which is reimplemented by us.
   // We don't want to change the sort order, so we set a flag here that is checked in
@@ -591,8 +591,8 @@ void KMHeaders::refreshNestedState(void)
 {
   bool oldState = isThreaded();
   NestingPolicy oldNestPolicy = nestingPolicy;
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Geometry");
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Geometry");
   mNested = config->readBoolEntry( "nestedMessages", false );
 
   nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
@@ -609,9 +609,9 @@ void KMHeaders::refreshNestedState(void)
 void KMHeaders::readFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mNestedOverride = config->readBoolEntry( "threadMessagesOverride", false );
   mSortCol = config->readNumEntry("SortColumn", mSortCol+1 /* inited to  date column */);
   mSortDescending = (mSortCol < 0);
@@ -625,7 +625,7 @@ void KMHeaders::readFolderConfig (void)
   mPaintInfo.status = config->readBoolEntry( "Status", false );
 
   { //area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mNested = config->readBoolEntry( "nestedMessages", false );
     nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
   }
@@ -639,10 +639,10 @@ void KMHeaders::readFolderConfig (void)
 void KMHeaders::writeFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   int mSortColAdj = mSortCol + 1;
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry("SortColumn", (mSortDescending ? -mSortColAdj : mSortColAdj));
   config->writeEntry("Top", topItemIndex());
   config->writeEntry("Current", currentItemIndex());
@@ -659,9 +659,9 @@ void KMHeaders::writeFolderConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::writeConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   saveLayout(config, "Header-Geometry");
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   config->writeEntry("showMessageSize"         , mPaintInfo.showSize);
   config->writeEntry("showAttachmentColumn"    , mPaintInfo.showAttachment);
   config->writeEntry("showInvitationColumn"    , mPaintInfo.showInvitation);
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 28b75142d..b894b0c7f 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -141,7 +141,7 @@ public:
    *
    * Note that if you want to restore the sort order correctly, call readConfig().
    */
-  void restoreColumnLayout( KConfig *config, const TQString &group );
+  void restoreColumnLayout( TDEConfig *config, const TQString &group );
 
   /** Return the current message */
   virtual KMMessage* currentMsg();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 11e291ef2..e5dd7072a 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -173,10 +173,10 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
 
 KMKernel::~KMKernel ()
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.begin();
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.begin();
   while ( it != mPutJobs.end() )
   {
-    KIO::Job *job = it.key();
+    TDEIO::Job *job = it.key();
     mPutJobs.remove( it );
     job->kill();
     it = mPutJobs.begin();
@@ -528,7 +528,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
   bool iCalAutoSend = false;
   bool noWordWrap = false;
   bool isICalInvitation = false;
-  KConfigGroup options( config(), "Groupware" );
+  TDEConfigGroup options( config(), "Groupware" );
   if ( !attachData.isEmpty() ) {
     isICalInvitation = attachName == "cal.ics" &&
       attachType == "text" &&
@@ -566,7 +566,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
         msgPart->setCharset( attachCharset );
       }
       // Don't show the composer window, if the automatic sending is checked
-      KConfigGroup options( config(), "Groupware" );
+      TDEConfigGroup options( config(), "Groupware" );
       iCalAutoSend = options.readBoolEntry( "AutomaticSending", true );
     }
   }
@@ -1411,7 +1411,7 @@ void KMKernel::recoverDeadLetters()
 }
 
 //-----------------------------------------------------------------------------
-void KMKernel::initFolders(KConfig* cfg)
+void KMKernel::initFolders(TDEConfig* cfg)
 {
   TQString name;
 
@@ -1498,11 +1498,11 @@ void KMKernel::init()
   the_shuttingDown = false;
   the_server_is_ready = false;
 
-  KConfig* cfg = KMKernel::config();
+  TDEConfig* cfg = KMKernel::config();
 
   TQDir dir;
 
-  KConfigGroupSaver saver(cfg, "General");
+  TDEConfigGroupSaver saver(cfg, "General");
   the_firstStart = cfg->readBoolEntry("first-start", true);
   cfg->writeEntry("first-start", false);
   the_previousVersion = cfg->readEntry("previous-version");
@@ -1547,7 +1547,7 @@ void KMKernel::init()
   the_server_is_ready = true;
   imProxy()->initialize();
   { // area for config group "Composer"
-    KConfigGroupSaver saver(cfg, "Composer");
+    TDEConfigGroupSaver saver(cfg, "Composer");
     if (cfg->readListEntry("pref-charsets").isEmpty())
     {
       cfg->writeEntry("pref-charsets", "us-ascii,iso-8859-1,locale,utf-8");
@@ -1780,8 +1780,8 @@ void KMKernel::cleanup(void)
   the_weaver = 0;
 #endif
 
-  KConfig* config =  KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig* config =  KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   if (the_trashFolder) {
 
@@ -1872,7 +1872,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
   // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved)
   const TQString kmailName = kapp->aboutData()->programName();
   TQString msg;
-  if ( KIO::NetAccess::exists( destinationDir, true, 0 ) ) {
+  if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) {
     // if destinationDir exists, we need to warn about possible
     // overwriting of files. otherwise, we don't have to
     msg = i18n( "%1-%3 is the application name, %4-%7 are folder path",
@@ -1906,10 +1906,10 @@ bool KMKernel::transferMail( TQString & destinationDir )
     return true;
   }
 
-  if ( !KIO::NetAccess::move( dir, destinationDir ) ) {
-    kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << KIO::NetAccess::lastErrorString() << endl;
+  if ( !TDEIO::NetAccess::move( dir, destinationDir ) ) {
+    kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << TDEIO::NetAccess::lastErrorString() << endl;
     kdDebug(5006) << k_funcinfo << "Deleting " << destinationDir << endl;
-    KIO::NetAccess::del( destinationDir, 0 );
+    TDEIO::NetAccess::del( destinationDir, 0 );
     destinationDir = dir;
     return false;
   }
@@ -2002,21 +2002,21 @@ void KMKernel::action(bool mailto, bool check, const TQString &to,
 void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL,
   bool overwrite)
 {
-  // ## when KDE 3.3 is out: use KIO::storedPut to remove slotDataReq altogether
-  KIO::Job *job = KIO::put(aURL, -1, overwrite, false);
+  // ## when KDE 3.3 is out: use TDEIO::storedPut to remove slotDataReq altogether
+  TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false);
   putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0;
   mPutJobs.insert(job, pd);
-  connect(job, TQT_SIGNAL(dataReq(KIO::Job*,TQByteArray&)),
-    TQT_SLOT(slotDataReq(KIO::Job*,TQByteArray&)));
-  connect(job, TQT_SIGNAL(result(KIO::Job*)),
-    TQT_SLOT(slotResult(KIO::Job*)));
+  connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+    TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+    TQT_SLOT(slotResult(TDEIO::Job*)));
 }
 
-void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
+void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data)
 {
   // send the data in 64 KB chunks
   const int MAX_CHUNK_SIZE = 64*1024;
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   int remainingBytes = (*it).data.size() - (*it).offset;
   if( remainingBytes > MAX_CHUNK_SIZE )
@@ -2037,13 +2037,13 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
   }
 }
 
-void KMKernel::slotResult(KIO::Job *job)
+void KMKernel::slotResult(TDEIO::Job *job)
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   if (job->error())
   {
-    if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+    if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
@@ -2286,7 +2286,7 @@ void KMKernel::slotEmptyTrash()
   }
 }
 
-KConfig* KMKernel::config()
+TDEConfig* KMKernel::config()
 {
   assert(mySelf);
   if (!mySelf->mConfig)
@@ -2352,9 +2352,9 @@ KMMainWidget *KMKernel::getKMMainWidget()
 
 void KMKernel::slotRunBackgroundTasks() // called regularly by timer
 {
-  // Hidden KConfig keys. Not meant to be used, but a nice fallback in case
+  // Hidden TDEConfig keys. Not meant to be used, but a nice fallback in case
   // a stable kmail release goes out with a nasty bug in CompactionJob...
-  KConfigGroup generalGroup( config(), "General" );
+  TDEConfigGroup generalGroup( config(), "General" );
 
   if ( generalGroup.readBoolEntry( "auto-expiring", true ) ) {
     the_folderMgr->expireAllFolders( false /*scheduled, not immediate*/ );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 471a77400..fb01231bf 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -21,7 +21,7 @@
 #define kmkernel KMKernel::self()
 #define kmconfig KMKernel::config()
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 namespace KWallet {
@@ -249,7 +249,7 @@ public:
   /** normal control stuff */
 
   static KMKernel *self() { return mySelf; }
-  static KConfig *config();
+  static TDEConfig *config();
 
   void init();
   void readConfig();
@@ -257,7 +257,7 @@ public:
   void recreateCorruptIndexFiles();
   void testDir(const char *_name);
   void recoverDeadLetters();
-  void initFolders(KConfig* cfg);
+  void initFolders(TDEConfig* cfg);
   void closeAllKMailWindows();
   void cleanup(void);
   void quit();
@@ -416,7 +416,7 @@ public slots:
   /// Save contents of all open composer widnows to ~/dead.letter
   void dumpDeadLetters();
 
-  /** Call this slot instead of directly KConfig::sync() to
+  /** Call this slot instead of directly TDEConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
@@ -432,8 +432,8 @@ public slots:
   void slotConfigChanged();
 
 protected slots:
-  void slotDataReq(KIO::Job*,TQByteArray&);
-  void slotResult(KIO::Job*);
+  void slotDataReq(TDEIO::Job*,TQByteArray&);
+  void slotResult(TDEIO::Job*);
 
 signals:
   void configChanged();
@@ -470,7 +470,7 @@ private:
     TQByteArray data;
     int offset;
   };
-  TQMap<KIO::Job *, putData> mPutJobs;
+  TQMap<TDEIO::Job *, putData> mPutJobs;
   /** previous KMail version. If different from current,
       the user has just updated. read from config */
   TQString the_previousVersion;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index c078cfe7a..acf0b0c03 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
       else {
         KABC::VCardConverter converter;
         TQString fileName;
-        if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+        if ( TDEIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
           TQFile file( fileName );
           file.open( IO_ReadOnly );
           const TQByteArray data = file.readAll();
@@ -129,7 +129,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
 #else
           list += converter.parseVCards( data );
 #endif
-          KIO::NetAccess::removeTempFile( fileName );
+          TDEIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
           TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
@@ -188,7 +188,7 @@ void KMLineEdit::loadContacts()
       TQStringList::Iterator it = recent.begin();
       TQString name, email;
 
-      KConfig config( "kpimcompletionorder" );
+      TDEConfig config( "kpimcompletionorder" );
       config.setGroup( "CompletionWeights" );
       int weight = config.readEntry( "Recent Addresses", "10" ).toInt();
       int idx = addCompletionSource( i18n( "Recent Addresses" ), weight );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 622e70ad7..14ccaba02 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
 //-----------------------------------------------------------------------------
 KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
                            KXMLGUIClient *aGUIClient,
-                           KActionCollection *actionCollection, KConfig* config ) :
+                           KActionCollection *actionCollection, TDEConfig* config ) :
     TQWidget(parent, name),
     mFavoritesCheckMailAction( 0 ),
     mFavoriteFolderView( 0 ),
@@ -287,8 +287,8 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
   mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
@@ -307,8 +307,8 @@ void KMMainWidget::readFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mFolderThreadPref = config->readBoolEntry( "threadMessagesOverride", false );
   mFolderThreadSubjPref = config->readBoolEntry( "threadMessagesBySubject", true );
   mFolderHtmlPref = config->readBoolEntry( "htmlMailOverride", false );
@@ -322,8 +322,8 @@ void KMMainWidget::writeFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry( "threadMessagesOverride", mFolderThreadPref );
   config->writeEntry( "threadMessagesBySubject", mFolderThreadSubjPref );
   config->writeEntry( "htmlMailOverride", mFolderHtmlPref );
@@ -334,7 +334,7 @@ void KMMainWidget::writeFolderConfig(void)
 //-----------------------------------------------------------------------------
 void KMMainWidget::readConfig(void)
 {
-  KConfig *config = KMKernel::config();
+  TDEConfig *config = KMKernel::config();
 
   bool oldLongFolderList =  mLongFolderList;
   bool oldReaderWindowActive = mReaderWindowActive;
@@ -367,7 +367,7 @@ void KMMainWidget::readConfig(void)
   }
 
   { // area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     // size of the mainwin
     TQSize defaultSize(750,560);
     siz = config->readSizeEntry("MainWin", &defaultSize);
@@ -458,7 +458,7 @@ void KMMainWidget::readConfig(void)
   mFavoritesCheckMailAction->setEnabled( GlobalSettings::self()->enableFavoriteFolderView() );
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     mBeepOnNew = config->readBoolEntry("beep-on-mail", false);
     mConfirmEmpty = config->readBoolEntry("confirm-before-empty", true);
     // startup-Folder, defaults to system-inbox
@@ -515,8 +515,8 @@ void KMMainWidget::readConfig(void)
 void KMMainWidget::writeConfig(void)
 {
   TQString s;
-  KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroup geometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -1125,8 +1125,8 @@ void KMMainWidget::slotExpireFolder()
     KMessageBox::information(this, str);
     return;
   }
-  KConfig           *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig           *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() ));
@@ -1319,10 +1319,10 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotExpireAll() {
-  KConfig    *config = KMKernel::config();
+  TDEConfig    *config = KMKernel::config();
   int        ret = 0;
 
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
@@ -1811,7 +1811,7 @@ void KMMainWidget::slotPrintMsg()
 
   bool htmlOverride = mMsgView ? mMsgView->htmlOverride() : false;
   bool htmlLoadExtOverride = mMsgView ? mMsgView->htmlLoadExtOverride() : false;
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
 
@@ -2335,7 +2335,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
 
   assert( msg != 0 );
   KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
   win->setUseFixedFont( useFixedFont );
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index fbfd9eeb8..959d581dc 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -39,7 +39,7 @@ class TQSignalMapper;
 
 class KActionMenu;
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KRadioAction;
 class KToggleAction;
 class KMenuBar;
@@ -62,7 +62,7 @@ template <typename T> class TQValueList;
 template <typename T, typename S> class TQMap;
 template <typename T> class TQGuardedPtr;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -88,7 +88,7 @@ public:
   KMMainWidget(TQWidget *parent, const char *name,
                KXMLGUIClient *aGUIClient,
                KActionCollection *actionCollection,
-         KConfig*config = KMKernel::config() );
+         TDEConfig*config = KMKernel::config() );
   virtual ~KMMainWidget();
   void destruct();
 
@@ -265,7 +265,7 @@ protected:
   /** @return the correct config dialog depending on whether the parent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
    */
-  KConfig * config();
+  TDEConfig * config();
 
 protected slots:
   void slotCheckOneAccount(int);
@@ -564,7 +564,7 @@ private:
   TQPtrList<KAction> mCustomTemplateActions;
 
   KMSystemTray  *mSystemTray;
-  KConfig *mConfig;
+  TDEConfig *mConfig;
   KXMLGUIClient *mGUIClient;
 
   KMail::MessageActions *mMsgActions;
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6f7d2b12a..20f9ce4c3 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -1425,7 +1425,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
 
   MDN::SendingMode s = MDN::SentAutomatically; // set to manual if asked user
   TQString special; // fill in case of error, warning or failure
-  KConfigGroup mdnConfig( KMKernel::config(), "MDN" );
+  TDEConfigGroup mdnConfig( KMKernel::config(), "MDN" );
 
   // default:
   int mode = mdnConfig.readNumEntry( "default-policy", 0 );
@@ -1794,7 +1794,7 @@ void KMMessage::setAutomaticFields(bool aIsMulti)
 //-----------------------------------------------------------------------------
 TQString KMMessage::dateStr() const
 {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   DwHeaders& header = mMsg->Headers();
   time_t unixTime;
 
@@ -3364,7 +3364,7 @@ TQString KMMessage::generateMessageId( const TQString& addr )
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
 
   TQString msgIdSuffix;
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   if( general.readBoolEntry( "useCustomMessageIdSuffix", false ) )
     msgIdSuffix = general.readEntry( "myMessageIdSuffix" );
@@ -3976,7 +3976,7 @@ TQString KMMessage::expandAliases( const TQString& recipients )
     // check whether the address is missing the domain part
     // FIXME: looking for '@' might be wrong
     if ( receiver.find('@') == -1 ) {
-      KConfigGroup general( KMKernel::config(), "General" );
+      TDEConfigGroup general( KMKernel::config(), "General" );
       TQString defaultdomain = general.readEntry( "Default domain" );
       if( !defaultdomain.isEmpty() ) {
         expandedRecipients += receiver + "@" + defaultdomain;
@@ -4029,15 +4029,15 @@ void KMMessage::readConfig()
 {
   KMMsgBase::readConfig();
 
-  KConfig *config=KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config=KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   config->setGroup("General");
 
   int languageNr = config->readNumEntry("reply-current-language",0);
 
   { // area for config group "KMMessage #n"
-    KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
+    TDEConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
     sReplyLanguage = config->readEntry("language",TDEGlobal::locale()->language());
     sReplyStr = config->readEntry("phrase-reply",
       i18n("On %D, you wrote:"));
@@ -4049,7 +4049,7 @@ void KMMessage::readConfig()
   }
 
   { // area for config group "Composer"
-    KConfigGroupSaver saver(config, "Composer");
+    TDEConfigGroupSaver saver(config, "Composer");
     sSmartQuote = GlobalSettings::self()->smartQuote();
     sWordWrap = GlobalSettings::self()->wordWrap();
     sWrapCol = GlobalSettings::self()->lineWrapWidth();
@@ -4062,7 +4062,7 @@ void KMMessage::readConfig()
   }
 
   { // area for config group "Reader"
-    KConfigGroupSaver saver(config, "Reader");
+    TDEConfigGroupSaver saver(config, "Reader");
     sHeaderStrategy = HeaderStrategy::create( config->readEntry( "header-set-displayed", "rich" ) );
   }
 }
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 50af4a428..74cbe62e5 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -236,7 +236,7 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
 {
   if (!item) return;
 
-  KIO::filesize_t totalSize = 0;
+  TDEIO::filesize_t totalSize = 0;
   TQListViewItem * myChild = item->firstChild();
   while ( myChild )
   {
@@ -244,7 +244,7 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
     myChild = myChild->nextSibling();
   }
   if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() )
-    item->setText( mSizeColumn, KIO::convertSize(totalSize) );
+    item->setText( mSizeColumn, TDEIO::convertSize(totalSize) );
   if ( item->parent() )
     correctSize( item->parent() );
 }
@@ -318,11 +318,11 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
-                                        KIO::filesize_t size )
+                                        TDEIO::filesize_t size )
   : TQListViewItem( parent, description,
 		   TQString(), // set by setIconAndTextForType()
 		   encoding,
-		   KIO::convertSize( size ) ),
+		   TDEIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
 {
   if( node )
@@ -337,12 +337,12 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
-                                        KIO::filesize_t size,
+                                        TDEIO::filesize_t size,
                                         bool revertOrder )
   : TQListViewItem( parent, description,
 		   TQString(), // set by setIconAndTextForType()
 		   encoding,
-		   KIO::convertSize( size ) ),
+		   TDEIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
 {
   if( revertOrder && nextSibling() ){
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index e6985d2c5..a5634b099 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -103,24 +103,24 @@ public:
                       const TQString & labelDescr,
                       const TQString & labelCntType  = TQString(),
                       const TQString & labelEncoding = TQString(),
-                      KIO::filesize_t size=0 );
+                      TDEIO::filesize_t size=0 );
   KMMimePartTreeItem( KMMimePartTreeItem * parent,
                       partNode* node,
                       const TQString & labelDescr,
                       const TQString & labelCntType  = TQString(),
                       const TQString & labelEncoding = TQString(),
-                      KIO::filesize_t size=0,
+                      TDEIO::filesize_t size=0,
                       bool revertOrder = false );
   partNode* node() const { return mPartNode; }
 
-  KIO::filesize_t origSize() const { return mOrigSize; }
-  void setOrigSize( KIO::filesize_t size ) { mOrigSize = size; }
+  TDEIO::filesize_t origSize() const { return mOrigSize; }
+  void setOrigSize( TDEIO::filesize_t size ) { mOrigSize = size; }
 
 private:
   void setIconAndTextForType( const TQString & mimetype );
 
   partNode* mPartNode;
-  KIO::filesize_t mOrigSize;
+  TDEIO::filesize_t mOrigSize;
 };
 
 #endif // KMMIMEPARTTREE_H
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index 3cd4f658f..eaac2ebfc 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -1446,7 +1446,7 @@ static bool sReplaceSubjPrefix, sReplaceForwSubjPrefix;
 //-----------------------------------------------------------------------------
 void KMMsgBase::readConfig()
 {
-  KConfigGroup composerGroup( KMKernel::config(), "Composer" );
+  TDEConfigGroup composerGroup( KMKernel::config(), "Composer" );
   sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
   if (sReplySubjPrefixes.isEmpty())
     sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 3af55f520..dc0815f81 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -94,7 +94,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 
   // row 1: Size label:
   mSize = new TQLabel( plainPage() );
-  setSize( KIO::filesize_t(0) );
+  setSize( TDEIO::filesize_t(0) );
   glay->addWidget( mSize, 1, 1 );
 
   msg = i18n("<qt><p>The size of the part:</p>"
@@ -217,8 +217,8 @@ void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
   mMimeType->insertStringList( mimeTypes );
 }
 
-void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) {
-  TQString text = KIO::convertSize( size );
+void KMMsgPartDialog::setSize( TDEIO::filesize_t size, bool estimated ) {
+  TQString text = TDEIO::convertSize( size );
   if ( estimated )
     text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")",
 		"%1 (est.)").arg( text );
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 1a7a83d38..78588eb10 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -63,7 +63,7 @@ public:
   /** Sets the size of the file to be attached in bytes. This is
       strictly informational and thus can't be queried. If @p approx
       is true, the size is an estimation based on typical */
-  void setSize( KIO::filesize_t size, bool estimated=false );
+  void setSize( TDEIO::filesize_t size, bool estimated=false );
 
   /** Returns the current file name of the attachment. Note that this
       doesn't define which file is being attached. It only defines
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index ed406209f..5cbbacda4 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -401,7 +401,7 @@ void KMPopFilterCnfrmDlg::setupLVI(KMPopHeadersViewItem *lvi, KMMessage *msg)
       // set the date
       lvi->setText(6, KMime::DateFormatter::formatDate( KMime::DateFormatter::Fancy, msg->date() ) );
       // set the size
-      lvi->setText(7, KIO::convertSize(msg->msgLength()));
+      lvi->setText(7, TDEIO::convertSize(msg->msgLength()));
       // Date for sorting
       lvi->setText(8, msg->dateIsoStr());
 }
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 80d461205..2ce6c8623 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -877,8 +877,8 @@ bool KMReaderWin::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMReaderWin::readConfig(void)
 {
-  const KConfigGroup mdnGroup( KMKernel::config(), "MDN" );
-  /*should be: const*/ KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup mdnGroup( KMKernel::config(), "MDN" );
+  /*should be: const*/ TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   delete mCSSHelper;
   mCSSHelper = new KMail::CSSHelper( TQPaintDeviceMetrics( mViewer->view() ) );
@@ -957,7 +957,7 @@ void KMReaderWin::adjustLayout() {
 }
 
 
-void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
+void KMReaderWin::saveSplitterSizes( TDEConfigBase & c ) const {
   if ( !mSplitter || !mMimePartTree )
     return;
   if ( mMimePartTree->isHidden() )
@@ -969,7 +969,7 @@ void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::writeConfig( bool sync ) const {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   reader.writeEntry( "useFixedFont", mUseFixedFont );
   if ( headerStyle() )
@@ -1443,7 +1443,7 @@ void KMReaderWin::showHideMimeTree( bool isPlainTextTopLevel ) {
     mMimePartTree->show();
   else {
     // don't rely on TQSplitter maintaining sizes for hidden widgets:
-    KConfigGroup reader( KMKernel::config(), "Reader" );
+    TDEConfigGroup reader( KMKernel::config(), "Reader" );
     saveSplitterSizes( reader );
     mMimePartTree->hide();
   }
@@ -1513,7 +1513,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   TQString cntDesc = aMsg->subject();
   if( cntDesc.isEmpty() )
     cntDesc = i18n("( body part )");
-  KIO::filesize_t cntSize = aMsg->msgSize();
+  TDEIO::filesize_t cntSize = aMsg->msgSize();
   TQString cntEnc;
   if( aMsg->contentTransferEncodingStr().isEmpty() )
     cntEnc = "7bit";
@@ -1574,7 +1574,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   }
 
   bool emitReplaceMsgByUnencryptedVersion = false;
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   if ( reader.readBoolEntry( "store-displayed-messages-unencrypted", false ) ) {
 
   // Hack to make sure the S/MIME CryptPlugs follows the strict requirement
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index f8c4e74e5..b8dd3f9ff 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -34,7 +34,7 @@ class KActionMenu;
 class KSelectAction;
 class KRadioAction;
 class KToggleAction;
-class KConfigBase;
+class TDEConfigBase;
 class KHTMLPart;
 class KURL;
 
@@ -529,7 +529,7 @@ private:
   void adjustLayout();
   void createWidgets();
   void createActions( KActionCollection * ac );
-  void saveSplitterSizes( KConfigBase & c ) const;
+  void saveSplitterSizes( TDEConfigBase & c ) const;
 
   KRadioAction * actionForHeaderStyle( const KMail::HeaderStyle *,
                                        const KMail::HeaderStrategy * );
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 2c003e49e..0d94c149f 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -125,7 +125,7 @@ KMSearchRule * KMSearchRule::createInstance( const KMSearchRule & other )
   return ( createInstance( other.field(), other.function(), other.contents() ) );
 }
 
-KMSearchRule * KMSearchRule::createInstanceFromConfig( const KConfig * config, int aIdx )
+KMSearchRule * KMSearchRule::createInstanceFromConfig( const TDEConfig * config, int aIdx )
 {
   const char cIdx = char( int('A') + aIdx );
 
@@ -161,7 +161,7 @@ TQString KMSearchRule::functionToString( Function function )
     return "invalid";
 }
 
-void KMSearchRule::writeConfig( KConfig * config, int aIdx ) const {
+void KMSearchRule::writeConfig( TDEConfig * config, int aIdx ) const {
   const char cIdx = char('A' + aIdx);
   static const TQString & field = TDEGlobal::staticQString( "field" );
   static const TQString & func = TDEGlobal::staticQString( "func" );
@@ -712,7 +712,7 @@ bool KMSearchRuleStatus::matches( const KMMessage * msg ) const
 //
 //==================================================
 
-KMSearchPattern::KMSearchPattern( const KConfig * config )
+KMSearchPattern::KMSearchPattern( const TDEConfig * config )
   : TQPtrList<KMSearchRule>()
 {
   setAutoDelete( true );
@@ -827,7 +827,7 @@ void KMSearchPattern::purify() {
     }
 }
 
-void KMSearchPattern::readConfig( const KConfig * config ) {
+void KMSearchPattern::readConfig( const TDEConfig * config ) {
   init();
 
   mName = config->readEntry("name");
@@ -850,7 +850,7 @@ void KMSearchPattern::readConfig( const KConfig * config ) {
   }
 }
 
-void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
+void KMSearchPattern::importLegacyConfig( const TDEConfig * config ) {
   KMSearchRule * rule = KMSearchRule::createInstance( config->readEntry("fieldA").latin1(),
 					  config->readEntry("funcA").latin1(),
 					  config->readEntry("contentsA") );
@@ -893,7 +893,7 @@ void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
   // treat any other case as "and" (our default).
 }
 
-void KMSearchPattern::writeConfig( KConfig * config ) const {
+void KMSearchPattern::writeConfig( TDEConfig * config ) const {
   config->writeEntry("name", mName);
   config->writeEntry("operator", (mOperator == KMSearchPattern::OpOr) ? "or" : "and" );
 
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index b60e9cdc8..d532602ea 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -13,7 +13,7 @@
 #include "kmmsgbase.h" // for KMMsgStatus
 
 class KMMessage;
-class KConfig;
+class TDEConfig;
 class DwBoyerMoore;
 class DwString;
 
@@ -70,7 +70,7 @@ public:
       rules within a single config group. This function does no
       validation of the data obtained from the config file. You should
       call isEmpty yourself if you need valid rules. */
-  static KMSearchRule* createInstanceFromConfig( const KConfig * config, int aIdx );
+  static KMSearchRule* createInstanceFromConfig( const TDEConfig * config, int aIdx );
 
   virtual ~KMSearchRule() {};
 
@@ -104,7 +104,7 @@ public:
       rules within a single config group. This function will happily
       write itself even when it's not valid, assuming higher layers to
       Do The Right Thing(TM). */
-  void writeConfig( KConfig * config, int aIdx ) const;
+  void writeConfig( TDEConfig * config, int aIdx ) const;
 
   /** Return filter function. This can be any of the operators
       defined in Function. */
@@ -290,8 +290,8 @@ public:
 /** This class is an abstraction of a search over messages.  It is
     intended to be used inside a KFilter (which adds KFilterAction's),
     as well as in KMSearch. It can read and write itself into a
-    KConfig group and there is a constructor, mainly used by KMFilter
-    to initialize from a preset KConfig-Group.
+    TDEConfig group and there is a constructor, mainly used by KMFilter
+    to initialize from a preset TDEConfig-Group.
 
     From a class hierarchy point of view, it is a TQPtrList of
     KMSearchRule's that adds the boolean operators (see Operator)
@@ -315,7 +315,7 @@ public:
       any of it's rules matches.
   */
   enum Operator { OpAnd, OpOr };
-  /** Constructor that initializes from a given KConfig group, if
+  /** Constructor that initializes from a given TDEConfig group, if
       given. This feature is mainly (solely?) used in KMFilter,
       as we don't allow to store search patterns in the config (yet).
       If config is 0, provides a pattern with minimal, but
@@ -323,7 +323,7 @@ public:
       to match any KMMessage. You can query for such an empty
       rule by using isEmpty, which is inherited from TQPtrList.
   */
-  KMSearchPattern( const KConfig * config=0 );
+  KMSearchPattern( const TDEConfig * config=0 );
 
   /** Destructor. Deletes all stored rules! */
   ~KMSearchPattern();
@@ -351,7 +351,7 @@ public:
   */
   void purify();
 
-  /** Reads a search pattern from a KConfig.  The group has to be
+  /** Reads a search pattern from a TDEConfig.  The group has to be
       preset. If it does not find a valid saerch pattern in the preset
       group, initializes the pattern as if it were constructed using
       the default constructor.
@@ -363,14 +363,14 @@ public:
       Derived classes reimplementing readConfig() should also call this
       method, or else the rules will not be loaded.
   */
-  void readConfig( const KConfig * config );
+  void readConfig( const TDEConfig * config );
   /** Writes itself into @p config. The group has to be preset. Tries
       to delete old-style keys by overwriting them with TQString().
 
       Derived classes reimplementing writeConfig() should also call this
       method, or else the rules will not be stored.
   */
-  void writeConfig( KConfig * config ) const;
+  void writeConfig( TDEConfig * config ) const;
 
   /** Get the name of the search pattern. */
   TQString name() const { return mName; }
@@ -397,7 +397,7 @@ private:
       and also makes sure that this method is called from an initialized
       object.
   */
-  void importLegacyConfig( const KConfig * config );
+  void importLegacyConfig( const TDEConfig * config );
   /** Initializes the object. Clears the list of rules, sets the name
       to "<i18n("unnamed")>", and the boolean operator to @p OpAnd. */
   void init();
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index a8953b6e4..d6a2f8add 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -87,7 +87,7 @@ void KMSender::setStatusMsg(const TQString &msg)
 void KMSender::readConfig(void)
 {
   TQString str;
-  KConfigGroup config(KMKernel::config(), SENDER_GROUP);
+  TDEConfigGroup config(KMKernel::config(), SENDER_GROUP);
 
   mSendImmediate = config.readBoolEntry("Immediate", true);
   mSendQuotedPrintable = config.readBoolEntry("Quoted-Printable", true);
@@ -97,7 +97,7 @@ void KMSender::readConfig(void)
 //-----------------------------------------------------------------------------
 void KMSender::writeConfig(bool aWithSync)
 {
-  KConfigGroup config(KMKernel::config(), SENDER_GROUP);
+  TDEConfigGroup config(KMKernel::config(), SENDER_GROUP);
 
   config.writeEntry("Immediate", mSendImmediate);
   config.writeEntry("Quoted-Printable", mSendQuotedPrintable);
@@ -1043,8 +1043,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender)
     mJob(0),
     mSlave(0)
 {
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave *, int,
-    const TQString &)), this, TQT_SLOT(slaveError(KIO::Slave *, int,
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int,
+    const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int,
     const TQString &)));
 }
 
@@ -1096,7 +1096,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
 
       KCursorSaver idle(KBusyPtr::idle());
       TQString passwd = ti->passwd();
-      result = KIO::PasswordDialog::getNameAndPassword(ti->user, passwd,
+      result = TDEIO::PasswordDialog::getNameAndPassword(ti->user, passwd,
 	&b, i18n("You need to supply a username and a password to use this "
 	     "SMTP server."), false, TQString(), ti->name, TQString());
 
@@ -1119,10 +1119,10 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
 
   if (!mSlave || !mInProcess)
   {
-    KIO::MetaData slaveConfig;
+    TDEIO::MetaData slaveConfig;
     slaveConfig.insert("tls", (ti->encryption == "TLS") ? "on" : "off");
     if (ti->auth) slaveConfig.insert("sasl", ti->authType);
-    mSlave = KIO::Scheduler::getConnectedSlave(destination, slaveConfig);
+    mSlave = TDEIO::Scheduler::getConnectedSlave(destination, slaveConfig);
   }
 
   if (!mSlave)
@@ -1144,16 +1144,16 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
   destination.setPath("/send");
   destination.setQuery( query );
 
-  mJob = KIO::put( destination, -1, false, false, false );
+  mJob = TDEIO::put( destination, -1, false, false, false );
   if ( !mJob ) {
     abort();
     return false;
   }
   mJob->addMetaData( "lf2crlf+dotstuff", "slave" );
-  KIO::Scheduler::assignJobToSlave(mSlave, mJob);
-  connect(mJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(result(KIO::Job *)));
-  connect(mJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)),
-          this, TQT_SLOT(dataReq(KIO::Job *, TQByteArray &)));
+  TDEIO::Scheduler::assignJobToSlave(mSlave, mJob);
+  connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *)));
+  connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+          this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &)));
   mSendOk = true;
   mInProcess = true;
   return true;
@@ -1169,7 +1169,7 @@ void KMSendSMTP::cleanup() {
 
   if (mSlave)
   {
-    KIO::Scheduler::disconnectSlave(mSlave);
+    TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
   }
 
@@ -1185,7 +1185,7 @@ void KMSendSMTP::doFinish() {
   cleanup();
 }
 
-void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array)
+void KMSendSMTP::dataReq(TDEIO::Job *, TQByteArray &array)
 {
   // Send it by 32K chuncks
   const int chunkSize = TQMIN( mMessageLength - mMessageOffset, 32*1024 );
@@ -1200,7 +1200,7 @@ void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array)
   mSender->emitProgressInfo( mMessageOffset );
 }
 
-void KMSendSMTP::result(KIO::Job *_job)
+void KMSendSMTP::result(TDEIO::Job *_job)
 {
   if (!mJob) return;
   mJob = 0;
@@ -1208,7 +1208,7 @@ void KMSendSMTP::result(KIO::Job *_job)
   if(_job->error())
   {
     mSendOk = false;
-    if (_job->error() == KIO::ERR_SLAVE_DIED) mSlave = 0;
+    if (_job->error() == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
     failed(_job->errorString());
     abort();
   } else {
@@ -1216,14 +1216,14 @@ void KMSendSMTP::result(KIO::Job *_job)
   }
 }
 
-void KMSendSMTP::slaveError(KIO::Slave *aSlave, int error, const TQString &errorMsg)
+void KMSendSMTP::slaveError(TDEIO::Slave *aSlave, int error, const TQString &errorMsg)
 {
   if (aSlave == mSlave)
   {
-    if (error == KIO::ERR_SLAVE_DIED) mSlave = 0;
+    if (error == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
     mSendOk = false;
     mJob = 0;
-    failed(KIO::buildErrorString(error, errorMsg));
+    failed(TDEIO::buildErrorString(error, errorMsg));
     abort();
   }
 }
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 478b941cd..8ae577b06 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -37,7 +37,7 @@
 class KMMessage;
 class KMFolder;
 class KMFolderMgr;
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KMSendProc;
 class KMSendSendmail;
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index 811eb559b..f87fd2a3a 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -14,7 +14,7 @@
 
 class TDEProcess;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
   class Slave;
@@ -126,9 +126,9 @@ public:
   void abort();
 
 private slots:
-  void dataReq(KIO::Job *, TQByteArray &);
-  void result(KIO::Job *);
-  void slaveError(KIO::Slave *, int, const TQString &);
+  void dataReq(TDEIO::Job *, TQByteArray &);
+  void result(TDEIO::Job *);
+  void slaveError(TDEIO::Slave *, int, const TQString &);
 
 private:
   /** implemented from KMSendProc */
@@ -147,8 +147,8 @@ private:
 
   bool mInProcess;
 
-  KIO::TransferJob *mJob;
-  KIO::Slave *mSlave;
+  TDEIO::TransferJob *mJob;
+  TDEIO::Slave *mSlave;
 };
 
 #endif /* __KMAIL_SENDER_P_H__ */
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index c7f96ce36..8548670a4 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -50,9 +50,9 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in
     mProtocol( protocol ), mHost( host ),
     mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 )
 {
-  KIO::Scheduler::connect(
-    TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-    this, TQT_SLOT(slotSlaveResult(KIO::Slave *, int, const TQString &)));
+  TDEIO::Scheduler::connect(
+    TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+    this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &)));
 
   if ( port == 993 || port == 995 || port == 465 )
     port = 0;
@@ -67,8 +67,8 @@ KMServerTest::~KMServerTest()
 }
 
 
-KIO::MetaData KMServerTest::slaveConfig() const {
-  KIO::MetaData md;
+TDEIO::MetaData KMServerTest::slaveConfig() const {
+  TDEIO::MetaData md;
   md.insert( "nologin", "on" );
   return md;
 }
@@ -80,29 +80,29 @@ void KMServerTest::startOffSlave( int port ) {
   if ( port )
     url.setPort( port );
 
-  mSlave = KIO::Scheduler::getConnectedSlave( url, slaveConfig() );
+  mSlave = TDEIO::Scheduler::getConnectedSlave( url, slaveConfig() );
   if ( !mSlave ) {
     slotSlaveResult( 0, 1 );
     return;
   }
-  connect( mSlave, TQT_SIGNAL(metaData(const KIO::MetaData&)),
-	   TQT_SLOT(slotMetaData(const KIO::MetaData&)) );
+  connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)),
+	   TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
   stream << (int) 'c';
 
-  mJob = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( mSlave, mJob );
-  connect( mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)) );
-  connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-	   TQT_SLOT(slotData(KIO::Job*,const TQString&)) );
+  mJob = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( mSlave, mJob );
+  connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
+  connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+	   TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) );
 }
 
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotData(KIO::Job *, const TQString &data)
+void KMServerTest::slotData(TDEIO::Job *, const TQString &data)
 {
   if ( mSSL )
     mListSSL = TQStringList::split(' ', data);
@@ -111,8 +111,8 @@ void KMServerTest::slotData(KIO::Job *, const TQString &data)
 }
 
 
-void KMServerTest::slotMetaData( const KIO::MetaData & md ) {
-  KIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" );
+void KMServerTest::slotMetaData( const TDEIO::MetaData & md ) {
+  TDEIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" );
   if ( it != md.end() ) {
     mAuthNone = it.data();
     kdDebug(5006) << "mAuthNone: " << mAuthNone << endl;
@@ -130,13 +130,13 @@ void KMServerTest::slotMetaData( const KIO::MetaData & md ) {
 }
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotResult(KIO::Job *job)
+void KMServerTest::slotResult(TDEIO::Job *job)
 {
   slotSlaveResult(mSlave, job->error());
 }
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
+void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
   const TQString &errorText)
 {
   if (aSlave != mSlave) return;
@@ -147,13 +147,13 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
     mListSSL.append("SSL");
   }
 
-  if (error != KIO::ERR_SLAVE_DIED && mSlave)
+  if (error != TDEIO::ERR_SLAVE_DIED && mSlave)
   {
     // disconnect slave after every connect
-    KIO::Scheduler::disconnectSlave(mSlave);
+    TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
   }
-  if ( error == KIO::ERR_COULD_NOT_CONNECT )
+  if ( error == TDEIO::ERR_COULD_NOT_CONNECT )
   {
     // if one of the two connection tests fails we ignore the error
     // if both fail the host is probably not correct so we display the error
@@ -167,7 +167,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
   {
     mJob = 0;
     KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()),
-        KIO::buildErrorString( error, errorText ),
+        TDEIO::buildErrorString( error, errorText ),
         i18n("Error") );
     emit capabilities( mListNormal, mListSSL );
     emit capabilities( mListNormal, mListSSL, mAuthNone, mAuthSSL, mAuthTLS );
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index 74fa88335..5d5cddf13 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class Slave;
   class SimpleJob;
@@ -62,14 +62,14 @@ signals:
                      const TQString & authTLS );
 
 protected slots:
-  void slotData(KIO::Job *job, const TQString &data);
-  void slotResult(KIO::Job *job);
-  void slotMetaData( const KIO::MetaData & );
-  void slotSlaveResult(KIO::Slave *aSlave, int error,
+  void slotData(TDEIO::Job *job, const TQString &data);
+  void slotResult(TDEIO::Job *job);
+  void slotMetaData( const TDEIO::MetaData & );
+  void slotSlaveResult(TDEIO::Slave *aSlave, int error,
     const TQString &errorText = TQString());
 
 protected:
-  KIO::MetaData slaveConfig() const;
+  TDEIO::MetaData slaveConfig() const;
   void startOffSlave( int port=0 );
 
 protected:
@@ -81,8 +81,8 @@ protected:
   TQString        mAuthNone;
   TQString        mAuthSSL;
   TQString        mAuthTLS;
-  KIO::SimpleJob *mJob;
-  KIO::Slave     *mSlave;
+  TDEIO::SimpleJob *mJob;
+  TDEIO::Slave     *mSlave;
   int            mConnectionErrorCount;
 };
 
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 6c041b0f1..43346fbcf 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -123,8 +123,8 @@ void checkConfigUpdates() {
   static const int numUpdates = sizeof updates / sizeof *updates;
   // Warning: do not remove entries in the above array, or the update-level check below will break
 
-  KConfig * config = KMKernel::config();
-  KConfigGroup startup( config, "Startup" );
+  TDEConfig * config = KMKernel::config();
+  TDEConfigGroup startup( config, "Startup" );
   const int configUpdateLevel = startup.readNumEntry( "update-level", 0 );
   if ( configUpdateLevel == numUpdates ) // Optimize for the common case that everything is OK
     return;
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index c9efd8a31..e17fdaf0e 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -66,8 +66,8 @@ KMTransportInfo::~KMTransportInfo()
 
 void KMTransportInfo::readConfig(int id)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Transport " + TQString::number(id));
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Transport " + TQString::number(id));
   mId = config->readUnsignedNumEntry( "id", 0 );
   type = config->readEntry("type", "smtp");
   name = config->readEntry("name", i18n("Unnamed"));
@@ -105,8 +105,8 @@ void KMTransportInfo::readConfig(int id)
 
 void KMTransportInfo::writeConfig(int id)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Transport " + TQString::number(id));
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Transport " + TQString::number(id));
   if (!mId)
     mId = TransportManager::createId();
   config->writeEntry("id", mId);
@@ -170,12 +170,12 @@ void KMTransportInfo::writeConfig(int id)
 
 int KMTransportInfo::findTransport(const TQString &name)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int numTransports = config->readNumEntry("transports", 0);
   for (int i = 1; i <= numTransports; i++)
   {
-    KConfigGroupSaver saver(config, "Transport " + TQString::number(i));
+    TDEConfigGroupSaver saver(config, "Transport " + TQString::number(i));
     if (config->readEntry("name") == name) return i;
   }
   return 0;
@@ -185,12 +185,12 @@ int KMTransportInfo::findTransport(const TQString &name)
 TQStringList KMTransportInfo::availableTransports()
 {
   TQStringList result;
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int numTransports = config->readNumEntry("transports", 0);
   for (int i = 1; i <= numTransports; i++)
   {
-    KConfigGroupSaver saver(config, "Transport " + TQString::number(i));
+    TDEConfigGroupSaver saver(config, "Transport " + TQString::number(i));
     result.append(config->readEntry("name"));
   }
   return result;
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 67a21fc65..79efe49c6 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -142,13 +142,13 @@ void ListJob::execute()
       + section );
   // go
   //kdDebug(5006) << "start listjob for " << url.path() << endl;
-  KIO::SimpleJob *job = KIO::listDir( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::listDir( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL(result(KIO::Job *)),
-      this, TQT_SLOT(slotListResult(KIO::Job *)) );
-  connect( job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
-      this, TQT_SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &)) );
+  connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+      this, TQT_SLOT(slotListResult(TDEIO::Job *)) );
+  connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+      this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) );
 }
 
 void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg )
@@ -163,7 +163,7 @@ void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg )
   }
 }
 
-void ListJob::slotListResult( KIO::Job* job )
+void ListJob::slotListResult( TDEIO::Job* job )
 {
   ImapAccountBase::JobIterator it = mAccount->findJob( job );
   if ( it == mAccount->jobsEnd() )
@@ -186,7 +186,7 @@ void ListJob::slotListResult( KIO::Job* job )
   delete this;
 }
 
-void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
+void ListJob::slotListEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& uds )
 {
   ImapAccountBase::JobIterator it = mAccount->findJob( job );
   if ( it == mAccount->jobsEnd() )
@@ -200,22 +200,22 @@ void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
   KURL url;
   TQString mimeType;
   TQString attributes;
-  for ( KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
+  for ( TDEIO::UDSEntryList::ConstIterator udsIt = uds.begin();
         udsIt != uds.end(); udsIt++ )
   {
     mimeType = TQString();
     attributes = TQString();
-    for ( KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
+    for ( TDEIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
           eIt != (*udsIt).end(); eIt++ )
     {
       // get the needed information
-      if ( (*eIt).m_uds == KIO::UDS_NAME )
+      if ( (*eIt).m_uds == TDEIO::UDS_NAME )
         name = (*eIt).m_str;
-      else if ( (*eIt).m_uds == KIO::UDS_URL )
+      else if ( (*eIt).m_uds == TDEIO::UDS_URL )
         url = KURL((*eIt).m_str, 106); // utf-8
-      else if ( (*eIt).m_uds == KIO::UDS_MIME_TYPE )
+      else if ( (*eIt).m_uds == TDEIO::UDS_MIME_TYPE )
         mimeType = (*eIt).m_str;
-      else if ( (*eIt).m_uds == KIO::UDS_EXTRA )
+      else if ( (*eIt).m_uds == TDEIO::UDS_EXTRA )
         attributes = (*eIt).m_str;
     }
     if ( (mimeType == "inode/directory" || mimeType == "message/digest"
diff --git a/kmail/listjob.h b/kmail/listjob.h
index fc2895690..3b53ea61d 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -38,7 +38,7 @@ class KMAcctCachedImap;
 class FolderStorage;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -109,12 +109,12 @@ protected slots:
    * Is called when the listing is done
    * Passes the folders and the jobData to the responding folder
    */
-  void slotListResult( KIO::Job* job );
+  void slotListResult( TDEIO::Job* job );
 
   /**
    * Collects the folder information
    */
-  void slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds );
+  void slotListEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& uds );
 
   /**
    * Called from the account when a connection was established
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 0b646e94a..e199e3d09 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -386,7 +386,7 @@ MailingList::id() const
 }
 
 void
-MailingList::writeConfig( KConfig* config ) const
+MailingList::writeConfig( TDEConfig* config ) const
 {
   config->writeEntry( "MailingListFeatures", mFeatures );
   config->writeEntry( "MailingListHandler", mHandler );
@@ -399,7 +399,7 @@ MailingList::writeConfig( KConfig* config ) const
 }
 
 void
-MailingList::readConfig( KConfig* config )
+MailingList::readConfig( TDEConfig* config )
 {
   mFeatures =  config->readNumEntry( "MailingListFeatures", 0 );
   mHandler = static_cast<MailingList::Handler>(
diff --git a/kmail/mailinglist-magic.h b/kmail/mailinglist-magic.h
index bcccf66f5..eaa645929 100644
--- a/kmail/mailinglist-magic.h
+++ b/kmail/mailinglist-magic.h
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 class KMMessage;
-class KConfig;
+class TDEConfig;
 
 namespace KMail
 {
@@ -67,8 +67,8 @@ public:
   void setId( const TQString& );
   TQString id() const;
 
-  void writeConfig( KConfig* config ) const;
-  void readConfig( KConfig* config );
+  void writeConfig( TDEConfig* config ) const;
+  void readConfig( TDEConfig* config );
 private:
   int        mFeatures;
   Handler    mHandler;
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index f14366184..da10d4428 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -93,29 +93,29 @@
 // This should be ported to a .kcfg one day I suppose (dfaure).
 
 static inline bool warnSendUnsigned() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unsigned", false );
 }
 static inline bool warnSendUnencrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unencrypted", false );
 }
 static inline bool saveMessagesEncrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-store-encrypted", true );
 }
 static inline bool encryptToSelf() {
     // return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-encrypt-to-self", true );
 }
 static inline bool showKeyApprovalDialog() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-show-keys-for-approval", true );
 }
 
 static inline int encryptKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-key-near-expire-int", 14 );
@@ -123,7 +123,7 @@ static inline int encryptKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-key-near-expire-int", 14 );
@@ -131,7 +131,7 @@ static inline int signingKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-root-near-expire-int", 14 );
@@ -139,7 +139,7 @@ static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-root-near-expire-int", 14 );
@@ -147,7 +147,7 @@ static inline int signingRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-chaincert-near-expire-int", 14 );
@@ -155,7 +155,7 @@ static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-chaincert-near-expire-int", 14 );
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 145ab2b2d..e0b682746 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kwallet.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 using KWallet::Wallet;
 
 #include <climits>
@@ -147,7 +147,7 @@ namespace KMail {
   //
   //
 
-  void NetworkAccount::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+  void NetworkAccount::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
     KMAccount::readConfig( config );
 
     setLogin( config.readEntry( "login" ) );
@@ -195,7 +195,7 @@ namespace KMail {
     mSieveConfig.readConfig( config );
   }
 
-  void NetworkAccount::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+  void NetworkAccount::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
     KMAccount::writeConfig( config );
 
     config.writeEntry( "login", login() );
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 112cc71d2..dd62b0cdc 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -34,9 +34,9 @@
 #include <tqstring.h>
 
 class AccountManager;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KURL;
-namespace KIO {
+namespace TDEIO {
   class Slave;
   class MetaData;
 }
@@ -99,16 +99,16 @@ namespace KMail {
     virtual void setSieveConfig( const KMail::SieveConfig & config );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
-    virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+    virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+    virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
 
     /** @return an URL for this account */
     virtual KURL getUrl() const;
 
     /** @return the KIO slave for this account */
-    KIO::Slave * slave() const { return mSlave; }
+    TDEIO::Slave * slave() const { return mSlave; }
 
     /** Kill all jobs that are currently in progress */
     virtual void killAllJobs( bool disconnectSlave = false ) = 0;
@@ -128,7 +128,7 @@ namespace KMail {
 
   protected:
     KMail::SieveConfig mSieveConfig;
-    TQGuardedPtr<KIO::Slave> mSlave;
+    TQGuardedPtr<TDEIO::Slave> mSlave;
     TQString mLogin, mPasswd, mAuth, mHost;
     unsigned short int mPort;
     bool mStorePasswd : 1;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 12c5cb00f..21d39cd6b 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -105,8 +105,8 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     // does the below make any sense?
     //  mFormatComboBox->insertItem("search", 2);
     {
-      KConfig *config = KMKernel::config();
-      KConfigGroupSaver saver(config, "General");
+      TDEConfig *config = KMKernel::config();
+      TDEConfigGroupSaver saver(config, "General");
       int type = config->readNumEntry("default-mailbox-format", 1);
       if ( type < 0 || type > 1 ) type = 1;
       mFormatComboBox->setCurrentItem( type );
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index fe0592d51..9c8c673a9 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1646,7 +1646,7 @@ namespace KMail {
       if ( !smimeCrypto || !mReader )
         return false;
 
-      const KConfigGroup reader( KMKernel::config(), "Reader" );
+      const TDEConfigGroup reader( KMKernel::config(), "Reader" );
       if ( !reader.readBoolEntry( "AutoImportKeys", false ) )
         return false;
 
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 705a0e2cc..9bfe46b90 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -468,7 +468,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
                                  TQString labelDescr,
                                  TQString labelCntType,
                                  TQString labelEncoding,
-                                 KIO::filesize_t size,
+                                 TDEIO::filesize_t size,
                                  bool revertOrder )
 {
   if( parentItem || mimePartTree ) {
@@ -479,7 +479,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
                                  revertOrder );
 
     TQString cntDesc, cntType, cntEnc;
-    KIO::filesize_t cntSize = 0;
+    TDEIO::filesize_t cntSize = 0;
 
     if( labelDescr.isEmpty() ) {
         DwHeaders* headers = 0;
diff --git a/kmail/partNode.h b/kmail/partNode.h
index 242223a31..b764c9dfe 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -184,7 +184,7 @@ public:
                            TQString labelDescr    = TQString(),
                            TQString labelCntType  = TQString(),
                            TQString labelEncoding = TQString(),
-                           KIO::filesize_t size=0,
+                           TDEIO::filesize_t size=0,
                            bool revertOrder = false );
 
     void adjustDefaultType( partNode* node );
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 8caba1e44..0d6c6e757 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -45,7 +45,7 @@ using KPIM::BroadcastStatus;
 #include <kio/scheduler.h>
 #include <kio/passdlg.h>
 #include <kconfig.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 
 #include <tqstylesheet.h>
 
@@ -73,9 +73,9 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin
 
   headersOnServer.setAutoDelete(true);
   connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs()));
-  KIO::Scheduler::connect(
-    TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-    this, TQT_SLOT(slotSlaveError(KIO::Slave *, int, const TQString &)));
+  TDEIO::Scheduler::connect(
+    TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+    this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &)));
 
   mHeaderDeleteUids.clear();
   mHeaderDownUids.clear();
@@ -150,7 +150,7 @@ void PopAccount::processNewMail(bool _interactive)
       mAuth != "GSSAPI" ) {
       TQString passwd = NetworkAccount::passwd();
       bool b = storePasswd();
-      if (KIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
+      if (TDEIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
         i18n("You need to supply a username and a password to access this "
         "mailbox."), false, TQString(), mName, i18n("Account:"))
         != TQDialog::Accepted)
@@ -168,7 +168,7 @@ void PopAccount::processNewMail(bool _interactive)
 
     TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
                                        mHost + ":" + TQString("%1").arg(mPort) );
-    KConfig config( seenUidList );
+    TDEConfig config( seenUidList );
     TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
     TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
     mUidsOfSeenMsgsDict.clear();
@@ -212,7 +212,7 @@ void PopAccount::processNewMail(bool _interactive)
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::readConfig(KConfig& config)
+void PopAccount::readConfig(TDEConfig& config)
 {
   NetworkAccount::readConfig(config);
 
@@ -227,7 +227,7 @@ void PopAccount::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::writeConfig(KConfig& config)
+void PopAccount::writeConfig(TDEConfig& config)
 {
   NetworkAccount::writeConfig(config);
 
@@ -285,13 +285,13 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize)
 
 //-----------------------------------------------------------------------------
 void PopAccount::connectJob() {
-  KIO::Scheduler::assignJobToSlave(mSlave, job);
-  connect(job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
-         TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
-  connect(job, TQT_SIGNAL( result( KIO::Job * ) ),
-         TQT_SLOT( slotResult( KIO::Job * ) ) );
-  connect(job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )),
-         TQT_SLOT( slotMsgRetrieved(KIO::Job*, const TQString &)));
+  TDEIO::Scheduler::assignJobToSlave(mSlave, job);
+  connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+         TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+  connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+         TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+         TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &)));
 }
 
 
@@ -410,14 +410,14 @@ void PopAccount::startJob()
   numBytes = 0;
   numBytesRead = 0;
   stage = List;
-  mSlave = KIO::Scheduler::getConnectedSlave( url, slaveConfig() );
+  mSlave = TDEIO::Scheduler::getConnectedSlave( url, slaveConfig() );
   if (!mSlave)
   {
-    slotSlaveError(0, KIO::ERR_CANNOT_LAUNCH_PROCESS, url.protocol());
+    slotSlaveError(0, TDEIO::ERR_CANNOT_LAUNCH_PROCESS, url.protocol());
     return;
   }
   url.setPath(TQString("/index"));
-  job = KIO::get( url, false, false );
+  job = TDEIO::get( url, false, false );
   connectJob();
 }
 
@@ -441,7 +441,7 @@ MetaData PopAccount::slaveConfig() const {
 //-----------------------------------------------------------------------------
 // one message is finished
 // add data to a KMMessage
-void PopAccount::slotMsgRetrieved(KIO::Job*, const TQString & infoMsg)
+void PopAccount::slotMsgRetrieved(TDEIO::Job*, const TQString & infoMsg)
 {
   if (infoMsg != "message complete") return;
   KMMessage *msg = new KMMessage;
@@ -482,7 +482,7 @@ void PopAccount::slotJobFinished() {
     mUidsOfNextSeenMsgsDict.resize( KMail::nextPrime( ( idsOfMsgs.count() * 11 ) / 10 ) );
     KURL url = getUrl();
     url.setPath(TQString("/uidl"));
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
     stage = Uidl;
   }
@@ -544,7 +544,7 @@ void PopAccount::slotJobFinished() {
       }
       headerIt.toFirst();
       url.setPath(TQString("/headers/") + headerIds);
-      job = KIO::get( url, false, false );
+      job = TDEIO::get( url, false, false );
       connectJob();
       slotGetNextHdr();
       stage = Head;
@@ -560,7 +560,7 @@ void PopAccount::slotJobFinished() {
       idsOfMsgs = TQStringList( mMsgsPendingDownload.keys() );
       KURL url = getUrl();
       url.setPath( "/download/" + idsOfMsgs.join(",") );
-      job = KIO::get( url, false, false );
+      job = TDEIO::get( url, false, false );
       connectJob();
       slotGetNextMsg();
       processMsgsTimer.start(processingDelay);
@@ -656,7 +656,7 @@ void PopAccount::slotJobFinished() {
     idsOfMsgs = TQStringList( mMsgsPendingDownload.keys() );
     KURL url = getUrl();
     url.setPath( "/download/" + idsOfMsgs.join(",") );
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
     slotGetNextMsg();
     processMsgsTimer.start(processingDelay);
@@ -765,7 +765,7 @@ void PopAccount::slotJobFinished() {
       url.setPath(TQString("/commit"));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     }
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
   }
   else if (stage == Dele) {
@@ -784,7 +784,7 @@ void PopAccount::slotJobFinished() {
         .arg( mHost ) );
     KURL url = getUrl();
     url.setPath(TQString("/commit"));
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     stage = Quit;
     connectJob();
   }
@@ -792,7 +792,7 @@ void PopAccount::slotJobFinished() {
     kdDebug(5006) << k_funcinfo << "stage == Quit" << endl;
     saveUidList();
     job = 0;
-    if (mSlave) KIO::Scheduler::disconnectSlave(mSlave);
+    if (mSlave) TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
     stage = Idle;
     if( mMailCheckProgressItem ) { // do this only once...
@@ -842,7 +842,7 @@ void PopAccount::saveUidList()
   }
   TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
                                       mHost + ":" + TQString("%1").arg(mPort) );
-  KConfig config( seenUidList );
+  TDEConfig config( seenUidList );
   config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
   config.writeEntry( "seenUidTimeList", seenUidTimeList );
   config.writeEntry( "downloadLater", TQStringList( mHeaderLaterUids.keys() ) );
@@ -874,7 +874,7 @@ void PopAccount::slotGetNextMsg()
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
+void PopAccount::slotData( TDEIO::Job* job, const TQByteArray &data)
 {
   if (data.size() == 0) {
     kdDebug(5006) << "Data: <End>" << endl;
@@ -1012,7 +1012,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
 }
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotResult( KIO::Job* )
+void PopAccount::slotResult( TDEIO::Job* )
 {
   if (!job) return;
   if ( job->error() )
@@ -1021,7 +1021,7 @@ void PopAccount::slotResult( KIO::Job* )
       if (headers) { // nothing to be done for headers
         idsOfMsgs.clear();
       }
-      if (stage == Head && job->error() == KIO::ERR_COULD_NOT_READ)
+      if (stage == Head && job->error() == TDEIO::ERR_COULD_NOT_READ)
       {
         KMessageBox::error(0, i18n("Your server does not support the "
           "TOP command. Therefore it is not possible to fetch the headers "
@@ -1041,25 +1041,25 @@ void PopAccount::slotResult( KIO::Job* )
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotSlaveError(KIO::Slave *aSlave, int error,
+void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error,
   const TQString &errorMsg)
 {
   if (aSlave != mSlave) return;
-  if (error == KIO::ERR_SLAVE_DIED) mSlave = 0;
+  if (error == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
 
   // explicitely disconnect the slave if the connection went down
-  if ( error == KIO::ERR_CONNECTION_BROKEN && mSlave ) {
-    KIO::Scheduler::disconnectSlave( mSlave );
+  if ( error == TDEIO::ERR_CONNECTION_BROKEN && mSlave ) {
+    TDEIO::Scheduler::disconnectSlave( mSlave );
     mSlave = 0;
   }
 
   if (interactive && kmkernel) {
-    KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg));
+    KMessageBox::error(kmkernel->mainWin(), TDEIO::buildErrorString(error, errorMsg));
   }
 
 
   stage = Quit;
-  if (error == KIO::ERR_COULD_NOT_LOGIN && !mStorePasswd)
+  if (error == TDEIO::ERR_COULD_NOT_LOGIN && !mStorePasswd)
     mAskAgain = true;
   /* We need a timer, otherwise slotSlaveError of the next account is also
      executed, if it reuses the slave, because the slave member variable
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 51cb84520..afa0acf27 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -13,7 +13,7 @@
 class KMPopHeaders;
 class KMMessage;
 class TQDataStream;
-namespace KIO {
+namespace TDEIO {
   class MetaData;
   class Slave;
   class SimpleJob;
@@ -33,7 +33,7 @@ public:
   virtual ~PopAccount();
   virtual void init(void);
 
-  virtual KIO::MetaData slaveConfig() const;
+  virtual TDEIO::MetaData slaveConfig() const;
 
   /** A weak assignment operator */
   virtual void pseudoAssign( const KMAccount * a );
@@ -90,8 +90,8 @@ public:
    * Inherited methods.
    */
   virtual TQString type(void) const;
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
   virtual void processNewMail(bool _interactive);
 
   virtual void killAllJobs( bool disconnectSlave=false ); // NOOP currently
@@ -130,7 +130,7 @@ protected:
   bool    mFilterOnServer;
   unsigned int mFilterOnServerCheckSize;
 
-  KIO::SimpleJob *job;
+  TDEIO::SimpleJob *job;
   //Map of ID's vs. sizes of messages which should be downloaded
   TQMap<TQString, int> mMsgsPendingDownload;
 
@@ -194,19 +194,19 @@ protected slots:
    * A messages has been retrieved successfully. The next data belongs to the
    * next message.
    */
-  void slotMsgRetrieved(KIO::Job*, const TQString &);
+  void slotMsgRetrieved(TDEIO::Job*, const TQString &);
 
   /**
    * New data has arrived append it to the end of the current message
    */
-  void slotData( KIO::Job*, const TQByteArray &);
+  void slotData( TDEIO::Job*, const TQByteArray &);
 
   /**
    * Finished downloading the current kio job, either due to an error
    * or because the job has been canceled or because the complete message
    * has been downloaded
    */
-  void slotResult( KIO::Job* );
+  void slotResult( TDEIO::Job* );
 
   /**
    * Cleans up after a user cancels the current job
@@ -227,7 +227,7 @@ protected slots:
   /**
    * Slave error handling
    */
-  void slotSlaveError(KIO::Slave *, int, const TQString &);
+  void slotSlaveError(TDEIO::Slave *, int, const TQString &);
 
   /**
    * If there are more headers to be downloaded then start a new kio job
diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp
index 3dd5aa49e..b08d7f91d 100644
--- a/kmail/quotajobs.cpp
+++ b/kmail/quotajobs.cpp
@@ -35,27 +35,27 @@
 using namespace KMail;
 
 QuotaJobs::GetQuotarootJob* QuotaJobs::getQuotaroot(
-    KIO::Slave* slave, const KURL& url )
+    TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'Q' << (int)'R' << url;
 
   GetQuotarootJob* job = new GetQuotarootJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url,
                                              const TQByteArray &packedArgs,
                                              bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void QuotaJobs::GetQuotarootJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList results = TQStringList::split("\r", str);
@@ -90,15 +90,15 @@ void QuotaJobs::GetQuotarootJob::slotInfoMessage( KIO::Job*, const TQString& str
 }
 
 QuotaJobs::GetStorageQuotaJob* QuotaJobs::getStorageQuota(
-    KIO::Slave* slave, const KURL& url )
+    TDEIO::Slave* slave, const KURL& url )
 {
   GetStorageQuotaJob* job = new GetStorageQuotaJob( slave, url );
   return job;
 }
 
 
-QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( KIO::Slave* slave, const KURL& url )
-  : KIO::Job( false )
+QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url )
+  : TDEIO::Job( false )
 {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -110,7 +110,7 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( KIO::Slave* slave, const KURL
             TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&)));
     connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)),
             TQT_SLOT(slotQuotarootResult(const TQStringList&)));
-    KIO::Scheduler::assignJobToSlave( slave, job );
+    TDEIO::Scheduler::assignJobToSlave( slave, job );
     addSubjob( job );
 }
 
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 1db1b3d2c..3e453b504 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -123,7 +123,7 @@ class GetQuotarootJob;
  * @param slave Slave object the job should be assigned to
  * @param url URL for which to get the quotaroot
  */
-GetQuotarootJob* getQuotaroot( KIO::Slave* slave, const KURL& url );
+GetQuotarootJob* getQuotaroot( TDEIO::Slave* slave, const KURL& url );
 
 class GetStorageQuotaJob;
 /**
@@ -131,10 +131,10 @@ class GetStorageQuotaJob;
  * @param slave Slave object the job should be assigned to
  * @param url URL for which to get the storage quota
  */
-GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url );
+GetStorageQuotaJob* getStorageQuota( TDEIO::Slave* slave, const KURL& url );
 
 /// for getQuotaroot()
-class GetQuotarootJob : public KIO::SimpleJob
+class GetQuotarootJob : public TDEIO::SimpleJob
 {
   Q_OBJECT
   
@@ -157,16 +157,16 @@ signals:
   void quotaInfoReceived( const QuotaInfoList& info );
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const TQString& );
+  void slotInfoMessage( TDEIO::Job*, const TQString& );
 };
 
 /// for getStorageQuota()
-class GetStorageQuotaJob : public KIO::Job
+class GetStorageQuotaJob : public TDEIO::Job
 {
   Q_OBJECT
   
 public:
-  GetStorageQuotaJob( KIO::Slave* slave, const KURL& url );
+  GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url );
 
   /**  Returns the storage quota info, if any, can be queried on result(). */
   QuotaInfo storageQuotaInfo() const;
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index de577a7cc..0d938bde2 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -577,7 +577,7 @@ void RecipientsPicker::insertRecentAddresses()
 {
   RecipientsCollection *collection = new RecipientsCollection( i18n("Recent Addresses") );
 
-  KConfig config( "kmailrc" );
+  TDEConfig config( "kmailrc" );
   KABC::Addressee::List recents =
     KRecentAddress::RecentAddresses::self( &config )->kabcAddresses();
 
@@ -810,7 +810,7 @@ void RecipientsPicker::keyPressEvent( TQKeyEvent *ev )
 
 void RecipientsPicker::readConfig()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "RecipientsPicker" );
   TQSize size = cfg->readSizeEntry( "Size" );
   if ( !size.isEmpty() ) {
@@ -825,7 +825,7 @@ void RecipientsPicker::readConfig()
 
 void RecipientsPicker::writeConfig()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "RecipientsPicker" );
   cfg->writeEntry( "Size", size() );
   cfg->writeEntry( "CurrentCollection", mCollectionCombo->currentItem() );
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 7715c5871..5e2a43d3f 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -143,18 +143,18 @@ void RenameJob::execute()
     src.setPath( mOldImapPath );
     KURL dst( account->getUrl() );
     dst.setPath( mNewImapPath );
-    KIO::SimpleJob *job = KIO::rename( src, dst, true );
+    TDEIO::SimpleJob *job = TDEIO::rename( src, dst, true );
     kdDebug(5006)<< "RenameJob::rename - " << src.prettyURL()
       << " |=> " << dst.prettyURL() << endl;
     ImapAccountBase::jobData jd( src.url() );
     account->insertJob( job, jd );
-    KIO::Scheduler::assignJobToSlave( account->slave(), job );
-    connect( job, TQT_SIGNAL(result(KIO::Job*)),
-        TQT_SLOT(slotRenameResult(KIO::Job*)) );
+    TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+        TQT_SLOT(slotRenameResult(TDEIO::Job*)) );
   }
 }
 
-void RenameJob::slotRenameResult( KIO::Job *job )
+void RenameJob::slotRenameResult( TDEIO::Job *job )
 {
   ImapAccountBase* account = static_cast<KMFolderImap*>(mStorage)->account();
   ImapAccountBase::JobIterator it = account->findJob(job);
@@ -208,9 +208,9 @@ void RenameJob::folderCopyComplete(bool success)
   // move complete or not necessary
   // save our settings
   TQString oldconfig = "Folder-" + mStorage->folder()->idString();
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQMap<TQString, TQString> entries = config->entryMap( oldconfig );
-  KConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString());
   for ( TQMap<TQString, TQString>::Iterator it = entries.begin();
         it != entries.end(); ++it )
   {
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 58a8f6d3a..9e3cea432 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -35,7 +35,7 @@ class KMFolderDir;
 class KMFolder;
 class KMCommand;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -68,7 +68,7 @@ public:
 
 protected slots:
   /** Rename the folder */
-  void slotRenameResult( KIO::Job* job );
+  void slotRenameResult( TDEIO::Job* job );
 
   /** All messages are copied so remove the original folder */
   void folderCopyComplete( bool success );
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 154bfdfe7..6e3040bd2 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -88,14 +88,14 @@ void SearchJob::searchCompleteFolder()
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int) 'E' << url;
-  KIO::SimpleJob *job = KIO::special( url, packedArgs, false );
+  TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
   if ( mFolder->imapPath() != TQString( "/" ) )
   {
-    KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
-    connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-      TQT_SLOT( slotSearchData( KIO::Job*, const TQString& ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-      TQT_SLOT( slotSearchResult( KIO::Job * ) ) );
+    TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+    connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+      TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+      TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
   }
   else
   { // for the "/ folder" of an imap account, searching blocks the kioslave
@@ -176,7 +176,7 @@ TQString SearchJob::searchStringFromPattern( const KMSearchPattern* pattern )
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchData( KIO::Job* job, const TQString& data )
+void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data )
 {
   if ( job && job->error() ) {
     // error is handled in slotSearchResult
@@ -344,7 +344,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchResult( KIO::Job *job )
+void SearchJob::slotSearchResult( TDEIO::Job *job )
 {
   if ( job->error() )
   {
@@ -385,17 +385,17 @@ void SearchJob::searchSingleMessage()
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
     stream << (int) 'E' << url;
-    KIO::SimpleJob *job = KIO::special( url, packedArgs, false );
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
-    connect( job, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-        TQT_SLOT(slotSearchDataSingleMessage(KIO::Job*,const TQString&)) );
-    connect( job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotSearchResult(KIO::Job *)) );
+    TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
+    connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+        TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotSearchResult(TDEIO::Job *)) );
   }
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchDataSingleMessage( KIO::Job* job, const TQString& data )
+void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& data )
 {
   if ( job && job->error() ) {
     // error is handled in slotSearchResult
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index d90f7fa18..85fd5c2a2 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -35,7 +35,7 @@ class KMFolderImap;
 class KMSearchPattern;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -92,16 +92,16 @@ protected slots:
   void slotSearchFolder();
 
   // processes the server answer
-  void slotSearchData( KIO::Job* job, const TQString& data );
+  void slotSearchData( TDEIO::Job* job, const TQString& data );
 
   // message is downloaded and searched
   void slotSearchMessageArrived( KMMessage* msg );
 
   // error handling for all cases
-  void slotSearchResult( KIO::Job *job );
+  void slotSearchResult( TDEIO::Job *job );
 
   // imap search result from a single message
-  void slotSearchDataSingleMessage( KIO::Job* job, const TQString& data );
+  void slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& data );
 
   // the user cancelled the search progress
   void slotAbortSearch( KPIM::ProgressItem* item );
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index dc226b9b0..de5e2d7e8 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -129,7 +129,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
 #endif
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->setGroup("SearchDialog");
 
   TQWidget* searchWidget = new TQWidget(this);
@@ -170,7 +170,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   if (curFolder)
       searchFolder = dynamic_cast<KMFolderSearch*>(curFolder->storage());
   if (searchFolder) {
-      KConfig config(curFolder->location());
+      TDEConfig config(curFolder->location());
       KMFolder *root = searchFolder->search()->root();
       config.setGroup("Search Folder");
       mSearchPattern->readConfig(&config);
@@ -379,7 +379,7 @@ SearchWindow::~SearchWindow()
     (*fit)->close("searchwindow");
   }
 
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->setGroup("SearchDialog");
   config->writeEntry("SubjectWidth", mLbxMatches->columnWidth(0));
   config->writeEntry("SenderWidth", mLbxMatches->columnWidth(1));
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index 9c22539c2..8e185f3a9 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -31,7 +31,7 @@
 
 namespace KMail {
 
-  void SieveConfig::readConfig( const KConfigBase & config ) {
+  void SieveConfig::readConfig( const TDEConfigBase & config ) {
     mManagesieveSupported = config.readBoolEntry( "sieve-support", false );
     mReuseConfig = config.readBoolEntry( "sieve-reuse-config", true );
 
@@ -45,7 +45,7 @@ namespace KMail {
       mVacationFileName = "kmail-vacation.siv";
   }
 
-  void SieveConfig::writeConfig( KConfigBase & config ) const {
+  void SieveConfig::writeConfig( TDEConfigBase & config ) const {
     config.writeEntry( "sieve-support", managesieveSupported() );
     config.writeEntry( "sieve-reuse-config", reuseConfig() );
     config.writeEntry( "sieve-port", port() );
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index 5c6fb4add..ac296375f 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -22,7 +22,7 @@
 class TQCheckBox;
 class TQLineEdit;
 class KIntSpinBox;
-class KConfigBase;
+class TDEConfigBase;
 
 namespace KMail {
 
@@ -74,8 +74,8 @@ namespace KMail {
 
     TQString vacationFileName() const { return mVacationFileName; }
 
-    void readConfig( const KConfigBase & config );
-    void writeConfig( KConfigBase & config ) const;
+    void readConfig( const TDEConfigBase & config );
+    void writeConfig( TDEConfigBase & config ) const;
 
   protected:
     bool mManagesieveSupported;
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 6993f8f66..3e823a7a7 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -19,11 +19,11 @@
 #include "sievejob.h"
 
 #include <kio/job.h>
-using KIO::Job;
+using TDEIO::Job;
 // <kio/global.h>
-using KIO::UDSAtomTypes;
-using KIO::UDSEntryList;
-using KIO::UDSEntry;
+using TDEIO::UDSAtomTypes;
+using TDEIO::UDSEntryList;
+using TDEIO::UDSEntry;
 #include <kdebug.h>
 
 #include <tqtextcodec.h>
@@ -71,25 +71,25 @@ namespace KMail {
     switch ( command ) {
     case Get:
       kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::get( mUrl, false /*reload*/, showProgressInfo );
-      connect( mJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-	       TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) );
+      mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo );
+      connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+	       TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
       break;
     case Put:
       kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
-      connect( mJob, TQT_SIGNAL(dataReq(KIO::Job*,TQByteArray&)),
-	       TQT_SLOT(slotDataReq(KIO::Job*,TQByteArray&)) );
+      mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
+      connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+	       TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) );
       break;
     case Activate:
       kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )"
 		<< endl;
-      mJob = KIO::chmod( mUrl, 0700 );
+      mJob = TDEIO::chmod( mUrl, 0700 );
       break;
     case Deactivate:
       kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0600 )"
 		<< endl;
-      mJob = KIO::chmod( mUrl, 0600 );
+      mJob = TDEIO::chmod( mUrl, 0600 );
       break;
     case SearchActive:
       kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
@@ -101,29 +101,29 @@ namespace KMail {
 	url.setQuery( query );
 	kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL()
 		  << endl;
-	mJob = KIO::listDir( url, showProgressInfo );
-	connect( mJob, TQT_SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
-		 TQT_SLOT(slotEntries(KIO::Job*,const KIO::UDSEntryList&)) );
+	mJob = TDEIO::listDir( url, showProgressInfo );
+	connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)),
+		 TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
 	break;
       }
     case List:
       kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
       {
-	mJob = KIO::listDir( mUrl, showProgressInfo );
-	connect( mJob, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList & ) ),
-		 TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
+	mJob = TDEIO::listDir( mUrl, showProgressInfo );
+	connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+		 TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
 	break;
       }
     case Delete:
       kdDebug(5006) << "SieveJob::schedule: delete( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::del( mUrl, false/*shred*/, showProgressInfo );
+      mJob = TDEIO::del( mUrl, false/*shred*/, showProgressInfo );
       break;
     default:
       assert( 0 );
     }
     mJob->setInteractive(showProgressInfo);
     // common to all jobs:
-    connect( mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
   }
 
   void SieveJob::slotData( Job *, const TQByteArray & data ) {
@@ -166,10 +166,10 @@ namespace KMail {
       TQString filename;
       bool isActive = false;
       for ( UDSEntry::const_iterator et = (*it).begin() ; et != (*it).end() ; ++ et ) {
-	if ( ( *et ).m_uds == KIO::UDS_NAME ) {
+	if ( ( *et ).m_uds == TDEIO::UDS_NAME ) {
 	  filename = ( *et ).m_str;
 	  mAvailableScripts.append( filename );
-	} else if ( ( *et ).m_uds == KIO::UDS_ACCESS && ( *et ).m_long == 0700 )
+	} else if ( ( *et ).m_uds == TDEIO::UDS_ACCESS && ( *et ).m_long == 0700 )
 	  isActive = true;
       }
 
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index a350740ff..84e316140 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -25,7 +25,7 @@
 #include <kio/global.h>
 
 class TQTextDecoder;
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -104,14 +104,14 @@ namespace KMail {
     void schedule( Command command, bool showProgressInfo );
 
   protected slots:
-    void slotData( KIO::Job *, const TQByteArray & ); // for get
-    void slotDataReq( KIO::Job *, TQByteArray & ); // for put
-    void slotEntries( KIO::Job *, const KIO::UDSEntryList & ); // for listDir
-    void slotResult( KIO::Job * ); // for all commands
+    void slotData( TDEIO::Job *, const TQByteArray & ); // for get
+    void slotDataReq( TDEIO::Job *, TQByteArray & ); // for put
+    void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ); // for listDir
+    void slotResult( TDEIO::Job * ); // for all commands
 
   protected:
     KURL mUrl;
-    KIO::Job * mJob;
+    TDEIO::Job * mJob;
     TQTextDecoder * mDec;
     TQString mScript;
     TQString mActiveScriptName;
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 0b4f271a0..4997386e7 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -418,7 +418,7 @@ void SnippetWidget::writeConfig()
 void SnippetWidget::initConfig()
 {
   if (_cfg == NULL)
-    _cfg = new KConfig("kmailsnippetrc", false, false);
+    _cfg = new TDEConfig("kmailsnippetrc", false, false);
 
   _cfg->setGroup("SnippetPart");
 
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 120f64ad1..18573c38b 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -32,7 +32,7 @@ class TQPoint;
 class SnippetDlg;
 class SnippetItem;
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 class KMEdit;
 class KActionCollection;
 
@@ -72,7 +72,7 @@ private:
 
     TQPtrList<SnippetItem> _list;
     TQMap<TQString, TQString> _mapSaved;
-    KConfig * _cfg;
+    TDEConfig * _cfg;
     SnippetConfig _SnippetConfig;
     KMEdit* mEditor;
     KActionCollection* mActionCollection;
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index e80d1cb27..ced8f7710 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -27,7 +27,7 @@ namespace KMail {
 
   TQStringList TransportManager::transportNames()
   {
-    KConfigGroup general( KMKernel::config(), "General");
+    TDEConfigGroup general( KMKernel::config(), "General");
 
     int numTransports = general.readNumEntry("transports", 0);
 
@@ -46,7 +46,7 @@ namespace KMail {
   {
     TQValueList<unsigned int> usedIds;
 
-    KConfigGroup general( KMKernel::config(), "General");
+    TDEConfigGroup general( KMKernel::config(), "General");
     int numTransports = general.readNumEntry( "transports", 0 );
 
     for ( int i = 1 ; i <= numTransports ; i++ ) {
diff --git a/kmail/util.h b/kmail/util.h
index 9f291a2e0..30b01cbaf 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -201,7 +201,7 @@ namespace Util {
     // return true if we should proceed, false if we should abort
     inline bool checkOverwrite( const KURL& url, TQWidget* w )
     {
-        if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
+        if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
             if ( KMessageBox::Cancel ==
                     KMessageBox::warningContinueCancel(
                         w,
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5279b78b2..5a279b92f 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -45,7 +45,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kio/netaccess.h>
-using namespace KIO;
+using namespace TDEIO;
 #include <kxface.h>
 using namespace KPIM;
 #include <kabc/stdaddressbook.h>
@@ -211,13 +211,13 @@ namespace KMail {
   void XFaceConfigurator::setXfaceFromFile( const KURL &url )
   {
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, this ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, this ) )
     {
       KXFace xf;
       mTextEdit->setText( xf.fromImage( TQImage( tmpFile ) ) );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     } else {
-      KMessageBox::error(this, KIO::NetAccess::lastErrorString() );
+      KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
     }
   }
 
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 1271d3ce7..95a014a6c 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -154,7 +154,7 @@ bool KMobileGnokii::setGnokiiStateMachine()
   return true;
 }
 
-bool KMobileGnokii::saveConfig( KConfig &conf, TQString group )
+bool KMobileGnokii::saveConfig( TDEConfig &conf, TQString group )
 {
   conf.setGroup(group);
   conf.writeEntry("model", m_modelnr );
@@ -170,7 +170,7 @@ bool KMobileGnokii::saveConfig( KConfig &conf, TQString group )
   return true;
 }
 
-bool KMobileGnokii::loadConfig( KConfig &conf, TQString group )
+bool KMobileGnokii::loadConfig( TDEConfig &conf, TQString group )
 {
   conf.setGroup(group);
   m_modelnr    = conf.readEntry("model", m_modelnr );
@@ -182,13 +182,13 @@ bool KMobileGnokii::loadConfig( KConfig &conf, TQString group )
 
 bool KMobileGnokii::saveGnokiiConfiguration()
 {
-  KConfig conf( TQDir::homeDirPath() + "/.gnokiirc", false, false, "" );
+  TDEConfig conf( TQDir::homeDirPath() + "/.gnokiirc", false, false, "" );
   return saveConfig( conf, "global" );
 }
 
 bool KMobileGnokii::loadGnokiiConfiguration()
 {
-  KConfig conf( TQDir::homeDirPath() + "/.gnokiirc", true, false, "" );
+  TDEConfig conf( TQDir::homeDirPath() + "/.gnokiirc", true, false, "" );
   return loadConfig( conf, "global" );
 }
 
@@ -341,19 +341,19 @@ static int gn_error2kio_error( gn_error err )
 	case GN_ERR_INVALIDMEMORYTYPE:
 	case GN_ERR_INVALIDLOCATION:
 	case GN_ERR_EMPTYLOCATION:
-		return KIO::ERR_DOES_NOT_EXIST;
+		return TDEIO::ERR_DOES_NOT_EXIST;
 	case GN_ERR_MEMORYFULL:
-		return KIO::ERR_OUT_OF_MEMORY;
+		return TDEIO::ERR_OUT_OF_MEMORY;
 	case GN_ERR_NOLINK:
-		return KIO::ERR_COULD_NOT_CONNECT;
+		return TDEIO::ERR_COULD_NOT_CONNECT;
 	case GN_ERR_TIMEOUT:
-		return KIO::ERR_SERVER_TIMEOUT;
+		return TDEIO::ERR_SERVER_TIMEOUT;
 	case GN_ERR_ENTRYTOOLONG:
 	case GN_ERR_WRONGDATAFORMAT:
 	case GN_ERR_INVALIDSIZE:
-		return KIO::ERR_COULD_NOT_WRITE;
+		return TDEIO::ERR_COULD_NOT_WRITE;
 	default:
-		return KIO::ERR_INTERNAL;
+		return TDEIO::ERR_INTERNAL;
   }
 }
 
@@ -590,7 +590,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
   PRINT_DEBUG << TQString("############   GET ADDRESS #%1\n").arg(index);
   // index is zero-based, but in gnokii the first address starts at 1
   if (index<0 || index>=numAddresses())
-    return KIO::ERR_DOES_NOT_EXIST;
+    return TDEIO::ERR_DOES_NOT_EXIST;
 
   // now get our addressbook entry
 
@@ -610,7 +610,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
 int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
 {
   /* XXX: this is a read-only device */
-  return KIO::ERR_WRITE_ACCESS_DENIED;
+  return TDEIO::ERR_WRITE_ACCESS_DENIED;
 }
 
 
@@ -683,7 +683,7 @@ int KMobileGnokii::numCalendarEntries()
 int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
 {
   if (index < 0 || index >= GN_CALNOTE_MAX_NUMBER)
-	return KIO::ERR_DOES_NOT_EXIST;
+	return TDEIO::ERR_DOES_NOT_EXIST;
 
   gn_data_clear(&data);
   gn_calnote entry;
@@ -764,7 +764,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
 int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event )
 {
   if (index < 0 || index >= GN_CALNOTE_MAX_NUMBER)
-	return KIO::ERR_DOES_NOT_EXIST;
+	return TDEIO::ERR_DOES_NOT_EXIST;
 
   gn_error error;
   gn_calnote entry;
@@ -862,7 +862,7 @@ int KMobileGnokii::readNote( int index, TQString &note )
 {
   // index is zero-based, and we only have one simulated note
   if (index<0 || index>=numNotes())
-    return KIO::ERR_DOES_NOT_EXIST;
+    return TDEIO::ERR_DOES_NOT_EXIST;
 
   note = TQString("NOTE #%1\n"
 		 "--------\n"
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index 782c2b92d..fbcb3cb6a 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -77,8 +77,8 @@ signals:
 
 protected:
     bool setGnokiiStateMachine();
-    bool saveConfig( KConfig &conf, TQString group );
-    bool loadConfig( KConfig &conf, TQString group );
+    bool saveConfig( TDEConfig &conf, TQString group );
+    bool loadConfig( TDEConfig &conf, TQString group );
     bool saveGnokiiConfiguration();
     bool loadGnokiiConfiguration();
     bool saveDeviceConfiguration();
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 5c05f3d9e..3a7c77b07 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -109,7 +109,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
 {
   // index is zero-based
   if (index<0 || index>=numAddresses())
-    return KIO::ERR_DOES_NOT_EXIST;
+    return TDEIO::ERR_DOES_NOT_EXIST;
 
   // now build our own sample name
   addr.setFamilyName(TQString("Meyer_%1").arg(index+1));  
@@ -133,7 +133,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
 int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool )
 {
   /* this is a read-only device */
-  return KIO::ERR_WRITE_ACCESS_DENIED;
+  return TDEIO::ERR_WRITE_ACCESS_DENIED;
 }
 
 /*
@@ -148,7 +148,7 @@ int KMobileSkeleton::readNote( int index, TQString &note )
 {
   // index is zero-based, and we only have one simulated note
   if (index<0 || index>=numNotes())
-    return KIO::ERR_DOES_NOT_EXIST;
+    return TDEIO::ERR_DOES_NOT_EXIST;
 
   note = TQString("NOTE #%1\n"
 		 "--------\n"
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp
index 8c4e3853f..e8cff4fa1 100644
--- a/kmobile/kioslave/kio_mobile.cpp
+++ b/kmobile/kioslave/kio_mobile.cpp
@@ -35,7 +35,7 @@
 
 #include <tdepimmacros.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define KIO_MOBILE_DEBUG_AREA 7126
 #define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "kio_mobile: "
@@ -115,14 +115,14 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path,
 	return 0;
   }
 
-  return KIO::ERR_DOES_NOT_EXIST;
+  return TDEIO::ERR_DOES_NOT_EXIST;
 }
 
 
 static
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
+void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
 {
-	KIO::UDSAtom	atom;
+	TDEIO::UDSAtom	atom;
 	atom.m_uds = ID;
 	atom.m_long = l;
 	atom.m_str = s;
@@ -130,35 +130,35 @@ void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s =
 }
 
 static
-void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
+void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime)
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
-	addAtom(entry, KIO::UDS_ACCESS, 0500);
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	addAtom(entry, KIO::UDS_URL, 0, url);
-	addAtom(entry, KIO::UDS_USER, 0, getenv("USER"));
-	addAtom(entry, KIO::UDS_GROUP, 0, getenv("USER"));
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0500);
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_USER, 0, getenv("USER"));
+	addAtom(entry, TDEIO::UDS_GROUP, 0, getenv("USER"));
 	PRINT_DEBUG << TQString("createDirEntry: File: %1  MIME: %2  URL: %3\n").arg(name).arg(mime).arg(url);
-//	addAtom(entry, KIO::UDS_SIZE, 0);
-	addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime);
+//	addAtom(entry, TDEIO::UDS_SIZE, 0);
+	addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime);
 }
 
 static
-void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, 
+void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, 
 		const unsigned long size = 0)
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG);
-	addAtom(entry, KIO::UDS_URL, 0, url);
-	addAtom(entry, KIO::UDS_ACCESS, 0400);
-	addAtom(entry, KIO::UDS_USER, 0, getenv("USER"));
-	addAtom(entry, KIO::UDS_GROUP, 0, getenv("USER"));
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	if (size) addAtom(entry, KIO::UDS_SIZE, size);
-	addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0400);
+	addAtom(entry, TDEIO::UDS_USER, 0, getenv("USER"));
+	addAtom(entry, TDEIO::UDS_GROUP, 0, getenv("USER"));
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	if (size) addAtom(entry, TDEIO::UDS_SIZE, size);
+	addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime);
 	PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2,  MIME: %3\n").arg(name).arg(size).arg(mime);
 }
 
@@ -181,7 +181,7 @@ void KMobileProtocol::get(const KURL &url)
   }
 
   if (devName.isEmpty() || resource.isEmpty()) {
-	error(KIO::ERR_DOES_NOT_EXIST, url.path());
+	error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
 	return;
   }
   
@@ -197,7 +197,7 @@ void KMobileProtocol::get(const KURL &url)
 					break;
     case KMobileDevice::hasFileStorage: err = getFileStorage(devName, result, mime, devPath);
 					break;
-    default:				err = KIO::ERR_CANNOT_ENTER_DIRECTORY; /* TODO */
+    default:				err = TDEIO::ERR_CANNOT_ENTER_DIRECTORY; /* TODO */
   }
 
   if (err) {
@@ -209,7 +209,7 @@ void KMobileProtocol::get(const KURL &url)
   mimeType(mime);
 
   // tell the length
-  KIO::filesize_t processed_size = result.length();
+  TDEIO::filesize_t processed_size = result.length();
   totalSize(processed_size);
 
   // tell the contents of the URL
@@ -233,7 +233,7 @@ void KMobileProtocol::listRoot(const KURL& url)
 {
   PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").arg(url.path()).arg(url.protocol());
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
   TQStringList deviceNames = m_dev.deviceNames();
   unsigned int dirs = deviceNames.count();
@@ -314,7 +314,7 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName)
 {
   PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").arg(devName);
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
   unsigned int caps = m_dev.capabilities(devName);
 
   for (int i=0; i<31; i++) {
@@ -362,7 +362,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r
 {
   PRINT_DEBUG << TQString("listAddressBook(%1)\n").arg(devName);
   
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
   int fieldwidth;
   int entries = m_dev.numAddresses(devName);
@@ -409,11 +409,11 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr
   if (index>0)
 	index = path.left(index).toInt();
   if (index<0 || index>=m_dev.numAddresses(devName))
-	return KIO::ERR_DOES_NOT_EXIST;
+	return TDEIO::ERR_DOES_NOT_EXIST;
 
   TQString str = m_dev.readAddress(devName, index);
   if (str.isEmpty())
-	return KIO::ERR_INTERNAL;
+	return TDEIO::ERR_INTERNAL;
   result = str.utf8();
   mime = entryMimeType(KMobileDevice::hasAddressBook);
 //  setMetaData("plugin", "const TQString &key, const TQString &value);
@@ -427,7 +427,7 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res
 {
   PRINT_DEBUG << TQString("listCalendar(%1)\n").arg(devName);
   
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
   int entries = m_dev.numCalendarEntries(devName);
   totalSize(entries);
@@ -455,7 +455,7 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ
   /* TODO */
   Q_UNUSED(result);
   Q_UNUSED(mime);
-  return KIO::ERR_CANNOT_ENTER_DIRECTORY;
+  return TDEIO::ERR_CANNOT_ENTER_DIRECTORY;
 }
 
 
@@ -466,7 +466,7 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour
 {
   PRINT_DEBUG << TQString("listNotes(%1)\n").arg(devName);
   
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
   int entries = m_dev.numNotes(devName);
   totalSize(entries);
@@ -498,11 +498,11 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri
   if (index>0)
 	index = path.left(index).toInt();
   if (index<0 || index>=m_dev.numNotes(devName))
-	return KIO::ERR_DOES_NOT_EXIST;
+	return TDEIO::ERR_DOES_NOT_EXIST;
 
   TQString note = m_dev.readNote(devName, index);
   if (note.isEmpty())
-	return KIO::ERR_DOES_NOT_EXIST;
+	return TDEIO::ERR_DOES_NOT_EXIST;
 
   result = note.utf8();
   mime = entryMimeType(KMobileDevice::hasNotes);
@@ -517,7 +517,7 @@ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &r
   PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").arg(devName).arg(devPath);
   
   /* TODO */
-  error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").arg(devName).arg(resource).arg(devPath) );
+  error( TDEIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").arg(devName).arg(resource).arg(devPath) );
 }
 
 /*
@@ -531,7 +531,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result,
   Q_UNUSED(devName);
   Q_UNUSED(result);
   Q_UNUSED(mime);
-  return KIO::ERR_CANNOT_ENTER_DIRECTORY;
+  return TDEIO::ERR_CANNOT_ENTER_DIRECTORY;
 }
 
 
@@ -602,7 +602,7 @@ void KMobileProtocol::listDir(const KURL &url)
   PRINT_DEBUG << TQString("listDir(%1)\n").arg(url.path());
 
   if (!m_dev.isKMobileAvailable()) {
-	error( KIO::ERR_CONNECTION_BROKEN, i18n("TDE Mobile Device Manager") );
+	error( TDEIO::ERR_CONNECTION_BROKEN, i18n("TDE Mobile Device Manager") );
 	return;
   }
 
@@ -622,7 +622,7 @@ void KMobileProtocol::listDir(const KURL &url)
 
 #if 0  
   if (!dev) {
-	error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1").arg(devName) );
+	error( TDEIO::ERR_DOES_NOT_EXIST, TQString("/%1").arg(devName) );
 	return;
   }
 #endif
diff --git a/kmobile/kioslave/kio_mobile.h b/kmobile/kioslave/kio_mobile.h
index eb053d599..f534514f3 100644
--- a/kmobile/kioslave/kio_mobile.h
+++ b/kmobile/kioslave/kio_mobile.h
@@ -26,7 +26,7 @@
 #include <kmobiledevice.h>
 #include <kmobileclient.h>
 
-class KMobileProtocol : public KIO::SlaveBase
+class KMobileProtocol : public TDEIO::SlaveBase
 {
 public:
   KMobileProtocol( const TQCString &pool, const TQCString &app );
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 4c46b8903..2453b3bac 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -55,7 +55,7 @@
 KMobile::KMobile()
     : KMainWindow( 0, "kmobile" )
 {
-    m_config = new KConfig("kmobilerc");
+    m_config = new TDEConfig("kmobilerc");
 
     m_view = new KMobileView(this, m_config);
 
@@ -168,14 +168,14 @@ void KMobile::fileSave()
 }
 
 
-void KMobile::saveProperties(KConfig *)
+void KMobile::saveProperties(TDEConfig *)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void KMobile::readProperties(KConfig *config)
+void KMobile::readProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index f9bfefb38..58d3f4c23 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -42,14 +42,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 public slots:
 
@@ -87,7 +87,7 @@ private:
     bool queryClose();
 
 private:
-    KConfig *m_config;
+    TDEConfig *m_config;
 
     KMobileView *m_view;
     SystemTray *m_systemTray;
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index 36c6bacb7..d1e031324 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -60,9 +60,9 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList
   // set the config file name
   m_configFileName = args[0];
   if (m_configFileName.isEmpty())
-	m_config = new KConfig();
+	m_config = new TDEConfig();
   else
-	m_config = new KConfig(m_configFileName);
+	m_config = new TDEConfig(m_configFileName);
   PRINT_DEBUG << TQString("name of config file is %1\n").arg(m_configFileName);
 }
 
@@ -178,9 +178,9 @@ const TQString KMobileDevice::nameForCap(int cap) const
 }
 
 // returns an error string for the given error code
-TQString KMobileDevice::buildErrorString(KIO::Error err, const TQString &errorText) const
+TQString KMobileDevice::buildErrorString(TDEIO::Error err, const TQString &errorText) const
 {
-  return KIO::buildErrorString( err, errorText);
+  return TDEIO::buildErrorString( err, errorText);
 }
 
 /*
@@ -193,12 +193,12 @@ int KMobileDevice::numAddresses()
 
 int KMobileDevice::readAddress( int, KABC::Addressee & )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 int KMobileDevice::storeAddress( int, const KABC::Addressee &, bool )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 /*
@@ -211,12 +211,12 @@ int KMobileDevice::numCalendarEntries()
 
 int KMobileDevice::readCalendarEntry( int, KCal::Event & )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 int KMobileDevice::storeCalendarEntry( int, const KCal::Event & )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 /*
@@ -229,12 +229,12 @@ int KMobileDevice::numNotes()
 
 int KMobileDevice::readNote( int, TQString & )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 int KMobileDevice::storeNote( int, const TQString & )
 {
-  return KIO::ERR_UNSUPPORTED_ACTION;
+  return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
 /*
@@ -243,96 +243,96 @@ int KMobileDevice::storeNote( int, const TQString & )
  */
 
 static
-void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
+void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
 {
-	KIO::UDSAtom atom;
+	TDEIO::UDSAtom atom;
 	atom.m_uds = ID;
 	atom.m_long = l;
 	atom.m_str = s;
 	entry.append(atom);
 }
 
-void KMobileDevice::createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) const
+void KMobileDevice::createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) const
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
-	addAtom(entry, KIO::UDS_ACCESS, 0500);
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	addAtom(entry, KIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0500);
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
 	PRINT_DEBUG << TQString("createDirEntry: File: %1  MIME: %2  URL: %3\n").arg(name).arg(mime).arg(url);
-//	addAtom(entry, KIO::UDS_SIZE, 0);
-	addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime);
+//	addAtom(entry, TDEIO::UDS_SIZE, 0);
+	addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime);
 }
 
-void KMobileDevice::createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,
+void KMobileDevice::createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,
 		const unsigned long size) const
 {
 	entry.clear();
-	addAtom(entry, KIO::UDS_NAME, 0, name);
-	addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG);
-	addAtom(entry, KIO::UDS_URL, 0, url);
-	addAtom(entry, KIO::UDS_ACCESS, 0400);
-	addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime);
-	if (size) addAtom(entry, KIO::UDS_SIZE, size);
-	addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime);
+	addAtom(entry, TDEIO::UDS_NAME, 0, name);
+	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	addAtom(entry, TDEIO::UDS_URL, 0, url);
+	addAtom(entry, TDEIO::UDS_ACCESS, 0400);
+	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime);
+	if (size) addAtom(entry, TDEIO::UDS_SIZE, size);
+	addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime);
 	PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2,  MIME: %3\n").arg(name).arg(size).arg(mime);
 }
 
 
 void KMobileDevice::listDir( const TQString & )
 {
-  emit error(KIO::ERR_CANNOT_ENTER_DIRECTORY,TQString());
+  emit error(TDEIO::ERR_CANNOT_ENTER_DIRECTORY,TQString());
 }
 
 void KMobileDevice::mkdir( const TQString &, int )
 {
-  emit error(KIO::ERR_COULD_NOT_MKDIR, TQString());
+  emit error(TDEIO::ERR_COULD_NOT_MKDIR, TQString());
 }
 
 void KMobileDevice::rename( const TQString &, const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::symlink( const TQString &, const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::del( const TQString &, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::stat( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::chmod( const TQString &, int )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::get( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::put( const TQString &, int, bool, bool )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::mimetype( const TQString & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 void KMobileDevice::special( const TQByteArray & )
 {
-  emit error(KIO::ERR_UNSUPPORTED_ACTION, TQString());
+  emit error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
 }
 
 
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index f8e36ba57..111a26e5d 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -35,7 +35,7 @@
 
 #include <libkcal/event.h>
 
-class KConfig;
+class TDEConfig;
 
 #define KMOBILE_MIMETYPE_DEVICE			"kdedevice/mobiledevice"
 #define KMOBILE_MIMETYPE_DEVICE_KONQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name)
@@ -171,8 +171,8 @@ public:
     const TQString nameForCap(int cap) const;
 
     // returns an error string for the given error code
-    // See KIO::buildErrorString()
-    TQString buildErrorString(KIO::Error err, const TQString &errorText) const;
+    // See TDEIO::buildErrorString()
+    TQString buildErrorString(TDEIO::Error err, const TQString &errorText) const;
 
 public:
     /*
@@ -208,9 +208,9 @@ public:
     /**
      * helper functions for the kmobile device drivers
      */
-    void createDirEntry(KIO::UDSEntry& entry, const TQString& name,
+    void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name,
 		const TQString& url, const TQString& mime) const;
-    void createFileEntry(KIO::UDSEntry& entry, const TQString& name,
+    void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name,
 		const TQString& url, const TQString& mime,
 		const unsigned long size = 0) const;
     /**
@@ -321,7 +321,7 @@ signals:
      * mimetype, etc.
      * @param _entry The UDSEntry containing all of the object attributes.
      */
-    void statEntry( const KIO::UDSEntry &_entry );
+    void statEntry( const TDEIO::UDSEntry &_entry );
 
     /**
      * internal function to be called by the slave.
@@ -333,7 +333,7 @@ signals:
      * @param ready set to true after emitting all items. _entry is not
      *        used in this case
      */
-    void listEntry( const KIO::UDSEntry& _entry, bool ready);
+    void listEntry( const TDEIO::UDSEntry& _entry, bool ready);
 
     /**
      * Internal function to transmit meta data to the application.
@@ -349,7 +349,7 @@ signals:
      * simple example:
      *
      * <pre>
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
      *    kdDebug() << TQString::fromLatin1("User: ")
@@ -363,7 +363,7 @@ signals:
      * comment as follows:
      *
      * <pre>
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * authInfo.caption= "Acme Password Dialog";
      * authInfo.username= "Wile E. Coyote";
      * TQString errorMsg = "You entered an incorrect password.";
@@ -384,7 +384,7 @@ signals:
      * @return      @p TRUE if user clicks on "OK", @p FALSE otherwsie.
      * @since 3.1
      */
-    bool openPassDlg( KIO::AuthInfo& info, const TQString &errorMsg );
+    bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg );
 
     /**
      * Call this in @ref #mimetype, when you know the mimetype.
@@ -396,7 +396,7 @@ signals:
      * Call to signal an error.
      * This also finishes the job, no need to call finished.
      *
-     * If the Error code is KIO::ERR_SLAVE_DEFINED then the
+     * If the Error code is TDEIO::ERR_SLAVE_DEFINED then the
      * _text should contain the complete translated text of
      * of the error message.  This message will be displayed
      * in an KTextBrowser which allows rich text complete
@@ -404,9 +404,9 @@ signals:
      * mailer, "exec:/command arg1 arg2" will be forked and
      * all other links will call the default browser.
      *
-     * @see KIO::Error
+     * @see TDEIO::Error
      * @see KTextBrowser
-     * @param _errid the error code from KIO::Error
+     * @param _errid the error code from TDEIO::Error
      * @param _text the rich text error message
      */
     void error( int _errid, const TQString &_text );
@@ -458,13 +458,13 @@ signals:
      * of the file
      * Call in @ref listDir too, when you know the total number of items.
      */
-    void totalSize( KIO::filesize_t _bytes );
+    void totalSize( TDEIO::filesize_t _bytes );
     /**
      * Call this during @ref #get and @ref #copy, once in a while,
      * to give some info about the current state.
      * Don't emit it in @ref #listDir, @ref #listEntries speaks for itself.
      */
-    void processedSize( KIO::filesize_t _bytes );
+    void processedSize( TDEIO::filesize_t _bytes );
 
 
 signals:
@@ -474,7 +474,7 @@ protected:
     // only available to sub-classed device drivers:
     void setClassType( enum ClassType ct );
     void setCapabilities( int caps );
-    KConfig *config() const { return m_config; };
+    TDEConfig *config() const { return m_config; };
     TQString configFileName() const { return m_configFileName; };
 
 
@@ -489,7 +489,7 @@ protected:
 protected:
     TQMutex  m_mutex;		// mutex to syncronize DCOP accesses to this device
     TQString m_configFileName;
-    KConfig *m_config;		// this is where this device should store it's configuration
+    TDEConfig *m_config;		// this is where this device should store it's configuration
     enum ClassType m_classType;
     TQString m_deviceClassName;	// e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer"
     TQString m_deviceName;	// e.g. "Nokia 6310", "Opie"
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 2471f667e..dec9924a4 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -29,7 +29,7 @@
 
 #define PRINT_DEBUG kdDebug() << "KMobileItem: "
 
-KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr service)
+KMobileItem::KMobileItem(TQIconView *parent, TDEConfig *_config, KService::Ptr service)
 	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
 {
    config = _config;
@@ -51,7 +51,7 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser
 }
 
 /* restore this item from the config file */
-KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, int reload_index)
+KMobileItem::KMobileItem(TQIconView *parent, TDEConfig *_config, int reload_index)
 	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
 {
    config = _config;
@@ -129,7 +129,7 @@ void KMobileItem::writeKonquMimeFile() const
    if (comment.isEmpty())
 	comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified);
 
-   KConfig conf( getKonquMimeType()+".desktop", false, true, "mime" );
+   TDEConfig conf( getKonquMimeType()+".desktop", false, true, "mime" );
    conf.setDesktopGroup();
    conf.writeEntry("Encoding", "UTF-8");
    conf.writeEntry("Comment", comment );
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index 81878c8d0..d3dc1761e 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -16,8 +16,8 @@ class KMobileItem : public TQObject, public TQIconViewItem
   
     friend class KMobileView;
 public:
-    KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service);
-    KMobileItem(TQIconView *parent, KConfig *config, int reload_index);
+    KMobileItem(TQIconView *parent, TDEConfig *config, KService::Ptr service);
+    KMobileItem(TQIconView *parent, TDEConfig *config, int reload_index);
     virtual ~KMobileItem();
 
     void configSave() const;
@@ -42,7 +42,7 @@ signals:
 private slots:
 
 private:
-    KConfig *config;
+    TDEConfig *config;
 
     TQString m_deviceConfigFile;
     TQString m_deviceDesktopFile;
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 89395bddb..0080b57a0 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -32,7 +32,7 @@
 #include "kmobileitem.h"
 
 
-KMobileView::KMobileView(TQWidget *parent, KConfig *_config)
+KMobileView::KMobileView(TQWidget *parent, TDEConfig *_config)
     : DCOPObject("kmobileIface"), TQIconView(parent)
 {
    m_config = _config;
@@ -47,7 +47,7 @@ KMobileView::~KMobileView()
 {
 }
 
-bool KMobileView::addNewDevice(KConfig *config, KService::Ptr service)
+bool KMobileView::addNewDevice(TDEConfig *config, KService::Ptr service)
 {
    kdDebug() << "New mobile device item:\n";
    kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n")
@@ -425,7 +425,7 @@ TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
 
 	mountList << name;
 	mountList << " ";
-	mountList << TQString("mobile:/%1").arg(name); // KIO::encodeFileName()
+	mountList << TQString("mobile:/%1").arg(name); // TDEIO::encodeFileName()
 	mountList << mime;
 	mountList << "true"; // mountState
 	mountList << "---";
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index ccb207ed8..39e2a53e0 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -10,7 +10,7 @@
 #include "kmobileiface.h"
 
 #include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
 class KMobileItem;
 
 /**
@@ -25,10 +25,10 @@ class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
     Q_OBJECT
   
 public:
-    KMobileView(TQWidget *parent, KConfig *_config);
+    KMobileView(TQWidget *parent, TDEConfig *_config);
     virtual ~KMobileView();
 
-    bool addNewDevice(KConfig *config, KService::Ptr service);
+    bool addNewDevice(TDEConfig *config, KService::Ptr service);
     bool startKonqueror(const TQString &devName);
 
     /**
@@ -83,7 +83,7 @@ signals:
     void signalChangeStatusbar(const TQString& text);
 
 private:
-    KConfig *m_config;
+    TDEConfig *m_config;
 
 };
 
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index b8b58fd6f..d5975dad1 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -285,7 +285,7 @@ void ArticleWidget::readConfig()
 
   mShowHtml = cfgMgr->readNewsViewer()->alwaysShowHTML();
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup( "READNEWS" );
   mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" );
   mHeaderStyle = conf->readEntry( "headerStyle", "fancy" );
@@ -309,7 +309,7 @@ void ArticleWidget::writeConfig()
   if ( knGlobals.artWidget != this )
     return;
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup( "READNEWS" );
   conf->writeEntry( "attachmentStyle", mAttachmentStyle );
   conf->writeEntry( "headerStyle", mHeaderStyle );
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 0498b99c1..9995ba465 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -98,7 +98,7 @@ KNHeaderView::~KNHeaderView()
 void KNHeaderView::readConfig()
 {
   if ( !mInitDone ) {
-    KConfig *conf = knGlobals.config();
+    TDEConfig *conf = knGlobals.config();
     conf->setGroup( "HeaderView" );
     mSortByThreadChangeDate = conf->readBoolEntry( "sortByThreadChangeDate", false );
     restoreLayout( conf, "HeaderView" );
@@ -125,7 +125,7 @@ void KNHeaderView::readConfig()
 
 void KNHeaderView::writeConfig()
 {
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup( "HeaderView" );
   conf->writeEntry( "sortByThreadChangeDate", mSortByThreadChangeDate );
   saveLayout( conf, "HeaderView" );
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 2dc8c931a..29376f9c4 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -41,7 +41,7 @@ KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const
   s_mtp = new KNServerInfo();
   s_mtp->setType(KNServerInfo::STsmtp);
   s_mtp->setId(0);
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("MAILSERVER");
   s_mtp->readConf(conf);
 
diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp
index 9c1e14e51..d6bf44c9b 100644
--- a/knode/knapplication.cpp
+++ b/knode/knapplication.cpp
@@ -31,7 +31,7 @@ int KNApplication::newInstance()
 {
   kdDebug(5003) << "KNApplication::newInstance()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("GENERAL");
   TQString ver=conf->readEntry("Version");
 
diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp
index f891a7894..bf05ec11b 100644
--- a/knode/knarticlewindow.cpp
+++ b/knode/knarticlewindow.cpp
@@ -111,7 +111,7 @@ KNArticleWindow::KNArticleWindow(KNArticle *art)
 
   setupGUI( ToolBar|Keys|Create, "knreaderui.rc");
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("articleWindow_options");
   resize(500,400);    // default optimized for 800x600
   applyMainWindowSettings(conf);
@@ -121,7 +121,7 @@ KNArticleWindow::KNArticleWindow(KNArticle *art)
 KNArticleWindow::~KNArticleWindow()
 {
   mInstances.remove( this );
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("articleWindow_options");
   saveMainWindowSettings(conf);
 }
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index e1fb20697..56fe429f6 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -90,7 +90,7 @@ KNCollectionView::~KNCollectionView()
 
 void KNCollectionView::readConfig()
 {
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup( "GroupView" );
 
   // execute the listview layout stuff only once
@@ -132,7 +132,7 @@ void KNCollectionView::readConfig()
 
 void KNCollectionView::writeConfig()
 {
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup( "GroupView" );
   saveLayout( knGlobals.config(), "GroupView" );
   conf->writeEntry( "UnreadColumn", unreadIndex() );
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index ec6e61b1c..38a18a342 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -376,7 +376,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
   v_iew->e_dit->setModified(false);
 
   // restore window & toolbar configuration
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("composerWindow_options");
   resize(535,450);    // default optimized for 800x600
   applyMainWindowSettings(conf);
@@ -401,7 +401,7 @@ KNComposer::~KNComposer()
   for ( TQValueList<KNAttachment*>::Iterator it = mDeletedAttachments.begin(); it != mDeletedAttachments.end(); ++it )
     delete (*it);
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("composerWindow_options");
   saveMainWindowSettings(conf);
 }
@@ -1397,7 +1397,7 @@ void KNComposer::slotConfKeys()
 
 void KNComposer::slotConfToolbar()
 {
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("composerWindow_options");
   saveMainWindowSettings(conf);
   KEditToolbar dlg(guiFactory(),this);
@@ -1412,7 +1412,7 @@ void KNComposer::slotNewToolbarConfig()
   a_ttPopup=static_cast<TQPopupMenu*> (factory()->container("attachment_popup", this));
   if(!a_ttPopup) a_ttPopup = new TQPopupMenu();
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("composerWindow_options");
   applyMainWindowSettings(conf);
 }
@@ -1588,8 +1588,8 @@ void KNComposer::slotSpellStarted( KSpell *)
         s_pellChecker->setProgressResolution(2);
 
         // read the quote indicator from the preferences
-        KConfig *config=knGlobals.config();
-        KConfigGroupSaver saver(config, "READNEWS");
+        TDEConfig *config=knGlobals.config();
+        TDEConfigGroupSaver saver(config, "READNEWS");
         TQString quotePrefix;
         quotePrefix = config->readEntry("quoteCharacters",">");
 //todo fixme
@@ -1779,8 +1779,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
   e_dit=new Editor(this, composer, main);
   e_dit->setMinimumHeight(50);
 
-  KConfig *config = knGlobals.config();
-  KConfigGroupSaver saver(config, "VISUAL_APPEARANCE");
+  TDEConfig *config = knGlobals.config();
+  TDEConfigGroupSaver saver(config, "VISUAL_APPEARANCE");
   TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp
   TQColor defaultColor2( kapp->palette().active().text() );
   TQColor defaultColor3( kapp->palette().active().text() );
@@ -1817,7 +1817,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
 KNComposer::ComposerView::~ComposerView()
 {
   if(v_iewOpen) {
-    KConfig *conf=knGlobals.config();
+    TDEConfig *conf=knGlobals.config();
     conf->setGroup("POSTNEWS");
 
     conf->writeEntry("Att_Splitter",sizes());   // save splitter pos
@@ -1943,7 +1943,7 @@ void KNComposer::ComposerView::showAttachmentView()
     v_iewOpen=true;
     a_ttWidget->show();
 
-    KConfig *conf=knGlobals.config();
+    TDEConfig *conf=knGlobals.config();
     conf->setGroup("POSTNEWS");
 
     TQValueList<int> lst=conf->readIntListEntry("Att_Splitter");
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index f8d9de39f..7214f2505 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -42,7 +42,7 @@ KNConfig::Identity::Identity(bool g)
  :  u_seSigFile(false), u_seSigGenerator(false), g_lobal(g)
 {
   if(g_lobal) {
-    KConfig *c=knGlobals.config();
+    TDEConfig *c=knGlobals.config();
     c->setGroup("IDENTITY");
     loadConfig(c);
   }
@@ -53,7 +53,7 @@ KNConfig::Identity::~Identity()
 {}
 
 
-void KNConfig::Identity::loadConfig(KConfigBase *c)
+void KNConfig::Identity::loadConfig(TDEConfigBase *c)
 {
   n_ame=c->readEntry("Name");
   e_mail=c->readEntry("Email");
@@ -68,7 +68,7 @@ void KNConfig::Identity::loadConfig(KConfigBase *c)
 }
 
 
-void KNConfig::Identity::saveConfig(KConfigBase *c)
+void KNConfig::Identity::saveConfig(TDEConfigBase *c)
 {
   c->writeEntry("Name", n_ame);
   c->writeEntry("Email", e_mail);
@@ -88,7 +88,7 @@ void KNConfig::Identity::save()
 {
   kdDebug(5003) << "KNConfig::Identity::save()" << endl;
   if(g_lobal) {
-    KConfig *c=knGlobals.config();
+    TDEConfig *c=knGlobals.config();
     c->setGroup("IDENTITY");
     saveConfig(c);
   }
@@ -173,7 +173,7 @@ void KNConfig::Identity::slotReceiveStderr(TDEProcess *, char *buffer, int bufle
 
 KNConfig::Appearance::Appearance()
 {
-  KConfig *c=knGlobals.config();
+  TDEConfig *c=knGlobals.config();
   c->setGroup("VISUAL_APPEARANCE");
 
   //colors
@@ -287,7 +287,7 @@ void KNConfig::Appearance::save()
 
   kdDebug(5003) << "KNConfig::Appearance::save()" << endl;
 
-  KConfig *c=knGlobals.config();
+  TDEConfig *c=knGlobals.config();
   c->setGroup("VISUAL_APPEARANCE");
 
   c->writeEntry("customColors", u_seColors);
@@ -534,7 +534,7 @@ void KNConfig::Appearance::recreateLVIcons()
 
 KNConfig::ReadNewsGeneral::ReadNewsGeneral()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS");
 
   a_utoCheck=conf->readBoolEntry("autoCheck", true);
@@ -572,7 +572,7 @@ void KNConfig::ReadNewsGeneral::save()
 
   kdDebug(5003) << "KNConfig::ReadNewsGeneral::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS");
 
   conf->writeEntry("autoCheck", a_utoCheck);
@@ -603,7 +603,7 @@ void KNConfig::ReadNewsGeneral::save()
 
 KNConfig::ReadNewsNavigation::ReadNewsNavigation()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS_NAVIGATION");
 
   m_arkAllReadGoNext=conf->readBoolEntry("markAllReadGoNext", false);
@@ -627,7 +627,7 @@ void KNConfig::ReadNewsNavigation::save()
 
   kdDebug(5003) << "KNConfig::ReadNewsNavigation::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS_NAVIGATION");
 
   conf->writeEntry("markAllReadGoNext", m_arkAllReadGoNext);
@@ -646,7 +646,7 @@ void KNConfig::ReadNewsNavigation::save()
 
 KNConfig::ReadNewsViewer::ReadNewsViewer()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS");
 
   r_ewrapBody=conf->readBoolEntry("rewrapBody", true);
@@ -674,7 +674,7 @@ void KNConfig::ReadNewsViewer::save()
 
   kdDebug(5003) << "KNConfig::ReadNewsViewer::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS");
 
   conf->writeEntry("rewrapBody", r_ewrapBody);
@@ -826,7 +826,7 @@ void KNConfig::DisplayedHeaders::down(KNDisplayedHeader *h)
 
 KNConfig::Scoring::Scoring()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("SCORING");
 
   i_gnoredThreshold=conf->readNumEntry("ignoredThreshold", -100);
@@ -846,7 +846,7 @@ void KNConfig::Scoring::save()
 
   kdDebug(5003) << "KNConfig::Scoring::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("SCORING");
 
   conf->writeEntry("ignoredThreshold", i_gnoredThreshold);
@@ -880,7 +880,7 @@ KNConfig::PostNewsTechnical::PostNewsTechnical()
 {
   findComposerCSCache.setAutoDelete(true);
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("POSTNEWS");
 
   c_omposerCharsets=conf->readListEntry("ComposerCharsets");
@@ -938,7 +938,7 @@ void KNConfig::PostNewsTechnical::save()
 
   kdDebug(5003) << "KNConfig::PostNewsTechnical::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("ComposerCharsets", c_omposerCharsets);
@@ -1044,7 +1044,7 @@ TQCString KNConfig::PostNewsTechnical::findComposerCharset(TQCString cs)
 
 KNConfig::PostNewsComposer::PostNewsComposer()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("POSTNEWS");
 
   w_ordWrap=conf->readBoolEntry("wordWrap",true);
@@ -1071,7 +1071,7 @@ void KNConfig::PostNewsComposer::save()
 
   kdDebug(5003) << "KNConfig::PostNewsComposer::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("wordWrap", w_ordWrap);
@@ -1103,14 +1103,14 @@ KNConfig::Cleanup::Cleanup( bool global ) :
   mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() )
 {
   if (mGlobal) {
-    KConfig *conf = knGlobals.config();
+    TDEConfig *conf = knGlobals.config();
     conf->setGroup( "EXPIRE" );
     loadConfig( conf );
   }
 }
 
 
-void KNConfig::Cleanup::loadConfig(KConfigBase *conf)
+void KNConfig::Cleanup::loadConfig(TDEConfigBase *conf)
 {
   // group expire settings
   d_oExpire = conf->readBoolEntry( "doExpire", true );
@@ -1133,7 +1133,7 @@ void KNConfig::Cleanup::loadConfig(KConfigBase *conf)
 }
 
 
-void KNConfig::Cleanup::saveConfig(KConfigBase *conf)
+void KNConfig::Cleanup::saveConfig(TDEConfigBase *conf)
 {
   // group expire settings
   conf->writeEntry( "doExpire", d_oExpire );
@@ -1162,7 +1162,7 @@ void KNConfig::Cleanup::save()
 {
   kdDebug(5003) << "KNConfig::Cleanup::save()" << endl;
   if (mGlobal) {
-    KConfig *conf = knGlobals.config();
+    TDEConfig *conf = knGlobals.config();
     conf->setGroup( "EXPIRE" );
     saveConfig( conf );
   }
@@ -1213,7 +1213,7 @@ void KNConfig::Cleanup::setLastCompactDate()
 
 /*KNConfig::Cache::Cache()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("CACHE");
 
   m_emMaxArt=conf->readNumEntry("memMaxArt", 1000);
@@ -1236,7 +1236,7 @@ void KNConfig::Cache::save()
 
   kdDebug(5003) << "KNConfig::Cache::save()" << endl;
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("CACHE");
 
   conf->writeEntry("memMaxArt", m_emMaxArt);
diff --git a/knode/knconfig.h b/knode/knconfig.h
index 44a985597..17ee8a525 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -74,8 +74,8 @@ Q_OBJECT
     Identity(bool g=true);
     ~Identity();
 
-    void loadConfig(KConfigBase *c);
-    void saveConfig(KConfigBase *c);
+    void loadConfig(TDEConfigBase *c);
+    void saveConfig(TDEConfigBase *c);
     void save();
     bool isEmpty();
     bool isGlobal()const           { return g_lobal; }
@@ -490,8 +490,8 @@ class KDE_EXPORT Cleanup : public Base {
     Cleanup( bool global = true );
     ~Cleanup() {}
 
-    void loadConfig( KConfigBase *conf );
-    void saveConfig( KConfigBase *conf );
+    void loadConfig( TDEConfigBase *conf );
+    void saveConfig( TDEConfigBase *conf );
     void save();
 
     //expire
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index c44b96954..a76b17efe 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -29,21 +29,21 @@
 // common config page with tabs (code mostly taken from kmail)
 //
 KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   mTabWidget = new TQTabWidget( this );
   vlay->addWidget( mTabWidget );
 }
 
-void KNConfig::BasePageWithTabs::addTab( KCModule* tab, const TQString & title ) {
+void KNConfig::BasePageWithTabs::addTab( TDECModule* tab, const TQString & title ) {
   mTabWidget->addTab( tab, title );
   connect( tab, TQT_SIGNAL(changed( bool )), this, TQT_SIGNAL(changed( bool )) );
 }
 
 void KNConfig::BasePageWithTabs::load() {
   for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
-    KCModule *tab = (KCModule*) mTabWidget->page(i);
+    TDECModule *tab = (TDECModule*) mTabWidget->page(i);
     if ( tab )
       tab->load();
   }
@@ -51,7 +51,7 @@ void KNConfig::BasePageWithTabs::load() {
 
 void KNConfig::BasePageWithTabs::save() {
   for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
-    KCModule *tab = (KCModule*) mTabWidget->page(i);
+    TDECModule *tab = (TDECModule*) mTabWidget->page(i);
     if ( tab )
       tab->save();
   }
@@ -59,7 +59,7 @@ void KNConfig::BasePageWithTabs::save() {
 
 void KNConfig::BasePageWithTabs::defaults() {
   for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
-    KCModule *tab = (KCModule*) mTabWidget->page(i);
+    TDECModule *tab = (TDECModule*) mTabWidget->page(i);
     if ( tab )
       tab->defaults();
   }
@@ -72,7 +72,7 @@ void KNConfig::BasePageWithTabs::defaults() {
 //
 extern "C"
 {
-  KDE_EXPORT KCModule *create_knode_config_identity( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_knode_config_identity( TQWidget *parent, const char * )
   {
     KNConfig::IdentityWidget *page = new KNConfig::IdentityWidget(
       knGlobals.configManager()->identity(),
@@ -89,7 +89,7 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_accounts( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_accounts( TQWidget *parent, const char * )
   {
     KNConfig::AccountsPage *page = new KNConfig::AccountsPage( parent, "kcmknode_config_accounts" );
     return page;
@@ -110,7 +110,7 @@ KNConfig::AccountsPage::AccountsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_appearance( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_appearance( TQWidget *parent, const char * )
   {
     KNConfig::AppearanceWidget *page = new KNConfig::AppearanceWidget( parent, "kcmknode_config_appearance" );
     return page;
@@ -124,7 +124,7 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_read_news( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_read_news( TQWidget *parent, const char * )
   {
     KNConfig::ReadNewsPage *page = new KNConfig::ReadNewsPage( parent, "kcmknode_config_read_news" );
     return page;
@@ -150,7 +150,7 @@ KNConfig::ReadNewsPage::ReadNewsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_post_news( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_post_news( TQWidget *parent, const char * )
   {
     KNConfig::PostNewsPage *page = new KNConfig::PostNewsPage( parent, "kcmknode_config_post_news" );
     return page;
@@ -173,7 +173,7 @@ KNConfig::PostNewsPage::PostNewsPage(TQWidget *parent, const char *name)
 //
 extern "C"
 {
-  KCModule *create_knode_config_privacy( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_privacy( TQWidget *parent, const char * )
   {
     KNConfig::PrivacyWidget *page = new KNConfig::PrivacyWidget( parent, "kcmknode_config_privacy" );
     return page;
@@ -187,7 +187,7 @@ extern "C"
 //
 extern "C"
 {
-  KCModule *create_knode_config_cleanup( TQWidget *parent, const char * )
+  TDECModule *create_knode_config_cleanup( TQWidget *parent, const char * )
   {
     KNConfig::CleanupWidget *page = new KNConfig::CleanupWidget( parent, "kcmknode_config_cleanup" );
     return page;
diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h
index 41054a97f..762845d7b 100644
--- a/knode/knconfigpages.h
+++ b/knode/knconfigpages.h
@@ -29,7 +29,7 @@ namespace KNConfig {
  * It simply forwards load and save operations to all tabs.
  * Code mostly taken from kmail.
  */
-class KDE_EXPORT BasePageWithTabs : public KCModule {
+class KDE_EXPORT BasePageWithTabs : public TDECModule {
   Q_OBJECT
   
   public:
@@ -41,7 +41,7 @@ class KDE_EXPORT BasePageWithTabs : public KCModule {
     virtual void defaults();
 
   protected:
-    void addTab( KCModule* tab, const TQString & title );
+    void addTab( TDECModule* tab, const TQString & title );
     
   private:
     TQTabWidget *mTabWidget;
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index b34d76381..af92a8d76 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -51,7 +51,7 @@
 
 
 KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQString msg;
@@ -280,7 +280,7 @@ void KNConfig::IdentityWidget::slotSignatureEdit()
 //BEGIN: NNTP account configuration widgets ----------------------------------
 
 KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char *n) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   a_ccManager( knGlobals.accountManager() )
 {
   p_ixmap = SmallIcon("server");
@@ -685,7 +685,7 @@ void KNConfig::SmtpAccountWidget::save()
   if ( mEncTLS->isChecked() )
     mAccount->setEncryption( KNServerInfo::TLS );
 
-  KConfig *conf = knGlobals.config();
+  TDEConfig *conf = knGlobals.config();
   conf->setGroup("MAILSERVER");
   mAccount->saveConf( conf );
 }
@@ -813,7 +813,7 @@ int KNConfig::AppearanceWidget::FontListItem::width(const TQListBox *lb ) const
 
 
 KNConfig::AppearanceWidget::AppearanceWidget( TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( knGlobals.configManager()->appearance() )
 {
   TQGridLayout *topL=new TQGridLayout(this, 8,2, 5,5);
@@ -992,7 +992,7 @@ void KNConfig::AppearanceWidget::slotFontSelectionChanged()
 
 
 KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQGroupBox *hgb=new TQGroupBox(i18n("Article Handling"), this);
@@ -1123,7 +1123,7 @@ void KNConfig::ReadNewsGeneralWidget::save()
 
 
 KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
@@ -1207,7 +1207,7 @@ void KNConfig::ReadNewsNavigationWidget::save()
 
 
 KNConfig::ReadNewsViewerWidget::ReadNewsViewerWidget( ReadNewsViewer *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQGroupBox *appgb=new TQGroupBox(i18n("Appearance"), this);
@@ -1303,7 +1303,7 @@ void KNConfig::ReadNewsViewerWidget::save()
 
 
 KNConfig::DisplayedHeadersWidget::DisplayedHeadersWidget( DisplayedHeaders *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   s_ave( false ),
   d_ata( d )
 {
@@ -1597,7 +1597,7 @@ void KNConfig::DisplayedHeaderConfDialog::slotNameChanged(const TQString& str)
 
 
 KNConfig::ScoringWidget::ScoringWidget( Scoring *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQGridLayout *topL = new TQGridLayout(this,4,2, 5,5);
@@ -1648,7 +1648,7 @@ void KNConfig::ScoringWidget::save()
 
 
 KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   f_ilManager( knGlobals.filterManager() )
 {
   TQGridLayout *topL=new TQGridLayout(this, 6,2, 5,5);
@@ -1930,7 +1930,7 @@ void KNConfig::FilterListWidget::slotSelectionChangedMenu()
 
 
 KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
@@ -2166,7 +2166,7 @@ TQString KNConfig::XHeaderConfDialog::result()
 
 
 KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( d )
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
@@ -2304,7 +2304,7 @@ void KNConfig::PostNewsComposerWidget::slotChooseEditor()
 
 
 KNConfig::PostNewsSpellingWidget::PostNewsSpellingWidget( TQWidget *p, const char *n ) :
-  KCModule( p, n )
+  TDECModule( p, n )
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
 
@@ -2330,7 +2330,7 @@ void KNConfig::PostNewsSpellingWidget::save()
 //==============================================================================================================
 
 KNConfig::PrivacyWidget::PrivacyWidget(TQWidget *p, const char *n) :
-  KCModule( p, n )
+  TDECModule( p, n )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout(this, 5);
   c_onf = new Kpgp::Config(this,"knode pgp config",false);
@@ -2469,7 +2469,7 @@ void KNConfig::GroupCleanupWidget::slotDefaultToggled( bool state )
 
 
 KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
-  KCModule( p, n ),
+  TDECModule( p, n ),
   d_ata( knGlobals.configManager()->cleanup() )
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
@@ -2552,7 +2552,7 @@ void KNConfig::CleanupWidget::slotFolderDaysChanged(int value)
 
 /*
 KNConfig::CacheWidget::CacheWidget(Cache *d, TQWidget *p, const char *n)
-  : KCModule p, n), d_ata(d)
+  : TDECModule p, n), d_ata(d)
 {
   TQVBoxLayout *topL=new TQVBoxLayout(this, 5);
 
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index fcf678a25..afed1ffc8 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -28,7 +28,7 @@ class TQRadioButton;
 class TQTextEdit;
 
 class KScoringEditorWidget;
-class KConfigBase;
+class TDEConfigBase;
 class KLineEdit;
 class KComboBox;
 class KIntSpinBox;
@@ -63,7 +63,7 @@ namespace KNConfig {
 
 namespace KNConfig {
 
-class KDE_EXPORT IdentityWidget : public KCModule {
+class KDE_EXPORT IdentityWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -105,7 +105,7 @@ class KDE_EXPORT IdentityWidget : public KCModule {
 };
 
 
-class KDE_EXPORT NntpAccountListWidget : public KCModule {
+class KDE_EXPORT NntpAccountListWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -217,7 +217,7 @@ Q_OBJECT
 };
 
 
-class KDE_EXPORT AppearanceWidget : public KCModule {
+class KDE_EXPORT AppearanceWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -296,7 +296,7 @@ class KDE_EXPORT AppearanceWidget : public KCModule {
 };
 
 
-class KDE_EXPORT ReadNewsGeneralWidget : public KCModule {
+class KDE_EXPORT ReadNewsGeneralWidget : public TDECModule {
 
   public:
     ReadNewsGeneralWidget(ReadNewsGeneral *d, TQWidget *p=0, const char *n=0);
@@ -325,7 +325,7 @@ class KDE_EXPORT ReadNewsGeneralWidget : public KCModule {
 };
 
 
-class KDE_EXPORT ReadNewsNavigationWidget : public KCModule {
+class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule {
 
   public:
     ReadNewsNavigationWidget(ReadNewsNavigation *d, TQWidget *p=0, const char *n=0);
@@ -346,7 +346,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public KCModule {
 };
 
 
-class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
+class KDE_EXPORT ReadNewsViewerWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -373,7 +373,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 };
 
 
-class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
+class KDE_EXPORT DisplayedHeadersWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -445,7 +445,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 };
 
 
-class KDE_EXPORT ScoringWidget : public KCModule {
+class KDE_EXPORT ScoringWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -466,7 +466,7 @@ class KDE_EXPORT ScoringWidget : public KCModule {
 };
 
 
-class KDE_EXPORT FilterListWidget : public KCModule {
+class KDE_EXPORT FilterListWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -532,7 +532,7 @@ class KDE_EXPORT FilterListWidget : public KCModule {
 };
 
 
-class KDE_EXPORT PostNewsTechnicalWidget : public KCModule {
+class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -586,7 +586,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
 };
 
 
-class KDE_EXPORT PostNewsComposerWidget : public KCModule {
+class KDE_EXPORT PostNewsComposerWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -617,7 +617,7 @@ class KDE_EXPORT PostNewsComposerWidget : public KCModule {
 };
 
 
-class KDE_EXPORT PostNewsSpellingWidget : public KCModule {
+class KDE_EXPORT PostNewsSpellingWidget : public TDECModule {
 
   public:
     PostNewsSpellingWidget(TQWidget *p=0, const char *n=0);
@@ -632,7 +632,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public KCModule {
 
 
 
-class KDE_EXPORT PrivacyWidget : public KCModule {
+class KDE_EXPORT PrivacyWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -681,7 +681,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 
 
 /** Global cleanup configuration widget */
-class KDE_EXPORT CleanupWidget : public KCModule {
+class KDE_EXPORT CleanupWidget : public TDECModule {
 
   Q_OBJECT
   
@@ -713,7 +713,7 @@ class KDE_EXPORT CleanupWidget : public KCModule {
 //END: Cleanup configuration -------------------------------------------------
 
 
-/*class CacheWidget : public KCModule  {
+/*class CacheWidget : public TDECModule  {
 
 
   Q_OBJECT
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 92fde5048..16ff8ce3a 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -66,7 +66,7 @@ KNFilterManager::KNFilterManager(TQObject * parent, const char * name)
 {
   loadFilters();
 
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("READNEWS");
   setFilter(conf->readNumEntry("lastFilterID", 1));
 }
@@ -95,7 +95,7 @@ void KNFilterManager::saveOptions()
 void KNFilterManager::prepareShutdown()
 {
   if (currFilter) {
-    KConfig *conf=knGlobals.config();
+    TDEConfig *conf=knGlobals.config();
     conf->setGroup("READNEWS");
     conf->writeEntry("lastFilterID", currFilter->id());
   }
diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp
index eaf026e8d..bfed08e1f 100644
--- a/knode/knglobals.cpp
+++ b/knode/knglobals.cpp
@@ -59,7 +59,7 @@ KNGlobals::~KNGlobals( )
 #endif
 }
 
-KConfig* KNGlobals::config()
+TDEConfig* KNGlobals::config()
 {
   if (!c_onfig) {
       c_onfig = KSharedConfig::openConfig( "knoderc" );
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 568a9ef86..2b535ac8b 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -62,7 +62,7 @@ class KDE_EXPORT KNGlobals {
     KNode::ArticleWidget  *artWidget;
     KNArticleFactory      *artFactory;
     Kpgp::Module          *pgp;
-    KConfig               *config();
+    TDEConfig               *config();
     TDEInstance             *instance;
 
     KNConfigManager       *configManager();
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index fefd96b12..b79b3199d 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -101,14 +101,14 @@ void KNJobData::cancel()
   }
 }
 
-void KNJobData::setJob( KIO::Job *job )
+void KNJobData::setJob( TDEIO::Job *job )
 {
   mJob = job;
   if ( job ) {
-    connect( job, TQT_SIGNAL( percent(KIO::Job*, unsigned long) ),
-             TQT_SLOT( slotJobPercent(KIO::Job*, unsigned long) ) );
-    connect( job, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&) ),
-             TQT_SLOT( slotJobInfoMessage(KIO::Job*, const TQString&) ) );
+    connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ),
+             TQT_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) );
+    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+             TQT_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) );
   }
 }
 
@@ -131,13 +131,13 @@ void KNJobData::createProgressItem()
       KPIM::ProgressManager::getUniqueID(), msg, i18n( "Waiting..." ), true, encr );
 }
 
-void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
+void KNJobData::slotJobPercent( TDEIO::Job*, unsigned long percent )
 {
   kdDebug(5003) << k_funcinfo << "Progress: " << percent << endl;
   setProgress( percent );
 }
 
-void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
+void KNJobData::slotJobInfoMessage( TDEIO::Job*, const TQString &msg )
 {
   kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
   setStatus( msg );
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 09050f59f..70a78872a 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -20,7 +20,7 @@
 
 #include <libtdepim/progressmanager.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -108,8 +108,8 @@ class KNJobData : public TQObject
     void prepareForExecution()           { e_rrorString = d_ata->prepareForExecution(); }
     void notifyConsumer();
 
-    KIO::Job* job() const                { return mJob; }
-    void setJob( KIO::Job *job );
+    TDEIO::Job* job() const                { return mJob; }
+    void setJob( TDEIO::Job *job );
 
     KPIM::ProgressItem* progressItem() const { return mProgressItem; }
     void createProgressItem();
@@ -129,11 +129,11 @@ class KNJobData : public TQObject
     KNJobConsumer *c_onsumer;
 
   private slots:
-    void slotJobPercent( KIO::Job *job, unsigned long percent );
-    void slotJobInfoMessage( KIO::Job *job, const TQString &msg );
+    void slotJobPercent( TDEIO::Job *job, unsigned long percent );
+    void slotJobInfoMessage( TDEIO::Job *job, const TQString &msg );
 
   private:
-    KIO::Job *mJob;
+    TDEIO::Job *mJob;
     KPIM::ProgressItem *mProgressItem;
 
 };
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index fa3b04787..f2728f8db 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -764,13 +764,13 @@ void KNMainWidget::initActions()
 
 bool KNMainWidget::firstStart()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("GENERAL");
   TQString ver = conf->readEntry("Version");
   if(!ver.isEmpty())
     return false;
 
-  KConfig emailConf("emaildefaults");
+  TDEConfig emailConf("emaildefaults");
 
   emailConf.setGroup("Defaults");
   TQString group = emailConf.readEntry("Profile","Default");
@@ -798,7 +798,7 @@ bool KNMainWidget::firstStart()
 
 void KNMainWidget::readOptions()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("APPEARANCE");
 
   if (conf->readBoolEntry("quicksearch", true))
@@ -819,7 +819,7 @@ void KNMainWidget::readOptions()
 
 void KNMainWidget::saveOptions()
 {
-  KConfig *conf=knGlobals.config();
+  TDEConfig *conf=knGlobals.config();
   conf->setGroup("APPEARANCE");
 
   conf->writeEntry("quicksearch", q_uicksearch->isShown());
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 92e7de23d..b81ccfa9f 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -274,9 +274,9 @@ void KNNetAccess::startJobSmtp()
       destination.setUser( account->user() );
       destination.setPass( account->pass() );
     }
-    KIO::Job* job = KIO::storedPut( art->encodedContent(true), destination, -1, false, false, false );
-    connect( job, TQT_SIGNAL( result(KIO::Job*) ),
-             TQT_SLOT( slotJobResult(KIO::Job*) ) );
+    TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false );
+    connect( job, TQT_SIGNAL( result(TDEIO::Job*) ),
+             TQT_SLOT( slotJobResult(TDEIO::Job*) ) );
     if ( account->encryption() == KNServerInfo::TLS )
       job->addMetaData( "tls", "on" );
     else
@@ -310,7 +310,7 @@ void KNNetAccess::threadDoneNntp()
       TQString user = info->user();
       TQString pass = info->pass();
       bool keep=false;
-      if (KDialog::Accepted == KIO::PasswordDialog::getNameAndPassword(user, pass, &keep,
+      if (KDialog::Accepted == TDEIO::PasswordDialog::getNameAndPassword(user, pass, &keep,
                                  i18n("You need to supply a username and a\npassword to access this server"), false,
                                  kapp->makeStdCaption(i18n("Authentication Failed")),info->server(),i18n("Server:"))) {
         info->setNeedsLogon(true);
@@ -457,7 +457,7 @@ void KNNetAccess::slotThreadSignal(int i)
 }
 
 
-void KNNetAccess::slotJobResult( KIO::Job *job )
+void KNNetAccess::slotJobResult( TDEIO::Job *job )
 {
   if ( job == currentSmtpJob->job() ) {
     if ( job->error() )
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index b8f48f92f..e59d5e514 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -21,7 +21,7 @@
 
 class TQSocketNotifier;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -88,7 +88,7 @@ class KNNetAccess : public TQObject  {
     void updateStatus();
 
   private slots:
-    void slotJobResult( KIO::Job *job );
+    void slotJobResult( TDEIO::Job *job );
 
     void slotCancelJob( KPIM::ProgressItem *item );
 
diff --git a/knode/knode_config_accounts.desktop b/knode/knode_config_accounts.desktop
index f9ea7ba78..53b0dcc71 100644
--- a/knode/knode_config_accounts.desktop
+++ b/knode/knode_config_accounts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_appearance.desktop b/knode/knode_config_appearance.desktop
index 65fb49080..727edb973 100644
--- a/knode/knode_config_appearance.desktop
+++ b/knode/knode_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_cleanup.desktop b/knode/knode_config_cleanup.desktop
index 0d857a697..bbbdb37f2 100644
--- a/knode/knode_config_cleanup.desktop
+++ b/knode/knode_config_cleanup.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=wizard
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_identity.desktop b/knode/knode_config_identity.desktop
index c8f6b54a5..b91a75552 100644
--- a/knode/knode_config_identity.desktop
+++ b/knode/knode_config_identity.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_post_news.desktop b/knode/knode_config_post_news.desktop
index 06776f0f3..41a53cf9a 100644
--- a/knode/knode_config_post_news.desktop
+++ b/knode/knode_config_post_news.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=mail_forward
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop
index 1b4255e77..05b2c5f0d 100644
--- a/knode/knode_config_privacy.desktop
+++ b/knode/knode_config_privacy.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=password
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_read_news.desktop b/knode/knode_config_read_news.desktop
index 6af38c8e7..b6bfb83ee 100644
--- a/knode/knode_config_read_news.desktop
+++ b/knode/knode_config_read_news.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=mail_get
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index d314a7710..30f0b863d 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -43,7 +43,7 @@ KNServerInfo::~KNServerInfo()
 
 
 
-void KNServerInfo::readConf(KConfig *conf)
+void KNServerInfo::readConf(TDEConfig *conf)
 {
   s_erver=conf->readEntry("server", "localhost");
 
@@ -87,7 +87,7 @@ void KNServerInfo::readConf(KConfig *conf)
 }
 
 
-void KNServerInfo::saveConf(KConfig *conf)
+void KNServerInfo::saveConf(TDEConfig *conf)
 {
   conf->writeEntry("server", s_erver);
   if ( p_ort == 0 ) p_ort = 119;
diff --git a/knode/knserverinfo.h b/knode/knserverinfo.h
index 68c39699a..ba5dcf4d7 100644
--- a/knode/knserverinfo.h
+++ b/knode/knserverinfo.h
@@ -17,7 +17,7 @@
 
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 namespace KWallet {
   class Wallet;
 }
@@ -32,8 +32,8 @@ class KNServerInfo {
     KNServerInfo();
     ~KNServerInfo();
 
-    void readConf(KConfig *conf);
-    void saveConf(KConfig *conf);
+    void readConf(TDEConfig *conf);
+    void saveConf(TDEConfig *conf);
 
     //get
     serverType type()const         { return t_ype; }
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 54ffb5e4a..5ae7862c0 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KNConfig::SmtpAccountWidgetBase</class>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>SmtpAccountWidgetBase</cstring>
     </property>
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 4ed48ea90..31d36369c 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -147,7 +147,7 @@ KNSaveHelper::~KNSaveHelper()
   } else
     if (tmpFile) {      // network location, initiate transaction
       tmpFile->close();
-      if (KIO::NetAccess::upload(tmpFile->name(),url, 0) == false)
+      if (TDEIO::NetAccess::upload(tmpFile->name(),url, 0) == false)
         KNHelper::displayRemoteFileError();
       tmpFile->unlink();   // delete temp file
       delete tmpFile;
@@ -206,7 +206,7 @@ KNLoadHelper::~KNLoadHelper()
 {
   delete f_ile;
   if (!t_empName.isEmpty())
-    KIO::NetAccess::removeTempFile(t_empName);
+    TDEIO::NetAccess::removeTempFile(t_empName);
 }
 
 
@@ -239,7 +239,7 @@ KNFile* KNLoadHelper::setURL(KURL url)
 
   TQString fileName;
   if (!u_rl.isLocalFile()) {
-    if (KIO::NetAccess::download(u_rl, t_empName, 0))
+    if (TDEIO::NetAccess::download(u_rl, t_empName, 0))
       fileName = t_empName;
   } else
     fileName = u_rl.path();
@@ -297,7 +297,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt
 
 void KNHelper::saveWindowSize(const TQString &name, const TQSize &s)
 {
-  KConfig *c=knGlobals.config();
+  TDEConfig *c=knGlobals.config();
   c->setGroup("WINDOW_SIZES");
   c->writeEntry(name, s);
 }
@@ -305,7 +305,7 @@ void KNHelper::saveWindowSize(const TQString &name, const TQSize &s)
 
 void KNHelper::restoreWindowSize(const TQString &name, TQWidget *d, const TQSize &defaultSize)
 {
-  KConfig *c=knGlobals.config();
+  TDEConfig *c=knGlobals.config();
   c->setGroup("WINDOW_SIZES");
 
   TQSize s=c->readSizeEntry(name,&defaultSize);
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index b0d0c047c..ef73afecd 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -231,13 +231,13 @@ ChangeLog for KNotes
 
     * revert dependency on tdelibs-HEAD, we need KDE 3.2.x for the KDE PIM 3.3
       release
-    * add a hack to work around inconsistency/limitation in KConfig XT:
+    * add a hack to work around inconsistency/limitation in TDEConfig XT:
       it is not possible to make one KCXT-generated class inherit another
       one due to CTOR-incompatibilites. The hack installs a CustomAddition
       and simply provides a copied&pasted CTOR from the generated code with
       adapted arguments (none, actually).
     * so now KNotesGlobalConfig inherits KNoteConfig and the global config
-      dialog needs only one KConfigSkeleton---the former one
+      dialog needs only one TDEConfigSkeleton---the former one
     * due to the last point it is now possible (and needed) to not simply copy
       the knotesrc for new notes but rather just copy part of KNotesGlobalConfig
       into the new KNoteConfig object. And boy, this makes creation of new notes
@@ -266,7 +266,7 @@ ChangeLog for KNotes
 
 2004/03/31  Michael Brade <[email protected]>
 
-    * hmm, wasn't such a good idea to set a default desktop in KConfig XT - only
+    * hmm, wasn't such a good idea to set a default desktop in TDEConfig XT - only
       changes will actually be saved and thus every new note that is not moved
       to a different desktop after creation appeared on the desktop KNotes was
       started on. Fixed.
@@ -340,8 +340,8 @@ ChangeLog for KNotes
 
     * adapt to new KWin: s/Always on Top/Keep Above Others/g and added
       Keep Below Others; furthermore use the corresponding new NET::State flags
-    * completely rewrote the config dialog, make it inherit KConfigDialog
-    * ported KNotes to KConfig XT, had to change the config file format:
+    * completely rewrote the config dialog, make it inherit TDEConfigDialog
+    * ported KNotes to TDEConfig XT, had to change the config file format:
       removed "state" entry and added "KeepAbove", "KeepBelow", "ShowInTaskbar"
 
 2004/03/15  Michael Brade <[email protected]>
@@ -367,7 +367,7 @@ ChangeLog for KNotes
       name anyway. Dunno why I introduced the attachments at all in the first
       place...
     * KNotes is now "network-enabled" regarding config files: it now only uses
-      KIO::NetAccess for the file handling.
+      TDEIO::NetAccess for the file handling.
 
 2004/03/09  Michael Brade <[email protected]>
 
@@ -732,7 +732,7 @@ ChangeLog for KNotes
     saved on a session shutdown.  The patch fixes those and adds some workarounds
     for some weird behavior in the QMultiLineEdit widget which adds some phantom
     lines to your text now and then.  It also reduces the memory usage by not
-    keeping a KConfig object open for each note all the time - it just creates
+    keeping a TDEConfig object open for each note all the time - it just creates
     them when saving new changes to the note settings."
 
 2000/09/24  Dirk Müller <[email protected]>
@@ -810,7 +810,7 @@ ChangeLog for KNotes
 2000/05/30  Wynn Wilkes <[email protected]>
 
     KNotes rewrite:
-     - changed config file to use KConfig
+     - changed config file to use TDEConfig
      - use KTQt::DockWindow and KUniqueApplication
      - Changed structure to make smaller files
 
diff --git a/knotes/TODO b/knotes/TODO
index bc2f5c570..202f563d7 100644
--- a/knotes/TODO
+++ b/knotes/TODO
@@ -33,9 +33,9 @@ TODO:
  * do not copy the knotesrc file anymore
    => use the static KNotesGlobalConfig object and copy the important stuff over
       Disadv: some keys and defaults must be defined in both config files
-             (and thus, KConfig XT specs)
-   => how about one kconfig Xt spec and inheriting from the KConfigSkeleton or make the
-      KConfigSkeleton inherit something?
+             (and thus, TDEConfig XT specs)
+   => how about one kconfig Xt spec and inheriting from the TDEConfigSkeleton or make the
+      TDEConfigSkeleton inherit something?
  * global config dialog: use "Defaults" in the side bar and add a page with two tabs,
    Display and Editor, respectively
  * call m_calendar.update( this ) in knotesapp after saving/changing a note?
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index b68a342f3..a90d891b9 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -219,7 +219,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     // no config file yet? -> use the default display config if available
     // we want to write to configFile, so use "false"
-    bool newNote = !KIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 );
+    bool newNote = !TDEIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 );
 
     m_config = new KNoteConfig( KSharedConfig::openConfig( configFile, false, false ) );
     m_config->readConfig();
@@ -227,7 +227,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     if ( newNote )
     {
-        // until tdelibs provides copying of KConfigSkeletons (KDE 3.4)
+        // until tdelibs provides copying of TDEConfigSkeletons (KDE 3.4)
         KNotesGlobalConfig *globalConfig = KNotesGlobalConfig::self();
         m_config->setBgColor( globalConfig->bgColor() );
         m_config->setFgColor( globalConfig->fgColor() );
@@ -324,7 +324,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) );
 
     // if this is a new note put on current desktop - we can't use defaults
-    // in KConfig XT since only _changes_ will be stored in the config file
+    // in TDEConfig XT since only _changes_ will be stored in the config file
     int desktop = m_config->desktop();
     if ( desktop < 0 && desktop != NETWinInfo::OnAllDesktops )
         desktop = KWin::currentDesktop();
@@ -410,7 +410,7 @@ void KNote::slotKill( bool force )
     TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" );
     configFile += m_journal->uid();
 
-    if ( !KIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) )
+    if ( !TDEIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) )
         kdError(5500) << "Can't remove the note config: " << configFile << endl;
 
     emit sigKillNote( m_journal );
@@ -654,15 +654,15 @@ void KNote::sync( const TQString& app )
     hash.update( m_editor->text().utf8() );
     hash.hexDigest( result );
 
-    // hacky... not possible with KConfig XT
-    KConfig *config = m_config->config();
+    // hacky... not possible with TDEConfig XT
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     config->writeEntry( app, result.data() );
 }
 
 bool KNote::isNew( const TQString& app ) const
 {
-    KConfig *config = m_config->config();
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     TQString hash = config->readEntry( app );
     return hash.isEmpty();
@@ -679,7 +679,7 @@ bool KNote::isModified( const TQString& app ) const
     hash.update( m_editor->text().utf8() );
     hash.hexDigest();
 
-    KConfig *config = m_config->config();
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     TQString orig = config->readEntry( app );
 
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 9eeb3fdc7..f35ad9e96 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -43,7 +43,7 @@
 
 KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title,
         TQWidget *parent, const char *name )
-    : KConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList,
+    : TDEConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList,
                      config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok )
 {
     setCaption( title );
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index 18300d987..5d7118ca7 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -27,7 +27,7 @@ class TQString;
 class KNoteConfig;
 
 
-class KNoteConfigDlg : public KConfigDialog
+class KNoteConfigDlg : public TDEConfigDialog
 {
     Q_OBJECT
   
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 9df09cf3f..d53ac911c 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -163,7 +163,7 @@ KNotesApp::KNotesApp()
 
     m_globalAccel->readSettings();
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Global Keybindings" );
     m_globalAccel->setEnabled( config->readBoolEntry( "Enabled", true ) );
 
@@ -199,7 +199,7 @@ KNotesApp::KNotesApp()
     m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) );
 
     // create the socket and possibly start listening for connections
-    m_listener = new KServerSocket();
+    m_listener = new TDEServerSocket();
     m_listener->setResolutionEnabled( true );
     connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) );
     updateNetworkListener();
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 66a3eea49..a850bec73 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -48,7 +48,7 @@ namespace KCal {
 }
 
 namespace KNetwork {
-    class KServerSocket;
+    class TDEServerSocket;
 }
 
 
@@ -145,7 +145,7 @@ private:
     KNotesResourceManager *m_manager;
 
     KNotesAlarm     *m_alarm;
-    KNetwork::KServerSocket   *m_listener;
+    KNetwork::TDEServerSocket   *m_listener;
 
     TQDict<KNote>    m_noteList;
     KNoteActionList m_noteActions;
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index c7e79172f..6c59f13ea 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -146,7 +146,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     TQString configFile = noteDir.absFilePath( journal->uid() );
 
     // set the defaults
-    KIO::NetAccess::copy(
+    TDEIO::NetAccess::copy(
         KURL( TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ),
         KURL( configFile ),
         0
@@ -240,7 +240,7 @@ bool KNotesLegacy::convertKNotes2Config( Journal *journal, TQDir& noteDir,
     }
 
     // update the config
-    KConfig config( configFile );
+    TDEConfig config( configFile );
     config.setGroup( "Data" );
     journal->setSummary( config.readEntry( "name" ) );
     config.deleteGroup( "Data", true );
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index a843c47bf..5845812c7 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -145,7 +145,7 @@ void KNotesNetworkReceiver::slotConnectionClosed()
 void KNotesNetworkReceiver::slotError( int err )
 {
     kdWarning() << k_funcinfo
-                << m_sock->KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )
+                << m_sock->KNetwork::TDESocketBase::errorString( static_cast<TDESocketBase::SocketError>(err) )
                 << endl;
 }
 
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 998439de4..20e2b07f1 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite()
 void KNotesNetworkSender::slotError( int err )
 {
     KMessageBox::sorry( 0, i18n("Communication error: %1")
-           .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
+           .arg( TQString(KNetwork::TDESocketBase::errorString( static_cast<TDESocketBase::SocketError>(err) )) )
     );
     slotClosed();
 }
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 440b1454c..7e208531e 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -44,7 +44,7 @@
 
 
 
-ResourceLocal::ResourceLocal( const KConfig *config )
+ResourceLocal::ResourceLocal( const TDEConfig *config )
     : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) )
 {
     kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl;
@@ -63,7 +63,7 @@ ResourceLocal::~ResourceLocal()
 {
 }
 
-void ResourceLocal::writeConfig( KConfig *config )
+void ResourceLocal::writeConfig( TDEConfig *config )
 {
     KRES::Resource::writeConfig( config );
     config->writePathEntry( "NotesURL", mURL.prettyURL() );
diff --git a/knotes/resourcelocal.h b/knotes/resourcelocal.h
index baeb710e5..d2100989f 100644
--- a/knotes/resourcelocal.h
+++ b/knotes/resourcelocal.h
@@ -43,10 +43,10 @@
 class ResourceLocal : public ResourceNotes
 {
 public:
-    ResourceLocal( const KConfig* );
+    ResourceLocal( const TDEConfig* );
     virtual ~ResourceLocal();
 
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
      * Load resource data.
diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp
index 846a5a3a6..ddd696ae4 100644
--- a/knotes/resourcelocal_plugin.cpp
+++ b/knotes/resourcelocal_plugin.cpp
@@ -38,7 +38,7 @@ class LocalNotesFactory
     : public KRES::PluginFactoryBase
 {
 public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
         return new ResourceLocal( config );
     }
@@ -61,7 +61,7 @@ extern "C"
         return new ResourceLocalConfig( parent, "Configure Local Resource" );
     }
 
-    KRES::Resource *resource( const KConfig* config )
+    KRES::Resource *resource( const TDEConfig* config )
     {
         return new ResourceLocal( config );
     }
diff --git a/knotes/resourcenotes.cpp b/knotes/resourcenotes.cpp
index 131142723..2cd31eb0d 100644
--- a/knotes/resourcenotes.cpp
+++ b/knotes/resourcenotes.cpp
@@ -33,7 +33,7 @@
 #include "resourcenotes.h"
 
 
-ResourceNotes::ResourceNotes( const KConfig *config )
+ResourceNotes::ResourceNotes( const TDEConfig *config )
     : KRES::Resource( config ), mManager( 0 )
 {
     if ( !config )
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index 65cf1acbe..1e0d07d1a 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -37,7 +37,7 @@
 #include <tdepimmacros.h>
 #include <libkcal/alarm.h>
 
-class KConfig;
+class TDEConfig;
 class KNotesResourceManager;
 
 namespace KCal {
@@ -55,7 +55,7 @@ namespace KCal {
 class KDE_EXPORT ResourceNotes : public KRES::Resource
 {
 public:
-    ResourceNotes( const KConfig * );
+    ResourceNotes( const TDEConfig * );
     virtual ~ResourceNotes();
 
     /**
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index a858f5d46..253b6bd21 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -935,7 +935,7 @@ void Converter::createTransportClass()
   queryCode += "TQDataStream stream( postData, IO_WriteOnly );";
   queryCode += "stream.writeRawBytes( xml.utf8(), xml.utf8().length() );";
   queryCode.newLine();
-  queryCode += "KIO::TransferJob* job = KIO::http_post( KURL( " + url.name() + " ), postData, false );";
+  queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );";
   queryCode += "if ( !job ) {";
   queryCode.indent();
   queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;";
@@ -946,8 +946,8 @@ void Converter::createTransportClass()
   queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );";
   queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );";
   queryCode.newLine();
-  queryCode += "connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );";
-  queryCode += "connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );";
+  queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
+  queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );";
 
   query.setBody( queryCode );
 
@@ -962,7 +962,7 @@ void Converter::createTransportClass()
   // data slot
   KODE::Function slotData( "slotData", "void", KODE::Function::Private | KODE::Function::Slot );
 
-  slotData.addArgument( "KIO::Job*" );
+  slotData.addArgument( "TDEIO::Job*" );
   slotData.addArgument( "const TQByteArray &data" );
 
   KODE::Code slotDataCode;
@@ -976,7 +976,7 @@ void Converter::createTransportClass()
 
   // result slot
   KODE::Function slotResult( "slotResult", "void", KODE::Function::Private | KODE::Function::Slot );
-  slotResult.addArgument( "KIO::Job* job" );
+  slotResult.addArgument( "TDEIO::Job* job" );
 
   KODE::Code slotResultCode;
   slotResultCode += "if ( job->error() != 0 ) {";
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index ea7c17394..b053f5d1e 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -151,7 +151,7 @@ void BinaryWidget::load()
     return;
 
   TQString tempFile;
-  if ( KIO::NetAccess::download( url, tempFile, this ) ) {
+  if ( TDEIO::NetAccess::download( url, tempFile, this ) ) {
     TQFile file( tempFile );
     if ( !file.open( IO_ReadOnly ) ) {
       KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) );
@@ -162,11 +162,11 @@ void BinaryWidget::load()
     setData( data );
 
     file.close();
-    KIO::NetAccess::removeTempFile( tempFile );
+    TDEIO::NetAccess::removeTempFile( tempFile );
 
     emit valueChanged( data );
   } else
-    KMessageBox::error( this, KIO::NetAccess::lastErrorString() );
+    KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() );
 }
 
 void BinaryWidget::save()
@@ -179,8 +179,8 @@ void BinaryWidget::save()
   tempFile.file()->writeBlock( mData );
   tempFile.close();
 
-  if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
-    KMessageBox::error( this, KIO::NetAccess::lastErrorString() );
+  if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
+    KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() );
 }
 
 #include "binaryinputfield.moc"
diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp
index 76f3acc82..32cfbe6ef 100644
--- a/kode/kwsdl/kung/transport.cpp
+++ b/kode/kwsdl/kung/transport.cpp
@@ -36,7 +36,7 @@ void Transport::query( const TQString &xml )
   TQDataStream stream( postData, IO_WriteOnly );
   stream.writeRawBytes( xml.utf8(), xml.utf8().length() );
   
-  KIO::TransferJob* job = KIO::http_post( KURL( mUrl ), postData, false );
+  TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
     kdWarning() << "Unable to create KIO job for " << mUrl << endl;
     return;
@@ -45,18 +45,18 @@ void Transport::query( const TQString &xml )
   job->addMetaData( "UserAgent", "KDE Kung" );
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 }
 
-void Transport::slotData( KIO::Job*, const TQByteArray &data )
+void Transport::slotData( TDEIO::Job*, const TQByteArray &data )
 {
   unsigned int oldSize = mData.size();
   mData.resize( oldSize + data.size() );
   memcpy( mData.data() + oldSize, data.data(), data.size() );
 }
 
-void Transport::slotResult( KIO::Job* job )
+void Transport::slotResult( TDEIO::Job* job )
 {
   if ( job->error() != 0 )
     emit error( job->errorText() );
diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h
index 3047b8815..71c4fa9de 100644
--- a/kode/kwsdl/kung/transport.h
+++ b/kode/kwsdl/kung/transport.h
@@ -37,8 +37,8 @@ class Transport : public TQObject
     void error( const TQString &errorMsg );
   
   private slots:
-    void slotData( KIO::Job*, const TQByteArray &data );
-    void slotResult( KIO::Job* job );
+    void slotData( TDEIO::Job*, const TQByteArray &data );
+    void slotResult( TDEIO::Job* job );
   
   private:
     TQString mUrl;
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index 10c46381b..d12d4eee3 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -52,11 +52,11 @@ bool FileProvider::get( const TQString &url, TQString &target )
 
   tqDebug( "Downloading external schema '%s'", url.latin1() );
 
-  KIO::TransferJob* job = KIO::get( KURL( url ), false, false );
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+  TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 
   mBlocked = true;
   while ( mBlocked ) {
@@ -73,14 +73,14 @@ void FileProvider::cleanUp()
   mFileName = TQString();
 }
 
-void FileProvider::slotData( KIO::Job*, const TQByteArray &data )
+void FileProvider::slotData( TDEIO::Job*, const TQByteArray &data )
 {
   unsigned int oldSize = mData.size();
   mData.resize( oldSize + data.size() );
   memcpy( mData.data() + oldSize, data.data(), data.size() );
 }
 
-void FileProvider::slotResult( KIO::Job *job )
+void FileProvider::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     tqDebug( "%s", job->errorText().latin1() );
diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h
index 679cd0a2b..c855416dc 100644
--- a/kode/kwsdl/schema/fileprovider.h
+++ b/kode/kwsdl/schema/fileprovider.h
@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -42,8 +42,8 @@ class FileProvider : TQObject
     void cleanUp();
 
   private slots:
-    void slotData( KIO::Job*, const TQByteArray& );
-    void slotResult( KIO::Job* );
+    void slotData( TDEIO::Job*, const TQByteArray& );
+    void slotResult( TDEIO::Job* );
 
   private:
     TQString mFileName;
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index 55d3c7a88..a37e5fc19 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -39,7 +39,7 @@ void Transport::query( const TQString &xml )
   TQDataStream stream( postData, IO_WriteOnly );
   stream.writeRawBytes( xml.utf8(), xml.utf8().length() );
   
-  KIO::TransferJob* job = KIO::http_post( KURL( mUrl ), postData, false );
+  TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
     kdWarning() << "Unable to create KIO job for " << mUrl << endl;
     return;
@@ -48,18 +48,18 @@ void Transport::query( const TQString &xml )
   job->addMetaData( "UserAgent", "KWSDL" );
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 }
 
-void Transport::slotData( KIO::Job*, const TQByteArray &data )
+void Transport::slotData( TDEIO::Job*, const TQByteArray &data )
 {
   unsigned int oldSize = mData.size();
   mData.resize( oldSize + data.size() );
   memcpy( mData.data() + oldSize, data.data(), data.size() );
 }
 
-void Transport::slotResult( KIO::Job* job )
+void Transport::slotResult( TDEIO::Job* job )
 {
   if ( job->error() != 0 ) {
     kdWarning() << "Error occurred " << job->errorText() << endl;
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index d07d246c0..0b5b49fa4 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -40,8 +40,8 @@ class Transport : public TQObject
     void result( const TQString &xml );
   
   private slots:
-    void slotData( KIO::Job*, const TQByteArray &data );
-    void slotResult( KIO::Job* job );
+    void slotData( TDEIO::Job*, const TQByteArray &data );
+    void slotResult( TDEIO::Job* job );
   
   private:
     TQString mUrl;
diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp
index 533279086..c353f28f8 100644
--- a/konsolekalendar/stdcalendar.cpp
+++ b/konsolekalendar/stdcalendar.cpp
@@ -54,7 +54,7 @@ StdCalendar::StdCalendar()
 
   mManager = resourceManager();
   if ( mManager->isEmpty() ) {
-    KConfig config( "korganizerrc" );
+    TDEConfig config( "korganizerrc" );
     config.setGroup( "General" );
     TQString fileName = config.readPathEntry( "Active Calendar" );
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 6e0abdfb8..863e75c6d 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -34,7 +34,7 @@ class DCOPClient;
 class DCOPObject;
 class TDEAboutData;
 class KAction;
-class KConfig;
+class TDEConfig;
 class TQWidget;
 namespace KParts { class ReadOnlyPart; }
 
@@ -250,12 +250,12 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     /**
      * Session management: read properties
      */
-    virtual void readProperties( KConfig * ) {}
+    virtual void readProperties( TDEConfig * ) {}
 
     /**
      * Session management: save properties
      */
-    virtual void saveProperties( KConfig * ) {}
+    virtual void saveProperties( TDEConfig * ) {}
 
     Core *core() const;
 
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index dae73e4b3..f59423099 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -115,7 +115,7 @@ TQStringList Plugin::configModules() const
     return modules;
 }
 
-void Plugin::readProperties( KConfig *config )
+void Plugin::readProperties( TDEConfig *config )
 {
     if ( part() ) {
         Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );    
@@ -123,7 +123,7 @@ void Plugin::readProperties( KConfig *config )
     }
 }
 
-void Plugin::saveProperties( KConfig *config )
+void Plugin::saveProperties( TDEConfig *config )
 {
     if ( part() ) {
         Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );    
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index bbc0063bc..657cbc4d7 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -65,8 +65,8 @@ class Plugin : public Kontact::Plugin
     virtual TQStringList configModules() const;
     virtual TQStringList invisibleToolbarActions() const;
     virtual bool isRunningStandalone();
-    virtual void readProperties( KConfig *config );
-    virtual void saveProperties( KConfig *config );
+    virtual void readProperties( TDEConfig *config );
+    virtual void saveProperties( TDEConfig *config );
 
   private slots:
     void showPart();
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index c9d467774..72141a6f1 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * )
   {
     return new KCMKMailSummary( parent, "kcmkmailsummary" );
   }
 }
 
 KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -125,7 +125,7 @@ void KCMKMailSummary::initFolders()
 
 void KCMKMailSummary::loadFolders()
 {
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList folders;
@@ -150,7 +150,7 @@ void KCMKMailSummary::loadFolders()
 
 void KCMKMailSummary::storeFolders()
 {
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList folders;
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index c5af05991..2a614c6ab 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_mail
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmailsummary
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index ae8792802..4e810ea37 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -33,7 +33,7 @@ class KListView;
 class TQCheckBox;
 class TQCheckListItem;
 
-class KCMKMailSummary : public KCModule
+class KCMKMailSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index e878ce1c2..0c4e765cf 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -104,7 +104,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList activeFolders;
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 48b6d3c8c..203055d5a 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * )
   {
     return new KCMKOrgSummary( parent, "kcmkorgsummary" );
   }
 }
 
 KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -135,7 +135,7 @@ void KCMKOrgSummary::initGUI()
 
 void KCMKOrgSummary::load()
 {
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
   int days = config.readNumEntry( "DaysToShow", 1 );
@@ -166,7 +166,7 @@ void KCMKOrgSummary::load()
 
 void KCMKOrgSummary::save()
 {
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index bb89934bc..4485a5143 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_date
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korgsummary
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 216557857..216e89d13 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -29,7 +29,7 @@
 class TQSpinxBox;
 class TQButtonGroup;
 
-class KCMKOrgSummary : public KCModule
+class KCMKOrgSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index bbd9be2b8..d12081d6c 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -85,7 +85,7 @@ void SummaryWidget::updateView()
 
   KIconLoader loader( "tdepim" );
 
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
   int days = config.readNumEntry( "DaysToShow", 1 );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index b0cbf7d93..26ce828eb 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -85,7 +85,7 @@ void TodoSummaryWidget::updateView()
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
   config.setGroup( "Todo" );
   bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false );
 
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0a059da3b..6e0efd0fc 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -49,7 +49,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * )
   {
     return new KCMKontactKNT( parent, "kcmkontactknt" );
   }
@@ -129,7 +129,7 @@ class NewsItem : public TQListViewItem
 };
 
 KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -175,7 +175,7 @@ void KCMKontactKNT::loadNews()
 
 void KCMKontactKNT::loadCustomNews()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   TQMap<TQString, TQString> customFeeds = config.entryMap( "CustomFeeds" );
   config.setGroup( "CustomFeeds" );
 
@@ -196,7 +196,7 @@ void KCMKontactKNT::loadCustomNews()
 
 void KCMKontactKNT::storeCustomNews()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.deleteGroup( "CustomFeeds" );
   config.setGroup( "CustomFeeds" );
 
@@ -409,7 +409,7 @@ void KCMKontactKNT::load()
   loadCustomNews();
   scanNews();
 
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   mUpdateInterval->setValue( config.readNumEntry( "UpdateInterval", 600 ) );
@@ -422,7 +422,7 @@ void KCMKontactKNT::save()
 {
   storeCustomNews();
 
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "UpdateInterval", mUpdateInterval->value() );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index b395d1313..5b4418c96 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=knode
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactknt
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index 0f9c15481..2eedb0a73 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -35,7 +35,7 @@ class KPushButton;
 
 class NewsItem;
 
-class KCMKontactKNT : public KCModule
+class KCMKontactKNT : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 8e6719fce..52bb8b6e4 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -105,7 +105,7 @@ void SummaryWidget::configChanged()
 
 void SummaryWidget::readConfig()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   mUpdateInterval = config.readNumEntry( "UpdateInterval", 600 );
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 4ce846d06..193958b89 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -43,14 +43,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * )
   {
     return new KCMSDSummary( parent, "kcmsdsummary" );
   }
 }
 
 KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -140,7 +140,7 @@ void KCMSDSummary::initGUI()
 
 void KCMSDSummary::load()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
   int days = config.readNumEntry( "DaysToShow", 7 );
@@ -181,7 +181,7 @@ void KCMSDSummary::load()
 
 void KCMSDSummary::save()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
 
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index dbed97243..c5b4f7dfa 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=cookie
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=sdsummary
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 9a4e56e51..b0dbbae9d 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -33,7 +33,7 @@ class TQSpinBox;
 
 class TDEAboutData;
 
-class KCMSDSummary : public KCModule
+class KCMSDSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index a36989304..4ab89a323 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -106,7 +106,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
 
   KCal::CalendarResourceManager *manager = mCalendar->resourceManager();
   if ( manager->isEmpty() ) {
-    KConfig config( "korganizerrc" );
+    TDEConfig config( "korganizerrc" );
     config.setGroup( "General" );
     TQString fileName = config.readPathEntry( "Active Calendar" );
 
@@ -139,7 +139,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
 
 void SDSummaryWidget::configUpdated()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
   mDaysAhead = config.readNumEntry( "DaysToShow", 7 );
@@ -166,7 +166,7 @@ void SDSummaryWidget::configUpdated()
 
 bool SDSummaryWidget::initHolidays()
 {
-  KConfig hconfig( "korganizerrc" );
+  TDEConfig hconfig( "korganizerrc" );
   hconfig.setGroup( "Time & Date" );
   TQString location = hconfig.readEntry( "Holidays" );
   if ( !location.isEmpty() ) {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f3eae0121..d880f153b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -43,7 +43,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) {
     return new KCMKontactSummary( parent, "kcmkontactsummary" );
   }
 }
@@ -91,7 +91,7 @@ PluginView::~PluginView()
 }
 
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -124,7 +124,7 @@ void KCMKontactSummary::load()
 
   TQStringList activeSummaries;
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   if ( !config.hasKey( "ActiveSummaries" ) ) {
     activeSummaries << "kontact_kaddressbookplugin";
     activeSummaries << "kontact_specialdatesplugin";
@@ -142,8 +142,8 @@ void KCMKontactSummary::load()
 
   mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" );
   KPluginInfo::List::Iterator it;
-  KConfig *conf = new KConfig("kontactrc");
-  KConfigGroup *cg = new KConfigGroup( conf, "Plugins" );
+  TDEConfig *conf = new TDEConfig("kontactrc");
+  TDEConfigGroup *cg = new TDEConfigGroup( conf, "Plugins" );
   for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) {
       (*it)->load( cg );
 
@@ -174,7 +174,7 @@ void KCMKontactSummary::save()
     ++it;
   }
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   config.writeEntry( "ActiveSummaries", activeSummaries );
 }
 
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index bb5e95d0b..34787c32d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_summary
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactsummary
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index fa1620452..6129f46a0 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -40,7 +40,7 @@ class PluginView : public KListView
     ~PluginView();
 };
 
-class KCMKontactSummary : public KCModule
+class KCMKontactSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index ba85836b2..b1da7d0fc 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -149,7 +149,7 @@ void SummaryViewPart::updateWidgets()
 
   TQStringList activeSummaries;
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   if ( !config.hasKey( "ActiveSummaries" ) ) {
     activeSummaries << "kontact_kmailplugin";
     activeSummaries << "kontact_specialdatesplugin";
@@ -392,7 +392,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
 
 void SummaryViewPart::loadLayout()
 {
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
 
   if ( !config.hasKey( "LeftColumnSummaries" ) ) {
     mLeftColumnSummaries << "kontact_korganizerplugin";
@@ -412,7 +412,7 @@ void SummaryViewPart::loadLayout()
 
 void SummaryViewPart::saveLayout()
 {
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
 
   config.writeEntry( "LeftColumnSummaries", mLeftColumnSummaries );
   config.writeEntry( "RightColumnSummaries", mRightColumnSummaries );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 9e46eef2d..96101ec00 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) {
     return new KcmKontact( parent, "kcmkontact" );
   }
 }
@@ -100,7 +100,7 @@ const TDEAboutData* KcmKontact::aboutData() const
 }
 
 
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent )
 {
   mItem = item;
   mPluginCombo = new TQComboBox( parent );
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index c15ecf048..6e0c402af 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -53,7 +53,7 @@ class PluginSelection : public KPrefsWid
   
 
   public:
-    PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
+    PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent );
     ~PluginSelection();
 
     void readConfig();
@@ -65,7 +65,7 @@ class PluginSelection : public KPrefsWid
   private:
     TQComboBox *mPluginCombo;
     TQValueList<KService::Ptr> mPluginList;
-    KConfigSkeleton::ItemString *mItem;
+    TDEConfigSkeleton::ItemString *mItem;
 };
 
 #endif
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index 6ea38e238..0c094d502 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -2,7 +2,7 @@
 Exec=kcmshell kontactconfig
 Icon=kontact
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontact
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 5ac040f73..8a6a7f354 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -338,7 +338,7 @@ void MainWindow::setupActions()
                                          KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
                                          actionCollection(), "action_new" );
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   cfg->setGroup( "Kontact Groupware Settings" );
   mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true );
 
@@ -371,7 +371,7 @@ void MainWindow::slotConfigureProfiles()
 }
 
 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 );
@@ -385,12 +385,12 @@ void MainWindow::slotSaveToProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   ::copyConfigEntry( cfg, &profile, "MainWindow Toolbar navigatorToolBar", "Hidden", "true" );
   ::copyConfigEntry( cfg, &profile, "View", "SidePaneSplitter" );
   ::copyConfigEntry( cfg, &profile, "Icons", "Theme" );
@@ -409,12 +409,12 @@ void MainWindow::slotLoadProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  const KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  const TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   const TQStringList groups = profile.groupList();
   for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it )
   {
@@ -1091,7 +1091,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
   }
 }
 
-void MainWindow::readProperties( KConfig *config )
+void MainWindow::readProperties( TDEConfig *config )
 {
   Core::readProperties( config );
 
@@ -1109,7 +1109,7 @@ void MainWindow::readProperties( KConfig *config )
   }
 }
 
-void MainWindow::saveProperties( KConfig *config )
+void MainWindow::saveProperties( TDEConfig *config )
 {
   Core::saveProperties( config );
 
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 90e9045bd..42b55420b 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -43,7 +43,7 @@ class TQVBox;
 class TQFrame;
 
 class KAction;
-class KConfig;
+class TDEConfig;
 class KPluginInfo;
 class KRSqueezedTextLabel;
 class KHTMLPart;
@@ -129,8 +129,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
     void setupActions();
     void showTip( bool );
     virtual bool queryClose();
-    virtual void readProperties( KConfig *config );
-    virtual void saveProperties( KConfig *config );
+    virtual void readProperties( TDEConfig *config );
+    virtual void saveProperties( TDEConfig *config );
     void paintAboutScreen( const TQString& msg );
     static TQString introductionString();
     KToolBar* findToolBar(const char* name);
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index c64cbf978..295f4615d 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -151,7 +151,7 @@ void Kontact::ProfileManager::writeConfig() const
 
 Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal )
 {
-    KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
+    TDEConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
     const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) );
     profileCfg.setGroup( "Kontact Profile" );
     const TQString id = profileCfg.readEntry( "Identifier" );
@@ -168,7 +168,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 {
     const TQString profileDir = profile.saveLocation();
     const TQString cfgPath = profileDir + "/profile.cfg";
-    KConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
+    TDEConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
     profileCfg.setGroup( "Kontact Profile" );
     profileCfg.writeEntry( "Identifier", profile.id() );
     profileCfg.writeEntry( "Name", profile.name() );
@@ -235,7 +235,7 @@ void Kontact::Profile::copyConfigFiles( const TQString& source_, const TQString&
 {
     const KURL source = KURL::fromPathOrURL( source_+"/*rc" );
     const KURL dest = KURL::fromPathOrURL( dest_ );
-    KIO::CopyJob* job = KIO::copy( source, dest, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, dest, /*showProgressInfo=*/false );
     // TODO better check for the copy result
 }
 
@@ -283,7 +283,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
     Kontact::Profile profile = profileById( id );
     if ( profile.isLocal() ) {
         KURL location = KURL::fromPathOrURL( profile.saveLocation() );
-        KIO::DeleteJob* job = KIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
+        TDEIO::DeleteJob* job = TDEIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
         // TODO check result
     }
     m_profiles.remove( id );
@@ -302,7 +302,7 @@ Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDir
     const KURL source = KURL::fromPathOrURL( profile.saveLocation() );
     const KURL target = KURL::fromPathOrURL( path + TQDir::separator() + profile.name() );
 
-    KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
     // TODO check result
 
     return SuccessfulExport;
@@ -319,7 +319,7 @@ Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromD
     const KURL source = KURL::fromPathOrURL( path );
     const KURL target = KURL::fromPathOrURL( profile.saveLocation() );
 
-    KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
     // TODO better check for the copy result
 
     addProfile( profile );
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 12ed57471..b72511f5c 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -31,7 +31,7 @@
 
 template <class T> class TQValueList;
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
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
 {
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index a791c53d4..477bab2ae 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -51,16 +51,16 @@ AccountManager::~AccountManager()
 	delete _dropInfo;
 }
 	
-void AccountManager::readConfig( KConfig* config, const int index )
+void AccountManager::readConfig( TDEConfig* config, const int index )
 {
-	KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).arg( index ) );
+	TDEConfigGroup *masterGroup = new TDEConfigGroup( config, TQString( "korn-%1" ).arg( index ) );
 	TQStringList dcop = masterGroup->readListEntry( "dcop", ',' );
-	KConfigGroup *accountGroup;
+	TDEConfigGroup *accountGroup;
 	int counter = 0;
 		
 	while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) )
 	{
-		accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
+		accountGroup = new TDEConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
 		
 		const Protocol *proto = Protocols::getProto( accountGroup->readEntry( "protocol" ) );
 		if( !proto )
@@ -139,7 +139,7 @@ void AccountManager::readConfig( KConfig* config, const int index )
 	setCount( totalMessages(), hasNewMessages() );
 }
 
-void AccountManager::writeConfig( KConfig* config, const int index )
+void AccountManager::writeConfig( TDEConfig* config, const int index )
 {
 	TQMap< KMailDrop*, Dropinfo* >::Iterator it;
 	for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it )
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index 5e7a03478..e28a85254 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -26,7 +26,7 @@ class KornSubjectsDlg;
 class KKioDrop;
 class KMailDrop;
 
-class KConfig;
+class TDEConfig;
 
 template< class T > class TQPtrList;
 template< class T, class W > class TQMap;
@@ -55,22 +55,22 @@ public:
 	/**
 	 * This function is used to read the config.
 	 *
-	 * @param config The KConfig instance to the configuration
+	 * @param config The TDEConfig instance to the configuration
 	 * @param index The index of the box. As there are different boxes,
 	 * every box have it's own index. This number is used to get the
 	 * right config-information out of the config parameter.
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 
 	/**
 	 * This write the configuration into a file. Things that must be right is
 	 * for example the reset number. The configuration isn't saved through this
 	 * method; configurations are saved in the configurations classes.
 	 *
-	 * @param config The KConfig instance to which the configuration is written.
+	 * @param config The TDEConfig instance to which the configuration is written.
 	 * @param index The index of the box.
 	 */
-	virtual void writeConfig( KConfig* config, const int index );
+	virtual void writeConfig( TDEConfig* config, const int index );
 	
 	/**
 	 * This method makes a TQString which can be used for a tooltip.
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 934a47c53..5e17c9479 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -36,7 +36,7 @@ BoxContainer::~BoxContainer()
 	delete _items;
 }
 
-void BoxContainer::readConfig( KConfig* config )
+void BoxContainer::readConfig( TDEConfig* config )
 {
 	int counter = 0;
 	while( config->hasGroup( TQString( "korn-%1" ).arg( counter ) ) )
@@ -49,7 +49,7 @@ void BoxContainer::readConfig( KConfig* config )
 	}
 }
 
-void BoxContainer::writeConfig( KConfig *config )
+void BoxContainer::writeConfig( TDEConfig *config )
 {
 	int index = 0;
 	
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index 765d28b18..e5f5a8f4c 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -25,7 +25,7 @@ class BoxContainerItem;
 
 template< class T > class TQPtrList;
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This class is the base for all BoxContainers. A BoxContainer is a place
@@ -48,18 +48,18 @@ public:
 	~BoxContainer();
 	
 	/**
-	 * This method reads the config from a certain KConfig instance.
+	 * This method reads the config from a certain TDEConfig instance.
 	 *
-	 * @param config The KConfig-instance to read the config from.
+	 * @param config The TDEConfig-instance to read the config from.
 	 */
-	void readConfig( KConfig* config );
+	void readConfig( TDEConfig* config );
 
 	/**
-	 * This method writes the config to a certain KConfig instance.
+	 * This method writes the config to a certain TDEConfig instance.
 	 *
-	 * @param config The KConfig-instance to write the config to.
+	 * @param config The TDEConfig-instance to write the config to.
 	 */
-	void writeConfig( KConfig *config );
+	void writeConfig( TDEConfig *config );
 	
 	/**
 	 * Shows all childs and itself
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 60277d1ed..3fea65f3e 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -78,7 +78,7 @@ BoxContainerItem::~BoxContainerItem()
 	delete _command;
 }
 	
-void BoxContainerItem::readConfig( KConfig* config, const int index )
+void BoxContainerItem::readConfig( TDEConfig* config, const int index )
 {
 	//Read information about how the thing have to look like
 	config->setGroup( TQString( "korn-%1" ).arg( index ) );
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index f903feb8e..8672e4309 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -25,7 +25,7 @@
 class KornMailSubject;
 
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class TDEProcess;
 
@@ -70,10 +70,10 @@ public:
 	/**
 	 * This function reads the config. It stores the readed values in the class.
 	 * It also sets the DCOPObject-name.
-	 * @param config The KConfigGroup-object which contains the configuration of this box.
+	 * @param config The TDEConfigGroup-object which contains the configuration of this box.
 	 * @param index The index of the box used in the config-file
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 
 public slots:
 	/**
diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp
index d1f27a616..41ab8c9d1 100644
--- a/korn/dcop_proto.cpp
+++ b/korn/dcop_proto.cpp
@@ -29,12 +29,12 @@
 #include <tqptrlist.h>
 #include <tqptrvector.h>
 
-KMailDrop* DCOP_Protocol::createMaildrop( KConfigGroup* ) const
+KMailDrop* DCOP_Protocol::createMaildrop( TDEConfigGroup* ) const
 {
 	return new DCOPDrop();
 }
 
-TQMap< TQString, TQString > * DCOP_Protocol::createConfig( KConfigGroup* config, const TQString& ) const
+TQMap< TQString, TQString > * DCOP_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap< TQString, TQString >;
 
diff --git a/korn/dcop_proto.h b/korn/dcop_proto.h
index a485e08d8..18e01e997 100644
--- a/korn/dcop_proto.h
+++ b/korn/dcop_proto.h
@@ -23,7 +23,7 @@
 #include "protocol.h"
 
 class AccountInput;
-class KConfigGroup;
+class TDEConfigGroup;
 class KIO_Protocol;
 class KMailDrop;
 class Protocol;
@@ -60,19 +60,19 @@ public:
 	 * This function returns a Protocol pointer given a configuration.
 	 * This function always returns itselfs, as the configuration never uses another protocol.
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* ) const { return this; }
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const { return this; }
 	/**
 	 * This function creates the maildrop used to count dcop-messages.
 	 * @param config The configuration
 	 */
-	virtual KMailDrop* createMaildrop( KConfigGroup* config ) const;
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const;
 	/**
 	 * The function converts the information of the configuration file into a mapping.
 	 *
 	 * @param config The configuration instance to be mapped
 	 * @return The keys and values of the configuration in a mapping
 	 */
-	virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& passwd ) const;
+	virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& passwd ) const;
 	/**
 	 * This return the name of this protocol. It is always "dcop".
 	 * @return The name of this protocol: "dcop"
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 407a6ff06..cdeccd6b1 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -67,7 +67,7 @@ bool DCOPDrop::stopMonitor()
 	return true;
 }
 
-bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg )
+bool DCOPDrop::readConfigGroup( const TDEConfigGroup &cfg )
 {
 	return KMailDrop::readConfigGroup( cfg );
 }
@@ -83,7 +83,7 @@ bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 	return true;
 }
 
-bool DCOPDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool DCOPDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KMailDrop::writeConfigGroup( cfg );
 
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index ed695372f..cd3cd7908 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -28,7 +28,7 @@ class DCOPDropInterface;
 class KornMailId;
 class KornMailSubject;
 
-class KConfigBase;
+class TDEConfigBase;
 
 template<class A, class B> class TQMap;
 class TQString;
@@ -97,7 +97,7 @@ public:
 	 * @param config The configuration group which contains the info for this account.
 	 * @return The same value as KMailDrop::readConfigGroup( config ) returns.
 	 */
-	virtual bool readConfigGroup( const KConfigGroup& config );
+	virtual bool readConfigGroup( const TDEConfigGroup& config );
 	/**
 	 * This function also reeds the configurion, but from a mapping.
 	 *
@@ -113,7 +113,7 @@ public:
 	 * @param config The configuration to write true
 	 * @return true if no error occured.
 	 */
-	virtual bool writeConfigGroup( KConfigBase& config ) const;
+	virtual bool writeConfigGroup( TDEConfigBase& config ) const;
 	/**
 	 * This returns the type of the box, in this case allways "dcop".
 	 *
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 9d30717f0..fac1cc479 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -57,7 +57,7 @@ void DockedItem::showBox()
 	_systemtray->show();
 }
 	
-void DockedItem::readConfig( KConfig* config, const int index )
+void DockedItem::readConfig( TDEConfig* config, const int index )
 {
 	BoxContainerItem::readConfig( config, index );
 	
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index ddb6b0d79..e375bb97d 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -23,7 +23,7 @@
 
 class SystemTray;
 
-class KConfig;
+class TDEConfig;
 
 class TQPixmap;
 
@@ -58,10 +58,10 @@ public:
 	 * This functions reads the config. It used the parent
 	 * version for the main things, but it is possible to
 	 * add some configurations over here.
-	 * @param config The KConfig-instance which contains the settings of this tray-item.
+	 * @param config The TDEConfig-instance which contains the settings of this tray-item.
 	 * @param index The index of the box in the configuration file
 	 */
-	virtual void readConfig( KConfig* config, const int index );
+	virtual void readConfig( TDEConfig* config, const int index );
 	
 public slots:	
 	/**
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 97fb209ad..3310da1b8 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -103,9 +103,9 @@ public:
 	 * In this case, "unseen" is added to the query to only list unlees kurls.
 	 * These function are called in kio_*.cpp
 	 */
-	virtual void recheckKURL    ( KURL &kurl, KIO::MetaData & ) const { kurl.setQuery( "unseen" ); }
-	virtual void readSubjectKURL( KURL &kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); }
-	virtual void deleteMailConnectKURL( KURL &, KIO::MetaData & metadata ) const { metadata.insert( "expunge", "auto" ); }
+	virtual void recheckKURL    ( KURL &kurl, TDEIO::MetaData & ) const { kurl.setQuery( "unseen" ); }
+	virtual void readSubjectKURL( KURL &kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); }
+	virtual void deleteMailConnectKURL( KURL &, TDEIO::MetaData & metadata ) const { metadata.insert( "expunge", "auto" ); }
 	
 	/**
 	 * This functions gives a list of names of groupboxes which are to be set in the configuration.
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index d3dce86e0..83b402031 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -65,7 +65,7 @@ KEditListBoxManager::~KEditListBoxManager()
 	delete _groupName;
 }
 
-void KEditListBoxManager::setConfig( KConfig* config )
+void KEditListBoxManager::setConfig( TDEConfig* config )
 {
 	_config = config;
 	if( _groupName )
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index 3c213c3c3..81acca899 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -21,7 +21,7 @@
 
 #include <keditlistbox.h>
 
-class KConfig;
+class TDEConfig;
 
 class TQString;
 class TQWidget;
@@ -63,10 +63,10 @@ public:
 	
 	
 	/** 
-	 * Set the KConfig object (required before doing something
-	 * @param config The KConfig-object
+	 * Set the TDEConfig object (required before doing something
+	 * @param config The TDEConfig-object
 	 */
-	void setConfig( KConfig* config );
+	void setConfig( TDEConfig* config );
 	/**
 	 * Sets the groupName. groupName should contain at least one %1.
 	 * It is used for makeing groupnames.
@@ -92,7 +92,7 @@ private:
 	 */
 	void readNames();
 private:
-	KConfig *_config; //Stores the KConfig-object
+	TDEConfig *_config; //Stores the TDEConfig-object
 	TQString *_groupName; //Stores the groupName string.
 	TQString *_subGroupName;
 	int _prevCount;
@@ -138,7 +138,7 @@ signals:
 	 * @param index The number of the item.
 	 * this config is already in the right group.
 	 */
-	void setDefaults( const TQString& name, const int index, KConfig* config );
+	void setDefaults( const TQString& name, const int index, TDEConfig* config );
 
 	void elementsSwapped( int, int );
 	void elementDeleted( int );
diff --git a/korn/kio.cpp b/korn/kio.cpp
index a21311980..63a9dc683 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -90,7 +90,7 @@ KKioDrop::KKioDrop()
 	_mailurls( 0 )
 {
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 
 	//Initialising protocol; if no protocol is set before first use, it will use the first protocol
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
@@ -112,7 +112,7 @@ KKioDrop::KKioDrop()
 	_mailurls = new TQValueList<FileInfo>;
 }
 
-KKioDrop::KKioDrop( KConfigGroup* )
+KKioDrop::KKioDrop( TDEConfigGroup* )
 	: KPollableDrop(),
 	_kurl( 0 ),
 	_metadata( 0 ),
@@ -128,7 +128,7 @@ KKioDrop::KKioDrop( KConfigGroup* )
 	_mailurls( 0 )
 {
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 
 	//Initialising protocol; if no protocol is set before first use, it will use the first protocol
 	_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
@@ -154,11 +154,11 @@ KKioDrop::KKioDrop( KConfigGroup* )
 
 void KKioDrop::setKioServer( const TQString & proto, const TQString & server, int port )
 {
-	 //Settings default for last vars; could not inline because KIO::MetaData-object is not defined in header.
-	setKioServer( proto, server, port, KIO::MetaData(), false, true );
+	 //Settings default for last vars; could not inline because TDEIO::MetaData-object is not defined in header.
+	setKioServer( proto, server, port, TDEIO::MetaData(), false, true );
 }
 
-void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const KIO::MetaData metadata, bool ssl,
+void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const TDEIO::MetaData metadata, bool ssl,
 		            bool setProtocol )
 {
 	TQString auth;
@@ -351,7 +351,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 		_protocol = Protocols::firstProtocol()->getKIOProtocol();
 			
 	val = *map.find( "server" );
-	setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false );
+	setKioServer( val2, val, (*map.find( "port" )).toInt(), TDEIO::MetaData(), *map.find( "ssl" ) == "true", false );
 
 	_kurl->setUser( *map.find( "username" ) );
 	_kurl->setPath( *map.find( "mailbox" ) );
@@ -373,7 +373,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 	return true;
 }
 
-bool KKioDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool KKioDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KPollableDrop::writeConfigGroup( cfg );
 	/*TQString p;
@@ -431,9 +431,9 @@ void KKioDrop::deleteMailsCanceled()
 //Private slots for displaying connection errors
 void KKioDrop::slotConnectionError( int number, const TQString& arg )
 {
-	kdError() << KIO::buildErrorString( number, arg ) << endl;
+	kdError() << TDEIO::buildErrorString( number, arg ) << endl;
 //	if( passivePopup() )
-		emitShowPassivePopup( KIO::buildErrorString( number, arg ) );
+		emitShowPassivePopup( TDEIO::buildErrorString( number, arg ) );
 }
 
 void KKioDrop::slotConnectionWarning( const TQString& msg )
diff --git a/korn/kio.h b/korn/kio.h
index 519dced5f..a2ac796a2 100644
--- a/korn/kio.h
+++ b/korn/kio.h
@@ -34,11 +34,11 @@ class KIO_Protocol;
 class KIO_Subjects;
 class KIO_Read;
 class KIO_Delete;
-class KConfigGroup;
+class TDEConfigGroup;
 class KURL;
 template<class> class TQPtrList;
 template<class> class TQValueList;
-namespace KIO { class Job; class MetaData; class Slave; class TransferJob; }
+namespace TDEIO { class Job; class MetaData; class Slave; class TransferJob; }
 
 /**
  * Polling monitor for IMAP4 maildrops.
@@ -53,7 +53,7 @@ class KKioDrop : public KPollableDrop
   
 private:
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 
 	TQString _password;
 	
@@ -104,14 +104,14 @@ public:
 	* KKioDrop Constructor
 	*/
 	KKioDrop();
-	KKioDrop( KConfigGroup* );
+	KKioDrop( TDEConfigGroup* );
 
 	/** 
 	  * Set the server that will be checked for new mail.
 	 */
 	void setKioServer( const TQString & proto, const TQString & server, int port = -1 );
 	void setKioServer( const TQString & proto, const TQString & server, int port,
-	                   const KIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol
+	                   const TDEIO::MetaData metadata, bool ssl, bool setProtocol = true ); //Last argument inits _protocol
 
 	/** Set the account information for the PROTO server. */
 	void setUser( const TQString & user, const TQString & password, const TQString & mailbox, const TQString & auth );
@@ -147,7 +147,7 @@ public:
 	
 	virtual KMailDrop* clone () const ;
 	virtual bool readConfigGroup ( const TQMap< TQString, TQString >& map, const Protocol * protocol );
-	virtual bool writeConfigGroup ( KConfigBase& cfg ) const;
+	virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const;
 	virtual TQString type() const { return TQString::fromUtf8("kio"); }
 	
 	virtual bool synchrone() const { return false; } //class is not synchrone
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index a1f8e825c..bea6bf196 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -70,11 +70,11 @@ void KIO_Count::count( KKioDrop *drop )
 	 * these are saved in the class.
 	 */
 	_kurl = new KURL( *_kio->_kurl );
-	_metadata = new KIO::MetaData( *_kio->_metadata );
+	_metadata = new TDEIO::MetaData( *_kio->_metadata );
 	_protocol = _kio->_protocol;
 
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 
 	// Serup a connection
 	if( _protocol->connectionBased( ) )
@@ -84,7 +84,7 @@ void KIO_Count::count( KKioDrop *drop )
 		if( kurl.port() == 0 )
 			kurl.setPort( _protocol->defaultPort( _kio->_ssl ) );
 
-		if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload
+		if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload
 		{
 			kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl;
 			_kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) );
@@ -122,17 +122,17 @@ void KIO_Count::count( KKioDrop *drop )
 
 	//Making job to fetch file-list
 	
-	_job = KIO::listDir( kurl, false );
+	_job = TDEIO::listDir( kurl, false );
 	_job->addMetaData( metadata );
 
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	         this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	         this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	if( _protocol->connectionBased() )
-		KIO::Scheduler::assignJobToSlave( _slave, _job );
+		TDEIO::Scheduler::assignJobToSlave( _slave, _job );
 	else
-		KIO::Scheduler::scheduleJob( _job );
+		TDEIO::Scheduler::scheduleJob( _job );
 }
 
 void KIO_Count::stopActiveCount()
@@ -140,16 +140,16 @@ void KIO_Count::stopActiveCount()
 	if( !_new_mailurls )
 		return;
 
-	disconnect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	disconnect( _job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
-	KIO::Scheduler::cancelJob( _job );
+	TDEIO::Scheduler::cancelJob( _job );
 
 	if( _slave )
 	{
 		//Slave seems to be disconnected by canceling the last job of the slave
-		//KIO::Scheduler::disconnectSlave( _slave );
+		//TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 
@@ -163,9 +163,9 @@ void KIO_Count::stopActiveCount()
 void KIO_Count::showPassive( const TQString& id )
 {
 	KURL kurl = *_kio->_kurl;
-	KIO::MetaData metadata = *_kio->_metadata;
+	TDEIO::MetaData metadata = *_kio->_metadata;
 	kurl = id;
-	//KIO::Slave *slave = 0;
+	//TDEIO::Slave *slave = 0;
 
 	_kio->_protocol->readSubjectKURL( kurl, metadata );
 	if( kurl.port() == 0 )
@@ -191,13 +191,13 @@ void KIO_Count::disconnectSlave()
 		return; //Slave doens't exist
 
 	//Disconnect slave
-	KIO::Scheduler::disconnectSlave( _slave );
+	TDEIO::Scheduler::disconnectSlave( _slave );
 	_slave = 0;
 	_protocol = 0;
 }
 
 //This function is called when fetching is over
-void KIO_Count::result( KIO::Job* job )
+void KIO_Count::result( TDEIO::Job* job )
 {
 	//job should be the latest job; elsewise: print an error.
 	if( job != _job )
@@ -213,9 +213,9 @@ void KIO_Count::result( KIO::Job* job )
 		_kio->emitValidChanged();
 	}
 
-	disconnect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( result( KIO::Job* ) ) );
-	disconnect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+	disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	disconnectSlave();
 
@@ -240,12 +240,12 @@ void KIO_Count::result( KIO::Job* job )
 }
 
 //An file list is ready; now save it in _kio->_mailurls.
-void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
+void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list )
 {
 	TQStringList old_list;
-	KIO::UDSEntryListConstIterator  it1 ;
-	KIO::UDSEntry::ConstIterator it2 ;
-	KIO::MetaData metadata;
+	TDEIO::UDSEntryListConstIterator  it1 ;
+	TDEIO::UDSEntry::ConstIterator it2 ;
+	TDEIO::MetaData metadata;
 	KURL kurl;
 	bool isFile;
 
@@ -269,12 +269,12 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 
 		for ( it2 = (*it1).begin() ; it2 != (*it1).end() ; it2++ )
 		{
-			if( (*it2).m_uds == KIO::UDS_FILE_TYPE &&
+			if( (*it2).m_uds == TDEIO::UDS_FILE_TYPE &&
 			    ((long)(*it2).m_long & S_IFREG ) )
 				isFile=true;
-			else if( (*it2).m_uds == KIO::UDS_URL )
+			else if( (*it2).m_uds == TDEIO::UDS_URL )
 				fileinfo.name = (*it2).m_str;
-			else if( (*it2).m_uds == KIO::UDS_NAME )
+			else if( (*it2).m_uds == TDEIO::UDS_NAME )
 			{ //The file kioslave doesn't return UDS_URL.
 				kurl = *_kurl;
 				metadata = *_metadata;
@@ -282,7 +282,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 				kurl.setPath ( kurl.path() + '/' + (*it2).m_str );
 				fileinfo.name = kurl.url();
 			}
-			else if( (*it2).m_uds == KIO::UDS_SIZE )
+			else if( (*it2).m_uds == TDEIO::UDS_SIZE )
 			{
 				fileinfo.size = (*it2).m_long;
 			}
diff --git a/korn/kio_count.h b/korn/kio_count.h
index 93222a700..9b44e1ca9 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -35,7 +35,7 @@ class KornMailSubject;
 class SortedMailSubject;
 
 template<class T> class TQValueList;
-namespace KIO { class Job; class ListJob; class MetaData; class Slave; }
+namespace TDEIO { class Job; class ListJob; class MetaData; class Slave; }
 
 class KURL;
 
@@ -57,10 +57,10 @@ public:
 	void stopActiveCount();
 private:
 	KKioDrop *_kio;
-	KIO::ListJob *_job;
-	KIO::Slave *_slave;
+	TDEIO::ListJob *_job;
+	TDEIO::Slave *_slave;
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 	const KIO_Protocol *_protocol;
 	bool _valid;
 	TQValueList<KKioDrop::FileInfo> *_new_mailurls; //entries can come with more function calls.
@@ -72,8 +72,8 @@ private:
 	void disconnectSlave();
 	
 private slots:
-	void result( KIO::Job* );
-	void entries( KIO::Job*, const KIO::UDSEntryList &list );
+	void result( TDEIO::Job* );
+	void entries( TDEIO::Job*, const TDEIO::UDSEntryList &list );
 	
 	void addtoPassivePopup( KornMailSubject* );
 	void deleteSingleSubject( KIO_Single_Subject* );
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index db27e28d9..17eec2f53 100644
--- a/korn/kio_delete.cpp
+++ b/korn/kio_delete.cpp
@@ -39,7 +39,7 @@ KIO_Delete::KIO_Delete( TQObject * parent, const char * name ) : TQObject( paren
 	_slave( 0 ),
 	_valid( true )
 {
-	_jobs = new TQPtrList< KIO::Job >;
+	_jobs = new TQPtrList< TDEIO::Job >;
 }
 
 KIO_Delete::~KIO_Delete( )
@@ -51,7 +51,7 @@ KIO_Delete::~KIO_Delete( )
 bool KIO_Delete::deleteMails( TQPtrList< const KornMailId > * ids, KKioDrop *drop )
 {
 	KURL kurl = *drop->_kurl;
-	KIO::MetaData metadata = *drop->_metadata;
+	TDEIO::MetaData metadata = *drop->_metadata;
 		
 	_kio = drop;
 	_valid = true;
@@ -93,19 +93,19 @@ void KIO_Delete::disConnect( )
 
 	if( _slave )
 	{
-		KIO::Scheduler::disconnectSlave( _slave );
+		TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 }
 
-bool KIO_Delete::setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+bool KIO_Delete::setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
 	protocol->deleteMailConnectKURL( kurl, metadata );
 	
 	if( kurl.port() == 0 )
 		kurl.setPort( protocol->defaultPort( _kio->_ssl ) );
 		
-	if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
+	if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
 	{
 		kdWarning() << i18n( "Could not get a connected slave; I cannot delete this way..." ) << endl;
 		_valid = false;
@@ -115,9 +115,9 @@ bool KIO_Delete::setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protoc
 	return true;
 }
 
-void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
-	KIO::Job* job = 0;
+	TDEIO::Job* job = 0;
 
 	kurl = dynamic_cast<const KornStringId*>( item )->getId();
 	
@@ -128,47 +128,47 @@ void KIO_Delete::deleteItem( const KornMailId *item, KURL kurl, KIO::MetaData me
 		
 	if( protocol->deleteFunction() == KIO_Protocol::get )
 	{
-		job = KIO::get( kurl, true, false );
+		job = TDEIO::get( kurl, true, false );
 		
 		if( protocol->connectionBased() )
-			KIO::Scheduler::assignJobToSlave( _slave, dynamic_cast< KIO::SimpleJob* >( job ) );
+			TDEIO::Scheduler::assignJobToSlave( _slave, dynamic_cast< TDEIO::SimpleJob* >( job ) );
 		else
-			KIO::Scheduler::scheduleJob( dynamic_cast< KIO::SimpleJob* >( job ) );
+			TDEIO::Scheduler::scheduleJob( dynamic_cast< TDEIO::SimpleJob* >( job ) );
 	}
 	else if( protocol->deleteFunction() == KIO_Protocol::del )
 	{
-		job = KIO::del( kurl, false, false );
+		job = TDEIO::del( kurl, false, false );
 	}
 	else
 		return; //Unknown deleteFunction
 		
-	connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 		
 	job->addMetaData( metadata );
 	
-	_jobs->append( dynamic_cast< KIO::Job* >( job ) );
+	_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
 }
 
 /*
  * Some protocols needs to a command to commit protocols.
  */
-void KIO_Delete::commitDelete( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol )
+void KIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol )
 {
 	protocol->deleteCommitKURL( kurl, metadata );
 	
 	if( kurl.port() == 0 )
 		kurl.setPort( protocol->defaultPort( _kio->_ssl ) );
 	
-	KIO::TransferJob *job = KIO::get( kurl, true, false );
+	TDEIO::TransferJob *job = TDEIO::get( kurl, true, false );
 	job->addMetaData( metadata );
-	connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
 	
-	_jobs->append( dynamic_cast< KIO::Job* >( job ) );
+	_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
 	
 	if( protocol->connectionBased() )
-		KIO::Scheduler::assignJobToSlave( _slave, job );
+		TDEIO::Scheduler::assignJobToSlave( _slave, job );
 	else
-		KIO::Scheduler::scheduleJob( job );
+		TDEIO::Scheduler::scheduleJob( job );
 
 	_total++;
 }
@@ -178,7 +178,7 @@ void KIO_Delete::canceled( )
 	disConnect( );
 }
 
-void KIO_Delete::slotResult( KIO::Job* job )
+void KIO_Delete::slotResult( TDEIO::Job* job )
 {
 	if( job->error() )
 	{
diff --git a/korn/kio_delete.h b/korn/kio_delete.h
index d900d508d..c084a58de 100644
--- a/korn/kio_delete.h
+++ b/korn/kio_delete.h
@@ -30,7 +30,7 @@ class KIO_Protocol;
 class KornMailId;
 
 class KURL;
-namespace KIO { class MetaData; class Job; class Slave; }
+namespace TDEIO { class MetaData; class Job; class Slave; }
 
 template<class T> class TQPtrList;
 
@@ -52,18 +52,18 @@ public slots:
 	//If this slot is called, the whole deletion is canceled.
 	void canceled( );
 private slots:
-	void slotResult( KIO::Job* );
+	void slotResult( TDEIO::Job* );
 	
 private:
 	void disConnect( );
-	bool setupSlave( KURL kurl, KIO::MetaData metadata, const KIO_Protocol *& protocol );
-	void deleteItem( const KornMailId *item, KURL, KIO::MetaData, const KIO_Protocol *&);
-	void commitDelete( KURL, KIO::MetaData, const KIO_Protocol *& );
+	bool setupSlave( KURL kurl, TDEIO::MetaData metadata, const KIO_Protocol *& protocol );
+	void deleteItem( const KornMailId *item, KURL, TDEIO::MetaData, const KIO_Protocol *&);
+	void commitDelete( KURL, TDEIO::MetaData, const KIO_Protocol *& );
 
 	KKioDrop *_kio;
 	unsigned int _total;
-	TQPtrList< KIO::Job > *_jobs;
-	KIO::Slave *_slave;
+	TQPtrList< TDEIO::Job > *_jobs;
+	TDEIO::Slave *_slave;
 	bool _valid;
 };
 
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index 8434fe44b..c6d2184df 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -24,7 +24,7 @@
 
 #include <tqmap.h>
 
-TQMap< TQString, TQString >* KIO_Protocol::createConfig( KConfigGroup * group, const TQString& password ) const
+TQMap< TQString, TQString >* KIO_Protocol::createConfig( TDEConfigGroup * group, const TQString& password ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap< TQString, TQString >;
 
diff --git a/korn/kio_proto.h b/korn/kio_proto.h
index 77a108940..e97b01128 100644
--- a/korn/kio_proto.h
+++ b/korn/kio_proto.h
@@ -54,11 +54,11 @@ public:
 	/**
 	 * This are the implementation of the Protocol-functions
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* ) const { return this; }
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const { return this; }
 
-	virtual KMailDrop* createMaildrop( KConfigGroup* config ) const { return new KKioDrop( config ); }
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const { return new KKioDrop( config ); }
 
-	virtual TQMap< TQString, TQString >* createConfig( KConfigGroup *group, const TQString& password ) const;
+	virtual TQMap< TQString, TQString >* createConfig( TDEConfigGroup *group, const TQString& password ) const;
 
 	/*
 	 * @return: the name of the kio_slave
@@ -104,7 +104,7 @@ public:
 
 	/*
 	 * The next function returns the method of deleting: some protoocols
-	 * like to delete files with KIO::get; other with KIO::del
+	 * like to delete files with TDEIO::get; other with TDEIO::del
 	 */
 	virtual DeleteTypeEnum deleteFunction() const { return del; }
 
@@ -128,15 +128,15 @@ public:
 	 * deleteCommitKURL is the KURL manipulator; the KURL is as in the settings.
 	 * That KURL isn't retouch by deleteMailKURL.
 	 */
-	virtual void recheckConnectKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void recheckKURL     ( KURL &, KIO::MetaData & ) const { };
-	virtual void readSubjectConnectKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "" ); }
-	virtual void readSubjectKURL ( KURL &, KIO::MetaData & ) const { } //For editing a kurl (adding extra options)
-	virtual void deleteMailConnectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "" ); }
-	virtual void deleteMailKURL  ( KURL &, KIO::MetaData & ) const { }
+	virtual void recheckConnectKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void recheckKURL     ( KURL &, TDEIO::MetaData & ) const { };
+	virtual void readSubjectConnectKURL ( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "" ); }
+	virtual void readSubjectKURL ( KURL &, TDEIO::MetaData & ) const { } //For editing a kurl (adding extra options)
+	virtual void deleteMailConnectKURL( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "" ); }
+	virtual void deleteMailKURL  ( KURL &, TDEIO::MetaData & ) const { }
 	virtual bool commitDelete() const { return false; }
-	virtual void deleteCommitKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void readMailKURL    ( KURL &, KIO::MetaData & ) const { }
+	virtual void deleteCommitKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void readMailKURL    ( KURL &, TDEIO::MetaData & ) const { }
 
 
 	virtual const KIO_Protocol* getKIOProtocol() const { return this; }
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index b92da304c..0e77e1a71 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -51,17 +51,17 @@ void KIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop )
 {
 	_kio = drop;
 	KURL kurl = *_kio->_kurl;
-	KIO::MetaData metadata = *_kio->_metadata;
+	TDEIO::MetaData metadata = *_kio->_metadata;
 	
 	kurl = dynamic_cast<const KornStringId*>(mailid)->getId( );
 	
 	_kio->_protocol->readMailKURL( kurl, metadata );
 	
-	_job = KIO::get( kurl, false, false );
+	_job = TDEIO::get( kurl, false, false );
 	_job->addMetaData( metadata );
 	
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
 }
 
 void KIO_Read::canceled( )
@@ -71,7 +71,7 @@ void KIO_Read::canceled( )
 	_job = 0;
 }
 
-void KIO_Read::slotResult( KIO::Job* job )
+void KIO_Read::slotResult( TDEIO::Job* job )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl;
@@ -85,7 +85,7 @@ void KIO_Read::slotResult( KIO::Job* job )
 	_job = 0;
 }
 
-void KIO_Read::slotData( KIO::Job* job, const TQByteArray & data )
+void KIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl;
diff --git a/korn/kio_read.h b/korn/kio_read.h
index 41f212da4..3b1ddec8e 100644
--- a/korn/kio_read.h
+++ b/korn/kio_read.h
@@ -27,7 +27,7 @@ class KKioDrop;
 class KornMailId;
 
 class KURL;
-namespace KIO { class MetaData; class Job; }
+namespace TDEIO { class MetaData; class Job; }
 class KIO_Protocol;
 
 class TQString;
@@ -46,7 +46,7 @@ public slots:
 	void canceled();
 private:
 	KKioDrop *_kio;
-	KIO::Job *_job;
+	TDEIO::Job *_job;
 	TQString *_message;
 	
 signals:
@@ -54,8 +54,8 @@ signals:
 	void ready( TQString* );
 	
 private slots:
-	void slotResult( KIO::Job* );
-	void slotData( KIO::Job*, const TQByteArray& );
+	void slotResult( TDEIO::Job* );
+	void slotData( TDEIO::Job*, const TQByteArray& );
 };
 
 #endif //MK_KIO_READ_H
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 02a6a103d..45ca047fc 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -36,12 +36,12 @@
 #include <tqstring.h>
 
 KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
-		    KURL &kurl, KIO::MetaData &metadata, const KIO_Protocol * protocol, KIO::Slave *& slave,
+		    KURL &kurl, TDEIO::MetaData &metadata, const KIO_Protocol * protocol, TDEIO::Slave *& slave,
 		    const TQString &url, const long size ) 
 		: TQObject( parent, name )
 {
 	_kurl = new KURL( kurl );
-	_metadata = new KIO::MetaData( metadata );
+	_metadata = new TDEIO::MetaData( metadata );
 	_protocol = protocol;
 	_name = new TQString( url );
 	_size = size;
@@ -53,26 +53,26 @@ KIO_Single_Subject::KIO_Single_Subject( TQObject * parent, const char * name,
 KIO_Single_Subject::~KIO_Single_Subject( )
 {
 	if( _job )
-		KIO::Scheduler::cancelJob( _job );
+		TDEIO::Scheduler::cancelJob( _job );
 	delete _kurl;
 	delete _metadata;
 	delete _name;
 	delete _message;
 }
 
-void KIO_Single_Subject::init( KIO::Slave *& slave)
+void KIO_Single_Subject::init( TDEIO::Slave *& slave)
 {
-	_job = KIO::get( *_kurl, false, false );
+	_job = TDEIO::get( *_kurl, false, false );
 	_job->addMetaData( *_metadata );
 	
-	connect( _job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data         (KIO::Job *, const TQByteArray &) ),
-	         this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) );
+	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQT_SIGNAL( data         (TDEIO::Job *, const TQByteArray &) ),
+	         this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
 	
 	if( _protocol->connectionBased( ) && slave )
-		KIO::Scheduler::assignJobToSlave( slave , _job );
+		TDEIO::Scheduler::assignJobToSlave( slave , _job );
 	else
-		KIO::Scheduler::scheduleJob( _job );
+		TDEIO::Scheduler::scheduleJob( _job );
 		 
 }
 
@@ -122,7 +122,7 @@ void KIO_Single_Subject::parseMail( TQString * message, KornMailSubject *subject
 	subject->setHeader( *message, fullMessage );
 }
 
-void KIO_Single_Subject::slotData( KIO::Job* job, const TQByteArray& data )
+void KIO_Single_Subject::slotData( TDEIO::Job* job, const TQByteArray& data )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl;
@@ -130,8 +130,8 @@ void KIO_Single_Subject::slotData( KIO::Job* job, const TQByteArray& data )
 		_message->append( data );
 }
 
-//KIO::Scheduler::disconnectSlave missing  if connection stops
-void KIO_Single_Subject::slotResult( KIO::Job *job )
+//TDEIO::Scheduler::disconnectSlave missing  if connection stops
+void KIO_Single_Subject::slotResult( TDEIO::Job *job )
 {
 	if( job != _job )
 		kdWarning() << i18n( "Got invalid job; something strange happened?" ) << endl;
diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h
index cba3a639a..9aac8baae 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -27,7 +27,7 @@
 class KornMailSubject;
 
 class KURL;
-namespace KIO { class MetaData; class Job; class TransferJob; class Slave; }
+namespace TDEIO { class MetaData; class Job; class TransferJob; class Slave; }
 class KIO_Protocol;
 
 class TQString;
@@ -36,8 +36,8 @@ class KIO_Single_Subject : public TQObject
 { Q_OBJECT
   
 public:
-	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *,
-	                    KIO::Slave *&, const TQString &, const long );
+	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, TDEIO::MetaData &, const KIO_Protocol *,
+	                    TDEIO::Slave *&, const TQString &, const long );
 	~KIO_Single_Subject( );
 	
 	//This functions try's te parse EMail; data, sender names and so on...
@@ -48,15 +48,15 @@ private:
 	TQString *_name;
 	KURL *_kurl;
 	const KIO_Protocol *_protocol;
-	KIO::MetaData *_metadata;
-	KIO::TransferJob* _job;
+	TDEIO::MetaData *_metadata;
+	TDEIO::TransferJob* _job;
 	long _size;
 	
-	void init( KIO::Slave*& );
+	void init( TDEIO::Slave*& );
 	
 private slots:
-	void slotResult( KIO::Job* );
-	void slotData( KIO::Job*, const TQByteArray& );
+	void slotResult( TDEIO::Job* );
+	void slotData( TDEIO::Job*, const TQByteArray& );
 	
 signals:
 	//This signal is emitted if the headers are read and put into a KornMailSubject*
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index 2de6ac59a..3fda7e4c8 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/kio_subjects.cpp
@@ -39,7 +39,7 @@ KIO_Subjects::KIO_Subjects( TQObject * parent, const char * name )
 {
 	_jobs = new TQPtrList<KIO_Single_Subject>;
 	_kurl = new KURL;
-	_metadata = new KIO::MetaData;
+	_metadata = new TDEIO::MetaData;
 	
 	_jobs->setAutoDelete( true );
 }
@@ -84,11 +84,11 @@ void KIO_Subjects::doReadSubjects( KKioDrop *drop )
 void KIO_Subjects::getConnection( )
 {
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 
 	if( _slave )
 	{
-		KIO::Scheduler::disconnectSlave( _slave );
+		TDEIO::Scheduler::disconnectSlave( _slave );
 		_slave = 0;
 	}
 	
@@ -99,7 +99,7 @@ void KIO_Subjects::getConnection( )
 		if( kurl.port() == 0 )
 			kurl.setPort( _protocol->defaultPort( _kio->_ssl ) );
 		
-		if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
+		if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
 		{
 			kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() );
 			_kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) );
@@ -115,7 +115,7 @@ void KIO_Subjects::getConnection( )
 void KIO_Subjects::startJob( const TQString &name, const long size )
 {
 	KURL kurl = *_kurl;
-	KIO::MetaData metadata = *_metadata;
+	TDEIO::MetaData metadata = *_metadata;
 	KIO_Single_Subject *subject;
 	
 	kurl = name;
@@ -139,7 +139,7 @@ void KIO_Subjects::disConnect( bool result )
 	{
 		if( _slave )
 		{
-			KIO::Scheduler::disconnectSlave( _slave );
+			TDEIO::Scheduler::disconnectSlave( _slave );
 			_slave = 0;
 		}
 		_kio->emitReadSubjectsReady( result );
diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h
index 124c83c40..018369de6 100644
--- a/korn/kio_subjects.h
+++ b/korn/kio_subjects.h
@@ -27,7 +27,7 @@ class KIO_Single_Subject;
 class KIO_Protocol;
 class KornMailSubject;
 
-namespace KIO { class MetaData; class Slave; }
+namespace TDEIO { class MetaData; class Slave; }
 class KURL;
 
 template<class T> class TQPtrList;
@@ -50,10 +50,10 @@ public:
 private:
 	KKioDrop *_kio;
 	KURL *_kurl;
-	KIO::MetaData *_metadata;
+	TDEIO::MetaData *_metadata;
 	const KIO_Protocol *_protocol;
 	TQPtrList<KIO_Single_Subject> *_jobs;
-	KIO::Slave *_slave;
+	TDEIO::Slave *_slave;
 	bool _valid;
 	
 	//Opens a connection.
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index fb6166c31..8f740c80a 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -51,9 +51,9 @@ KMail_Protocol::~KMail_Protocol()
 {
 }
 
-const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const
+const Protocol* KMail_Protocol::getProtocol( TDEConfigGroup* config ) const
 {
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	int id;
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 
@@ -73,10 +73,10 @@ const Protocol* KMail_Protocol::getProtocol( KConfigGroup* config ) const
 	return 0;
 }
 
-KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const
+KMailDrop* KMail_Protocol::createMaildrop( TDEConfigGroup *config ) const
 {
 	int id;
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 
 	if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" || type == "maildir" )
@@ -86,11 +86,11 @@ KMailDrop* KMail_Protocol::createMaildrop( KConfigGroup *config ) const
 	return 0;
 }
 
-TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config, const TQString& ) const
+TQMap< TQString, TQString > * KMail_Protocol::createConfig( TDEConfigGroup* config, const TQString& ) const
 {
 	TQMap< TQString, TQString > *result = new TQMap<TQString, TQString>;
 	int id;
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	//First: find the account in the configuration and get the type and id out of it.
 	TQString type = getTypeAndConfig( config->readEntry( "kmailname" ), kmailconfig, id );
 	TQString metadata;
@@ -184,7 +184,7 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje
 	TQString name;
 	int nummer = kmailFirstGroup - 1;
 	
-	KConfig kmailconfig( "kmailrc", true, false );
+	TDEConfig kmailconfig( "kmailrc", true, false );
 	while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
 	{
 		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
@@ -209,7 +209,7 @@ void KMail_Protocol::writeEntries( TQMap< TQString, TQString >* ) const
 	//The configuartion is read out on the right way
 }
 
-TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, int id ) const
+TQString KMail_Protocol::readPassword( bool store, const TDEConfigBase& config, int id ) const
 {
 	if( !store )
 		return "";
@@ -217,7 +217,7 @@ TQString KMail_Protocol::readPassword( bool store, const KConfigBase& config, in
 	return KOrnPassword::readKMailPassword( id, config );
 }
 
-TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &kmailconfig, int &id ) const
+TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, TDEConfig &kmailconfig, int &id ) const
 {
 	int nummer = kmailFirstGroup - 1;
 	bool found = false;
diff --git a/korn/kmail_proto.h b/korn/kmail_proto.h
index 72e846d25..c2026baf1 100644
--- a/korn/kmail_proto.h
+++ b/korn/kmail_proto.h
@@ -22,8 +22,8 @@
 
 #include "protocol.h"
 
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * This class is the comminucation between KOrn and KMail.
@@ -51,14 +51,14 @@ public:
 	 * @param config The configuration group to read the kmailname from.
 	 * @return A pointer to a Protocol (not newly created) or 0 if an error orrured.
 	 */
-	virtual const Protocol* getProtocol( KConfigGroup* config ) const;
+	virtual const Protocol* getProtocol( TDEConfigGroup* config ) const;
 	/**
 	 * This gives a new Maildrop back. The maildrop is responsible to execute the configuration.
 	 * In most cases, it will return a new instance of the KKioDrop Maildrop.
 	 * @param config The configuration group to read the kmailname from.
 	 * @return A new KMailDrop, or a 0 pointer if an error occured.
 	 */
-        virtual KMailDrop* createMaildrop( KConfigGroup* config ) const;
+        virtual KMailDrop* createMaildrop( TDEConfigGroup* config ) const;
 	/**
 	 * This does the real convertion: given a namen of a KMail account (hidden in config),
 	 * it calculates how the configuration whould have looked in KOrn.
@@ -67,7 +67,7 @@ public:
 	 * @param password The password fetched out of the configuration or KWallet.
 	 * @return A mapping containing the configuration if success, and empty mapping otherwise.
 	 */
-        virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& password ) const;
+        virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const;
 	/**
 	 * The name of thes protocol
 	 *
@@ -107,8 +107,8 @@ public:
 	virtual void writeEntries( TQMap< TQString, TQString >* config ) const;
 
 private:
-	TQString readPassword( bool store, const KConfigBase &config, int id ) const;
-	TQString getTypeAndConfig( const TQString& kmailname, KConfig &config, int &nummer ) const;
+	TQString readPassword( bool store, const TDEConfigBase &config, int id ) const;
+	TQString getTypeAndConfig( const TQString& kmailname, TDEConfig &config, int &nummer ) const;
 	
 	static const char* kmailGroupName;
 	static const char* kmailKeyName;
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 19c0bb1d6..a68ccefb6 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -63,7 +63,7 @@ KornAccountCfgImpl::~KornAccountCfgImpl()
 	delete _accountinput;
 }
 
-void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr )
+void KornAccountCfgImpl::readConfig( TDEConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr )
 {
 	AccountInput *input;
 	
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 8e2f833e1..0a765dcbd 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -21,7 +21,7 @@
 
 #include "kornaccountcfg.h"
 
-class KConfigGroup;
+class TDEConfigGroup;
 class KURLRequester;
 
 class TQVBoxLayout;
@@ -42,7 +42,7 @@ public:
 	KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 );
 	~KornAccountCfgImpl();
 	
-	void readConfig( KConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr );
+	void readConfig( TDEConfigGroup *config, TQMap< TQString, TQString > *entries, int boxnr, int accountnr );
 	void writeConfig();
 
 public slots:
@@ -55,7 +55,7 @@ private slots:
 	void slotOK();
 	void slotCancel();
 private:
-	KConfigGroup *_config;
+	TDEConfigGroup *_config;
 	int _fields;
 	int _urlfields;
 	int _boxnr, _accountnr;
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 863b222a9..53e32d9c6 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -1490,8 +1490,8 @@
         <pixmap>image0</pixmap>
         <signal>activated( const TQString&amp; )</signal>
         <signal>activated( const int )</signal>
-        <signal>setDefaults( const TQString&amp;, KConfig* )</signal>
-        <signal>setDefaults( const TQString&amp;, const int, KConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, TDEConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, const int, TDEConfig* )</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -1556,9 +1556,9 @@
     </connection>
     <connection>
         <sender>elbAccounts</sender>
-        <signal>setDefaults(const TQString&amp;,const int,KConfig*)</signal>
+        <signal>setDefaults(const TQString&amp;,const int,TDEConfig*)</signal>
         <receiver>KornBoxCfg</receiver>
-        <slot>slotSetDefaults(const TQString&amp;,const int,KConfig*)</slot>
+        <slot>slotSetDefaults(const TQString&amp;,const int,TDEConfig*)</slot>
     </connection>
     <connection>
         <sender>pbNormalFont</sender>
@@ -1669,7 +1669,7 @@
     <slot access="protected">slotEditBox()</slot>
     <slot access="protected">slotActivated( const TQString&amp; )</slot>
     <slot access="protected">slotActivated( const int )</slot>
-    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, KConfig* )</slot>
+    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
     <slot access="protected">slotChangeNormalFont()</slot>
     <slot access="protected">slotChangeNewFont()</slot>
     <slot access="protected">slotChangeNormalAnim()</slot>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index ab6671427..fc699c10f 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
-class KConfig;
+class TDEConfig;
 #include "kornboxcfgimpl.h"
 
 #include "keditlistboxman.h"
@@ -73,7 +73,7 @@ KornBoxCfgImpl::~KornBoxCfgImpl()
 	delete _anims[ 1 ];
 }
 
-void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
+void KornBoxCfgImpl::readConfig( TDEConfig * config, const int index )
 {
 	_config = config;
 	_index = index;
@@ -86,7 +86,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
 	readAccountsConfig();
 }
 
-void KornBoxCfgImpl::writeConfig( KConfig * config, const int index )
+void KornBoxCfgImpl::writeConfig( TDEConfig * config, const int index )
 {
 	config->setGroup( TQString( "korn-%1" ).arg( index ) );
 	
@@ -165,7 +165,7 @@ void KornBoxCfgImpl::readDCOPConfig()
 	elbDCOP->insertStringList( _config->readListEntry( "dcop", ',' ) );
 }
 	
-void KornBoxCfgImpl::writeViewConfig( KConfig* config )
+void KornBoxCfgImpl::writeViewConfig( TDEConfig* config )
 {
 	TQColor invalid;
 	
@@ -194,7 +194,7 @@ void KornBoxCfgImpl::writeViewConfig( KConfig* config )
 	
 }
 
-void KornBoxCfgImpl::writeEventConfig( KConfig *config )
+void KornBoxCfgImpl::writeEventConfig( TDEConfig *config )
 {
 	config->writeEntry( "leftrecheck",   this->chLeftRecheck  ->isChecked() );
 	config->writeEntry( "middlerecheck", this->chMiddleRecheck->isChecked() );
@@ -224,11 +224,11 @@ void KornBoxCfgImpl::writeEventConfig( KConfig *config )
 	config->writeEntry( "passivedate", this->chPassiveDate->isChecked() );
 }
 
-void KornBoxCfgImpl::writeAccountsConfig( KConfig */*config */)
+void KornBoxCfgImpl::writeAccountsConfig( TDEConfig */*config */)
 {
 }
 
-void KornBoxCfgImpl::writeDCOPConfig( KConfig *config )
+void KornBoxCfgImpl::writeDCOPConfig( TDEConfig *config )
 {
 	config->writeEntry( "dcop", elbDCOP->items(), ',' );
 }
@@ -249,7 +249,7 @@ void KornBoxCfgImpl::slotEditBox()
 	
 	connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
 
-	_group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).
+	_group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).
 			arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
 	
 	TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ).
@@ -270,7 +270,7 @@ void KornBoxCfgImpl::slotActivated( const int )
 	slotEditBox();
 }
 
-void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, KConfig* config )
+void KornBoxCfgImpl::slotSetDefaults( const TQString& name, const int, TDEConfig* config )
 {
 	config->writeEntry( "name", name );
 	config->writeEntry( "protocol", "mbox" );
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index 73cf7bb55..5bc82c443 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -21,8 +21,8 @@
 
 #include "kornboxcfg.h"
 
-class KConfig;
-class KConfigGroup;
+class TDEConfig;
+class TDEConfigGroup;
 class KDialogBase;
 
 class TQFont;
@@ -37,20 +37,20 @@ public:
 	~KornBoxCfgImpl();
 	
 	/**
-	 * This method write the current configuration to a specified KConfig-object.
+	 * This method write the current configuration to a specified TDEConfig-object.
 	 *
 	 * @param config The config where in which the configuration should be added.
 	 * @param index The index of the selected config. This is the group-number.
 	 */
-	void writeConfig( KConfig * config, const int index );
+	void writeConfig( TDEConfig * config, const int index );
 	
 	/**
-	 * This method write the current configuration to a specified KConfig-object.
+	 * This method write the current configuration to a specified TDEConfig-object.
 	 *
 	 * @param config The config where in which the configuration should be added. Note that this object is stored locally until the object is destroyed.
 	 * @param index The index of the selected config. This is the group-number.
 	 */
-	void readConfig( KConfig * config, const int index );
+	void readConfig( TDEConfig * config, const int index );
 	
 private:
 	void readViewConfig();
@@ -58,13 +58,13 @@ private:
 	void readAccountsConfig();
 	void readDCOPConfig();
 	
-	void writeViewConfig( KConfig* config );
-	void writeEventConfig( KConfig *config );
-	void writeAccountsConfig( KConfig *config );
-	void writeDCOPConfig( KConfig *config );
+	void writeViewConfig( TDEConfig* config );
+	void writeEventConfig( TDEConfig *config );
+	void writeAccountsConfig( TDEConfig *config );
+	void writeDCOPConfig( TDEConfig *config );
 	
-	KConfig* _config;
-	KConfigGroup *_group;
+	TDEConfig* _config;
+	TDEConfigGroup *_group;
 	KDialogBase *_base;
 	int _index;
 	TQString *_anims[ 2 ];
@@ -74,7 +74,7 @@ protected slots:
 	virtual void slotEditBox();
 	virtual void slotActivated( const TQString& );
 	virtual void slotActivated( const int );
-	virtual void slotSetDefaults( const TQString&, const int, KConfig* );
+	virtual void slotSetDefaults( const TQString&, const int, TDEConfig* );
 	virtual void slotChangeNormalAnim();
 	virtual void slotChangeNewAnim();
 	virtual void slotChangeNormalFont();
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index 8707cecc6..f99da3d4a 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -134,8 +134,8 @@
         <pixmap>image0</pixmap>
         <signal>activated( const TQString&amp; )</signal>
         <signal>activated( const int )</signal>
-        <signal>setDefaults( const TQString&amp;, KConfig* )</signal>
-        <signal>setDefaults( const TQString&amp;, const int, KConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, TDEConfig* )</signal>
+        <signal>setDefaults( const TQString&amp;, const int, TDEConfig* )</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -152,9 +152,9 @@
     </connection>
     <connection>
         <sender>elbBoxes</sender>
-        <signal>setDefaults(const TQString&amp;,const int,KConfig*)</signal>
+        <signal>setDefaults(const TQString&amp;,const int,TDEConfig*)</signal>
         <receiver>KornCfgWidget</receiver>
-        <slot>slotSetDefaults(const TQString&amp;,const int,KConfig*)</slot>
+        <slot>slotSetDefaults(const TQString&amp;,const int,TDEConfig*)</slot>
     </connection>
     <connection>
         <sender>pbEdit</sender>
@@ -169,7 +169,7 @@
     <slot>slotOK()</slot>
     <slot>slotApply()</slot>
     <slot>slotCancel()</slot>
-    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, KConfig* )</slot>
+    <slot access="protected">slotSetDefaults( const TQString&amp;, const int, TDEConfig* )</slot>
     <slot access="protected">slotEditBox()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index 33af34065..b944087f1 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -39,7 +39,7 @@
  */
 KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
 	: KornCfgWidget( parent, name ),	
-	_config( new KConfig( "kornrc" ) ),
+	_config( new TDEConfig( "kornrc" ) ),
 	_base( 0 )
 {
 	elbBoxes->setSubGroupName( "korn-%1-%2" );
@@ -120,7 +120,7 @@ void KornCfgImpl::slotActivated( const int )
 	slotEditBox();
 }
 
-void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfig* config )
+void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, TDEConfig* config )
 {
 	config->writeEntry( "name", name );
 	config->writeEntry( "hasnormalfgcolour", true );
@@ -234,14 +234,14 @@ void KornCfgImpl::rewritePasswords()
 {
 	int box = 0 - 1;
 	int account = 0 - 1;
-	KConfigGroup *group;
+	TDEConfigGroup *group;
 
 	while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) )
 	{
 		account = 0 - 1;
 		while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) )
 		{
-			group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) );
+			group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) );
 			KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() );
 			delete group;
 		}
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index eee7c610d..e1289cd8e 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -19,7 +19,7 @@
 #ifndef MK_KORNCFGIMPL_H
 #define MK_KORNCFGIMPL_H
 
-class KConfig;
+class TDEConfig;
 #include "korncfg.h"
 
 class KDialogBase;
@@ -42,7 +42,7 @@ protected slots:
 	virtual void slotEditBox();
 	virtual void slotActivated( const TQString& );
 	virtual void slotActivated( const int );
-	virtual void slotSetDefaults( const TQString&, const int, KConfig* );
+	virtual void slotSetDefaults( const TQString&, const int, TDEConfig* );
 public slots:
 	virtual void slotOK();
 	virtual void slotCancel();
@@ -54,7 +54,7 @@ private:
 
 	void rewritePasswords();
 	
-	KConfig *_config;
+	TDEConfig *_config;
 	KDialogBase *_base;
 };
 
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index dc823779d..2e0cc091d 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -34,7 +34,7 @@
 
 KornShell::KornShell( TQWidget * parent, const char * name )
 	: TQWidget( parent, name ),
-	_config( new KConfig( "kornrc" ) ),
+	_config( new TDEConfig( "kornrc" ) ),
 	_box( 0 ),
 	_configDialog( 0 ),
 	_show( false )
diff --git a/korn/kornshell.h b/korn/kornshell.h
index e3e506677..57d631d77 100644
--- a/korn/kornshell.h
+++ b/korn/kornshell.h
@@ -22,7 +22,7 @@
 class BoxContainer;
 class KDialogBase;
 
-class KConfig;
+class TDEConfig;
 
 #include <tqwidget.h>
 
@@ -49,7 +49,7 @@ private slots:
 	void readConfig();
 	
 private:
-	KConfig *_config;
+	TDEConfig *_config;
 	BoxContainer *_box;
 	KDialogBase *_configDialog;
 	bool _show;
diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h
index 2ce5e9dbb..d7700ac3d 100644
--- a/korn/maildir_proto.h
+++ b/korn/maildir_proto.h
@@ -46,11 +46,11 @@ public:
 		
 	virtual TQString serverName() const { return i18n( "Path:" ); }
 
-	virtual void recheckKURL( KURL &kurl, KIO::MetaData & )
+	virtual void recheckKURL( KURL &kurl, TDEIO::MetaData & )
 	                               { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
-	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { }
-	virtual void deleteMailKURL( KURL &, KIO::MetaData & )  { }
-	virtual void readMailKURL( KURL &, KIO::MetaData & )    { }
+	virtual void readSubjectKURL( KURL &, TDEIO::MetaData & ) { }
+	virtual void deleteMailKURL( KURL &, TDEIO::MetaData & )  { }
+	virtual void readMailKURL( KURL &, TDEIO::MetaData & )    { }
 };
 
 #endif
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 9d2f12f67..20b6dfe9d 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -72,7 +72,7 @@ void KMailDrop::forceCountZero()
   emit changed( 0, this );
 }
 
-void KMailDrop::readGeneralConfigGroup( const KConfigBase& cfg )
+void KMailDrop::readGeneralConfigGroup( const TDEConfigBase& cfg )
 {
   _passivePopup = cfg.readBoolEntry(fu(PassivePopupConfigKey), false );
   _passiveDate = cfg.readBoolEntry(fu(PassiveDateConfigKey), false );
@@ -82,7 +82,7 @@ void KMailDrop::readGeneralConfigGroup( const KConfigBase& cfg )
   emit(configChanged());
 }
 
-bool KMailDrop::readConfigGroup(const KConfigBase & c)
+bool KMailDrop::readConfigGroup(const TDEConfigBase & c)
 {
   _caption    = c.readEntry(fu(CaptionConfigKey));
   _clickCmd   = c.readPathEntry(fu(ClickConfigKey));
@@ -103,7 +103,7 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c)
   return true;
 }
 
-bool KMailDrop::writeConfigGroup(KConfigBase & c) const
+bool KMailDrop::writeConfigGroup(TDEConfigBase & c) const
 {
   c.writeEntry(fu(TypeConfigKey),         type());
   c.writeEntry(fu(CaptionConfigKey),      caption());
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 460f0afff..e0f1a46d1 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -13,8 +13,8 @@
 
 class Protocol;
 
-class KConfigBase;
-class KConfigGroup;
+class TDEConfigBase;
+class TDEConfigGroup;
 class KDropCfgDialog;
 class TQColor;
 class KornMailSubject;
@@ -150,7 +150,7 @@ class KMailDrop : public TQObject
      *@param cfg A configuration object with the group already
      * set to the configuration for this box
      */
-    virtual void readGeneralConfigGroup( const KConfigBase& cfg );
+    virtual void readGeneralConfigGroup( const TDEConfigBase& cfg );
 
     /** 
      * Read box configuration from a config group. Subclasses that
@@ -160,7 +160,7 @@ class KMailDrop : public TQObject
      *     the configuration for this box.
      * @return true if read was successful, false otherwise.
      */
-    virtual bool readConfigGroup( const KConfigBase& cfg );
+    virtual bool readConfigGroup( const TDEConfigBase& cfg );
     virtual bool readConfigGroup( const TQMap< TQString, TQString > &, const Protocol * ) { return true; }
 
     /** 
@@ -171,7 +171,7 @@ class KMailDrop : public TQObject
      *     the configuration for this box.
      * @return true if read was successful, false otherwise.
      */
-    virtual bool writeConfigGroup( KConfigBase& cfg ) const;
+    virtual bool writeConfigGroup( TDEConfigBase& cfg ) const;
 
     /** 
      * Return the type of this monitor, for display and
diff --git a/korn/mbox_proto.h b/korn/mbox_proto.h
index 78b01abfb..f017f3b6f 100644
--- a/korn/mbox_proto.h
+++ b/korn/mbox_proto.h
@@ -43,11 +43,11 @@ public:
 		
 	virtual TQString mailboxName() const { return i18n( "File:" ); }
 	
-	virtual void recheckKURL( KURL &, KIO::MetaData & md ) const
+	virtual void recheckKURL( KURL &, TDEIO::MetaData & md ) const
 		{ md.insert( "onlynew", "" ); md.insert( "savetime", "" ); }
-	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void deleteMailKURL( KURL &, KIO::MetaData & ) const { }
-	virtual void readMailKURL( KURL &, KIO::MetaData & ) const   { }
+	virtual void readSubjectKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void deleteMailKURL( KURL &, TDEIO::MetaData & ) const { }
+	virtual void readMailKURL( KURL &, TDEIO::MetaData & ) const   { }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const;
 	virtual void configFields( TQPtrVector< TQWidget >*, const TQObject*, TQPtrList< AccountInput >* ) const;
diff --git a/korn/password.cpp b/korn/password.cpp
index 764b90f98..966221394 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -30,7 +30,7 @@ KWallet::Wallet* KOrnPassword::m_wallet = 0;
 bool KOrnPassword::m_openFailed = false;
 bool KOrnPassword::m_useWallet = false; //Not default true until moving works
 
-TQString KOrnPassword::readKOrnPassword( int box, int account, const KConfigBase &fallbackConfig )
+TQString KOrnPassword::readKOrnPassword( int box, int account, const TDEConfigBase &fallbackConfig )
 {
 	TQString result;
 
@@ -40,7 +40,7 @@ TQString KOrnPassword::readKOrnPassword( int box, int account, const KConfigBase
 		return fallbackConfig.readEntry( "password" );
 }
 
-TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fallbackConfig )
+TQString KOrnPassword::readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig )
 {
 	TQString password;
 	open();
@@ -58,7 +58,7 @@ TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fall
 	return password;
 }
 
-void KOrnPassword::writeKOrnPassword( int box, int account, KConfigBase& fallbackConfig, const TQString& password )
+void KOrnPassword::writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password )
 {
 	if( writeKOrnPassword( box, account, password ) )
 	{
@@ -69,7 +69,7 @@ void KOrnPassword::writeKOrnPassword( int box, int account, KConfigBase& fallbac
 		fallbackConfig.writeEntry( "password", password );
 }
 
-void KOrnPassword::deleteKOrnPassword( int box, int account, KConfigBase& fallbackConfig )
+void KOrnPassword::deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig )
 {
 	deleteKOrnPassword( box, account );
 	if( fallbackConfig.hasKey( "password" ) )
@@ -103,8 +103,8 @@ bool KOrnPassword::deleteKOrnPassword( int box, int account )
 	return true;
 }
 
-void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase& configSrc,
-                                     int boxDest, int accountDest, KConfigBase &configDest )
+void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, TDEConfigBase& configSrc,
+                                     int boxDest, int accountDest, TDEConfigBase &configDest )
 {
 	TQString password;
 	
@@ -113,7 +113,7 @@ void KOrnPassword::moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase& co
 	writeKOrnPassword( boxDest, accountDest, configDest, password );
 }
 
-void KOrnPassword::swapKOrnPassword( int box1, int account1, KConfigBase &config1, int box2, int account2, KConfigBase &config2 )
+void KOrnPassword::swapKOrnPassword( int box1, int account1, TDEConfigBase &config1, int box2, int account2, TDEConfigBase &config2 )
 {
 	TQString password1, password2;
 	password1 = readKOrnPassword( box1, account1, config1 );
@@ -149,7 +149,7 @@ void KOrnPassword::swapKOrnWalletPasswords( int box1, int accountnumber1 ,int bo
 		swapKOrnWalletPassword( box1, xx, box2, xx );
 }
 
-void KOrnPassword::rewritePassword( int box, int account, KConfigBase &config, bool newUseWalletValue )
+void KOrnPassword::rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue )
 {
 	bool useWallet = m_useWallet;
 	TQString password;
diff --git a/korn/password.h b/korn/password.h
index ebfb24c4a..a2df7f990 100644
--- a/korn/password.h
+++ b/korn/password.h
@@ -20,7 +20,7 @@
 #ifndef KORNPASSWORD_H
 #define KORNPASSWORD_H
 
-class KConfigBase;
+class TDEConfigBase;
 namespace KWallet { class Wallet; }
 
 class TQString;
@@ -49,7 +49,7 @@ public:
 	 * @param fallbackConfig The configuration file if KWallet cannot be used.
 	 * @return The password, or TQString() if it failes.
 	 */
-	static TQString readKOrnPassword( int box, int account, const KConfigBase& fallbackConfig );
+	static TQString readKOrnPassword( int box, int account, const TDEConfigBase& fallbackConfig );
 	/**
 	 * This function gets a password with is puts in KWallet by KMail
 	 *
@@ -57,7 +57,7 @@ public:
 	 * @param fallbackConfig The configuration used if KWallet isn't available.
 	 * @return The password, TQStirng::null if it failes.
 	 */
-	static TQString readKMailPassword( int accountnr, const KConfigBase& fallbackConfig );
+	static TQString readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig );
 	
 	/**
 	 * This function saves a password for usage in KOrn.
@@ -67,7 +67,7 @@ public:
 	 * @param fallbackConfig The configuration file if KWallet isn't available.
 	 * @param password The password to be stored.
 	 */
-	static void writeKOrnPassword( int box, int account, KConfigBase& fallbackConfig, const TQString& password );
+	static void writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password );
 
 	/**
 	 * This function deletes a password from both KWallet and the configuration file
@@ -76,7 +76,7 @@ public:
 	 * @param account The accountnumber of the account.
 	 * @param fallbackConfig The configuration file if KWallet isn't available.
 	 */
-	static void deleteKOrnPassword( int box, int account, KConfigBase& fallbackConfig );
+	static void deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig );
 
 	/**
 	 * This function deletes a password from KWallet 
@@ -96,8 +96,8 @@ public:
 	 * @param accountDest The destination account number
 	 * @param configDest The destination configuration group.
 	 */
-	static void moveKOrnPassword( int boxSrc, int accountSrc, KConfigBase &configSrc,
-	                              int boxDest, int accountDest, KConfigBase &configDest );
+	static void moveKOrnPassword( int boxSrc, int accountSrc, TDEConfigBase &configSrc,
+	                              int boxDest, int accountDest, TDEConfigBase &configDest );
 
 	/**
 	 * This swaps the password from one box/account combination to another.
@@ -109,7 +109,7 @@ public:
 	 * @param account2 The account number of the second password.
 	 * @param config2 The configurationgroup of the second password.
 	 */
-	static void swapKOrnPassword( int box1, int account1, KConfigBase &config1, int box2, int account2, KConfigBase &config2 );
+	static void swapKOrnPassword( int box1, int account1, TDEConfigBase &config1, int box2, int account2, TDEConfigBase &config2 );
 
 	/**
 	 * This swaps the Wallet password from one box/account combination to another.
@@ -140,7 +140,7 @@ public:
 	 * @param config The configuration group
 	 * @param newUseWalletValue true to transport a password from a configuration to a wallet, false the other wat around
 	 */
-	static void rewritePassword( int box, int account, KConfigBase &config, bool newUseWalletValue );
+	static void rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue );
 	
 	/**
 	 * If set to true, this class will try to use KWallet,
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index 8d05a03be..bc4422caf 100644
--- a/korn/polldrop.cpp
+++ b/korn/polldrop.cpp
@@ -59,7 +59,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev )
 	}
 }
 
-bool KPollableDrop::readConfigGroup( const KConfigBase& cfg )
+bool KPollableDrop::readConfigGroup( const TDEConfigBase& cfg )
 {
 	KMailDrop::readConfigGroup( cfg );
 
@@ -68,7 +68,7 @@ bool KPollableDrop::readConfigGroup( const KConfigBase& cfg )
 	return true;
 }
 
-bool KPollableDrop::writeConfigGroup( KConfigBase& cfg ) const
+bool KPollableDrop::writeConfigGroup( TDEConfigBase& cfg ) const
 {
 	KMailDrop::writeConfigGroup( cfg );
 
diff --git a/korn/polldrop.h b/korn/polldrop.h
index 44a90d1c2..b45cdb4da 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -47,8 +47,8 @@ public:
 	int freq() const { return _freq; }
 	void setFreq( int freq );
 
-	virtual bool readConfigGroup ( const KConfigBase& cfg );
-	virtual bool writeConfigGroup ( KConfigBase& cfg ) const;
+	virtual bool readConfigGroup ( const TDEConfigBase& cfg );
+	virtual bool writeConfigGroup ( TDEConfigBase& cfg ) const;
 
 	//virtual void addConfigPage( KDropCfgDialog * );
 
diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h
index c828e595f..2d4e7661f 100644
--- a/korn/pop3_proto.h
+++ b/korn/pop3_proto.h
@@ -44,10 +44,10 @@ public:
 
 	virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); }
 	
-	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
-	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
+	virtual void readSubjectKURL( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
+	virtual void deleteMailKURL ( KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
 	virtual bool commitDelete () const { return true; }
-	virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); }
+	virtual void deleteCommitKURL(KURL & kurl, TDEIO::MetaData & ) const { kurl.setPath( "commit" ); }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const;
         virtual void configFields( TQPtrVector< TQWidget >* vector, const TQObject*, TQPtrList< AccountInput >* ) const;
diff --git a/korn/protocol.h b/korn/protocol.h
index c5caca28a..700cd5979 100644
--- a/korn/protocol.h
+++ b/korn/protocol.h
@@ -21,7 +21,7 @@
 #define PROTOCOL_H
 
 class AccountInput;
-class KConfigGroup;
+class TDEConfigGroup;
 class KIO_Protocol;
 class KMailDrop;
 
@@ -42,9 +42,9 @@ public:
 	Protocol() {}
 	virtual ~Protocol() {}
 
-	virtual const Protocol* getProtocol( KConfigGroup* ) const = 0;
-	virtual KMailDrop* createMaildrop( KConfigGroup* ) const = 0;
-	virtual TQMap< TQString, TQString > * createConfig( KConfigGroup* config, const TQString& password ) const = 0;
+	virtual const Protocol* getProtocol( TDEConfigGroup* ) const = 0;
+	virtual KMailDrop* createMaildrop( TDEConfigGroup* ) const = 0;
+	virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const = 0;
 	virtual TQString configName() const { return "not specified"; }
 
 	virtual void configFillGroupBoxes( TQStringList* ) const = 0;
diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h
index 4abd7fbc3..0d9374055 100644
--- a/korn/qmail_proto.h
+++ b/korn/qmail_proto.h
@@ -39,7 +39,7 @@ public:
 	virtual bool canReadMail() const { return true; }
 	virtual bool fullMessage() const { return true; }
 
-	virtual void recheckKURL( KURL &kurl, KIO::MetaData& ) const
+	virtual void recheckKURL( KURL &kurl, TDEIO::MetaData& ) const
 		{ if( kurl.path().right( 1 ) == "/" )
 		  	kurl.setPath( kurl.path() +  "new" );
 		  else
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 3a6af941d..b98d49e06 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -66,7 +66,7 @@ extern "C"
   }
 }
 
-ResourceKABC::ResourceKABC( const KConfig* config )
+ResourceKABC::ResourceKABC( const TDEConfig* config )
   : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
@@ -102,7 +102,7 @@ void ResourceKABC::init()
   mAddressbook = 0;
 }
 
-void ResourceKABC::readConfig( const KConfig *config )
+void ResourceKABC::readConfig( const TDEConfig *config )
 {
   mAlarmDays = config->readNumEntry( "AlarmDays", 0 );
   mAlarm = config->readBoolEntry( "Alarm", true );
@@ -110,7 +110,7 @@ void ResourceKABC::readConfig( const KConfig *config )
   mUseCategories = config->readBoolEntry( "UseCategories", false );
 }
 
-void ResourceKABC::writeConfig( KConfig *config )
+void ResourceKABC::writeConfig( TDEConfig *config )
 {
   ResourceCalendar::writeConfig( config );
   config->writeEntry( "AlarmDays", mAlarmDays );
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index be77c1860..169a02946 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -35,7 +35,7 @@
 
 #include "libtdepim/tdepimmacros.h"
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 }
@@ -53,12 +53,12 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
     friend class ResourceKABCConfig;
 
   public:
-    ResourceKABC( const KConfig * );
+    ResourceKABC( const TDEConfig * );
     ResourceKABC( );
     virtual ~ResourceKABC();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig* config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig* config );
 
     void setAlarm( bool );
     bool alarm();
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h
index f690fc422..9425bd5e6 100644
--- a/kresources/blogging/API_Blog.h
+++ b/kresources/blogging/API_Blog.h
@@ -123,18 +123,18 @@ class APIBlog : public TQObject
     virtual TQString getFunctionName( blogFunctions type ) = 0;
     virtual TQValueList<TQVariant> defaultArgs( const TQString &id = TQString() );
 
-    virtual KIO::Job *createUserInfoJob() = 0;
-    virtual KIO::Job *createListFoldersJob() = 0;
-    virtual KIO::TransferJob *createListItemsJob( const KURL &url ) = 0;
-    virtual KIO::TransferJob *createDownloadJob( const KURL &url ) = 0;
-    virtual KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) = 0;
-    virtual KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ) = 0;
-    virtual KIO::Job *createRemoveJob( const KURL &url, const TQString &postid ) = 0;
-
-    virtual bool interpretUserInfoJob( KIO::Job *job ) = 0;
-    virtual void interpretListFoldersJob( KIO::Job *job ) = 0;
-    virtual bool interpretListItemsJob( KIO::Job *job ) = 0;
-    virtual bool interpretDownloadItemsJob( KIO::Job *job ) = 0;
+    virtual TDEIO::Job *createUserInfoJob() = 0;
+    virtual TDEIO::Job *createListFoldersJob() = 0;
+    virtual TDEIO::TransferJob *createListItemsJob( const KURL &url ) = 0;
+    virtual TDEIO::TransferJob *createDownloadJob( const KURL &url ) = 0;
+    virtual TDEIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) = 0;
+    virtual TDEIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ) = 0;
+    virtual TDEIO::Job *createRemoveJob( const KURL &url, const TQString &postid ) = 0;
+
+    virtual bool interpretUserInfoJob( TDEIO::Job *job ) = 0;
+    virtual void interpretListFoldersJob( TDEIO::Job *job ) = 0;
+    virtual bool interpretListItemsJob( TDEIO::Job *job ) = 0;
+    virtual bool interpretDownloadItemsJob( TDEIO::Job *job ) = 0;
     
     static KCal::Journal *journalFromPosting( KBlog::BlogPosting *post );
     static KBlog::BlogPosting *postingFromJournal( KCal::Journal *journal );
diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp
index 0745467b8..69a722e22 100644
--- a/kresources/blogging/API_Blogger.cpp
+++ b/kresources/blogging/API_Blogger.cpp
@@ -44,53 +44,53 @@ TQString APIBlogger::getFunctionName( blogFunctions type )
 
 
 
-KIO::Job *APIBlogger::createUserInfoJob()
+TDEIO::Job *APIBlogger::createUserInfoJob()
 {
   kdDebug() << "read user info..." << endl;
   TQValueList<TQVariant> args( defaultArgs() );
-  return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUserInfo ), args, false );
+  return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUserInfo ), args, false );
 }
 
-KIO::Job *APIBlogger::createListFoldersJob()
+TDEIO::Job *APIBlogger::createListFoldersJob()
 {
   // TODO: Check if we're already authenticated. If not, do it!
 //   if ( isValid() ) {
     kdDebug() << "Fetch List of Blogs..." << endl;
     TQValueList<TQVariant> args( defaultArgs() );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUsersBlogs ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUsersBlogs ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
 //   }
 }
 
-KIO::TransferJob *APIBlogger::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *APIBlogger::createListItemsJob( const KURL &url )
 {
   // TODO: Check if we're already authenticated. If not, do it!
 //   if ( isValid() ) {
     kdDebug() << "Fetch List of Posts..." << endl;
     TQValueList<TQVariant> args( defaultArgs( url.url() ) );
     args << TQVariant( mDownloadCount );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetRecentPosts ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetRecentPosts ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
 //   }
 }
 
-KIO::TransferJob *APIBlogger::createDownloadJob( const KURL &url )
+TDEIO::TransferJob *APIBlogger::createDownloadJob( const KURL &url )
 {
 //   if ( isValid() ){
     kdDebug() << "Fetch Posting with url " << url.url() << endl;
     TQValueList<TQVariant> args( defaultArgs( url.url() ) );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetPost ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetPost ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
 //   }
 }
 
-KIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosting *posting )
+TDEIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosting *posting )
 {
   if ( !posting ) {
     kdDebug() << "APIBlogger::createUploadJob: posting=0" << endl;
@@ -101,14 +101,14 @@ KIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosti
     TQValueList<TQVariant> args( defaultArgs( posting->postID() ) );
     args << TQVariant( posting->content() );
     args << TQVariant( /*publish=*/true, 0 );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
 //   }
 }
 
-KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting )
+TDEIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting )
 {
   if ( !posting ) {
     kdDebug() << "APIBlogger::createUploadNewJob: posting=0" << endl;
@@ -119,20 +119,20 @@ KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting )
     TQValueList<TQVariant> args( defaultArgs( posting->blogID() ) );
     args << TQVariant( posting->content() );
     args << TQVariant( /*publish=*/true, 0 );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
 //   }
 }
 
-KIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid )
+TDEIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid )
 {
 kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl;
 //   if ( isValid() ){
     TQValueList<TQVariant> args( defaultArgs( postid ) );
     args << TQVariant( /*publish=*/true, 0 );
-    return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false );
+    return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false );
 //   } else {
 //     warningNotInitialized();
 //     return 0;
@@ -142,11 +142,11 @@ kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl;
 
 
 
-bool APIBlogger::interpretUserInfoJob( KIO::Job *job )
+bool APIBlogger::interpretUserInfoJob( TDEIO::Job *job )
 {
   // TODO: Implement user authentication
 //   isValid = true;
-  KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job);
+  TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job);
   if ( job->error() || !trfjob ) {
     // TODO: Error handling
     return false;
@@ -172,10 +172,10 @@ bool APIBlogger::interpretUserInfoJob( KIO::Job *job )
   return false;
 }
 
-void APIBlogger::interpretListFoldersJob( KIO::Job *job )
+void APIBlogger::interpretListFoldersJob( TDEIO::Job *job )
 {
 kdDebug() << "APIBlogger::interpretListFoldersJob" << endl;
-  KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job);
+  TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job);
   if ( job->error() || !trfjob ) {
     // TODO: Error handling
   } else {
@@ -204,15 +204,15 @@ kdDebug()<< "Emitting folderInfoRetrieved( id=" << id << ", name=" << name << ")
   }
 }
 
-bool APIBlogger::interpretListItemsJob( KIO::Job *job )
+bool APIBlogger::interpretListItemsJob( TDEIO::Job *job )
 {
   return interpretDownloadItemsJob( job );
 }
 
-bool APIBlogger::interpretDownloadItemsJob( KIO::Job *job )
+bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job )
 {
   kdDebug(5800)<<"APIBlogger::interpretDownloadItemJob"<<endl;
-  KIO::XmlrpcJob *trfjob = dynamic_cast<KIO::XmlrpcJob*>(job);
+  TDEIO::XmlrpcJob *trfjob = dynamic_cast<TDEIO::XmlrpcJob*>(job);
   bool success = false;
   if ( job->error() || !trfjob ) {
     // TODO: Error handling
diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h
index 04950338d..d7d5f43b9 100644
--- a/kresources/blogging/API_Blogger.h
+++ b/kresources/blogging/API_Blogger.h
@@ -37,18 +37,18 @@ class APIBlogger : public APIBlog
     TQString interfaceName() const { return "Blogger API 1.0"; }
 
 
-    KIO::Job *createUserInfoJob();
-    KIO::Job *createListFoldersJob();
-    KIO::TransferJob *createListItemsJob( const KURL &url );
-    KIO::TransferJob *createDownloadJob( const KURL &url );
-    KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting );
-    KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting );
-    KIO::Job *createRemoveJob( const KURL &url, const TQString &postid );
-
-    bool interpretUserInfoJob( KIO::Job *job );
-    void interpretListFoldersJob( KIO::Job *job );
-    bool interpretListItemsJob( KIO::Job *job );
-    bool interpretDownloadItemsJob( KIO::Job *job );
+    TDEIO::Job *createUserInfoJob();
+    TDEIO::Job *createListFoldersJob();
+    TDEIO::TransferJob *createListItemsJob( const KURL &url );
+    TDEIO::TransferJob *createDownloadJob( const KURL &url );
+    TDEIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting );
+    TDEIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting );
+    TDEIO::Job *createRemoveJob( const KURL &url, const TQString &postid );
+
+    bool interpretUserInfoJob( TDEIO::Job *job );
+    void interpretListFoldersJob( TDEIO::Job *job );
+    bool interpretListItemsJob( TDEIO::Job *job );
+    bool interpretDownloadItemsJob( TDEIO::Job *job );
   protected:
     bool readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo );
 };
diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/kresources/blogging/bloggingcalendaradaptor.cpp
index bb91edb07..2ed925a88 100644
--- a/kresources/blogging/bloggingcalendaradaptor.cpp
+++ b/kresources/blogging/bloggingcalendaradaptor.cpp
@@ -62,7 +62,7 @@ BloggingUploadItem::~BloggingUploadItem()
   delete mPosting;
 }
 
-KIO::TransferJob *BloggingUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *BloggingUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"BloggingUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<baseurl.url()<<endl;
   Q_ASSERT( adaptor );
@@ -72,7 +72,7 @@ kdDebug()<<"BloggingUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<b
   return mAPI->createUploadJob( url(), mPosting );
 }
 
-KIO::TransferJob *BloggingUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *BloggingUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"BloggingUploadItem::createUploadNewJob"<<endl;
   Q_ASSERT( adaptor );
@@ -167,7 +167,7 @@ void BloggingCalendarAdaptor::setUserPassword( KURL & )
 
 
 
-KIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url,
+TDEIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url,
                                                    const TQString &user,
                                                    const TQString &password )
 {
@@ -179,21 +179,21 @@ KIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url,
   } else return 0;
 }
 
-KIO::Job *BloggingCalendarAdaptor::createListFoldersJob( const KURL &/*url*/ )
+TDEIO::Job *BloggingCalendarAdaptor::createListFoldersJob( const KURL &/*url*/ )
 {
   if ( mAPI ) {
     return mAPI->createListFoldersJob();
   } else return 0;
 }
 
-KIO::TransferJob *BloggingCalendarAdaptor::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *BloggingCalendarAdaptor::createListItemsJob( const KURL &url )
 {
   if ( mAPI ) {
     return mAPI->createListItemsJob( url );
   } else return 0;
 }
 
-KIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url,
+TDEIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url,
                                      KPIM::FolderLister::ContentType ctype )
 {
   if ( mAPI && (ctype & KPIM::FolderLister::Journal) ) {
@@ -201,7 +201,7 @@ KIO::TransferJob *BloggingCalendarAdaptor::createDownloadJob( const KURL &url,
   } else return 0;
 }
 
-KIO::Job *BloggingCalendarAdaptor::createRemoveJob( const KURL &url,
+TDEIO::Job *BloggingCalendarAdaptor::createRemoveJob( const KURL &url,
                          KPIM::GroupwareUploadItem *deleteItem )
 {
 kdDebug()<<"BloggingCalendarAdaptor::createRemoveJob( " << url.url() << ", ..)" << endl;
@@ -213,7 +213,7 @@ kdDebug()<<"BloggingCalendarAdaptor::createRemoveJob( " << url.url() << ", ..)"
 
 
 
-bool BloggingCalendarAdaptor::interpretLoginJob( KIO::Job *job )
+bool BloggingCalendarAdaptor::interpretLoginJob( TDEIO::Job *job )
 {
 kdDebug()<<"BloggingCalendarAdaptor::interpretLoginJob"<<endl;
   if ( mAPI && job ) {
@@ -226,7 +226,7 @@ kdDebug() << "authenticated=" << mAuthenticated << endl;
 }
 
 
-void BloggingCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister * )
+void BloggingCalendarAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister * )
 {
 kdDebug() << "BloggingCalendarAdaptor::interpretListFoldersJob" << endl;
   if ( mAPI && job ) {
@@ -235,7 +235,7 @@ kdDebug() << "BloggingCalendarAdaptor::interpretListFoldersJob" << endl;
 }
 
 
-bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job,
+bool BloggingCalendarAdaptor::interpretListItemsJob( TDEIO::Job *job,
                                                     const TQString &/*jobData*/ )
 {
   if ( mAPI ) {
@@ -246,7 +246,7 @@ bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job,
 }
 
 
-bool BloggingCalendarAdaptor::interpretDownloadItemsJob( KIO::Job *job,
+bool BloggingCalendarAdaptor::interpretDownloadItemsJob( TDEIO::Job *job,
                                                     const TQString &/*jobData*/ )
 {
   if ( mAPI ) {
diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h
index e47e6b13c..ee6d292aa 100644
--- a/kresources/blogging/bloggingcalendaradaptor.h
+++ b/kresources/blogging/bloggingcalendaradaptor.h
@@ -26,7 +26,7 @@
 #include "API_Blog.h"
 #include <kurl.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -37,9 +37,9 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem
   public:
     BloggingUploadItem( KBlog::APIBlog *api, CalendarAdaptor *adaptor, KCal::Incidence *incidence, UploadType type );
     virtual ~BloggingUploadItem();
-    virtual KIO::TransferJob *createUploadNewJob(
+    virtual TDEIO::TransferJob *createUploadNewJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
-    virtual KIO::TransferJob *createUploadJob(
+    virtual TDEIO::TransferJob *createUploadJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &url );
 
   protected:
@@ -73,18 +73,18 @@ Q_OBJECT
     KBlog::APIBlog *api() const;
     void setAPI( KBlog::APIBlog *api );
 
-    KIO::Job *createLoginJob( const KURL &url, const TQString &user,
+    TDEIO::Job *createLoginJob( const KURL &url, const TQString &user,
                               const TQString &password  );
-    KIO::Job *createListFoldersJob( const KURL &url );
-    KIO::TransferJob *createListItemsJob( const KURL &url );
-    KIO::TransferJob *createDownloadJob( const KURL &url,
+    TDEIO::Job *createListFoldersJob( const KURL &url );
+    TDEIO::TransferJob *createListItemsJob( const KURL &url );
+    TDEIO::TransferJob *createDownloadJob( const KURL &url,
                                     KPIM::FolderLister::ContentType ctype );
-    KIO::Job *createRemoveJob( const KURL &url, KPIM::GroupwareUploadItem *deleteItem );
+    TDEIO::Job *createRemoveJob( const KURL &url, KPIM::GroupwareUploadItem *deleteItem );
 
-    bool interpretLoginJob( KIO::Job *job );
-    void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister * );
-    bool interpretListItemsJob( KIO::Job *job, const TQString &jobData );
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData );
+    bool interpretLoginJob( TDEIO::Job *job );
+    void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister * );
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData );
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData );
 
   public slots:
     void slotFolderInfoRetrieved( const TQString &id, const TQString &name );
diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/kresources/blogging/kcal_resourceblogging.cpp
index c8b016620..14bb24ca3 100644
--- a/kresources/blogging/kcal_resourceblogging.cpp
+++ b/kresources/blogging/kcal_resourceblogging.cpp
@@ -34,7 +34,7 @@ ResourceBlogging::ResourceBlogging()
   init();
 }
 
-ResourceBlogging::ResourceBlogging( const KConfig *config )
+ResourceBlogging::ResourceBlogging( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
@@ -57,7 +57,7 @@ void ResourceBlogging::init()
   ResourceGroupwareBase::init();
 }
 
-void ResourceBlogging::readConfig( const KConfig *config )
+void ResourceBlogging::readConfig( const TDEConfig *config )
 {
   BloggingCalendarAdaptor *ad = dynamic_cast<BloggingCalendarAdaptor*>( adaptor() );
   ResourceGroupwareBase::readConfig( config );
@@ -77,7 +77,7 @@ void ResourceBlogging::readConfig( const KConfig *config )
 
 }
 
-void ResourceBlogging::writeConfig( KConfig *config )
+void ResourceBlogging::writeConfig( TDEConfig *config )
 {
   kdDebug(5800) << "ResourceBlogging::writeConfig()" << endl;
 
diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h
index 8eff5062e..4e850d148 100644
--- a/kresources/blogging/kcal_resourceblogging.h
+++ b/kresources/blogging/kcal_resourceblogging.h
@@ -39,10 +39,10 @@ class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
   
   public:
     ResourceBlogging();
-    ResourceBlogging( const KConfig * );
+    ResourceBlogging( const TDEConfig * );
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     bool addEvent( Event* ) { return false; }
     bool addTodo( Todo * ) { return false; }
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index 19582ec35..f2e516308 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -39,9 +39,9 @@
 #define KIO_ARGS TQByteArray packedArgs; \
                  TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
-using namespace KIO;
+using namespace TDEIO;
 
-namespace KIO {
+namespace TDEIO {
   class XMLRPCResult
   {
       friend class XmlrpcJob;
@@ -68,7 +68,7 @@ public:
 
 XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method,
                       const TQValueList<TQVariant> &params, bool showProgressInfo)
-  : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(),
+  : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(),
                  showProgressInfo )
 {
   d = new XmlrpcJobPrivate;
@@ -147,10 +147,10 @@ kdDebug() << m_str_response << endl;
     istream >> s_url;
     istream >> s_method;
     // PROPFIND
-    if ( (s_cmd == 7) && (s_method == (int)KIO::HTTP_POST) ) {
+    if ( (s_cmd == 7) && (s_method == (int)TDEIO::HTTP_POST) ) {
       m_packedArgs.truncate(0);
       TQDataStream stream( m_packedArgs, IO_WriteOnly );
-      stream << (int)7 << m_redirectionURL << (int)KIO::HTTP_POST;
+      stream << (int)7 << m_redirectionURL << (int)TDEIO::HTTP_POST;
     }
   } else */
 
@@ -383,7 +383,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl;
 
 /* Convenience methods */
 
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<TQVariant> &params, bool showProgressInfo )
+XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<TQVariant> &params, bool showProgressInfo )
 {
   if ( url.isEmpty() ) {
     kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
@@ -395,15 +395,15 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, const TQVal
   return job;
 }
 
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method,
 		                        const TQVariant &arg, bool showProgressInfo )
 {
   TQValueList<TQVariant> args;
   args << arg;
-  return KIO::xmlrpcCall( url, method, args, showProgressInfo );
+  return TDEIO::xmlrpcCall( url, method, args, showProgressInfo );
 }
 
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method,
 		                        const TQStringList &arg, bool showProgressInfo )
 {
   TQValueList<TQVariant> args;
@@ -411,11 +411,11 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
   TQStringList::ConstIterator end = arg.end();
   for ( ; it != end; ++it )
     args << TQVariant( *it );
-  return KIO::xmlrpcCall( url, method, args, showProgressInfo );
+  return TDEIO::xmlrpcCall( url, method, args, showProgressInfo );
 }
 
 template <typename T>
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+XmlrpcJob* TDEIO::xmlrpcCall( const KURL& url, const TQString &method,
 		                        const TQValueList<T>&arg, bool showProgressInfo )
 {
   TQValueList<TQVariant> args;
@@ -424,7 +424,7 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
   typename TQValueList<T>::ConstIterator end = arg.end();
   for ( ; it != end; ++it )
     args << TQVariant( *it );
-  return KIO::xmlrpcCall( url, method, args, showProgressInfo );
+  return TDEIO::xmlrpcCall( url, method, args, showProgressInfo );
 }
 
 #include "xmlrpcjob.moc"
diff --git a/kresources/blogging/xmlrpcjob.h b/kresources/blogging/xmlrpcjob.h
index bc830ad2e..1efe79e1d 100644
--- a/kresources/blogging/xmlrpcjob.h
+++ b/kresources/blogging/xmlrpcjob.h
@@ -32,7 +32,7 @@
 #include <kio/jobclasses.h>
 #include <kio/global.h>
 
-namespace KIO {
+namespace TDEIO {
 
   class XMLRPCResult;
 
@@ -41,7 +41,7 @@ namespace KIO {
  * Data is sent to the slave on request of the slave ( dataReq ).
  * If data coming from the slave can not be handled, the
  * reading of data from the slave should be suspended.
- * @see KIO::xmlrpcCall()
+ * @see TDEIO::xmlrpcCall()
  * @since 3.4
  */
 class XmlrpcJob : public TransferJob {
@@ -57,8 +57,8 @@ Q_OBJECT
       XMLRPCUnknownResponse
     };
     /**
-     * Use KIO::xmlrpcPropFind(), KIO::xmlrpcPropPatch() and
-     * KIO::xmlrpcSearch() to create a new XmlrpcJob.
+     * Use TDEIO::xmlrpcPropFind(), TDEIO::xmlrpcPropPatch() and
+     * TDEIO::xmlrpcSearch() to create a new XmlrpcJob.
      */
     XmlrpcJob( const KURL& url, const TQString& method,
 				       const TQValueList<TQVariant> &params, bool showProgressInfo );
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 87d9c972f..10da60e0e 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -99,8 +99,8 @@ void CalDavPrefs::removeWallet(bool noWallet) {
 }
 
 void CalDavPrefs::addPrefix(const TQString& prefix) {
-    KConfigSkeletonItem::List itemList = items();
-    KConfigSkeletonItem::List::Iterator it;
+    TDEConfigSkeletonItem::List itemList = items();
+    TDEConfigSkeletonItem::List::Iterator it;
 
     for ( it = itemList.begin(); it != itemList.end(); ++it ) {
         (*it)->setGroup( prefix + ':' + (*it)->group() );
diff --git a/kresources/caldav/preferences.h b/kresources/caldav/preferences.h
index d21be84c3..fe585406e 100644
--- a/kresources/caldav/preferences.h
+++ b/kresources/caldav/preferences.h
@@ -100,7 +100,7 @@ public:
 protected:
 
     /**
-     * Add an unique prefix to KConfigGroup, so that different instances of the resource
+     * Add an unique prefix to TDEConfigGroup, so that different instances of the resource
      * can use the same config file.
      * @param prefix Unique prefix of the resource instance.
      */
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index 0ec3ceb6f..b9285e611 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -68,7 +68,7 @@ const int ResourceCalDav::DEFAULT_SAVE_POLICY       = ResourceCached::SaveDelaye
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCalDav::ResourceCalDav( const KConfig *config ) :
+ResourceCalDav::ResourceCalDav( const TDEConfig *config ) :
     ResourceCached(config)
     , readLockout(false)
     , mAllWritesComplete(false)
@@ -213,13 +213,13 @@ KABC::Lock* ResourceCalDav::lock() {
     return &mLock;
 }
 
-void ResourceCalDav::readConfig( const KConfig *config ) {
+void ResourceCalDav::readConfig( const TDEConfig *config ) {
     log("readConfig");
     mPrefs->readConfig();
     ResourceCached::readConfig(config);
 }
 
-void ResourceCalDav::writeConfig( KConfig *config ) {
+void ResourceCalDav::writeConfig( TDEConfig *config ) {
     log("writeConfig()");
     ResourceCalendar::writeConfig(config);
     mPrefs->writeConfig();
diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index 67eaa6c0d..ea04ef483 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -48,11 +48,11 @@ class KDE_EXPORT ResourceCalDav : public ResourceCached
 
 public:
 
-    explicit ResourceCalDav( const KConfig *config );
+    explicit ResourceCalDav( const TDEConfig *config );
     virtual ~ResourceCalDav();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     /**
      * @return This resource preferences.
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index 17e0216ab..5e46b611b 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -98,8 +98,8 @@ void CardDavPrefs::removeWallet(bool noWallet) {
 }
 
 void CardDavPrefs::addPrefix(const TQString& prefix) {
-    KConfigSkeletonItem::List itemList = items();
-    KConfigSkeletonItem::List::Iterator it;
+    TDEConfigSkeletonItem::List itemList = items();
+    TDEConfigSkeletonItem::List::Iterator it;
 
     for ( it = itemList.begin(); it != itemList.end(); ++it ) {
         (*it)->setGroup( prefix + ':' + (*it)->group() );
diff --git a/kresources/carddav/preferences.h b/kresources/carddav/preferences.h
index 0f074b4da..89a8ac585 100644
--- a/kresources/carddav/preferences.h
+++ b/kresources/carddav/preferences.h
@@ -91,7 +91,7 @@ public:
 protected:
 
     /**
-     * Add an unique prefix to KConfigGroup, so that different instances of the resource
+     * Add an unique prefix to TDEConfigGroup, so that different instances of the resource
      * can use the same config file.
      * @param prefix Unique prefix of the resource instance.
      */
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index f416a64ba..dae91c322 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -68,7 +68,7 @@ const int ResourceCardDav::DEFAULT_SAVE_POLICY       = ResourceCached::SaveDelay
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCardDav::ResourceCardDav( const KConfig *config ) :
+ResourceCardDav::ResourceCardDav( const TDEConfig *config ) :
     ResourceCached(config)
     , readLockout(false)
     , mAllWritesComplete(false)
@@ -217,14 +217,14 @@ KABC::Lock* ResourceCardDav::lock() {
     return &mLock;
 }
 
-void ResourceCardDav::readConfig( const KConfig *config ) {
+void ResourceCardDav::readConfig( const TDEConfig *config ) {
     log("readConfig");
     mPrefs->readConfig();
     // FIXME KABC
     //ResourceCached::readConfig(config);
 }
 
-void ResourceCardDav::writeConfig( KConfig *config ) {
+void ResourceCardDav::writeConfig( TDEConfig *config ) {
     log("writeConfig()");
     Resource::writeConfig(config);
     mPrefs->writeConfig();
diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h
index ff4c49674..cf5090e57 100644
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@@ -47,11 +47,11 @@ class KDE_EXPORT ResourceCardDav : public ResourceCached
 
 public:
 
-    explicit ResourceCardDav( const KConfig *config );
+    explicit ResourceCardDav( const TDEConfig *config );
     virtual ~ResourceCardDav();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     virtual Ticket *requestSaveTicket();
     virtual void releaseSaveTicket( Ticket* );
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 222c4f4f2..84e783827 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -57,7 +57,7 @@ static int rights( const KABC::Addressee &addr )
   return addr.custom( "EGWRESOURCE", "RIGHTS" ).toInt();
 }
 
-ResourceXMLRPC::ResourceXMLRPC( const KConfig *config )
+ResourceXMLRPC::ResourceXMLRPC( const TDEConfig *config )
   : ResourceCached( config ), mServer( 0 )
 {
   init();
@@ -122,7 +122,7 @@ ResourceXMLRPC::~ResourceXMLRPC()
   mSynchronizer = 0;
 }
 
-void ResourceXMLRPC::writeConfig( KConfig *config )
+void ResourceXMLRPC::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 93ba66509..d9b745aa3 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -26,7 +26,7 @@
 
 #include "libtdepim/kabcresourcecached.h"
 
-class KConfig;
+class TDEConfig;
 class Synchronizer;
 
 namespace KXMLRPC {
@@ -43,12 +43,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
   
 
   public:
-    ResourceXMLRPC( const KConfig* );
+    ResourceXMLRPC( const TDEConfig* );
     ResourceXMLRPC( const TQString &url, const TQString &domain,
                     const TQString &user, const TQString &password );
     ~ResourceXMLRPC();
 
-    virtual void writeConfig( KConfig* );
+    virtual void writeConfig( TDEConfig* );
 
     EGroupwarePrefs *prefs() const { return mPrefs; }
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 8841da75e..1224a27c8 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -103,7 +103,7 @@ static int rights( Incidence *incidence )
   return incidence->customProperty( "EGWRESOURCE", "RIGHTS" ).toInt();
 }
 
-ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
+ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config )
   : ResourceCached( config ), mServer( 0 ), mLock( 0 )
 {
   init();
@@ -164,14 +164,14 @@ void ResourceXMLRPC::initEGroupware()
   KURL url( mPrefs->url() );
 }
 
-void ResourceXMLRPC::readConfig( const KConfig* config )
+void ResourceXMLRPC::readConfig( const TDEConfig* config )
 {
   mPrefs->readConfig();
 
   ResourceCached::readConfig( config );
 }
 
-void ResourceXMLRPC::writeConfig( KConfig* config )
+void ResourceXMLRPC::writeConfig( TDEConfig* config )
 {
   ResourceCalendar::writeConfig( config );
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index de6033078..5253babaa 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -56,12 +56,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
   
 
   public:
-    ResourceXMLRPC( const KConfig* );
+    ResourceXMLRPC( const TDEConfig* );
     ResourceXMLRPC();
     virtual ~ResourceXMLRPC();
 
-    void readConfig( const KConfig* config );
-    void writeConfig( KConfig* config );
+    void readConfig( const TDEConfig* config );
+    void writeConfig( TDEConfig* config );
 
     EGroupwarePrefs *prefs() const { return mPrefs; }
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index c9a9a1bfd..1b19831bc 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -49,7 +49,7 @@ static const TQString AddNoteCommand = "infolog.boinfolog.write";
 static const TQString DeleteNoteCommand = "infolog.boinfolog.delete";
 static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories";
 
-ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
+ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config )
   : ResourceNotes( config ),  mCalendar( TQString::fromLatin1("UTC") ),
     mServer( 0 )
 {
@@ -94,12 +94,12 @@ void ResourceXMLRPC::init()
   mSynchronizer = new Synchronizer;
 }
 
-void ResourceXMLRPC::readConfig( const KConfig* )
+void ResourceXMLRPC::readConfig( const TDEConfig* )
 {
   mPrefs->readConfig();
 }
 
-void ResourceXMLRPC::writeConfig( KConfig* config )
+void ResourceXMLRPC::writeConfig( TDEConfig* config )
 {
   ResourceNotes::writeConfig( config );
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index c7bee901e..df8a4dd36 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -52,12 +52,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
   
 
   public:
-    ResourceXMLRPC( const KConfig* );
+    ResourceXMLRPC( const TDEConfig* );
     ResourceXMLRPC();
     virtual ~ResourceXMLRPC();
 
-    void readConfig( const KConfig* config );
-    void writeConfig( KConfig* config );
+    void readConfig( const TDEConfig* config );
+    void writeConfig( TDEConfig* config );
 
     EGroupwarePrefs *prefs() const { return mPrefs; }
 
diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h
index 97270e318..e9183bd20 100644
--- a/kresources/egroupware/synchronizer.h
+++ b/kresources/egroupware/synchronizer.h
@@ -36,15 +36,15 @@
 
     ...
 
-    job = KIO::file_copy( url, file, -1, true );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotResult( KIO::Job * ) ) );
+    job = TDEIO::file_copy( url, file, -1, true );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
     mSynchronizer.start(); // will block here until the slot was called
     ...
 
 
-    void slotResult( KIO::Job* )
+    void slotResult( TDEIO::Job* )
     {
       mSynchronizer.stop();
     }
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index fd12d174d..d43613e65 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -69,7 +69,7 @@ void Query::call( const TQString &server, const TQString &method,
   TQDataStream stream( postData, IO_WriteOnly );
   stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.utf8().length() );
 
-  KIO::TransferJob *job = KIO::http_post( KURL( server ), postData, false );
+  TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false );
   if ( !job ) {
     kdWarning() << "Unable to create KIO job for " << server << endl;
     return;
@@ -78,22 +78,22 @@ void Query::call( const TQString &server, const TQString &method,
   job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
   job->addMetaData( "ConnectTimeout", "50" );
 
-  connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
   m_pendingJobs.append( job );
 }
 
-void Query::slotData( KIO::Job *, const TQByteArray &data )
+void Query::slotData( TDEIO::Job *, const TQByteArray &data )
 {
   unsigned int oldSize = m_buffer.size();
   m_buffer.resize( oldSize + data.size() );
   memcpy( m_buffer.data() + oldSize, data.data(), data.size() );
 }
 
-void Query::slotResult( KIO::Job *job )
+void Query::slotResult( TDEIO::Job *job )
 {
   m_pendingJobs.remove( job );
 
@@ -316,7 +316,7 @@ Query::Query( const TQVariant &id, TQObject *parent, const char *name )
 
 Query::~Query()
 {
-  TQValueList<KIO::Job*>::Iterator it;
+  TQValueList<TDEIO::Job*>::Iterator it;
   for ( it = m_pendingJobs.begin(); it != m_pendingJobs.end(); ++it )
     (*it)->kill();
 }
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index 395cf2372..df2f3a6da 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -18,7 +18,7 @@
 #include <tqvariant.h>
 #include <tqvaluelist.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -51,8 +51,8 @@ namespace KXMLRPC
       void finished( Query* );
 
     private slots:
-      void slotData( KIO::Job *job, const TQByteArray &data );
-      void slotResult( KIO::Job *job );
+      void slotData( TDEIO::Job *job, const TQByteArray &data );
+      void slotResult( TDEIO::Job *job );
 
     private:
       bool isMessageResponse( const TQDomDocument &doc ) const;
@@ -72,7 +72,7 @@ namespace KXMLRPC
       TQByteArray m_buffer;
       TQVariant m_id;
 
-      TQValueList<KIO::Job*> m_pendingJobs;
+      TQValueList<TDEIO::Job*> m_pendingJobs;
   };
 
   class Server : public TQObject
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index eb90b8c4a..1f6779a81 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -72,7 +72,7 @@ public:
   long updateWatch;
 };
 
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
   : ResourceCalendar( config ), mClient(0), mMonitor(0), mCache(0), mDates(0),
     mEventDates(0), mCacheDates(0)
 {
@@ -106,7 +106,7 @@ ResourceExchange::~ResourceExchange()
   delete mAccount; mAccount = 0;
 }
 
-void ResourceExchange::writeConfig( KConfig* config )
+void ResourceExchange::writeConfig( TDEConfig* config )
 {
   ResourceCalendar::writeConfig( config );
   config->writeEntry( "ExchangeHost", mAccount->host() );
diff --git a/kresources/exchange/resourceexchange.h b/kresources/exchange/resourceexchange.h
index b59b66567..9b414dbb7 100644
--- a/kresources/exchange/resourceexchange.h
+++ b/kresources/exchange/resourceexchange.h
@@ -51,10 +51,10 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
   
 
   public:
-    ResourceExchange( const KConfig * );
+    ResourceExchange( const TDEConfig * );
     virtual ~ResourceExchange();
 
-    virtual void writeConfig( KConfig* config );
+    virtual void writeConfig( TDEConfig* config );
 
     KABC::Lock *lock();
 
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index 349e4ad56..762bee1f8 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -43,7 +43,7 @@
 
 using namespace KCal;
 
-ResourceFeaturePlan::ResourceFeaturePlan( const KConfig *config )
+ResourceFeaturePlan::ResourceFeaturePlan( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   mPrefs = new Prefs;
@@ -60,12 +60,12 @@ Prefs *ResourceFeaturePlan::prefs()
   return mPrefs;
 }
 
-void ResourceFeaturePlan::readConfig( const KConfig * )
+void ResourceFeaturePlan::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 }
 
-void ResourceFeaturePlan::writeConfig( KConfig *config )
+void ResourceFeaturePlan::writeConfig( TDEConfig *config )
 {
   ResourceCalendar::writeConfig( config );
 
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h
index 0e666704e..2808aef71 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.h
+++ b/kresources/featureplan/kcal_resourcefeatureplan.h
@@ -42,11 +42,11 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
     Q_OBJECT
   
   public:
-    ResourceFeaturePlan( const KConfig * );
+    ResourceFeaturePlan( const TDEConfig * );
     virtual ~ResourceFeaturePlan();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     Prefs *prefs();
 
diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h
index 7a716800b..425c63712 100644
--- a/kresources/groupdav/groupdavaddressbookadaptor.h
+++ b/kresources/groupdav/groupdavaddressbookadaptor.h
@@ -47,20 +47,20 @@ class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return GroupDavGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return GroupDavGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return GroupDavGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
         { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); }
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ )
         { return GroupDavGlobals::interpretListItemsJob( this, job ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return GroupDavGlobals::interpretAddressBookDownloadItemsJob(
            this, job, jobData ); }
 
diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h
index 15b41de80..b1a0bd366 100644
--- a/kresources/groupdav/groupdavcalendaradaptor.h
+++ b/kresources/groupdav/groupdavcalendaradaptor.h
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -56,20 +56,20 @@ class GroupDavCalendarAdaptor : public DavCalendarAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return GroupDavGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return GroupDavGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return GroupDavGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, KPIM::GroupwareUploadItem *deletedItem )
         { return GroupDavGlobals::createRemoveJob( this, uploadurl, deletedItem ); }
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &/*jobData*/ )
         { return GroupDavGlobals::interpretListItemsJob( this, job ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return GroupDavGlobals::interpretCalendarDownloadItemsJob( this, job, jobData );  }
 
 
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 896680e9e..5088bca96 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -37,7 +37,7 @@
 #include <kio/davjob.h>
 #include <kio/job.h>
 
-TQString GroupDavGlobals::extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ )
+TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   const TQString& headers = job->queryMetaData( "HTTP-Headers" );
   return WebdavHandler::getEtagFromHeaders( headers );
@@ -93,7 +93,7 @@ bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 
 
 
-KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
+TDEIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
@@ -103,11 +103,11 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 //  WebdavHandler::addElement( doc, prop, "d:hassubs" );
 
   kdDebug(7000) << "props: " << doc.toString() << endl;
-  return KIO::davPropFind( url, doc, "1", false );
+  return TDEIO::davPropFind( url, doc, "1", false );
 }
 
 
-KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "propfind" );
@@ -115,7 +115,7 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
   WebdavHandler::addDavElement( doc, prop, "getetag" );
 //  WebdavHandler::addDavElement( doc, prop, "getcontenttype" );
   kdDebug(5800) << "props = "<< doc.toString() << endl;
-  KIO::TransferJob *job = KIO::davPropFind( url, doc, "1", false );
+  TDEIO::TransferJob *job = TDEIO::davPropFind( url, doc, "1", false );
   if ( job ) {
     job->addMetaData( "accept", "text/xml" );
     job->addMetaData( "customHTTPHeader", "accept-encoding: " );
@@ -124,11 +124,11 @@ KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 }
 
 
-KIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+TDEIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                     const KURL &url, KPIM::FolderLister::ContentType /*ctype*/ )
 {
 kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl;
-  KIO::TransferJob *job = KIO::get( url, false, false );
+  TDEIO::TransferJob *job = TDEIO::get( url, false, false );
   if ( adaptor ) {
     TQString mt = adaptor->mimeType();
     job->addMetaData( "accept", mt );
@@ -138,7 +138,7 @@ kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl;
 }
 
 
-KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/,
+TDEIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*uploadurl*/,
        KPIM::GroupwareUploadItem *deletedItem )
 {
   if ( !deletedItem ) return 0;
@@ -147,10 +147,10 @@ KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor,
   if ( adaptor ) {
     adaptor->adaptUploadUrl( url );
   }
-  KIO::Job *delJob = 0;
+  TDEIO::Job *delJob = 0;
   if ( !url.isEmpty() ) {
     kdDebug(5700) << "Delete: " <<   url.url() << endl;
-    delJob = KIO::file_delete( url, false );
+    delJob = TDEIO::file_delete( url, false );
   }
   if ( delJob && adaptor && adaptor->idMapper() ) {
     kdDebug(5800 ) << "Adding If-Match metadata: " << adaptor->idMapper()->fingerprint( deletedItem->uid() ) << endl;
@@ -176,16 +176,16 @@ kdDebug() << "Deleting item at "<< url.url() << endl;
     }
     kdDebug(5700) << "Delete (Mod) : " <<   url.url() << endl;
   }
-  return KIO::file_del( urls, false, false );*/
+  return TDEIO::file_del( urls, false, false );*/
 }
 
 
 
 
 bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-                                        KIO::Job *job )
+                                        TDEIO::Job *job )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job);
 
   if ( !davjob ) {
     return false;
@@ -225,7 +225,7 @@ bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor
 
 
 bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                         KIO::Job *job, const TQString &jobData )
+                                         TDEIO::Job *job, const TQString &jobData )
 {
 kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl;
 kdDebug(5800) << jobData << endl;
@@ -244,7 +244,7 @@ kdDebug(5800) << jobData << endl;
 
     KCal::Incidence *inc = (raw.front())->clone();
     if ( !inc ) return false;
-    KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob *>(job);
+    TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob *>(job);
     KURL remoteId;
     if ( sjob ) remoteId = sjob->url();
     TQString fingerprint = extractFingerprint( job, jobData );
@@ -259,7 +259,7 @@ kdDebug(5800) << jobData << endl;
 
 
 bool GroupDavGlobals::interpretAddressBookDownloadItemsJob(
-      KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &jobData )
+      KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData )
 {
 kdDebug(5800) << "GroupDavGlobals::interpretAddressBookDownloadItemsJob, vCard=" << endl;
 kdDebug(5800) << jobData << endl;
@@ -275,7 +275,7 @@ kdDebug(5800) << jobData << endl;
 
   KABC::Addressee a = addrs.first();
 
-  KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob*>(job);
+  TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob*>(job);
   KURL remoteId;
   if ( sjob ) remoteId = sjob->url();
   TQString fingerprint = extractFingerprint( job, jobData );
diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h
index 14ae7a3c8..e7f2b06e7 100644
--- a/kresources/groupdav/groupdavglobals.h
+++ b/kresources/groupdav/groupdavglobals.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class GroupwareDataAdaptor;
 class GroupwareUploadItem;
 }
-namespace KIO {
+namespace TDEIO {
 class TransferJob;
 class Job;
 }
@@ -47,26 +47,26 @@ class GroupDavGlobals
 {
   public:
     GroupDavGlobals() {}
-    static TQString extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ );
+    static TQString extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ );
     static KPIM::FolderLister::ContentType getContentType( const TQDomElement &prop );
     static KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode );
     static bool getFolderHasSubs( const TQDomNode &folderNode );
 
 
-    static KIO::Job *createListFoldersJob( const KURL &url );
-    static KIO::TransferJob *createListItemsJob( const KURL &url );
-    static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+    static TDEIO::Job *createListFoldersJob( const KURL &url );
+    static TDEIO::TransferJob *createListItemsJob( const KURL &url );
+    static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                        const KURL &url, KPIM::FolderLister::ContentType ctype );
-    static KIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl,
+    static TDEIO::Job *createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &uploadurl,
                           KPIM::GroupwareUploadItem *deletedItems );
 
 
     static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-                                       KIO::Job *job );
+                                       TDEIO::Job *job );
     static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
     static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
 
 };
 
diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/kresources/groupdav/kabc_resourcegroupdav.cpp
index 568f6fc5a..54a02a0ad 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.cpp
+++ b/kresources/groupdav/kabc_resourcegroupdav.cpp
@@ -27,7 +27,7 @@
 
 using namespace KABC;
 
-ResourceGroupDav::ResourceGroupDav( const KConfig *config )
+ResourceGroupDav::ResourceGroupDav( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index 662af282f..ca7ed96d3 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -33,7 +33,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
   
 
   public:
-    ResourceGroupDav( const KConfig * );
+    ResourceGroupDav( const TDEConfig * );
 //     ResourceGroupDav( const KURL &url,
 //             const TQString &user, const TQString &password );
   protected:
diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/kresources/groupdav/kcal_resourcegroupdav.cpp
index eef95c6e0..b93ba7693 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.cpp
+++ b/kresources/groupdav/kcal_resourcegroupdav.cpp
@@ -32,7 +32,7 @@ ResourceGroupDav::ResourceGroupDav()
   init();
 }
 
-ResourceGroupDav::ResourceGroupDav( const KConfig *config )
+ResourceGroupDav::ResourceGroupDav( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h
index 102a5021b..dba9bd274 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.h
+++ b/kresources/groupdav/kcal_resourcegroupdav.h
@@ -37,7 +37,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
   
   public:
     ResourceGroupDav();
-    ResourceGroupDav( const KConfig * );
+    ResourceGroupDav( const TDEConfig * );
 
   protected:
     void init();
diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp
index c7950bcb0..3c9d9792c 100644
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@@ -34,7 +34,7 @@
 
 using namespace KABC;
 
-ResourceGroupware::ResourceGroupware( const KConfig *config )
+ResourceGroupware::ResourceGroupware( const TDEConfig *config )
   : ResourceCached( config )
 {
   init();
@@ -78,14 +78,14 @@ ResourceGroupware::~ResourceGroupware()
   mPrefs = 0;
 }
 
-void ResourceGroupware::readConfig( const KConfig * )
+void ResourceGroupware::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 
   readAddressBooks();
 }
 
-void ResourceGroupware::writeConfig( KConfig *config )
+void ResourceGroupware::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -244,12 +244,12 @@ bool ResourceGroupware::asyncLoad()
   mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") );
@@ -300,7 +300,7 @@ bool ResourceGroupware::asyncSave( Ticket* )
   return true;
 }
 
-void ResourceGroupware::slotJobResult( KIO::Job *job )
+void ResourceGroupware::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupware::slotJobResult(): " << endl;
 
@@ -341,14 +341,14 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupware::slotJobData()" << endl;
 
   mJobData.append( data.data() );
 }
 
-void ResourceGroupware::slotJobPercent( KIO::Job *, unsigned long percent )
+void ResourceGroupware::slotJobPercent( TDEIO::Job *, unsigned long percent )
 {
   kdDebug() << "ResourceGroupware::slotJobPercent() " << percent << endl;
   if ( mProgress ) mProgress->setProgress( percent );
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index 995301fc8..53c1d007a 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -26,7 +26,7 @@
 
 #include <kio/job.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KABC {
 
@@ -38,13 +38,13 @@ class ResourceGroupware : public ResourceCached
   
 
   public:
-    ResourceGroupware( const KConfig * );
+    ResourceGroupware( const TDEConfig * );
     ResourceGroupware( const KURL &url,
                        const TQString &user, const TQString &password );
     ~ResourceGroupware();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     void readAddressBooks();
     void writeAddressBooks();
@@ -68,16 +68,16 @@ class ResourceGroupware : public ResourceCached
     void init();
 
   private slots:
-    void slotJobResult( KIO::Job * );
-    void slotJobData( KIO::Job *, const TQByteArray & );
-    void slotJobPercent( KIO::Job *job, unsigned long percent );
+    void slotJobResult( TDEIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
+    void slotJobPercent( TDEIO::Job *job, unsigned long percent );
 
     void cancelLoad();
 
   private:
     GroupwarePrefs *mPrefs;
 
-    KIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
     TQString mJobData;
 };
diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp
index 6af5dce26..79658bb6a 100644
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@@ -55,7 +55,7 @@ ResourceGroupware::ResourceGroupware()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceGroupware::ResourceGroupware( const KConfig *config )
+ResourceGroupware::ResourceGroupware( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -96,7 +96,7 @@ GroupwarePrefsBase *ResourceGroupware::prefs()
   return mPrefs;
 }
 
-void ResourceGroupware::readConfig( const KConfig *config )
+void ResourceGroupware::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupware::readConfig()" << endl;
 
@@ -105,7 +105,7 @@ void ResourceGroupware::readConfig( const KConfig *config )
   ResourceCached::readConfig( config );
 }
 
-void ResourceGroupware::writeConfig( KConfig *config )
+void ResourceGroupware::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupware::writeConfig()" << endl;
 
@@ -159,10 +159,10 @@ bool ResourceGroupware::doLoad()
   mJobData = TQString();
 
   mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
@@ -173,7 +173,7 @@ bool ResourceGroupware::doLoad()
   return true;
 }
 
-void ResourceGroupware::slotJobResult( KIO::Job *job )
+void ResourceGroupware::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupware::slotJobResult(): " << endl;
 
@@ -221,7 +221,7 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupware::slotJobData()" << endl;
 
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 9674b0bf5..d3c809db7 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -46,11 +46,11 @@ class ResourceGroupware : public ResourceCached
   public:
     ResourceGroupware();
   
-    ResourceGroupware( const KConfig * );
+    ResourceGroupware( const TDEConfig * );
     virtual ~ResourceGroupware();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     GroupwarePrefsBase *prefs();
 
@@ -70,8 +70,8 @@ class ResourceGroupware : public ResourceCached
   protected slots:
     void loadFinished();
 
-    void slotJobResult( KIO::Job * );
-    void slotJobData( KIO::Job *, const TQByteArray & );
+    void slotJobResult( TDEIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
 
     void cancelLoad();
 
@@ -79,7 +79,7 @@ class ResourceGroupware : public ResourceCached
     GroupwarePrefsBase *mPrefs;
     KABC::LockNull mLock;
 
-    KIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
     TQString mJobData;
 
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index d14d1a419..b3930bfbe 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -33,7 +33,7 @@
 
 using namespace KABC;
 
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
   : ResourceCached( config )
 {
   init();
@@ -95,14 +95,14 @@ ResourceGroupwise::~ResourceGroupwise()
   mPrefs = 0;
 }
 
-void ResourceGroupwise::readConfig( const KConfig * )
+void ResourceGroupwise::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 
   readAddressBooks();
 }
 
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -346,18 +346,18 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
     return;
   }
 
-  mJob = KIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
+  mJob = TDEIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
                                          // contains no address book IDs
   kdDebug() << "  Job address: " << mJob << endl;
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   if ( bookType == System )
   {
-    connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
+    connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) );
     mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
         i18n( "Fetching System Address Book" ), TQString(),
@@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
   else
   {
-    connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
+    connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) );
     mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
         mProgress, KPIM::ProgressManager::getUniqueID(),
         i18n( "Fetching User Address Books" ), TQString(),
@@ -378,7 +378,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   return;
 }
 
-void ResourceGroupwise::fetchSABResult( KIO::Job *job )
+void ResourceGroupwise::fetchSABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::fetchSABResult() " << endl;
 
@@ -402,7 +402,7 @@ void ResourceGroupwise::fetchSABResult( KIO::Job *job )
     loadCompleted();
 }
 
-void ResourceGroupwise::fetchUABResult( KIO::Job *job )
+void ResourceGroupwise::fetchUABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::fetchUABResult() " << endl;
 
@@ -444,19 +444,19 @@ void ResourceGroupwise::updateSystemAddressBook()
       false /*CannotBeCancelled*/,
       mPrefs->url().startsWith("https" ) );
 
-  mJob = KIO::get( url, false, false );
+  mJob = TDEIO::get( url, false, false );
   mJob->setInteractive( false );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( updateSABResult( KIO::Job * ) ) );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotUpdateJobData( KIO::Job *, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( updateSABResult( TDEIO::Job * ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
 
   return;
 }
 
-void ResourceGroupwise::updateSABResult( KIO::Job *job )
+void ResourceGroupwise::updateSABResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::updateSABResult() " << endl;
 
@@ -467,7 +467,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
 
   int errorCode = job->error();
   if ( errorCode != 0 ) {
-    if ( errorCode == KIO::ERR_NO_CONTENT ) // we need to refresh the SAB
+    if ( errorCode == TDEIO::ERR_NO_CONTENT ) // we need to refresh the SAB
     {
       kdDebug() << "  update SAB failed, fetching all of it again" << endl;
       mPrefs->setLastSequenceNumber( 0 );
@@ -486,7 +486,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
     loadCompleted();
 }
 
-void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data )
+void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &data )
 {
   kdDebug() << "ResourceGroupwise::slotReadJobData()" << endl;
   Q_UNUSED( job );
@@ -520,7 +520,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data
   mJobData = TQString();
 }
 
-void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
+void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &data )
 {
   kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl;
   kdDebug() << "  Job address: " << job << endl;
@@ -585,7 +585,7 @@ void ResourceGroupwise::loadCompleted()
   addressBook()->emitAddressBookChanged();
 }
 
-void ResourceGroupwise::slotJobPercent( KIO::Job *, unsigned long percent )
+void ResourceGroupwise::slotJobPercent( TDEIO::Job *, unsigned long percent )
 {
   // TODO: make this act on the correct progress item
   kdDebug() << "ResourceGroupwise::slotJobPercent() " << percent << endl;
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index 23912916e..658ddd76b 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -29,7 +29,7 @@
 
 #include <kio/job.h>
 
-class KConfig;
+class TDEConfig;
 
 class GroupwiseServer;
 
@@ -45,15 +45,15 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
   
 
   public:
-    ResourceGroupwise( const KConfig * );
+    ResourceGroupwise( const TDEConfig * );
     ResourceGroupwise( const KURL &url,
                        const TQString &user, const TQString &password,
                        const TQStringList &readAddressBooks,
                        const TQString &writeAddressBook );
     ~ResourceGroupwise();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     void readAddressBooks();
     void writeAddressBooks();
@@ -137,14 +137,14 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
 
   private slots:
     /** STATE CHANGING SLOTS **/
-    void fetchSABResult( KIO::Job * );
-    void fetchUABResult( KIO::Job * );
-    void updateSABResult( KIO::Job * );
+    void fetchSABResult( TDEIO::Job * );
+    void fetchUABResult( TDEIO::Job * );
+    void updateSABResult( TDEIO::Job * );
     /** DATA PROCESSING SLOTS **/
-    void slotReadJobData( KIO::Job *, const TQByteArray & );
-    void slotUpdateJobData( KIO::Job *, const TQByteArray & );
+    void slotReadJobData( TDEIO::Job *, const TQByteArray & );
+    void slotUpdateJobData( TDEIO::Job *, const TQByteArray & );
     /** HELPER TQT_SLOT **/
-    void slotJobPercent( KIO::Job *job, unsigned long percent );
+    void slotJobPercent( TDEIO::Job *job, unsigned long percent );
 
     void cancelLoad();
   private:
@@ -153,7 +153,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
 
     GroupwiseServer *mServer;
 
-    KIO::TransferJob *mJob;
+    TDEIO::TransferJob *mJob;
     KPIM::ProgressItem *mProgress;
     KPIM::ProgressItem *mSABProgress;
     KPIM::ProgressItem *mUABProgress;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 060fe5f20..ed5fd3ae7 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -55,7 +55,7 @@ ResourceGroupwise::ResourceGroupwise()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -92,7 +92,7 @@ GroupwisePrefsBase *ResourceGroupwise::prefs()
   return mPrefs;
 }
 
-void ResourceGroupwise::readConfig( const KConfig *config )
+void ResourceGroupwise::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupwise::readConfig()" << endl;
 
@@ -101,7 +101,7 @@ void ResourceGroupwise::readConfig( const KConfig *config )
   ResourceCached::readConfig( config );
 }
 
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceGroupwise::writeConfig()" << endl;
 
@@ -157,11 +157,11 @@ bool ResourceGroupwise::doLoad()
 
   mJobData = TQString();
 
-  mDownloadJob = KIO::get( url, false, false );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+  mDownloadJob = TDEIO::get( url, false, false );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
@@ -172,7 +172,7 @@ bool ResourceGroupwise::doLoad()
   return true;
 }
 
-void ResourceGroupwise::slotJobResult( KIO::Job *job )
+void ResourceGroupwise::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceGroupwise::slotJobResult(): " << endl;
 
@@ -220,7 +220,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
   mProgress = 0;
 }
 
-void ResourceGroupwise::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupwise::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
 //  kdDebug() << "ResourceGroupwise::slotJobData()" << endl;
 
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index 09e0b6d47..088e624a6 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -49,11 +49,11 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
   public:
     ResourceGroupwise();
   
-    ResourceGroupwise( const KConfig * );
+    ResourceGroupwise( const TDEConfig * );
     virtual ~ResourceGroupwise();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     GroupwisePrefsBase *prefs();
 
@@ -73,8 +73,8 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
     bool confirmSave();
 
   protected slots:
-    void slotJobResult( KIO::Job * );
-    void slotJobData( KIO::Job *, const TQByteArray & );
+    void slotJobResult( TDEIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
 
     void cancelLoad();
 
@@ -82,7 +82,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
     GroupwisePrefsBase *mPrefs;
     KABC::LockNull mLock;
 
-    KIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
     TQString mJobData;
 
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index e22d95dd5..c3addd3b0 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -381,7 +381,7 @@ void Groupwise::updateAddressbook( const KURL &url )
       kdDebug() << "  Updating Addressbook" << endl;
       if ( !server.updateAddressBooks( ids, lastSequenceNumber + 1, lastPORebuildTime ) )
       {
-        error( KIO::ERR_NO_CONTENT, server.errorText() );
+        error( TDEIO::ERR_NO_CONTENT, server.errorText() );
         //errorMessage( i18n("Unable to update addressbook data: ") + server.errorText() );
       }
       kdDebug() << "  Logout" << endl;
@@ -393,7 +393,7 @@ void Groupwise::updateAddressbook( const KURL &url )
 
 void Groupwise::errorMessage( const TQString &msg )
 {
-  error( KIO::ERR_SLAVE_DEFINED, msg );
+  error( TDEIO::ERR_SLAVE_DEFINED, msg );
 }
 
 void Groupwise::debugMessage( const TQString &msg )
diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h
index 3d110af8e..c5f109d30 100644
--- a/kresources/groupwise/kioslave/groupwise.h
+++ b/kresources/groupwise/kioslave/groupwise.h
@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 
-class Groupwise : public TQObject, public KIO::SlaveBase
+class Groupwise : public TQObject, public TDEIO::SlaveBase
 {
     Q_OBJECT
   
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 9a2f44274..9112fdeab 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -284,7 +284,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
   mSoap->frecv = myReceiveCallback;
   mSoap->fclose = myClose;
 
-  KConfig cfg( "groupwiserc" );
+  TDEConfig cfg( "groupwiserc" );
   cfg.setGroup( "Debug" );
   mLogFile = cfg.readEntry( "LogFile" );
   
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index cd66fc500..90ccf83d6 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -161,14 +161,14 @@ TQString KSSLSocket::metaData( const TQString &key )
 }
 
 /*
-I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting.
+I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting.
 
  * Copyright (C) 2000 Alex Zepeda <[email protected]
  * Copyright (C) 2001-2003 George Staikos <[email protected]>
  * Copyright (C) 2001 Dawit Alemayehu <[email protected]>
 */
 
-int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
+int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
 	const TQString &buttonYes, const TQString &buttonNo )
 {
 	kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
@@ -324,7 +324,7 @@ int KSSLSocket::verifyCertificate()
 						TQString msg = i18n("The IP address of the host %1 "
 								"does not match the one the "
 								"certificate was issued to.");
-						result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
+						result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
 						msg.arg(ourHost),
 						i18n("Server Authentication"),
 						i18n("&Details"),
@@ -334,7 +334,7 @@ int KSSLSocket::verifyCertificate()
 					{
 						TQString msg = i18n("The server certificate failed the "
 							"authenticity test (%1).");
-						result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
+						result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
 						msg.arg(ourHost),
 						i18n("Server Authentication"),
 						i18n("&Details"),
@@ -348,7 +348,7 @@ int KSSLSocket::verifyCertificate()
 					rc = 1;
 					cp = KSSLCertificateCache::Accept;
 					doAddHost = true;
-					result = messageBox( KIO::SlaveBase::WarningYesNo,
+					result = messageBox( TDEIO::SlaveBase::WarningYesNo,
 							i18n("Would you like to accept this "
 							"certificate forever without "
 							"being prompted?"),
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index a83672369..c19b440a1 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -46,7 +46,7 @@ class KSSLSocket : public KExtendedSocket
 
 	private:
 		int verifyCertificate();
-		int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
+		int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text,
 			const TQString &caption,	const TQString &buttonYes, const TQString &buttonNo );
 
 
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index a17c340b8..ff8f869b7 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -1276,9 +1276,9 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   TQImage img;
   if ( !picture.isIntern() && !picture.url().isEmpty() ) {
     TQString tmpFile;
-    if ( KIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
+    if ( TDEIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
       img.load( tmpFile );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
   } else
     img = picture.data();
@@ -1305,13 +1305,13 @@ TQByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
   TQByteArray data;
   if ( !sound.isIntern() && !sound.url().isEmpty() ) {
     TQString tmpFile;
-    if ( KIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) {
+    if ( TDEIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) {
       TQFile f( tmpFile );
       if ( f.open( IO_ReadOnly ) ) {
         data = f.readAll();
         f.close();
       }
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
   } else
     data = sound.data();
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index 438696412..ce7c18c42 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -58,7 +58,7 @@ using namespace Kolab;
 class KolabFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceKolab( config );
     }
@@ -76,7 +76,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
 static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
 static const char* s_inlineMimeType = "text/x-vcard";
 
-KABC::ResourceKolab::ResourceKolab( const KConfig *config )
+KABC::ResourceKolab::ResourceKolab( const TDEConfig *config )
   : KPIM::ResourceABC( config ),
     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
     mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
@@ -96,12 +96,12 @@ KABC::ResourceKolab::~ResourceKolab()
   }
 }
 
-void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config,
+void KABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config,
                                                  const TQString& name,
                                                  const TQString& label,
                                                  bool writable )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   int completionWeight = group.readNumEntry( "CompletionWeight", 80 );
   mSubResources.insert( name, Kolab::SubResource( active, writable, label,
@@ -110,7 +110,7 @@ void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config,
 
 bool KABC::ResourceKolab::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   // Read the calendar entries
   TQValueList<KMailICalIface::SubResource> subResources;
@@ -527,7 +527,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "Contact" );
   loadSubResourceConfig( config, subResource, label, writable );
   loadSubResource( subResource );
@@ -547,7 +547,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
@@ -681,7 +681,7 @@ bool KABC::ResourceKolab::removeSubresource( const TQString& id )
 
 void KABC::ResourceKolab::writeConfig()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   Kolab::ResourceMap::ConstIterator it;
   for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it ) {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index d27a97c92..3a142b209 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -59,7 +59,7 @@ public:
   /**
    * Constructor
    */
-  ResourceKolab( const KConfig* );
+  ResourceKolab( const TDEConfig* );
 
   /**
    * Destructor.
@@ -155,7 +155,7 @@ protected:
 
   void doClose();
 
-  void loadSubResourceConfig( KConfig& config, const TQString& name,
+  void loadSubResourceConfig( TDEConfig& config, const TQString& name,
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index db69b8969..55ac64205 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -37,7 +37,7 @@ using namespace Kolab;
 class KolabFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceKolab( config );
     }
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index edd94303c..44c13fd2b 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -68,7 +68,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal"
 static const char* incidenceInlineMimeType = "text/calendar";
 
 
-ResourceKolab::ResourceKolab( const KConfig *config )
+ResourceKolab::ResourceKolab( const TDEConfig *config )
   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
@@ -90,20 +90,20 @@ ResourceKolab::~ResourceKolab()
   }
 }
 
-void ResourceKolab::loadSubResourceConfig( KConfig& config,
+void ResourceKolab::loadSubResourceConfig( TDEConfig& config,
                                            const TQString& name,
                                            const TQString& label,
                                            bool writable,
                                            bool alarmRelevant,
                                            ResourceMap& subResource )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   subResource.insert( name, Kolab::SubResource( active, writable,
                                                 alarmRelevant, label ) );
 }
 
-bool ResourceKolab::openResource( KConfig& config, const char* contentType,
+bool ResourceKolab::openResource( TDEConfig& config, const char* contentType,
                                   ResourceMap& map )
 {
   // Read the subresource entries from KMail
@@ -125,7 +125,7 @@ bool ResourceKolab::doOpen()
     return true;
   mOpen = true;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "General" );
   mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200);
 
@@ -134,7 +134,7 @@ bool ResourceKolab::doOpen()
     && openResource( config, kmailJournalContentsType, mJournalSubResources );
 }
 
-static void writeResourceConfig( KConfig& config, ResourceMap& map )
+static void writeResourceConfig( TDEConfig& config, ResourceMap& map )
 {
   ResourceMap::ConstIterator it;
   for ( it = map.begin(); it != map.end(); ++it ) {
@@ -1077,7 +1077,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( subResource );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -1100,7 +1100,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     return;
 
   // Delete from the config file
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
@@ -1322,7 +1322,7 @@ TQString ResourceKolab::subresourceType( const TQString &resource )
 
 void ResourceKolab::writeConfig()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   writeResourceConfig( config, mEventSubResources );
   writeResourceConfig( config, mTodoSubResources );
   writeResourceConfig( config, mJournalSubResources );
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index e639d2606..fdf952cc3 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -56,7 +56,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
     friend struct TemporarySilencer;
 
 public:
-  ResourceKolab( const KConfig* );
+  ResourceKolab( const TDEConfig* );
   virtual ~ResourceKolab();
 
   /// Load resource data.
@@ -195,9 +195,9 @@ private:
   void incidenceUpdated( KCal::IncidenceBase* );
   void incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase);
 
-  bool openResource( KConfig& config, const char* contentType,
+  bool openResource( TDEConfig& config, const char* contentType,
                      Kolab::ResourceMap& map );
-  void loadSubResourceConfig( KConfig& config, const TQString& name,
+  void loadSubResourceConfig( TDEConfig& config, const TQString& name,
                               const TQString& label, bool writable,
                               bool alarmRelevant, Kolab::ResourceMap& subResource );
   bool loadSubResource( const TQString& subResource, const char* mimetype );
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index 151fa9f3d..eb56897ae 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -35,7 +35,7 @@
 class KolabFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new KCal::ResourceKolab( config );
   }
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index b92a723a5..a28a51b27 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -50,7 +50,7 @@ static const char* kmailContentsType = "Note";
 static const char* attachmentMimeType = "application/x-vnd.kolab.note";
 static const char* inlineMimeType = "text/calendar";
 
-ResourceKolab::ResourceKolab( const KConfig *config )
+ResourceKolab::ResourceKolab( const TDEConfig *config )
   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
     mCalendar( TQString::fromLatin1("UTC") )
 {
@@ -66,7 +66,7 @@ ResourceKolab::~ResourceKolab()
 
 bool ResourceKolab::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   // Get the list of Notes folders from KMail
@@ -88,7 +88,7 @@ bool ResourceKolab::doOpen()
 
 void ResourceKolab::doClose()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   Kolab::ResourceMap::ConstIterator it;
   for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it )
@@ -356,7 +356,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -379,7 +379,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   config.deleteEntry( subResource );
   config.sync();
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index f596d8f70..fb0d191b9 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -57,7 +57,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
   
 
 public:
-  ResourceKolab( const KConfig* );
+  ResourceKolab( const TDEConfig* );
   virtual ~ResourceKolab();
 
   /// Load resource data.
diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp
index fa187d2b9..f589986cb 100644
--- a/kresources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp
@@ -35,7 +35,7 @@
 class KolabFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new Kolab::ResourceKolab( config );
   }
diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am
index 10719ed53..37d08bedc 100644
--- a/kresources/lib/Makefile.am
+++ b/kresources/lib/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 ### We use three (or more) namespaces here in here - KPIM, KABC and KCal.
 ### When using multiple "using namespace foo" declarations, namespaced
 ### definitions cannot be resolved properly; we could use namespace foo { }
-### instead, but this breaks on KConfigXT generated code, which still uses
+### instead, but this breaks on TDEConfigXT generated code, which still uses
 ### "using namespace" and can't be fixed due to our backwards-compatibility
 ### requirements. This is only fatal when doing --enable-final, since only
 ### then do all the namespaces get mixed together.
diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp
index f96e353dd..5b4a0a521 100644
--- a/kresources/lib/davaddressbookadaptor.cpp
+++ b/kresources/lib/davaddressbookadaptor.cpp
@@ -36,9 +36,9 @@
 
 using namespace KABC;
 
-void DavAddressBookAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
+void DavAddressBookAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job );
   Q_ASSERT( davjob );
   if ( !davjob ) return;
 
diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h
index 55bb18193..f0f6f39d2 100644
--- a/kresources/lib/davaddressbookadaptor.h
+++ b/kresources/lib/davaddressbookadaptor.h
@@ -38,7 +38,7 @@ class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
         the job describes a folder of the appropriate type, by emitting 
         folderInfoRetrieved( href, displayName, type ). If the folder has
         subfolders, just emit retrieveSubfolder( href ) for each of them. */
-    virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
+    virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister );
     /** Returns the type of folder retrieved in the dom node. Typically, you'll
         compare the DAV:resourcetype property with some values. */
     virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index 206bb7e96..5d6be2da6 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -31,9 +31,9 @@ using namespace KCal;
 
 // TODO: This is exactly the same code as for the DavAddressBookAdaptor::interpretListFoldersJob!
 //       But as this emits a signal, it needs to be located inside a TQObject
-void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
+void DavCalendarAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>( job );
   Q_ASSERT( davjob );
   if ( !davjob ) return;
 
diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h
index 00134eda9..998a9cc7d 100644
--- a/kresources/lib/davcalendaradaptor.h
+++ b/kresources/lib/davcalendaradaptor.h
@@ -38,7 +38,7 @@ class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor
         the job describes a folder of the appropriate type, by emitting 
         folderInfoRetrieved( href, displayName, type ). If the folder has
         subfolders, just emit retrieveSubfolder( href ) for each of them. */
-    virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
+    virtual void interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister *folderLister );
     /** Returns the type of folder retrieved in the dom node. Typically, you'll
         compare the DAV:resourcetype property with some values. */
     virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index affc6af57..eb91243b7 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -177,7 +177,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
   TQStringList names;
   TQStringList active;
 
-//   KConfigGroup cfgg( newprefs->config(), "Folders" );
+//   TDEConfigGroup cfgg( newprefs->config(), "Folders" );
   int nr = 0;
   Entry::List::ConstIterator it;
   for( it = mFolders.begin(); it != mFolders.end(); ++it ) {
@@ -266,14 +266,14 @@ void FolderLister::doRetrieveFolder( const KURL &u )
     kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl;
   } else {
 
-    KIO::Job *listjob = createListFoldersJob( url );
+    TDEIO::Job *listjob = createListFoldersJob( url );
     if ( listjob ) {
       mUrls.append( url );
 
       kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" 
                     << url.prettyURL() << endl;
-      connect( listjob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotListJobResult( KIO::Job * ) ) );
+      connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) );
     } else {
       // TODO: Indicate a problem to the user!
       kdWarning() << "Unable to create the folder list job for the url " 
@@ -319,13 +319,13 @@ kdDebug() << "Folder "<< href << " is not of correct type ("<<type<<")"<<endl;
   }
 }
 
-void FolderLister::slotListJobResult( KIO::Job *job )
+void FolderLister::slotListJobResult( TDEIO::Job *job )
 {
   kdDebug(7000) << "OpenGroupware::slotListJobResult(): " << endl;
   kdDebug() << "URLS (" << mUrls.count() << "): " << mUrls.toStringList().join(" | ") << endl;
   kdDebug() << "Processed URLS (" << mProcessedPathes.count() << "): "
             << mProcessedPathes.join(" | ") << endl;
-  KIO::SimpleJob *j = dynamic_cast<KIO::SimpleJob*>(job);
+  TDEIO::SimpleJob *j = dynamic_cast<TDEIO::SimpleJob*>(job);
   if ( j ) {
     mUrls.remove( j->url() );
     mProcessedPathes.append( j->url().path(-1) );
@@ -346,7 +346,7 @@ void FolderLister::slotListJobResult( KIO::Job *job )
   }
 }
 
-void FolderLister::interpretListFoldersJob( KIO::Job *job )
+void FolderLister::interpretListFoldersJob( TDEIO::Job *job )
 {
   if ( adaptor() ) {
     adaptor()->interpretListFoldersJob( job, this );
@@ -357,7 +357,7 @@ void FolderLister::interpretListFoldersJob( KIO::Job *job )
   }
 }
 
-KIO::Job *FolderLister::createListFoldersJob( const KURL &url )
+TDEIO::Job *FolderLister::createListFoldersJob( const KURL &url )
 {
   if ( adaptor() ) {
     return adaptor()->createListFoldersJob( url );
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index 746c99a29..8248ec22a 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -33,11 +33,11 @@
 #include <tqstringlist.h>
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
-class KConfig;
+class TDEConfig;
 
 namespace KPIM {
 
@@ -100,7 +100,7 @@ class KDE_EXPORT FolderLister : public TQObject
     void foldersRead();
 
   protected slots:
-    void slotListJobResult( KIO::Job * );
+    void slotListJobResult( TDEIO::Job * );
     /** Adds the folder with the given url and display name to the folder
      *  tree (if is has an appropriate type) */
     virtual void processFolderResult( const KURL &href,
@@ -117,7 +117,7 @@ class KDE_EXPORT FolderLister : public TQObject
     /** Creates the job to retrieve information about the folder at the given
         url. It's results will be interpreted by interpretFolderResult
     */
-    virtual KIO::Job *createListFoldersJob( const KURL &url );
+    virtual TDEIO::Job *createListFoldersJob( const KURL &url );
     /** Interprets the results returned by the liste job (created by
      *  createJob(url) ). The default implementation calls
      *  interpretFolderListJob of the GroupwareDataAdaptor. Typically,
@@ -125,7 +125,7 @@ class KDE_EXPORT FolderLister : public TQObject
      *  folder of the appropriate type, by calling processsFolderResult.
      *  If the folder has subfolders, just call doRetrieveFolder(url)
      *  recursively. */
-    virtual void interpretListFoldersJob( KIO::Job *job );
+    virtual void interpretListFoldersJob( TDEIO::Job *job );
     /** List of folders that will always be included (subfolders won't!).
      *  Usually this is not needed as you should traverse the whole folder
      *  tree starting from the user's root dir. */
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index da012b158..85dacdaa8 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -49,7 +49,7 @@ kdDebug() << "Final Path for new item: " << u.url() << endl;
   } else return baseurl;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
+TDEIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
                        GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
 {
   Q_ASSERT( adaptor );
@@ -60,7 +60,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
   if ( adaptor )
     adaptor->adaptUploadUrl( upUrl );
   kdDebug(7000) << "Uploading to: " << upUrl.prettyURL() << endl;
-  KIO::TransferJob *job = KIO::storedPut( dta.utf8(), upUrl, -1, true,
+  TDEIO::TransferJob *job = TDEIO::storedPut( dta.utf8(), upUrl, -1, true,
                                           false, false );
   job->addMetaData( "PropagateHttpHeader", "true" );
   if ( adaptor ) {
@@ -69,12 +69,12 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
   return job;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createUploadNewJob(
+TDEIO::TransferJob *GroupwareUploadItem::createUploadNewJob(
       GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() << endl;
   setUrl( adaptNewItemUrl( adaptor, baseurl ) );
-  KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
+  TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
     TQString header;
@@ -88,11 +88,11 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   return job;
 }
 
-KIO::TransferJob *GroupwareUploadItem::createUploadJob(
+TDEIO::TransferJob *GroupwareUploadItem::createUploadJob(
                            GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
-  KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
+  TDEIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
     TQString header;
@@ -131,22 +131,22 @@ FolderLister::Entry::List GroupwareDataAdaptor::defaultFolders()
   return FolderLister::Entry::List();
 }
 
-KIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url,
+TDEIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url,
                                                      GroupwareUploadItem *item )
 {
   if ( item ) {
-    KIO::TransferJob *job = item->createUploadJob( this, url );
+    TDEIO::TransferJob *job = item->createUploadJob( this, url );
     setUidForJob( job, item->uid() );
     return job;
   } else return 0;
 }
 
-KIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url,
+TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url,
                                                      GroupwareUploadItem *item )
 {
 kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl;
   if ( item ) {
-    KIO::TransferJob *job = item->createUploadNewJob( this, url );
+    TDEIO::TransferJob *job = item->createUploadNewJob( this, url );
     setUidForJob( job, item->uid() );
     return job;
   } else return 0;
@@ -190,10 +190,10 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
   }
 }
 
-bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretRemoveJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   if ( !job ) return false;
-  KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job);
+  TDEIO::DeleteJob *deljob = dynamic_cast<TDEIO::DeleteJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -214,10 +214,10 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*
 }
 
 
-bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl;
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -236,11 +236,11 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*
   }
 }
 
-bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
 // TODO: How does the incidence mapper know the old/new ids???
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl;
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -259,7 +259,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString
   }
 }
 
-TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
+TQString GroupwareDataAdaptor::uidFromJob( TDEIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
   if ( mJobUIDMap.contains( job ) ) {
@@ -270,7 +270,7 @@ kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
   }
 }
 
-void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid )
+void GroupwareDataAdaptor::setUidForJob( TDEIO::Job *job, const TQString &uid )
 {
   if ( uid.isEmpty() ) {
     mJobUIDMap.remove( job );
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 5cd72419d..b7bd6e333 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -32,7 +32,7 @@
 #include <tdepimmacros.h>
 
 
-namespace KIO {
+namespace TDEIO {
 class TransferJob;
 class Job;
 }
@@ -70,11 +70,11 @@ class KDE_EXPORT GroupwareUploadItem
     virtual KURL adaptNewItemUrl( GroupwareDataAdaptor *adaptor, 
                                   const KURL &url );
 
-    virtual KIO::TransferJob *createRawUploadJob( 
+    virtual TDEIO::TransferJob *createRawUploadJob( 
                                GroupwareDataAdaptor *adaptor, const KURL &url );
-    virtual KIO::TransferJob *createUploadNewJob( 
+    virtual TDEIO::TransferJob *createUploadNewJob( 
                                GroupwareDataAdaptor *adaptor, const KURL &url );
-    virtual KIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, 
+    virtual TDEIO::TransferJob *createUploadJob( GroupwareDataAdaptor *adaptor, 
                                                const KURL &url );
     virtual KPIM::FolderLister::ContentType itemType() { return mItemType; }
   protected:
@@ -246,43 +246,43 @@ Q_OBJECT
 
 
     // Creating jobs
-    /** Creates the KIO::Job for logging in to the server. This is only
+    /** Creates the TDEIO::Job for logging in to the server. This is only
      *  called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set
      *  for the resource. */
-    virtual KIO::Job *createLoginJob( const KURL &, const TQString &/*user*/,
+    virtual TDEIO::Job *createLoginJob( const KURL &, const TQString &/*user*/,
                                       const TQString &/*password*/ ) { return 0; }
-    /** Creates the KIO::Job for logging off the server. This is only
+    /** Creates the TDEIO::Job for logging off the server. This is only
      *  called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set
      *  for the resource. */
-    virtual KIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/,
+    virtual TDEIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/,
                                       const TQString &/*password*/ ) { return 0; }
-    /** Creates the KIO::Job for listing all subfolders of the given url. */
-    virtual KIO::Job *createListFoldersJob ( const KURL & ) = 0;
-    /** Creates the KIO::TransferJob for listing all items in the given url. */
-    virtual KIO::TransferJob *createListItemsJob( const KURL & ) = 0;
-    /** Creates the KIO::TransferJob for downloading one given item. */
-    virtual KIO::TransferJob *createDownloadJob( const KURL &,
+    /** Creates the TDEIO::Job for listing all subfolders of the given url. */
+    virtual TDEIO::Job *createListFoldersJob ( const KURL & ) = 0;
+    /** Creates the TDEIO::TransferJob for listing all items in the given url. */
+    virtual TDEIO::TransferJob *createListItemsJob( const KURL & ) = 0;
+    /** Creates the TDEIO::TransferJob for downloading one given item. */
+    virtual TDEIO::TransferJob *createDownloadJob( const KURL &,
                                           FolderLister::ContentType ) = 0;
-    /** Creates the KIO::TransferJob for downloading a list of items items. */
-    virtual KIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; }
+    /** Creates the TDEIO::TransferJob for downloading a list of items items. */
+    virtual TDEIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; }
     /** Create the job to remove the deletedItems from the server. The base
         URL of the server is passed as uploadurl.  */
-    virtual KIO::Job *createRemoveJob( const KURL &,
+    virtual TDEIO::Job *createRemoveJob( const KURL &,
                              const KPIM::GroupwareUploadItem::List &/*deletedItems*/ ) { return 0; }
     /** Create the job to remove the item from the server. The base
         URL of the server is passed as uploadurl.  */
-    virtual KIO::Job *createRemoveJob( const KURL &, 
+    virtual TDEIO::Job *createRemoveJob( const KURL &, 
                              KPIM::GroupwareUploadItem */*deletedItem*/ ) { return 0; }
     /** Create the job to change the item on the server (at the given URL) */
-    virtual KIO::TransferJob *createUploadJob( const KURL &,
+    virtual TDEIO::TransferJob *createUploadJob( const KURL &,
                                                GroupwareUploadItem *item );
     /** Create the job to change the items on the server (at the given URL) */
-    virtual KIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
+    virtual TDEIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
     /** Create the job to add the item to the server (at the given baseURL) */
-    virtual KIO::TransferJob *createUploadNewJob( const KURL &,
+    virtual TDEIO::TransferJob *createUploadNewJob( const KURL &,
                                                   GroupwareUploadItem *item );
     /** Create the job to add the items to the server (at the given baseURL) */
-    virtual KIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
+    virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; }
 
 
     // Interpreting the result of the jobs
@@ -290,20 +290,20 @@ Q_OBJECT
      *  createLoginJob. Return true, if the login was successfull, or false
      *  if the user could not be authenticated or something else went wrong.
      *  In that case the resource will not be marked as open. */
-    virtual bool interpretLoginJobResult( KIO::Job * ) { return true; }
+    virtual bool interpretLoginJobResult( TDEIO::Job * ) { return true; }
     /** Extract the success information from the logoff job, created by
      *  createLogoffJob. */
-    virtual bool interpretLogoffJobResult( KIO::Job * ) { return true; }
+    virtual bool interpretLogoffJobResult( TDEIO::Job * ) { return true; }
     
-    virtual void interpretListFoldersJob( KIO::Job *, FolderLister *) = 0;
+    virtual void interpretListFoldersJob( TDEIO::Job *, FolderLister *) = 0;
     /** Extract the list of items on the server and the list of items to be
         downloaded from the results of the job (the job was created by
         createListitemsJob). */
-    virtual bool interpretListItemsJob( KIO::Job *, const TQString &jobData ) = 0;
-    virtual bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) = 0;
-    virtual bool interpretRemoveJob( KIO::Job *job, const TQString &jobData );
-    virtual bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
-    virtual bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
+    virtual bool interpretListItemsJob( TDEIO::Job *, const TQString &jobData ) = 0;
+    virtual bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData ) = 0;
+    virtual bool interpretRemoveJob( TDEIO::Job *job, const TQString &jobData );
+    virtual bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ );
+    virtual bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ );
 
     virtual void processDownloadListItem(  const KURL &entry,
         const TQString &newFingerprint, KPIM::FolderLister::ContentType type );
@@ -312,8 +312,8 @@ Q_OBJECT
     {
       return TQString(); 
     }
-    virtual TQString uidFromJob( KIO::Job *job ) const;
-    virtual void setUidForJob( KIO::Job *job, const TQString &uid );
+    virtual TQString uidFromJob( TDEIO::Job *job ) const;
+    virtual void setUidForJob( TDEIO::Job *job, const TQString &uid );
 
 
     enum {
@@ -356,7 +356,7 @@ Q_OBJECT
     TQString mUser;
     TQString mPassword;
     KPIM::IdMapper *mIdMapper;
-    TQMap<KIO::Job*,TQString> mJobUIDMap;
+    TQMap<TDEIO::Job*,TQString> mJobUIDMap;
 };
 
 }
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 3bdead675..9104da847 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -105,15 +105,15 @@ void GroupwareDownloadJob::listItems()
     mListItemsData = TQString();
     mListEventsJob = adaptor()->createListItemsJob( url );
 
-    connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotListItemsResult( KIO::Job * ) ) );
-    connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
 
-void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data )
+void GroupwareDownloadJob::slotListItemsData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl;
 
@@ -121,7 +121,7 @@ void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &dat
 }
 
 
-void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
+void GroupwareDownloadJob::slotListItemsResult( TDEIO::Job *job )
 {
   kdDebug(5800) << "GroupwareDownloadJob::slotListItemsResult(): " << endl;
 
@@ -187,18 +187,18 @@ void GroupwareDownloadJob::downloadItem()
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
-    connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) );
-    connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
-void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
+void GroupwareDownloadJob::slotDownloadItemResult( TDEIO::Job *job )
 {
   kdDebug(5800) << "GroupwareDownloadJob::slotDownloadItemResult(): " << endl;
 
-  KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *trfjob = dynamic_cast<TDEIO::TransferJob*>(job);
   if ( !trfjob ) return;
 
   if ( job->error() ) {
@@ -217,7 +217,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
   downloadItem();
 }
 
-void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data )
+void GroupwareDownloadJob::slotDownloadItemData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl;
 
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index b27882953..6cf3bf249 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -26,7 +26,7 @@
 #include "groupwareresourcejob.h"
 #include <tqstringlist.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
 }
@@ -58,10 +58,10 @@ class GroupwareDownloadJob : public GroupwareJob
 
     void cancelLoad();
 
-    void slotListItemsResult( KIO::Job * );
-    void slotListItemsData( KIO::Job *, const TQByteArray & );
-    void slotDownloadItemResult( KIO::Job * );
-    void slotDownloadItemData( KIO::Job *, const TQByteArray & );
+    void slotListItemsResult( TDEIO::Job * );
+    void slotListItemsData( TDEIO::Job *, const TQByteArray & );
+    void slotDownloadItemResult( TDEIO::Job * );
+    void slotDownloadItemData( TDEIO::Job *, const TQByteArray & );
     
     void slotItemToDownload( const KURL &remoteURL,
                              KPIM::FolderLister::ContentType type );
@@ -83,8 +83,8 @@ class GroupwareDownloadJob : public GroupwareJob
 
     KPIM::ProgressItem *mProgress;
 
-    KIO::TransferJob *mDownloadJob;
-    KIO::TransferJob *mListEventsJob;
+    TDEIO::TransferJob *mDownloadJob;
+    TDEIO::TransferJob *mListEventsJob;
     
     TQString mListItemsData;
     TQString mDownloadItemsData;
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index 60e4a53e6..cf46571fc 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl;
 
     if ( mDeletionJob ) {
       mDeletionJobData = TQString();
-      connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) );
-//       connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-//                TQT_SLOT( slotDeletionJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
+//       connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+//                TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       deleteItem();
     }
@@ -114,7 +114,7 @@ kdDebug() << "Not using batch delete " << endl;
 
 
 
-void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotDeletionJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotDeletionData()" << endl;
 
@@ -123,7 +123,7 @@ void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &dat
 
 
 
-void GroupwareUploadJob::slotDeletionJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretRemoveJob( job, mDeletionJobData );
@@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl;
 
     if ( mUploadJob ) {
       mUploadJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadItem();
     }
@@ -170,7 +170,7 @@ kdDebug() << "Not using batch upload " << endl;
 }
 
 
-void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotUploadJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotUploadData()" << endl;
 
@@ -179,7 +179,7 @@ void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data
 
 
 
-void GroupwareUploadJob::slotUploadJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretUploadJob( job, mUploadJobData );
@@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
 
     if ( mUploadJob ) {
       mUploadNewJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-               TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+               TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadNewItem();
     }
@@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
   }
 }
 
-void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data )
+void GroupwareUploadJob::slotUploadNewJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl;
 
@@ -240,7 +240,7 @@ void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &da
 
 
 
-void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job )
+void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job )
 {
   if ( job  && adaptor() ) {
     adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 7d3c973c2..b3a0ff756 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 #include <groupwaredataadaptor.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
   class DeleteJob;
@@ -88,12 +88,12 @@ class GroupwareUploadJob : public GroupwareJob
 
     void cancelSave();
 
-    void slotDeletionJobResult( KIO::Job *job );
-    void slotDeletionJobData( KIO::Job *, const TQByteArray & );
-    void slotUploadJobResult( KIO::Job *job );
-    void slotUploadJobData( KIO::Job *, const TQByteArray & );
-    void slotUploadNewJobResult( KIO::Job *job );
-    void slotUploadNewJobData( KIO::Job *, const TQByteArray & );
+    void slotDeletionJobResult( TDEIO::Job *job );
+    void slotDeletionJobData( TDEIO::Job *, const TQByteArray & );
+    void slotUploadJobResult( TDEIO::Job *job );
+    void slotUploadJobData( TDEIO::Job *, const TQByteArray & );
+    void slotUploadNewJobResult( TDEIO::Job *job );
+    void slotUploadNewJobData( TDEIO::Job *, const TQByteArray & );
 
     void slotItemDeleted( const TQString &localID, const KURL &remoteURL );
     void slotItemUploaded( const TQString &localID, const KURL &remoteURL );
@@ -118,8 +118,8 @@ class GroupwareUploadJob : public GroupwareJob
     TQString mUploadJobData;
     TQString mUploadNewJobData;
 
-    KIO::TransferJob *mUploadJob;
-    KIO::Job *mDeletionJob;
+    TDEIO::TransferJob *mUploadJob;
+    TDEIO::Job *mDeletionJob;
     KPIM::ProgressItem *mUploadProgress;
 
 };
diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp
index 0d8f197c4..4700dd1f3 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebase.cpp
@@ -34,7 +34,7 @@
 
 using namespace KABC;
 
-ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config )
+ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config )
   : ResourceCached( config ),
     mPrefs(0), mFolderLister(0), mAdaptor(0), mDownloadJob(0), mUploadJob(0)
 {
@@ -112,7 +112,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs()
 
 
 
-void ResourceGroupwareBase::readConfig( const KConfig */*config*/ )
+void ResourceGroupwareBase::readConfig( const TDEConfig */*config*/ )
 {
   kdDebug(5700) << "KABC::ResourceGroupwareBase::readConfig()" << endl;
 //   ResourceCached::readConfig( config );
@@ -123,7 +123,7 @@ void ResourceGroupwareBase::readConfig( const KConfig */*config*/ )
   }
 }
 
-void ResourceGroupwareBase::writeConfig( KConfig *config )
+void ResourceGroupwareBase::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index 0785709c6..28ce5199e 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -26,7 +26,7 @@
 #include <kabcresourcecached.h>
 #include <tdepimmacros.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KPIM {
 class GroupwareJob;
@@ -46,11 +46,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
   
 
   public:
-    ResourceGroupwareBase( const KConfig * );
+    ResourceGroupwareBase( const TDEConfig * );
     ~ResourceGroupwareBase();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     KPIM::GroupwarePrefsBase *prefs() const { return mPrefs; }
     void setPrefs( KPIM::GroupwarePrefsBase *prefs );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index d52e0eaba..118fc6629 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -44,7 +44,7 @@ ResourceGroupwareBase::ResourceGroupwareBase()
 {
 }
 
-ResourceGroupwareBase::ResourceGroupwareBase( const KConfig *config )
+ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config )
   : ResourceCached( config ), mPrefs(0), mFolderLister(0),
     mLock( true ), mAdaptor(0), mDownloadJob(0), mUploadJob(0)
 {
@@ -160,7 +160,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::prefs()
   return mPrefs;
 }
 
-void ResourceGroupwareBase::readConfig( const KConfig *config )
+void ResourceGroupwareBase::readConfig( const TDEConfig *config )
 {
   kdDebug(5800) << "KCal::ResourceGroupwareBase::readConfig()" << endl;
   ResourceCached::readConfig( config );
@@ -171,7 +171,7 @@ void ResourceGroupwareBase::readConfig( const KConfig *config )
   }
 }
 
-void ResourceGroupwareBase::writeConfig( KConfig *config )
+void ResourceGroupwareBase::writeConfig( TDEConfig *config )
 {
   kdDebug(5800) << "KCal::ResourceGroupwareBase::writeConfig()" << endl;
 
@@ -190,13 +190,13 @@ bool ResourceGroupwareBase::doOpen()
   if ( !adaptor() )
     return false;
   if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogon ) {
-    KIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() );
+    TDEIO::Job *loginJob = adaptor()->createLoginJob( prefs()->url(), prefs()->user(), prefs()->password() );
     if ( !loginJob ) {
       return false;
     } else {
       mLoginFinished = false;
-      connect( loginJob, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotLoginJobResult( KIO::Job* ) ) );
+      connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
       enter_loop();
       return mLoginFinished;
     }
@@ -205,7 +205,7 @@ bool ResourceGroupwareBase::doOpen()
 }
 
 // BEGIN:COPIED
-// TODO: Get rid of this hack, which is copied from KIO::NetAccess, which is
+// TODO: Get rid of this hack, which is copied from TDEIO::NetAccess, which is
 // LGPL'ed and
 //     Copyright (C) 1997 Torben Weis ([email protected])
 //     Copyright (C) 1998 Matthias Ettrich ([email protected])
@@ -224,7 +224,7 @@ void ResourceGroupwareBase::enter_loop()
 }
 // END:COPIED
 
-void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job )
+void ResourceGroupwareBase::slotLoginJobResult( TDEIO::Job *job )
 {
   if ( !adaptor() ) return;
   mLoginFinished = adaptor()->interpretLoginJobResult( job );
@@ -238,15 +238,15 @@ void ResourceGroupwareBase::doClose()
 
   if ( adaptor() &&
        adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
-    KIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
-    connect( logoffJob, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotLogoffJobResult( KIO::Job* ) ) );
+    TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
+    connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
     // TODO: Do we really need to block while waiting for the job to return?
     enter_loop();
   }
 }
 
-void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job )
+void ResourceGroupwareBase::slotLogoffJobResult( TDEIO::Job *job )
 {
   if ( !adaptor() ) return;
   adaptor()->interpretLogoffJobResult( job );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index 5691c19d6..f6b46dbf7 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -28,7 +28,7 @@
 #include <tdepimmacros.h>
 #include <kabc/locknull.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -56,11 +56,11 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
   public:
     ResourceGroupwareBase();
   
-    ResourceGroupwareBase( const KConfig * );
+    ResourceGroupwareBase( const TDEConfig * );
     virtual ~ResourceGroupwareBase();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     KPIM::GroupwarePrefsBase *prefs();
     KPIM::FolderLister *folderLister() { return mFolderLister; }
@@ -92,8 +92,8 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
     virtual KPIM::GroupwareUploadJob *createUploadJob( CalendarAdaptor *adaptor );
 
   protected slots:
-    void slotLoginJobResult( KIO::Job *job );
-    void slotLogoffJobResult( KIO::Job *job );
+    void slotLoginJobResult( TDEIO::Job *job );
+    void slotLogoffJobResult( TDEIO::Job *job );
     void slotDownloadJobResult( KPIM::GroupwareJob * );
     void slotUploadJobResult( KPIM::GroupwareJob * );
 
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index bd22858a5..7e8ae8bb9 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -43,7 +43,7 @@ ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor
   }
 }
 
-KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
+TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
 {
 kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl;
   Q_ASSERT( adaptor );
@@ -51,11 +51,11 @@ kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl;
   KURL upUrl( url() );
   adaptor->adaptUploadUrl( upUrl );
   kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl;
-  KIO::DavJob *job = KIO::davPropPatch( upUrl, mDavData, false );
+  TDEIO::DavJob *job = TDEIO::davPropPatch( upUrl, mDavData, false );
   return job;
 }
 
-KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"ExchangeAddressBookUploadItem::createUploadNewJob"<<endl;
   KURL url( baseurl );
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h
index 576427645..cbf5ac6f6 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.h
+++ b/kresources/newexchange/exchangeaddressbookadaptor.h
@@ -40,9 +40,9 @@ class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem
   public:
     ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, UploadType type );
     virtual ~ExchangeAddressBookUploadItem() {}
-/**/    virtual KIO::TransferJob *createUploadJob(
+/**/    virtual TDEIO::TransferJob *createUploadJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
-/**/    virtual KIO::TransferJob *createUploadNewJob(
+/**/    virtual TDEIO::TransferJob *createUploadNewJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
 
   protected:
@@ -65,21 +65,21 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return ExchangeGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return ExchangeGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return ExchangeGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
         { return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); }
 
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData )
        { return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return ExchangeGlobals::interpretAddressBookDownloadItemsJob( this, job, jobData ); }
 
 
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index c0882ab1a..89c9b742e 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -50,7 +50,7 @@ kdDebug()<<"mItemType=="<<mItemType<<endl;
   }
 }
 
-KIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl )
+TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl )
 {
 kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<baseUrl.url()<<endl;
   Q_ASSERT( adaptor );
@@ -59,11 +59,11 @@ kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<",
   adaptor->adaptUploadUrl( upUrl );
   kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl;
  
-  KIO::DavJob *job = KIO::davPropPatch( upUrl, mDavData, false );
+  TDEIO::DavJob *job = TDEIO::davPropPatch( upUrl, mDavData, false );
   return job;
 }
 
-KIO::TransferJob *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"ExchangeCalendarUploadItem::createUploadNewJob"<<endl;
   KURL url( baseurl );
@@ -107,9 +107,9 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
 	" AND (\"urn:schemas:calendar:instancetype\" = 0\r\n"
 	"      OR \"urn:schemas:calendar:instancetype\" = 1)\r\n";
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
   job->setWindow( mWindow );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
 }
 
 */
@@ -126,10 +126,10 @@ KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Inciden
   return new ExchangeCalendarUploadItem( this, it, type );
 }
 
-bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
   kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadJob " << endl;
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
@@ -153,11 +153,11 @@ bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString
   }
 }
 
-bool ExchangeCalendarAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
 // TODO: How does the incidence mapper know the old/new ids???
   kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadNewJob " << endl;
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
   bool error = job->error();
   const TQString err = job->errorString();
 
diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h
index 3a4acab99..4f8d1da2c 100644
--- a/kresources/newexchange/exchangecalendaradaptor.h
+++ b/kresources/newexchange/exchangecalendaradaptor.h
@@ -38,9 +38,9 @@ class ExchangeCalendarUploadItem : public KPIM::GroupwareUploadItem
   public:
     ExchangeCalendarUploadItem( CalendarAdaptor *adaptor, KCal::Incidence *incidence, UploadType type );
     virtual ~ExchangeCalendarUploadItem() {}
-    virtual KIO::TransferJob *createUploadNewJob(
+    virtual TDEIO::TransferJob *createUploadNewJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
-    virtual KIO::TransferJob *createUploadJob(
+    virtual TDEIO::TransferJob *createUploadJob(
             KPIM::GroupwareDataAdaptor *adaptor, const KURL &url );
 
   protected:
@@ -63,23 +63,23 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor
 
 
     // Creating Jobs
-    KIO::Job *createListFoldersJob( const KURL &url )
+    TDEIO::Job *createListFoldersJob( const KURL &url )
         { return ExchangeGlobals::createListFoldersJob( url ); }
-    KIO::TransferJob *createListItemsJob( const KURL &url )
+    TDEIO::TransferJob *createListItemsJob( const KURL &url )
         { return ExchangeGlobals::createListItemsJob( url ); }
-    KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+    TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
         { return ExchangeGlobals::createDownloadJob( this, url, ctype ); }
-    KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
+    TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
         { return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); }
 
 
     // Interpreting Jobs
-    bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
-    bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+    bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
         { return ExchangeGlobals::interpretCalendarDownloadItemsJob( this, job, jobData );  }
-    bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
-    bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
+    bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ );
+    bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ );
 
 
 
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index 529409362..bf2a66db9 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -310,12 +310,12 @@ void ExchangeDownload::handleRecurrence( TQString uid )
 
   // kdDebug() << "Exchange master query: " << endl << query << endl;
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotMasterResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
 }
 */
 
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index 5cb2eee77..f2d90cd6d 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -87,7 +87,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 
 
 
-KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
+TDEIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
@@ -97,11 +97,11 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
   WebdavHandler::addElement( doc, prop, "d:hassubs" );
 
   kdDebug(7000) << "props: " << doc.toString() << endl;
-  return KIO::davPropFind( url, doc, "1", false );
+  return TDEIO::davPropFind( url, doc, "1", false );
 }
 
 
-KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
   TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
@@ -109,11 +109,11 @@ KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
   WebdavHandler::addElement( doc, prop, "d:getetag" );
   WebdavHandler::addElement( doc, prop, "d:contentclass" );
   kdDebug(5800) << "props = "<< doc.toString() << endl;
-  return KIO::davPropFind( url, doc, "1", false );
+  return TDEIO::davPropFind( url, doc, "1", false );
 }
 
 
-KIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+TDEIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                         const KURL &url, KPIM::FolderLister::ContentType ctype )
 {
 kdDebug() << "ExchangeGlobals::createDownloadJob()" << endl;
@@ -156,18 +156,18 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
 
   kdDebug(7000) << "doc: " << doc.toString() << endl;
   KURL authURL = url;
-  KIO::DavJob *job = KIO::davPropFind( authURL, doc, "0", false );
+  TDEIO::DavJob *job = TDEIO::davPropFind( authURL, doc, "0", false );
 /*  KURL httpurl( url );
   TQString proto("http");
   httpurl.setProtocol( proto );
-  KIO::TransferJob *job = KIO::get(httpurl, false, false);
+  TDEIO::TransferJob *job = TDEIO::get(httpurl, false, false);
   job->addMetaData("customHTTPHeader", "Translate: f");
   job->addMetaData("cache", "reload");*/
   return job;
 }
 
 
-KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
+TDEIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
        const KPIM::GroupwareUploadItem::List &deletedItems )
 {
   TQStringList urls;
@@ -182,7 +182,7 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
       urls << url.url();
     kdDebug() << "Delete (Mod) : " <<   url.url() << endl;
   }
-  return KIO::del( urls, false, false );
+  return TDEIO::del( urls, false, false );
 }
 
 
@@ -192,10 +192,10 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
 // it calls getContentType of the ExchangeGlobals class, instead of the one
 // from OGoGlobals!!!!
 bool ExchangeGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-    KIO::Job *job, const TQString &/*jobData*/ )
+    TDEIO::Job *job, const TQString &/*jobData*/ )
 {
 kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job);
 
   if ( !davjob ) {
     return false;
@@ -237,9 +237,9 @@ kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
 
 
 bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                         KIO::Job *job, const TQString &/*jobData*/ )
+                                         TDEIO::Job *job, const TQString &/*jobData*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
   if ( !davjob || !adaptor ) return false;
 
 kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument="
@@ -261,9 +261,9 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen
 
 
 bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
-      KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &/*jobData*/ )
+      KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ )
 {
-  KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+  TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
   if ( !davjob || !adaptor ) return false;
 
 kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument="
diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h
index a1e12f4c1..5d75bc42b 100644
--- a/kresources/newexchange/exchangeglobals.h
+++ b/kresources/newexchange/exchangeglobals.h
@@ -25,7 +25,7 @@
 #include <groupwareuploadjob.h>
 #include <tqdom.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 class TransferJob;
 }
@@ -51,20 +51,20 @@ class ExchangeGlobals
     static bool getFolderHasSubs( const TQDomNode &folderNode );
 
 
-    static KIO::Job *createListFoldersJob( const KURL &url );
-    static KIO::TransferJob *createListItemsJob( const KURL &url );
-    static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+    static TDEIO::Job *createListFoldersJob( const KURL &url );
+    static TDEIO::TransferJob *createListItemsJob( const KURL &url );
+    static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
                        const KURL &url, KPIM::FolderLister::ContentType ctype );
-    static KIO::Job *createRemoveJob( const KURL &uploadurl,
+    static TDEIO::Job *createRemoveJob( const KURL &uploadurl,
                           const KPIM::GroupwareUploadItem::List &deletedItems );
 
 
     static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
-           KIO::Job *job, const TQString &jobData );
+           TDEIO::Job *job, const TQString &jobData );
     static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
     static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
-                                        KIO::Job *job, const TQString &jobData );
+                                        TDEIO::Job *job, const TQString &jobData );
 };
 
 #endif
diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp
index db773f2f4..8c3ca2d1b 100644
--- a/kresources/newexchange/kabc_resourceexchange.cpp
+++ b/kresources/newexchange/kabc_resourceexchange.cpp
@@ -30,7 +30,7 @@
 
 using namespace KABC;
 
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 2afad9da6..941f91792 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -31,7 +31,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
   
 
   public:
-    ResourceExchange( const KConfig * );
+    ResourceExchange( const TDEConfig * );
 /*    ResourceExchange( const KURL &url,
                        const TQString &user, const TQString &password );*/
   protected:
diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp
index 953e30c31..eff1fa6ba 100644
--- a/kresources/newexchange/kcal_resourceexchange.cpp
+++ b/kresources/newexchange/kcal_resourceexchange.cpp
@@ -35,7 +35,7 @@ ResourceExchange::ResourceExchange()
   init();
 }
 
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index ded903a23..823ed9a72 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
   
   public:
     ResourceExchange();
-    ResourceExchange( const KConfig * );
+    ResourceExchange( const TDEConfig * );
 
   protected:
     void init();
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 229dd86bf..3803ecbef 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -51,7 +51,7 @@
 
 using namespace KCal;
 
-ResourceRemote::ResourceRemote( const KConfig *config )
+ResourceRemote::ResourceRemote( const TDEConfig *config )
   : ResourceCached( config ), mUseProgressManager( true ), mUseCacheFile( true )
 {
   if ( config ) {
@@ -101,7 +101,7 @@ void ResourceRemote::init()
   enableChangeNotification();
 }
 
-void ResourceRemote::readConfig( const KConfig *config )
+void ResourceRemote::readConfig( const TDEConfig *config )
 {
   TQString url = config->readEntry( "DownloadUrl" );
   mDownloadUrl = KURL( url );
@@ -112,7 +112,7 @@ void ResourceRemote::readConfig( const KConfig *config )
   ResourceCached::readConfig( config );
 }
 
-void ResourceRemote::writeConfig( KConfig *config )
+void ResourceRemote::writeConfig( TDEConfig *config )
 {
   kdDebug(5800) << "ResourceRemote::writeConfig()" << endl;
 
@@ -195,13 +195,13 @@ bool ResourceRemote::doLoad()
   {
     kdDebug() << "Download from: " << mDownloadUrl << endl;
 
-    mDownloadJob = KIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
+    mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
                                     false, !mUseProgressManager );
-    connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-            TQT_SLOT( slotLoadJobResult( KIO::Job * ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+            TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
     if ( mUseProgressManager ) {
-        connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-                TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
+        connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+                TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
         mProgress = KPIM::ProgressManager::createProgressItem(
             KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") );
 
@@ -213,14 +213,14 @@ bool ResourceRemote::doLoad()
   return true;
 }
 
-void ResourceRemote::slotPercent( KIO::Job *, unsigned long percent )
+void ResourceRemote::slotPercent( TDEIO::Job *, unsigned long percent )
 {
   kdDebug() << "ResourceRemote::slotPercent(): " << percent << endl;
 
   mProgress->setProgress( percent );
 }
 
-void ResourceRemote::slotLoadJobResult( KIO::Job *job )
+void ResourceRemote::slotLoadJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     // TODO: Should detect 404, 401 etc. vs host not found and prompt to create new resource only when 404 is returned
@@ -282,9 +282,9 @@ bool ResourceRemote::doSave()
 
   saveCache();
 
-  mUploadJob = KIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
-  connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSaveJobResult( KIO::Job * ) ) );
+  mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
+  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
 
   return true;
 }
@@ -294,7 +294,7 @@ bool ResourceRemote::isSaving()
   return mUploadJob;
 }
 
-void ResourceRemote::slotSaveJobResult( KIO::Job *job )
+void ResourceRemote::slotSaveJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0 );
diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 656fa9e34..2c3fd5fad 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -38,7 +38,7 @@
 
 #include <libkcal/resourcecached.h>
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 }
@@ -57,9 +57,9 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
 
   public:
     /**
-      Create resource from configuration information stored in KConfig object.
+      Create resource from configuration information stored in TDEConfig object.
     */
-    ResourceRemote( const KConfig * );
+    ResourceRemote( const TDEConfig * );
     /**
       Create remote resource.
       
@@ -69,8 +69,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
     ResourceRemote( const KURL &downloadUrl, const KURL &uploadUrl = KURL() );
     virtual ~ResourceRemote();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     void setDownloadUrl( const KURL & );
     KURL downloadUrl() const;
@@ -94,10 +94,10 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
 
 
   protected slots:
-    void slotLoadJobResult( KIO::Job * );
-    void slotSaveJobResult( KIO::Job * );
+    void slotLoadJobResult( TDEIO::Job * );
+    void slotSaveJobResult( TDEIO::Job * );
 
-    void slotPercent( KIO::Job *, unsigned long percent );
+    void slotPercent( TDEIO::Job *, unsigned long percent );
 
   protected:
     bool doLoad();
@@ -114,8 +114,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
     bool mUseProgressManager;
     bool mUseCacheFile;
 
-    KIO::FileCopyJob *mDownloadJob;
-    KIO::FileCopyJob *mUploadJob;
+    TDEIO::FileCopyJob *mDownloadJob;
+    TDEIO::FileCopyJob *mUploadJob;
     
     KPIM::ProgressItem *mProgress;
 
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 94cec32a2..42aef92d5 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -59,7 +59,7 @@ using namespace Scalix;
 class ScalixFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceScalix( config );
     }
@@ -77,7 +77,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
 static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
 static const char* s_inlineMimeType = "application/scalix-properties";
 
-KABC::ResourceScalix::ResourceScalix( const KConfig *config )
+KABC::ResourceScalix::ResourceScalix( const TDEConfig *config )
   : KPIM::ResourceABC( config ),
     Scalix::ResourceScalixBase( "ResourceScalix-KABC" ),
     mCachedSubresource( TQString() ), mLocked( false )
@@ -94,12 +94,12 @@ KABC::ResourceScalix::~ResourceScalix()
   }
 }
 
-void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config,
+void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config,
                                                  const TQString& name,
                                                  const TQString& label,
                                                  bool writable )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   int completionWeight = group.readNumEntry( "CompletionWeight", 80 );
   mSubResources.insert( name, Scalix::SubResource( active, writable, label,
@@ -108,7 +108,7 @@ void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config,
 
 bool KABC::ResourceScalix::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   // Read the calendar entries
   TQValueList<KMailICalIface::SubResource> subResources;
@@ -125,7 +125,7 @@ bool KABC::ResourceScalix::doOpen()
 
 void KABC::ResourceScalix::doClose()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   Scalix::ResourceMap::ConstIterator it;
   for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) {
@@ -487,7 +487,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "Contact" );
   loadSubResourceConfig( config, subResource, label, writable );
   loadSubResource( subResource );
@@ -507,7 +507,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 82c238196..dbb0b93c6 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -60,7 +60,7 @@ public:
   /**
    * Constructor
    */
-  ResourceScalix( const KConfig* );
+  ResourceScalix( const TDEConfig* );
 
   /**
    * Destructor.
@@ -149,7 +149,7 @@ protected:
 
   void doClose();
 
-  void loadSubResourceConfig( KConfig& config, const TQString& name,
+  void loadSubResourceConfig( TDEConfig& config, const TQString& name,
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format );
diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp
index c6fe224cb..bbf7a436a 100644
--- a/kresources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp
@@ -38,7 +38,7 @@ using namespace Scalix;
 class ScalixFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceScalix( config );
     }
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index eeebb32f8..a757c81fc 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -61,7 +61,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal"
 static const char* incidenceInlineMimeType = "text/calendar";
 
 
-ResourceScalix::ResourceScalix( const KConfig *config )
+ResourceScalix::ResourceScalix( const TDEConfig *config )
   : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
 {
@@ -79,18 +79,18 @@ ResourceScalix::~ResourceScalix()
   }
 }
 
-void ResourceScalix::loadSubResourceConfig( KConfig& config,
+void ResourceScalix::loadSubResourceConfig( TDEConfig& config,
                                            const TQString& name,
                                            const TQString& label,
                                            bool writable,
                                            ResourceMap& subResource )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   subResource.insert( name, Scalix::SubResource( active, writable, label ) );
 }
 
-bool ResourceScalix::openResource( KConfig& config, const char* contentType,
+bool ResourceScalix::openResource( TDEConfig& config, const char* contentType,
                                   ResourceMap& map )
 {
   // Read the subresource entries from KMail
@@ -111,7 +111,7 @@ bool ResourceScalix::doOpen()
     return true;
   mOpen = true;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "General" );
   mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200);
 
@@ -120,7 +120,7 @@ bool ResourceScalix::doOpen()
     && openResource( config, kmailJournalContentsType, mJournalSubResources );
 }
 
-static void closeResource( KConfig& config, ResourceMap& map )
+static void closeResource( TDEConfig& config, ResourceMap& map )
 {
   ResourceMap::ConstIterator it;
   for ( it = map.begin(); it != map.end(); ++it ) {
@@ -136,7 +136,7 @@ void ResourceScalix::doClose()
     return;
   mOpen = false;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   closeResource( config, mEventSubResources );
   closeResource( config, mTodoSubResources );
   closeResource( config, mJournalSubResources );
@@ -745,7 +745,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( subResource );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -767,7 +767,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     return;
 
   // Delete from the config file
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index cfcf71403..dcd783979 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -55,7 +55,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
     friend struct TemporarySilencer;
 
 public:
-  ResourceScalix( const KConfig* );
+  ResourceScalix( const TDEConfig* );
   virtual ~ResourceScalix();
 
   /// Load resource data.
@@ -167,9 +167,9 @@ private:
   /// Reimplemented from IncidenceBase::Observer to know when an incidence was changed
   void incidenceUpdated( KCal::IncidenceBase* );
 
-  bool openResource( KConfig& config, const char* contentType,
+  bool openResource( TDEConfig& config, const char* contentType,
                      Scalix::ResourceMap& map );
-  void loadSubResourceConfig( KConfig& config, const TQString& name,
+  void loadSubResourceConfig( TDEConfig& config, const TQString& name,
                               const TQString& label, bool writable,
                               Scalix::ResourceMap& subResource );
   bool loadSubResource( const TQString& subResource, const char* mimetype );
diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp
index 728dc280d..036c2f45e 100644
--- a/kresources/scalix/kcal/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp
@@ -36,7 +36,7 @@
 class ScalixFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new KCal::ResourceScalix( config );
   }
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 52384afad..1b4cc7b8f 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -76,7 +76,7 @@ void Scalix::get( const KURL &url )
   if ( path.contains( "/freebusy/" ) ) {
     retrieveFreeBusy( url );
   } else {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
   }
 }
 
@@ -87,7 +87,7 @@ void Scalix::put( const KURL& url, int, bool, bool )
   if ( path.contains( "/freebusy/" ) ) {
     publishFreeBusy( url );
   } else {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
   }
 }
 
@@ -115,11 +115,11 @@ void Scalix::retrieveFreeBusy( const KURL &url )
 
   mFreeBusyData = TQString();
 
-  KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) );
+  TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
+  connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
@@ -144,7 +144,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 );
 
   if ( requestUser.isEmpty() || calendar.isEmpty() ) {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) );
     return;
   };
 
@@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     const int newSize = readData(buffer);
     if ( newSize < 0 ) {
       // read error: network in unknown state so disconnect
-      error( KIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") );
+      error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") );
       return;
     }
 
@@ -181,14 +181,14 @@ void Scalix::publishFreeBusy( const KURL &url )
                                                    url.user() : url.user() + ":" + url.pass() )
                                                 .arg( url.host() );
 
-  KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) );
+  TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
 
-void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
+void Scalix::slotInfoMessage( TDEIO::Job *job, const TQString &data )
 {
   if ( job->error() ) {
     // error is handled in slotResult
@@ -199,10 +199,10 @@ void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
 }
 
 
-void Scalix::slotRetrieveResult( KIO::Job *job )
+void Scalix::slotRetrieveResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    error( KIO::ERR_SLAVE_DEFINED, job->errorString() );
+    error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() );
   } else {
     data( mFreeBusyData.utf8() );
     finished();
@@ -211,10 +211,10 @@ void Scalix::slotRetrieveResult( KIO::Job *job )
   tqApp->eventLoop()->exitLoop();
 }
 
-void Scalix::slotPublishResult( KIO::Job *job )
+void Scalix::slotPublishResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    error( KIO::ERR_SLAVE_DEFINED, job->errorString() );
+    error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() );
   } else {
     finished();
   }
diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h
index 62c2428b4..dc034b7b5 100644
--- a/kresources/scalix/kioslave/scalix.h
+++ b/kresources/scalix/kioslave/scalix.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 
-class Scalix : public TQObject, public KIO::SlaveBase
+class Scalix : public TQObject, public TDEIO::SlaveBase
 {
   Q_OBJECT
   
@@ -38,9 +38,9 @@ class Scalix : public TQObject, public KIO::SlaveBase
     void put( const KURL &url, int permissions, bool overwrite, bool resume );
 
   private slots:
-    void slotRetrieveResult( KIO::Job* );
-    void slotPublishResult( KIO::Job* );
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotRetrieveResult( TDEIO::Job* );
+    void slotPublishResult( TDEIO::Job* );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
 
   private:
     void retrieveFreeBusy( const KURL& );
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 0289fab0a..62b0daf48 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -47,7 +47,7 @@ static const char* kmailContentsType = "Note";
 static const char* attachmentMimeType = "application/x-vnd.kolab.note";
 static const char* inlineMimeType = "text/calendar";
 
-ResourceScalix::ResourceScalix( const KConfig *config )
+ResourceScalix::ResourceScalix( const TDEConfig *config )
   : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
     mCalendar( TQString::fromLatin1("UTC") )
 {
@@ -60,7 +60,7 @@ ResourceScalix::~ResourceScalix()
 
 bool ResourceScalix::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   // Get the list of Notes folders from KMail
@@ -82,7 +82,7 @@ bool ResourceScalix::doOpen()
 
 void ResourceScalix::doClose()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   Scalix::ResourceMap::ConstIterator it;
   for ( it = mSubResources.begin(); it != mSubResources.end(); ++it )
@@ -331,7 +331,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -354,7 +354,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( configGroupName );
   config.deleteEntry( subResource );
   config.sync();
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index 000b2e915..6a3676c1e 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -56,7 +56,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes,
   
 
 public:
-  ResourceScalix( const KConfig* );
+  ResourceScalix( const TDEConfig* );
   virtual ~ResourceScalix();
 
   /// Load resource data.
diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp
index 1cb835567..925c27b01 100644
--- a/kresources/scalix/knotes/resourcescalix_plugin.cpp
+++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp
@@ -36,7 +36,7 @@
 class ScalixFactory : public KRES::PluginFactoryBase
 {
 public:
-  KRES::Resource *resource( const KConfig *config )
+  KRES::Resource *resource( const TDEConfig *config )
   {
     return new Scalix::ResourceScalix( config );
   }
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 033472901..169ff0853 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates()
 {
   Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(),
                                                        Settings::self()->accountUrl() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allDelegates( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) );
 }
 
 void DelegatePage::addDelegate()
@@ -88,7 +88,7 @@ void DelegatePage::addDelegate()
   Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
                                                      Settings::self()->accountUrl(),
                                                      delegate.email(), delegate.rights() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
 }
 
 void DelegatePage::editDelegate()
@@ -113,7 +113,7 @@ void DelegatePage::editDelegate()
   Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
                                                      Settings::self()->accountUrl(),
                                                      delegate.email(), delegate.rights() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
 }
 
 void DelegatePage::removeDelegate()
@@ -124,10 +124,10 @@ void DelegatePage::removeDelegate()
 
   Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(),
                                                            Settings::self()->accountUrl(), delegate.email() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateRemoved( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) );
 }
 
-void DelegatePage::allDelegates( KIO::Job *job )
+void DelegatePage::allDelegates( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
@@ -143,7 +143,7 @@ void DelegatePage::allDelegates( KIO::Job *job )
   selectionChanged();
 }
 
-void DelegatePage::delegateAdded( KIO::Job *job )
+void DelegatePage::delegateAdded( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
@@ -151,7 +151,7 @@ void DelegatePage::delegateAdded( KIO::Job *job )
     loadAllDelegates(); // update the GUI
 }
 
-void DelegatePage::delegateRemoved( KIO::Job *job )
+void DelegatePage::delegateRemoved( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index 0f1b9c79a..0523effee 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -43,9 +43,9 @@ class DelegatePage : public TQWidget
     void editDelegate();
     void removeDelegate();
 
-    void delegateAdded( KIO::Job* );
-    void delegateRemoved( KIO::Job* );
-    void allDelegates( KIO::Job* );
+    void delegateAdded( TDEIO::Job* );
+    void delegateRemoved( TDEIO::Job* );
+    void allDelegates( TDEIO::Job* );
 
     void selectionChanged();
 
diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index f1bce9f2c..49b0a8fe5 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -67,7 +67,7 @@ TQString Delegate::rightsAsString( int rights )
 }
 
 
-SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
+SetPasswordJob* Scalix::setPassword( TDEIO::Slave* slave, const KURL& url,
                                      const TQString &oldPassword, const TQString& newPassword )
 {
   TQByteArray packedArgs;
@@ -76,11 +76,11 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
          << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
 
   SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params )
+SetDelegateJob* Scalix::setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params )
 {
   TQStringList types;
   if ( params & SendOnBehalfOf )
@@ -98,11 +98,11 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
          << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
 
   SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email )
+DeleteDelegateJob* Scalix::deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -110,22 +110,22 @@ DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, c
          << TQString( "X-DELETE-DELEGATE" ) << email;
 
   DeleteDelegateJob* job = new DeleteDelegateJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-GetDelegatesJob* Scalix::getDelegates( KIO::Slave* slave, const KURL& url )
+GetDelegatesJob* Scalix::getDelegates( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N' << TQString( "X-GET-DELEGATES" ) << TQString();
 
   GetDelegatesJob* job = new GetDelegatesJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email )
+AddOtherUserJob* Scalix::addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -133,11 +133,11 @@ AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const
          << TQString( "X-ADD-OTHER-USER" ) << email;
 
   AddOtherUserJob* job = new AddOtherUserJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email )
+DeleteOtherUserJob* Scalix::deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -145,11 +145,11 @@ DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url,
          << TQString( "X-DELETE-OTHER-USER" ) << email;
 
   DeleteOtherUserJob* job = new DeleteOtherUserJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
+GetOtherUsersJob* Scalix::getOtherUsers( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -157,11 +157,11 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
          << TQString( "X-GET-OTHER-USERS" ) << TQString();
 
   GetOtherUsersJob* job = new GetOtherUsersJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
+SetOutOfOfficeJob* Scalix::setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
 {
   const TQString argument = msg;
   const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
@@ -173,11 +173,11 @@ SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, b
   stream << (int) 'X' << (int)'E' << command << argument;
 
   SetOutOfOfficeJob* job = new SetOutOfOfficeJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url )
+GetOutOfOfficeJob* Scalix::getOutOfOffice( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -185,30 +185,30 @@ GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url )
          << TQString( "X-GET-OUT-OF-OFFICE" ) << TQString();
 
   GetOutOfOfficeJob* job = new GetOutOfOfficeJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 SetPasswordJob::SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 SetDelegateJob::SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
+  connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
 }
 
 Delegate::List GetDelegatesJob::delegates() const
@@ -216,7 +216,7 @@ Delegate::List GetDelegatesJob::delegates() const
   return mDelegates;
 }
 
-void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data )
+void GetDelegatesJob::slotInfoMessage( TDEIO::Job*, const TQString &data )
 {
   /**
    * The passed data have the following form:
@@ -247,20 +247,20 @@ void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data )
 }
 
 AddOtherUserJob::AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
+  connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
 }
 
 TQStringList GetOtherUsersJob::otherUsers() const
@@ -268,21 +268,21 @@ TQStringList GetOtherUsersJob::otherUsers() const
   return mOtherUsers;
 }
 
-void GetOtherUsersJob::slotInfoMessage( KIO::Job*, const TQString &data )
+void GetOtherUsersJob::slotInfoMessage( TDEIO::Job*, const TQString &data )
 {
   mOtherUsers = TQStringList::split( ' ', data );
 }
 
 SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
 }
 
 GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
+  connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
 }
 
 bool GetOutOfOfficeJob::enabled() const
@@ -295,7 +295,7 @@ TQString GetOutOfOfficeJob::message() const
   return mMessage;
 }
 
-void GetOutOfOfficeJob::slotInfoMessage( KIO::Job*, const TQString &data )
+void GetOutOfOfficeJob::slotInfoMessage( TDEIO::Job*, const TQString &data )
 {
   const TQStringList fields = TQStringList::split( '^', data );
 
diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h
index 27efbb72a..0c73fb507 100644
--- a/kresources/scalix/scalixadmin/jobs.h
+++ b/kresources/scalix/scalixadmin/jobs.h
@@ -66,37 +66,37 @@ namespace Scalix {
   /**
    * Sets/Changes the password of the user encoded in @p url.
    */
-  SetPasswordJob* setPassword( KIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword );
+  SetPasswordJob* setPassword( TDEIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword );
 
   /**
    * Adds a delegate represented by @p email with the given @p params for the user encoded in @p url.
    */
-  SetDelegateJob* setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params );
+  SetDelegateJob* setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params );
 
   /**
    * Deletes the delegate represented by @p email for the user encoded in @p url.
    */
-  DeleteDelegateJob* deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email );
+  DeleteDelegateJob* deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email );
 
   /**
    * Retrieves the delegates for the user encoded in @p url.
    */
-  GetDelegatesJob* getDelegates( KIO::Slave* slave, const KURL& url );
+  GetDelegatesJob* getDelegates( TDEIO::Slave* slave, const KURL& url );
 
   /**
    * Adds the mailbox of another user represented by @p email to the users 'Other Users' namespace.
    */
-  AddOtherUserJob* addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email );
+  AddOtherUserJob* addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email );
 
   /**
    * Deletes the mailbox of another user represented by @p email from the users 'Other Users' namespace.
    */
-  DeleteOtherUserJob* deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email );
+  DeleteOtherUserJob* deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email );
 
   /**
    * Retrieves the list of all other users.
    */
-  GetOtherUsersJob* getOtherUsers( KIO::Slave* slave, const KURL& url );
+  GetOtherUsersJob* getOtherUsers( TDEIO::Slave* slave, const KURL& url );
 
   /**
    * Sets the out-of-office data.
@@ -104,33 +104,33 @@ namespace Scalix {
    * @param enabled Whether the out-of-office functionality is enabled.
    * @param msg The out-of-office message.
    */
-  SetOutOfOfficeJob* setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg );
+  SetOutOfOfficeJob* setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg );
 
   /**
    * Retrieves the out-of-office data.
    */
-  GetOutOfOfficeJob* getOutOfOffice( KIO::Slave* slave, const KURL& url );
+  GetOutOfOfficeJob* getOutOfOffice( TDEIO::Slave* slave, const KURL& url );
 
 
-  class SetPasswordJob : public KIO::SimpleJob
+  class SetPasswordJob : public TDEIO::SimpleJob
   {
     public:
       SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class SetDelegateJob : public KIO::SimpleJob
+  class SetDelegateJob : public TDEIO::SimpleJob
   {
     public:
       SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class DeleteDelegateJob : public KIO::SimpleJob
+  class DeleteDelegateJob : public TDEIO::SimpleJob
   {
     public:
       DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class GetDelegatesJob : public KIO::SimpleJob
+  class GetDelegatesJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -141,25 +141,25 @@ namespace Scalix {
       Delegate::List delegates() const;
 
     private slots:
-      void slotInfoMessage( KIO::Job*, const TQString& );
+      void slotInfoMessage( TDEIO::Job*, const TQString& );
 
     private:
       Delegate::List mDelegates;
   };
 
-  class AddOtherUserJob : public KIO::SimpleJob
+  class AddOtherUserJob : public TDEIO::SimpleJob
   {
     public:
       AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class DeleteOtherUserJob : public KIO::SimpleJob
+  class DeleteOtherUserJob : public TDEIO::SimpleJob
   {
     public:
       DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class GetOtherUsersJob : public KIO::SimpleJob
+  class GetOtherUsersJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -170,19 +170,19 @@ namespace Scalix {
       TQStringList otherUsers() const;
 
     private slots:
-      void slotInfoMessage( KIO::Job*, const TQString& );
+      void slotInfoMessage( TDEIO::Job*, const TQString& );
 
     private:
       TQStringList mOtherUsers;
   };
 
-  class SetOutOfOfficeJob : public KIO::SimpleJob
+  class SetOutOfOfficeJob : public TDEIO::SimpleJob
   {
     public:
       SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
   };
 
-  class GetOutOfOfficeJob : public KIO::SimpleJob
+  class GetOutOfOfficeJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -194,7 +194,7 @@ namespace Scalix {
       TQString message() const;
 
     private slots:
-      void slotInfoMessage( KIO::Job*, const TQString& );
+      void slotInfoMessage( TDEIO::Job*, const TQString& );
 
     private:
       bool mEnabled;
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index 98b7b2268..3aac47c9e 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers()
 {
   Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(),
                                                          Settings::self()->accountUrl() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allUsers( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) );
 }
 
 void OtherUserPage::addUser()
@@ -82,7 +82,7 @@ void OtherUserPage::addUser()
 
   Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(),
                                                        Settings::self()->accountUrl(), email );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userAdded( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) );
 }
 
 void OtherUserPage::removeUser()
@@ -93,10 +93,10 @@ void OtherUserPage::removeUser()
 
   Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(),
                                                              Settings::self()->accountUrl(), email );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userRemoved( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) );
 }
 
-void OtherUserPage::allUsers( KIO::Job *job )
+void OtherUserPage::allUsers( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
@@ -112,7 +112,7 @@ void OtherUserPage::allUsers( KIO::Job *job )
   selectionChanged();
 }
 
-void OtherUserPage::userAdded( KIO::Job *job )
+void OtherUserPage::userAdded( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
@@ -122,7 +122,7 @@ void OtherUserPage::userAdded( KIO::Job *job )
   updateKmail();
 }
 
-void OtherUserPage::userRemoved( KIO::Job *job )
+void OtherUserPage::userRemoved( TDEIO::Job *job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index 67ec4fe90..e8c5e269d 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -42,9 +42,9 @@ class OtherUserPage : public TQWidget
     void addUser();
     void removeUser();
 
-    void userAdded( KIO::Job* );
-    void userRemoved( KIO::Job* );
-    void allUsers( KIO::Job* );
+    void userAdded( TDEIO::Job* );
+    void userRemoved( TDEIO::Job* );
+    void allUsers( TDEIO::Job* );
 
     void selectionChanged();
 
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index e1e331fc4..4e34a9144 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -71,10 +71,10 @@ void OutOfOfficePage::load()
 {
   Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(),
                                                            Settings::self()->accountUrl() );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( loaded( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) );
 }
 
-void OutOfOfficePage::loaded( KIO::Job* job )
+void OutOfOfficePage::loaded( TDEIO::Job* job )
 {
   if ( job->error() ) {
     KMessageBox::error( this, job->errorString() );
@@ -98,12 +98,12 @@ void OutOfOfficePage::store()
                                                            mEnabled->isChecked(),
                                                            mMessage->text() );
 
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( stored( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) );
 
   mSaveButton->setEnabled( false );
 }
 
-void OutOfOfficePage::stored( KIO::Job* job )
+void OutOfOfficePage::stored( TDEIO::Job* job )
 {
   if ( job->error() )
     KMessageBox::error( this, job->errorString() );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index dbd845ba1..f9863fa18 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -39,9 +39,9 @@ class OutOfOfficePage : public TQWidget
 
   private slots:
     void load();
-    void loaded( KIO::Job* );
+    void loaded( TDEIO::Job* );
     void store();
-    void stored( KIO::Job* );
+    void stored( TDEIO::Job* );
     void statusChanged();
     void changed();
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 23f4304c5..120de86f5 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -77,7 +77,7 @@ void PasswordPage::buttonClicked()
 
     mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(),
                                 Settings::self()->accountPassword(), mPassword->text() );
-    connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( finished( KIO::Job* ) ) );
+    connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) );
 
     updateState( true );
   } else {
@@ -107,7 +107,7 @@ void PasswordPage::textChanged()
                        !mPasswordRetype->text().isEmpty() );
 }
 
-void PasswordPage::finished( KIO::Job* job )
+void PasswordPage::finished( TDEIO::Job* job )
 {
   mJob = 0;
 
@@ -123,26 +123,26 @@ void PasswordPage::finished( KIO::Job* job )
   const TQString newPassword = mPassword->text();
 
   { // ScalixAdmin config
-    KConfig config( "scalixadminrc" );
-    KConfigGroup group( &config, "Account" );
+    TDEConfig config( "scalixadminrc" );
+    TDEConfigGroup group( &config, "Account" );
     group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
   }
 
   { // ScalixWizard config
-    KConfig config( "scalixrc" );
-    KConfigGroup group( &config, "General" );
+    TDEConfig config( "scalixrc" );
+    TDEConfigGroup group( &config, "General" );
     group.writeEntry( "Password", KStringHandler::obscure( newPassword ) );
   }
 
   { // KMail config
-    KConfig config( "kmailrc" );
+    TDEConfig config( "kmailrc" );
 
     // Try to find account group for Scalix
     TQString scalixAccount;
     const TQStringList groupList = config.groupList();
     for ( uint i = 0; i < groupList.count(); ++i ) {
       if ( groupList[ i ].startsWith( "Account " ) ) {
-        KConfigGroup group( &config, groupList[ i ] );
+        TDEConfigGroup group( &config, groupList[ i ] );
         if ( group.hasKey( "groupwareType" ) && group.readNumEntry( "groupwareType" ) == 2 ) {
           scalixAccount = groupList[ i ];
           break;
@@ -157,7 +157,7 @@ void PasswordPage::finished( KIO::Job* job )
 
     const int accountId = scalixAccount.mid( 8 ).toInt();
 
-    KConfigGroup group( &config, scalixAccount );
+    TDEConfigGroup group( &config, scalixAccount );
 
     // Save only if the user choose it before
     bool storePassword = group.readBoolEntry( "store-passwd", false );
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
         group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
       }
 
-      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
+      TDEConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
       fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
     }
   }
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index 450bde674..5255193e8 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -26,7 +26,7 @@
 class TQLineEdit;
 class TQPushButton;
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -40,7 +40,7 @@ class PasswordPage : public TQWidget
 
   private slots:
     void buttonClicked();
-    void finished( KIO::Job* );
+    void finished( TDEIO::Job* );
     void textChanged();
 
   private:
@@ -50,7 +50,7 @@ class PasswordPage : public TQWidget
     TQLineEdit *mPasswordRetype;
     TQPushButton *mButton;
 
-    KIO::Job *mJob;
+    TDEIO::Job *mJob;
 };
 
 #endif
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..279491c5f 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -28,7 +28,7 @@ Settings* Settings::mSelf = 0;
 
 Settings::Settings()
 {
-  mSlave = KIO::Scheduler::getConnectedSlave( accountUrl(),
+  mSlave = TDEIO::Scheduler::getConnectedSlave( accountUrl(),
                                               accountData() );
 }
 
@@ -44,12 +44,12 @@ Settings* Settings::self()
   return mSelf;
 }
 
-KIO::MetaData Settings::accountData() const
+TDEIO::MetaData Settings::accountData() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
-  KIO::MetaData data;
+  TDEIO::MetaData data;
   data.insert( "auth", group.readEntry( "auth" ) );
   data.insert( "tls", group.readBoolEntry( "use-tls" ) ? "on" : "off" );
 
@@ -58,8 +58,8 @@ KIO::MetaData Settings::accountData() const
 
 KURL Settings::accountUrl() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
   KURL url;
   url.setProtocol( group.readBoolEntry( "use-ssl" ) ? "imaps" : "imap" );
@@ -73,25 +73,25 @@ KURL Settings::accountUrl() const
 
 TQString Settings::accountPassword() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
   return KStringHandler::obscure( group.readEntry( "pass" ) );
 }
 
-KIO::Slave* Settings::globalSlave() const
+TDEIO::Slave* Settings::globalSlave() const
 {
   return mSlave;
 }
 
 TQString Settings::rulesWizardUrl() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Misc" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Misc" );
 
   TQString url = group.readEntry( "rulesWizardUrl" );
   if ( url.isEmpty() ) {
-    KConfigGroup group( &config, "Account" );
+    TDEConfigGroup group( &config, "Account" );
     url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
                                                        .arg( group.readEntry( "user" ) );
   }
@@ -101,36 +101,36 @@ TQString Settings::rulesWizardUrl() const
 
 TQString Settings::ldapHost() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "host" );
 }
 
 TQString Settings::ldapPort() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "port" );
 }
 
 TQString Settings::ldapBase() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "base" );
 }
 
 TQString Settings::ldapBindDn() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "bindDn" );
 }
 
 TQString Settings::ldapPassword() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "password" );
 }
 
diff --git a/kresources/scalix/scalixadmin/settings.h b/kresources/scalix/scalixadmin/settings.h
index 1e36833ad..29028f3b8 100644
--- a/kresources/scalix/scalixadmin/settings.h
+++ b/kresources/scalix/scalixadmin/settings.h
@@ -32,11 +32,11 @@ class Settings
 
     static Settings* self();
 
-    KIO::MetaData accountData() const;
+    TDEIO::MetaData accountData() const;
     KURL accountUrl() const;
     TQString accountPassword() const;
 
-    KIO::Slave *globalSlave() const;
+    TDEIO::Slave *globalSlave() const;
 
     TQString rulesWizardUrl() const;
 
@@ -48,7 +48,7 @@ class Settings
 
   private:
     Settings();
-    KIO::Slave *mSlave;
+    TDEIO::Slave *mSlave;
 
     static Settings* mSelf;
 };
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 6412de4a0..b83c0b957 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -40,7 +40,7 @@
 
 using namespace KABC;
 
-ResourceSlox::ResourceSlox( const KConfig *config )
+ResourceSlox::ResourceSlox( const TDEConfig *config )
   : ResourceCached( config ), SloxBase( this )
 {
   init();
@@ -115,12 +115,12 @@ ResourceSlox::~ResourceSlox()
   kdDebug() << "KABC::~ResourceSlox() done" << endl;
 }
 
-void ResourceSlox::readConfig( const KConfig * )
+void ResourceSlox::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 }
 
-void ResourceSlox::writeConfig( KConfig *config )
+void ResourceSlox::writeConfig( TDEConfig *config )
 {
   kdDebug() << "ResourceSlox::writeConfig() " << endl;
   kdDebug() << mPrefs->url() << endl;
@@ -206,11 +206,11 @@ bool ResourceSlox::asyncLoad()
 
   kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl;
 
-  mDownloadJob = KIO::davPropFind( url, doc, "0", false );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
+  mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
 
   mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") );
@@ -223,7 +223,7 @@ bool ResourceSlox::asyncLoad()
   return true;
 }
 
-void ResourceSlox::slotResult( KIO::Job *job )
+void ResourceSlox::slotResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceSlox::slotResult()" << endl;
 
@@ -288,7 +288,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
   emit loadingFinished( this );
 }
 
-void ResourceSlox::slotUploadResult( KIO::Job *job )
+void ResourceSlox::slotUploadResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceSlox::slotUploadResult()" << endl;
 
@@ -519,11 +519,11 @@ void ResourceSlox::uploadContacts()
   url.setUser( mPrefs->user() );
   url.setPass( mPrefs->password() );
 
-  mUploadJob = KIO::davPropPatch( url, doc, false );
-  connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotUploadResult( KIO::Job * ) ) );
-  connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
+  mUploadJob = TDEIO::davPropPatch( url, doc, false );
+  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+  connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
 
   mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") );
@@ -641,7 +641,7 @@ void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &
   WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() );
 }
 
-void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent )
+void ResourceSlox::slotProgress( TDEIO::Job *job, unsigned long percent )
 {
   if ( mDownloadProgress && job == mDownloadJob )
     mDownloadProgress->setProgress( percent );
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index 51bec97c1..d5251bdc7 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -30,7 +30,7 @@
 #include <tqmap.h>
 #include <tqdom.h>
 
-namespace KIO {
+namespace TDEIO {
 class DavJob;
 class Job;
 }
@@ -39,7 +39,7 @@ namespace KPIM {
 class ProgressItem;
 }
 
-class KConfig;
+class TDEConfig;
 
 namespace KABC {
 
@@ -50,13 +50,13 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     Q_OBJECT
   
   public:
-    ResourceSlox( const KConfig * );
+    ResourceSlox( const TDEConfig * );
     ResourceSlox( const KURL &url,
                   const TQString &user, const TQString &password );
     ~ResourceSlox();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     SloxPrefs *prefs() const { return mPrefs; }
 
@@ -87,9 +87,9 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     void uploadContacts();
 
   protected slots:
-    void slotResult( KIO::Job *job );
-    void slotUploadResult( KIO::Job *job );
-    void slotProgress( KIO::Job *job, unsigned long percent );
+    void slotResult( TDEIO::Job *job );
+    void slotUploadResult( TDEIO::Job *job );
+    void slotProgress( TDEIO::Job *job, unsigned long percent );
 
     void cancelDownload();
     void cancelUpload();
@@ -97,8 +97,8 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
   private:
     SloxPrefs *mPrefs;
 
-    KIO::DavJob *mDownloadJob;
-    KIO::DavJob *mUploadJob;
+    TDEIO::DavJob *mDownloadJob;
+    TDEIO::DavJob *mUploadJob;
     KPIM::ProgressItem *mDownloadProgress;
     KPIM::ProgressItem *mUploadProgress;
 
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 0b712b66f..98ca90ea4 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -61,7 +61,7 @@
 
 using namespace KCal;
 
-KCalResourceSlox::KCalResourceSlox( const KConfig *config )
+KCalResourceSlox::KCalResourceSlox( const TDEConfig *config )
   : ResourceCached( config ), SloxBase( this )
 {
   init();
@@ -122,7 +122,7 @@ void KCalResourceSlox::init()
   enableChangeNotification();
 }
 
-void KCalResourceSlox::readConfig( const KConfig *config )
+void KCalResourceSlox::readConfig( const TDEConfig *config )
 {
   mPrefs->readConfig();
 
@@ -138,7 +138,7 @@ void KCalResourceSlox::readConfig( const KConfig *config )
   mAccounts = new SloxAccounts( this, url );
 }
 
-void KCalResourceSlox::writeConfig( KConfig *config )
+void KCalResourceSlox::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCalResourceSlox::writeConfig()" << endl;
 
@@ -225,11 +225,11 @@ void KCalResourceSlox::requestEvents()
 
   kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl;
 
-  mLoadEventsJob = KIO::davPropFind( url, doc, "0", false );
-  connect( mLoadEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotLoadEventsResult( KIO::Job * ) ) );
-  connect( mLoadEventsJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotEventsProgress( KIO::Job *, unsigned long ) ) );
+  mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false );
+  connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
+  connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
 
   mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") );
@@ -270,11 +270,11 @@ void KCalResourceSlox::requestTodos()
 
   kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl;
 
-  mLoadTodosJob = KIO::davPropFind( url, doc, "0", false );
-  connect( mLoadTodosJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotLoadTodosResult( KIO::Job * ) ) );
-  connect( mLoadTodosJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotTodosProgress( KIO::Job *, unsigned long ) ) );
+  mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false );
+  connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
+  connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
 
   mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") );
@@ -379,11 +379,11 @@ void KCalResourceSlox::uploadIncidences()
 
   kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl;
 
-  mUploadJob = KIO::davPropPatch( url, doc, false );
-  connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotUploadResult( KIO::Job * ) ) );
-  connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotUploadProgress( KIO::Job *, unsigned long ) ) );
+  mUploadJob = TDEIO::davPropPatch( url, doc, false );
+  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+  connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
 
   mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") );
@@ -912,7 +912,7 @@ void KCalResourceSlox::parseTodoAttribute( const TQDomElement &e,
   }
 }
 
-void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
+void KCalResourceSlox::slotLoadTodosResult( TDEIO::Job *job )
 {
   kdDebug() << "KCalResourceSlox::slotLoadTodosJobResult()" << endl;
 
@@ -986,7 +986,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
   mLoadTodosProgress = 0;
 }
 
-void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
+void KCalResourceSlox::slotLoadEventsResult( TDEIO::Job *job )
 {
   kdDebug() << "KCalResourceSlox::slotLoadEventsResult() " << long( this ) << endl;
 
@@ -1076,7 +1076,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
   mLoadEventsProgress = 0;
 }
 
-void KCalResourceSlox::slotUploadResult( KIO::Job *job )
+void KCalResourceSlox::slotUploadResult( TDEIO::Job *job )
 {
   kdDebug() << "KCalResourceSlox::slotUploadResult()" << endl;
 
@@ -1185,7 +1185,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job )
   uploadIncidences();
 }
 
-void KCalResourceSlox::slotEventsProgress( KIO::Job *job,
+void KCalResourceSlox::slotEventsProgress( TDEIO::Job *job,
                                            unsigned long percent )
 {
 #if 0
@@ -1197,7 +1197,7 @@ void KCalResourceSlox::slotEventsProgress( KIO::Job *job,
   if ( mLoadEventsProgress ) mLoadEventsProgress->setProgress( percent );
 }
 
-void KCalResourceSlox::slotTodosProgress( KIO::Job *job, unsigned long percent )
+void KCalResourceSlox::slotTodosProgress( TDEIO::Job *job, unsigned long percent )
 {
 #if 0
   kdDebug() << "PROGRESS: todos " << int( job ) << ": " << percent << endl;
@@ -1208,7 +1208,7 @@ void KCalResourceSlox::slotTodosProgress( KIO::Job *job, unsigned long percent )
   if ( mLoadTodosProgress ) mLoadTodosProgress->setProgress( percent );
 }
 
-void KCalResourceSlox::slotUploadProgress( KIO::Job *job, unsigned long percent )
+void KCalResourceSlox::slotUploadProgress( TDEIO::Job *job, unsigned long percent )
 {
 #if 0
   kdDebug() << "PROGRESS: upload " << int( job ) << ": " << percent << endl;
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index ce1fd86cd..6735b9934 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -39,7 +39,7 @@
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecached.h>
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 class DavJob;
@@ -74,14 +74,14 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
     enum { ReloadNever, ReloadOnStartup, ReloadOnceADay, ReloadAlways };
 
     /**
-      Create resource from configuration information stored in KConfig object.
+      Create resource from configuration information stored in TDEConfig object.
     */
-    KCalResourceSlox( const KConfig * );
+    KCalResourceSlox( const TDEConfig * );
     KCalResourceSlox( const KURL &url );
     ~KCalResourceSlox();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     KCal::SloxPrefs *prefs() const { return mPrefs; }
 
@@ -92,13 +92,13 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
     void dump() const;
 
   protected slots:
-    void slotLoadEventsResult( KIO::Job * );
-    void slotLoadTodosResult( KIO::Job * );
-    void slotUploadResult( KIO::Job * );
+    void slotLoadEventsResult( TDEIO::Job * );
+    void slotLoadTodosResult( TDEIO::Job * );
+    void slotUploadResult( TDEIO::Job * );
 
-    void slotEventsProgress( KIO::Job *job, unsigned long percent );
-    void slotTodosProgress( KIO::Job *job, unsigned long percent );
-    void slotUploadProgress( KIO::Job *job, unsigned long percent );
+    void slotEventsProgress( TDEIO::Job *job, unsigned long percent );
+    void slotTodosProgress( TDEIO::Job *job, unsigned long percent );
+    void slotUploadProgress( TDEIO::Job *job, unsigned long percent );
 
     void cancelLoadEvents();
     void cancelLoadTodos();
@@ -147,9 +147,9 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
 
     KCal::SloxPrefs *mPrefs;
 
-    KIO::DavJob *mLoadEventsJob;
-    KIO::DavJob *mLoadTodosJob;
-    KIO::DavJob *mUploadJob;
+    TDEIO::DavJob *mLoadEventsJob;
+    TDEIO::DavJob *mLoadTodosJob;
+    TDEIO::DavJob *mUploadJob;
 
     KPIM::ProgressItem *mLoadEventsProgress;
     KPIM::ProgressItem *mLoadTodosProgress;
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index 616197936..aa648d1bc 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -121,7 +121,7 @@ void SloxAccounts::requestAccounts()
 
     kdDebug() << "SloxAccounts::requestAccounts() URL: " << url << endl;
 
-    mDownloadJob = KIO::file_copy( url, cacheFile(), -1, true, false, false );
+    mDownloadJob = TDEIO::file_copy( url, cacheFile(), -1, true, false, false );
   } else if ( mRes->resType() == "ox" ) {
     KURL url = mBaseUrl;
     url.setPath( "/servlet/webdav.groupuser/" );
@@ -136,14 +136,14 @@ void SloxAccounts::requestAccounts()
 
     kdDebug() << k_funcinfo << doc.toString( 2 ) << endl;
 
-    mDownloadJob = KIO::davPropFind( url, doc, "0", false );
+    mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
   }
 
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void SloxAccounts::slotResult( KIO::Job *job )
+void SloxAccounts::slotResult( TDEIO::Job *job )
 {
   kdDebug() << "SloxAccounts::slotResult()" << endl;
 
@@ -157,7 +157,7 @@ void SloxAccounts::slotResult( KIO::Job *job )
         return;
       }
       TQTextStream stream ( &f );
-      stream << static_cast<KIO::DavJob*>( mDownloadJob )->response();
+      stream << static_cast<TDEIO::DavJob*>( mDownloadJob )->response();
       f.close();
     }
     readAccounts();
diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h
index 85b7625c3..214e3c707 100644
--- a/kresources/slox/sloxaccounts.h
+++ b/kresources/slox/sloxaccounts.h
@@ -24,7 +24,7 @@
 #include <tdepimmacros.h>
 #include <tqobject.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -51,12 +51,12 @@ class KDE_EXPORT SloxAccounts : public TQObject
     TQString cacheFile() const;
 
   protected slots:
-    void slotResult( KIO::Job * );
+    void slotResult( TDEIO::Job * );
 
   private:
     TQString mDomain;
 
-    KIO::Job *mDownloadJob;
+    TDEIO::Job *mDownloadJob;
 
     TQMap<TQString, KABC::Addressee> mUsers; // map users ids to addressees.
 
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index 41864caf8..a60cd7885 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -77,13 +77,13 @@ void SloxFolderManager::requestFolders()
 
   kdDebug() << k_funcinfo << doc.toString( 2 ) << endl;
 
-  mDownloadJob = KIO::davPropFind( url, doc, "0", false );
+  mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
 
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void SloxFolderManager::slotResult( KIO::Job *job )
+void SloxFolderManager::slotResult( TDEIO::Job *job )
 {
   kdDebug() << k_funcinfo << endl;
 
diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h
index 54008d55a..f31c212c7 100644
--- a/kresources/slox/sloxfoldermanager.h
+++ b/kresources/slox/sloxfoldermanager.h
@@ -27,7 +27,7 @@
 
 #include <tdepimmacros.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 class DavJob;
 }
@@ -55,10 +55,10 @@ class KDE_EXPORT SloxFolderManager : public TQObject
     TQString cacheFile() const;
 
   protected slots:
-    void slotResult( KIO::Job * );
+    void slotResult( TDEIO::Job * );
 
   private:
-    KIO::DavJob *mDownloadJob;
+    TDEIO::DavJob *mDownloadJob;
     KURL mBaseUrl;
     TQMap<TQString, SloxFolder*> mFolders;
     SloxBase *mRes;
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 6b2c733a4..32d3c4167 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -49,7 +49,7 @@ SloxItem::SloxItem()
 WebdavHandler::WebdavHandler()
   : mLogCount( 0 )
 {
-  KConfig cfg( "sloxrc" );
+  TDEConfig cfg( "sloxrc" );
 
   cfg.setGroup( "General" );
   mLogFile = cfg.readEntry( "LogFile" );
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 4933768ab..e447008c3 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -59,7 +59,7 @@ ResourceTVAnytime::ResourceTVAnytime()
   mPrefs->addGroupPrefix( identifier() );
 }
 
-ResourceTVAnytime::ResourceTVAnytime( const KConfig *config )
+ResourceTVAnytime::ResourceTVAnytime( const TDEConfig *config )
   : ResourceCached( config ), mLock( true )
 {
   init();
@@ -102,7 +102,7 @@ TVAnytimePrefsBase *ResourceTVAnytime::prefs()
   return mPrefs;
 }
 
-void ResourceTVAnytime::readConfig( const KConfig *config )
+void ResourceTVAnytime::readConfig( const TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceTVAnytime::readConfig()" << endl;
 
@@ -116,7 +116,7 @@ void ResourceTVAnytime::readConfig( const KConfig *config )
   
 }
 
-void ResourceTVAnytime::writeConfig( KConfig *config )
+void ResourceTVAnytime::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCal::ResourceTVAnytime::writeConfig()" << endl;
 
@@ -178,9 +178,9 @@ bool ResourceTVAnytime::doLoad()
   kdDebug(5850) << "  DESTINATION: " << destination.url() << endl;
 
   // TODO: find out if the file to download is fresh.  if not, just work with the cache.
-  mDownloadJob = KIO::file_copy( url, destination, -1, true );
-  connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+  mDownloadJob = TDEIO::file_copy( url, destination, -1, true );
+  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
@@ -192,7 +192,7 @@ bool ResourceTVAnytime::doLoad()
   return true;
 }
 
-void ResourceTVAnytime::slotJobResult( KIO::Job *job )
+void ResourceTVAnytime::slotJobResult( TDEIO::Job *job )
 {
   kdDebug() << "ResourceTVAnytime::slotJobResult(): " << endl;
 
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index 526d1f181..1c8bd9c90 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -56,11 +56,11 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
   public:
     ResourceTVAnytime();
 
-    ResourceTVAnytime( const KConfig * );
+    ResourceTVAnytime( const TDEConfig * );
     virtual ~ResourceTVAnytime();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     TVAnytimePrefsBase *prefs();
 
@@ -101,7 +101,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
     bool readProgrammeInformation( const TQDomDocument & );
 
   protected slots:
-    void slotJobResult( KIO::Job * );
+    void slotJobResult( TDEIO::Job * );
     void cancelLoad();
     void slotEmitResourceChanged();
 
@@ -109,7 +109,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
     TVAnytimePrefsBase *mPrefs;
     KABC::LockNull mLock;
 
-    KIO::FileCopyJob *mDownloadJob;
+    TDEIO::FileCopyJob *mDownloadJob;
     KPIM::ProgressItem *mProgress;
 
     bool mIsShowingError;
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 110a62f9e..f9ec2a499 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -70,7 +70,7 @@ void ResourceTVAnytimeConfig::loadSettings( KRES::Resource *resource )
       kdError() << "No PREF" << endl;
       return;
     }
-    KConfigSkeleton::ItemInt * daysItem = res->prefs()->daysItem();
+    TDEConfigSkeleton::ItemInt * daysItem = res->prefs()->daysItem();
     mDays->setMinValue( daysItem->minValue().toInt() );
     mDays->setMaxValue( daysItem->maxValue().toInt() );
     TQWhatsThis::add( mDays, daysItem->whatsThis() );
diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index 7bb836425..b07c29737 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -35,7 +35,7 @@ NetworkStatus *NetworkStatus::mSelf = 0;
 NetworkStatus::NetworkStatus()
   : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" )
 {
-  KConfigGroup group( TDEGlobal::config(), "NetworkStatus" );
+  TDEConfigGroup group( TDEGlobal::config(), "NetworkStatus" );
   if ( group.readBoolEntry( "Online", true ) == true )
     mStatus = Online;
   else
@@ -46,7 +46,7 @@ NetworkStatus::NetworkStatus()
 
 NetworkStatus::~NetworkStatus()
 {
-  KConfigGroup group( TDEGlobal::config(), "NetworkStatus" );
+  TDEConfigGroup group( TDEGlobal::config(), "NetworkStatus" );
   group.writeEntry( "Online", mStatus == Online );
 }
 
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index 47ba6d1ce..20035bc58 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -75,7 +75,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen
   }
 
   if ( a->isUri() ) {
-    if ( !KIO::NetAccess::exists( a->uri(), true, parent ) ) {
+    if ( !TDEIO::NetAccess::exists( a->uri(), true, parent ) ) {
       KMessageBox::sorry(
         parent,
         i18n( "The attachment \"%1\" is a web link that is inaccessible from this computer. " ).
@@ -216,14 +216,14 @@ bool AttachmentHandler::saveAs( TQWidget *parent, Attachment *attachment )
   bool stat = false;
   if ( attachment->isUri() ) {
     // save the attachment url
-    stat = KIO::NetAccess::file_copy( attachment->uri(), KURL( saveAsFile ), -1, true );
+    stat = TDEIO::NetAccess::file_copy( attachment->uri(), KURL( saveAsFile ), -1, true );
   } else {
     // put the attachment in a temporary file and save it
     KURL tempUrl = tempFileForAttachment( attachment );
     if ( tempUrl.isValid() ) {
-      stat = KIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true );
-      if ( !stat && KIO::NetAccess::lastError() ) {
-        KMessageBox::error( parent, KIO::NetAccess::lastErrorString() );
+      stat = TDEIO::NetAccess::file_copy( tempUrl, KURL( saveAsFile ), -1, true );
+      if ( !stat && TDEIO::NetAccess::lastError() ) {
+        KMessageBox::error( parent, TDEIO::NetAccess::lastErrorString() );
       }
     } else {
       stat = false;
diff --git a/libkcal/calendarnull.h b/libkcal/calendarnull.h
index 8ea0afa91..4db35bce7 100644
--- a/libkcal/calendarnull.h
+++ b/libkcal/calendarnull.h
@@ -30,7 +30,7 @@
 #include "calendar.h"
 #include "libkcal_export.h"
 
-class KConfig;
+class TDEConfig;
 
 /**
    @namespace KCal
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index abd1cc213..5ab08bd76 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -143,7 +143,7 @@ CalendarResources::~CalendarResources()
   delete mAskPolicy;
 }
 
-void CalendarResources::readConfig( KConfig *config )
+void CalendarResources::readConfig( TDEConfig *config )
 {
   mManager->readConfig( config );
 
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index 3f6f17740..921fb227a 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -171,7 +171,7 @@ class LIBKCAL_EXPORT CalendarResources :
 
     /**
        Loads all Incidences from the Resources.  The Resources must be added
-       first using either readConfig(KConfig *config), which adds the system
+       first using either readConfig(TDEConfig *config), which adds the system
        Resources, or manually using resourceAdded(ResourceCalendar *resource).
     */
     void load();
@@ -251,12 +251,12 @@ class LIBKCAL_EXPORT CalendarResources :
     /**
        Read the Resources settings from a config file.
 
-       @param config The KConfig object which points to the config file.
+       @param config The TDEConfig object which points to the config file.
        If no object is given (null pointer) the standard config file is used.
 
        @note Call this method <em>before</em> load().
     */
-    void readConfig( KConfig *config = 0 );
+    void readConfig( TDEConfig *config = 0 );
 
     /**
        Set the destination policy such that Incidences are always added
diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp
index 2e913d56f..62cf26e6e 100644
--- a/libkcal/freebusyurlstore.cpp
+++ b/libkcal/freebusyurlstore.cpp
@@ -42,7 +42,7 @@ FreeBusyUrlStore *FreeBusyUrlStore::self()
 FreeBusyUrlStore::FreeBusyUrlStore()
 {
   TQString configFile = locateLocal( "data", "korganizer/freebusyurls" );
-  mConfig = new KConfig( configFile );
+  mConfig = new TDEConfig( configFile );
 }
 
 FreeBusyUrlStore::~FreeBusyUrlStore()
diff --git a/libkcal/freebusyurlstore.h b/libkcal/freebusyurlstore.h
index 6beb4d03a..95b3026cf 100644
--- a/libkcal/freebusyurlstore.h
+++ b/libkcal/freebusyurlstore.h
@@ -25,7 +25,7 @@
 
 #include "libkcal_export.h"
 
-class KConfig;
+class TDEConfig;
 
 namespace KCal {
 
@@ -46,7 +46,7 @@ class LIBKCAL_EXPORT FreeBusyUrlStore
   
     static FreeBusyUrlStore *mSelf;
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 }
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index d32fad054..aab9216db 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -48,7 +48,7 @@ using namespace KCal;
 
 static bool m_editoropen = false;
 
-ResourceCached::ResourceCached( const KConfig* config )
+ResourceCached::ResourceCached( const TDEConfig* config )
   : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
     mReloadPolicy( ReloadNever ),  mReloadInterval( 10 ),
     mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ),
@@ -107,7 +107,7 @@ int ResourceCached::saveInterval() const
   return mSaveInterval;
 }
 
-void ResourceCached::readConfig( const KConfig *config )
+void ResourceCached::readConfig( const TDEConfig *config )
 {
   mReloadPolicy = config->readNumEntry( "ReloadPolicy", ReloadNever );
   mReloadInterval = config->readNumEntry( "ReloadInterval", 10 );
@@ -144,7 +144,7 @@ void ResourceCached::setupReloadTimer()
   }
 }
 
-void ResourceCached::writeConfig( KConfig *config )
+void ResourceCached::writeConfig( TDEConfig *config )
 {
   config->writeEntry( "ReloadPolicy", mReloadPolicy );
   config->writeEntry( "ReloadInterval", mReloadInterval );
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index a26c3c539..5f56e3907 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -61,11 +61,11 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
     */
     enum { SaveNever, SaveOnExit, SaveInterval, SaveDelayed, SaveAlways };
 
-    ResourceCached( const KConfig * );
+    ResourceCached( const TDEConfig * );
     virtual ~ResourceCached();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     static bool editorWindowOpen();
     static void setEditorWindowOpen(bool open);
diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp
index 9f611e75e..36a0932b0 100644
--- a/libkcal/resourcecalendar.cpp
+++ b/libkcal/resourcecalendar.cpp
@@ -32,7 +32,7 @@
 
 using namespace KCal;
 
-ResourceCalendar::ResourceCalendar( const KConfig *config )
+ResourceCalendar::ResourceCalendar( const TDEConfig *config )
   : KRES::Resource( config ), mResolveConflict( false )
 {
   mException = 0;
@@ -81,7 +81,7 @@ TQString ResourceCalendar::infoText() const
   return txt;
 }
 
-void ResourceCalendar::writeConfig( KConfig* config )
+void ResourceCalendar::writeConfig( TDEConfig* config )
 {
 //  kdDebug(5800) << "ResourceCalendar::writeConfig()" << endl;
 
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index c1c1e492f..e63a2ad61 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -59,7 +59,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
   Q_OBJECT
   
   public:
-    ResourceCalendar( const KConfig * );
+    ResourceCalendar( const TDEConfig * );
     virtual ~ResourceCalendar();
 
     /**
@@ -81,7 +81,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
 
     void setResolveConflict( bool b);
 
-    virtual void writeConfig( KConfig* config );
+    virtual void writeConfig( TDEConfig* config );
 
     /**
       Return rich text with info about the resource. Adds standard info and
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index 2f10dce4b..8b0bc1cca 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -56,7 +56,7 @@ class ResourceLocal::Private
     TQDateTime mLastModified;
 };
 
-ResourceLocal::ResourceLocal( const KConfig* config )
+ResourceLocal::ResourceLocal( const TDEConfig* config )
   : ResourceCached( config ), mLock( 0 )
 {
   if ( config ) {
@@ -87,7 +87,7 @@ ResourceLocal::ResourceLocal( const TQString& fileName )
 }
 
 
-void ResourceLocal::writeConfig( KConfig* config )
+void ResourceLocal::writeConfig( TDEConfig* config )
 {
   kdDebug(5800) << "ResourceLocal::writeConfig()" << endl;
 
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index d5a28eaab..a2b6818b9 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <kdirwatch.h>
 #include <tdepimmacros.h>
-class KConfig;
+class TDEConfig;
 
 #include "calendarlocal.h"
 #include "libkcal_export.h"
@@ -51,16 +51,16 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
 
   public:
     /**
-      Create resource from configuration information stored in a KConfig object.
+      Create resource from configuration information stored in a TDEConfig object.
     */
-    ResourceLocal( const KConfig * );
+    ResourceLocal( const TDEConfig * );
     /**
       Create resource for file named @a fileName.
     */
     ResourceLocal( const TQString& fileName );
     virtual ~ResourceLocal();
 
-    virtual void writeConfig( KConfig* config );
+    virtual void writeConfig( TDEConfig* config );
 
     KABC::Lock *lock();
 
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index f1e00f327..63221ca04 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -52,7 +52,7 @@
 
 using namespace KCal;
 
-ResourceLocalDir::ResourceLocalDir( const KConfig* config )
+ResourceLocalDir::ResourceLocalDir( const TDEConfig* config )
   : ResourceCached( config ), mLock( 0 )
 {
   if ( config ) {
@@ -71,13 +71,13 @@ ResourceLocalDir::ResourceLocalDir( const TQString& dirName )
 }
 
 
-void ResourceLocalDir::readConfig( const KConfig *config )
+void ResourceLocalDir::readConfig( const TDEConfig *config )
 {
   TQString url = config->readPathEntry( "CalendarURL" );
   mURL = KURL( url );
 }
 
-void ResourceLocalDir::writeConfig( KConfig *config )
+void ResourceLocalDir::writeConfig( TDEConfig *config )
 {
   kdDebug(5800) << "ResourceLocalDir::writeConfig()" << endl;
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index e5fe7f81e..0adbf1cb6 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -30,7 +30,7 @@
 #include "libkcal_export.h"
 
 class TQString;
-class KConfig;
+class TDEConfig;
 
 namespace KCal {
 
@@ -50,12 +50,12 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
     friend class ResourceLocalDirConfig;
 
   public:
-    ResourceLocalDir( const KConfig * );
+    ResourceLocalDir( const TDEConfig * );
     ResourceLocalDir( const TQString& fileName );
     virtual ~ResourceLocalDir();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig* config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig* config );
 
     KABC::Lock *lock();
 
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index b7f2f24c4..25c9e5d6c 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -68,9 +68,9 @@ int main(int argc, char *argv[])
     TQString type = TQString();
     if ( args->getOption( "resource" ) )
       type = TQString::fromLocal8Bit( args->getOption( "resource" ) );
-    KConfig *config = 0;
+    TDEConfig *config = 0;
     if ( args->getOption( "configfile" ) )
-      config = new KConfig( KURL( args->getOption( "configfile" ) ).url() );
+      config = new TDEConfig( KURL( args->getOption( "configfile" ) ).url() );
     kdDebug() << KURL( args->getOption( "configfile" ) ).url() << endl;
     KCal::TestResource test( type, config );
     test.setup();
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 
 namespace KCal {
 
-TestResource::TestResource( const TQString &type, KConfig *config )
+TestResource::TestResource( const TQString &type, TDEConfig *config )
  :m_resource_type( type ), m_config( config ), m_res( 0 )
 {}
   
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index f6d7fc127..4d17c7b48 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -20,7 +20,7 @@
 #define TESTRESOURCE_H
 
 #include <tqobject.h>
-class KConfig;
+class TDEConfig;
 
 namespace KCal {
 
@@ -32,7 +32,7 @@ class TestResource : public TQObject
   
 
 public:
-    TestResource( const TQString& type, KConfig *config );
+    TestResource( const TQString& type, TDEConfig *config );
     void setup();
     void runAll();
     void cleanup();
@@ -49,7 +49,7 @@ public:
 private:
     bool check(const TQString& txt, TQString a, TQString b);
     TQString m_resource_type;
-    KConfig *m_config;
+    TDEConfig *m_config;
     ResourceCalendar *m_res;
 };
 }
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 08557a727..18060ec6d 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -63,7 +63,7 @@ Module::Module()
   kpgpObject=kpgpod.setObject(Module::kpgpObject, this);
   pgp = 0;
 
-  config = new KConfig("kpgprc");
+  config = new TDEConfig("kpgprc");
 
   init();
 }
@@ -1013,7 +1013,7 @@ Module::getKpgp()
 }
 
 
-KConfig *
+TDEConfig *
 Module::getConfig()
 {
   return getKpgp()->config;
@@ -1739,12 +1739,12 @@ Module::readAddressData()
   TQString address;
   AddressData data;
 
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   int num = general.readNumEntry( "addressEntries", 0 );
 
   addressDataDict.clear();
   for( int i=1; i<=num; i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
+    TDEConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     address = addrGroup.readEntry( "Address" );
     data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) );
     data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference",
@@ -1761,7 +1761,7 @@ Module::readAddressData()
 void
 Module::writeAddressData()
 {
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   general.writeEntry( "addressEntries", addressDataDict.count() );
 
   int i;
@@ -1769,7 +1769,7 @@ Module::writeAddressData()
   for ( i=1, it = addressDataDict.begin();
         it != addressDataDict.end();
         ++it, i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
+    TDEConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     addrGroup.writeEntry( "Address", it.key() );
     addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() );
     addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref );
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index 967254b6b..6628f41e5 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -43,7 +43,7 @@ class TQCursor;
 class TQCheckBox;
 class TQGridLayout;
 
-class KConfig;
+class TDEConfig;
 
 namespace Kpgp {
 
@@ -304,7 +304,7 @@ public:
   static Kpgp::Module *getKpgp();
 
   /** get the kpgp config object */
-  static KConfig *getConfig();
+  static TDEConfig *getConfig();
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
@@ -416,7 +416,7 @@ private:
   void assignPGPBase(void);
 
   static Kpgp::Module *kpgpObject;
-  KConfig *config;
+  TDEConfig *config;
 
   struct AddressData {
     KeyIDList keyIds;
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 2e6d71606..164225d19 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -296,8 +296,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
   if ( kapp )
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
-  KConfig *config = pgp->getConfig();
-  KConfigGroup dialogConfig( config, "Key Selection Dialog" );
+  TDEConfig *config = pgp->getConfig();
+  TDEConfigGroup dialogConfig( config, "Key Selection Dialog" );
 
   TQSize defaultSize( 580, 400 );
   TQSize dialogSize = dialogConfig.readSizeEntry( "Dialog size", &defaultSize );
@@ -397,8 +397,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
 KeySelectionDialog::~KeySelectionDialog()
 {
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
-  KConfig *config = pgp->getConfig();
-  KConfigGroup dialogConfig( config, "Key Selection Dialog" );
+  TDEConfig *config = pgp->getConfig();
+  TDEConfigGroup dialogConfig( config, "Key Selection Dialog" );
   dialogConfig.writeEntry( "Dialog size", size() );
   config->sync();
   delete mKeyGoodPix;
@@ -1662,7 +1662,7 @@ void CipherTextDialog::setMinimumSize()
 #if KDE_IS_VERSION( 3, 1, 90 )
   int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100;
 #else
-  KConfig gc("kdeglobals", false, false);
+  TDEConfig gc("kdeglobals", false, false);
   gc.setGroup("Windows");
   int maxWidth;
   if (TQApplication::desktop()->isVirtualDesktop() &&
diff --git a/libkpimexchange/configure.in.in b/libkpimexchange/configure.in.in
index 43906b311..139073a4c 100644
--- a/libkpimexchange/configure.in.in
+++ b/libkpimexchange/configure.in.in
@@ -8,7 +8,7 @@ AC_LANG_CPLUSPLUS
 AC_TRY_COMPILE(
 [#include <kio/http.h>],
 [
-  int method = (int) KIO::DAV_SUBSCRIBE;
+  int method = (int) TDEIO::DAV_SUBSCRIBE;
 ],
 [
   ac_has_recent_webdav="yes"
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 0f15b1005..7b67a5529 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -179,7 +179,7 @@ bool ExchangeAccount::authenticate( int windowId )
 
   kdDebug() << "Authenticating to base URL: " << baseURL().prettyURL() << endl;
 
-  KIO::AuthInfo info;
+  TDEIO::AuthInfo info;
   info.url = baseURL();
   info.username = mAccount;
   info.password = mPassword;
@@ -194,7 +194,7 @@ bool ExchangeAccount::authenticate( int windowId )
   stream << info << windowId;
 
   dcopClient->send( "kded", "kpasswdserver",
-                    "addAuthInfo(KIO::AuthInfo, long int)", params );
+                    "addAuthInfo(TDEIO::AuthInfo, long int)", params );
 
   dcopClient->detach();
   delete dcopClient;
@@ -237,13 +237,13 @@ void ExchangeAccount::calcFolderURLs()
 
   mError = false;
 
-  KIO::DavJob* job = KIO::davPropFind( baseURL(), doc, "1", false );
+  TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotFolderResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeAccount::slotFolderResult( KIO::Job *job )
+void ExchangeAccount::slotFolderResult( TDEIO::Job *job )
 {
   kdDebug() << "ExchangeAccount::slotFolderResult()" << endl;
   if ( job->error() ) {
@@ -254,7 +254,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job )
     mError = true;
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   TQDomElement prop = response.documentElement().namedItem( "response" )
                      .namedItem( "propstat" ).namedItem( "prop" ).toElement();
@@ -297,14 +297,14 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
   url.setPass( password );
 
   TQString tmpFile;
-  if ( !KIO::NetAccess::download( url, tmpFile, 0 ) ) {
+  if ( !TDEIO::NetAccess::download( url, tmpFile, 0 ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to download " << url.prettyURL() << endl;
     return TQString();
   }
   TQFile file( tmpFile );
   if ( !file.open( IO_ReadOnly ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to open temp file " << tmpFile << endl;
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
     return TQString();
   }
 
@@ -332,7 +332,7 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
     }
     file.close();
 
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
     return result;
 }
 
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 71b6b889d..0d8bfcdf8 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -81,7 +81,7 @@ class KDE_EXPORT ExchangeAccount : public TQObject
                                const TQString &password );
 
   private slots:
-    void slotFolderResult( KIO::Job * );
+    void slotFolderResult( TDEIO::Job * );
 
   private:
     TQString mHost;
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index fe320b0f0..eadcc2bed 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -102,7 +102,7 @@ void ExchangeClient::test()
   "  <allprop/>\r\n"
   "</propfind>\r\n";
 
-  KIO::DavJob* job = new KIO::DavJob( url, (int) KIO::DAV_PROPFIND, query, false );
+  TDEIO::DavJob* job = new TDEIO::DavJob( url, (int) TDEIO::DAV_PROPFIND, query, false );
   job->addMetaData( "davDepth", "0" );
 */
 //  ExchangeMonitor* monitor = new ExchangeMonitor( mAccount );
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index b9b0acd50..6c994c02a 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -33,7 +33,7 @@ namespace KCal {
   class Calendar;
 }
 
-namespace KIO { 
+namespace TDEIO { 
   class Job; 
 }
 
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index eecfbd7f3..b23e9527e 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -72,19 +72,19 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
 	" AND (\"urn:schemas:calendar:instancetype\" = 0\r\n"
 	"      OR \"urn:schemas:calendar:instancetype\" = 1)\r\n";
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
   job->setWindow( mWindow );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
 }
 
-void ExchangeDelete::slotFindUidResult( KIO::Job * job )
+void ExchangeDelete::slotFindUidResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
     emit finished( this, ExchangeClient::CommunicationError, "IO Error: " + TQString::number(job->error()) + ":" + job->errorString() );
     return;
   }
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
 
   TQDomElement item = response.documentElement().firstChild().toElement();
   TQDomElement hrefElement = item.namedItem( "href" ).toElement();
@@ -102,12 +102,12 @@ void ExchangeDelete::slotFindUidResult( KIO::Job * job )
 
 void ExchangeDelete::startDelete( const KURL& url )
 {
-  KIO::SimpleJob* job = KIO::file_delete( url, false ); // no GUI
+  TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeDelete::slotDeleteResult( KIO::Job* job )
+void ExchangeDelete::slotDeleteResult( TDEIO::Job* job )
 {
   kdDebug() << "Finished Delete" << endl;
   if ( job->error() ) {
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 0c2c60e49..151657e57 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -41,8 +41,8 @@ class KDE_EXPORT ExchangeDelete : public TQObject {
     ~ExchangeDelete();
 
   private slots:
-    void slotDeleteResult( KIO::Job * );
-    void slotFindUidResult( KIO::Job * );
+    void slotDeleteResult( TDEIO::Job * );
+    void slotFindUidResult( TDEIO::Job * );
 
   signals:
     void finished( ExchangeDelete* worker, int result, const TQString& moreInfo );
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 60879d266..75b5f100f 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -108,12 +108,12 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
   kdDebug() << "ExchangeDownload::download() davSearch URL: "
             << mAccount->calendarURL() << endl;
 
-  KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      sql, false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSearchResult( TDEIO::Job *) ) );
 }
 
 void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress )
@@ -134,11 +134,11 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
 
   increaseDownloads();
 
-  KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
-  KIO::Scheduler::scheduleJob(job);
+  TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
+  TDEIO::Scheduler::scheduleJob(job);
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
 }
 
 // Original query TODO: make query configurable
@@ -176,7 +176,7 @@ TQString ExchangeDownload::dateSelectQuery( const TQDate& start, const TQDate& e
 }
 #endif
 
-void ExchangeDownload::slotSearchResult( KIO::Job *job )
+void ExchangeDownload::slotSearchResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdError() << "ExchangeDownload::slotSearchResult() error: "
@@ -188,7 +188,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
     finishUp( ExchangeClient::CommunicationError, job );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search result: " << endl << response.toString() << endl;
 
@@ -197,7 +197,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
   decreaseDownloads();
 }
 
-void ExchangeDownload::slotMasterResult( KIO::Job *job )
+void ExchangeDownload::slotMasterResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdError() << "Error result for Master search: " << job->error() << endl;
@@ -205,7 +205,7 @@ void ExchangeDownload::slotMasterResult( KIO::Job *job )
     finishUp( ExchangeClient::CommunicationError, job );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search (master) result: " << endl << response.toString() << endl;
 
@@ -297,12 +297,12 @@ void ExchangeDownload::handleRecurrence( TQString uid )
 
   increaseDownloads();
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotMasterResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeDownload::readAppointment( const KURL& url )
@@ -345,15 +345,15 @@ void ExchangeDownload::readAppointment( const KURL& url )
 
   increaseDownloads();
 
-  KIO::DavJob* job = KIO::davPropFind( url, doc, "0", false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::DavJob* job = TDEIO::davPropFind( url, doc, "0", false );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeDownload::slotPropFindResult( KIO::Job *job )
+void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropFindResult" << endl;
 
@@ -364,7 +364,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
     return;
   }
 
-  TQDomDocument response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "Response: " << endl;
   kdDebug() << response.toString() << endl;
 
@@ -589,7 +589,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
     mCalendar->addEvent( event );
   } else {
     kdDebug() << "EMIT gotEvent" << endl;
-    emit gotEvent( event, static_cast<KIO::DavJob *>( job )->url() );
+    emit gotEvent( event, static_cast<TDEIO::DavJob *>( job )->url() );
 //    mEvents->append( event );
   }
 
@@ -633,7 +633,7 @@ void ExchangeDownload::finishUp( int result, const TQString &moreInfo )
 //  }
 }
 
-void ExchangeDownload::finishUp( int result, KIO::Job *job )
+void ExchangeDownload::finishUp( int result, TDEIO::Job *job )
 {
   finishUp( result, TQString("WebDAV job error code = ") +
                     TQString::number( job->error() ) + ";\n" + "\"" +
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index a28cc7106..33d135603 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -55,16 +55,16 @@ class ExchangeDownload : public TQObject {
     void finished( ExchangeDownload*, int result, const TQString& moreInfo, TQPtrList<KCal::Event>& events );
 
   private slots:
-    void slotSearchResult( KIO::Job *job );
-    void slotMasterResult( KIO::Job* job );
-    void slotPropFindResult( KIO::Job * );
+    void slotSearchResult( TDEIO::Job *job );
+    void slotMasterResult( TDEIO::Job* job );
+    void slotPropFindResult( TDEIO::Job * );
 
   private:
     void handleAppointments( const TQDomDocument &, bool recurrence );
     void readAppointment( const KURL& url );
     void handleRecurrence( TQString uid );
     void finishUp( int result, const TQString& moreInfo=TQString() );
-    void finishUp( int result, KIO::Job* job );
+    void finishUp( int result, TDEIO::Job* job );
 
     void increaseDownloads();
     void decreaseDownloads();
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index c9f8c627a..531a2417e 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -129,11 +129,11 @@ ExchangeMonitor::~ExchangeMonitor()
   if ( ! mSubscriptionMap.isEmpty() ) {
     TQString headers = "Subscription-ID: " + makeIDString( mSubscriptionMap.keys() );
     kdDebug() << "Subsubscribing all watches, headers:" << endl << headers << endl;
-    KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
+    TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
     job->addMetaData( "customHTTPHeader", headers );
     // Can't do, this is a destructor!
     // job->addMetaData( "PropagateHttpHeader", "true" );
-    // connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(KIO::Job *)));
+    // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
   }
   kdDebug() << "Finished ExchangeMonitor destructor" << endl;
 
@@ -158,10 +158,10 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth )
   kdDebug() << "Headers: " << headers << endl;
 
   KURL myURL = toDAV( url );
-  KIO::DavJob *job = new KIO::DavJob( myURL, (int) KIO::DAV_SUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", headers );
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotSubscribeResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::removeWatch( const KURL &url ) 
@@ -179,13 +179,13 @@ void ExchangeMonitor::removeWatch( const KURL &url )
 
 void ExchangeMonitor::removeWatch( ID id )
 {
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id ));
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
+void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
@@ -245,7 +245,7 @@ void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
   mSubscriptionMap.insert( id, url );
 }
 
-void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
+void ExchangeMonitor::slotUnsubscribeResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
@@ -253,7 +253,7 @@ void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
     return;
   }
 
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "UNSUBSCRIBE result: " << endl << response.toString() << endl;
 
   TQDomElement status = response.documentElement().namedItem( "response" ).namedItem( "status" ).toElement();
@@ -321,19 +321,19 @@ void ExchangeMonitor::poll( const IDList& IDs ) {
 //  }
 
   // confirm it
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_POLL, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotPollResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotPollResult( KIO::Job * job )
+void ExchangeMonitor::slotPollResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
     emit error( ExchangeClient::CommunicationError, "IO Error: " + TQString::number(job->error()) + ":" + job->errorString() );
     return;
   }
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "POLL result: " << endl << response.toString() << endl;
 
   // Multiple results!
@@ -366,12 +366,12 @@ void ExchangeMonitor::slotRenewTimer()
 {
   kdDebug() << "ExchangeMonitor::slotRenewTimer()" << endl;
 
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_SUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotRenewResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotRenewResult( KIO::Job* job )
+void ExchangeMonitor::slotRenewResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index 6f31700d2..15b4fa992 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -78,13 +78,13 @@ class ExchangeMonitor : public TQObject {
     void error( int result, const TQString& moreInfo );
 
   private slots:
-    void slotSubscribeResult( KIO::Job * );
-    void slotUnsubscribeResult( KIO::Job * );
+    void slotSubscribeResult( TDEIO::Job * );
+    void slotUnsubscribeResult( TDEIO::Job * );
     void slotPollTimer();
     void poll( const IDList& IDs );
-    void slotPollResult( KIO::Job * );
+    void slotPollResult( TDEIO::Job * );
     void slotRenewTimer();
-    void slotRenewResult( KIO::Job * );
+    void slotRenewResult( TDEIO::Job * );
     void slotActivated(int socket);
 
   private:
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index d317976d0..e553b40c3 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -85,14 +85,14 @@ void ExchangeUpload::findUid( TQString const &uid )
   kdDebug() << "Find uid query: " << endl << query << endl;
   kdDebug() << "Looking for uid " << uid << endl;
   
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotFindUidResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotFindUidResult( KIO::Job * job )
+void ExchangeUpload::slotFindUidResult( TDEIO::Job * job )
 {
   kdDebug() << "slotFindUidResult()" << endl;
 
@@ -104,7 +104,7 @@ void ExchangeUpload::slotFindUidResult( KIO::Job * job )
                    job->errorString() );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search uid result: " << endl << response.toString() << endl;
 
@@ -144,19 +144,19 @@ void ExchangeUpload::tryExist()
   addElement( doc, prop, "DAV:", "displayname" );
   addElement( doc, prop, "urn:schemas:calendar", "uid" );
 
-  KIO::DavJob *job = KIO::davPropFind( url, doc, "0", false );
+  TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotPropFindResult( KIO::Job *job )
+void ExchangeUpload::slotPropFindResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropFindResult()" << endl;
   int error = job->error(); 
   kdDebug() << "PROPFIND error: " << error << ":" << job->errorString() << endl;
-  if ( error && error != KIO::ERR_DOES_NOT_EXIST ) {
+  if ( error && error != TDEIO::ERR_DOES_NOT_EXIST ) {
     job->showErrorDialog( 0 );
     emit finished( this, ExchangeClient::CommunicationError,
                    "IO Error: " + TQString::number(error) + ":" +
@@ -330,13 +330,13 @@ void ExchangeUpload::startUpload( const KURL &url )
 
   kdDebug() << "Upload url: " << url << endl;
 
-  KIO::DavJob *job = KIO::davPropPatch( url, doc, false );
+  TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPatchResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotPatchResult( KIO::Job *job )
+void ExchangeUpload::slotPatchResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropPatchResult()" << endl;
   if ( job->error() ) {
@@ -347,7 +347,7 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
                    job->errorString() );
     return;
   }
-  TQDomDocument response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "Patch result: " << response.toString() << endl;
 
   // Either we have a "201 Created" (if a new event has been created) or 
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index fd279faab..e592c00f4 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -41,9 +41,9 @@ class KDE_EXPORT ExchangeUpload : public TQObject {
     ~ExchangeUpload();
 
   private slots:
-    void slotPatchResult( KIO::Job * );
-    void slotPropFindResult( KIO::Job * );
-    void slotFindUidResult( KIO::Job * );
+    void slotPatchResult( TDEIO::Job * );
+    void slotPropFindResult( TDEIO::Job * );
+    void slotFindUidResult( TDEIO::Job * );
 
   signals:
     void startDownload();
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c0ce5a6e8..761236f55 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -121,7 +121,7 @@ TQString Signature::textFromFile( bool * ok ) const
 {
   assert( mType == FromFile );
 
-  // ### FIXME: Use KIO::NetAccess to download non-local files!
+  // ### FIXME: Use TDEIO::NetAccess to download non-local files!
   if ( !KURL(mUrl).isLocalFile() && !(TQFileInfo(mUrl).isRelative()
                                       && TQFileInfo(mUrl).exists()) ) {
     kdDebug( 5006 ) << "Signature::textFromFile: non-local URLs are unsupported" << endl;
@@ -172,7 +172,7 @@ static const char sigTextKey[] = "Inline Signature";
 static const char sigFileKey[] = "Signature File";
 static const char sigCommandKey[] = "Signature Command";
 
-void Signature::readConfig( const KConfigBase * config )
+void Signature::readConfig( const TDEConfigBase * config )
 {
   TQString sigType = config->readEntry( sigTypeKey );
   if ( sigType == sigTypeInlineValue ) {
@@ -189,7 +189,7 @@ void Signature::readConfig( const KConfigBase * config )
   mText = config->readEntry( sigTextKey );
 }
 
-void Signature::writeConfig( KConfigBase * config ) const
+void Signature::writeConfig( TDEConfigBase * config ) const
 {
   switch ( mType ) {
   case Inlined:
@@ -316,7 +316,7 @@ Identity::~Identity()
 }
 
 
-void Identity::readConfig( const KConfigBase * config )
+void Identity::readConfig( const TDEConfigBase * config )
 {
   mUoid = config->readUnsignedNumEntry("uoid",0);
 
@@ -353,7 +353,7 @@ void Identity::readConfig( const KConfigBase * config )
 }
 
 
-void Identity::writeConfig( KConfigBase * config ) const
+void Identity::writeConfig( TDEConfigBase * config ) const
 {
   config->writeEntry("uoid", mUoid);
 
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 7139b753a..4d6eeed09 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -20,7 +20,7 @@ namespace KPIM {
   class Identity;
   class Signature;
 }
-class KConfigBase;
+class TDEConfigBase;
 class IdentityList;
 class TQDataStream;
 
@@ -72,8 +72,8 @@ public:
   void setType( Type type ) { mType = type; }
 
 protected:
-  void writeConfig( KConfigBase * config ) const;
-  void readConfig( const KConfigBase * config );
+  void writeConfig( TDEConfigBase * config ) const;
+  void readConfig( const TDEConfigBase * config );
 
 private:
   TQString textFromFile( bool * ok ) const;
@@ -136,12 +136,12 @@ public:
 
 protected:
   /** Read configuration from config. Group must be preset (or use
-      KConfigGroup). Called from IdentityManager. */
-  void readConfig( const KConfigBase * );
+      TDEConfigGroup). Called from IdentityManager. */
+  void readConfig( const TDEConfigBase * );
 
   /** Write configuration to config. Group must be preset (or use
-      KConfigGroup). Called from IdentityManager. */
-  void writeConfig( KConfigBase * ) const;
+      TDEConfigGroup). Called from IdentityManager. */
+  void writeConfig( TDEConfigBase * ) const;
 
 public:
   /** Tests if there are enough values set to allow mailing */
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 2935fe0a2..f6bc5def4 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -70,13 +70,13 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char *
   : ConfigManager( parent, name ), DCOPObject( newDCOPObjectName() )
 {
   mReadOnly = readonly;
-  mConfig = new KConfig( "emailidentities", readonly );
+  mConfig = new TDEConfig( "emailidentities", readonly );
   readConfig(mConfig);
   if ( mIdentities.isEmpty() ) {
     kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl;
     // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2)
     // => convert it, i.e. read settings from kmailrc
-    KConfig kmailConf( "kmailrc", true );
+    TDEConfig kmailConf( "kmailrc", true );
     readConfig( &kmailConf );
   }
   // we need at least a default identity:
@@ -201,11 +201,11 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
+    TDEConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
-      KConfigGroup general( mConfig, "General" );
+      TDEConfigGroup general( mConfig, "General" );
       general.writeEntry( configKeyDefaultIdentity, (*it).uoid() );
 
       // Also write the default identity to emailsettings
@@ -220,19 +220,19 @@ void IdentityManager::writeConfig() const {
 
 }
 
-void IdentityManager::readConfig(KConfigBase* config) {
+void IdentityManager::readConfig(TDEConfigBase* config) {
   mIdentities.clear();
 
   TQStringList identities = groupList(config);
   if ( identities.isEmpty() ) return; // nothing to be done...
 
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   uint defaultIdentity = general.readUnsignedNumEntry( configKeyDefaultIdentity );
   bool haveDefault = false;
 
   for ( TQStringList::Iterator group = identities.begin() ;
 	group != identities.end() ; ++group ) {
-    KConfigGroup configGroup( config, *group );
+    TDEConfigGroup configGroup( config, *group );
     mIdentities << Identity();
     mIdentities.last().readConfig( &configGroup );
     if ( !haveDefault && mIdentities.last().uoid() == defaultIdentity ) {
@@ -249,7 +249,7 @@ void IdentityManager::readConfig(KConfigBase* config) {
   mShadowIdentities = mIdentities;
 }
 
-TQStringList IdentityManager::groupList(KConfigBase* config) const {
+TQStringList IdentityManager::groupList(TDEConfigBase* config) const {
   return config->groupList().grep( TQRegExp("^Identity #\\d+$") );
 }
 
@@ -442,7 +442,7 @@ void IdentityManager::createDefaultIdentity() {
       if ( emailAddress.isEmpty() ) {
         emailAddress = user.loginName();
         if ( !emailAddress.isEmpty() ) {
-          KConfigGroup general( mConfig, "General" );
+          TDEConfigGroup general( mConfig, "General" );
           TQString defaultdomain = general.readEntry( "Default domain" );
           if( !defaultdomain.isEmpty() ) {
             emailAddress += '@' + defaultdomain;
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 2f0d5bde9..b0aee59d4 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -37,8 +37,8 @@
 #include <dcopobject.h>
 #include <tdepimmacros.h>
 
-class KConfigBase;
-class KConfig;
+class TDEConfigBase;
+class TDEConfig;
 class KMKernel;
 class TQStringList;
 class KMIdentity;
@@ -226,15 +226,15 @@ k_dcop:
 
 private:
   void writeConfig() const;
-  void readConfig(KConfigBase* config);
-  TQStringList groupList(KConfigBase* config) const;
+  void readConfig(TDEConfigBase* config);
+  TQStringList groupList(TDEConfigBase* config) const;
   void createDefaultIdentity();
 
   // returns a new Unique Object Identifier
   int newUoid();
 
 private:
-  KConfig* mConfig;
+  TDEConfig* mConfig;
   bool mReadOnly;
 };
 
diff --git a/libtdepim/TODO b/libtdepim/TODO
index f6c5214c3..3bca9b1a0 100644
--- a/libtdepim/TODO
+++ b/libtdepim/TODO
@@ -1,10 +1,10 @@
-KConfigPropagator:
+TDEConfigPropagator:
 
 - Title for all changes.
 - Write DTD for extended kcfg file.
 - Check validity of rules against the installed kcfg files.
 - Turn public members of Change, Rule, Condition into proper accessors/mutators
 
-KConfigWizard:
+TDEConfigWizard:
 
 - More pretty changes view.
diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp
index fe66adbd8..c2c6ff4f4 100644
--- a/libtdepim/addresseeemailselection.cpp
+++ b/libtdepim/addresseeemailselection.cpp
@@ -201,7 +201,7 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const
 KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const
 {
   if ( index == 0 ) {
-    KConfig config( "kmailrc" );
+    TDEConfig config( "kmailrc" );
     return RecentAddresses::self( &config )->kabcAddresses();
   } else {
     return KABC::Addressee::List();
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 3b55024b6..dbe032b2c 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -552,7 +552,7 @@ void AddresseeLineEdit::loadContacts()
 
   TQApplication::setOverrideCursor( KCursor::waitCursor() ); // loading might take a while
 
-  KConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there.
+  TDEConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there.
   config.setGroup( "CompletionWeights" );
 
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -1008,7 +1008,7 @@ void KPIM::AddresseeLineEdit::slotCompletion()
 // not cached, to make sure we get an up-to-date value when it changes
 KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
 {
-  KConfig config( "kpimcompletionorder" );
+  TDEConfig config( "kpimcompletionorder" );
   config.setGroup( "General" );
   const TQString order = config.readEntry( "CompletionOrder", "Weighted" );
 
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 3c98fe132..7cf3a340c 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -39,7 +39,7 @@
 #include <dcopobject.h>
 #include <tdepimmacros.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KPIM {
 class LdapSearch;
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 5be001a67..559f01713 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -51,7 +51,7 @@
 using namespace KPIM;
 
 AddresseeView::AddresseeView( TQWidget *parent, const char *name,
-                              KConfig *config )
+                              TDEConfig *config )
   : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
     mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
 {
@@ -97,7 +97,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
   connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
 
   if ( !config ) {
-    mConfig = new KConfig( "kaddressbookrc" );
+    mConfig = new TDEConfig( "kaddressbookrc" );
     mDefaultConfig = true;
   } else
     mConfig = config;
@@ -546,11 +546,11 @@ void AddresseeView::updateView()
       if ( mImageData.count() > 0 )
         TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) );
       else {
-        mImageJob = KIO::get( KURL( picture.url() ), false, false );
-        connect( mImageJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-                 this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-        connect( mImageJob, TQT_SIGNAL( result( KIO::Job* ) ),
-                 this, TQT_SLOT( result( KIO::Job* ) ) );
+        mImageJob = TDEIO::get( KURL( picture.url() ), false, false );
+        connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+                 this, TQT_SLOT( result( TDEIO::Job* ) ) );
       }
     } else {
       TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
@@ -582,7 +582,7 @@ void AddresseeView::emailClicked( const TQString &email )
 
 void AddresseeView::phoneNumberClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "PhoneHookApplication" );
 
@@ -597,7 +597,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number )
 
 void AddresseeView::smsTextClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "SMSHookApplication" );
 
@@ -614,7 +614,7 @@ void AddresseeView::smsTextClicked( const TQString &number )
 
 void AddresseeView::sendSMS( const TQString &number, const TQString &text )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "SMSHookApplication" );
 
@@ -631,7 +631,7 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text )
 
 void AddresseeView::faxNumberClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "FaxHookApplication", "tdeprintfax --phone %N" );
 
@@ -734,14 +734,14 @@ void AddresseeView::configChanged()
   updateView();
 }
 
-void AddresseeView::data( KIO::Job*, const TQByteArray &d )
+void AddresseeView::data( TDEIO::Job*, const TQByteArray &d )
 {
   unsigned int oldSize = mImageData.size();
   mImageData.resize( oldSize + d.size() );
   memcpy( mImageData.data() + oldSize, d.data(), d.size() );
 }
 
-void AddresseeView::result( KIO::Job *job )
+void AddresseeView::result( TDEIO::Job *job )
 {
   mImageJob = 0;
 
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 98a779832..782f4416e 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -29,7 +29,7 @@
 #include <kimproxy.h>
 #include <tdepimmacros.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 class KToggleAction;
@@ -52,7 +52,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
                     which fields will be shown.
      */
     AddresseeView( TQWidget *parent = 0, const char *name = 0,
-                   KConfig *config = 0 );
+                   TDEConfig *config = 0 );
 
     ~AddresseeView();
 
@@ -167,8 +167,8 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
     void slotPresenceInfoExpired();
     void configChanged();
 
-    void data( KIO::Job*, const TQByteArray& );
-    void result( KIO::Job* );
+    void data( TDEIO::Job*, const TQByteArray& );
+    void result( TDEIO::Job* );
 
   private:
     void load();
@@ -178,11 +178,11 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
 
     TQString strippedNumber( const TQString &number );
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
     bool mDefaultConfig;
 
     TQByteArray mImageData;
-    KIO::Job *mImageJob;
+    TDEIO::Job *mImageJob;
 
     KToggleAction *mActionShowBirthday;
     KToggleAction *mActionShowAddresses;
diff --git a/libtdepim/cfgc/README b/libtdepim/cfgc/README
index 6a7783817..720ea2126 100644
--- a/libtdepim/cfgc/README
+++ b/libtdepim/cfgc/README
@@ -1,5 +1,5 @@
 This directory contains text and example code for automatic creation of
-configuration dialogs based on KConfigSkeleton, kconfig_compiler and
+configuration dialogs based on TDEConfigSkeleton, kconfig_compiler and
 KPrefsDialog.
 
 If you have questions or comments please contact Cornelius Schumacher
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 68339f9e1..2e455fe10 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -100,7 +100,7 @@ private:
 
 void LDAPCompletionItem::save( CompletionOrderEditor* )
 {
-  KConfig * config = LdapSearch::config();
+  TDEConfig * config = LdapSearch::config();
   config->setGroup( "LDAP" );
   config->writeEntry( TQString( "SelectedCompletionWeight%1" ).arg( mLdapClient->clientNumber() ),
                       mWeight );
@@ -113,7 +113,7 @@ class SimpleCompletionItem : public CompletionItem
 public:
   SimpleCompletionItem( CompletionOrderEditor* editor, const TQString& label, const TQString& identifier, int weight )
     : mLabel( label ), mIdentifier( identifier ) {
-      KConfigGroup group( editor->configFile(), "CompletionWeights" );
+      TDEConfigGroup group( editor->configFile(), "CompletionWeights" );
       mWeight = group.readNumEntry( mIdentifier, weight );
     }
   virtual TQString label() const { return mLabel; }
@@ -130,7 +130,7 @@ void SimpleCompletionItem::save( CompletionOrderEditor* editor )
 {
   // Maybe KABC::Resource could have a completionWeight setting (for readConfig/writeConfig)
   // But for tdelibs-3.2 compat purposes I can't do that.
-  KConfigGroup group( editor->configFile(), "CompletionWeights" );
+  TDEConfigGroup group( editor->configFile(), "CompletionWeights" );
   group.writeEntry( mIdentifier, mWeight );
 }
 
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index 6a87b3076..a755d1734 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -69,7 +69,7 @@ public:
   CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
   ~CompletionOrderEditor();
 
-  KConfig* configFile() { return &mConfig; }
+  TDEConfig* configFile() { return &mConfig; }
 
 private slots:
   void slotSelectionChanged( TQListViewItem* );
@@ -78,7 +78,7 @@ private slots:
   virtual void slotOk();
 
 private:
-  KConfig mConfig;
+  TDEConfig mConfig;
   CompletionItemList mItems;
   KListView* mListView;
   KPushButton* mUpButton;
diff --git a/libtdepim/groupwarejob.cpp b/libtdepim/groupwarejob.cpp
index bd413e12b..22c9b7aa4 100644
--- a/libtdepim/groupwarejob.cpp
+++ b/libtdepim/groupwarejob.cpp
@@ -24,24 +24,24 @@
 #include <kio/job.h>
 #include <kdebug.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
-KIO::TransferJob *GroupwareJob::getCalendar( const KURL &u )
+TDEIO::TransferJob *GroupwareJob::getCalendar( const KURL &u )
 {
   KURL url = u;
   url.setPath( "/calendar/" );
 
   kdDebug() << "GroupwareJob::getCalendar(): URL: " << url << endl;
 
-  return KIO::get( url, false, false );
+  return TDEIO::get( url, false, false );
 }
 
-KIO::TransferJob *GroupwareJob::getAddressBook( const KURL &u )
+TDEIO::TransferJob *GroupwareJob::getAddressBook( const KURL &u )
 {
   KURL url = u;
   url.setPath( "/addressbook/" );
 
   kdDebug() << "GroupwareJob::getAddressBook(): URL: " << url << endl;
 
-  return KIO::get( url, false, false );
+  return TDEIO::get( url, false, false );
 }
diff --git a/libtdepim/groupwarejob.h b/libtdepim/groupwarejob.h
index bf5a33f6e..2fc2069b0 100644
--- a/libtdepim/groupwarejob.h
+++ b/libtdepim/groupwarejob.h
@@ -23,13 +23,13 @@
 
 #include <kio/jobclasses.h>
 
-namespace KIO {
+namespace TDEIO {
 
 class GroupwareJob
 {
   public:
-    static KIO::TransferJob *getCalendar( const KURL & );
-    static KIO::TransferJob *getAddressBook( const KURL & );
+    static TDEIO::TransferJob *getCalendar( const KURL & );
+    static TDEIO::TransferJob *getAddressBook( const KURL & );
 };
 
 }
diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp
index eece76351..510ef2f83 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/kabcresourcecached.cpp
@@ -29,7 +29,7 @@
 
 using namespace KABC;
 
-ResourceCached::ResourceCached( const KConfig *config )
+ResourceCached::ResourceCached( const TDEConfig *config )
   : KABC::Resource( config ), mIdMapper( "kabc/uidmaps/" ),
     mReloadPolicy( ReloadInterval ),  mReloadInterval( 10 ),
     mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ),
@@ -40,7 +40,7 @@ ResourceCached::ResourceCached( const KConfig *config )
   connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) );
 
   if (config)
-    this->readConfig(const_cast<KConfig *>(config));
+    this->readConfig(const_cast<TDEConfig *>(config));
 }
 
 ResourceCached::~ResourceCached()
@@ -91,7 +91,7 @@ int ResourceCached::saveInterval() const
   return mSaveInterval;
 }
 
-void ResourceCached::writeConfig( KConfig *config )
+void ResourceCached::writeConfig( TDEConfig *config )
 {
   config->writeEntry( "ReloadPolicy", mReloadPolicy );
   config->writeEntry( "ReloadInterval", mReloadInterval );
@@ -105,7 +105,7 @@ void ResourceCached::writeConfig( KConfig *config )
   KABC::Resource::writeConfig( config );
 }
 
-void ResourceCached::readConfig( KConfig *config )
+void ResourceCached::readConfig( TDEConfig *config )
 {
   mReloadPolicy = config->readNumEntry( "ReloadPolicy", ReloadNever );
   mReloadInterval = config->readNumEntry( "ReloadInterval", 10 );
diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/kabcresourcecached.h
index 0b2d4287a..db46ee27f 100644
--- a/libtdepim/kabcresourcecached.h
+++ b/libtdepim/kabcresourcecached.h
@@ -50,7 +50,7 @@ class KDE_EXPORT ResourceCached : public Resource
     */
     enum { SaveNever, SaveOnExit, SaveInterval, SaveDelayed, SaveAlways };
 
-    ResourceCached( const KConfig* );
+    ResourceCached( const TDEConfig* );
     ~ResourceCached();
 
     /**
@@ -113,12 +113,12 @@ class KDE_EXPORT ResourceCached : public Resource
    /**
      Reads the resource specific config from disk.
     */
-   virtual void readConfig( KConfig *config );
+   virtual void readConfig( TDEConfig *config );
 
     /**
       Writes the resource specific config to disk.
      */
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
       Insert an addressee into the resource.
diff --git a/libtdepim/kabcresourcenull.h b/libtdepim/kabcresourcenull.h
index 7d77b89b7..a926e2059 100644
--- a/libtdepim/kabcresourcenull.h
+++ b/libtdepim/kabcresourcenull.h
@@ -31,7 +31,7 @@ namespace KABC {
 class ResourceNull : public Resource
 {
   public:
-    ResourceNull( const KConfig *cfg ) : Resource( cfg ) {}
+    ResourceNull( const TDEConfig *cfg ) : Resource( cfg ) {}
     ResourceNull() : Resource( 0 ) {}
     virtual ~ResourceNull() {}
   
diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp
index 392fea265..f8fd61cf4 100644
--- a/libtdepim/kaccount.cpp
+++ b/libtdepim/kaccount.cpp
@@ -39,7 +39,7 @@ KAccount::KAccount( const uint id, const TQString &name, const Type type )
 {
 }
 
-void KAccount::writeConfig( KConfig &config, const TQString &group )
+void KAccount::writeConfig( TDEConfig &config, const TQString &group )
 {
   TQString oldGroup = config.group();
   if (!group.isEmpty())
@@ -50,7 +50,7 @@ void KAccount::writeConfig( KConfig &config, const TQString &group )
     config.setGroup(oldGroup);
 }
 
-void KAccount::readConfig( KConfig &config, const TQString &group )
+void KAccount::readConfig( TDEConfig &config, const TQString &group )
 {
   TQString oldGroup = config.group();
   if (!group.isEmpty())
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index d0a1b7f21..559a3c03c 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -35,7 +35,7 @@
 #include <tqstring.h>
 #include <tdepimmacros.h>
 
-class KConfig;
+class TDEConfig;
 
 class KDE_EXPORT KAccount
 {
@@ -73,15 +73,15 @@ class KDE_EXPORT KAccount
 
     /**
      * Save the settings
-     * If the group is empty it must be preset in the KConfig
+     * If the group is empty it must be preset in the TDEConfig
      */
-    void writeConfig( KConfig &config, const TQString &group = TQString() ); 
+    void writeConfig( TDEConfig &config, const TQString &group = TQString() ); 
 
     /**
      * Read the settings
-     * If the group is empty it must be preset in the KConfig
+     * If the group is empty it must be preset in the TDEConfig
      */
-    void readConfig( KConfig &config, const TQString &group = TQString() ); 
+    void readConfig( TDEConfig &config, const TQString &group = TQString() ); 
 
   protected:
     uint mId;
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 230f4ef4b..44e1488bd 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -117,7 +117,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
     a.insertEmail( email, true );
 
     {
-      KConfig config( "kaddressbookrc" );
+      TDEConfig config( "kaddressbookrc" );
       config.setGroup( "General" );
       int type = config.readNumEntry( "FormattedNameType", 1 );
 
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index a96a88e78..bb870b11f 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -127,7 +127,7 @@ class PageItem : public TQCheckListItem
 };
 
 KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
   
@@ -178,7 +178,7 @@ void KCMDesignerFields::deleteFile()
     if (KMessageBox::warningContinueCancel(this,
 	i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() )
          == KMessageBox::Continue)
-      KIO::NetAccess::del( pageItem->path(), 0 );
+      TDEIO::NetAccess::del( pageItem->path(), 0 );
   }
   // The actual view refresh will be done automagically by the slots connected to kdirwatch
 }
@@ -189,7 +189,7 @@ void KCMDesignerFields::importFile()
                                               this, i18n("Import Page") );
   KURL dest = localUiDir();
   dest.setFileName(src.fileName());
-  KIO::NetAccess::file_copy( src, dest, -1, true, false, this );
+  TDEIO::NetAccess::file_copy( src, dest, -1, true, false, this );
   // The actual view refresh will be done automagically by the slots connected to kdirwatch
 }
 
@@ -412,7 +412,7 @@ void KCMDesignerFields::startDesigner()
   // check if path exists and create one if not.
   TQString cepPath = localUiDir();
   if( !TDEGlobal::dirs()->exists(cepPath) ) {
-    KIO::NetAccess::mkdir( cepPath, this );
+    TDEIO::NetAccess::mkdir( cepPath, this );
   }
 
   // finally jump there
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index 9e9c890fa..aeb196a3e 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -33,7 +33,7 @@ class TQPushButton;
 
 namespace KPIM {
 
-class KDE_EXPORT KCMDesignerFields : public KCModule
+class KDE_EXPORT KCMDesignerFields : public TDECModule
 {
   Q_OBJECT
   
diff --git a/libtdepim/kconfigpropagator.cpp b/libtdepim/kconfigpropagator.cpp
index d22805db9..a231f9638 100644
--- a/libtdepim/kconfigpropagator.cpp
+++ b/libtdepim/kconfigpropagator.cpp
@@ -31,43 +31,43 @@
 #include <tqfile.h>
 #include <tqstringlist.h>
 
-KConfigPropagator::Change::~Change()
+TDEConfigPropagator::Change::~Change()
 {
 }
 
-KConfigPropagator::ChangeConfig::ChangeConfig()
-  : KConfigPropagator::Change( i18n("Change Config Value") ),
+TDEConfigPropagator::ChangeConfig::ChangeConfig()
+  : TDEConfigPropagator::Change( i18n("Change Config Value") ),
     hideValue( false )
 {
 }
 
-TQString KConfigPropagator::ChangeConfig::arg1() const
+TQString TDEConfigPropagator::ChangeConfig::arg1() const
 {
   return file + "/" + group + "/" + name;
 }
 
-TQString KConfigPropagator::ChangeConfig::arg2() const
+TQString TDEConfigPropagator::ChangeConfig::arg2() const
 {
   if ( hideValue ) return "*";
   else return value;
 }
 
-void KConfigPropagator::ChangeConfig::apply()
+void TDEConfigPropagator::ChangeConfig::apply()
 {
-  KConfig cfg( file );
+  TDEConfig cfg( file );
   cfg.setGroup( group );
   cfg.writeEntry( name, value );
 
   cfg.sync();
 }
 
-KConfigPropagator::KConfigPropagator()
+TDEConfigPropagator::TDEConfigPropagator()
   : mSkeleton( 0 )
 {
   init();
 }
 
-KConfigPropagator::KConfigPropagator( KConfigSkeleton *skeleton,
+TDEConfigPropagator::TDEConfigPropagator( TDEConfigSkeleton *skeleton,
                                       const TQString &kcfgFile )
   : mSkeleton( skeleton ), mKcfgFile( kcfgFile )
 {
@@ -76,12 +76,12 @@ KConfigPropagator::KConfigPropagator( KConfigSkeleton *skeleton,
   readKcfgFile();
 }
 
-void KConfigPropagator::init()
+void TDEConfigPropagator::init()
 {
   mChanges.setAutoDelete( true );
 }
 
-void KConfigPropagator::readKcfgFile()
+void TDEConfigPropagator::readKcfgFile()
 {
   TQString filename = locate( "kcfg", mKcfgFile );
   if ( filename.isEmpty() ) {
@@ -134,7 +134,7 @@ void KConfigPropagator::readKcfgFile()
   }
 }
 
-KConfigPropagator::Rule KConfigPropagator::parsePropagation( const TQDomElement &e )
+TDEConfigPropagator::Rule TDEConfigPropagator::parsePropagation( const TQDomElement &e )
 {
   Rule r;
 
@@ -150,7 +150,7 @@ KConfigPropagator::Rule KConfigPropagator::parsePropagation( const TQDomElement
   return r;
 }
 
-void KConfigPropagator::parseConfigEntryPath( const TQString &path,
+void TDEConfigPropagator::parseConfigEntryPath( const TQString &path,
                                               TQString &file,
                                               TQString &group,
                                               TQString &entry )
@@ -172,7 +172,7 @@ void KConfigPropagator::parseConfigEntryPath( const TQString &path,
   return;
 }
 
-KConfigPropagator::Condition KConfigPropagator::parseCondition( const TQDomElement &e )
+TDEConfigPropagator::Condition TDEConfigPropagator::parseCondition( const TQDomElement &e )
 {
   Condition c;
   
@@ -187,7 +187,7 @@ KConfigPropagator::Condition KConfigPropagator::parseCondition( const TQDomEleme
   return c;
 }
 
-void KConfigPropagator::commit()
+void TDEConfigPropagator::commit()
 {
   updateChanges();
 
@@ -197,15 +197,15 @@ void KConfigPropagator::commit()
   }
 }
 
-KConfigSkeletonItem *KConfigPropagator::findItem( const TQString &group,
+TDEConfigSkeletonItem *TDEConfigPropagator::findItem( const TQString &group,
                                                   const TQString &name )
 {
-//  kdDebug() << "KConfigPropagator::findItem()" << endl;
+//  kdDebug() << "TDEConfigPropagator::findItem()" << endl;
 
   if ( !mSkeleton ) return 0;
 
-  KConfigSkeletonItem::List items = mSkeleton->items();
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List items = mSkeleton->items();
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = items.begin(); it != items.end(); ++it ) {
 //    kdDebug() << "  Item: " << (*it)->name() << "  Type: "
 //              << (*it)->property().typeName() << endl;
@@ -217,7 +217,7 @@ KConfigSkeletonItem *KConfigPropagator::findItem( const TQString &group,
   else return *it;
 }
 
-TQString KConfigPropagator::itemValueAsString( KConfigSkeletonItem *item )
+TQString TDEConfigPropagator::itemValueAsString( TDEConfigSkeletonItem *item )
 {
   TQVariant p = item->property();
 
@@ -229,7 +229,7 @@ TQString KConfigPropagator::itemValueAsString( KConfigSkeletonItem *item )
   return p.toString();
 }
 
-void KConfigPropagator::updateChanges()
+void TDEConfigPropagator::updateChanges()
 {
   mChanges.clear();
 
@@ -238,7 +238,7 @@ void KConfigPropagator::updateChanges()
     Rule r = *it;
     Condition c = r.condition;
     if ( c.isValid ) {
-      KConfigSkeletonItem *item = findItem( c.group, c.key );
+      TDEConfigSkeletonItem *item = findItem( c.group, c.key );
       kdDebug() << "Item " << c.group << "/" << c.key << ":" << endl;
       if ( !item ) {
         kdError() << "  Item not found." << endl;
@@ -251,7 +251,7 @@ void KConfigPropagator::updateChanges()
       }
     }
 
-    KConfigSkeletonItem *item = findItem( r.sourceGroup, r.sourceEntry );
+    TDEConfigSkeletonItem *item = findItem( r.sourceGroup, r.sourceEntry );
     if ( !item ) {
       kdError() << "Item " << r.sourceGroup << "/" << r.sourceEntry 
                 << " not found." << endl;
@@ -259,7 +259,7 @@ void KConfigPropagator::updateChanges()
     }
     TQString value = itemValueAsString( item );
 
-    KConfig target( r.targetFile );
+    TDEConfig target( r.targetFile );
     target.setGroup( r.targetGroup );
     TQString targetValue = target.readEntry( r.targetEntry );
     if ( r.hideValue ) targetValue = KStringHandler::obscure( targetValue );
@@ -278,12 +278,12 @@ void KConfigPropagator::updateChanges()
   addCustomChanges( mChanges );
 }
 
-KConfigPropagator::Change::List KConfigPropagator::changes()
+TDEConfigPropagator::Change::List TDEConfigPropagator::changes()
 {
   return mChanges;
 }
 
-KConfigPropagator::Rule::List KConfigPropagator::rules()
+TDEConfigPropagator::Rule::List TDEConfigPropagator::rules()
 {
   return mRules;
 }
diff --git a/libtdepim/kconfigpropagator.h b/libtdepim/kconfigpropagator.h
index 3e52eb7c4..92f9565f2 100644
--- a/libtdepim/kconfigpropagator.h
+++ b/libtdepim/kconfigpropagator.h
@@ -28,27 +28,27 @@
 
 #include <tdepimmacros.h>
 
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
 
-class KDE_EXPORT KConfigPropagator
+class KDE_EXPORT TDEConfigPropagator
 {
   public:
 
     /**
-      Create KConfigPropagator object without associated source configuration.
+      Create TDEConfigPropagator object without associated source configuration.
     */
-    KConfigPropagator();
+    TDEConfigPropagator();
     /**
-      Create KConfigPropagator object.
+      Create TDEConfigPropagator object.
       
-      @param skeleton KConfigSkeleton object used as source for the propagation
+      @param skeleton TDEConfigSkeleton object used as source for the propagation
       @param kcfgFile file name of kcfg file containing the propagation rules
     */
-    KConfigPropagator( KConfigSkeleton *skeleton, const TQString &kcfgFile );
-    virtual ~KConfigPropagator() {}
+    TDEConfigPropagator( TDEConfigSkeleton *skeleton, const TQString &kcfgFile );
+    virtual ~TDEConfigPropagator() {}
 
-    KConfigSkeleton *skeleton() { return mSkeleton; }
+    TDEConfigSkeleton *skeleton() { return mSkeleton; }
 
     /*
       Commit changes according to propagation rules.
@@ -142,9 +142,9 @@ class KDE_EXPORT KConfigPropagator
     */
     virtual void addCustomChanges( Change::List & ) {}
 
-    KConfigSkeletonItem *findItem( const TQString &group, const TQString &name );
+    TDEConfigSkeletonItem *findItem( const TQString &group, const TQString &name );
 
-    TQString itemValueAsString( KConfigSkeletonItem * );
+    TQString itemValueAsString( TDEConfigSkeletonItem * );
 
     void readKcfgFile();
 
@@ -155,7 +155,7 @@ class KDE_EXPORT KConfigPropagator
                                TQString &group, TQString &entry );
 
   private:
-    KConfigSkeleton *mSkeleton;
+    TDEConfigSkeleton *mSkeleton;
     TQString mKcfgFile;
 
     Rule::List mRules;
diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/kconfigwizard.cpp
index bceacd656..c2baafcc7 100644
--- a/libtdepim/kconfigwizard.cpp
+++ b/libtdepim/kconfigwizard.cpp
@@ -31,7 +31,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-KConfigWizard::KConfigWizard( TQWidget *parent,
+TDEConfigWizard::TDEConfigWizard( TQWidget *parent,
                               char *name, bool modal )
   : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
                  name, modal ),
@@ -40,7 +40,7 @@ KConfigWizard::KConfigWizard( TQWidget *parent,
   init();
 }
 
-KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
+TDEConfigWizard::TDEConfigWizard( TDEConfigPropagator *propagator, TQWidget *parent,
                               char *name, bool modal )
   : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent,
                  name, modal ),
@@ -49,12 +49,12 @@ KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent,
   init();
 }
 
-KConfigWizard::~KConfigWizard()
+TDEConfigWizard::~TDEConfigWizard()
 {
   delete mPropagator;
 }
 
-void KConfigWizard::init()
+void TDEConfigWizard::init()
 {
   connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ),
            TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) );
@@ -62,24 +62,24 @@ void KConfigWizard::init()
   TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) );
 }
 
-void KConfigWizard::setPropagator( KConfigPropagator *p )
+void TDEConfigWizard::setPropagator( TDEConfigPropagator *p )
 {
   mPropagator = p;
 }
 
-void KConfigWizard::slotAboutToShowPage( TQWidget *page )
+void TDEConfigWizard::slotAboutToShowPage( TQWidget *page )
 {
   if ( page == mChangesPage ) {
     updateChanges();
   }
 }
 
-TQFrame *KConfigWizard::createWizardPage( const TQString &title )
+TQFrame *TDEConfigWizard::createWizardPage( const TQString &title )
 {
   return addPage( title );
 }
 
-void KConfigWizard::setupRulesPage()
+void TDEConfigWizard::setupRulesPage()
 {
   TQFrame *topFrame = addPage( i18n("Rules") );
   TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -94,25 +94,25 @@ void KConfigWizard::setupRulesPage()
   updateRules();
 }
 
-void KConfigWizard::updateRules()
+void TDEConfigWizard::updateRules()
 {
   if ( !mPropagator ) {
-    kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+    kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
     return;
   }
 
   mRuleView->clear();
 
-  KConfigPropagator::Rule::List rules = mPropagator->rules();
-  KConfigPropagator::Rule::List::ConstIterator it;
+  TDEConfigPropagator::Rule::List rules = mPropagator->rules();
+  TDEConfigPropagator::Rule::List::ConstIterator it;
   for( it = rules.begin(); it != rules.end(); ++it ) {
-    KConfigPropagator::Rule r = *it;
+    TDEConfigPropagator::Rule r = *it;
     TQString source = r.sourceFile + "/" + r.sourceGroup + "/" +
                      r.sourceEntry;
     TQString target = r.targetFile + "/" + r.targetGroup + "/" +
                      r.targetEntry;
     TQString condition;
-    KConfigPropagator::Condition c = r.condition;
+    TDEConfigPropagator::Condition c = r.condition;
     if ( c.isValid ) {
       condition = c.file + "/" + c.group + "/" + c.key + " = " + c.value;
     }
@@ -120,7 +120,7 @@ void KConfigWizard::updateRules()
   }
 }
 
-void KConfigWizard::setupChangesPage()
+void TDEConfigWizard::setupChangesPage()
 {
   TQFrame *topFrame = addPage( i18n("Changes") );
   TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -136,12 +136,12 @@ void KConfigWizard::setupChangesPage()
   mChangesPage = topFrame;
 }
 
-void KConfigWizard::updateChanges()
+void TDEConfigWizard::updateChanges()
 {
-  kdDebug() << "KConfigWizard::updateChanges()" << endl;
+  kdDebug() << "TDEConfigWizard::updateChanges()" << endl;
 
   if ( !mPropagator ) {
-    kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+    kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
     return;
   }
 
@@ -151,16 +151,16 @@ void KConfigWizard::updateChanges()
 
   mChangeView->clear();
 
-  KConfigPropagator::Change::List changes = mPropagator->changes();
-  KConfigPropagator::Change *c;
+  TDEConfigPropagator::Change::List changes = mPropagator->changes();
+  TDEConfigPropagator::Change *c;
   for( c = changes.first(); c; c = changes.next() ) {
     new TQListViewItem( mChangeView, mChangeView->lastItem(), c->title(), c->arg1(), c->arg2() );
   }
 }
 
-void KConfigWizard::readConfig()
+void TDEConfigWizard::readConfig()
 {
-  kdDebug() << "KConfigWizard::readConfig()" << endl;
+  kdDebug() << "TDEConfigWizard::readConfig()" << endl;
 
   int result = KMessageBox::warningContinueCancel( this,
       i18n("Please make sure that the programs which are "
@@ -172,14 +172,14 @@ void KConfigWizard::readConfig()
   usrReadConfig();
 }
 
-void KConfigWizard::slotOk()
+void TDEConfigWizard::slotOk()
 {
   TQString error = validate();
   if ( error.isNull() ) {
     usrWriteConfig();
 
     if ( !mPropagator ) {
-      kdError() << "KConfigWizard: No KConfigPropagator set." << endl;
+      kdError() << "TDEConfigWizard: No TDEConfigPropagator set." << endl;
       return;
     } else {
       if ( mPropagator->skeleton() ) {
diff --git a/libtdepim/kconfigwizard.h b/libtdepim/kconfigwizard.h
index b933e2a2b..a06849ecc 100644
--- a/libtdepim/kconfigwizard.h
+++ b/libtdepim/kconfigwizard.h
@@ -30,7 +30,7 @@ class TQListView;
 /**
   @short Configuration wizard base class
 */
-class KDE_EXPORT KConfigWizard : public KDialogBase
+class KDE_EXPORT TDEConfigWizard : public KDialogBase
 {
     Q_OBJECT
   
@@ -38,26 +38,26 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
     /**
       Create wizard. You have to set a propgator with setPropagator() later.
     */
-    KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
+    TDEConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false );
     /**
-      Create wizard for given KConfigPropagator. The wizard takes ownership of
+      Create wizard for given TDEConfigPropagator. The wizard takes ownership of
       the propagator.
     */
-    KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0,
+    TDEConfigWizard( TDEConfigPropagator *propagator, TQWidget *parent = 0,
                    char *name = 0, bool modal = false );
     /**
       Destructor.
     */
-    virtual ~KConfigWizard();
+    virtual ~TDEConfigWizard();
 
     /**
       Set propagator the wizard operates on.
     */
-    void setPropagator( KConfigPropagator * );
+    void setPropagator( TDEConfigPropagator * );
     /**
       Return propagator the wizard operates on.
     */
-    KConfigPropagator *propagator() { return mPropagator; }
+    TDEConfigPropagator *propagator() { return mPropagator; }
 
     /**
       Create wizard page with given title.
@@ -65,15 +65,15 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
     TQFrame *createWizardPage( const TQString &title );
 
     /**
-      Use this function to read the configuration from the KConfigSkeleton
+      Use this function to read the configuration from the TDEConfigSkeleton
       object to the GUI.
     */
     virtual void usrReadConfig() = 0;
 
     /**
       This function is called when the wizard is finished. You have to save all
-      settings from the GUI to the KConfigSkeleton object here, so that the
-      KConfigPropagator can take them up from there.
+      settings from the GUI to the TDEConfigSkeleton object here, so that the
+      TDEConfigPropagator can take them up from there.
     */
     virtual void usrWriteConfig() = 0;
 
@@ -99,7 +99,7 @@ class KDE_EXPORT KConfigWizard : public KDialogBase
     void updateChanges();
 
   private:
-    KConfigPropagator *mPropagator;
+    TDEConfigPropagator *mPropagator;
 
     TQListView *mRuleView;
     TQListView *mChangeView;
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index e1e887be2..5cad23656 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -192,15 +192,15 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize )
       if (mSize == 0 && (childCount() == 0 || isOpen() ) )
           size = "- ";
       else
-          size = KIO::convertSize(mSize);
+          size = TDEIO::convertSize(mSize);
   }
   if ( childCount() > 0 && !isOpen() ) {
       TQ_INT64 recursiveSize = recursiveFolderSize();
       if ( recursiveSize != mSize ) {
             if ( mType != Root )
-                size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) );
+                size += TQString::fromLatin1(" + %1").arg( TDEIO::convertSize( recursiveSize - mSize ) );
             else 
-                size = KIO::convertSize( recursiveSize );
+                size = TDEIO::convertSize( recursiveSize );
       }
   }
   size += " ";
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index d3603e19b..e07ef00ac 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -742,7 +742,7 @@ void KImportDialog::saveTemplate()
   if ( name.isEmpty() )
     return;
 
-  KConfig config( fileName );
+  TDEConfig config( fileName );
   config.setGroup( "General" );
   config.writeEntry( "Columns", mColumns.count() );
   config.writeEntry( "Format", mFormatCombo->currentItem() + 1 );
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 807869487..7abdb0e18 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
     return new Komposer::PrefsModule( parent, "komposerprefs" );
   }
 }
diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp
index 478ed7047..9ae04cfaf 100644
--- a/libtdepim/kpimprefs.cpp
+++ b/libtdepim/kpimprefs.cpp
@@ -36,7 +36,7 @@
 #include "kpimprefs.h"
 
 KPimPrefs::KPimPrefs( const TQString &name )
-  : KConfigSkeleton( name )
+  : TDEConfigSkeleton( name )
 {
 }
 
@@ -64,7 +64,7 @@ const TQString KPimPrefs::timezone()
   TQString zone = "";
 
   // Read TimeZoneId from korganizerrc.
-  KConfig korgcfg( locate( "config", "korganizerrc" ) );
+  TDEConfig korgcfg( locate( "config", "korganizerrc" ) );
   korgcfg.setGroup( "Time & Date" );
   TQString tz( korgcfg.readEntry( "TimeZoneId" ) );
   if ( !tz.isEmpty() ) {
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index 1d88a8d8f..051b0f2fb 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -28,7 +28,7 @@
 
 class TQString;
 
-class KDE_EXPORT KPimPrefs : public KConfigSkeleton
+class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton
 {
   public:
     KPimPrefs( const TQString &name = TQString() );
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 047f16d22..577692506 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -50,30 +50,30 @@
 
 namespace KPrefsWidFactory {
 
-KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
+KPrefsWid *create( TDEConfigSkeletonItem *item, TQWidget *parent )
 {
-  KConfigSkeleton::ItemBool *boolItem =
-      dynamic_cast<KConfigSkeleton::ItemBool *>( item );
+  TDEConfigSkeleton::ItemBool *boolItem =
+      dynamic_cast<TDEConfigSkeleton::ItemBool *>( item );
   if ( boolItem ) {
     return new KPrefsWidBool( boolItem, parent );
   }
 
-  KConfigSkeleton::ItemString *stringItem =
-      dynamic_cast<KConfigSkeleton::ItemString *>( item );
+  TDEConfigSkeleton::ItemString *stringItem =
+      dynamic_cast<TDEConfigSkeleton::ItemString *>( item );
   if ( stringItem ) {
     return new KPrefsWidString( stringItem, parent );
   }
 
-  KConfigSkeleton::ItemEnum *enumItem =
-      dynamic_cast<KConfigSkeleton::ItemEnum *>( item );
+  TDEConfigSkeleton::ItemEnum *enumItem =
+      dynamic_cast<TDEConfigSkeleton::ItemEnum *>( item );
   if ( enumItem ) {
-    TQValueList<KConfigSkeleton::ItemEnum::Choice> choices = enumItem->choices();
+    TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices = enumItem->choices();
     if ( choices.isEmpty() ) {
       kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl;
       return 0;
     } else {
       KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent );
-      TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+      TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         radios->addRadio( (*it).label );
       }
@@ -81,8 +81,8 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent )
     }
   }
 
-  KConfigSkeleton::ItemInt *intItem =
-      dynamic_cast<KConfigSkeleton::ItemInt *>( item );
+  TDEConfigSkeleton::ItemInt *intItem =
+      dynamic_cast<TDEConfigSkeleton::ItemInt *>( item );
   if ( intItem ) {
     return new KPrefsWidInt( intItem, parent );
   }
@@ -99,7 +99,7 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const
 }
 
 
-KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent )
+KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *parent )
   : mItem( item )
 {
   mCheck = new TQCheckBox( item->label(), parent);
@@ -132,7 +132,7 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const
 }
 
 
-KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item,
+KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item,
                             TQWidget *parent )
   : mItem( item )
 {
@@ -182,7 +182,7 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const
 }
 
 
-KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item,
+KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item,
                                 TQWidget *parent )
   : mItem( item )
 {
@@ -222,7 +222,7 @@ KColorButton *KPrefsWidColor::button()
 }
 
 
-KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item,
+KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item,
                               TQWidget *parent, const TQString &sampleText )
   : mItem( item )
 {
@@ -280,7 +280,7 @@ void KPrefsWidFont::selectFont()
 }
 
 
-KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item,
                               TQWidget *parent )
   : mItem( item )
 {
@@ -319,7 +319,7 @@ KTimeEdit *KPrefsWidTime::timeEdit()
 }
 
 
-KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item,
                                       TQWidget *parent )
   : mItem( item )
 {
@@ -360,7 +360,7 @@ TQTimeEdit *KPrefsWidDuration::timeEdit()
 }
 
 
-KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item,
                               TQWidget *parent )
   : mItem( item )
 {
@@ -397,7 +397,7 @@ KDateEdit *KPrefsWidDate::dateEdit()
 }
 
 
-KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item,
+KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item,
                                   TQWidget *parent )
   : mItem( item )
 {
@@ -439,7 +439,7 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const
   return w;
 }
 
-KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item,
+KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item,
                                   TQWidget *parent )
   : mItem( item )
 {
@@ -475,7 +475,7 @@ TQComboBox* KPrefsWidCombo::comboBox()
   return mCombo;
 }
 
-KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item,
+KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item,
                                   TQWidget *parent,
                                   TQLineEdit::EchoMode echomode )
   : mItem( item )
@@ -525,7 +525,7 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const
 }
 
 
-KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
                               const TQString &filter, uint mode )
   : mItem( item )
 {
@@ -575,7 +575,7 @@ TQValueList<TQWidget *> KPrefsWidPath::widgets() const
 }
 
 
-KPrefsWidManager::KPrefsWidManager( KConfigSkeleton *prefs )
+KPrefsWidManager::KPrefsWidManager( TDEConfigSkeleton *prefs )
   : mPrefs( prefs )
 {
 }
@@ -589,7 +589,7 @@ void KPrefsWidManager::addWid( KPrefsWid *wid )
   mPrefsWids.append( wid );
 }
 
-KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
+KPrefsWidBool *KPrefsWidManager::addWidBool( TDEConfigSkeleton::ItemBool *item,
                                              TQWidget *parent )
 {
   KPrefsWidBool *w = new KPrefsWidBool( item, parent );
@@ -597,7 +597,7 @@ KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item,
   return w;
 }
 
-KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidTime *KPrefsWidManager::addWidTime( TDEConfigSkeleton::ItemDateTime *item,
                                              TQWidget *parent )
 {
   KPrefsWidTime *w = new KPrefsWidTime( item, parent );
@@ -605,7 +605,7 @@ KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item
   return w;
 }
 
-KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDuration *KPrefsWidManager::addWidDuration( TDEConfigSkeleton::ItemDateTime *item,
                                                      TQWidget *parent )
 {
   KPrefsWidDuration *w = new KPrefsWidDuration( item, parent );
@@ -613,7 +613,7 @@ KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTi
   return w;
 }
 
-KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item,
+KPrefsWidDate *KPrefsWidManager::addWidDate( TDEConfigSkeleton::ItemDateTime *item,
                                              TQWidget *parent )
 {
   KPrefsWidDate *w = new KPrefsWidDate( item, parent );
@@ -621,7 +621,7 @@ KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item
   return w;
 }
 
-KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
+KPrefsWidColor *KPrefsWidManager::addWidColor( TDEConfigSkeleton::ItemColor *item,
                                                TQWidget *parent )
 {
   KPrefsWidColor *w = new KPrefsWidColor( item, parent );
@@ -629,13 +629,13 @@ KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item,
   return w;
 }
 
-KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item,
+KPrefsWidRadios *KPrefsWidManager::addWidRadios( TDEConfigSkeleton::ItemEnum *item,
                                                  TQWidget *parent )
 {
   KPrefsWidRadios *w = new KPrefsWidRadios( item, parent );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
-  TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
   for( it = choices.begin(); it != choices.end(); ++it ) {
     w->addRadio( (*it).label, (*it).whatsThis );
   }
@@ -643,13 +643,13 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item
   return w;
 }
 
-KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
+KPrefsWidCombo *KPrefsWidManager::addWidCombo( TDEConfigSkeleton::ItemEnum *item,
                                                TQWidget* parent )
 {
   KPrefsWidCombo *w = new KPrefsWidCombo( item, parent );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> choices;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> choices;
   choices = item->choices();
-  TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator it;
   for( it = choices.begin(); it != choices.end(); ++it ) {
     w->comboBox()->insertItem( (*it).label, -1 );
   }
@@ -657,7 +657,7 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item,
   return w;
 }
 
-KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item,
+KPrefsWidString *KPrefsWidManager::addWidString( TDEConfigSkeleton::ItemString *item,
                                                  TQWidget *parent )
 {
   KPrefsWidString *w = new KPrefsWidString( item, parent,
@@ -666,7 +666,7 @@ KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *it
   return w;
 }
 
-KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
+KPrefsWidPath *KPrefsWidManager::addWidPath( TDEConfigSkeleton::ItemPath *item,
                                              TQWidget *parent, const TQString &filter, uint mode )
 {
   KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode );
@@ -674,7 +674,7 @@ KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item,
   return w;
 }
 
-KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item,
+KPrefsWidString *KPrefsWidManager::addWidPassword( TDEConfigSkeleton::ItemString *item,
                                                    TQWidget *parent )
 {
   KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password );
@@ -682,7 +682,7 @@ KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *
   return w;
 }
 
-KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
+KPrefsWidFont *KPrefsWidManager::addWidFont( TDEConfigSkeleton::ItemFont *item,
                                              TQWidget *parent,
                                              const TQString &sampleText )
 {
@@ -691,7 +691,7 @@ KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item,
   return w;
 }
 
-KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item,
+KPrefsWidInt *KPrefsWidManager::addWidInt( TDEConfigSkeleton::ItemInt *item,
                                            TQWidget *parent )
 {
   KPrefsWidInt *w = new KPrefsWidInt( item, parent );
@@ -733,7 +733,7 @@ void KPrefsWidManager::writeWidConfig()
 }
 
 
-KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name,
+KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *name,
                             bool modal )
   : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent,
                 name,modal,true),
@@ -752,13 +752,13 @@ KPrefsDialog::~KPrefsDialog()
 
 void KPrefsDialog::autoCreate()
 {
-  KConfigSkeletonItem::List items = prefs()->items();
+  TDEConfigSkeletonItem::List items = prefs()->items();
 
   TQMap<TQString,TQWidget *> mGroupPages;
   TQMap<TQString,TQGridLayout *> mGroupLayouts;
   TQMap<TQString,int> mCurrentRows;
 
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = items.begin(); it != items.end(); ++it ) {
     TQString group = (*it)->group();
     TQString name = (*it)->name();
@@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault()
 }
 
 
-KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent,
+KPrefsModule::KPrefsModule( TDEConfigSkeleton *prefs, TQWidget *parent,
                             const char *name )
-  : KCModule( parent, name ),
+  : TDECModule( parent, name ),
     KPrefsWidManager( prefs )
 {
   emit changed( false );
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 4ef604ee2..eebdb9394 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -95,10 +95,10 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
     /**
       Create a bool value control element consisting of a TQCheckbox.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent );
+    KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *parent );
 
     /**
       Return the TQCheckbox used by this control element.
@@ -111,7 +111,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemBool *mItem;
+    TDEConfigSkeleton::ItemBool *mItem;
 
     TQCheckBox *mCheck;
 };
@@ -130,10 +130,10 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
       Create a integer value control element consisting of a label and a
       spinbox.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent );
+    KPrefsWidInt( TDEConfigSkeleton::ItemInt *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this control element.
@@ -151,7 +151,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemInt *mItem;
+    TDEConfigSkeleton::ItemInt *mItem;
 
     TQLabel *mLabel;
     TQSpinBox *mSpin;
@@ -170,10 +170,10 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
     /**
       Create a time value control element consisting of a label and a spinbox.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -188,7 +188,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
     void writeConfig();
 
   private:
-    KConfigSkeleton::ItemDateTime *mItem;
+    TDEConfigSkeleton::ItemDateTime *mItem;
 
     TQLabel *mLabel;
     KTimeEdit *mTimeEdit;
@@ -208,10 +208,10 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
       Create a duration value control element consisting of a label and a
       spinbox.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -226,7 +226,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
     void writeConfig();
 
   private:
-    KConfigSkeleton::ItemDateTime *mItem;
+    TDEConfigSkeleton::ItemDateTime *mItem;
 
     TQLabel *mLabel;
     TQTimeEdit *mTimeEdit;
@@ -245,10 +245,10 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
     /**
       Create a time value control element consisting of a label and a date box.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent );
+    KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item, TQWidget *parent );
 
     /**
       Return TQLabel used by this widget.
@@ -263,7 +263,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
     void writeConfig();
 
   private:
-    KConfigSkeleton::ItemDateTime *mItem;
+    TDEConfigSkeleton::ItemDateTime *mItem;
 
     TQLabel *mLabel;
     KDateEdit *mDateEdit;
@@ -285,10 +285,10 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
       Create a color value control element consisting of a test field and a
       button for opening a color dialog.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent );
+    KPrefsWidColor( TDEConfigSkeleton::ItemColor *item, TQWidget *parent );
     /**
       Destruct color setting widget.
     */
@@ -307,7 +307,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
     void writeConfig();
 
   private:
-    KConfigSkeleton::ItemColor *mItem;
+    TDEConfigSkeleton::ItemColor *mItem;
 
     TQLabel *mLabel;
     KColorButton *mButton;
@@ -328,11 +328,11 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
       Create a font value control element consisting of a test field and a
       button for opening a font dialog.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
-    KPrefsWidFont( KConfigSkeleton::ItemFont *item,
+    KPrefsWidFont( TDEConfigSkeleton::ItemFont *item,
                    TQWidget *parent, const TQString &sampleText );
     /**
       Destruct font setting widget.
@@ -359,7 +359,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
     void selectFont();
 
   private:
-    KConfigSkeleton::ItemFont *mItem;
+    TDEConfigSkeleton::ItemFont *mItem;
 
     TQLabel *mLabel;
     TQLabel *mPreview;
@@ -384,10 +384,10 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
       Create a control element for selection of an option. It consists of a box
       with several radio buttons.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+    KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent );
     virtual ~KPrefsWidRadios();
 
     /**
@@ -410,7 +410,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemEnum *mItem;
+    TDEConfigSkeleton::ItemEnum *mItem;
 
     TQButtonGroup *mBox;
 };
@@ -432,10 +432,10 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
       Create a control element for selection of an option. It consists of a
       combo box.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent );
+    KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent );
     virtual ~KPrefsWidCombo();
 
     void readConfig();
@@ -445,7 +445,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemEnum *mItem;
+    TDEConfigSkeleton::ItemEnum *mItem;
     TQComboBox *mCombo;
 };
 
@@ -465,11 +465,11 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
       Create a string value control element consisting of a test label and a
       line edit.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
       @param echomode  Describes how a line edit should display its contents.
     */
-    KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent,
+    KPrefsWidString( TDEConfigSkeleton::ItemString *item, TQWidget *parent,
                      TQLineEdit::EchoMode echomode=TQLineEdit::Normal );
     /**
       Destructor.
@@ -491,7 +491,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemString *mItem;
+    TDEConfigSkeleton::ItemString *mItem;
 
     TQLabel *mLabel;
     TQLineEdit *mEdit;
@@ -512,12 +512,12 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
       Create a string value control element consisting of a test label and a
       line edit.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
       @param filter URLRequester filter
       @param mode  Describes how a line edit should display its contents.
     */
-    KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+    KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
                    const TQString &filter = TQString(), uint mode = KFile::File );
     /**
       Destructor.
@@ -539,7 +539,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
     TQValueList<TQWidget *> widgets() const;
 
   private:
-    KConfigSkeleton::ItemPath *mItem;
+    TDEConfigSkeleton::ItemPath *mItem;
 
     TQLabel *mLabel;
     KURLRequester *mURLRequester;
@@ -562,13 +562,13 @@ class KDE_EXPORT KPrefsWidManager
 
       @param prefs  KPrefs object used to access te configuration.
     */
-    KPrefsWidManager( KConfigSkeleton *prefs );
+    KPrefsWidManager( TDEConfigSkeleton *prefs );
     /**
       Destructor.
     */
     virtual ~KPrefsWidManager();
 
-    KConfigSkeleton *prefs() const { return mPrefs; }
+    TDEConfigSkeleton *prefs() const { return mPrefs; }
 
     /**
       Register a custom KPrefsWid object.
@@ -578,116 +578,116 @@ class KDE_EXPORT KPrefsWidManager
     /**
       Register a @ref KPrefsWidBool object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item,
+    KPrefsWidBool *addWidBool( TDEConfigSkeleton::ItemBool *item,
                                TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidInt object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item,
+    KPrefsWidInt *addWidInt( TDEConfigSkeleton::ItemInt *item,
                              TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidDate object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item,
+    KPrefsWidDate *addWidDate( TDEConfigSkeleton::ItemDateTime *item,
                                TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidTime object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item,
+    KPrefsWidTime *addWidTime( TDEConfigSkeleton::ItemDateTime *item,
                                TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidDuration object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item,
+    KPrefsWidDuration *addWidDuration( TDEConfigSkeleton::ItemDateTime *item,
                                        TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidColor object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item,
+    KPrefsWidColor *addWidColor( TDEConfigSkeleton::ItemColor *item,
                                  TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidRadios object. The choices represented by the
       given item object are automatically added as radio buttons.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item,
+    KPrefsWidRadios *addWidRadios( TDEConfigSkeleton::ItemEnum *item,
                                    TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidCombo object. The choices represented by the
       given item object are automatically added to the combo box.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item,
+    KPrefsWidCombo *addWidCombo( TDEConfigSkeleton::ItemEnum *item,
                                    TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidString object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item,
+    KPrefsWidString *addWidString( TDEConfigSkeleton::ItemString *item,
                                    TQWidget *parent );
 
     /**
       Register a path @ref KPrefsWidPath object.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
       @param filter URLRequester filter
       @param mode URLRequester mode
     */
-    KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent,
+    KPrefsWidPath *addWidPath ( TDEConfigSkeleton::ItemPath *item, TQWidget *parent,
                                 const TQString &filter = TQString(),
                                 uint mode = KFile::File );
 
     /**
       Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password.
 
-      @param item    The KConfigSkeletonItem representing the preferences entry.
+      @param item    The TDEConfigSkeletonItem representing the preferences entry.
       @param parent  Parent widget.
     */
-    KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item,
+    KPrefsWidString *addWidPassword ( TDEConfigSkeleton::ItemString *item,
                                       TQWidget *parent );
 
     /**
       Register a @ref KPrefsWidFont object.
 
-      @param item       The KConfigSkeletonItem representing the preferences
+      @param item       The TDEConfigSkeletonItem representing the preferences
                         entry.
       @param parent     Parent widget.
       @param sampleText Sample text for previewing the selected font.
     */
-    KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item,
+    KPrefsWidFont *addWidFont( TDEConfigSkeleton::ItemFont *item,
                                TQWidget *parent, const TQString &sampleText );
 
     /** Set all widgets to default values. */
@@ -700,7 +700,7 @@ class KDE_EXPORT KPrefsWidManager
     void writeWidConfig();
 
   private:
-    KConfigSkeleton *mPrefs;
+    TDEConfigSkeleton *mPrefs;
 
     TQPtrList<KPrefsWid> mPrefsWids;
 };
@@ -731,7 +731,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
       @param name   Widget name.
       @param modal  true, if dialog has to be modal, false for non-modal.
     */
-    KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
+    KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0,
                   bool modal = false );
     /**
       Destructor.
@@ -772,12 +772,12 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 };
 
 
-class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager
+class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager
 {
     Q_OBJECT
   
   public:
-    KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
+    KPrefsModule( TDEConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
 
     virtual void addWid( KPrefsWid * );
 
diff --git a/libtdepim/kresourceprefs.cpp b/libtdepim/kresourceprefs.cpp
index c343f806d..614c17980 100644
--- a/libtdepim/kresourceprefs.cpp
+++ b/libtdepim/kresourceprefs.cpp
@@ -24,14 +24,14 @@
 #include "kresourceprefs.h"
 
 KResourcePrefs::KResourcePrefs( const TQString &name )
-  : KConfigSkeleton( name )
+  : TDEConfigSkeleton( name )
 {
 }
 
 void KResourcePrefs::addGroupPrefix( const TQString &prefix )
 {
-  KConfigSkeletonItem::List itemList = items();
-  KConfigSkeletonItem::List::Iterator it;
+  TDEConfigSkeletonItem::List itemList = items();
+  TDEConfigSkeletonItem::List::Iterator it;
 
   for ( it = itemList.begin(); it != itemList.end(); ++it )
     (*it)->setGroup( prefix + ":" + (*it)->group() );
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 6d96deadb..968d86a9e 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -35,7 +35,7 @@ class TQString;
   The prefix should be an unique identifier to avoid name clashes and the method
   has to be called before readConfig(), otherwise the wrong entries are read.
  */
-class KDE_EXPORT KResourcePrefs : public KConfigSkeleton
+class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton
 {
   public:
     KResourcePrefs( const TQString &name = TQString() );
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 1bebe3350..9f1a6fd8e 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -44,8 +44,8 @@
 
 using namespace KPIM;
 
-KConfig *KPIM::LdapSearch::s_config = 0L;
-static KStaticDeleter<KConfig> configDeleter;
+TDEConfig *KPIM::LdapSearch::s_config = 0L;
+static KStaticDeleter<TDEConfig> configDeleter;
 
 TQString LdapObject::toString() const
 {
@@ -136,12 +136,12 @@ void LdapClient::startQuery( const TQString& filter )
 
   startParseLDIF();
   mActive = true;
-  mJob = KIO::get( url, false, false );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+  mJob = TDEIO::get( url, false, false );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
            this, TQT_SLOT( slotDone() ) );
 }
 
@@ -155,12 +155,12 @@ void LdapClient::cancelQuery()
   mActive = false;
 }
 
-void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
+void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
 {
   parseLDIF( data );
 }
 
-void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
+void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
 {
   //tqDebug("Job said \"%s\"", info.latin1());
 }
@@ -175,7 +175,7 @@ void LdapClient::slotDone()
   }
 #endif
   int err = mJob->error();
-  if ( err && err != KIO::ERR_USER_CANCELED ) {
+  if ( err && err != TDEIO::ERR_USER_CANCELED ) {
     emit error( mJob->errorString() );
   }
   emit done();
@@ -274,7 +274,7 @@ void LdapClient::setCompletionWeight( int weight )
   mCompletionWeight = weight;
 }
 
-void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::readConfig( LdapServer &server, TDEConfig *config, int j, bool active )
 {
   TQString prefix;
   if ( active ) prefix = "Selected";
@@ -309,7 +309,7 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac
   server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) );
 }
 
-void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::writeConfig( const LdapServer &server, TDEConfig *config, int j, bool active )
 {
   TQString prefix;
   if ( active ) prefix = "Selected";
@@ -327,10 +327,10 @@ void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j,
   config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() );
 }
 
-KConfig* LdapSearch::config()
+TDEConfig* LdapSearch::config()
 {
   if ( !s_config )
-    configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
+    configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
 
   return s_config;
 }
@@ -349,7 +349,7 @@ LdapSearch::LdapSearch()
           TQT_SLOT(slotFileChanged(const TQString&)));
 }
 
-void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber )
+void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber )
 {
   const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 );
   if ( completionWeight != -1 )
@@ -358,7 +358,7 @@ void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int cl
 
 void LdapSearch::updateCompletionWeights()
 {
-  KConfig *config = KPIM::LdapSearch::config();
+  TDEConfig *config = KPIM::LdapSearch::config();
   config->setGroup( "LDAP" );
   for ( uint i = 0; i < mClients.size(); i++ ) {
     readWeighForClient( mClients[i], config, i );
@@ -374,7 +374,7 @@ void LdapSearch::readConfig()
   mClients.clear();
 
   // stolen from KAddressBook
-  KConfig *config = KPIM::LdapSearch::config();
+  TDEConfig *config = KPIM::LdapSearch::config();
   config->setGroup( "LDAP" );
   int numHosts = config->readUnsignedNumEntry( "NumSelectedHosts");
   if ( !numHosts ) {
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 7eaa3fd00..502937299 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -195,8 +195,8 @@ class KDE_EXPORT LdapClient : public TQObject
     void cancelQuery();
 
   protected slots:
-    void slotData( KIO::Job*, const TQByteArray &data );
-    void slotInfoMessage( KIO::Job*, const TQString &info );
+    void slotData( TDEIO::Job*, const TQByteArray &data );
+    void slotInfoMessage( TDEIO::Job*, const TQString &info );
     void slotDone();
 
   protected:
@@ -209,7 +209,7 @@ class KDE_EXPORT LdapClient : public TQObject
     TQString mScope;
     TQStringList mAttrs;
 
-    TQGuardedPtr<KIO::SimpleJob> mJob;
+    TQGuardedPtr<TDEIO::SimpleJob> mJob;
     bool mActive;
     bool mReportObjectClass;
 
@@ -251,9 +251,9 @@ class KDE_EXPORT LdapSearch : public TQObject
   public:
     LdapSearch();
 
-    static KConfig *config();
-    static void readConfig( LdapServer &server, KConfig *config, int num, bool active );
-    static void writeConfig( const LdapServer &server, KConfig *config, int j, bool active );
+    static TDEConfig *config();
+    static void readConfig( LdapServer &server, TDEConfig *config, int num, bool active );
+    static void writeConfig( const LdapServer &server, TDEConfig *config, int j, bool active );
 
     void startSearch( const TQString& txt );
     void cancelSearch();
@@ -279,7 +279,7 @@ class KDE_EXPORT LdapSearch : public TQObject
     void slotFileChanged( const TQString& );
 
   private:
-    void readWeighForClient( LdapClient *client, KConfig *config, int clientNumber );
+    void readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber );
     void readConfig();
     void finish();
     void makeSearchData( TQStringList& ret, LdapResultList& resList );
@@ -292,7 +292,7 @@ class KDE_EXPORT LdapSearch : public TQObject
     TQString mConfigFile;
 
   private:
-    static KConfig *s_config;
+    static TDEConfig *s_config;
     class LdapSearchPrivate* d;
 };
 
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 53bfba32b..fe67137b1 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -221,14 +221,14 @@ void LDAPSearchDialog::restoreSettings()
   mLdapClientList.setAutoDelete( true );
   mLdapClientList.clear();
 
-  KConfig kabConfig( "kaddressbookrc" );
+  TDEConfig kabConfig( "kaddressbookrc" );
   kabConfig.setGroup( "LDAPSearch" );
   mSearchType->setCurrentItem( kabConfig.readNumEntry( "SearchType", 0 ) );
 
   // then read the config file and register all selected
   // server in the list
-  KConfig* config = KABC::AddressLineEdit::config(); // singleton kabldaprc config object
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfig* config = KABC::AddressLineEdit::config(); // singleton kabldaprc config object
+  TDEConfigGroupSaver saver( config, "LDAP" );
   mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" );
   if ( !mNumHosts ) {
     KMessageBox::error( this, i18n( "You must select a LDAP server before searching.\nYou can do this from the menu Settings/Configure KAddressBook." ) );
@@ -308,7 +308,7 @@ void LDAPSearchDialog::restoreSettings()
 
 void LDAPSearchDialog::saveSettings()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "LDAPSearch" );
   config.writeEntry( "SearchType", mSearchType->currentItem() );
   config.sync();
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index 066ba27b3..bbd7d29a9 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -47,14 +47,14 @@ static KStaticDeleter<RecentAddresses> sd;
 
 RecentAddresses * RecentAddresses::s_self = 0;
 
-RecentAddresses * RecentAddresses::self( KConfig *config)
+RecentAddresses * RecentAddresses::self( TDEConfig *config)
 {
     if ( !s_self )
         sd.setObject( s_self, new RecentAddresses(config) );
     return s_self;
 }
 
-RecentAddresses::RecentAddresses(KConfig * config)
+RecentAddresses::RecentAddresses(TDEConfig * config)
 {
   if ( !config )
     load( TDEGlobal::config() );
@@ -68,14 +68,14 @@ RecentAddresses::~RecentAddresses()
     // on s_self
 }
 
-void RecentAddresses::load( KConfig *config )
+void RecentAddresses::load( TDEConfig *config )
 {
     TQStringList addresses;
     TQString name;
     TQString email;
 
     m_addresseeList.clear();
-    KConfigGroupSaver cs( config, "General" );
+    TDEConfigGroupSaver cs( config, "General" );
     m_maxCount = config->readNumEntry( "Maximum Recent Addresses", 40 );
     addresses = config->readListEntry( "Recent Addresses" );
     for ( TQStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it ) {
@@ -91,9 +91,9 @@ void RecentAddresses::load( KConfig *config )
     adjustSize();
 }
 
-void RecentAddresses::save( KConfig *config )
+void RecentAddresses::save( TDEConfig *config )
 {
-    KConfigGroupSaver cs( config, "General" );
+    TDEConfigGroupSaver cs( config, "General" );
     config->writeEntry( "Recent Addresses", addresses() );
 }
 
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index 8d649e812..08976a027 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -37,7 +37,7 @@
 
 #include <tdepimmacros.h>
 
-class KConfig;
+class TDEConfig;
 class KEditListBox;
 namespace KRecentAddress {
 
@@ -65,7 +65,7 @@ public:
     /**
      * @returns the only possible instance of this class.
      */
-    static RecentAddresses * self(KConfig *config = 0L);
+    static RecentAddresses * self(TDEConfig *config = 0L);
 
     /*
      * @return true if self() was called, i.e. a RecentAddresses instance exists
@@ -102,13 +102,13 @@ public:
      * Loads the list of recently used addresses from the configfile.
      * Automatically done on startup.
      */
-    void load( KConfig * );
+    void load( TDEConfig * );
 
     /**
      * Saves the list of recently used addresses to the configfile.
      * Make sure to call TDEGlobal::config()->sync() afterwards, to really save.
      */
-    void save( KConfig * );
+    void save( TDEConfig * );
 
     /**
      * Removes all entries from the history.
@@ -116,7 +116,7 @@ public:
     void clear();
 
 private:
-    RecentAddresses(KConfig *config = 0L);
+    RecentAddresses(TDEConfig *config = 0L);
 
     KABC::Addressee::List m_addresseeList;
 
diff --git a/libtdepim/resourceabc.cpp b/libtdepim/resourceabc.cpp
index dbcc98f87..16eeadc5b 100644
--- a/libtdepim/resourceabc.cpp
+++ b/libtdepim/resourceabc.cpp
@@ -26,7 +26,7 @@
 
 using namespace KPIM;
 
-ResourceABC::ResourceABC( const KConfig* config )
+ResourceABC::ResourceABC( const TDEConfig* config )
   : KABC::Resource( config )
 {
 }
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index c7e019fb1..fe2e45bf1 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ResourceABC : public KABC::Resource
   
 
 public:
-  ResourceABC( const KConfig* );
+  ResourceABC( const TDEConfig* );
   virtual ~ResourceABC();
 
   /**
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 7572c8478..b6962d511 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -152,8 +152,8 @@ void TestDistrList::cleanup()
 
     TQString tdehome = TQFile::decodeName( getenv("TDEHOME") );
     KURL urltdehome; urltdehome.setPath( tdehome );
-    // don't use KIO::NetAccess here since it needs X
-    // KIO::NetAccess::del( urltdehome, 0 )i;
+    // don't use TDEIO::NetAccess here since it needs X
+    // TDEIO::NetAccess::del( urltdehome, 0 )i;
     assert( removeDirAndContentsRecursively( tdehome ) );
 }
 
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 4e3dec288..1e404165e 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -32,11 +32,11 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-class TestConfigWizard : public KConfigWizard
+class TestConfigWizard : public TDEConfigWizard
 {
   public:
     TestConfigWizard() :
-      KConfigWizard( new KConfigPropagator( MyConfig::self(),
+      TDEConfigWizard( new TDEConfigPropagator( MyConfig::self(),
                                             "propagator_test.kcfg" ) )
     {
       TQFrame *page = createWizardPage( "My Wizard Page" );
@@ -83,7 +83,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  TDEAboutData aboutData("testwizard","Test KConfigWizard","0.1");
+  TDEAboutData aboutData("testwizard","Test TDEConfigWizard","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index bc1c4e585..769a4d8e3 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -240,7 +240,7 @@ namespace {
       tmpFile.file()->writeBlock( data.data(), data.size() );
       tmpFile.close();
 
-      return KIO::NetAccess::upload( tmpFile.name(), saveAsUrl, 0 );
+      return TDEIO::NetAccess::upload( tmpFile.name(), saveAsUrl, 0 );
     }
   };
 
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index 8c0c37a1f..d644d0e4b 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -55,11 +55,11 @@ static TQString createURL( const TQString &server, bool useSSL, const TQString &
   return url.url();
 }
 
-class CreateEGroupwareKabcResource : public KConfigPropagator::Change
+class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change
 {
   public:
     CreateEGroupwareKabcResource()
-      : KConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") )
     {
     }
 
@@ -82,11 +82,11 @@ class CreateEGroupwareKabcResource : public KConfigPropagator::Change
 };
 
 // TODO: fix the i18n strings after freeze...
-class ChangeEGroupwareKabcResource : public KConfigPropagator::Change
+class ChangeEGroupwareKabcResource : public TDEConfigPropagator::Change
 {
   public:
     ChangeEGroupwareKabcResource( const TQString &identifier )
-      : KConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ),
+      : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ),
         mIdentifier( identifier )
     {
     }
@@ -120,11 +120,11 @@ class ChangeEGroupwareKabcResource : public KConfigPropagator::Change
     TQString mIdentifier;
 };
 
-class CreateEGroupwareKcalResource : public KConfigPropagator::Change
+class CreateEGroupwareKcalResource : public TDEConfigPropagator::Change
 {
   public:
     CreateEGroupwareKcalResource()
-      : KConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) )
+      : TDEConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) )
     {
     }
 
@@ -146,11 +146,11 @@ class CreateEGroupwareKcalResource : public KConfigPropagator::Change
     }
 };
 
-class ChangeEGroupwareKcalResource : public KConfigPropagator::Change
+class ChangeEGroupwareKcalResource : public TDEConfigPropagator::Change
 {
   public:
     ChangeEGroupwareKcalResource( const TQString &identifier )
-      : KConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ),
+      : TDEConfigPropagator::Change( i18n( "Create eGroupware Calendar Resource" ) ),
         mIdentifier( identifier )
     {
     }
@@ -184,11 +184,11 @@ class ChangeEGroupwareKcalResource : public KConfigPropagator::Change
     TQString mIdentifier;
 };
 
-class CreateEGroupwareKnotesResource : public KConfigPropagator::Change
+class CreateEGroupwareKnotesResource : public TDEConfigPropagator::Change
 {
   public:
     CreateEGroupwareKnotesResource()
-      : KConfigPropagator::Change( i18n("Create eGroupware Notes Resource") )
+      : TDEConfigPropagator::Change( i18n("Create eGroupware Notes Resource") )
     {
     }
 
@@ -212,11 +212,11 @@ class CreateEGroupwareKnotesResource : public KConfigPropagator::Change
     }
 };
 
-class ChangeEGroupwareKnotesResource : public KConfigPropagator::Change
+class ChangeEGroupwareKnotesResource : public TDEConfigPropagator::Change
 {
   public:
     ChangeEGroupwareKnotesResource( const TQString &identifier )
-      : KConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ),
+      : TDEConfigPropagator::Change( i18n("Create eGroupware Notes Resource") ),
         mIdentifier( identifier )
     {
     }
@@ -250,11 +250,11 @@ class ChangeEGroupwareKnotesResource : public KConfigPropagator::Change
     TQString mIdentifier;
 };
 
-class EGroupwarePropagator : public KConfigPropagator
+class EGroupwarePropagator : public TDEConfigPropagator
 {
   public:
     EGroupwarePropagator()
-      : KConfigPropagator( EGroupwareConfig::self(), "egroupware.kcfg" )
+      : TDEConfigPropagator( EGroupwareConfig::self(), "egroupware.kcfg" )
     {
     }
 
@@ -299,7 +299,7 @@ class EGroupwarePropagator : public KConfigPropagator
     }
 };
 
-EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator )
+EGroupwareWizard::EGroupwareWizard() : TDEConfigWizard( new EGroupwarePropagator )
 {
   TQFrame *page = createWizardPage( i18n( "eGroupware Server" ) );
 
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index e01305df8..2a920467f 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -27,7 +27,7 @@
 class KLineEdit;
 class TQCheckBox;
 
-class KDE_EXPORT EGroupwareWizard : public KConfigWizard
+class KDE_EXPORT EGroupwareWizard : public TDEConfigWizard
 {
   public:
     EGroupwareWizard();
diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp
index 84c2a13d1..e243b2e22 100644
--- a/wizards/exchangewizard.cpp
+++ b/wizards/exchangewizard.cpp
@@ -43,11 +43,11 @@ i18n("Please select folders for events, to-dos and journal entries:")
 #endif
 
 
-class CreateExchangeKcalResource : public KConfigPropagator::Change
+class CreateExchangeKcalResource : public TDEConfigPropagator::Change
 {
   public:
     CreateExchangeKcalResource()
-      : KConfigPropagator::Change( i18n("Create Exchange Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Exchange Calendar Resource") )
     {
     }
 
@@ -59,7 +59,7 @@ class CreateExchangeKcalResource : public KConfigPropagator::Change
 
       KURL url( exchangeUrl() );
 
-      KCal::ResourceExchange *r = new KCal::ResourceExchange( new KConfig );// url );
+      KCal::ResourceExchange *r = new KCal::ResourceExchange( new TDEConfig );// url );
       r->setResourceName( i18n("Exchange Server") );
       r->prefs()->setUser( ExchangeConfig::self()->user() );
       r->prefs()->setPassword( ExchangeConfig::self()->password() );
@@ -74,11 +74,11 @@ class CreateExchangeKcalResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateExchangeKcalResource : public KConfigPropagator::Change
+class UpdateExchangeKcalResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateExchangeKcalResource()
-      : KConfigPropagator::Change( i18n("Update Exchange Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Update Exchange Calendar Resource") )
     {
     }
 
@@ -107,11 +107,11 @@ class UpdateExchangeKcalResource : public KConfigPropagator::Change
     }
 };
 
-class CreateExchangeKabcResource : public KConfigPropagator::Change
+class CreateExchangeKabcResource : public TDEConfigPropagator::Change
 {
   public:
     CreateExchangeKabcResource()
-      : KConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") )
     {
     }
 
@@ -135,11 +135,11 @@ class CreateExchangeKabcResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateExchangeKabcResource : public KConfigPropagator::Change
+class UpdateExchangeKabcResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateExchangeKabcResource()
-      : KConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") )
     {
     }
 
@@ -166,11 +166,11 @@ class UpdateExchangeKabcResource : public KConfigPropagator::Change
 };
 
 
-class ExchangePropagator : public KConfigPropagator
+class ExchangePropagator : public TDEConfigPropagator
 {
   public:
     ExchangePropagator()
-      : KConfigPropagator( /*ExchangeConfig::self()*/ 0, "exchange.kcfg" )
+      : TDEConfigPropagator( /*ExchangeConfig::self()*/ 0, "exchange.kcfg" )
     {
     }
 
@@ -223,7 +223,7 @@ class ExchangePropagator : public KConfigPropagator
     }
 };
 
-ExchangeWizard::ExchangeWizard() : KConfigWizard( new ExchangePropagator )
+ExchangeWizard::ExchangeWizard() : TDEConfigWizard( new ExchangePropagator )
 {
   TQFrame *page = createWizardPage( i18n("Microsoft Exchange Server") );
   TQGridLayout *topLayout = new TQGridLayout( page );
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index d608f23ba..f453356da 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -27,7 +27,7 @@ class KLineEdit;
 class TQCheckBox;
 class TQSpinBox;
 
-class KDE_EXPORT ExchangeWizard : public KConfigWizard
+class KDE_EXPORT ExchangeWizard : public TDEConfigWizard
 {
   public:
     ExchangeWizard();
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index b28095bce..ecd472c8c 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -50,11 +50,11 @@ TQString serverUrl()
   return url;
 }
 
-class CreateGroupwiseKcalResource : public KConfigPropagator::Change
+class CreateGroupwiseKcalResource : public TDEConfigPropagator::Change
 {
   public:
     CreateGroupwiseKcalResource()
-      : KConfigPropagator::Change( i18n("Create GroupWise Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Create GroupWise Calendar Resource") )
     {
     }
 
@@ -80,11 +80,11 @@ class CreateGroupwiseKcalResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateGroupwiseKcalResource : public KConfigPropagator::Change
+class UpdateGroupwiseKcalResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateGroupwiseKcalResource()
-      : KConfigPropagator::Change( i18n("Update GroupWise Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Update GroupWise Calendar Resource") )
     {
     }
 
@@ -109,11 +109,11 @@ class UpdateGroupwiseKcalResource : public KConfigPropagator::Change
     }
 };
 
-class CreateGroupwiseKabcResource : public KConfigPropagator::Change
+class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change
 {
   public:
     CreateGroupwiseKabcResource()
-      : KConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") )
     {
     }
 
@@ -138,11 +138,11 @@ class CreateGroupwiseKabcResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateGroupwiseKabcResource : public KConfigPropagator::Change
+class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateGroupwiseKabcResource()
-      : KConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") )
     {
     }
 
@@ -165,11 +165,11 @@ class UpdateGroupwiseKabcResource : public KConfigPropagator::Change
 };
 
 
-class GroupwisePropagator : public KConfigPropagator
+class GroupwisePropagator : public TDEConfigPropagator
 {
   public:
     GroupwisePropagator()
-      : KConfigPropagator( GroupwiseConfig::self(), "groupwise.kcfg" )
+      : TDEConfigPropagator( GroupwiseConfig::self(), "groupwise.kcfg" )
     {
     }
 
@@ -182,7 +182,7 @@ class GroupwisePropagator : public KConfigPropagator
     class Writer : public CreateDisconnectedImapAccount::CustomWriter
     {
       public:
-	void writeFolder( KConfig &, int ) {}
+	void writeFolder( TDEConfig &, int ) {}
 	void writeIds( int accountId, int transportId )
 	{
           GroupwiseConfig::setKMailAccountId( accountId );
@@ -266,7 +266,7 @@ class GroupwisePropagator : public KConfigPropagator
     }
 };
 
-GroupwiseWizard::GroupwiseWizard() : KConfigWizard( new GroupwisePropagator )
+GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator )
 {
   TQFrame *page = createWizardPage( i18n("Novell GroupWise") );
 
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index f3a7b4ff1..073de386a 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class TQSpinBox;
 class TQGroupBox;
 
-class KDE_EXPORT GroupwiseWizard : public KConfigWizard
+class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard
 {
     Q_OBJECT
   
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 191ea8436..abcd57d44 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -43,7 +43,7 @@ static const char* s_folderContentsType[] = {
 Wallet* CreateImapAccount::mWallet = 0;
 
 CreateImapAccount::CreateImapAccount( const TQString &accountName, const TQString &title )
-  : KConfigPropagator::Change( title ),
+  : TDEConfigPropagator::Change( title ),
     mAccountName( accountName ), mPort( 993 ), mEnableSieve( false ), mEnableSavePassword( true ),
     mEncryption( None ), mAuthentication( NONE ), mAuthenticationSend( PLAIN ), mSmtpPort( 25 ),
     mExistingAccountId( -1 ), mExistingTransportId( -1 ),
@@ -156,7 +156,7 @@ void CreateDisconnectedImapAccount::apply()
 {
   if ( mEmail.isEmpty() ) mEmail = mUser + "@" + mServer;
 
-  KConfig c( "kmailrc" );
+  TDEConfig c( "kmailrc" );
   c.setGroup( "General" );
   c.writeEntry( "Default domain", mDefaultDomain );
   int accountId;
@@ -313,7 +313,7 @@ CreateOnlineImapAccount::CreateOnlineImapAccount(const TQString & accountName) :
 
 void CreateOnlineImapAccount::apply()
 {
-  KConfig c( "kmailrc" );
+  TDEConfig c( "kmailrc" );
   c.setGroup( "General" );
   uint accCnt = c.readNumEntry( "accounts", 0 );
   c.writeEntry( "accounts", accCnt+1 );
diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h
index 7622608d5..f238b3628 100644
--- a/wizards/kmailchanges.h
+++ b/wizards/kmailchanges.h
@@ -29,13 +29,13 @@ namespace KWallet {
   class Wallet;
 }
 
-class CreateImapAccount : public KConfigPropagator::Change
+class CreateImapAccount : public TDEConfigPropagator::Change
 {
   public:
     class CustomWriter
     {
       public:
-        virtual void writeFolder( KConfig &, int folderId ) = 0;
+        virtual void writeFolder( TDEConfig &, int folderId ) = 0;
         virtual void writeIds( int accountId, int transportId ) = 0;
     };
 
diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index a77de3037..0adfc46b7 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -30,7 +30,7 @@
 
 class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
 {
-  void writeFolder( KConfig &c, int id )
+  void writeFolder( TDEConfig &c, int id )
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
@@ -39,65 +39,65 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
   void writeIds( int, int ) {}
 };
 
-void createKMailChanges( KConfigPropagator::Change::List& changes )
+void createKMailChanges( TDEConfigPropagator::Change::List& changes )
 {
-  KConfigPropagator::ChangeConfig *c = new KConfigPropagator::ChangeConfig;
+  TDEConfigPropagator::ChangeConfig *c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoAccept";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoDeclConflict";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyMangleFromToHeaders";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyBodyInvites";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceEnabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceStorageFormat";
   c->value = KolabConfig::self()->kolab1Legacy() ? "IcalVcard" : "XML";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Folder Language";
@@ -123,7 +123,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
     user = email = user+"@"+KolabConfig::self()->server();
 
   if ( KolabConfig::self()->useOnlineForNonGroupware() ) {
-    c = new KConfigPropagator::ChangeConfig;
+    c = new TDEConfigPropagator::ChangeConfig;
     c->file = "kmailrc";
     c->group = "IMAP Resource";
     c->name = "ShowOnlyGroupwareFoldersForGroupwareAccount";
diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h
index 4ccf69c4b..74d07691b 100644
--- a/wizards/kolabkmailchanges.h
+++ b/wizards/kolabkmailchanges.h
@@ -23,6 +23,6 @@
 
 #include <kconfigpropagator.h>
 
-void createKMailChanges( KConfigPropagator::Change::List& );
+void createKMailChanges( TDEConfigPropagator::Change::List& );
 
 #endif
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index 857ed3e9d..a35493841 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -42,11 +42,11 @@
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 
-class SetupLDAPSearchAccount : public KConfigPropagator::Change
+class SetupLDAPSearchAccount : public TDEConfigPropagator::Change
 {
   public:
     SetupLDAPSearchAccount()
-      : KConfigPropagator::Change( i18n("Setup LDAP Search Account") )
+      : TDEConfigPropagator::Change( i18n("Setup LDAP Search Account") )
     {
     }
 
@@ -67,7 +67,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
           basedn = h;
       }
       { // while we're here, write default domain
-        KConfig c( "kmailrc" );
+        TDEConfig c( "kmailrc" );
         c.setGroup( "General" );
         c.writeEntry( "Default domain", basedn );
       }
@@ -76,7 +76,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       basedn.prepend("dc=");
 
       // Set the changes
-      KConfig c( "kabldaprc" );
+      TDEConfig c( "kabldaprc" );
       c.setGroup( "LDAP" );
       bool hasMyServer = false;
       uint selHosts = c.readNumEntry("NumSelectedHosts", 0);
@@ -93,11 +93,11 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
 
 };
 
-class CreateCalendarImapResource : public KConfigPropagator::Change
+class CreateCalendarImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateCalendarImapResource()
-      : KConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
     {
     }
 
@@ -113,11 +113,11 @@ class CreateCalendarImapResource : public KConfigPropagator::Change
     }
 };
 
-class CreateContactImapResource : public KConfigPropagator::Change
+class CreateContactImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateContactImapResource()
-      : KConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
     {
     }
 
@@ -134,11 +134,11 @@ class CreateContactImapResource : public KConfigPropagator::Change
 
 };
 
-class CreateNotesImapResource : public KConfigPropagator::Change
+class CreateNotesImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateNotesImapResource()
-      : KConfigPropagator::Change( i18n("Create Notes IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Notes IMAP Resource") )
     {
     }
 
@@ -156,11 +156,11 @@ class CreateNotesImapResource : public KConfigPropagator::Change
 };
 
 
-class KolabPropagator : public KConfigPropagator
+class KolabPropagator : public TDEConfigPropagator
 {
   public:
     KolabPropagator()
-      : KConfigPropagator( KolabConfig::self(), "kolab.kcfg" )
+      : TDEConfigPropagator( KolabConfig::self(), "kolab.kcfg" )
     {
     }
 
@@ -252,7 +252,7 @@ class KolabPropagator : public KConfigPropagator
     }
 };
 
-KolabWizard::KolabWizard() : KConfigWizard( new KolabPropagator )
+KolabWizard::KolabWizard() : TDEConfigWizard( new KolabPropagator )
 {
   TQFrame *page = createWizardPage( i18n("Kolab Server") );
 
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index 6a5539ab8..eec252336 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -29,7 +29,7 @@ class KLineEdit;
 class TQCheckBox;
 class TQRadioButton;
 
-class KDE_EXPORT KolabWizard : public KConfigWizard
+class KDE_EXPORT KolabWizard : public TDEConfigWizard
 {
   public:
     KolabWizard();
diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp
index 56c18afe9..4926678ed 100644
--- a/wizards/scalixkmailchanges.cpp
+++ b/wizards/scalixkmailchanges.cpp
@@ -30,7 +30,7 @@
 
 class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
 {
-  void writeFolder( KConfig &c, int id )
+  void writeFolder( TDEConfig &c, int id )
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
@@ -40,65 +40,65 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
   void writeIds( int, int ) {}
 };
 
-void createKMailChanges( KConfigPropagator::Change::List& changes )
+void createKMailChanges( TDEConfigPropagator::Change::List& changes )
 {
-  KConfigPropagator::ChangeConfig *c = new KConfigPropagator::ChangeConfig;
+  TDEConfigPropagator::ChangeConfig *c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoAccept";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoDeclConflict";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyMangleFromToHeaders";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyBodyInvites";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceEnabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceStorageFormat";
   c->value = "IcalVcard";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Folder Language";
@@ -106,7 +106,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
   changes.append( c );
 
   // Don't show the account wizard as we created an account already
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "AccountWizard";
   c->name = "ShowOnStartup";
diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h
index 85279e089..91ae7b303 100644
--- a/wizards/scalixkmailchanges.h
+++ b/wizards/scalixkmailchanges.h
@@ -23,6 +23,6 @@
 
 #include <kconfigpropagator.h>
 
-void createKMailChanges( KConfigPropagator::Change::List& );
+void createKMailChanges( TDEConfigPropagator::Change::List& );
 
 #endif
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index f7be16a64..f6acd0e51 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -48,11 +48,11 @@
 
 #include <unistd.h>
 
-class SetupLDAPSearchAccount : public KConfigPropagator::Change
+class SetupLDAPSearchAccount : public TDEConfigPropagator::Change
 {
   public:
     SetupLDAPSearchAccount()
-      : KConfigPropagator::Change( i18n("Setup LDAP Search Account") )
+      : TDEConfigPropagator::Change( i18n("Setup LDAP Search Account") )
     {
     }
 
@@ -63,13 +63,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       TQString basedn( "o=Scalix" );
 
       { // while we're here, write default domain
-        KConfig c( "kmailrc" );
+        TDEConfig c( "kmailrc" );
         c.setGroup( "General" );
         c.writeEntry( "Default domain", basedn );
       }
 
       // Set the changes
-      KConfig c( "kabldaprc" );
+      TDEConfig c( "kabldaprc" );
       c.setGroup( "LDAP" );
       bool hasMyServer = false;
       uint selHosts = c.readNumEntry("NumSelectedHosts", 0);
@@ -86,17 +86,17 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
 
 };
 
-class SetupScalixAdmin : public KConfigPropagator::Change
+class SetupScalixAdmin : public TDEConfigPropagator::Change
 {
   public:
     SetupScalixAdmin()
-      : KConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) )
+      : TDEConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) )
     {
     }
 
     void apply()
     {
-      KConfig c( "scalixadminrc" );
+      TDEConfig c( "scalixadminrc" );
       c.setGroup( "Account" );
 
       c.writeEntry( "user", ScalixConfig::self()->user() );
@@ -149,11 +149,11 @@ class SetupScalixAdmin : public KConfigPropagator::Change
     }
 };
 
-class CreateCalendarImapResource : public KConfigPropagator::Change
+class CreateCalendarImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateCalendarImapResource()
-      : KConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
     {
     }
 
@@ -169,11 +169,11 @@ class CreateCalendarImapResource : public KConfigPropagator::Change
     }
 };
 
-class CreateContactImapResource : public KConfigPropagator::Change
+class CreateContactImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateContactImapResource()
-      : KConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
     {
     }
 
@@ -190,11 +190,11 @@ class CreateContactImapResource : public KConfigPropagator::Change
 
 };
 
-class SynchronizeScalixAccount : public KConfigPropagator::Change
+class SynchronizeScalixAccount : public TDEConfigPropagator::Change
 {
   public:
     SynchronizeScalixAccount()
-      : KConfigPropagator::Change( i18n("Synchronize Scalix Account") )
+      : TDEConfigPropagator::Change( i18n("Synchronize Scalix Account") )
     {
     }
 
@@ -238,11 +238,11 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
 };
 
 
-class ScalixPropagator : public KConfigPropagator
+class ScalixPropagator : public TDEConfigPropagator
 {
   public:
     ScalixPropagator()
-      : KConfigPropagator( ScalixConfig::self(), "scalix.kcfg" )
+      : TDEConfigPropagator( ScalixConfig::self(), "scalix.kcfg" )
     {
     }
 
@@ -360,7 +360,7 @@ class ScalixPropagator : public KConfigPropagator
     }
 };
 
-ScalixWizard::ScalixWizard() : KConfigWizard( new ScalixPropagator )
+ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator )
 {
   TQFrame *page = createWizardPage( i18n("Scalix Server") );
 
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index ae8816290..6ff44b054 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -29,7 +29,7 @@ class KComboBox;
 class KLineEdit;
 class TQCheckBox;
 
-class KDE_EXPORT ScalixWizard : public KConfigWizard
+class KDE_EXPORT ScalixWizard : public TDEConfigWizard
 {
   public:
     ScalixWizard();
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 632bdd420..c7d8e7ea7 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -94,7 +94,7 @@ class ServerType : public TQObject
      */
     virtual void activateConnection( const TQString& uid, bool active ) = 0;
 
-    virtual KConfigPropagator::Change::List changes() = 0;
+    virtual TDEConfigPropagator::Change::List changes() = 0;
 };
 
 
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index 5d5481b94..9cdd5538b 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -48,11 +48,11 @@ TQString sloxUrl()
   return url;
 }
 
-class CreateSloxKcalResource : public KConfigPropagator::Change
+class CreateSloxKcalResource : public TDEConfigPropagator::Change
 {
   public:
     CreateSloxKcalResource()
-      : KConfigPropagator::Change( i18n("Create SLOX Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Create SLOX Calendar Resource") )
     {
     }
 
@@ -77,11 +77,11 @@ class CreateSloxKcalResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateSloxKcalResource : public KConfigPropagator::Change
+class UpdateSloxKcalResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateSloxKcalResource()
-      : KConfigPropagator::Change( i18n("Update SLOX Calendar Resource") )
+      : TDEConfigPropagator::Change( i18n("Update SLOX Calendar Resource") )
     {
     }
 
@@ -108,11 +108,11 @@ class UpdateSloxKcalResource : public KConfigPropagator::Change
     }
 };
 
-class CreateSloxKabcResource : public KConfigPropagator::Change
+class CreateSloxKabcResource : public TDEConfigPropagator::Change
 {
   public:
     CreateSloxKabcResource()
-      : KConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") )
     {
     }
 
@@ -134,11 +134,11 @@ class CreateSloxKabcResource : public KConfigPropagator::Change
     }
 };
 
-class UpdateSloxKabcResource : public KConfigPropagator::Change
+class UpdateSloxKabcResource : public TDEConfigPropagator::Change
 {
   public:
     UpdateSloxKabcResource()
-      : KConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") )
+      : TDEConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") )
     {
     }
 
@@ -163,11 +163,11 @@ class UpdateSloxKabcResource : public KConfigPropagator::Change
 };
 
 
-class SloxPropagator : public KConfigPropagator
+class SloxPropagator : public TDEConfigPropagator
 {
   public:
     SloxPropagator()
-      : KConfigPropagator( SloxConfig::self(), "slox.kcfg" )
+      : TDEConfigPropagator( SloxConfig::self(), "slox.kcfg" )
     {
     }
 
@@ -219,7 +219,7 @@ class SloxPropagator : public KConfigPropagator
     }
 };
 
-SloxWizard::SloxWizard() : KConfigWizard( new SloxPropagator )
+SloxWizard::SloxWizard() : TDEConfigWizard( new SloxPropagator )
 {
   TQFrame *page = createWizardPage( i18n("SUSE LINUX OpenExchange Server") );
 
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index e5f7f5d3a..f43525d1a 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -26,7 +26,7 @@
 class KLineEdit;
 class TQCheckBox;
 
-class KDE_EXPORT SloxWizard : public KConfigWizard
+class KDE_EXPORT SloxWizard : public TDEConfigWizard
 {
   public:
     SloxWizard();