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/newexchange/exchangeaddressbookadaptor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kresources/newexchange/exchangeaddressbookadaptor.cpp')

diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index bd22858a5..7e8ae8bb9 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -43,7 +43,7 @@ ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor
   }
 }
 
-KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
+TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ )
 {
 kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl;
   Q_ASSERT( adaptor );
@@ -51,11 +51,11 @@ kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<<endl;
   KURL upUrl( url() );
   adaptor->adaptUploadUrl( upUrl );
   kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl;
-  KIO::DavJob *job = KIO::davPropPatch( upUrl, mDavData, false );
+  TDEIO::DavJob *job = TDEIO::davPropPatch( upUrl, mDavData, false );
   return job;
 }
 
-KIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
 {
 kdDebug()<<"ExchangeAddressBookUploadItem::createUploadNewJob"<<endl;
   KURL url( baseurl );
-- 
cgit v1.2.1