From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/distributionlist.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libkdepim/distributionlist.cpp') diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp index 2ccdeb525..6d96b2358 100644 --- a/libkdepim/distributionlist.cpp +++ b/libkdepim/distributionlist.cpp @@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e TQString str = custom( "KADDRESSBOOK", s_customFieldName ); // Assumption: UIDs don't contain ; nor , str += ";" + uid + "," + email; - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email ) @@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e } if ( str.isEmpty() ) str = ";"; // keep something, for isDistributionList to work - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr ) @@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo return DistributionList(); } -static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) +static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) { - KABC::Addressee a = book->findByUid( uidOrName ); + KABC::Addressee a = book->tqfindByUid( uidOrName ); if ( a.isEmpty() ) { // UID not found, maybe it is a name instead. // If we have an email, let's use that for the lookup. // [This is used by e.g. the Kolab resource] if ( !email.isEmpty() ) { - KABC::Addressee::List lst = book->findByEmail( email ); + KABC::Addressee::List lst = book->tqfindByEmail( email ); KABC::Addressee::List::ConstIterator listit = lst.begin(); for ( ; listit != lst.end(); ++listit ) if ( (*listit).formattedName() == uidOrName ) { @@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre const TQString uid = (*it).first; const TQString email = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, uid, email ); + KABC::Addressee a = tqfindByUidOrName( book, uid, email ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... kdWarning() << "Addressee not found: " << uid << endl; @@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const const TQString thisEmail = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); + KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... continue; -- cgit v1.2.1