From 94273bcb909fac42ef9427e3d8a614cab8c29c66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:27:27 -0600 Subject: Rename KABC namespace --- libkcal/calendarresources.cpp | 2 +- libkcal/htmlexport.cpp | 6 +++--- libkcal/incidenceformatter.cpp | 42 +++++++++++++++++++++--------------------- libkcal/person.cpp | 2 +- libkcal/resourcecalendar.h | 2 +- libkcal/resourcelocal.cpp | 6 +++--- libkcal/resourcelocal.h | 4 ++-- libkcal/resourcelocaldir.cpp | 4 ++-- libkcal/resourcelocaldir.h | 4 ++-- 9 files changed, 36 insertions(+), 36 deletions(-) (limited to 'libkcal') diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index b7d73dec1..bfc493ba4 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -827,7 +827,7 @@ CalendarResources::Ticket { kdDebug(5800) << "CalendarResources::requestSaveTicket()" << endl; - KABC::Lock *lock = resource->lock(); + TDEABC::Lock *lock = resource->lock(); if ( !lock ) return 0; if ( lock->lock() ) diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 2b538574a..24aa925c4 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -557,10 +557,10 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event ) if (attendees.count()) { *ts << ""; #ifndef KORG_NOKABC - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList; + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList; addressList = add_book->findByEmail(event->organizer().email()); - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if (!o.isEmpty() && addressList.size()<2) { *ts << "organizer().email() << "\">"; *ts << cleanChars(o.formattedName()) << "\n"; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 1455a24a0..f8f6fa7c7 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -183,10 +183,10 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS // Make the search, if there is an email address to search on, // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { if ( name.isEmpty() ) { // No name set, so use the one from the addressbook @@ -1134,10 +1134,10 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString // Make the search, if there is an email address to search on, // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { if ( name.isEmpty() ) { // No name set, so use the one from the addressbook @@ -2832,8 +2832,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) KTNEFParser parser; TQBuffer buf( tnef ); CalendarLocal cal ( TQString::fromLatin1( "UTC" ) ); - KABC::Addressee addressee; - KABC::VCardConverter cardConv; + TDEABC::Addressee addressee; + TDEABC::VCardConverter cardConv; ICalFormat calFormat; Event* event = new Event(); @@ -3069,14 +3069,14 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) vPart += stringProp(tnefMsg, "\n","NOTE", ... , "" ); */ - KABC::Address adr; + TDEABC::Address adr; adr.setPostOfficeBox( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_PO_BOX ) ); adr.setStreet( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_STREET ) ); adr.setLocality( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_CITY ) ); adr.setRegion( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_STATE_OR_PROVINCE ) ); adr.setPostalCode( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_POSTAL_CODE ) ); adr.setCountry( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_COUNTRY ) ); - adr.setType(KABC::Address::Home); + adr.setType(TDEABC::Address::Home); addressee.insertAddress(adr); adr.setPostOfficeBox( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSPOBOX ) ); @@ -3085,7 +3085,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) adr.setRegion( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSSTATE ) ); adr.setPostalCode( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSPOSTALCODE ) ); adr.setCountry( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSCOUNTRY ) ); - adr.setType( KABC::Address::Work ); + adr.setType( TDEABC::Address::Work ); addressee.insertAddress( adr ); adr.setPostOfficeBox( stringProp( tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_PO_BOX ) ); @@ -3094,7 +3094,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) adr.setRegion( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_STATE_OR_PROVINCE ) ); adr.setPostalCode( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_POSTAL_CODE ) ); adr.setCountry( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_COUNTRY ) ); - adr.setType( KABC::Address::Dom ); + adr.setType( TDEABC::Address::Dom ); addressee.insertAddress(adr); // problem: the 'other' address was stored by KOrganizer in @@ -3103,15 +3103,15 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) TQString nr; nr = stringProp( tnefMsg, MAPI_TAG_PR_HOME_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Home ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Home ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_BUSINESS_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Work ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Work ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_MOBILE_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Cell ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Cell ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_HOME_FAX_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Home ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_BUSINESS_FAX_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Work ) ); s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY ) .replace( TQChar( '-' ), TQString() ) @@ -3133,7 +3133,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) return iCal; // Not an iCal - try a vCard - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.createVCard( addressee ); } @@ -3360,10 +3360,10 @@ static TQString tooltipPerson( const TQString& email, TQString name ) // Make the search, if there is an email address to search on, // and name is missing if ( name.isEmpty() && !email.isEmpty() ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { // use the name from the addressbook name = o.formattedName(); diff --git a/libkcal/person.cpp b/libkcal/person.cpp index d56233bb8..2ef0f7431 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -61,7 +61,7 @@ TQString Person::fullName() const if( mEmail.isEmpty() ) return mName; else { - // Taken from KABC::Addressee::fullEmail + // Taken from TDEABC::Addressee::fullEmail TQString name = mName; TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ); bool weNeedToQuote = name.find( needQuotes ) != -1; diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 80f37f821..f33b7da44 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -138,7 +138,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource /** Return object for locking the resource. */ - virtual KABC::Lock *lock() = 0; + virtual TDEABC::Lock *lock() = 0; /** Add incidence to resource. diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index aee2ba988..a193b0b78 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -118,7 +118,7 @@ void ResourceLocal::init() connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), TQT_SLOT( reload() ) ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addFile( mURL.path() ); mDirWatch.startScan(); @@ -166,7 +166,7 @@ bool ResourceLocal::doSave() return success; } -KABC::Lock *ResourceLocal::lock() +TDEABC::Lock *ResourceLocal::lock() { return mLock; } @@ -213,7 +213,7 @@ bool ResourceLocal::setFileName( const TQString &fileName ) mDirWatch.stopScan(); mDirWatch.removeFile( mURL.path() ); mURL = KURL( fileName ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addFile( mURL.path() ); mDirWatch.startScan(); return true; diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index a2b6818b9..d13ed2d81 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -62,7 +62,7 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached virtual void writeConfig( TDEConfig* config ); - KABC::Lock *lock(); + TDEABC::Lock *lock(); TQString fileName() const; bool setFileName( const TQString &fileName ); @@ -94,7 +94,7 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached KDirWatch mDirWatch; - KABC::Lock *mLock; + TDEABC::Lock *mLock; class Private; Private *d; diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index f51457351..33fa42f73 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -99,7 +99,7 @@ void ResourceLocalDir::init() connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), TQT_SLOT( reload( const TQString & ) ) ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addDir( mURL.path(), true ); mDirWatch.startScan(); @@ -212,7 +212,7 @@ bool ResourceLocalDir::doSave( Incidence *incidence ) return ret; } -KABC::Lock *ResourceLocalDir::lock() +TDEABC::Lock *ResourceLocalDir::lock() { return mLock; } diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index 0adbf1cb6..6826da6b4 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -57,7 +57,7 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached void readConfig( const TDEConfig *config ); void writeConfig( TDEConfig* config ); - KABC::Lock *lock(); + TDEABC::Lock *lock(); /** deletes an event from this calendar. */ bool deleteEvent(Event *); @@ -93,7 +93,7 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached KDirWatch mDirWatch; - KABC::Lock *mLock; + TDEABC::Lock *mLock; TQPtrListmDeletedIncidences; class Private; -- cgit v1.2.1