diff options
Diffstat (limited to 'kresources/carddav')
-rw-r--r-- | kresources/carddav/preferences.cpp | 4 | ||||
-rw-r--r-- | kresources/carddav/preferences.h | 2 | ||||
-rw-r--r-- | kresources/carddav/resource.cpp | 6 | ||||
-rw-r--r-- | kresources/carddav/resource.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp index 17e0216ab..5e46b611b 100644 --- a/kresources/carddav/preferences.cpp +++ b/kresources/carddav/preferences.cpp @@ -98,8 +98,8 @@ void CardDavPrefs::removeWallet(bool noWallet) { } void CardDavPrefs::addPrefix(const TQString& prefix) { - KConfigSkeletonItem::List itemList = items(); - KConfigSkeletonItem::List::Iterator it; + TDEConfigSkeletonItem::List itemList = items(); + TDEConfigSkeletonItem::List::Iterator it; for ( it = itemList.begin(); it != itemList.end(); ++it ) { (*it)->setGroup( prefix + ':' + (*it)->group() ); diff --git a/kresources/carddav/preferences.h b/kresources/carddav/preferences.h index 0f074b4da..89a8ac585 100644 --- a/kresources/carddav/preferences.h +++ b/kresources/carddav/preferences.h @@ -91,7 +91,7 @@ public: protected: /** - * Add an unique prefix to KConfigGroup, so that different instances of the resource + * Add an unique prefix to TDEConfigGroup, so that different instances of the resource * can use the same config file. * @param prefix Unique prefix of the resource instance. */ diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp index f416a64ba..dae91c322 100644 --- a/kresources/carddav/resource.cpp +++ b/kresources/carddav/resource.cpp @@ -68,7 +68,7 @@ const int ResourceCardDav::DEFAULT_SAVE_POLICY = ResourceCached::SaveDelay | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCardDav::ResourceCardDav( const KConfig *config ) : +ResourceCardDav::ResourceCardDav( const TDEConfig *config ) : ResourceCached(config) , readLockout(false) , mAllWritesComplete(false) @@ -217,14 +217,14 @@ KABC::Lock* ResourceCardDav::lock() { return &mLock; } -void ResourceCardDav::readConfig( const KConfig *config ) { +void ResourceCardDav::readConfig( const TDEConfig *config ) { log("readConfig"); mPrefs->readConfig(); // FIXME KABC //ResourceCached::readConfig(config); } -void ResourceCardDav::writeConfig( KConfig *config ) { +void ResourceCardDav::writeConfig( TDEConfig *config ) { log("writeConfig()"); Resource::writeConfig(config); mPrefs->writeConfig(); diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h index ff4c49674..cf5090e57 100644 --- a/kresources/carddav/resource.h +++ b/kresources/carddav/resource.h @@ -47,11 +47,11 @@ class KDE_EXPORT ResourceCardDav : public ResourceCached public: - explicit ResourceCardDav( const KConfig *config ); + explicit ResourceCardDav( const TDEConfig *config ); virtual ~ResourceCardDav(); - void readConfig( const KConfig *config ); - void writeConfig( KConfig *config ); + void readConfig( const TDEConfig *config ); + void writeConfig( TDEConfig *config ); virtual Ticket *requestSaveTicket(); virtual void releaseSaveTicket( Ticket* ); |