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/kolab/knotes/resourcekolab.cpp | 10 +++++----- kresources/kolab/knotes/resourcekolab.h | 2 +- kresources/kolab/knotes/resourcekolab_plugin.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kresources/kolab/knotes') diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index b92a723a5..a28a51b27 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -50,7 +50,7 @@ static const char* kmailContentsType = "Note"; static const char* attachmentMimeType = "application/x-vnd.kolab.note"; static const char* inlineMimeType = "text/calendar"; -ResourceKolab::ResourceKolab( const KConfig *config ) +ResourceKolab::ResourceKolab( const TDEConfig *config ) : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ), mCalendar( TQString::fromLatin1("UTC") ) { @@ -66,7 +66,7 @@ ResourceKolab::~ResourceKolab() bool ResourceKolab::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); // Get the list of Notes folders from KMail @@ -88,7 +88,7 @@ bool ResourceKolab::doOpen() void ResourceKolab::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); Kolab::ResourceMap::ConstIterator it; for ( it = mSubResources.constBegin(); it != mSubResources.constEnd(); ++it ) @@ -356,7 +356,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); bool active = config.readBoolEntry( subResource, true ); @@ -379,7 +379,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); config.deleteEntry( subResource ); config.sync(); diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h index f596d8f70..fb0d191b9 100644 --- a/kresources/kolab/knotes/resourcekolab.h +++ b/kresources/kolab/knotes/resourcekolab.h @@ -57,7 +57,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes, public: - ResourceKolab( const KConfig* ); + ResourceKolab( const TDEConfig* ); virtual ~ResourceKolab(); /// Load resource data. diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp index fa187d2b9..f589986cb 100644 --- a/kresources/kolab/knotes/resourcekolab_plugin.cpp +++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp @@ -35,7 +35,7 @@ class KolabFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new Kolab::ResourceKolab( config ); } -- cgit v1.2.1