| -rw-r--r-- | kabc/addresseedialog.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 19b52bb..e89584d 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -37,20 +37,17 @@ //#include "addresseedialog.moc" using namespace KABC; AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) : QListViewItem( parent ), mAddressee( addressee ) { - QString name = addressee.familyName()+", "+ addressee.givenName(); - if ( name.length() == 2 ) - name = addressee.organization(); - setText( Name,name); + setText( Name,addressee.realName()); setText( Email, addressee.preferredEmail() ); } QString AddresseeItem::key( int column, bool ) const { if (column == Email) { QString value = text(Email); @@ -160,19 +157,17 @@ void AddresseeDialog::loadAddressBook() re.setWildcard(true); // most people understand these better. re.setCaseSensitive(false); re.setPattern( "*"+ mAddresseeEdit->text() + "*"); AddressBook::Iterator it; for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) continue; - QString name = (*it).familyName()+", "+ (*it).givenName(); - if ( name.length() == 2 ) - name = (*it).realName(); + QString name = (*it).realName(); name += (*it).preferredEmail(); #if QT_VERSION >= 0x030000 if (re.search(name) != -1) #else if (re.match(name) != -1) #endif AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); } |