4 files changed, 99 insertions, 48 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3ce733d..568dfc4 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -662,1476 +662,1478 @@ QString Addressee::uid() const
 QString Addressee::uidLabel()
 {
   return i18n("Unique Identifier");
 }
 
 void Addressee::setName( const QString &name )
 {
   if ( name == mData->name ) return;
   detach();
   mData->empty = false;
   mData->name = name;
 }
 
 QString Addressee::name() const
 {
   return mData->name;
 }
 
 QString Addressee::nameLabel()
 {
   return i18n("Name");
 }
 
 
 void Addressee::setFormattedName( const QString &formattedName )
 {
   if ( formattedName == mData->formattedName ) return;
   detach();
   mData->empty = false;
   mData->formattedName = formattedName;
 }
 
 QString Addressee::formattedName() const
 {
   return mData->formattedName;
 }
 
 QString Addressee::formattedNameLabel()
 {
   return i18n("Formatted Name");
 }
 
 
 void Addressee::setFamilyName( const QString &familyName )
 {
   if ( familyName == mData->familyName ) return;
   detach();
   mData->empty = false;
   mData->familyName = familyName;
 }
 
 QString Addressee::familyName() const
 {
   return mData->familyName;
 }
 
 QString Addressee::familyNameLabel()
 {
   return i18n("Family Name");
 }
 
 
 void Addressee::setGivenName( const QString &givenName )
 {
   if ( givenName == mData->givenName ) return;
   detach();
   mData->empty = false;
   mData->givenName = givenName;
 }
 
 QString Addressee::givenName() const
 {
   return mData->givenName;
 }
 
 QString Addressee::givenNameLabel()
 {
   return i18n("Given Name");
 }
 
 
 void Addressee::setAdditionalName( const QString &additionalName )
 {
   if ( additionalName == mData->additionalName ) return;
   detach();
   mData->empty = false;
   mData->additionalName = additionalName;
 }
 
 QString Addressee::additionalName() const
 {
   return mData->additionalName;
 }
 
 QString Addressee::additionalNameLabel()
 {
   return i18n("Additional Names");
 }
 
 
 void Addressee::setPrefix( const QString &prefix )
 {
   if ( prefix == mData->prefix ) return;
   detach();
   mData->empty = false;
   mData->prefix = prefix;
 }
 
 QString Addressee::prefix() const
 {
   return mData->prefix;
 }
 
 QString Addressee::prefixLabel()
 {
   return i18n("Honorific Prefixes");
 }
 
 
 void Addressee::setSuffix( const QString &suffix )
 {
   if ( suffix == mData->suffix ) return;
   detach();
   mData->empty = false;
   mData->suffix = suffix;
 }
 
 QString Addressee::suffix() const
 {
   return mData->suffix;
 }
 
 QString Addressee::suffixLabel()
 {
   return i18n("Honorific Suffixes");
 }
 
 
 void Addressee::setNickName( const QString &nickName )
 {
   if ( nickName == mData->nickName ) return;
   detach();
   mData->empty = false;
   mData->nickName = nickName;
 }
 
 QString Addressee::nickName() const
 {
   return mData->nickName;
 }
 
 QString Addressee::nickNameLabel()
 {
   return i18n("Nick Name");
 }
 
 
 void Addressee::setBirthday( const QDateTime &birthday )
 {
   if ( birthday == mData->birthday ) return;
   detach();
   mData->empty = false;
   mData->birthday = birthday;
 }
 
 QDateTime Addressee::birthday() const
 {
   return mData->birthday;
 }
 
 QString Addressee::birthdayLabel()
 {
   return i18n("Birthday");
 }
 
 
 QString Addressee::homeAddressStreetLabel()
 {
   return i18n("Home Address Street");
 }
 
 
 QString Addressee::homeAddressLocalityLabel()
 {
   return i18n("Home Address Locality");
 }
 
 
 QString Addressee::homeAddressRegionLabel()
 {
   return i18n("Home Address Region");
 }
 
 
 QString Addressee::homeAddressPostalCodeLabel()
 {
   return i18n("Home Address Postal Code");
 }
 
 
 QString Addressee::homeAddressCountryLabel()
 {
   return i18n("Home Address Country");
 }
 
 
 QString Addressee::homeAddressLabelLabel()
 {
   return i18n("Home Address Label");
 }
 
 
 QString Addressee::businessAddressStreetLabel()
 {
   return i18n("Business Address Street");
 }
 
 
 QString Addressee::businessAddressLocalityLabel()
 {
   return i18n("Business Address Locality");
 }
 
 
 QString Addressee::businessAddressRegionLabel()
 {
   return i18n("Business Address Region");
 }
 
 
 QString Addressee::businessAddressPostalCodeLabel()
 {
   return i18n("Business Address Postal Code");
 }
 
 
 QString Addressee::businessAddressCountryLabel()
 {
   return i18n("Business Address Country");
 }
 
 
 QString Addressee::businessAddressLabelLabel()
 {
   return i18n("Business Address Label");
 }
 
 
 QString Addressee::homePhoneLabel()
 {
   return i18n("Home Phone");
 }
 
 
 QString Addressee::businessPhoneLabel()
 {
   return i18n("Business Phone");
 }
 
 
 QString Addressee::mobilePhoneLabel()
 {
   return i18n("Mobile Phone");
 }
 
 
 QString Addressee::homeFaxLabel()
 {
   return i18n("Home Fax");
 }
 
 
 QString Addressee::businessFaxLabel()
 {
   return i18n("Business Fax");
 }
 
 
 QString Addressee::carPhoneLabel()
 {
   return i18n("Car Phone");
 }
 
 
 QString Addressee::isdnLabel()
 {
   return i18n("ISDN");
 }
 
 
 QString Addressee::pagerLabel()
 {
   return i18n("Pager");
 }
 
 QString Addressee::sipLabel()
 {
   return i18n("SIP");
 }
 
 QString Addressee::emailLabel()
 {
   return i18n("Email Address");
 }
 
 
 void Addressee::setMailer( const QString &mailer )
 {
   if ( mailer == mData->mailer ) return;
   detach();
   mData->empty = false;
   mData->mailer = mailer;
 }
 
 QString Addressee::mailer() const
 {
   return mData->mailer;
 }
 
 QString Addressee::mailerLabel()
 {
   return i18n("Mail Client");
 }
 
 
 void Addressee::setTimeZone( const TimeZone &timeZone )
 {
   if ( timeZone == mData->timeZone ) return;
   detach();
   mData->empty = false;
   mData->timeZone = timeZone;
 }
 
 TimeZone Addressee::timeZone() const
 {
   return mData->timeZone;
 }
 
 QString Addressee::timeZoneLabel()
 {
   return i18n("Time Zone");
 }
 
 
 void Addressee::setGeo( const Geo &geo )
 {
   if ( geo == mData->geo ) return;
   detach();
   mData->empty = false;
   mData->geo = geo;
 }
 
 Geo Addressee::geo() const
 {
   return mData->geo;
 }
 
 QString Addressee::geoLabel()
 {
   return i18n("Geographic Position");
 }
 
 
 void Addressee::setTitle( const QString &title )
 {
   if ( title == mData->title ) return;
   detach();
   mData->empty = false;
   mData->title = title;
 }
 
 QString Addressee::title() const
 {
   return mData->title;
 }
 
 QString Addressee::titleLabel()
 {
   return i18n("Title");
 }
 
 
 void Addressee::setRole( const QString &role )
 {
   if ( role == mData->role ) return;
   detach();
   mData->empty = false;
   mData->role = role;
 }
 
 QString Addressee::role() const
 {
   return mData->role;
 }
 
 QString Addressee::roleLabel()
 {
   return i18n("Role");
 }
 
 
 void Addressee::setOrganization( const QString &organization )
 {
   if ( organization == mData->organization ) return;
   detach();
   mData->empty = false;
   mData->organization = organization;
 }
 
 QString Addressee::organization() const
 {
   return mData->organization;
 }
 
 QString Addressee::organizationLabel()
 {
   return i18n("Organization");
 }
 
 
 void Addressee::setNote( const QString &note )
 {
   if ( note == mData->note ) return;
   detach();
   mData->empty = false;
   mData->note = note;
 }
 
 QString Addressee::note() const
 {
   return mData->note;
 }
 
 QString Addressee::noteLabel()
 {
   return i18n("Note");
 }
 
 
 void Addressee::setProductId( const QString &productId )
 {
   if ( productId == mData->productId ) return;
   detach();
   mData->empty = false;
   mData->productId = productId;
 }
 
 QString Addressee::productId() const
 {
   return mData->productId;
 }
 
 QString Addressee::productIdLabel()
 {
   return i18n("Product Identifier");
 }
 
 
 void Addressee::setRevision( const QDateTime &revision )
 {
   if ( revision == mData->revision ) return;
   detach();
   mData->empty = false;
   mData->revision = QDateTime( revision.date(),
                                QTime (revision.time().hour(),
                                       revision.time().minute(),
                                       revision.time().second()));
 }
 
 QDateTime Addressee::revision() const
 {
   return mData->revision;
 }
 
 QString Addressee::revisionLabel()
 {
   return i18n("Revision Date");
 }
 
 
 void Addressee::setSortString( const QString &sortString )
 {
   if ( sortString == mData->sortString ) return;
   detach();
   mData->empty = false;
   mData->sortString = sortString;
 }
 
 QString Addressee::sortString() const
 {
   return mData->sortString;
 }
 
 QString Addressee::sortStringLabel()
 {
   return i18n("Sort String");
 }
 
 
 void Addressee::setUrl( const KURL &url )
 {
   if ( url == mData->url ) return;
   detach();
   mData->empty = false;
   mData->url = url;
 }
 
 KURL Addressee::url() const
 {
   return mData->url;
 }
 
 QString Addressee::urlLabel()
 {
   return i18n("URL");
 }
 
 
 void Addressee::setSecrecy( const Secrecy &secrecy )
 {
   if ( secrecy == mData->secrecy ) return;
   detach();
   mData->empty = false;
   mData->secrecy = secrecy;
 }
 
 Secrecy Addressee::secrecy() const
 {
   return mData->secrecy;
 }
 
 QString Addressee::secrecyLabel()
 {
   return i18n("Security Class");
 }
 
 
 void Addressee::setLogo( const Picture &logo )
 {
   if ( logo == mData->logo ) return;
   detach();
   mData->empty = false;
   mData->logo = logo;
 }
 
 Picture Addressee::logo() const
 {
   return mData->logo;
 }
 
 QString Addressee::logoLabel()
 {
   return i18n("Logo");
 }
 
 
 void Addressee::setPhoto( const Picture &photo )
 {
   if ( photo == mData->photo ) return;
   detach();
   mData->empty = false;
   mData->photo = photo;
 }
 
 Picture Addressee::photo() const
 {
   return mData->photo;
 }
 
 QString Addressee::photoLabel()
 {
   return i18n("Photo");
 }
 
 
 void Addressee::setSound( const Sound &sound )
 {
   if ( sound == mData->sound ) return;
   detach();
   mData->empty = false;
   mData->sound = sound;
 }
 
 Sound Addressee::sound() const
 {
   return mData->sound;
 }
 
 QString Addressee::soundLabel()
 {
   return i18n("Sound");
 }
 
 
 void Addressee::setAgent( const Agent &agent )
 {
   if ( agent == mData->agent ) return;
   detach();
   mData->empty = false;
   mData->agent = agent;
 }
 
 Agent Addressee::agent() const
 {
   return mData->agent;
 }
 
 QString Addressee::agentLabel()
 {
   return i18n("Agent");
 }
 
 
 
 void Addressee::setNameFromString( const QString &str )
 {
   setFormattedName( str );
   setName( str );
 
   static bool first = true;
   static QStringList titles;
   static QStringList suffixes;
   static QStringList prefixes;
 
   if ( first ) {
       first = false;
       titles += i18n( "Dr." );
       titles += i18n( "Miss" );
       titles += i18n( "Mr." );
       titles += i18n( "Mrs." );
       titles += i18n( "Ms." );
       titles += i18n( "Prof." );
 
       suffixes += i18n( "I" );
       suffixes += i18n( "II" );
       suffixes += i18n( "III" );
       suffixes += i18n( "Jr." );
       suffixes += i18n( "Sr." );
 
       prefixes += "van";
       prefixes += "von";
       prefixes += "de";
 
       KConfig config( locateLocal( "config", "kabcrc") );
       config.setGroup( "General" );
       titles += config.readListEntry( "Prefixes" );
       titles.remove( "" );
       prefixes += config.readListEntry( "Inclusions" );
       prefixes.remove( "" );
       suffixes += config.readListEntry( "Suffixes" );
       suffixes.remove( "" );
   }
 
   // clear all name parts
   setPrefix( "" );
   setGivenName( "" );
   setAdditionalName( "" );
   setFamilyName( "" );
   setSuffix( "" );
 
   if ( str.isEmpty() )
     return;
 
   int i = str.find(',');
   if( i < 0 ) {
     QStringList parts = QStringList::split( " ", str );
     int leftOffset = 0;
     int rightOffset = parts.count() - 1;
 
     QString suffix;
     while ( rightOffset >= 0 ) {
       if ( suffixes.contains( parts[ rightOffset ] ) ) {
         suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
         rightOffset--;
       } else
         break;
     }
     setSuffix( suffix );
 
     if ( rightOffset < 0 )
       return;
 
     if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
       setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
       rightOffset--;
     } else
       setFamilyName( parts[ rightOffset ] );
 
     QString prefix;
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
     setPrefix( prefix );
 
     if ( leftOffset < rightOffset ) {
       setGivenName( parts[ leftOffset ] );
       leftOffset++;
     }
 
     QString additionalName;
     while ( leftOffset < rightOffset ) {
       additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
       leftOffset++;
     }
     setAdditionalName( additionalName );
   } else {
     QString part1 = str.left( i );
     QString part2 = str.mid( i + 1 );
 
     QStringList parts = QStringList::split( " ", part1 );
     int leftOffset = 0;
     int rightOffset = parts.count() - 1;
 
     QString suffix;
     while ( rightOffset >= 0 ) {
       if ( suffixes.contains( parts[ rightOffset ] ) ) {
         suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
         rightOffset--;
       } else
         break;
     }
     setSuffix( suffix );
 
     if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
       setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
       rightOffset--;
     } else
       setFamilyName( parts[ rightOffset ] );
 
     QString prefix;
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
 
     parts = QStringList::split( " ", part2 );
 
     leftOffset = 0;
     rightOffset = parts.count();
 
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
     setPrefix( prefix );
 
     if ( leftOffset < rightOffset ) {
       setGivenName( parts[ leftOffset ] );
       leftOffset++;
     }
 
     QString additionalName;
     while ( leftOffset < rightOffset ) {
       additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
       leftOffset++;
     }
     setAdditionalName( additionalName );
   }
 }
 
 QString Addressee::realName() const
 {
   if ( !formattedName().isEmpty() )
     return formattedName();
 
   QString n = assembledName();
 
   if ( n.isEmpty() )
     n = name();
 
   return n;
 }
 
 QString Addressee::assembledName() const
 {
   QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
               familyName() + " " + suffix();
 
   return name.simplifyWhiteSpace();
 }
 
 QString Addressee::fullEmail( const QString &email ) const
 {
   QString e;
   if ( email.isNull() ) {
     e = preferredEmail();
   } else {
     e = email;
   }
   if ( e.isEmpty() ) return QString::null;
 
   QString text;
   if ( realName().isEmpty() )
     text = e;
   else
     text = assembledName() + " <" + e + ">";
 
   return text;
 }
 
 void Addressee::insertEmail( const QString &email, bool preferred )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
 
   if ( it != mData->emails.end() ) {
     if ( !preferred || it == mData->emails.begin() ) return;
     mData->emails.remove( it );
     mData->emails.prepend( email );
   } else {
     if ( preferred ) {
       mData->emails.prepend( email );
     } else {
       mData->emails.append( email );
     }
   }
 }
 
 void Addressee::removeEmail( const QString &email )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
   if ( it == mData->emails.end() ) return;
 
   mData->emails.remove( it );
 }
 
 QString Addressee::preferredEmail() const
 {
   if ( mData->emails.count() == 0 ) return QString::null;
   else return mData->emails.first();
 }
 
 QStringList Addressee::emails() const
 {
   return mData->emails;
 }
 void Addressee::setEmails( const QStringList& emails ) {
     detach();
     mData->emails = emails;
 }
 void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
   mData->empty = false;
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       *it = phoneNumber;
       return;
     }
   }
   mData->phoneNumbers.append( phoneNumber );
 }
 
 void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       mData->phoneNumbers.remove( it );
       return;
     }
   }
 }
 
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
   PhoneNumber phoneNumber( "", type );
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPatternP( (*it).type(), type ) ) {
       if ( (*it).type() & PhoneNumber::Pref )
         return (*it);
       else if ( phoneNumber.number().isEmpty() )
         phoneNumber = (*it);
     }
   }
 
   return phoneNumber;
 }
 
 PhoneNumber::List Addressee::phoneNumbers() const
 {
   return mData->phoneNumbers;
 }
 
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
   PhoneNumber::List list;
 
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
   return list;
 }
 
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return PhoneNumber();
 }
 
 void Addressee::insertKey( const Key &key )
 {
   detach();
   mData->empty = false;
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       *it = key;
       return;
     }
   }
   mData->keys.append( key );
 }
 
 void Addressee::removeKey( const Key &key )
 {
   detach();
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       mData->keys.remove( key );
       return;
     }
   }
 }
 
 Key Addressee::key( int type, QString customTypeString ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           return *it;
         } else {
           if ( (*it).customTypeString() == customTypeString )
             return (*it);
         }
       } else {
         return *it;
       }
     }
   }
   return Key( QString(), type );
 }
 void Addressee::setKeys( const Key::List& list ) {
     detach();
     mData->keys = list;
 }
 
 Key::List Addressee::keys() const
 {
   return mData->keys;
 }
 
 Key::List Addressee::keys( int type, QString customTypeString ) const
 {
   Key::List list;
 
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           list.append(*it);
         } else {
           if ( (*it).customTypeString() == customTypeString )
             list.append(*it);
         }
       } else {
         list.append(*it);
       }
     }
   }
   return list;
 }
 
 Key Addressee::findKey( const QString &id ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Key();
 }
 
 QString Addressee::asString() const
 {
   return "Smith, agent Smith...";
 }
 
 void Addressee::dump() const
 {
     return;
+#if 0 
   kdDebug(5700) << "Addressee {" << endl;
 
   kdDebug(5700) << "  Uid: '" << uid() << "'" << endl;
 
   kdDebug(5700) << "  Name: '" << name() << "'" << endl;
   kdDebug(5700) << "  FormattedName: '" << formattedName() << "'" << endl;
   kdDebug(5700) << "  FamilyName: '" << familyName() << "'" << endl;
   kdDebug(5700) << "  GivenName: '" << givenName() << "'" << endl;
   kdDebug(5700) << "  AdditionalName: '" << additionalName() << "'" << endl;
   kdDebug(5700) << "  Prefix: '" << prefix() << "'" << endl;
   kdDebug(5700) << "  Suffix: '" << suffix() << "'" << endl;
   kdDebug(5700) << "  NickName: '" << nickName() << "'" << endl;
   kdDebug(5700) << "  Birthday: '" << birthday().toString() << "'" << endl;
   kdDebug(5700) << "  Mailer: '" << mailer() << "'" << endl;
   kdDebug(5700) << "  TimeZone: '" << timeZone().asString() << "'" << endl;
   kdDebug(5700) << "  Geo: '" << geo().asString() << "'" << endl;
   kdDebug(5700) << "  Title: '" << title() << "'" << endl;
   kdDebug(5700) << "  Role: '" << role() << "'" << endl;
   kdDebug(5700) << "  Organization: '" << organization() << "'" << endl;
   kdDebug(5700) << "  Note: '" << note() << "'" << endl;
   kdDebug(5700) << "  ProductId: '" << productId() << "'" << endl;
   kdDebug(5700) << "  Revision: '" << revision().toString() << "'" << endl;
   kdDebug(5700) << "  SortString: '" << sortString() << "'" << endl;
   kdDebug(5700) << "  Url: '" << url().url() << "'" << endl;
   kdDebug(5700) << "  Secrecy: '" << secrecy().asString() << "'" << endl;
   kdDebug(5700) << "  Logo: '" << logo().asString() << "'" << endl;
   kdDebug(5700) << "  Photo: '" << photo().asString() << "'" << endl;
   kdDebug(5700) << "  Sound: '" << sound().asString() << "'" << endl;
   kdDebug(5700) << "  Agent: '" << agent().asString() << "'" << endl;
 
   kdDebug(5700) << "  Emails {" << endl;
   QStringList e = emails();
   QStringList::ConstIterator it;
   for( it = e.begin(); it != e.end(); ++it ) {
     kdDebug(5700) << "    " << (*it) << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "  PhoneNumbers {" << endl;
   PhoneNumber::List p = phoneNumbers();
   PhoneNumber::List::ConstIterator it2;
   for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
     kdDebug(5700) << "    Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   Address::List a = addresses();
   Address::List::ConstIterator it3;
   for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
     (*it3).dump();
   }
 
   kdDebug(5700) << "  Keys {" << endl;
   Key::List k = keys();
   Key::List::ConstIterator it4;
   for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
     kdDebug(5700) << "    Type: " << int((*it4).type()) <<
                      " Key: " << (*it4).textData() <<
                      " CustomString: " << (*it4).customTypeString() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "}" << endl;
+#endif 
 }
 
 
 void Addressee::insertAddress( const Address &address )
 {
   detach();
   mData->empty = false;
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       *it = address;
       return;
     }
   }
   mData->addresses.append( address );
 }
 
 void Addressee::removeAddress( const Address &address )
 {
   detach();
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       mData->addresses.remove( it );
       return;
     }
   }
 }
 
 Address Addressee::address( int type ) const
 {
   Address address( type );
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPatternA( (*it).type(), type ) ) {
       if ( (*it).type() & Address::Pref )
         return (*it);
       else if ( address.isEmpty() )
         address = (*it);
     }
   }
 
   return address;
 }
 
 Address::List Addressee::addresses() const
 {
   return mData->addresses;
 }
 
 Address::List Addressee::addresses( int type ) const
 {
   Address::List list;
 
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
 
   return list;
 }
 
 Address Addressee::findAddress( const QString &id ) const
 {
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Address();
 }
 
 void Addressee::insertCategory( const QString &c )
 {
   detach();
   mData->empty = false;
 
   if ( mData->categories.contains( c ) ) return;
 
   mData->categories.append( c );
 }
 
 void Addressee::removeCategory( const QString &c )
 {
   detach();
 
   QStringList::Iterator it = mData->categories.find( c );
   if ( it == mData->categories.end() ) return;
 
   mData->categories.remove( it );
 }
 
 bool Addressee::hasCategory( const QString &c ) const
 {
   return ( mData->categories.contains( c ) );
 }
 
 void Addressee::setCategories( const QStringList &c )
 {
   detach();
   mData->empty = false;
 
   mData->categories = c;
 }
 
 QStringList Addressee::categories() const
 {
   return mData->categories;
 }
 
 void Addressee::insertCustom( const QString &app, const QString &name,
                               const QString &value )
 {
   if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return;
 
   detach();
   mData->empty = false;
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       (*it) = qualifiedName + value; 
       return;
     }
   }
   mData->custom.append( qualifiedName + value );
 }
 
 void Addressee::removeCustom( const QString &app, const QString &name)
 {
   detach();
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       mData->custom.remove( it );
       return;
     }
   }
 }
 
 QString Addressee::custom( const QString &app, const QString &name ) const
 {
   QString qualifiedName = app + "-" + name + ":";
   QString value;
 
   QStringList::ConstIterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       value = (*it).mid( (*it).find( ":" ) + 1 );
       break;
     }
   }
 
   return value;
 }
 
 void Addressee::setCustoms( const QStringList &l )
 {
   detach();
   mData->empty = false;
 
   mData->custom = l;
 }
 
 QStringList Addressee::customs() const
 {
   return mData->custom;
 }
 
 void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
                                    QString &email)
 {
   int startPos, endPos, len;
   QString partA, partB, result;
   char endCh = '>';
 
   startPos = rawEmail.find('<');
   if (startPos < 0)
   {
     startPos = rawEmail.find('(');
     endCh = ')';
   }
   if (startPos < 0)
   {
     // We couldn't find any separators, so we assume the whole string
     // is the email address
     email = rawEmail;
     fullName = "";
   }
   else
   {
     // We have a start position, try to find an end
     endPos = rawEmail.find(endCh, startPos+1);
 
     if (endPos < 0)
     {
       // We couldn't find the end of the email address. We can only
       // assume the entire string is the email address.
       email = rawEmail;
       fullName = "";
     }
     else
     {
       // We have a start and end to the email address
 
       // Grab the name part
       fullName = rawEmail.left(startPos).stripWhiteSpace();
 
       // grab the email part
       email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace();
 
       // Check that we do not have any extra characters on the end of the
       // strings
       len = fullName.length();
       if (fullName[0]=='"' && fullName[len-1]=='"')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='<' && fullName[len-1]=='>')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='(' && fullName[len-1]==')')
         fullName = fullName.mid(1, len-2);
     }
   }
 }
 
 void Addressee::setResource( Resource *resource )
 {
     detach();
     mData->resource = resource;
 }
 
 Resource *Addressee::resource() const
 {
     return mData->resource;
 }
 
 //US
 QString Addressee::resourceLabel()
 {
   return i18n("Resource");
 }
 QString Addressee::categoryLabel()
 {
   return i18n("Category");
 }
 
 void Addressee::setChanged( bool value )
 {
     detach();
     mData->changed = value;
 }
 
 bool Addressee::changed() const
 {
     return mData->changed;
 }
 
 void Addressee::setTagged( bool value )
 {
     detach();
     mData->tagged = value;
 }
 
 bool Addressee::tagged() const
 {
     return mData->tagged;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
 {
   if (!a.mData) return s;
 
   s << a.uid(); 
 
   s << a.mData->name;
   s << a.mData->formattedName;
   s << a.mData->familyName;
   s << a.mData->givenName;
   s << a.mData->additionalName;
   s << a.mData->prefix;
   s << a.mData->suffix;
   s << a.mData->nickName;
   s << a.mData->birthday;
   s << a.mData->mailer;
   s << a.mData->timeZone;
   s << a.mData->geo;
   s << a.mData->title;
   s << a.mData->role;
   s << a.mData->organization;
   s << a.mData->note;
   s << a.mData->productId;
   s << a.mData->revision;
   s << a.mData->sortString;
   s << a.mData->url;
   s << a.mData->secrecy;
   s << a.mData->logo;
   s << a.mData->photo;
   s << a.mData->sound;
   s << a.mData->agent;
   s << a.mData->phoneNumbers;
   s << a.mData->addresses;
   s << a.mData->emails;
   s << a.mData->categories;
   s << a.mData->custom;
   s << a.mData->keys;
   return s;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
 {
   if (!a.mData) return s;
 
   s >> a.mData->uid;
 
   s >> a.mData->name;
   s >> a.mData->formattedName;
   s >> a.mData->familyName;
   s >> a.mData->givenName;
   s >> a.mData->additionalName;
   s >> a.mData->prefix;
   s >> a.mData->suffix;
   s >> a.mData->nickName;
   s >> a.mData->birthday;
   s >> a.mData->mailer;
   s >> a.mData->timeZone;
   s >> a.mData->geo;
   s >> a.mData->title;
   s >> a.mData->role;
   s >> a.mData->organization;
   s >> a.mData->note;
   s >> a.mData->productId;
   s >> a.mData->revision;
   s >> a.mData->sortString;
   s >> a.mData->url;
   s >> a.mData->secrecy;
   s >> a.mData->logo;
   s >> a.mData->photo;
   s >> a.mData->sound;
   s >> a.mData->agent;
   s >> a.mData->phoneNumbers;
   s >> a.mData->addresses;
   s >> a.mData->emails;
   s >> a.mData->categories;
   s >> a.mData->custom;
   s >> a.mData->keys;
 
   a.mData->empty = false;
 
   return s;
 }
 bool matchBinaryPattern( int value, int pattern )
 {
   /**
     We want to match all telephonnumbers/addresses which have the bits in the
     pattern set. More are allowed.
     if pattern == 0 we have a special handling, then we want only those with
     exactly no bit set.
    */
   if ( pattern == 0 )
     return ( value == 0 );
   else
     return ( pattern == ( pattern & value ) );
 }
 
 bool matchBinaryPatternP( int value, int pattern )
 {
   
   if ( pattern == 0 )
     return ( value == 0 );
   else
       return ( (pattern |PhoneNumber::Pref ) == ( value |PhoneNumber::Pref ) );
 }
 bool matchBinaryPatternA( int value, int pattern )
 {
  
   if ( pattern == 0 )
     return ( value == 0 );
   else
       return ( (pattern | Address::Pref) == ( value | Address::Pref ) );
 }
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 6a34b98..57aa297 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -1,141 +1,167 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "picture.h"
 
 using namespace KABC;
 
 Picture::Picture()
   : mIntern( false )
 {
   mUndefined = true;
 }
 
 Picture::Picture( const QString &url )
   : mUrl( url ), mIntern( false )
 {
   mUndefined = false;
 }
 
 Picture::Picture( const QImage &data )
   : mData( data ), mIntern( true )
 {
   mUndefined = false;
 }
 
 Picture::~Picture()
 {
 }
 
 bool Picture::operator==( const Picture &p ) const
 {
-  if ( mIntern != p.mIntern ) return false;
-
+    //qDebug("compare PIC ");
+    if ( mUndefined && p.mUndefined ) {
+        //qDebug("compare PIC true 1 ");
+        return true;
+    }
+    if ( mUndefined || p.mUndefined ) {
+        //qDebug("compare PIC false 1");
+         return false;
+    }
+    // now we should deal with two defined pics!
+    if ( mIntern != p.mIntern ) {
+        //qDebug("compare PIC false 2");
+        return false;
+    }
   if ( mIntern ) {
-    if ( mData != p.mData )
+      //qDebug("mIntern ");
+      if ( mData.isNull() && p.mData.isNull() ) {
+          //qDebug("compare PIC true 2 ");
+          return true;
+      }
+      if ( mData.isNull() || p.mData.isNull() ){
+          //qDebug("compare PIC false 3-1");
+
+          return false;
+      }
+      if ( mData != p.mData ) {
+          //qDebug("compare PIC false 3");
       return false;
+      }
   } else {
-    if ( mUrl != p.mUrl )
-      return false;
+      if ( mUrl != p.mUrl ) {
+          //qDebug("compare PIC false 4");
+          return false;
+      }
   }
-
+  //qDebug("compare PIC true ");
   return true;
 }
 
 bool Picture::operator!=( const Picture &p ) const
 {
   return !( p == *this );
 }
 
 void Picture::setUrl( const QString &url )
 {
   mUrl = url;
   mIntern = false;
   mUndefined = false;
 }
 
 void Picture::setData( const QImage &data )
 {
   mData = data;
   mIntern = true;
   mUndefined = false;
 }
 
 void Picture::setType( const QString &type )
 {
   mType = type;
 }
 
 bool Picture::isIntern() const
 {
   return mIntern;
 }
 
 QString Picture::url() const
 {
   return mUrl;
 }
 
 QImage Picture::data() const
 {
   return mData;
 }
 QPixmap Picture::pixmap() const
 {
     QPixmap p;
     p.convertFromImage ( mData );
     return p;
 }
 
 QString Picture::type() const
 {
   return mType;
 }
 bool Picture::undefined() const
 {
   return mUndefined;
 }
  
 
 QString Picture::asString() const
 {
   if ( mIntern )
     return "intern picture";
   else
     return mUrl;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const Picture &picture )
 {
   return s << picture.mIntern << picture.mUrl << picture.mType << picture.mData;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Picture &picture )
 {
   s >> picture.mIntern >> picture.mUrl >> picture.mType >> picture.mData;
   return s;
 }
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index c368172..2f88cde 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -1,321 +1,349 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1999 Rik Hemsley rik@kde.org
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qcstring.h>
 #include <qstrlist.h>
 #include <qregexp.h>
 
 #include <kdebug.h>
 
 #include <VCardAdrParam.h>
 #include <VCardAgentParam.h>
 #include <VCardDateParam.h>
 #include <VCardEmailParam.h>
 #include <VCardImageParam.h>
 #include <VCardSourceParam.h>
 #include <VCardTelParam.h>
 #include <VCardTextBinParam.h>
 #include <VCardTextParam.h>
 
 #include <VCardAdrValue.h>
 #include <VCardAgentValue.h>
 #include <VCardDateValue.h>
 #include <VCardImageValue.h>
 #include <VCardTextValue.h>
 #include <VCardTextBinValue.h>
 #include <VCardLangValue.h>
 #include <VCardNValue.h>
 #include <VCardURIValue.h>
 #include <VCardSoundValue.h>
 #include <VCardClassValue.h>
 #include <VCardFloatValue.h>
 #include <VCardOrgValue.h>
 #include <VCardTelValue.h>
 #include <VCardTextListValue.h>
 #include <VCardUTCValue.h>
 #include <VCardGeoValue.h>
 
 #include <VCardRToken.h>
 #include <VCardContentLine.h>
 
 #include <VCardEntity.h>
 #include <VCardEnum.h>
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 ContentLine::ContentLine()
                 :Entity(),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
   paramList_.setAutoDelete( TRUE );
 }
 
 ContentLine::ContentLine(const ContentLine & x)
                 :Entity(x),
                 group_ (x.group_),
                 name_ (x.name_),
         /*US    paramList_(x.paramList_),*/
                 value_(x.value_->clone()),
                 paramType_(x.paramType_),
                 valueType_(x.valueType_),
                 entityType_(x.entityType_)
 {
   paramList_.setAutoDelete( TRUE );
 
 
   ParamListIterator it(x.paramList_);
   for (; it.current(); ++it)
   {
     Param *p = new Param;
         p->setName( it.current()->name() );
         p->setValue( it.current()->value() );
     paramList_.append(p);
   }
 
 }
 
 ContentLine::ContentLine(const QCString & s)
                 :Entity(s),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
   paramList_.setAutoDelete( TRUE );
 }
 
         ContentLine &
 ContentLine::operator = (ContentLine & x)
 {
         if (*this == x) return *this;
 
     ParamListIterator it(x.paramList_);
     for (; it.current(); ++it)
     {
       Param *p = new Param;
       p->setName( it.current()->name() );
       p->setValue( it.current()->value() );
       paramList_.append(p);
     }
 
         value_ = x.value_->clone();
 
         Entity::operator = (x);
         return *this;
 }
 
         ContentLine &
 ContentLine::operator = (const QCString & s)
 {
         Entity::operator = (s);
         delete value_;
         value_ = 0;
         return *this;
 }
 
         bool
 ContentLine::operator == (ContentLine & x)
 {
         x.parse();
 
         QPtrListIterator<Param> it(x.paramList());
 
         if (!paramList_.find(it.current()))
                 return false;
 
         return true;
 }
 
 ContentLine::~ContentLine()
 {
         delete value_;
         value_ = 0;
 }
 
         void
 ContentLine::_parse()
 {
         vDebug("parse");
 
         // Unqote newlines
         strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
 
         int split = strRep_.find(':');
 
         if (split == -1) { // invalid content line
                 vDebug("No ':'");
                 return;
         }
 
         QCString firstPart(strRep_.left(split));
         QCString valuePart(strRep_.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.mid(split + 1);
         }
 
         vDebug("Group == " + group_);
         vDebug("firstPart == " + firstPart);
         vDebug("valuePart == " + valuePart);
 
         // Now we have the group, the name and param list together and the value.
 
         QStrList l;
 
         RTokenise(firstPart, ";", l);
 
         if (l.count() == 0) {// invalid - no name !
                 vDebug("No name for this content line !");
                 return;
         }
 
         name_ = l.at(0);
 
         // Now we have the name, so the rest of 'l' is the params.
         // Remove the name part.
         l.remove(0u);
 
                 entityType_= EntityNameToEntityType(name_);
                 paramType_= EntityTypeToParamType(entityType_);
 
         unsigned int i = 0;
 
         // For each parameter, create a new parameter of the correct type.
 
         QStrListIterator it(l);
 
         for (; it.current(); ++it, i++) {
 
                 QCString str = *it;
 
                 split = str.find("=");
                 if (split < 0 ) {
                         vDebug("No '=' in paramter.");
                         continue;
                 }
 
                 QCString paraName = str.left(split);
                 QCString paraValue = str.mid(split + 1);
 
                 QStrList paraValues;
                 RTokenise(paraValue, ",", paraValues);
 
                 QStrListIterator it2( paraValues );
 
                 for(; it2.current(); ++it2) {
 
                         Param *p = new Param;
                         p->setName( paraName );
                         p->setValue( *it2 );
 
                         paramList_.append(p);
                 }
         }
 
         // Create a new value of the correct type.
 
         valueType_ = EntityTypeToValueType(entityType_);
 
         //kdDebug(5710) << "valueType: " << valueType_ << endl;
 
         switch (valueType_) {
 
                         case ValueSound:        value_ = new SoundValue;break;
                         case ValueAgent:        value_ = new AgentValue;break;
                         case ValueAddress:      value_ = new AdrValue;  break;
                         case ValueTel:          value_ = new TelValue;  break;
                         case ValueTextBin:      value_ = new TextBinValue;break;
                         case ValueOrg:          value_ = new OrgValue;  break;
                         case ValueN:            value_ = new NValue;    break;
                         case ValueUTC:          value_ = new UTCValue;  break;
                         case ValueURI:          value_ = new URIValue;  break;
                         case ValueClass:        value_ = new ClassValue;break;
                         case ValueFloat:        value_ = new FloatValue;break;
                         case ValueImage:        value_ = new ImageValue;break;
                         case ValueDate:                 value_ = new DateValue;         break;
                         case ValueTextList:     value_ = new TextListValue;break;
                         case ValueGeo:          value_ = new GeoValue;  break;
                 case ValueText:
                 case ValueUnknown:
                         default:                value_ = new TextValue;         break;
         }
 
         *value_ = valuePart;
 }
 
         void
 ContentLine::_assemble()
 {
+        //strRep_.truncate(0);
+        QString line;
+        if (!group_.isEmpty())
+                line = group_ + '.';
+        line += name_;
+        ParamListIterator it(paramList_);
+        for (; it.current(); ++it)
+                line += ";" + it.current()->asString();
+
+        if (value_ != 0)
+                line += ":" + value_->asString();
+
+        line = line.replace( QRegExp( "\n" ), "\\n" );
+
+        // Fold lines longer than 72 chars
+        const int maxLen = 72;
+        uint cursor = 0;
+    QString cut;
+        while( line.length() > ( cursor + 1 ) * maxLen ) {
+                cut += line.mid( cursor * maxLen, maxLen );
+                cut += "\r\n ";
+                ++cursor;
+        }
+        cut += line.mid( cursor * maxLen );
+    strRep_ = cut.latin1();
+    //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+#if 0
         vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
         strRep_.truncate(0);
 
         QCString line;
 
         if (!group_.isEmpty())
                 line += group_ + '.';
 
         line += name_;
 
         vDebug("Adding parameters");
         ParamListIterator it(paramList_);
 
         for (; it.current(); ++it)
                 line += ";" + it.current()->asString();
 
         vDebug("Adding value");
         if (value_ != 0)
                 line += ":" + value_->asString();
         else
                 vDebug("No value");
 
         // Quote newlines
         line = line.replace( QRegExp( "\n" ), "\\n" );
 
         // Fold lines longer than 72 chars
         const int maxLen = 72;
         uint cursor = 0;
         while( line.length() > ( cursor + 1 ) * maxLen ) {
                 strRep_ += line.mid( cursor * maxLen, maxLen );
                 strRep_ += "\r\n ";
                 ++cursor;
         }
         strRep_ += line.mid( cursor * maxLen );
-    //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+    qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
+#endif
 }
 
         void
 ContentLine::clear()
 {
         group_.truncate(0);
         name_.truncate(0);
         paramList_.clear();
         delete value_;
         value_ = 0;
 }
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index bc80707..49bfe43 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -1,299 +1,294 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1998 Rik Hemsley rik@kde.org
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qcstring.h>
 #include <qstrlist.h>
+#include <qstringlist.h>
+#include <qstring.h>
+#include <qvaluelist.h>
 
 #include <VCardEntity.h>
 #include <VCardVCard.h>
 #include <VCardContentLine.h>
 #include <VCardRToken.h>
 
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 VCard::VCard()
                 :Entity()
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
 VCard::VCard(const VCard & x)
                 :Entity(x),
                 group_(x.group_)
 {
   contentLineList_.setAutoDelete( TRUE );
 
   QPtrListIterator<ContentLine> it(x.contentLineList_);
   for (; it.current(); ++it) {
     ContentLine * c = new ContentLine(*it.current());
     contentLineList_.append(c);
   }
 
 }
 
 VCard::VCard(const QCString & s)
                 :Entity(s)
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
         VCard &
 VCard::operator = (VCard & x)
 {
         if (*this == x) return *this;
 
                 group_                  = x.group();
     QPtrListIterator<ContentLine> it(x.contentLineList_);
     for (; it.current(); ++it) {
       ContentLine * c = new ContentLine(*it.current());
       contentLineList_.append(c);
     }
 
         Entity::operator = (x);
         return *this;
 }
 
         VCard &
 VCard::operator = (const QCString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 VCard::operator == (VCard & x)
 {
         x.parse();
         return false;
 }
 
 VCard::~VCard()
 {
 }
 
         void
 VCard::_parse()
 {
-        vDebug("parse() called");
-        QStrList l;
+        
+        QStringList l;
+        QStrList sl;
 
-        RTokenise(strRep_, "\r\n", l);
+        RTokenise(strRep_, "\r\n", sl);
 
-        if (l.count() < 3) { // Invalid VCARD !
-                vDebug("Invalid vcard");
+        if (sl.count() < 3) { // Invalid VCARD !
+        //qDebug("invalid vcard ");
                 return;
         }
-
+    l = QStringList::fromStrList( sl );
         // Get the first line
-        QCString beginLine = QCString(l.at(0)).stripWhiteSpace();
-
-        vDebug("Begin line == \"" + beginLine + "\"");
+        QString beginLine = l[0].stripWhiteSpace();
 
         // Remove extra blank lines
-        while (QCString(l.last()).isEmpty())
+        while (l.last().isEmpty())
                 l.remove(l.last());
 
         // Now we know this is the last line
-        QCString endLine = l.last();
+        QString endLine = l.last();
 
         // Trash the first and last lines as we have seen them.
-        l.remove(0u);
+        l.remove(l.first());
         l.remove(l.last());
 
         ///////////////////////////////////////////////////////////////
         // FIRST LINE
 
         int split = beginLine.find(':');
 
         if (split == -1) { // invalid, no BEGIN
                 vDebug("No split");
                 return;
         }
 
-        QCString firstPart(beginLine.left(split));
-        QCString valuePart(beginLine.mid(split + 1));
+        QString firstPart(beginLine.left(split));
+        QString valuePart(beginLine.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.right(firstPart.length() - split - 1);
         }
 
-        if (qstrnicmp(firstPart, "BEGIN", 5) != 0) { // No BEGIN !
-                vDebug("No BEGIN");
+        if (firstPart.left(5) != "BEGIN" ) { // No BEGIN !
+                qDebug("no BEGIN in vcard ");
                 return;
         }
 
-        if (qstrnicmp(valuePart, "VCARD", 5) != 0) { // Not a vcard !
-                vDebug("No VCARD");
+        if (valuePart.left(5) != "VCARD") { // Not a vcard !
+                qDebug("not a VCARD  ");
                 return;
         }
 
         ///////////////////////////////////////////////////////////////
         // CONTENT LINES
         //
         vDebug("Content lines");
 
         // Handle folded lines.
 
-        QStrList refolded;
-
-        QStrListIterator it(l);
+        QStringList refolded;
 
-        QCString cur;
 
-        for (; it.current(); ++it) {
+    QStringList::Iterator it =  l.begin(); 
 
-                cur = it.current();
+        QString cur;
 
+        for (; it != l.end(); ++it) {
+                cur = (*it);
                 ++it;
-
-                while (
-                                it.current()    &&
-                                it.current()[0] == ' '&&
-                        strlen(it.current()) != 1)
-                {
-                        cur += it.current() + 1;
+                        while ( it!= l.end() && (*it).at(0) == ' '&& (*it).length()!= 1) {
+                        cur += (*it) ;
                         ++it;
                 }
-
                 --it;
-
                 refolded.append(cur);
         }
-
-        QStrListIterator it2(refolded);
-
-        for (; it2.current(); ++it2) {
-          vDebug("New contentline using \"" + QCString(it2.current()) + "\"");
-                ContentLine * cl = new ContentLine(it2.current());
-
+    QStringList::Iterator it2 = refolded.begin();
+        for (; it2 != refolded.end(); ++it2) {
+                ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
                 cl->parse();
                 if (cl->value() == 0)
                 {
-                    qDebug("Content line could not be parsed. Discarded: %s", it2.current());
+                    qDebug("Content line could not be parsed. Discarded: %s", (*it2).latin1());
                     delete cl;
                 }
                 else
                   contentLineList_.append(cl);
         }
 
         ///////////////////////////////////////////////////////////////
         // LAST LINE
 
+
+        // LR: sorry, but the remaining code in this method makes no sense
+
+#if 0
         split = endLine.find(':');
 
         if (split == -1) // invalid, no END
                 return;
 
         firstPart = endLine.left(split);
         valuePart = endLine.right(firstPart.length() - split - 1);
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.right(firstPart.length() - split - 1);
         }
 
         if (qstricmp(firstPart, "END") != 0) // No END !
                 return;
 
         if (qstricmp(valuePart, "VCARD") != 0) // Not a vcard !
                 return;
+#endif
 }
 
         void
 VCard::_assemble()
 {
         vDebug("Assembling vcard");
         strRep_ = "BEGIN:VCARD\r\n";
         strRep_ += "VERSION:3.0\r\n";
 
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 strRep_ += it.current()->asString() + "\r\n";
 
         strRep_ += "END:VCARD\r\n";
 }
 
         bool
 VCard::has(EntityType t)
 {
         parse();
         return contentLine(t) == 0 ? false : true;
 }
 
         bool
 VCard::has(const QCString & s)
 {
         parse();
         return contentLine(s) == 0 ? false : true;
 }
 
         void
 VCard::add(const ContentLine & cl)
 {
         parse();
         ContentLine * c = new ContentLine(cl);
         contentLineList_.append(c);
 }
 
         void
 VCard::add(const QCString & s)
 {
         parse();
         ContentLine * c = new ContentLine(s);
         contentLineList_.append(c);
 }
 
         ContentLine *
 VCard::contentLine(EntityType t)
 {
         parse();
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == t)
                         return it.current();
 
         return 0;
 }
 
         ContentLine *
 VCard::contentLine(const QCString & s)
 {
         parse();
         QPtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == EntityNameToEntityType(s))
                         return it.current();
 
         return 0;
 }