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 --- kresources/featureplan/kcal_resourcefeatureplan.cpp | 6 +++--- kresources/featureplan/kcal_resourcefeatureplan.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kresources/featureplan') diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp index 349e4ad56..762bee1f8 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp @@ -43,7 +43,7 @@ using namespace KCal; -ResourceFeaturePlan::ResourceFeaturePlan( const KConfig *config ) +ResourceFeaturePlan::ResourceFeaturePlan( const TDEConfig *config ) : ResourceCached( config ), mLock( true ) { mPrefs = new Prefs; @@ -60,12 +60,12 @@ Prefs *ResourceFeaturePlan::prefs() return mPrefs; } -void ResourceFeaturePlan::readConfig( const KConfig * ) +void ResourceFeaturePlan::readConfig( const TDEConfig * ) { mPrefs->readConfig(); } -void ResourceFeaturePlan::writeConfig( KConfig *config ) +void ResourceFeaturePlan::writeConfig( TDEConfig *config ) { ResourceCalendar::writeConfig( config ); diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h index 0e666704e..2808aef71 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.h +++ b/kresources/featureplan/kcal_resourcefeatureplan.h @@ -42,11 +42,11 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached Q_OBJECT public: - ResourceFeaturePlan( const KConfig * ); + ResourceFeaturePlan( const TDEConfig * ); virtual ~ResourceFeaturePlan(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); Prefs *prefs(); -- cgit v1.2.1