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/exchange/resourceexchange.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kresources/exchange/resourceexchange.cpp')

diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index eb90b8c4a..1f6779a81 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -72,7 +72,7 @@ public:
   long updateWatch;
 };
 
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
   : ResourceCalendar( config ), mClient(0), mMonitor(0), mCache(0), mDates(0),
     mEventDates(0), mCacheDates(0)
 {
@@ -106,7 +106,7 @@ ResourceExchange::~ResourceExchange()
   delete mAccount; mAccount = 0;
 }
 
-void ResourceExchange::writeConfig( KConfig* config )
+void ResourceExchange::writeConfig( TDEConfig* config )
 {
   ResourceCalendar::writeConfig( config );
   config->writeEntry( "ExchangeHost", mAccount->host() );
-- 
cgit v1.2.1