From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kresources/scalix/kcal/resourcescalix.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kresources/scalix/kcal/resourcescalix.cpp')

diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index eeebb32f..a757c81f 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -61,7 +61,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal"
 static const char* incidenceInlineMimeType = "text/calendar";
 
 
-ResourceScalix::ResourceScalix( const KConfig *config )
+ResourceScalix::ResourceScalix( const TDEConfig *config )
   : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
     mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
 {
@@ -79,18 +79,18 @@ ResourceScalix::~ResourceScalix()
   }
 }
 
-void ResourceScalix::loadSubResourceConfig( KConfig& config,
+void ResourceScalix::loadSubResourceConfig( TDEConfig& config,
                                            const TQString& name,
                                            const TQString& label,
                                            bool writable,
                                            ResourceMap& subResource )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   subResource.insert( name, Scalix::SubResource( active, writable, label ) );
 }
 
-bool ResourceScalix::openResource( KConfig& config, const char* contentType,
+bool ResourceScalix::openResource( TDEConfig& config, const char* contentType,
                                   ResourceMap& map )
 {
   // Read the subresource entries from KMail
@@ -111,7 +111,7 @@ bool ResourceScalix::doOpen()
     return true;
   mOpen = true;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "General" );
   mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200);
 
@@ -120,7 +120,7 @@ bool ResourceScalix::doOpen()
     && openResource( config, kmailJournalContentsType, mJournalSubResources );
 }
 
-static void closeResource( KConfig& config, ResourceMap& map )
+static void closeResource( TDEConfig& config, ResourceMap& map )
 {
   ResourceMap::ConstIterator it;
   for ( it = map.begin(); it != map.end(); ++it ) {
@@ -136,7 +136,7 @@ void ResourceScalix::doClose()
     return;
   mOpen = false;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   closeResource( config, mEventSubResources );
   closeResource( config, mTodoSubResources );
   closeResource( config, mJournalSubResources );
@@ -745,7 +745,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( subResource );
 
   bool active = config.readBoolEntry( subResource, true );
@@ -767,7 +767,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     return;
 
   // Delete from the config file
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
-- 
cgit v1.2.3