From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kopete/plugins/alias/aliaspreferences.cpp | 16 ++++++++-------- kopete/plugins/alias/aliaspreferences.h | 2 +- kopete/plugins/alias/kopete_alias_config.desktop | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kopete/plugins/alias') 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( 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 -- cgit v1.2.1