1 files changed, 17 insertions, 17 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 8525b0de7..16deee5b7 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqregexp.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 
@@ -262,7 +262,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
         kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl;
       VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit());
       addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE");
-      addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status()));
+      addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status()));
     }
   }
 
@@ -355,7 +355,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
     // pilot sync stuff
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
-    tmpStr.sprintf("%i",anEvent->syncStatus());
+    tmpStr.sprintf("%i",anEvent->synctqStatus());
     addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit());
   }
 
@@ -422,7 +422,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
         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, VCStatusProp, writeStatus(curAttendee->status()));
+      addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status()));
     }
   }
 
@@ -641,7 +641,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
     // pilot sync stuff
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit());
-    tmpStr.sprintf("%i",anEvent->syncStatus());
+    tmpStr.sprintf("%i",anEvent->synctqStatus());
     addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit());
   }
 
@@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
     deleteStr(s);
   }
   else
-    anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+    anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
                                        TQTime::currentTime()));
 
   // organizer
@@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->seStatus(readStatus(vObjectStringZValue(vp)));
+        a->setqStatus(readtqStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -845,11 +845,11 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
     anEvent->setPilotId(0);
 
   if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) {
-    anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
-    anEvent->setSyncStatus(Event::SYNCMOD);
+    anEvent->setSynctqStatus(Event::SYNCMOD);
 
   return anEvent;
 }
@@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     deleteStr(s);
   }
   else
-    anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+    anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
                                        TQTime::currentTime()));
 
   // organizer
@@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->seStatus(readStatus(vObjectStringZValue(vp)));
+        a->setqStatus(readtqStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
 // TODO: Define Event status
-//    anEvent->seStatus(tmpStr);
+//    anEvent->setqStatus(tmpStr);
   }
   else
-//    anEvent->seStatus("NEEDS ACTION");
+//    anEvent->setqStatus("NEEDS ACTION");
 #endif
 
   // secrecy
@@ -1311,11 +1311,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     anEvent->setPilotId(0);
 
   if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) {
-    anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
+    anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
   else
-    anEvent->setSyncStatus(Event::SYNCMOD);
+    anEvent->setSynctqStatus(Event::SYNCMOD);
 
   return anEvent;
 }
@@ -1565,7 +1565,7 @@ int VCalFormat::numFromDay(const TQString &day)
   return -1; // something bad happened. :)
 }
 
-Attendee::PartStat VCalFormat::readStatus(const char *s) const
+Attendee::PartStat VCalFormat::readtqStatus(const char *s) const
 {
   TQString statStr = s;
   statStr = statStr.upper();
@@ -1597,7 +1597,7 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const
   return status;
 }
 
-TQCString VCalFormat::writeStatus(Attendee::PartStat status) const
+TQCString VCalFormat::writetqStatus(Attendee::PartStat status) const
 {
   switch(status) {
     default: