summaryrefslogtreecommitdiffstats
path: root/libkdepim/distributionlist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkdepim/distributionlist.cpp')
-rw-r--r--libkdepim/distributionlist.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp
index 6d96b2358..97b11bcf8 100644
--- a/libkdepim/distributionlist.cpp
+++ b/libkdepim/distributionlist.cpp
@@ -28,7 +28,7 @@ void KPIM::DistributionList::setName( const TQString &name )
// Helper function, to parse the contents of the custom field
// Returns a list of { uid, email }
-typedef TQValueList<QPair<TQString, TQString> > ParseList;
+typedef TQValueList<TQPair<TQString, TQString> > ParseList;
static ParseList parseCustom( const TQString& str )
{
ParseList res;
@@ -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 ); // tqreplace old value
+ insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace 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 ); // tqreplace old value
+ insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace 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 tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
+static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
{
- KABC::Addressee a = book->tqfindByUid( uidOrName );
+ KABC::Addressee a = book->findByUid( 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->tqfindByEmail( email );
+ KABC::Addressee::List lst = book->findByEmail( 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 = tqfindByUidOrName( book, uid, email );
+ KABC::Addressee a = findByUidOrName( 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 = tqfindByUidOrName( book, thisUid, thisEmail );
+ KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail );
if ( a.isEmpty() ) {
// ## The old DistributionListManager had a "missing entries" list...
continue;