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

27 files changed, 48 insertions, 48 deletions

diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index e12a6d73..1c011f99 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -128,7 +128,7 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name )
 	connect( protocolListView, TQT_SIGNAL(spacePressed(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *)));
 
 	// read sticky settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Add Contact Wizard");
 	bool useKABC = config->readBoolEntry( "UseAddressBook", false );
 	chkAddressee->setChecked( useKABC );
@@ -237,7 +237,7 @@ void AddContactWizard::accept()
 		delete metaContact;
 
 	// write sticky settings
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Add Contact Wizard");
 	config->writeEntry( "UseAddressBook", chkAddressee->isChecked() );
 	config->sync();
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 341e4c47..a8bc1c9f 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -296,7 +296,7 @@ void ChatMessagePart::slotImportEmoticon()
     TQString emo = d->activeElement.getAttribute("src").string();
     TQString themeName = KopetePrefs::prefs()->iconTheme();
 
-    KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ));
+    TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ));
 
     TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ) +  "/emoticons.xml");
 
@@ -371,7 +371,7 @@ void ChatMessagePart::save()
 
 	tempFile.close();
 
-	if ( !KIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) )
+	if ( !TDEIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) )
 	{
 		KMessageBox::queuedMessageBox( view(), KMessageBox::Error,
 				i18n("<qt>Could not open <b>%1</b> for writing.</qt>").arg( saveURL.prettyURL() ), // Message
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index da3288b0..97263b8a 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -834,7 +834,7 @@ void ChatView::messageSentSuccessfully()
 
 void ChatView::saveOptions()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) );
 	config->setGroup( TQString::fromLatin1( "ChatViewDock" ) );
@@ -858,7 +858,7 @@ void ChatView::saveChatSettings()
 	if ( !mc )
 		return;
 
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	
 	TQString contactListGroup = TQString::fromLatin1("chatwindow_") +
 	                           mc->metaContactId();
@@ -878,7 +878,7 @@ void ChatView::loadChatSettings()
 	//read settings for metacontact
 	TQString contactListGroup = TQString::fromLatin1("chatwindow_") +
 	                           contacts.first()->metaContact()->metaContactId();
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup( contactListGroup );
 	bool enableRichText = config->readBoolEntry( "EnableRichText", true );
 	editPart()->slotSetRichTextEnabled( enableRichText );
@@ -889,7 +889,7 @@ void ChatView::loadChatSettings()
 
 void ChatView::readOptions()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	/** THIS IS BROKEN !!! */
 	//dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") );
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 45ff87cf..e205fb5a 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -1031,7 +1031,7 @@ void KopeteChatWindow::readOptions()
 {
 	// load and apply config file settings affecting the appearance of the UI
 //	kdDebug(14010) << k_funcinfo << endl;
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) );
 	config->setGroup( TQString::fromLatin1("ChatWindowSettings") );
 	m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true );
@@ -1041,7 +1041,7 @@ void KopeteChatWindow::saveOptions()
 {
 //	kdDebug(14010) << k_funcinfo << endl;
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	// saves menubar,toolbar and statusbar setting
 	saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) );
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index cf54985f..7ed0e931 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -304,7 +304,7 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath)
 		}
 	
 		// Do the actual deletion of the directory style.
-		return KIO::NetAccess::del( urlStyle, 0 );
+		return TDEIO::NetAccess::del( urlStyle, 0 );
 	}
 	else
 	{
@@ -319,7 +319,7 @@ ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &styleP
 		// NOTE: This is a hidden config switch for style developers
 		// Check in the config if the cache is disabled.
 		// if the cache is disabled, reload the style everytime it's getted.
-		KConfig *config = TDEGlobal::config();
+		TDEConfig *config = TDEGlobal::config();
 		config->setGroup("KopeteStyleDebug");
 		bool disableCache = config->readBoolEntry("disableStyleCache", false);
 		if(disableCache)
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index ef51c020..d3cef26e 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -175,7 +175,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP
 	else
 		toggleMode( Send );
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" )  );
 
 	d->sendInProgress = false;
@@ -195,7 +195,7 @@ KopeteEmailWindow::~KopeteEmailWindow()
 	emit( closing( this ) );
 
 	// saves menubar, toolbar and statusbar setting
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) );
 	config->sync();
 
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 16ebe584..a42fd718 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -300,7 +300,7 @@ void KopeteRichTextEditPart::readConfig()
 {
 	// Don't update config untill we read whole config first
 	m_configWriteLock = true;
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("RichTextEditor");
 
 	TQColor tmpColor = TDEGlobalSettings::textColor();
@@ -342,7 +342,7 @@ void KopeteRichTextEditPart::writeConfig()
 	// If true we're still reading the conf write now, so don't write.
 	if( m_configWriteLock ) return;
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("RichTextEditor");
 	config->writeEntry("Font", mFont );
 	config->writeEntry("FontSize", mFont.pointSize() );
diff --git a/kopete/kopete/config/accounts/kopete_accountconfig.desktop b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
index 09d43a5a..f7645dc7 100644
--- a/kopete/kopete/config/accounts/kopete_accountconfig.desktop
+++ b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_accountconfig
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
index 1bb9357f..28af94f6 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -54,7 +54,7 @@ typedef KGenericFactory<KopeteAccountConfig, TQWidget> KopeteAccountConfigFactor
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_accountconfig, KopeteAccountConfigFactory( "kcm_kopete_accountconfig" ) )
 
 KopeteAccountConfig::KopeteAccountConfig( TQWidget *parent, const char * /* name */, const TQStringList &args )
-: KCModule( KopeteAccountConfigFactory::instance(), parent, args )
+: TDECModule( KopeteAccountConfigFactory::instance(), parent, args )
 {
 
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.h b/kopete/kopete/config/accounts/kopeteaccountconfig.h
index dc3ff2d6..5cb474a8 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.h
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.h
@@ -30,7 +30,7 @@ class KopeteAccountConfigBase;
 /**
  * @author Olivier Goffart <ogoffart @ kde.org>
  */
-class KopeteAccountConfig : public KCModule
+class KopeteAccountConfig : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index aff81a39..106622c9 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -179,16 +179,16 @@ public:
 	}
 };
 
-// TODO: Someday, this configuration dialog must(not should) use KConfigXT
+// TODO: Someday, this configuration dialog must(not should) use TDEConfigXT
 AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const TQStringList &args )
-: KCModule( KopeteAppearanceConfigFactory::instance(), parent, args )
+: TDECModule( KopeteAppearanceConfigFactory::instance(), parent, args )
 {
 	d = new Private;
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	d->mAppearanceTabCtl = new TQTabWidget(this, "mAppearanceTabCtl");
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "ChatWindowSettings" );
 
 	// "Emoticons" TAB ==========================================================
@@ -629,7 +629,7 @@ void AppearanceConfig::slotInstallChatStyle()
 	if( !styleToInstall.isEmpty() )
 	{
 		TQString stylePath;
-		if( KIO::NetAccess::download( styleToInstall, stylePath, this ) )
+		if( TDEIO::NetAccess::download( styleToInstall, stylePath, this ) )
 		{
 			int styleInstallReturn = 0;
 			styleInstallReturn = ChatWindowStyleManager::self()->installStyle( stylePath );
@@ -662,7 +662,7 @@ void AppearanceConfig::slotInstallChatStyle()
 			}
 
 			// removeTempFile check if the file is a temp file, so it's ok for local files.
-			KIO::NetAccess::removeTempFile( stylePath );
+			TDEIO::NetAccess::removeTempFile( stylePath );
 		}
 	}
 }
@@ -846,14 +846,14 @@ void AppearanceConfig::removeSelectedEmoticonTheme()
 		return;
 
 	KURL themeUrl(TDEGlobal::dirs()->findResource("emoticons", themeName+"/"));
-	KIO::NetAccess::del(themeUrl, this);
+	TDEIO::NetAccess::del(themeUrl, this);
 
 	updateEmoticonlist();
 }
 
 void AppearanceConfig::slotGetEmoticonThemes()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup( "KNewStuff" );
 	config->writeEntry( "ProvidersUrl",
 						"http://download.kde.org/khotnewstuff/emoticons-providers.xml" );
diff --git a/kopete/kopete/config/appearance/appearanceconfig.h b/kopete/kopete/config/appearance/appearanceconfig.h
index 60f769a4..15d761f8 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.h
+++ b/kopete/kopete/config/appearance/appearanceconfig.h
@@ -27,7 +27,7 @@
  * @author Duncan Mac-Vicar P. <duncan@kde.org>
  * @author Michaël Larouche <michael.larouche@kdemail.net>
  */
-class AppearanceConfig : public KCModule
+class AppearanceConfig : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index 4bfb0468..d432d22e 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -226,7 +226,7 @@ void EmoticonsEditDialog::slotRemoveClicked()
 void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy)
 {
     if(copy)
-        KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ));
+        TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons",  themeName, false ));
 
     KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons);
     itm->setPixmap(0, TQPixmap(emo));
diff --git a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
index de74d4bd..e5afd8f8 100644
--- a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
+++ b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_appearanceconfig
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
index 4f8bafc0..cf619fd7 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
@@ -44,7 +44,7 @@ typedef KGenericFactory<AVDeviceConfig, TQWidget> KopeteAVDeviceConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_avdeviceconfig, KopeteAVDeviceConfigFactory( "kcm_kopete_avdeviceconfig" ) )
 
 AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char *  name , const TQStringList &args)
- : KCModule( KopeteAVDeviceConfigFactory::instance(), parent, args )
+ : TDECModule( KopeteAVDeviceConfigFactory::instance(), parent, args )
 {
 	kdDebug() << "kopete:config (avdevice): KopeteAVDeviceConfigFactory::instance() called. " << endl;
 	(new TQVBoxLayout(this))->setAutoAdd(true);
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.h b/kopete/kopete/config/avdevice/avdeviceconfig.h
index ee03faf5..23b74e28 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.h
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.h
@@ -37,7 +37,7 @@ class AVDeviceConfig_AudioDevice;
 /**
 @author Cl�dio da Silveira Pinheiro
 */
-class AVDeviceConfig : public KCModule
+class AVDeviceConfig : public TDECModule
 {
 Q_OBJECT
   
diff --git a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
index 05eed0c4..55bd8c3e 100644
--- a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
+++ b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kopete_avdevice
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_avdeviceconfig
diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp
index dc21e28a..bae2d832 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.cpp
+++ b/kopete/kopete/config/behavior/behaviorconfig.cpp
@@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_behaviorconfig, KopeteBehaviorConfigFacto
 
 
 BehaviorConfig::BehaviorConfig(TQWidget *parent, const char * /* name */, const TQStringList &args) :
-		KCModule( KopeteBehaviorConfigFactory::instance(), parent, args )
+		TDECModule( KopeteBehaviorConfigFactory::instance(), parent, args )
 {
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	mBehaviorTabCtl = new TQTabWidget(this, "mBehaviorTabCtl");
@@ -159,7 +159,7 @@ void BehaviorConfig::save()
 //	kdDebug(14000) << k_funcinfo << "called." << endl;
 
 	KopetePrefs *p = KopetePrefs::prefs();
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	// "General" TAB ============================================================
 	p->setShowTray(mPrfsGeneral->mShowTrayChk->isChecked());
@@ -219,7 +219,7 @@ void BehaviorConfig::load()
 {
 //	kdDebug(14000) << k_funcinfo << "called" << endl;
 	KopetePrefs *p = KopetePrefs::prefs();
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	awayInstance = Kopete::Away::getInstance();
 
 	// "General" TAB ============================================================
diff --git a/kopete/kopete/config/behavior/behaviorconfig.h b/kopete/kopete/config/behavior/behaviorconfig.h
index c181cda4..0b37bd1e 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.h
+++ b/kopete/kopete/config/behavior/behaviorconfig.h
@@ -32,7 +32,7 @@ class BehaviorConfig_Chat;
 class KopeteAwayConfigBaseUI;
 class KPluginInfo;
 
-class BehaviorConfig : public KCModule
+class BehaviorConfig : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
index 06880ef3..e02c4c84 100644
--- a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
+++ b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=configure
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_behaviorconfig
diff --git a/kopete/kopete/config/identity/kopete_identityconfig.desktop b/kopete/kopete/config/identity/kopete_identityconfig.desktop
index 7c2f6c4e..8ab9dc92 100644
--- a/kopete/kopete/config/identity/kopete_identityconfig.desktop
+++ b/kopete/kopete/config/identity/kopete_identityconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_identityconfig
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index 94e19a94..da13d3cc 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -85,13 +85,13 @@ public:
 typedef KGenericFactory<KopeteIdentityConfig, TQWidget> KopeteIdentityConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_identityconfig, KopeteIdentityConfigFactory( "kcm_kopete_identityconfig" ) )
 
-KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), parent, args)
+KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : TDECModule( KopeteIdentityConfigFactory::instance(), parent, args)
 {
 	d = new Private;
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	d->m_view = new KopeteIdentityConfigBase( this, "KopeteIdentityConfig::m_view" );
 	
-	// Setup KConfigXT link with GUI.
+	// Setup TDEConfigXT link with GUI.
 	addConfig( Kopete::Config::self(), d->m_view );
 
 	// Load config
@@ -160,7 +160,7 @@ KopeteIdentityConfig::~KopeteIdentityConfig()
 
 void KopeteIdentityConfig::load()
 {
-	KCModule::load();
+	TDECModule::load();
 
 	// Populate the select Identity combo box.
 	loadIdentities();
@@ -181,7 +181,7 @@ void KopeteIdentityConfig::load()
 
 void KopeteIdentityConfig::save()
 {
-	KCModule::save();
+	TDECModule::save();
 
 	saveCurrentIdentity();
 
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h
index 107d1ee5..83b80683 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.h
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.h
@@ -33,7 +33,7 @@ class KopeteIdentityConfigBase;
 /**
  * @author Michaël Larouche <shock@shockdev.ca.tc>
  */
-class KopeteIdentityConfig : public KCModule
+class KopeteIdentityConfig : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp
index f8e2bb85..bc5ed895 100644
--- a/kopete/kopete/contactlist/customnotificationprops.cpp
+++ b/kopete/kopete/contactlist/customnotificationprops.cpp
@@ -40,7 +40,7 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti
 
 	m_item = item;
 	TQString path = "kopete/eventsrc";
-	KConfig eventsfile( path, true, false, "data" );
+	TDEConfig eventsfile( path, true, false, "data" );
 	m_eventList = eventsfile.groupList();
 	TQStringList contactSpecificEvents; // we are only interested in events that relate to contacts
 	TQStringList::Iterator it = m_eventList.begin();
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 8dba350d..8a41bc49 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -118,7 +118,7 @@ void KopeteApplication::slotLoadPlugins()
 	Kopete::AccountManager::self()->load();
 	Kopete::ContactList::self()->load();
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	// Parse command-line arguments
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp
index 46049498..d532dacd 100644
--- a/kopete/kopete/kopeteiface.cpp
+++ b/kopete/kopete/kopeteiface.cpp
@@ -35,7 +35,7 @@
 
 KopeteIface::KopeteIface() : DCOPObject( "KopeteIface" )
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("AutoAway");
 
 	if (config->readBoolEntry("UseAutoAway", true))
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index d55caa81..5215d588 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -422,7 +422,7 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
 
 void KopeteWindow::loadOptions()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	toolBar("mainToolBar")->applySettings( config, "ToolBar Settings" );
 	toolBar("quickSearchBar")->applySettings( config, "QuickSearchBar Settings" );
@@ -469,7 +469,7 @@ void KopeteWindow::loadOptions()
 
 void KopeteWindow::saveOptions()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 
 	toolBar("mainToolBar")->saveSettings ( config, "ToolBar Settings" );
 	toolBar("quickSearchBar")->saveSettings( config, "QuickSearchBar Settings" );