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

55 files changed, 129 insertions, 129 deletions

diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
index 113ec95e..320eeb3e 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp
@@ -75,7 +75,7 @@ void BookmarksPlugin::slotBookmarkURLsInMessage(Kopete::Message & msg)
 	delete URLsList;
 }
 
-void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data )
+void BookmarksPlugin::slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data )
 {
 	TQTextCodec *codec = getPageEncoding( data );
 	TQString htmlpage = codec->toUnicode( data );
@@ -84,21 +84,21 @@ void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArr
 	int pos = rx.search( htmlpage );
 	KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
 	KBookmarkGroup group = getKopeteFolder();
-	TQString sender = m_map[(KIO::TransferJob*)transfer].sender;
+	TQString sender = m_map[(TDEIO::TransferJob*)transfer].sender;
 	
 	if ( m_settings.useSubfolderForContact( sender ) )
 		group = getFolder( group, sender );
 
 	if( pos == -1 ){
-		group.addBookmark( mgr, m_map[(KIO::TransferJob*)transfer].url.prettyURL(), m_map[(KIO::TransferJob*)transfer].url.url() );
+		group.addBookmark( mgr, m_map[(TDEIO::TransferJob*)transfer].url.prettyURL(), m_map[(TDEIO::TransferJob*)transfer].url.url() );
 		kdDebug( 14501 ) << "failed to extract title from first data chunk" << endl;
 	}else {
 		group.addBookmark( mgr, rx.cap( 1 ).simplifyWhiteSpace(),
-						   m_map[(KIO::TransferJob*)transfer].url.url() );
+						   m_map[(TDEIO::TransferJob*)transfer].url.url() );
 	}
 	mgr->save();
 	mgr->emitChanged( group );
-	m_map.remove( (KIO::TransferJob*)transfer );
+	m_map.remove( (TDEIO::TransferJob*)transfer );
 	transfer->kill();
 }
 
@@ -129,12 +129,12 @@ void BookmarksPlugin::addKopeteBookmark( const KURL& url, const TQString& sender
 	// either restrict to http(s) or to KProtocolInfo::protocolClass() == :internet
 	if( !isURLInGroup( url, group )
 		&& url.isValid() && url.protocol().startsWith("http") ) {
-		KIO::TransferJob *transfer;
+		TDEIO::TransferJob *transfer;
 		// make asynchronous transfer to avoid GUI freezing due to overloaded web servers
-		transfer = KIO::get(url, false, false);
+		transfer = TDEIO::get(url, false, false);
 		transfer->setInteractive(false);
-		connect ( transfer, TQT_SIGNAL ( data( KIO::Job *, const TQByteArray & ) ),
-		this, TQT_SLOT ( slotAddKopeteBookmark( KIO::Job *, const TQByteArray & ) ) );
+		connect ( transfer, TQT_SIGNAL ( data( TDEIO::Job *, const TQByteArray & ) ),
+		this, TQT_SLOT ( slotAddKopeteBookmark( TDEIO::Job *, const TQByteArray & ) ) );
 		m_map[transfer].url = url;
 		m_map[transfer].sender = sender;
 	}
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h
index 4de58478..32143ff9 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.h
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h
@@ -36,7 +36,7 @@ private:
 		KURL url;
 		TQString sender;
     } URLandName;
-    typedef TQMap<KIO::TransferJob*,URLandName> JobsToURLsMap;
+    typedef TQMap<TDEIO::TransferJob*,URLandName> JobsToURLsMap;
     JobsToURLsMap m_map;
     BookmarksPrefsSettings m_settings;
     void addKopeteBookmark( const KURL& url, const TQString& sender );
@@ -49,7 +49,7 @@ public slots:
     void slotReloadSettings();
 
 private slots:
-    void slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data );
+    void slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data );
 };
 
 typedef KGenericFactory<BookmarksPlugin> BookmarksPluginFactory;
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
index a6175750..703ec550 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
@@ -27,7 +27,7 @@ typedef KGenericFactory<BookmarksPreferences> BookmarksPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") )
 
 BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args)
- : KCModule(BookmarksPreferencesFactory::instance(), parent, args)
+ : TDECModule(BookmarksPreferencesFactory::instance(), parent, args)
 {
 	Q_UNUSED( name );
 	( new TQVBoxLayout (this) )->setAutoAdd( true );
@@ -67,7 +67,7 @@ void BookmarksPreferences::save()
 	m_settings.setAddBookmarksFromUnknownContacts( p_dialog->m_addUntrusted->isChecked() );
 	m_settings.save();
 	emit PreferencesChanged(); 
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void BookmarksPreferences::slotSetStatusChanged()
@@ -77,12 +77,12 @@ void BookmarksPreferences::slotSetStatusChanged()
 	else
 		p_dialog->contactList->setEnabled(true);
 	
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void BookmarksPreferences::slotAddUntrustedChanged()
 {
-    emit KCModule::changed(true);
+    emit TDECModule::changed(true);
 }
 
 void BookmarksPreferences::load()
@@ -108,7 +108,7 @@ void BookmarksPreferences::load()
 			p_dialog->contactList->setSelected( item, true );
 		}
 	}
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 #include "addbookmarkspreferences.moc"
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
index 19ba80b5..6f07c8b5 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
@@ -19,7 +19,7 @@
 /**
 @author Roie Kerstein <sf_kersteinroie@bezeqint.net>
 */
-class BookmarksPreferences : public KCModule
+class BookmarksPreferences : public TDECModule
 {
 Q_OBJECT
   
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index acb1b1b1..31f12978 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -28,11 +28,11 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings()
 
 void BookmarksPrefsSettings::load()
 {
-	KConfig * configfile = TDEGlobal::config();
+	TDEConfig * configfile = TDEGlobal::config();
 	m_isfolderforeachcontact = Always;
 	m_contactslist.clear();
 	m_addbookmarksfromunknowns = false;
-	if( configfile->getConfigState() == KConfigBase::NoAccess ){
+	if( configfile->getConfigState() == TDEConfigBase::NoAccess ){
 		kdDebug( 14501 ) << "load: failed to open config file for reading" << endl;
 		return;
 	}
@@ -48,9 +48,9 @@ void BookmarksPrefsSettings::load()
 
 void BookmarksPrefsSettings::save()
 {
-	KConfig * configfile = TDEGlobal::config();
+	TDEConfig * configfile = TDEGlobal::config();
 
-	if( configfile->getConfigState() != KConfigBase::ReadWrite ){
+	if( configfile->getConfigState() != TDEConfigBase::ReadWrite ){
 		kdDebug( 14501 ) << "save: failed to open config file for writing" << endl;
 		return;
 	}
diff --git a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
index 8129d0b8..7c25fdef 100644
--- a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
+++ b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
@@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
 Comment[zh_TW]=自動將接收訊息中的連結加入書籤
 Icon=konqueror
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_addbookmarks
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 60c4b0f2..4ffa9d27 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -120,7 +120,7 @@ class ProtocolItem : public TQListViewItem
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_alias, AliasPreferencesFactory( "kcm_kopete_alias" ) )
 
 AliasPreferences::AliasPreferences( TQWidget *parent, const char *, const TQStringList &args )
-	: KCModule( AliasPreferencesFactory::instance(), parent, args )
+	: TDECModule( AliasPreferencesFactory::instance(), parent, args )
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	preferencesDialog = new AliasDialogBase( this );
@@ -158,7 +158,7 @@ AliasPreferences::~AliasPreferences()
 // reload configuration reading it from kopeterc
 void AliasPreferences::load()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	if( config->hasGroup( "AliasPlugin" ) )
 	{
 		config->setGroup("AliasPlugin");
@@ -189,7 +189,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 	Kopete::Protocol *protocol = static_cast<Kopete::Protocol*>( plugin );
 	if( protocol )
 	{
-		KConfig *config = TDEGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		if( config->hasGroup( "AliasPlugin" ) )
 		{
 			config->setGroup("AliasPlugin");
@@ -240,7 +240,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
 // save list to kopeterc and creates map out of it
 void AliasPreferences::save()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
 	config->setGroup( TQString::fromLatin1("AliasPlugin") );
 
@@ -266,7 +266,7 @@ void AliasPreferences::save()
 
 	config->writeEntry( "AliasNames", aliases );
 	config->sync();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id )
@@ -358,7 +358,7 @@ void AliasPreferences::slotAddAlias()
 				}
 			}
 			addAlias( alias, command, protocols );
-			emit KCModule::changed(true); 
+			emit TDECModule::changed(true); 
 
 		}
 	}
@@ -457,7 +457,7 @@ void AliasPreferences::slotEditAlias()
 					delete item;
 
 					addAlias( alias, command, selProtocols );
-					emit KCModule::changed(true);
+					emit TDECModule::changed(true);
 				}
 			}
 		}
@@ -484,7 +484,7 @@ void AliasPreferences::slotDeleteAliases()
 
 			aliasMap.erase( i->text(0) );
 			delete i;
-			emit KCModule::changed(true);
+			emit TDECModule::changed(true);
 		}
 
 		save();
diff --git a/kopete/plugins/alias/aliaspreferences.h b/kopete/plugins/alias/aliaspreferences.h
index dcbc2671..c906b8ce 100644
--- a/kopete/plugins/alias/aliaspreferences.h
+++ b/kopete/plugins/alias/aliaspreferences.h
@@ -21,7 +21,7 @@ class AliasItem;
 class AliasDialog;
 namespace Kopete { class Plugin; }
 
-class AliasPreferences : public KCModule
+class AliasPreferences : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/plugins/alias/kopete_alias_config.desktop b/kopete/plugins/alias/kopete_alias_config.desktop
index 8b6cd4f8..976c0360 100644
--- a/kopete/plugins/alias/kopete_alias_config.desktop
+++ b/kopete/plugins/alias/kopete_alias_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_alias
diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index 96de543f..0ce547cb 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -30,7 +30,7 @@ AutoReplaceConfig::AutoReplaceConfig()
 // reload configuration reading it from kopeterc
 void AutoReplaceConfig::load()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "AutoReplace Plugin" );
 
 	TQStringList wordsList = config->readListEntry( "WordsToReplace" );
@@ -113,7 +113,7 @@ AutoReplaceConfig::WordsToReplace AutoReplaceConfig::map() const
 
 void AutoReplaceConfig::save()
 {
-	KConfig * config = TDEGlobal::config();
+	TDEConfig * config = TDEGlobal::config();
 	config->setGroup( "AutoReplace Plugin" );
 
 	TQStringList newWords;
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 7c035e24..48062fb5 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -190,7 +190,7 @@ void AutoReplacePreferences::slotSelectionChanged()
 
 void AutoReplacePreferences::slotWidgetModified()
 {
-	emit KCModule::changed( m_wordListChanged || autoConfig()->hasChanged() );
+	emit TDECModule::changed( m_wordListChanged || autoConfig()->hasChanged() );
 }
 
 void AutoReplacePreferences::defaults()
diff --git a/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop b/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
index 28364f60..1dc4ec3e 100644
--- a/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
+++ b/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_autoreplace
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index f76fae2f..7e7d7761 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin()
 
 void CryptographyPlugin::loadSettings()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	mPrivateKeyID = config->readEntry("PGP_private_key");
diff --git a/kopete/plugins/cryptography/kopete_cryptography_config.desktop b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
index 77bb8bd0..23e321aa 100644
--- a/kopete/plugins/cryptography/kopete_cryptography_config.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_cryptography
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 39560eeb..65cfb3bc 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
 	CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() );
 	CBhideid->setChecked( KGpgSettings::hideUserID() );
 	if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	CBarmor->hide();
@@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p)
 void popupPublic::slotOk()
 {
 //BEGIN modified for Kopete
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Cryptography Plugin");
 
 	config->writeEntry("UntrustedKeys", CBuntrusted->isChecked());
diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index ca62a6d7..02570ef2 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -47,7 +47,7 @@ public:
 	TQStringList untrustedList;
 
 private:
-        KConfig *config;
+        TDEConfig *config;
         TQButtonGroup *boutonboxoptions;
         TQString customOptions;
 
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 90aa053f..a96e1475 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -40,7 +40,7 @@ typedef KGenericFactory<HighlightPreferences> HighlightPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_highlight, HighlightPreferencesFactory( "kcm_kopete_highlight" )  )
 
 HighlightPreferences::HighlightPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(HighlightPreferencesFactory::instance(), parent, args)
+							: TDECModule(HighlightPreferencesFactory::instance(), parent, args)
 {
 	donttouch=true;
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
@@ -100,13 +100,13 @@ void HighlightPreferences::load()
 		first=false;
 	}
 	donttouch=false;
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void HighlightPreferences::save()
 {
 	m_config->save();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 
@@ -190,7 +190,7 @@ void HighlightPreferences::slotRemoveFilter()
 	m_filterItems.remove(lvi);
 	delete lvi;
 	m_config->removeFilter(current);
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void HighlightPreferences::slotRenameFilter()
@@ -209,7 +209,7 @@ void HighlightPreferences::slotRenameFilter()
 		return;
 	current->displayName=newname;
 	lvi->setText(0,newname);
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 
@@ -237,7 +237,7 @@ void HighlightPreferences::slotSomethingHasChanged()
 	preferencesDialog->m_soundFN->setEnabled(current->playSound);
 	current->raiseView=preferencesDialog->m_raise->isChecked();
 
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void HighlightPreferences::slotEditRegExp()
diff --git a/kopete/plugins/highlight/highlightpreferences.h b/kopete/plugins/highlight/highlightpreferences.h
index 597564f4..601a05e5 100644
--- a/kopete/plugins/highlight/highlightpreferences.h
+++ b/kopete/plugins/highlight/highlightpreferences.h
@@ -29,7 +29,7 @@ class TQListViewItem;
   *@author Olivier Goffart
   */
 
-class HighlightPreferences : public KCModule  {
+class HighlightPreferences : public TDECModule  {
    Q_OBJECT
   
 public:
diff --git a/kopete/plugins/highlight/kopete_highlight_config.desktop b/kopete/plugins/highlight/kopete_highlight_config.desktop
index 9f241868..697b13e2 100644
--- a/kopete/plugins/highlight/kopete_highlight_config.desktop
+++ b/kopete/plugins/highlight/kopete_highlight_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=highlight
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_highlight
diff --git a/kopete/plugins/history/historypreferences.cpp b/kopete/plugins/history/historypreferences.cpp
index 370e6721..b1bca2f6 100644
--- a/kopete/plugins/history/historypreferences.cpp
+++ b/kopete/plugins/history/historypreferences.cpp
@@ -30,7 +30,7 @@ typedef KGenericFactory<HistoryPreferences> HistoryConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_history, HistoryConfigFactory( "kcm_kopete_history" ) )
 
 HistoryPreferences::HistoryPreferences(TQWidget *parent, const char*/*name*/, const TQStringList &args)
-	: KCModule(HistoryConfigFactory::instance(), parent, args)
+	: TDECModule(HistoryConfigFactory::instance(), parent, args)
 {
 	kdDebug(14310) << k_funcinfo << "called." << endl;
 	(new TQVBoxLayout(this))->setAutoAdd(true);
@@ -61,7 +61,7 @@ void HistoryPreferences::load()
 	p->Number_ChatWindow->setValue(HistoryConfig::number_ChatWindow());
 	p->History_color->setColor(HistoryConfig::history_color());
 	//p-> HistoryConfig::browserStyle();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void HistoryPreferences::save()
@@ -72,17 +72,17 @@ void HistoryPreferences::save()
 	HistoryConfig::setNumber_ChatWindow(p->Number_ChatWindow->value());
 	HistoryConfig::setHistory_color(p->History_color->color());
 	HistoryConfig::self()->writeConfig();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void HistoryPreferences::slotModified()
 {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void HistoryPreferences::slotShowPreviousChanged(bool on)
 {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 #include "historypreferences.moc"
diff --git a/kopete/plugins/history/historypreferences.h b/kopete/plugins/history/historypreferences.h
index d0dfa920..d230b208 100644
--- a/kopete/plugins/history/historypreferences.h
+++ b/kopete/plugins/history/historypreferences.h
@@ -26,7 +26,7 @@ class HistoryPrefsUI;
 /**
  * @author Stefan Gehn
  */
-class HistoryPreferences : public KCModule
+class HistoryPreferences : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/plugins/history/kopete_history_config.desktop b/kopete/plugins/history/kopete_history_config.desktop
index aa50a756..80684cb9 100644
--- a/kopete/plugins/history/kopete_history_config.desktop
+++ b/kopete/plugins/history/kopete_history_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=history
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_history
diff --git a/kopete/plugins/latex/kopete_latex_config.desktop b/kopete/plugins/latex/kopete_latex_config.desktop
index 7bc0db1f..f679ed54 100644
--- a/kopete/plugins/latex/kopete_latex_config.desktop
+++ b/kopete/plugins/latex/kopete_latex_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=latex
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_latex
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index d8169311..dd9046a2 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -180,7 +180,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg)
 	Q_UNUSED(msg)
 	//disabled because to work correctly, we need to find what special has the gif we can send over MSN
 #if 0
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Latex Plugin");
 
 	if(!config->readBoolEntry("ParseOutgoing", false))
diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp
index ff02c831..09c388e7 100644
--- a/kopete/plugins/latex/latexpreferences.cpp
+++ b/kopete/plugins/latex/latexpreferences.cpp
@@ -31,7 +31,7 @@ typedef KGenericFactory<LatexPreferences> LatexPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_latex, LatexPreferencesFactory( "kcm_kopete_latex" )  )
 
 LatexPreferences::LatexPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(LatexPreferencesFactory::instance(), parent, args)
+							: TDECModule(LatexPreferencesFactory::instance(), parent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	m_preferencesDialog = new LatexPrefsUI(this);
@@ -55,12 +55,12 @@ void LatexPreferences::load()
 	// load widgets here
 	m_preferencesDialog->horizontalDPI->setValue(LatexConfig::self()->horizontalDPI());
 	m_preferencesDialog->verticalDPI->setValue(LatexConfig::self()->verticalDPI());
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void LatexPreferences::slotModified()
 {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void LatexPreferences::save()
@@ -68,7 +68,7 @@ void LatexPreferences::save()
 	LatexConfig::self()->setHorizontalDPI(m_preferencesDialog->horizontalDPI->value());
 	LatexConfig::self()->setVerticalDPI(m_preferencesDialog->verticalDPI->value());
 	LatexConfig::self()->writeConfig();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 #include "latexpreferences.moc"
diff --git a/kopete/plugins/latex/latexpreferences.h b/kopete/plugins/latex/latexpreferences.h
index 33013acb..aa6d8597 100644
--- a/kopete/plugins/latex/latexpreferences.h
+++ b/kopete/plugins/latex/latexpreferences.h
@@ -28,7 +28,7 @@ class TQListViewItem;
   *@author Duncan Mac-Vicar Prett
   */
 
-class LatexPreferences : public KCModule
+class LatexPreferences : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
index 85a0213c..2f1ae265 100644
--- a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
+++ b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_motionaway
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp
index 56958bec..ea4bf2bc 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.cpp
+++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp
@@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin()
 }
 
 void MotionAwayPlugin::loadSettings(){
-	KConfig *kconfig = TDEGlobal::config();
+	TDEConfig *kconfig = TDEGlobal::config();
 	kconfig->setGroup("MotionAway Plugin");
 
 	awayTimeout = kconfig->readNumEntry("AwayTimeout", 1);
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
index 889d4d30..01dc7771 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
@@ -31,7 +31,7 @@ typedef KGenericFactory<MotionAwayPreferences> MotionAwayPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway"))
 
 MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(MotionAwayPreferencesFactory::instance(), parent, args)
+							: TDECModule(MotionAwayPreferencesFactory::instance(), parent, args)
 {
 	// Add actuall widget generated from ui file.
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
@@ -48,12 +48,12 @@ void MotionAwayPreferences::load()
 	preferencesDialog->AwayTimeout->setValue(MotionAwayConfig::self()->awayTimeout());
 	preferencesDialog->BecomeAvailableWithActivity->setChecked(MotionAwayConfig::self()->becomeAvailableWithActivity());
 	preferencesDialog->VideoDevice->setText(MotionAwayConfig::self()->videoDevice());
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void MotionAwayPreferences::slotWidgetModified()
 {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 void MotionAwayPreferences::save()
@@ -62,7 +62,7 @@ void MotionAwayPreferences::save()
 	MotionAwayConfig::self()->setBecomeAvailableWithActivity(preferencesDialog->BecomeAvailableWithActivity->isChecked());
 	MotionAwayConfig::self()->setVideoDevice(preferencesDialog->VideoDevice->text());
 	MotionAwayConfig::self()->writeConfig();
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 #include "motionawaypreferences.moc"
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h
index 3574005b..78ac9104 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.h
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.h
@@ -26,7 +26,7 @@ class motionawayPrefsUI;
  * Preference widget for the Motion Away plugin
  * @author Duncan Mac-Vicar P.
  */
-class MotionAwayPreferences : public KCModule
+class MotionAwayPreferences : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop b/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
index 154dcf16..0d266c03 100644
--- a/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
+++ b/kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=highlight
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_netmeeting
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 8d310bc0..7581ac62 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -160,7 +160,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 {
 	//TODO: use TDEProcess
 	
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
 	
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index a1801fbf..d5d7f01b 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -40,7 +40,7 @@ typedef KGenericFactory<NetmeetingPreferences> NetmeetingPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" )  )
 
 NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(NetmeetingPreferencesFactory::instance(), parent, args)
+							: TDECModule(NetmeetingPreferencesFactory::instance(), parent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	preferencesDialog = new NetmeetingPrefsUI(this);
@@ -56,24 +56,24 @@ NetmeetingPreferences::~NetmeetingPreferences()
 
 void NetmeetingPreferences::load()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1"));
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void NetmeetingPreferences::save()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText());
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 
 void NetmeetingPreferences::slotChanged()
 {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 #include "netmeetingpreferences.moc"
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h
index 2ed4d86b..2246e805 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.h
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.h
@@ -26,7 +26,7 @@ class NetmeetingPrefsUI;
   *@author Olivier Goffart
   */
 
-class NetmeetingPreferences : public KCModule  {
+class NetmeetingPreferences : public TDECModule  {
    Q_OBJECT
   
 public:
diff --git a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
index 43625fdd..7985f663 100644
--- a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaboodle
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_nowlistening
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.h b/kopete/plugins/nowlistening/nowlisteningplugin.h
index 8489044e..c0ee77d5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.h
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.h
@@ -96,7 +96,7 @@ friend class NowListeningGUIClient;
 		void slotNewKMM( Kopete::ChatSession* );
 		
 		/**
-		 * Reacts to the plugin's settings changed signal, originating from the KCModule dispatcher
+		 * Reacts to the plugin's settings changed signal, originating from the TDECModule dispatcher
 		 */ 
 		void slotSettingsChanged();
 
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index bd0cb983..d7117852 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_nowlistening, NowListeningPreferencesFact
 
 
 NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-	: KCModule( NowListeningPreferencesFactory::instance(), parent, args )
+	: TDECModule( NowListeningPreferencesFactory::instance(), parent, args )
 {
 	(  new TQVBoxLayout(  this ) )->setAutoAdd(  true );
 	preferencesDialog = new NowListeningPrefsUI( this );
@@ -63,12 +63,12 @@ NowListeningPreferences::~NowListeningPreferences( )
 
 void NowListeningPreferences::save()
 {
-	KCModule::save();
+	TDECModule::save();
 }
 
 void NowListeningPreferences::load()
 {
-	KCModule::load();
+	TDECModule::load();
 }
 
 void NowListeningPreferences::slotSettingsChanged()
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.h b/kopete/plugins/nowlistening/nowlisteningpreferences.h
index 7e29df51..05169c10 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.h
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.h
@@ -29,7 +29,7 @@ class NowListeningConfig;
   *@author Will Stephenson
   */
 
-class NowListeningPreferences : public KCModule
+class NowListeningPreferences : public TDECModule
 {
 Q_OBJECT
   
diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs
index 80854a86..74942692 100644
--- a/kopete/plugins/smpppdcs/Changelog.smpppdcs
+++ b/kopete/plugins/smpppdcs/Changelog.smpppdcs
@@ -16,7 +16,7 @@ Changelog
 =========
 
 0.79 (2006/01/25)
-* using KConfigXT for configuration
+* using TDEConfigXT for configuration
 * using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package),
   no more own implementation
 * experimental implementation of the the KDED-NetworkStatus (not active, yet)
@@ -27,7 +27,7 @@ Changelog
 * even more speed improvements
 
 0.75 (2006/01/01)
-* use of KSocketStream instead of deprecated KExtendedSocket
+* use of TDESocketStream instead of deprecated KExtendedSocket
 * progressbar while searching for an smpppd on the local network
 * automatically found smpppd server is resolved via DNS
 * Fixed Bug 111369: better detection of a SMPPPD and no more freeze of Kopete
diff --git a/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop b/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
index e7241fe7..c8b33de5 100644
--- a/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
+++ b/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=smpppdcs
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_smpppdcs
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index 671008bc..1815fe9e 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -36,7 +36,7 @@ typedef KGenericFactory<SMPPPDCSPreferences> SMPPPDCSPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs"))
 
 SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name */, const TQStringList& args)
- : KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
+ : TDECModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
 
  	Kopete::AccountManager * manager = Kopete::AccountManager::self(); 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
@@ -98,7 +98,7 @@ void SMPPPDCSPreferences::listClicked(TQListViewItem * item)
 				break;
 			}
 		}
-		emit KCModule::changed(change);
+		emit TDECModule::changed(change);
 	}
 	m_accountMapCur[cli->text(0)].m_on = cli->isOn();
 }
@@ -149,7 +149,7 @@ void SMPPPDCSPreferences::load()
 	m_ui->SMPPPDLocation->port->setValue(SMPPPDCSConfig::self()->port());
 	m_ui->SMPPPDLocation->Password->setText(SMPPPDCSConfig::self()->password());
 	
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void SMPPPDCSPreferences::save()
@@ -177,11 +177,11 @@ void SMPPPDCSPreferences::save()
 	
 	SMPPPDCSConfig::self()->writeConfig();
 	
-	emit KCModule::changed(false);
+	emit TDECModule::changed(false);
 }
 
 void SMPPPDCSPreferences::slotModified() {
-	emit KCModule::changed(true);
+	emit TDECModule::changed(true);
 }
 
 #include "smpppdcspreferences.moc"
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.h b/kopete/plugins/smpppdcs/smpppdcspreferences.h
index f9ccf914..19368313 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.h
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.h
@@ -36,7 +36,7 @@ public:
  *
  * @author Heiko Sch&auml;fer <heiko@rangun.de>
  */
-class SMPPPDCSPreferences : public KCModule {
+class SMPPPDCSPreferences : public TDECModule {
     Q_OBJECT
   
 
diff --git a/kopete/plugins/texteffect/kopete_texteffect_config.desktop b/kopete/plugins/texteffect/kopete_texteffect_config.desktop
index 335f2be6..e554f7c6 100644
--- a/kopete/plugins/texteffect/kopete_texteffect_config.desktop
+++ b/kopete/plugins/texteffect/kopete_texteffect_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=texteffect
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_texteffect
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index bf05d59a..b1e2417c 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -30,7 +30,7 @@ TextEffectConfig::TextEffectConfig()
 
 void TextEffectConfig::load()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("TextEffect Plugin");
 
 	mColors = config->readListEntry("Colors");
@@ -54,7 +54,7 @@ TQStringList TextEffectConfig::defaultColorList()
 
 void TextEffectConfig::save()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("TextEffect Plugin");
 
 	config->writeEntry("Colors", mColors );
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index e567f1a8..e2a05469 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_texteffect, TextEffectPreferencesFactory(
 TextEffectPreferences::TextEffectPreferences(TQWidget *parent,
                                              const char* /*name*/,
                                              const TQStringList &args)
-	: KCModule(TextEffectPreferencesFactory::instance(), parent, args)
+	: TDECModule(TextEffectPreferencesFactory::instance(), parent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 
@@ -107,7 +107,7 @@ void TextEffectPreferences::load()
 
 
 	// Call parent's save method
-	KCModule::load();
+	TDECModule::load();
 
 	// Indicate that we have not changed ^_^
 	emit changed( false );
@@ -135,7 +135,7 @@ void TextEffectPreferences::save()
 	//TextEffectPlugin::plugin()->slotSettingsChanged();
 
 	// Call parent's save method
-	KCModule::save();
+	TDECModule::save();
 
 	// Indicate that we have not changed ^_^
 	emit changed( false );
diff --git a/kopete/plugins/texteffect/texteffectpreferences.h b/kopete/plugins/texteffect/texteffectpreferences.h
index 2afda35f..e8157326 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.h
+++ b/kopete/plugins/texteffect/texteffectpreferences.h
@@ -28,7 +28,7 @@ class TQStringList;
   *@author Olivier Goffart
   */
 
-class TextEffectPreferences : public KCModule  {
+class TextEffectPreferences : public TDECModule  {
    Q_OBJECT
   
 public:
diff --git a/kopete/plugins/translator/kopete_translator_config.desktop b/kopete/plugins/translator/kopete_translator_config.desktop
index ac5e3a3b..a59090d6 100644
--- a/kopete/plugins/translator/kopete_translator_config.desktop
+++ b/kopete/plugins/translator/kopete_translator_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=locale
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_translator
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index d331f8f2..a2614640 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L;
 
 void TranslatorPlugin::loadSettings()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	int mode = 0;
 
 	config->setGroup( "Translator Plugin" );
@@ -269,14 +269,14 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	kdDebug(14308) << k_funcinfo << " URL: " << gurl << endl;
 	KURL geturl ( gurl );
 
-	KIO::TransferJob *job = KIO::get( geturl, false, true );
-	//job = KIO::http_post( translatorURL, postData, true );
+	TDEIO::TransferJob *job = TDEIO::get( geturl, false, true );
+	//job = TDEIO::http_post( translatorURL, postData, true );
 
 	//job->addMetaData( "content-type", "application/x-www-form-urlencoded" );
 	//job->addMetaData( "referrer", "http://www.google.com" );
 
-	TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
-	TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
+	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
 	// KIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -309,10 +309,10 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS
 
 	kdDebug( 14308 ) << k_funcinfo << "URL: " << gurl << endl;
 
-	KIO::TransferJob *job = KIO::get( geturl, false, true );
+	TDEIO::TransferJob *job = TDEIO::get( geturl, false, true );
 
-	TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
-	TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
+	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
 	// KIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -381,16 +381,16 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr
 	};
 }
 
-void TranslatorPlugin::slotDataReceived ( KIO::Job *job, const TQByteArray &data )
+void TranslatorPlugin::slotDataReceived ( TDEIO::Job *job, const TQByteArray &data )
 {
 	m_data[ job ] += TQCString( data, data.size() + 1 );
 }
 
-void TranslatorPlugin::slotJobDone ( KIO::Job *job )
+void TranslatorPlugin::slotJobDone ( TDEIO::Job *job )
 {
 	m_completed[ job ] = true;
-	TQObject::disconnect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
-	TQObject::disconnect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
+	TQObject::disconnect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::disconnect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 }
 
 void TranslatorPlugin::slotSetLanguage()
diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h
index f3b50bce..762b6018 100644
--- a/kopete/plugins/translator/translatorplugin.h
+++ b/kopete/plugins/translator/translatorplugin.h
@@ -73,8 +73,8 @@ public:
 private slots:
 	void slotIncomingMessage( Kopete::Message& msg );
 	void slotOutgoingMessage( Kopete::Message& msg );
-	void slotDataReceived ( KIO::Job *, const TQByteArray &data);
-	void slotJobDone ( KIO::Job *);
+	void slotDataReceived ( TDEIO::Job *, const TQByteArray &data);
+	void slotJobDone ( TDEIO::Job *);
 	void slotSetLanguage();
 	void slotSelectionChanged(bool);
 	void slotNewKMM(Kopete::ChatSession *);
@@ -90,8 +90,8 @@ protected:
 
 private:
 
-	TQMap< KIO::Job *, TQCString> m_data;
-	TQMap< KIO::Job *, bool> m_completed;
+	TQMap< TDEIO::Job *, TQCString> m_data;
+	TQMap< TDEIO::Job *, bool> m_completed;
 
 	KSelectAction* m_actionLanguage;
 
diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index d62c9c34..e84fca85 100644
--- a/kopete/plugins/webpresence/DESIGN
+++ b/kopete/plugins/webpresence/DESIGN
@@ -6,7 +6,7 @@ Provides a view of the current state of your contact list as a webpage.
 How It Does It
 Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that KIO can access.
 
-Use KIO::NetAccess to upload the files!
+Use TDEIO::NetAccess to upload the files!
 
 Getting Info about Local User's Status
 Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol.  So we need to know (protocol, uin, status).
diff --git a/kopete/plugins/webpresence/kopete_webpresence_config.desktop b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
index cf2791a8..11e33a5a 100644
--- a/kopete/plugins/webpresence/kopete_webpresence_config.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=html
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_webpresence
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 59cf8315..82525619 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin()
 
 void WebPresencePlugin::loadSettings()
 {
-	KConfig *kconfig = TDEGlobal::config();
+	TDEConfig *kconfig = TDEGlobal::config();
 	kconfig->setGroup( "Web Presence Plugin" );
 
 	frequency = kconfig->readNumEntry("UploadFrequency", 15);
@@ -196,12 +196,12 @@ void WebPresencePlugin::slotWriteFile()
 
 	// upload it to the specified URL
 	KURL src( m_output->name() );
-	KIO::FileCopyJob *job = KIO::file_move( src, dest, -1, true, false, false );
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-			TQT_SLOT(  slotUploadJobResult( KIO::Job * ) ) );
+	TDEIO::FileCopyJob *job = TDEIO::file_move( src, dest, -1, true, false, false );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+			TQT_SLOT(  slotUploadJobResult( TDEIO::Job * ) ) );
 }
 
-void WebPresencePlugin::slotUploadJobResult( KIO::Job *job )
+void WebPresencePlugin::slotUploadJobResult( TDEIO::Job *job )
 {
 	if ( job->error() ) {
 		kdDebug(14309) << "Error uploading presence info." << endl;
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index c4db2429..d5324a40 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.h
+++ b/kopete/plugins/webpresence/webpresenceplugin.h
@@ -78,7 +78,7 @@ protected slots:
 	/**
 	 * Called when an upload finished, displays error if needed
 	 */
-	 void slotUploadJobResult( KIO::Job * );
+	 void slotUploadJobResult( TDEIO::Job * );
 	/**
 	 * Called to schedule a write, after waiting to see if more changes
 	 * occur (accounts tend to change status together)
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index e62e63bc..711822d4 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -28,7 +28,7 @@ typedef KGenericFactory<WebPresencePreferences> WebPresencePreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_webpresence, WebPresencePreferencesFactory("kcm_kopete_webpresence"))
 
 WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-		: KCModule(WebPresencePreferencesFactory::instance(), parent, args)
+		: TDECModule(WebPresencePreferencesFactory::instance(), parent, args)
 {
 	// Add actuall widget generated from ui file.
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
@@ -46,7 +46,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
 
 void WebPresencePreferences::widgetModified()
 {
-	emit KCModule::changed(kautoconfig->hasChanged());
+	emit TDECModule::changed(kautoconfig->hasChanged());
 }
 
 void WebPresencePreferences::save()
diff --git a/kopete/plugins/webpresence/webpresencepreferences.h b/kopete/plugins/webpresence/webpresencepreferences.h
index 5fd42de5..2ea900c3 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.h
+++ b/kopete/plugins/webpresence/webpresencepreferences.h
@@ -27,7 +27,7 @@ class KAutoConfig;
  * Preference widget for the Now Listening plugin, copied from the Cryptography plugin
  * @author Olivier Goffart
  */
-class WebPresencePreferences : public KCModule  {
+class WebPresencePreferences : public TDECModule  {
    Q_OBJECT