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

32 files changed, 140 insertions, 140 deletions

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);