From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kontact/plugins/summary/kcmkontactsummary.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kontact/plugins/summary/kcmkontactsummary.cpp') diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index f3eae012..d880f153 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) { + KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } @@ -91,7 +91,7 @@ PluginView::~PluginView() } KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) - : KCModule( parent, name ) + : TDECModule( parent, name ) { TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -124,7 +124,7 @@ void KCMKontactSummary::load() TQStringList activeSummaries; - KConfig config( "kontact_summaryrc" ); + TDEConfig config( "kontact_summaryrc" ); if ( !config.hasKey( "ActiveSummaries" ) ) { activeSummaries << "kontact_kaddressbookplugin"; activeSummaries << "kontact_specialdatesplugin"; @@ -142,8 +142,8 @@ void KCMKontactSummary::load() mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" ); KPluginInfo::List::Iterator it; - KConfig *conf = new KConfig("kontactrc"); - KConfigGroup *cg = new KConfigGroup( conf, "Plugins" ); + TDEConfig *conf = new TDEConfig("kontactrc"); + TDEConfigGroup *cg = new TDEConfigGroup( conf, "Plugins" ); for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) { (*it)->load( cg ); @@ -174,7 +174,7 @@ void KCMKontactSummary::save() ++it; } - KConfig config( "kontact_summaryrc" ); + TDEConfig config( "kontact_summaryrc" ); config.writeEntry( "ActiveSummaries", activeSummaries ); } -- cgit v1.2.3