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
@@ -348,9 +348,9 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   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;
@@ -526,7 +526,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
   }
   if (!tmpStr2.isEmpty()) {
     tmpStr2.truncate(tmpStr2.length()-1);
-    addPropValue(vevent, VCExDateProp, tmpStr2.local8Bit());
+    addPropValue(vevent, VCExpDateProp, tmpStr2.local8Bit());
   }
 
   // description
@@ -641,9 +641,9 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
   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;
@@ -849,14 +849,14 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
   }
 
   /* 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);
   }
@@ -1207,7 +1207,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
 
   // 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;
@@ -1371,14 +1371,14 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
   }
 
   /* 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);
   }
@@ -1522,7 +1522,7 @@ void VCalFormat::populate(VObject *vcal)
     // 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