summaryrefslogtreecommitdiffstats
path: root/kresources/newexchange
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/newexchange')
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.cpp6
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.h16
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.cpp18
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.h20
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp8
-rw-r--r--kresources/newexchange/exchangeglobals.cpp30
-rw-r--r--kresources/newexchange/exchangeglobals.h16
-rw-r--r--kresources/newexchange/kabc_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kabc_resourceexchange.h2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.h2
11 files changed, 61 insertions, 61 deletions
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 );
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h
index 576427645..cbf5ac6f6 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.h
+++ b/kresources/newexchange/exchangeaddressbookadaptor.h
@@ -40,9 +40,9 @@ class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem
public:
ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, UploadType type );
virtual ~ExchangeAddressBookUploadItem() {}
-/**/ virtual KIO::TransferJob *createUploadJob(
+/**/ virtual TDEIO::TransferJob *createUploadJob(
KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
-/**/ virtual KIO::TransferJob *createUploadNewJob(
+/**/ virtual TDEIO::TransferJob *createUploadNewJob(
KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
protected:
@@ -65,21 +65,21 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
// Creating Jobs
- KIO::Job *createListFoldersJob( const KURL &url )
+ TDEIO::Job *createListFoldersJob( const KURL &url )
{ return ExchangeGlobals::createListFoldersJob( url ); }
- KIO::TransferJob *createListItemsJob( const KURL &url )
+ TDEIO::TransferJob *createListItemsJob( const KURL &url )
{ return ExchangeGlobals::createListItemsJob( url ); }
- KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+ TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
{ return ExchangeGlobals::createDownloadJob( this, url, ctype ); }
- KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
+ TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
{ return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); }
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
+ bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+ bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretAddressBookDownloadItemsJob( this, job, jobData ); }
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index c0882ab1a..89c9b742e 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -50,7 +50,7 @@ kdDebug()<<"mItemType=="<<mItemType<<endl;
}
}
-KIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl )
+TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseUrl )
{
kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<", URL="<<baseUrl.url()<<endl;
Q_ASSERT( adaptor );
@@ -59,11 +59,11 @@ kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<<adaptor<<",
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 *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
+TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadNewJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl )
{
kdDebug()<<"ExchangeCalendarUploadItem::createUploadNewJob"<<endl;
KURL url( baseurl );
@@ -107,9 +107,9 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
" AND (\"urn:schemas:calendar:instancetype\" = 0\r\n"
" OR \"urn:schemas:calendar:instancetype\" = 1)\r\n";
- KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
+ TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
job->setWindow( mWindow );
- connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
}
*/
@@ -126,10 +126,10 @@ KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Inciden
return new ExchangeCalendarUploadItem( this, it, type );
}
-bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ )
{
kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadJob " << endl;
- KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+ TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
bool error = job->error();
const TQString err = job->errorString();
@@ -153,11 +153,11 @@ bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString
}
}
-bool ExchangeCalendarAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ )
{
// TODO: How does the incidence mapper know the old/new ids???
kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadNewJob " << endl;
- KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+ TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
bool error = job->error();
const TQString err = job->errorString();
diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h
index 3a4acab99..4f8d1da2c 100644
--- a/kresources/newexchange/exchangecalendaradaptor.h
+++ b/kresources/newexchange/exchangecalendaradaptor.h
@@ -38,9 +38,9 @@ class ExchangeCalendarUploadItem : public KPIM::GroupwareUploadItem
public:
ExchangeCalendarUploadItem( CalendarAdaptor *adaptor, KCal::Incidence *incidence, UploadType type );
virtual ~ExchangeCalendarUploadItem() {}
- virtual KIO::TransferJob *createUploadNewJob(
+ virtual TDEIO::TransferJob *createUploadNewJob(
KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
- virtual KIO::TransferJob *createUploadJob(
+ virtual TDEIO::TransferJob *createUploadJob(
KPIM::GroupwareDataAdaptor *adaptor, const KURL &url );
protected:
@@ -63,23 +63,23 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor
// Creating Jobs
- KIO::Job *createListFoldersJob( const KURL &url )
+ TDEIO::Job *createListFoldersJob( const KURL &url )
{ return ExchangeGlobals::createListFoldersJob( url ); }
- KIO::TransferJob *createListItemsJob( const KURL &url )
+ TDEIO::TransferJob *createListItemsJob( const KURL &url )
{ return ExchangeGlobals::createListItemsJob( url ); }
- KIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
+ TDEIO::TransferJob *createDownloadJob( const KURL &url, KPIM::FolderLister::ContentType ctype )
{ return ExchangeGlobals::createDownloadJob( this, url, ctype ); }
- KIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
+ TDEIO::Job *createRemoveJob( const KURL &uploadurl, const KPIM::GroupwareUploadItem::List &deletedItems )
{ return ExchangeGlobals::createRemoveJob( uploadurl, deletedItems ); }
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
+ bool interpretListItemsJob( TDEIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
+ bool interpretDownloadItemsJob( TDEIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretCalendarDownloadItemsJob( this, job, jobData ); }
- bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
- bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
+ bool interpretUploadJob( TDEIO::Job *job, const TQString &/*jobData*/ );
+ bool interpretUploadNewJob( TDEIO::Job *job, const TQString &/*jobData*/ );
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index 529409362..bf2a66db9 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -310,12 +310,12 @@ void ExchangeDownload::handleRecurrence( TQString uid )
// kdDebug() << "Exchange master query: " << endl << query << endl;
- KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+ TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
query, false );
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotMasterResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
}
*/
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index 5cb2eee77..f2d90cd6d 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -87,7 +87,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
-KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
+TDEIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
{
TQDomDocument doc;
TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
@@ -97,11 +97,11 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
WebdavHandler::addElement( doc, prop, "d:hassubs" );
kdDebug(7000) << "props: " << doc.toString() << endl;
- return KIO::davPropFind( url, doc, "1", false );
+ return TDEIO::davPropFind( url, doc, "1", false );
}
-KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
+TDEIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
{
TQDomDocument doc;
TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
@@ -109,11 +109,11 @@ KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
WebdavHandler::addElement( doc, prop, "d:getetag" );
WebdavHandler::addElement( doc, prop, "d:contentclass" );
kdDebug(5800) << "props = "<< doc.toString() << endl;
- return KIO::davPropFind( url, doc, "1", false );
+ return TDEIO::davPropFind( url, doc, "1", false );
}
-KIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+TDEIO::TransferJob *ExchangeGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
const KURL &url, KPIM::FolderLister::ContentType ctype )
{
kdDebug() << "ExchangeGlobals::createDownloadJob()" << endl;
@@ -156,18 +156,18 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
kdDebug(7000) << "doc: " << doc.toString() << endl;
KURL authURL = url;
- KIO::DavJob *job = KIO::davPropFind( authURL, doc, "0", false );
+ TDEIO::DavJob *job = TDEIO::davPropFind( authURL, doc, "0", false );
/* KURL httpurl( url );
TQString proto("http");
httpurl.setProtocol( proto );
- KIO::TransferJob *job = KIO::get(httpurl, false, false);
+ TDEIO::TransferJob *job = TDEIO::get(httpurl, false, false);
job->addMetaData("customHTTPHeader", "Translate: f");
job->addMetaData("cache", "reload");*/
return job;
}
-KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
+TDEIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
const KPIM::GroupwareUploadItem::List &deletedItems )
{
TQStringList urls;
@@ -182,7 +182,7 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
urls << url.url();
kdDebug() << "Delete (Mod) : " << url.url() << endl;
}
- return KIO::del( urls, false, false );
+ return TDEIO::del( urls, false, false );
}
@@ -192,10 +192,10 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
// it calls getContentType of the ExchangeGlobals class, instead of the one
// from OGoGlobals!!!!
bool ExchangeGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
- KIO::Job *job, const TQString &/*jobData*/ )
+ TDEIO::Job *job, const TQString &/*jobData*/ )
{
kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
- KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job);
+ TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob *>(job);
if ( !davjob ) {
return false;
@@ -237,9 +237,9 @@ kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const TQString &/*jobData*/ )
+ TDEIO::Job *job, const TQString &/*jobData*/ )
{
- KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+ TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument="
@@ -261,9 +261,9 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen
bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
- KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &/*jobData*/ )
+ KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ )
{
- KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
+ TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument="
diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h
index a1e12f4c1..5d75bc42b 100644
--- a/kresources/newexchange/exchangeglobals.h
+++ b/kresources/newexchange/exchangeglobals.h
@@ -25,7 +25,7 @@
#include <groupwareuploadjob.h>
#include <tqdom.h>
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -51,20 +51,20 @@ class ExchangeGlobals
static bool getFolderHasSubs( const TQDomNode &folderNode );
- static KIO::Job *createListFoldersJob( const KURL &url );
- static KIO::TransferJob *createListItemsJob( const KURL &url );
- static KIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
+ static TDEIO::Job *createListFoldersJob( const KURL &url );
+ static TDEIO::TransferJob *createListItemsJob( const KURL &url );
+ static TDEIO::TransferJob *createDownloadJob( KPIM::GroupwareDataAdaptor *adaptor,
const KURL &url, KPIM::FolderLister::ContentType ctype );
- static KIO::Job *createRemoveJob( const KURL &uploadurl,
+ static TDEIO::Job *createRemoveJob( const KURL &uploadurl,
const KPIM::GroupwareUploadItem::List &deletedItems );
static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
- KIO::Job *job, const TQString &jobData );
+ TDEIO::Job *job, const TQString &jobData );
static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const TQString &jobData );
+ TDEIO::Job *job, const TQString &jobData );
static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
- KIO::Job *job, const TQString &jobData );
+ TDEIO::Job *job, const TQString &jobData );
};
#endif
diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp
index db773f2f4..8c3ca2d1b 100644
--- a/kresources/newexchange/kabc_resourceexchange.cpp
+++ b/kresources/newexchange/kabc_resourceexchange.cpp
@@ -30,7 +30,7 @@
using namespace KABC;
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
: ResourceGroupwareBase( config )
{
init();
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 2afad9da6..941f91792 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -31,7 +31,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
public:
- ResourceExchange( const KConfig * );
+ ResourceExchange( const TDEConfig * );
/* ResourceExchange( const KURL &url,
const TQString &user, const TQString &password );*/
protected:
diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp
index 953e30c31..eff1fa6ba 100644
--- a/kresources/newexchange/kcal_resourceexchange.cpp
+++ b/kresources/newexchange/kcal_resourceexchange.cpp
@@ -35,7 +35,7 @@ ResourceExchange::ResourceExchange()
init();
}
-ResourceExchange::ResourceExchange( const KConfig *config )
+ResourceExchange::ResourceExchange( const TDEConfig *config )
: ResourceGroupwareBase( config )
{
init();
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index ded903a23..823ed9a72 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
public:
ResourceExchange();
- ResourceExchange( const KConfig * );
+ ResourceExchange( const TDEConfig * );
protected:
void init();