3 files changed, 37 insertions, 8 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index df93209..223aa5a 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -100,1076 +100,1085 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
 
   vcal = newVObject(VCCalProp);
 
   //  addPropValue(vcal,VCLocationProp, "0.0");
   addPropValue(vcal,VCProdIdProp, productId());
   tmpStr = mCalendar->getTimeZoneStr();
   //qDebug("mCalendar->getTimeZoneStr() %s",tmpStr.latin1() );
   addPropValue(vcal,VCTimeZoneProp, tmpStr.local8Bit());
   addPropValue(vcal,VCVersionProp, _VCAL_VERSION);
 
   // TODO STUFF
   QPtrList<Todo> todoList = mCalendar->rawTodos();
   QPtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     vo = eventToVTodo(qlt.current());
     addVObjectProp(vcal, vo);
   }
 
   // EVENT STUFF
   QPtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     vo = eventToVEvent(ev);
     addVObjectProp(vcal, vo);
   }
 
   writeVObjectToFile(QFile::encodeName(fileName).data() ,vcal);
   cleanVObjects(vcal);
   cleanStrTbl();
 
   if (QFile::exists(fileName)) {
     return true;
   } else  {
     return false; // error
   }
 }
 
 bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 {
   // TODO: Factor out VCalFormat::fromString()
 
   QCString data = text.utf8();
 
   if ( !data.size() ) return false;
 
   VObject *vcal = Parse_MIME( data.data(), data.size());
   if ( !vcal ) return false;
 
   VObjectIterator i;
   VObject *curvo;
   initPropIterator( &i, vcal );
 
   // we only take the first object. TODO: parse all incidences.
   do  {
     curvo = nextVObject( &i );
   } while ( strcmp( vObjectName( curvo ), VCEventProp ) &&
             strcmp( vObjectName( curvo ), VCTodoProp ) );
 
   if ( strcmp( vObjectName( curvo ), VCEventProp ) == 0 ) {
     Event *event = VEventToEvent( curvo );
     calendar->addEvent( event );
   } else {
       qDebug("VCalFormat::fromString(): Unknown object type. ");
     deleteVObject( vcal );
     return false;
   }
 
   deleteVObject( vcal );
 
   return true;
 }
 
 QString VCalFormat::eventToString( Event * event, Calendar *calendar, bool useLocal)
 {
  
   if ( !event ) return QString::null;
   bool useL = useLocalTime;
   useLocalTime = useLocal;
   mCalendar = calendar;
   VObject *vevent = eventToVEvent( event );
   char *buf = writeMemVObject( 0, 0, vevent );
   QString result( buf );
   cleanVObject( vevent );
   useLocalTime =  useL;
   return result;
 }
 QString VCalFormat::todoToString( Todo * todo, Calendar *calendar, bool useLocal )
 {
  
  if ( !todo ) return QString::null;
   bool useL = useLocalTime;
   useLocalTime = useLocal;
   mCalendar = calendar;
   VObject *vevent = eventToVTodo( todo );
   char *buf = writeMemVObject( 0, 0, vevent );
   QString result( buf );
   cleanVObject( vevent );
   useLocalTime =  useL;
   return result;
 }
 
 QString VCalFormat::toString( Calendar *calendar )
 {
   // TODO: Factor out VCalFormat::asString()
 
   VObject *vcal = newVObject(VCCalProp);
 
   addPropValue( vcal, VCProdIdProp, CalFormat::productId() );
   QString tmpStr = mCalendar->getTimeZoneStr();
   addPropValue( vcal, VCTimeZoneProp, tmpStr.local8Bit() );
   addPropValue( vcal, VCVersionProp, _VCAL_VERSION );
 
   // TODO: Use all data.
   QPtrList<Event> events = calendar->events();
   Event *event = events.first();
   if ( !event ) return QString::null;
 
   VObject *vevent = eventToVEvent( event );
 
   addVObjectProp( vcal, vevent );
 
   char *buf = writeMemVObject( 0, 0, vcal );
 
   QString result( buf );
 
   cleanVObject( vcal );
 
   return result;
 }
 
 VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
 {
   VObject *vtodo;
   QString tmpStr;
   QStringList tmpStrList;
 
   vtodo = newVObject(VCTodoProp);
 
   // due date
   if (anEvent->hasDueDate()) {
     tmpStr = qDateTimeToISO(anEvent->dtDue(),
                             !anEvent->doesFloat());
     addPropValue(vtodo, VCDueProp, tmpStr.local8Bit());
   }
 
   // start date
   if (anEvent->hasStartDate()) {
     tmpStr = qDateTimeToISO(anEvent->dtStart(),
                             !anEvent->doesFloat());
     addPropValue(vtodo, VCDTstartProp, tmpStr.local8Bit());
   }
 
   // creation date
   tmpStr = qDateTimeToISO(anEvent->created());
   addPropValue(vtodo, VCDCreatedProp, tmpStr.local8Bit());
 
   // unique id
   addPropValue(vtodo, VCUniqueStringProp,
                anEvent->uid().local8Bit());
 
   // revision
   tmpStr.sprintf("%i", anEvent->revision());
   addPropValue(vtodo, VCSequenceProp, tmpStr.local8Bit());
 
   // last modification date
   tmpStr = qDateTimeToISO(anEvent->lastModified());
   addPropValue(vtodo, VCLastModifiedProp, tmpStr.local8Bit());
 
   // organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vtodo, ICOrganizerProp, tmpStr.local8Bit());
 
   // attendees
   if (anEvent->attendeeCount() != 0) {
     QPtrList<Attendee> al = anEvent->attendees();
     QPtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
           !curAttendee->name().isEmpty())
         tmpStr = "MAILTO:" + curAttendee->name() + " <" +
                  curAttendee->email() + ">";
       else if (curAttendee->name().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->email();
       else if (curAttendee->email().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->name();
       else if (curAttendee->name().isEmpty() &&
                curAttendee->email().isEmpty())
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit());
+      addPropValue(aProp, VCRoleProp, writeRole(curAttendee->role()));
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
       addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
     }
   }
 
   // description BL:
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vtodo, VCDescriptionProp,
                               anEvent->description().local8Bit());
     if (anEvent->description().find('\n') != -1)
       addProp(d, VCQuotedPrintableProp);
   }
 
   // summary
   if (!anEvent->summary().isEmpty())
     addPropValue(vtodo, VCSummaryProp, anEvent->summary().local8Bit());
 
   if (!anEvent->location().isEmpty())
     addPropValue(vtodo, VCLocationProp, anEvent->location().local8Bit());
 
   // completed
   // status
   // backward compatibility, KOrganizer used to interpret only these two values
   addPropValue(vtodo, VCStatusProp, anEvent->isCompleted() ? "COMPLETED" :
                                                              "NEEDS_ACTION");
   // completion date
   if (anEvent->hasCompletedDate()) {
     tmpStr = qDateTimeToISO(anEvent->completed());
     addPropValue(vtodo, VCCompletedProp, tmpStr.local8Bit());
   }
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vtodo, VCPriorityProp, tmpStr.local8Bit());
 
   // related event
   if (anEvent->relatedTo()) {
     addPropValue(vtodo, VCRelatedToProp,
                  anEvent->relatedTo()->uid().local8Bit());
   }
 
   // categories
   tmpStrList = anEvent->categories();
   tmpStr = "";
   QString catStr;
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vtodo, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // alarm stuff
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
   QPtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
         VObject *a;
             tmpStr = qDateTimeToISO(alarm->time());
         if (alarm->type() == Alarm::Audio) {
             a = addProp(vtodo, VCAAlarmProp);
             addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
             addPropValue(a, VCRepeatCountProp, "1");
             addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
         }
         else if (alarm->type() == Alarm::Procedure) {
             a = addProp(vtodo, VCPAlarmProp);
             addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
             addPropValue(a, VCRepeatCountProp, "1");
             addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
         } else {
             a = addProp(vtodo, VCDAlarmProp);
             addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
             addPropValue(a, VCRepeatCountProp, "1");
             addPropValue(a, VCDisplayStringProp, "beep!");
       }
     }
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
     addPropValue(vtodo, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
     addPropValue(vtodo, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vtodo;
 }
 
 VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 {
   VObject *vevent;
   QString tmpStr;
   QStringList tmpStrList;
 
   vevent = newVObject(VCEventProp);
 
   // start and end time
   tmpStr = qDateTimeToISO(anEvent->dtStart(),
                           !anEvent->doesFloat());
   addPropValue(vevent, VCDTstartProp, tmpStr.local8Bit());
 
   // events that have time associated but take up no time should
   // not have both DTSTART and DTEND.
   if (anEvent->dtStart() != anEvent->dtEnd()) {
     tmpStr = qDateTimeToISO(anEvent->dtEnd(),
                             !anEvent->doesFloat());
     addPropValue(vevent, VCDTendProp, tmpStr.local8Bit());
   }
 
   // creation date
   tmpStr = qDateTimeToISO(anEvent->created());
   addPropValue(vevent, VCDCreatedProp, tmpStr.local8Bit());
 
   // unique id
   addPropValue(vevent, VCUniqueStringProp,
                anEvent->uid().local8Bit());
 
   // revision
   tmpStr.sprintf("%i", anEvent->revision());
   addPropValue(vevent, VCSequenceProp, tmpStr.local8Bit());
 
   // last modification date
   tmpStr = qDateTimeToISO(anEvent->lastModified());
   addPropValue(vevent, VCLastModifiedProp, tmpStr.local8Bit());
 
   // attendee and organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vevent, ICOrganizerProp, tmpStr.local8Bit());
 
   if (anEvent->attendeeCount() != 0) {
     QPtrList<Attendee> al = anEvent->attendees();
     QPtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     // TODO: Put this functionality into Attendee class
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
           !curAttendee->name().isEmpty())
         tmpStr = "MAILTO:" + curAttendee->name() + " <" +
                  curAttendee->email() + ">";
       else if (curAttendee->name().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->email();
       else if (curAttendee->email().isEmpty())
         tmpStr = "MAILTO: " + curAttendee->name();
       else if (curAttendee->name().isEmpty() &&
                curAttendee->email().isEmpty())
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vevent, VCAttendeeProp, tmpStr.local8Bit());
-      addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");;
+      addPropValue(aProp, VCRoleProp, writeRole(curAttendee->role()));
+      addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
       addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
     }
   }
 
   // recurrence rule stuff
   if (anEvent->recurrence()->doesRecur()) {
     // some more variables
     QPtrList<Recurrence::rMonthPos> tmpPositions;
     QPtrList<int> tmpDays;
     int *tmpDay;
     Recurrence::rMonthPos *tmpPos;
     QString tmpStr2;
     int i;
 
     switch(anEvent->recurrence()->doesRecur()) {
     case Recurrence::rDaily:
       tmpStr.sprintf("D%i ",anEvent->recurrence()->frequency());
 //      if (anEvent->rDuration > 0)
         //tmpStr += "#";
       break;
     case Recurrence::rWeekly:
       tmpStr.sprintf("W%i ",anEvent->recurrence()->frequency());
       for (i = 0; i < 7; i++) {
         if (anEvent->recurrence()->days().testBit(i))
           tmpStr += dayFromNum(i);
       }
       break;
     case Recurrence::rMonthlyPos:
       tmpStr.sprintf("MP%i ", anEvent->recurrence()->frequency());
       // write out all rMonthPos's
       tmpPositions = anEvent->recurrence()->monthPositions();
       for (tmpPos = tmpPositions.first();
            tmpPos;
            tmpPos = tmpPositions.next()) {
 
         tmpStr2.sprintf("%i", tmpPos->rPos);
         if (tmpPos->negative)
           tmpStr2 += "- ";
         else
           tmpStr2 += "+ ";
         tmpStr += tmpStr2;
         for (i = 0; i < 7; i++) {
           if (tmpPos->rDays.testBit(i))
             tmpStr += dayFromNum(i);
         }
       } // loop for all rMonthPos's
       break;
     case Recurrence::rMonthlyDay:
       tmpStr.sprintf("MD%i ", anEvent->recurrence()->frequency());
       // write out all rMonthDays;
       tmpDays = anEvent->recurrence()->monthDays();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     case Recurrence::rYearlyMonth:
       tmpStr.sprintf("YM%i ", anEvent->recurrence()->frequency());
       // write out all the rYearNums;
       tmpDays = anEvent->recurrence()->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     case Recurrence::rYearlyDay:
       tmpStr.sprintf("YD%i ", anEvent->recurrence()->frequency());
       // write out all the rYearNums;
       tmpDays = anEvent->recurrence()->yearNums();
       for (tmpDay = tmpDays.first();
            tmpDay;
            tmpDay = tmpDays.next()) {
         tmpStr2.sprintf("%i ", *tmpDay);
         tmpStr += tmpStr2;
       }
       break;
     default:
       kdDebug(5800) << "ERROR, it should never get here in eventToVEvent!" << endl;
       break;
     } // switch
 
     if (anEvent->recurrence()->duration() > 0) {
       tmpStr2.sprintf("#%i",anEvent->recurrence()->duration());
       tmpStr += tmpStr2;
     } else if (anEvent->recurrence()->duration() == -1) {
       tmpStr += "#0"; // defined as repeat forever
     } else {
       tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE);
     }
     addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit());
 
   } // event repeats
 
   // exceptions to recurrence
   DateList dateList = anEvent->exDates();
   DateList::ConstIterator it;
   QString tmpStr2;
 
   for (it = dateList.begin(); it != dateList.end(); ++it) {
     tmpStr = qDateToISO(*it) + ";";
     tmpStr2 += tmpStr;
   }
   if (!tmpStr2.isEmpty()) {
     tmpStr2.truncate(tmpStr2.length()-1);
     addPropValue(vevent, VCExpDateProp, tmpStr2.local8Bit());
   }
 
   // description
   if (!anEvent->description().isEmpty()) {
     VObject *d = addPropValue(vevent, VCDescriptionProp,
                               anEvent->description().local8Bit());
     if (anEvent->description().find('\n') != -1)
       addProp(d, VCQuotedPrintableProp);
   }
 
   // summary
   if (!anEvent->summary().isEmpty())
     addPropValue(vevent, VCSummaryProp, anEvent->summary().local8Bit());
 
   if (!anEvent->location().isEmpty())
     addPropValue(vevent, VCLocationProp, anEvent->location().local8Bit());
 
   // status
 // TODO: define Event status
 //  addPropValue(vevent, VCStatusProp, anEvent->statusStr().local8Bit());
 
   // secrecy
   const char *text = 0;
   switch (anEvent->secrecy()) {
     case Incidence::SecrecyPublic:
       text = "PUBLIC";
       break;
     case Incidence::SecrecyPrivate:
       text = "PRIVATE";
       break;
     case Incidence::SecrecyConfidential:
       text = "CONFIDENTIAL";
       break;
   }
   if (text) {
     addPropValue(vevent, VCClassProp, text);
   }
 
   // categories
   tmpStrList = anEvent->categories();
   tmpStr = "";
   QString catStr;
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vevent, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // attachments 
   // TODO: handle binary attachments!
   QPtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
     addPropValue(vevent, VCAttachProp, at->uri().local8Bit());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit());
 
   // alarm stuff
   QPtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
       if (alarm->enabled()) {
           VObject *a ;
           tmpStr = qDateTimeToISO(alarm->time());
           if (alarm->type() == Alarm::Audio) {
               a = addProp(vevent, VCAAlarmProp);
               addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
               addPropValue(a, VCRepeatCountProp, "1");
               addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
           }
           if (alarm->type() == Alarm::Procedure) {
               a = addProp(vevent, VCPAlarmProp);
               addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
               addPropValue(a, VCRepeatCountProp, "1");
               addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
           } else {
               a = addProp(vevent, VCDAlarmProp);
               addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
               addPropValue(a, VCRepeatCountProp, "1");
               addPropValue(a, VCDisplayStringProp, "beep!");
           
       }
     }
   }
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vevent, VCPriorityProp, tmpStr.local8Bit());
 
   // transparency
   tmpStr.sprintf("%i",anEvent->transparency());
   addPropValue(vevent, VCTranspProp, tmpStr.local8Bit());
 
   // related event
   if (anEvent->relatedTo()) {
     addPropValue(vevent, VCRelatedToProp,
                  anEvent->relatedTo()->uid().local8Bit());
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
     addPropValue(vevent, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
     addPropValue(vevent, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vevent;
 }
 
 Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 {
   VObject *vo;
   VObjectIterator voi;
   char *s;
 
   Todo *anEvent = new Todo;
 
   // creation date
   if ((vo = isAPropertyOf(vtodo, VCDCreatedProp)) != 0) {
       anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
   // unique id
   vo = isAPropertyOf(vtodo, VCUniqueStringProp);
   // while the UID property is preferred, it is not required.  We'll use the
   // default Event UID if none is given.
   if (vo) {
     anEvent->setUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
 
   // last modification date
   if ((vo = isAPropertyOf(vtodo, VCLastModifiedProp)) != 0) {
     anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setLastModified(QDateTime(QDate::currentDate(),
                                        QTime::currentTime()));
 
   // organizer
   // if our extension property for the event's ORGANIZER exists, add it.
   if ((vo = isAPropertyOf(vtodo, ICOrganizerProp)) != 0) {
     anEvent->setOrganizer(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   } else {
     anEvent->setOrganizer(mCalendar->getEmail());
   }
 
   // attendees.
   initPropIterator(&voi, vtodo);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttendeeProp) == 0) {
       Attendee *a;
       VObject *vp;
       s = fakeCString(vObjectUStringZValue(vo));
       QString tmpStr = QString::fromLocal8Bit(s);
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
       if ((emailPos1 = tmpStr.find('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
       } else if (tmpStr.find('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
         // just a name
-        QString email = tmpStr.replace( QRegExp(" "), "." );
-        a = new Attendee(tmpStr,email);
+          // QString email = tmpStr.replace( QRegExp(" "), "." );
+          a = new Attendee(tmpStr,0);
       }
-
+      // is there a Role property?
+      if ((vp = isAPropertyOf(vo, VCRoleProp)) != 0)
+          a->setRole(readRole(vObjectStringZValue(vp)));
       // is there an RSVP property?
       if ((vp = isAPropertyOf(vo, VCRSVPProp)) != 0)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
         a->setStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
   }
 
   // description for todo
   if ((vo = isAPropertyOf(vtodo, VCDescriptionProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setDescription(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
 
   // summary
   if ((vo = isAPropertyOf(vtodo, VCSummaryProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setSummary(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
   if ((vo = isAPropertyOf(vtodo, VCLocationProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
     anEvent->setLocation(QString::fromLocal8Bit(s));
     deleteStr(s);
   }
 
 
   // completed
   // was: status
   if ((vo = isAPropertyOf(vtodo, VCStatusProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     if (strcmp(s,"COMPLETED") == 0) {
       anEvent->setCompleted(true);
     } else {
       anEvent->setCompleted(false);
     }
     deleteStr(s);
   }
   else
     anEvent->setCompleted(false);
 
   // completion date
   if ((vo = isAPropertyOf(vtodo, VCCompletedProp)) != 0) {
     anEvent->setCompleted(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
   // priority
   if ((vo = isAPropertyOf(vtodo, VCPriorityProp))) {
     anEvent->setPriority(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
 
   // due date
   if ((vo = isAPropertyOf(vtodo, VCDueProp)) != 0) {
     anEvent->setDtDue(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
     anEvent->setHasDueDate(true);
   } else {
     anEvent->setHasDueDate(false);
   }
 
   // start time
   if ((vo = isAPropertyOf(vtodo, VCDTstartProp)) != 0) {
     anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
             //    kdDebug(5800) << "s is " << //  s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     anEvent->setHasStartDate(true);
   } else {
     anEvent->setHasStartDate(false);
   }
 
   /* alarm stuff */
   //kdDebug(5800) << "vcalformat::VTodoToEvent called" << endl;
   if ((vo = isAPropertyOf(vtodo, VCDAlarmProp))) {
     Alarm* alarm = anEvent->newAlarm();
     VObject *a;
     if ((a = isAPropertyOf(vo, VCRunTimeProp))) {
       alarm->setTime(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(a))));
       deleteStr(s);
     }
     alarm->setEnabled(true);
     if ((vo = isAPropertyOf(vtodo, VCPAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCProcedureNameProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setProcedureAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
     if ((vo = isAPropertyOf(vtodo, VCAAlarmProp))) {
       if ((a = isAPropertyOf(vo, VCAudioContentProp))) {
         s = fakeCString(vObjectUStringZValue(a));
         alarm->setAudioAlarm(QFile::decodeName(s));
         deleteStr(s);
       }
     }
   }
 
   // related todo
   if ((vo = isAPropertyOf(vtodo, VCRelatedToProp)) != 0) {
     anEvent->setRelatedToUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     mTodosRelate.append(anEvent);
   }
 
   // categories
   QStringList tmpStrList;
   int index1 = 0;
   int index2 = 0;
   if ((vo = isAPropertyOf(vtodo, VCCategoriesProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     QString categories = QString::fromLocal8Bit(s);
     deleteStr(s);
     //const char* category;
     QString category;
     while ((index2 = categories.find(',', index1)) != -1) {
         //category = (const char *) categories.mid(index1, (index2 - index1));
       category = categories.mid(index1, (index2 - index1));
       tmpStrList.append(category);
       index1 = index2+1;
     }
     // get last category
     category = categories.mid(index1, (categories.length()-index1));
     tmpStrList.append(category);
     anEvent->setCategories(tmpStrList);
   }
 
   /* PILOT SYNC STUFF */
   if ((vo = isAPropertyOf(vtodo, XPilotIdProp))) {
     anEvent->setPilotId(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setPilotId(0);
 
   if ((vo = isAPropertyOf(vtodo, XPilotStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setSyncStatus(Event::SYNCMOD);
 
   return anEvent;
 }
 
 Event* VCalFormat::VEventToEvent(VObject *vevent)
 {
   VObject *vo;
   VObjectIterator voi;
   char *s;
 
   Event *anEvent = new Event;
 
   // creation date
   if ((vo = isAPropertyOf(vevent, VCDCreatedProp)) != 0) {
       anEvent->setCreated(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
   }
 
   // unique id
   vo = isAPropertyOf(vevent, VCUniqueStringProp);
   // while the UID property is preferred, it is not required.  We'll use the
   // default Event UID if none is given.
   if (vo) {
     anEvent->setUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
 
   // revision
   // again NSCAL doesn't give us much to work with, so we improvise...
   if ((vo = isAPropertyOf(vevent, VCSequenceProp)) != 0) {
     anEvent->setRevision(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setRevision(0);
 
   // last modification date
   if ((vo = isAPropertyOf(vevent, VCLastModifiedProp)) != 0) {
     anEvent->setLastModified(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setLastModified(QDateTime(QDate::currentDate(),
                                        QTime::currentTime()));
 
   // organizer
   // if our extension property for the event's ORGANIZER exists, add it.
   if ((vo = isAPropertyOf(vevent, ICOrganizerProp)) != 0) {
     anEvent->setOrganizer(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   } else {
     anEvent->setOrganizer(mCalendar->getEmail());
   }
 
   // deal with attendees.
   initPropIterator(&voi, vevent);
   while (moreIteration(&voi)) {
     vo = nextVObject(&voi);
     if (strcmp(vObjectName(vo), VCAttendeeProp) == 0) {
       Attendee *a;
       VObject *vp;
       s = fakeCString(vObjectUStringZValue(vo));
       QString tmpStr = QString::fromLocal8Bit(s);
       deleteStr(s);
       tmpStr = tmpStr.simplifyWhiteSpace();
       int emailPos1, emailPos2;
       if ((emailPos1 = tmpStr.find('<')) > 0) {
         // both email address and name
         emailPos2 = tmpStr.findRev('>');
         a = new Attendee(tmpStr.left(emailPos1 - 1),
                          tmpStr.mid(emailPos1 + 1,
                                     emailPos2 - (emailPos1 + 1)));
       } else if (tmpStr.find('@') > 0) {
         // just an email address
         a = new Attendee(0, tmpStr);
       } else {
         // just a name
-        QString email = tmpStr.replace( QRegExp(" "), "." );
-        a = new Attendee(tmpStr,email);
+          //QString email = tmpStr.replace( QRegExp(" "), "." );
+          a = new Attendee(tmpStr,0);
       }
 
+  
+  // is there a Role property?
+      if ((vp = isAPropertyOf(vo, VCRoleProp)) != 0)
+          a->setRole(readRole(vObjectStringZValue(vp)));
+
       // is there an RSVP property?
       if ((vp = isAPropertyOf(vo, VCRSVPProp)) != 0)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
         a->setStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
   }
 
   // This isn't strictly true.  An event that doesn't have a start time
   // or an end time doesn't "float", it has an anchor in time but it doesn't
   // "take up" any time.
   /*if ((isAPropertyOf(vevent, VCDTstartProp) == 0) ||
       (isAPropertyOf(vevent, VCDTendProp) == 0)) {
     anEvent->setFloats(TRUE);
     } else {
     }*/
 
   anEvent->setFloats(FALSE);
 
   // start time
   if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) {
     anEvent->setDtStart(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
             //    kdDebug(5800) << "s is " << //  s << ", ISO is " << ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl;
     deleteStr(s);
     if (anEvent->dtStart().time().isNull())
       anEvent->setFloats(TRUE);
   }
 
   // stop time
   if ((vo = isAPropertyOf(vevent, VCDTendProp)) != 0) {
     anEvent->setDtEnd(ISOToQDateTime(s = fakeCString(vObjectUStringZValue(vo))));
       deleteStr(s);
       if (anEvent->dtEnd().time().isNull())
         anEvent->setFloats(TRUE);
   }
 
   // at this point, there should be at least a start or end time.
   // fix up for events that take up no time but have a time associated
   if (!(vo = isAPropertyOf(vevent, VCDTstartProp)))
     anEvent->setDtStart(anEvent->dtEnd());
   if (!(vo = isAPropertyOf(vevent, VCDTendProp)))
     anEvent->setDtEnd(anEvent->dtStart());
 
   ///////////////////////////////////////////////////////////////////////////
 
   // repeat stuff
   if ((vo = isAPropertyOf(vevent, VCRRuleProp)) != 0) {
     QString tmpStr = (s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     tmpStr.simplifyWhiteSpace();
     tmpStr = tmpStr.upper();
 
     /********************************* DAILY ******************************/
     if (tmpStr.left(1) == "D") {
       int index = tmpStr.find(' ');
       int rFreq = tmpStr.mid(1, (index-1)).toInt();
       index = tmpStr.findRev(' ') + 1; // advance to last field
       if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setDaily(rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0) // VEvents set this to 0 forever, we use -1
           anEvent->recurrence()->setDaily(rFreq, -1);
         else
           anEvent->recurrence()->setDaily(rFreq, rDuration);
       }
     }
     /********************************* WEEKLY ******************************/
     else if (tmpStr.left(1) == "W") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(1, (index-1)).toInt();
       index += 1; // advance to beginning of stuff after freq
       QBitArray qba(7);
       QString dayStr;
       if( index == last ) {
         // e.g. W1 #0
         qba.setBit(anEvent->dtStart().date().dayOfWeek() - 1);
       }
       else {
         // e.g. W1 SU #0
         while (index < last) {
           dayStr = tmpStr.mid(index, 3);
           int dayNum = numFromDay(dayStr);
           qba.setBit(dayNum);
           index += 3; // advance to next day, or possibly "#"
         }
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setWeekly(rFreq, qba, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setWeekly(rFreq, qba, -1);
         else
           anEvent->recurrence()->setWeekly(rFreq, qba, rDuration);
       }
     }
     /**************************** MONTHLY-BY-POS ***************************/
     else if (tmpStr.left(2) == "MP") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1; // advance to beginning of stuff after freq
       QBitArray qba(7);
       short tmpPos;
       if( index == last ) {
         // e.g. MP1 #0
         tmpPos = anEvent->dtStart().date().day()/7 + 1;
         if( tmpPos == 5 )
           tmpPos = -1;
         qba.setBit(anEvent->dtStart().date().dayOfWeek() - 1);
         anEvent->recurrence()->addMonthlyPos(tmpPos, qba);
       }
       else {
         // e.g. MP1 1+ SU #0
         while (index < last) {
           tmpPos = tmpStr.mid(index,1).toShort();
           index += 1;
           if (tmpStr.mid(index,1) == "-")
             // convert tmpPos to negative
             tmpPos = 0 - tmpPos;
           index += 2; // advance to day(s)
           while (numFromDay(tmpStr.mid(index,3)) >= 0) {
             int dayNum = numFromDay(tmpStr.mid(index,3));
             qba.setBit(dayNum);
             index += 3; // advance to next day, or possibly pos or "#"
           }
           anEvent->recurrence()->addMonthlyPos(tmpPos, qba);
           qba.detach();
           qba.fill(FALSE); // clear out
         } // while != "#"
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length() -
                                                     index))).date();
         anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, -1);
         else
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyPos, rFreq, rDuration);
       }
     }
 
     /**************************** MONTHLY-BY-DAY ***************************/
     else if (tmpStr.left(2) == "MD") {
       int index = tmpStr.find(' ');
       int last = tmpStr.findRev(' ') + 1;
       int rFreq = tmpStr.mid(2, (index-1)).toInt();
       index += 1;
       short tmpDay;
       if( index == last ) {
         // e.g. MD1 #0
         tmpDay = anEvent->dtStart().date().day();
         anEvent->recurrence()->addMonthlyDay(tmpDay);
       }
       else {
         // e.g. MD1 3 #0
         while (index < last) {
           int index2 = tmpStr.find(' ', index);
           tmpDay = tmpStr.mid(index, (index2-index)).toShort();
           index = index2-1;
           if (tmpStr.mid(index, 1) == "-")
             tmpDay = 0 - tmpDay;
           index += 2; // advance the index;
           anEvent->recurrence()->addMonthlyDay(tmpDay);
         } // while != #
       }
       index = last; if (tmpStr.mid(index,1) == "#") index++;
       if (tmpStr.find('T', index) != -1) {
         QDate rEndDate = (ISOToQDateTime(tmpStr.mid(index, tmpStr.length()-index))).date();
         anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, rEndDate);
       } else {
         int rDuration = tmpStr.mid(index, tmpStr.length()-index).toInt();
         if (rDuration == 0)
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, -1);
         else
           anEvent->recurrence()->setMonthly(Recurrence::rMonthlyDay, rFreq, rDuration);
       }
     }
 
     /*********************** YEARLY-BY-MONTH *******************************/
@@ -1469,252 +1478,270 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
   QDate tmpDate;
   QTime tmpTime;
   QString tmpStr;
   int year, month, day, hour, minute, second;
 
   tmpStr = dtStr;
   year = tmpStr.left(4).toInt();
   month = tmpStr.mid(4,2).toInt();
   day = tmpStr.mid(6,2).toInt();
   hour = tmpStr.mid(9,2).toInt();
   minute = tmpStr.mid(11,2).toInt();
   second = tmpStr.mid(13,2).toInt();
   tmpDate.setYMD(year, month, day);
   tmpTime.setHMS(hour, minute, second);
 
   ASSERT(tmpDate.isValid());
   ASSERT(tmpTime.isValid());
   QDateTime tmpDT(tmpDate, tmpTime);
   // correct for GMT if string is in Zulu format
   if (dtStr.at(dtStr.length()-1) == 'Z')
     tmpDT = tmpDT.addSecs (KGlobal::locale()->localTimeOffset( tmpDT )*60);
   return tmpDT;
 }
 
 QDate VCalFormat::ISOToQDate(const QString &dateStr)
 {
   int year, month, day;
 
   year = dateStr.left(4).toInt();
   month = dateStr.mid(4,2).toInt();
   day = dateStr.mid(6,2).toInt();
 
   return(QDate(year, month, day));
 }
 
 // take a raw vcalendar (i.e. from a file on disk, clipboard, etc. etc.
 // and break it down from it's tree-like format into the dictionary format
 // that is used internally in the VCalFormat.
 void VCalFormat::populate(VObject *vcal)
 {
   // this function will populate the caldict dictionary and other event
   // lists. It turns vevents into Events and then inserts them.
 
   VObjectIterator i;
   VObject *curVO, *curVOProp;
   Event *anEvent;
 
   if ((curVO = isAPropertyOf(vcal, ICMethodProp)) != 0) {
     char *methodType = 0;
     methodType = fakeCString(vObjectUStringZValue(curVO));
     kdDebug() << "This calendar is an iTIP transaction of type '"
               << methodType << "'" << endl;
     delete methodType;
   }
 
   // warn the user that we might have trouble reading non-known calendar.
   if ((curVO = isAPropertyOf(vcal, VCProdIdProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(productId().local8Bit(), s) != 0)
       kdDebug() << "This vCalendar file was not created by KOrganizer "
                    "or any other product we support. Loading anyway..." << endl;
     mLoadedProductId = s;
     deleteStr(s);
   }
 
   // warn the user we might have trouble reading this unknown version.
   if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(_VCAL_VERSION, s) != 0)
       kdDebug() << "This vCalendar file has version " << s
                 << "We only support " << _VCAL_VERSION << endl;
     deleteStr(s);
   }
 
   // set the time zone
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
       if ( vObjectUStringZValue(curVO) != 0 ) {
           char *s = fakeCString(vObjectUStringZValue(curVO));
           mCalendar->setTimeZone(s);
           deleteStr(s);
       }
   }
 
   // Store all events with a relatedTo property in a list for post-processing
   mEventsRelate.clear();
   mTodosRelate.clear();
 
   initPropIterator(&i, vcal);
 
   // go through all the vobjects in the vcal
   while (moreIteration(&i)) {
     curVO = nextVObject(&i);
 
     /************************************************************************/
 
     // now, check to see that the object is an event or todo.
     if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
 
       if ((curVOProp = isAPropertyOf(curVO, XPilotStatusProp)) != 0) {
         char *s;
         s = fakeCString(vObjectUStringZValue(curVOProp));
         // check to see if event was deleted by the kpilot conduit
         if (atoi(s) == Event::SYNCDEL) {
           deleteStr(s);
           kdDebug(5800) << "skipping pilot-deleted event" << endl;
           goto SKIP;
         }
         deleteStr(s);
       }
 
       // this code checks to see if we are trying to read in an event
       // that we already find to be in the calendar.  If we find this
       // to be the case, we skip the event.
       if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) {
         char *s = fakeCString(vObjectUStringZValue(curVOProp));
         QString tmpStr(s);
         deleteStr(s);
 
         if (mCalendar->event(tmpStr)) {
           goto SKIP;
         }
         if (mCalendar->todo(tmpStr)) {
           goto SKIP;
         }
       }
 
       if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) &&
           (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) {
         kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl;
         goto SKIP;
       }
 
       anEvent = VEventToEvent(curVO);
       // we now use addEvent instead of insertEvent so that the
       // signal/slot get connected.
       if (anEvent) {
               if ( !anEvent->dtStart().isValid() || !anEvent->dtEnd().isValid() ) {
           kdDebug() << "VCalFormat::populate(): Event has invalid dates."
                     << endl;
         } else {
           mCalendar->addEvent(anEvent);
               }
       } else {
         // some sort of error must have occurred while in translation.
         goto SKIP;
       }
     } else if (strcmp(vObjectName(curVO), VCTodoProp) == 0) {
       Todo *aTodo = VTodoToEvent(curVO);
       mCalendar->addTodo(aTodo);
     } else if ((strcmp(vObjectName(curVO), VCVersionProp) == 0) ||
                (strcmp(vObjectName(curVO), VCProdIdProp) == 0) ||
                (strcmp(vObjectName(curVO), VCTimeZoneProp) == 0)) {
       // do nothing, we know these properties and we want to skip them.
       // we have either already processed them or are ignoring them.
       ;
     } else {
       kdDebug(5800) << "Ignoring unknown vObject \"" << vObjectName(curVO) << "\"" << endl;
     }
   SKIP:
     ;
   } // while
 
   // Post-Process list of events with relations, put Event objects in relation
   Event *ev;
   for ( ev=mEventsRelate.first(); ev != 0; ev=mEventsRelate.next() ) {
     ev->setRelatedTo(mCalendar->event(ev->relatedToUid()));
   }
   Todo *todo;
   for ( todo=mTodosRelate.first(); todo != 0; todo=mTodosRelate.next() ) {
     todo->setRelatedTo(mCalendar->todo(todo->relatedToUid()));
   }
 }
 
 const char *VCalFormat::dayFromNum(int day)
 {
   const char *days[7] = { "MO ", "TU ", "WE ", "TH ", "FR ", "SA ", "SU " };
 
   return days[day];
 }
 
 int VCalFormat::numFromDay(const QString &day)
 {
   if (day == "MO ") return 0;
   if (day == "TU ") return 1;
   if (day == "WE ") return 2;
   if (day == "TH ") return 3;
   if (day == "FR ") return 4;
   if (day == "SA ") return 5;
   if (day == "SU ") return 6;
 
   return -1; // something bad happened. :)
 }
+Attendee::Role VCalFormat::readRole(const char *s) const
+{
+    QString statStr = s;
+  statStr = statStr.upper();
+  Attendee::Role role = Attendee::ReqParticipant;
+
+  if ( statStr == "OWNER")
+      role = Attendee::Chair;
+  //  enum Role { ReqParticipant, OptParticipant, NonParticipant, Chair };
+
+  return role;
+}
 
+QCString VCalFormat::writeRole(Attendee::Role role) const
+{
+    if ( role == Attendee::Chair )
+        return "OWNER";
+    return "ATTENDEE";
+}
 Attendee::PartStat VCalFormat::readStatus(const char *s) const
 {
   QString statStr = s;
   statStr = statStr.upper();
   Attendee::PartStat status;
 
   if (statStr == "X-ACTION")
     status = Attendee::NeedsAction;
   else if (statStr == "NEEDS ACTION")
     status = Attendee::NeedsAction;
   else if (statStr== "ACCEPTED")
     status = Attendee::Accepted;
   else if (statStr== "SENT")
     status = Attendee::NeedsAction;
   else if (statStr== "TENTATIVE")
     status = Attendee::Tentative;
   else if (statStr== "CONFIRMED")
     status = Attendee::Accepted;
   else if (statStr== "DECLINED")
     status = Attendee::Declined;
   else if (statStr== "COMPLETED")
     status = Attendee::Completed;
   else if (statStr== "DELEGATED")
     status = Attendee::Delegated;
   else {
     kdDebug(5800) << "error setting attendee mStatus, unknown mStatus!" << endl;
     status = Attendee::NeedsAction;
   }
 
   return status;
 }
 
 QCString VCalFormat::writeStatus(Attendee::PartStat status) const
 {
   switch(status) {
     default:
     case Attendee::NeedsAction:
       return "NEEDS ACTION";
       break;
     case Attendee::Accepted:
       return "ACCEPTED";
       break;
     case Attendee::Declined:
       return "DECLINED";
       break;
     case Attendee::Tentative:
       return "TENTATIVE";
       break;
     case Attendee::Delegated:
       return "DELEGATED";
       break;
     case Attendee::Completed:
       return "COMPLETED";
       break;
     case Attendee::InProcess:
       return "NEEDS ACTION";
       break;
   }
 }
diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h
index 5bef7ed..c7df017 100644
--- a/libkcal/vcalformat.h
+++ b/libkcal/vcalformat.h
@@ -1,112 +1,113 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001 Cornelius Schumacher <schumacher@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.
 */
 
 #ifndef _VCALFORMAT_H
 #define _VCALFORMAT_H
 
 #include "calformat.h"
 
 #define _VCAL_VERSION "1.0"
 
 class VObject;
 
 namespace KCal {
 
 /**
   This class implements the vCalendar format. It provides methods for
   loading/saving/converting vCalendar format data into the internal KOrganizer
   representation as Calendar and Events.
 
   @short vCalendar format implementation
 */
 class VCalFormat : public CalFormat {
   public:
     VCalFormat();
     virtual ~VCalFormat();
 
    /** loads a calendar on disk in vCalendar format into the current calendar.
      * any information already present is lost. Returns TRUE if successful,
      * else returns FALSE.
      * @param fileName the name of the calendar on disk.
      */
     bool load(Calendar *,const QString &fileName );
     /** writes out the calendar to disk in vCalendar format. Returns true if
      * successful and false on error.
      * @param fileName the name of the file
      */
     bool save(Calendar *,const QString &fileName );
   
     /**
       Parse string and populate calendar with that information.
     */
     bool fromString( Calendar *, const QString & );  
     /**
       Return calendar information as string.
     */
     void setLocalTime ( bool );
     QString toString( Calendar * );
     QString eventToString( Event *, Calendar *calendar, bool useLocalTime = true );
     QString todoToString( Todo * ,Calendar *calendar, bool useLocalTime = true );
     
   protected:
     /** translates a VObject of the TODO type into a Event */
     Todo *VTodoToEvent(VObject *vtodo);
     /** translates a VObject into a Event and returns a pointer to it. */
     Event *VEventToEvent(VObject *vevent);
     /** translate a Event into a VTodo-type VObject and return pointer */
     VObject *eventToVTodo(const Todo *anEvent);
     /** translate a Event into a VObject and returns a pointer to it. */
     VObject* eventToVEvent(const Event *anEvent);
 
     /** takes a QDate and returns a string in the format YYYYMMDDTHHMMSS */
     QString qDateToISO(const QDate &);
     /** takes a QDateTime and returns a string in format YYYYMMDDTHHMMSS */
     QString qDateTimeToISO(const QDateTime &, bool zulu=TRUE);
     /** takes a string in the format YYYYMMDDTHHMMSS and returns a 
      * valid QDateTime. */
     QDateTime ISOToQDateTime(const QString & dtStr);
     /** takes a string in the format YYYYMMDD and returns a 
      * valid QDate. */
     QDate ISOToQDate(const QString & dtStr);
     /** takes a vCalendar tree of VObjects, and puts all of them that have
      * the "event" property into the dictionary, todos in the todo-list, etc. */
     void populate(VObject *vcal);
   
     /** takes a number 0 - 6 and returns the two letter string of that day,
       * i.e. MO, TU, WE, etc. */
     const char *dayFromNum(int day);
     /** the reverse of the above function. */
     int numFromDay(const QString &day);
-
+    Attendee::Role VCalFormat::readRole(const char *s) const;
+    QCString writeRole(Attendee::Role role) const;
     Attendee::PartStat readStatus(const char *s) const;
     QCString writeStatus(Attendee::PartStat status) const;
   
   private:
     Calendar *mCalendar;
     bool useLocalTime;
   
     QPtrList<Event> mEventsRelate;           // events with relations
     QPtrList<Todo> mTodosRelate;             // todos with relations
 };
 
 }
 
 #endif
diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c
index 9be752d..5413813 100644
--- a/libkcal/versit/vcc.c
+++ b/libkcal/versit/vcc.c
@@ -1573,385 +1573,386 @@ static void enterAttr(const char *s1, const char *s2)
     {
     const char *p1, *p2;
     p1 = lookupProp_(s1);
     if (s2) {
         VObject *a;
         p2 = lookupProp_(s2);
         a = addProp(curProp,p1);
         setVObjectStringZValue(a,p2);
         }
     else
         addProp(curProp,p1);
     if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
         lexPushMode(L_BASE64);
     else if (stricmp(p1,VCQuotedPrintableProp) == 0
             || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
         lexPushMode(L_QUOTED_PRINTABLE);
     deleteStr(s1); deleteStr(s2);
     }
 
 
 #define MAX_LEX_LOOKAHEAD_0 32
 #define MAX_LEX_LOOKAHEAD 64
 #define MAX_LEX_MODE_STACK_SIZE 10
 #define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
 
 struct LexBuf {
         /* input */
 #ifdef INCLUDEMFC
     CFile *inputFile;
 #else
     FILE *inputFile;
 #endif
     char *inputString;
     unsigned long curPos;
     unsigned long inputLen;
         /* lookahead buffer */
         /*   -- lookahead buffer is short instead of char so that EOF
          /      can be represented correctly.
         */
     unsigned long len;
     short buf[MAX_LEX_LOOKAHEAD];
     unsigned long getPtr;
         /* context stack */
     unsigned long lexModeStackTop;
     enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
         /* token buffer */
     unsigned long maxToken;
     char *strs;
     unsigned long strsLen;
     } lexBuf;
 
 static void lexPushMode(enum LexMode mode)
     {
     if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
         yyerror("lexical context stack overflow");
     else {
         lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
         }
     }
 
 static void lexPopMode(int top)
     {
     /* special case of pop for ease of error recovery -- this
         version will never underflow */
     if (top)
         lexBuf.lexModeStackTop = 0;
     else
         if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
     }
 
 static int lexWithinMode(enum LexMode mode) {
     unsigned long i;
     for (i=0;i<lexBuf.lexModeStackTop;i++)
         if (mode == lexBuf.lexModeStack[i]) return 1;
     return 0;
     }
 
 static char lexGetc_()
     {
     /* get next char from input, no buffering. */
     if (lexBuf.curPos == lexBuf.inputLen)
         return EOF;
     else if (lexBuf.inputString)
         return *(lexBuf.inputString + lexBuf.curPos++);
     else {
 #ifdef INCLUDEMFC
         char result;
         return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
 #else
         return fgetc(lexBuf.inputFile);
 #endif
         }
     }
 
 static int lexGeta()
     {
     ++lexBuf.len;
     return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
     }
 
 static int lexGeta_(int i)
     {
     ++lexBuf.len;
     return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
     }
 
 static void lexSkipLookahead() {
     if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
         /* don't skip EOF. */
         lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
         lexBuf.len--;
         }
     }
 
 static int lexLookahead() {
     int c = (lexBuf.len)?
         lexBuf.buf[lexBuf.getPtr]:
         lexGeta();
     /* do the \r\n -> \n or \r -> \n translation here */
     if (c == '\r') {
         int a = (lexBuf.len>1)?
             lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
             lexGeta_(1);
         if (a == '\n') {
             lexSkipLookahead();
             }
         lexBuf.buf[lexBuf.getPtr] = c = '\n';
         }
     else if (c == '\n') {
         int a = (lexBuf.len>1)?
             lexBuf.buf[lexBuf.getPtr+1]:
             lexGeta_(1);
         if (a == '\r') {
             lexSkipLookahead();
             }
         lexBuf.buf[lexBuf.getPtr] = '\n';
         }
     return c;
     }
 
 static int lexGetc() {
     int c = lexLookahead();
     if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
         /* EOF will remain in lookahead buffer */
         lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
         lexBuf.len--;
         }
     return c;
     }
 
 static void lexSkipLookaheadWord() {
     if (lexBuf.strsLen <= lexBuf.len) {
         lexBuf.len -= lexBuf.strsLen;
         lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
         }
     }
 
 static void lexClearToken()
     {
     lexBuf.strsLen = 0;
     }
 
 static void lexAppendc(int c)
     {
     lexBuf.strs[lexBuf.strsLen] = c;
     /* append up to zero termination */
     if (c == 0) return;
     lexBuf.strsLen++;
     if (lexBuf.strsLen > lexBuf.maxToken) {
         /* double the token string size */
         lexBuf.maxToken <<= 1;
         lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
         }
     }
 
 static char* lexStr() {
     return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
     }
 
 static void lexSkipWhite() {
     int c = lexLookahead();
     while (c == ' ' || c == '\t') {
         lexSkipLookahead();
         c = lexLookahead();
         }
     }
 
 static char* lexGetWord() {
     int c;
     lexSkipWhite();
     lexClearToken();
     c = lexLookahead();
-    while (c != EOF && !strchr("\t\n ;:=",c)) {
+    // LR while (c != EOF && !strchr("\t\n ;:=",c)) {
+    while (c != EOF && !strchr("\t\n;:=",c)) {
         lexAppendc(c);
         lexSkipLookahead();
         c = lexLookahead();
         }
     lexAppendc(0);
     return lexStr();
     }
 
 static void lexPushLookaheadc(int c) {
     int putptr;
     /* can't putback EOF, because it never leaves lookahead buffer */
     if (c == EOF) return;
     putptr = (int)lexBuf.getPtr - 1;
     if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
     lexBuf.getPtr = putptr;
     lexBuf.buf[putptr] = c;
     lexBuf.len += 1;
     }
 
 static char* lexLookaheadWord() {
     /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
      /  and thing bigger than that will stop the lookahead and return 0;
      / leading white spaces are not recoverable.
      */
     int c;
     int len = 0;
     int curgetptr = 0;
     lexSkipWhite();
     lexClearToken();
             curgetptr = (int)lexBuf.getPtr;/* remember! */
     while (len < (MAX_LEX_LOOKAHEAD_0)) {
         c = lexGetc();
         len++;
         if (c == EOF || strchr("\t\n ;:=", c)) {
             lexAppendc(0);
             /* restore lookahead buf. */
             lexBuf.len += len;
             lexBuf.getPtr = curgetptr;
             return lexStr();
             }
         else
             lexAppendc(c);
         }
             lexBuf.len += len;/* char that has been moved to lookahead buffer */
     lexBuf.getPtr = curgetptr;
     return 0;
     }
 
 #ifdef _SUPPORT_LINE_FOLDING
 static void handleMoreRFC822LineBreak(int c) {
     /* suport RFC 822 line break in cases like
              *ADR: foo;
      *    morefoo;
      *    more foo;
      */
     if (c == ';') {
         int a;
         lexSkipLookahead();
         /* skip white spaces */
         a = lexLookahead();
         while (a == ' ' || a == '\t') {
             lexSkipLookahead();
             a = lexLookahead();
             }
         if (a == '\n') {
             lexSkipLookahead();
             a = lexLookahead();
             if (a == ' ' || a == '\t') {
                 /* continuation, throw away all the \n and spaces read so
                  * far
                  */
                 lexSkipWhite();
                 lexPushLookaheadc(';');
                 }
             else {
                 lexPushLookaheadc('\n');
                 lexPushLookaheadc(';');
                 }
             }
         else {
             lexPushLookaheadc(';');
             }
         }
     }
 
 static char* lexGet1Value() {
     int c;
     lexSkipWhite();
     c = lexLookahead();
     lexClearToken();
     while (c != EOF && c != ';') {
         if (c == '\n') {
             int a;
             lexSkipLookahead();
             a  = lexLookahead();
             if (a == ' ' || a == '\t') {
                 lexAppendc(' ');
                 lexSkipLookahead();
                 }
             else {
                 lexPushLookaheadc('\n');
                 break;
                 }
             }
         else {
             lexAppendc(c);
             lexSkipLookahead();
             }
         c = lexLookahead();
         }
     lexAppendc(0);
     handleMoreRFC822LineBreak(c);
     return c==EOF?0:lexStr();
     }
 #endif
 
 
 static int match_begin_name(int end) {
     char *n = lexLookaheadWord();
     int token = ID;
     if (n) {
         if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
         else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
         else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
         else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
         deleteStr(n);
         return token;
         }
     return 0;
     }
 
 
 #ifdef INCLUDEMFC
 void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
 #else
 void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
 #endif
     {
     /* initialize lex mode stack */
     lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
 
     /* iniatialize lex buffer. */
     lexBuf.inputString = (char*) inputstring;
     lexBuf.inputLen = inputlen;
     lexBuf.curPos = 0;
     lexBuf.inputFile = inputfile;
 
     lexBuf.len = 0;
     lexBuf.getPtr = 0;
 
     lexBuf.maxToken = MAXTOKEN;
     lexBuf.strs = (char*)malloc(MAXTOKEN);
     lexBuf.strsLen = 0;
 
     }
 
 static void finiLex() {
     free(lexBuf.strs);
     }
 
 
 /* This parses and converts the base64 format for binary encoding into
  * a decoded buffer (allocated with new).  See RFC 1521.
  */
 static char * lexGetDataFromBase64()
     {
     unsigned long bytesLen = 0, bytesMax = 0;
     int quadIx = 0, pad = 0;
     unsigned long trip = 0;
     unsigned char b;
     int c;
     unsigned char *bytes = NULL;
     unsigned char *oldBytes = NULL;
 
     DBG_(("db: lexGetDataFromBase64\n"));
     while (1) {
         c = lexGetc();
         if (c == '\n') {
             ++mime_lineNum;
             if (lexLookahead() == '\n') {
                 /* a '\n' character by itself means end of data */
                 break;
                 }
             else continue; /* ignore '\n' */
             }
         else {
             if ((c >= 'A') && (c <= 'Z'))
                 b = (unsigned char)(c - 'A');
             else if ((c >= 'a') && (c <= 'z'))
                 b = (unsigned char)(c - 'a') + 26;
             else if ((c >= '0') && (c <= '9'))
                 b = (unsigned char)(c - '0') + 52;