";
tmpStr += "" + i18n( "Organizer:" ) + " | ";
tmpStr += "" +
- displayViewLinkPerson( incidence->organizer()->email(),
- incidence->organizer()->name(),
- QString(), iconPath ) +
+ displayViewFormatOrganizer( incidence->organizer()->email(),
+ incidence->organizer()->name() ) +
" | ";
tmpStr += "
";
}
@@ -373,10 +477,8 @@
QString name_1 = event->customProperty( "KABC", "NAME-1" );
QString email_1= event->customProperty( "KABC", "EMAIL-1" );
- KIconLoader *iconLoader = KIconLoader::global();
- const QString iconPath = iconLoader->iconPath( "mail-message-new", KIconLoader::Small );
- //TODO: add a birthday cake icon
- QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, iconPath );
+ //TODO: add a birthday cake icon. Make a displayViewLinkBirthdayPerson(email,name,uid)
+ QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, Attendee::None );
return tmpStr;
}
@@ -1245,44 +1347,30 @@
return ret;
}
-static QString invitationPerson( const QString &email, QString name, QString uid )
+static QString invitationPerson( const QString &email, const QString &name, const QString &uid )
{
- // 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() ) ) {
- uid.clear();
- }
+ QPair