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/kabc/resourcescalix.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 94cec32a2..42aef92d5 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -59,7 +59,7 @@ using namespace Scalix;
 class ScalixFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new KABC::ResourceScalix( config );
     }
@@ -77,7 +77,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
 static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
 static const char* s_inlineMimeType = "application/scalix-properties";
 
-KABC::ResourceScalix::ResourceScalix( const KConfig *config )
+KABC::ResourceScalix::ResourceScalix( const TDEConfig *config )
   : KPIM::ResourceABC( config ),
     Scalix::ResourceScalixBase( "ResourceScalix-KABC" ),
     mCachedSubresource( TQString() ), mLocked( false )
@@ -94,12 +94,12 @@ KABC::ResourceScalix::~ResourceScalix()
   }
 }
 
-void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config,
+void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config,
                                                  const TQString& name,
                                                  const TQString& label,
                                                  bool writable )
 {
-  KConfigGroup group( &config, name );
+  TDEConfigGroup group( &config, name );
   bool active = group.readBoolEntry( "Active", true );
   int completionWeight = group.readNumEntry( "CompletionWeight", 80 );
   mSubResources.insert( name, Scalix::SubResource( active, writable, label,
@@ -108,7 +108,7 @@ void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config,
 
 bool KABC::ResourceScalix::doOpen()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   // Read the calendar entries
   TQValueList<KMailICalIface::SubResource> subResources;
@@ -125,7 +125,7 @@ bool KABC::ResourceScalix::doOpen()
 
 void KABC::ResourceScalix::doClose()
 {
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
 
   Scalix::ResourceMap::ConstIterator it;
   for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) {
@@ -487,7 +487,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Already registered
     return;
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.setGroup( "Contact" );
   loadSubResourceConfig( config, subResource, label, writable );
   loadSubResource( subResource );
@@ -507,7 +507,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
   // Ok, it's our job, and we have it here
   mSubResources.erase( subResource );
 
-  KConfig config( configFile() );
+  TDEConfig config( configFile() );
   config.deleteGroup( subResource );
   config.sync();
 
-- 
cgit v1.2.1