1 files changed, 11 insertions, 11 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 59030d5..72a781a 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -339,27 +339,27 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
       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()));
       }
     }
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
-    addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
+    addPropValue(vtodo, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vtodo, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vtodo, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vtodo;
 }
 
 VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 {
   VObject *vevent;
   QString tmpStr;
   QStringList tmpStrList;
 
   vevent = newVObject(VCEventProp);
@@ -517,25 +517,25 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 
   // 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, VCExDateProp, tmpStr2.local8Bit());
+    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())
@@ -632,27 +632,27 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
   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, KPilotIdProp, tmpStr.local8Bit());
+    addPropValue(vevent, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vevent, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vevent, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vevent;
 }
 
 Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 {
   VObject *vo;
   VObjectIterator voi;
   char *s;
 
   Todo *anEvent = new Todo;
@@ -840,32 +840,32 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
 	//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, KPilotIdProp))) {
+  if ((vo = isAPropertyOf(vtodo, XPilotIdProp))) {
     anEvent->setPilotId(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vtodo, KPilotStatusProp))) {
+  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;
@@ -1198,25 +1198,25 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 	if (rDuration == 0)
 	  anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, rFreq, -1);
 	else
 	  anEvent->recurrence()->setYearly(Recurrence::rYearlyDay, rFreq, rDuration);
       }
     } else {
       kdDebug(5800) << "we don't understand this type of recurrence!" << endl;
     } // if
   } // repeats
 
 
   // recurrence exceptions
-  if ((vo = isAPropertyOf(vevent, VCExDateProp)) != 0) {
+  if ((vo = isAPropertyOf(vevent, VCExpDateProp)) != 0) {
     s = fakeCString(vObjectUStringZValue(vo));
     QStringList exDates = QStringList::split(",",s);
     QStringList::ConstIterator it;
     for(it = exDates.begin(); it != exDates.end(); ++it ) {
       anEvent->addExDate(ISOToQDate(*it));
     }
     deleteStr(s);
   }
 
   // summary
   if ((vo = isAPropertyOf(vevent, VCSummaryProp))) {
     s = fakeCString(vObjectUStringZValue(vo));
@@ -1362,32 +1362,32 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     anEvent->setTransparency( i == 1 ? Event::Transparent : Event::Opaque );
     deleteStr(s);
   }
 
   // related event
   if ((vo = isAPropertyOf(vevent, VCRelatedToProp)) != 0) {
     anEvent->setRelatedToUid(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
     mEventsRelate.append(anEvent);
   }
 
   /* PILOT SYNC STUFF */
-  if ((vo = isAPropertyOf(vevent, KPilotIdProp))) {
+  if ((vo = isAPropertyOf(vevent, XPilotIdProp))) {
     anEvent->setPilotId(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vevent, KPilotStatusProp))) {
+  if ((vo = isAPropertyOf(vevent, XPilotStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
     anEvent->setSyncStatus(Event::SYNCMOD);
 
   return anEvent;
 }
 
 
 QString VCalFormat::qDateToISO(const QDate &qd)
 {
@@ -1513,25 +1513,25 @@ void VCalFormat::populate(VObject *vcal)
 
   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, KPilotStatusProp)) != 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