| -rw-r--r-- | korganizer/calendarview.cpp | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b3b4cdb..d71ea08 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1424,40 +1424,41 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd QString uid; bool ok = true; for ( int i = 0; i < count; i++) - { - if ( ! bar.isVisible() ) - return; - bar.setProgress( i ); - qApp->processEvents(); - - qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); - - birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); - if (!ok) - qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); - - anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); - if (!ok) - qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); - realName = realNameList[i]; - email = emailList[i]; - assembledName = assembledNameList[i]; - uid = uidList[i]; + { + if ( ! bar.isVisible() ) + return; + bar.setProgress( i ); + qApp->processEvents(); - if ( birthday.isValid() ){ - a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, - KCal::Attendee::ReqParticipant,uid) ; - if ( addAnniversary( birthday, assembledName, a, true ) ) - ++addCount; - } + birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok); + if (!ok) { + ; //qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1()); + } - if ( anniversary.isValid() ){ - a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, - KCal::Attendee::ReqParticipant,uid) ; - if ( addAnniversary( anniversary, assembledName, a, false ) ) - ++addCount; + anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok); + if (!ok) { + ;// qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1()); + } + realName = realNameList[i]; + email = emailList[i]; + assembledName = assembledNameList[i]; + uid = uidList[i]; + //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() ); + + if ( birthday.isValid() ){ + a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, + KCal::Attendee::ReqParticipant,uid) ; + if ( addAnniversary( birthday, assembledName, a, true ) ) + ++addCount; + } + + if ( anniversary.isValid() ){ + a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction, + KCal::Attendee::ReqParticipant,uid) ; + if ( addAnniversary( anniversary, assembledName, a, false ) ) + ++addCount; + } } - } updateView(); topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |