diff options
Diffstat (limited to 'tderesources/newexchange')
10 files changed, 27 insertions, 27 deletions
diff --git a/tderesources/newexchange/Person.mapping b/tderesources/newexchange/Person.mapping index d7571e773..ac0f0b3a1 100644 --- a/tderesources/newexchange/Person.mapping +++ b/tderesources/newexchange/Person.mapping @@ -140,7 +140,7 @@ http://schemas.microsoft.com/mapi/id/{00062004-0000-0000-C000-000000000046}/0x00 -KABC::Addressee method not used: +TDEABC::Addressee method not used: logo() photo() sound() @@ -150,7 +150,7 @@ productId() mailer() -KABC::Address methods not used: +TDEABC::Address methods not used: id() type() extended () diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp index 1abaacd4d..7b061e868 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp +++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <tdeio/davjob.h> -using namespace KABC; +using namespace TDEABC; -ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type ) +ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, TDEABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type ) : GroupwareUploadItem( type ) { if ( adaptor && !addr.isEmpty() ) { @@ -88,7 +88,7 @@ TQString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadIt } -KPIM::GroupwareUploadItem *ExchangeAddressBookAdaptor::newUploadItem( KABC::Addressee addr, +KPIM::GroupwareUploadItem *ExchangeAddressBookAdaptor::newUploadItem( TDEABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type ) { return new ExchangeAddressBookUploadItem( this, addr, type ); diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h index fd89fa84d..8713b2790 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.h +++ b/tderesources/newexchange/exchangeaddressbookadaptor.h @@ -33,12 +33,12 @@ #include <kurl.h> #include <tqdom.h> -namespace KABC { +namespace TDEABC { class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem { public: - ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, UploadType type ); + ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, TDEABC::Addressee addr, UploadType type ); virtual ~ExchangeAddressBookUploadItem() {} /**/ virtual TDEIO::TransferJob *createUploadJob( KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl ); @@ -85,7 +85,7 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor -/**/ KPIM::GroupwareUploadItem *newUploadItem( KABC::Addressee addr, +/**/ KPIM::GroupwareUploadItem *newUploadItem( TDEABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type ); diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index e8de19cb8..dae145677 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> -using namespace KABC; +using namespace TDEABC; ExchangeConverterContact::ExchangeConverterContact() { @@ -296,17 +296,17 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse // 0 None, 1 Personal, 2 Private, 3 Company Confidential if ( WebdavHandler::extractLong( node, "sensitivity", tmplng ) ) { switch( tmplng ) { - case 0: addressee.setSecrecy( KABC::Secrecy::Public ); break; + case 0: addressee.setSecrecy( TDEABC::Secrecy::Public ); break; case 1: - case 2: addressee.setSecrecy( KABC::Secrecy::Private ); break; - case 3: addressee.setSecrecy( KABC::Secrecy::Confidential ); break; + case 2: addressee.setSecrecy( TDEABC::Secrecy::Private ); break; + case 3: addressee.setSecrecy( TDEABC::Secrecy::Confidential ); break; default: kdWarning() << "Unknown sensitivity: " << tmplng << endl; } } #define insertPhone( name, type ) \ if ( WebdavHandler::extractString( node, name, tmpstr ) ) \ - addressee.insertPhoneNumber( KABC::PhoneNumber( tmpstr, type ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( tmpstr, type ) ); // Phone numbers insertPhone( "telephoneNumber", PhoneNumber::Work ); //insertPhone( "telephonenumber2", PhoneNumber::Work ); @@ -499,8 +499,8 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr ) // 0 None, 1 Personal, 2 Private, 3 Company Confidential TQString value; switch ( addr.secrecy().type() ) { - case KABC::Secrecy::Private: value = "2"; break; - case KABC::Secrecy::Confidential: value = "3"; break; + case TDEABC::Secrecy::Private: value = "2"; break; + case TDEABC::Secrecy::Confidential: value = "3"; break; default: value = "0"; } domDavProperty( "sensitivity", value ); @@ -599,7 +599,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr ) // ? TODO: timeZone() /* - KABC::Geo geo = addr.geo(); + TDEABC::Geo geo = addr.geo(); if ( geo.isValid() ) { // TODO: Do we need to set any other attribute to make it a float? TQDomAttr att_cal = doc.createAttribute( "xmlns:cal" ); diff --git a/tderesources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h index 847b07676..4960284e8 100644 --- a/tderesources/newexchange/exchangeconvertercontact.h +++ b/tderesources/newexchange/exchangeconvertercontact.h @@ -26,7 +26,7 @@ #include <tdeabc/addressee.h> -namespace KABC { +namespace TDEABC { class ExchangeConverterContact { diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp index dc74650c5..313b04f57 100644 --- a/tderesources/newexchange/exchangeglobals.cpp +++ b/tderesources/newexchange/exchangeglobals.cpp @@ -148,7 +148,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", " KCal::ExchangeConverterCalendar::createRequestJournal( doc, prop ); break; case KPIM::FolderLister::Contact: - KABC::ExchangeConverterContact::createRequest( doc, prop ); + TDEABC::ExchangeConverterContact::createRequest( doc, prop ); break; default: break; @@ -261,18 +261,18 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen bool ExchangeGlobals::interpretAddressBookDownloadItemsJob( - KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ ) + TDEABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ ) { TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job); if ( !davjob || !adaptor ) return false; kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument=" << endl << davjob->response().toString() << endl; - KABC::ExchangeConverterContact conv; - KABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() ); + TDEABC::ExchangeConverterContact conv; + TDEABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() ); bool res = false; - KABC::Addressee::List::Iterator it = addressees.begin(); + TDEABC::Addressee::List::Iterator it = addressees.begin(); for ( ; it != addressees.end(); ++it ) { TQString fpr = (*it).custom( "TDEPIM-Exchange-Resource", "fingerprint" ); KURL href( (*it).custom( "TDEPIM-Exchange-Resource", "href" ) ); diff --git a/tderesources/newexchange/exchangeglobals.h b/tderesources/newexchange/exchangeglobals.h index 5d75bc42b..2fa69ffb7 100644 --- a/tderesources/newexchange/exchangeglobals.h +++ b/tderesources/newexchange/exchangeglobals.h @@ -34,7 +34,7 @@ namespace KPIM { class GroupwareDataAdaptor; class GroupwareUploadItem; } -namespace KABC { +namespace TDEABC { class AddressBookAdaptor; } namespace KCal { @@ -63,7 +63,7 @@ class ExchangeGlobals TDEIO::Job *job, const TQString &jobData ); static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData ); - static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor, + static bool interpretAddressBookDownloadItemsJob( TDEABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData ); }; diff --git a/tderesources/newexchange/tdeabc_resourceexchange.cpp b/tderesources/newexchange/tdeabc_resourceexchange.cpp index 63f46f503..2b495b44f 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.cpp +++ b/tderesources/newexchange/tdeabc_resourceexchange.cpp @@ -28,7 +28,7 @@ #include <tdelocale.h> -using namespace KABC; +using namespace TDEABC; ResourceExchange::ResourceExchange( const TDEConfig *config ) : ResourceGroupwareBase( config ) diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index db5cc7b55..732ed981c 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -23,7 +23,7 @@ #include <tdeabc_resourcegroupwarebase.h> -namespace KABC { +namespace TDEABC { class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase { diff --git a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp index 4f081a311..7fe3a8b9f 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp +++ b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp @@ -21,7 +21,7 @@ #include "tdeabc_resourceexchange.h" #include "tdeabc_resourcegroupwarebaseconfig.h" -using namespace KABC; +using namespace TDEABC; typedef KRES::PluginFactory<ResourceExchange,ResourceGroupwareBaseConfig> ExchangeFactory; K_EXPORT_COMPONENT_FACTORY( tdeabc_newexchange, ExchangeFactory ) |