1 files changed, 13 insertions, 13 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index bb53a3531..0af7b4c52 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -75,7 +75,7 @@ static TQString quoteForParam( const TQString &text )
   tmp.remove( '"' );
   if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) )
     return tmp; // libical quotes in this case already, see icalparameter_as_ical_string()
-  return TQString::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" );
+  return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" );
 }
 
 const int gSecondsPerMinute = 60;
@@ -157,7 +157,7 @@ icalcomponent *ICalFormatImpl::writeTodo(Todo *todo)
     if (!todo->hasCompletedDate()) {
       // If todo was created by KOrganizer <2.2 it has no correct completion
       // date. Set it to now.
-      todo->setCompleted(TQDateTime::tqcurrentDateTime());
+      todo->setCompleted(TQDateTime::currentDateTime());
     }
     icaltimetype completed = writeICalDateTime(todo->completed());
     icalcomponent_add_property(vtodo,icalproperty_new_completed(completed));
@@ -312,11 +312,11 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
   if (incidence->pilotId()) {
     // NOTE: we can't do setNonKDECustomProperty here because this changes
     // data and triggers an updated() event...
-    // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->synctqStatus()));
+    // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->syncStatus()));
     // incidence->setNonKDECustomProperty("X-PILOTID", TQString::number(incidence->pilotId()));
 
     icalproperty *p = 0;
-    p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8());
+    p = icalproperty_new_x(TQString::number(incidence->syncStatus()).utf8());
     icalproperty_set_x_name(p,"X-PILOTSTAT");
     icalcomponent_add_property(parent,p);
 
@@ -535,7 +535,7 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent,
                                          IncidenceBase * incidenceBase )
 {
   icalcomponent_add_property( parent, icalproperty_new_dtstamp(
-      writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) );
+      writeICalDateTime( TQDateTime::currentDateTime() ) ) );
 
   // organizer stuff
   if ( !incidenceBase->organizer().isEmpty() ) {
@@ -1081,7 +1081,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon
 
   const TQString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT");
   if ( !msade.isEmpty() ) {
-    const bool floats = ( msade == TQString::tqfromLatin1("TRUE") );
+    const bool floats = ( msade == TQString::fromLatin1("TRUE") );
     event->setFloats(floats);
   }
 
@@ -1171,7 +1171,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
   icalparameter *p = 0;
 
   TQString email = TQString::fromUtf8(icalproperty_get_attendee(attendee));
-  if ( email.tqstartsWith( "mailto:", false ) ) {
+  if ( email.startsWith( "mailto:", false ) ) {
     email = email.mid( 7 );
   }
 
@@ -1267,7 +1267,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
 Person ICalFormatImpl::readOrganizer( icalproperty *organizer )
 {
   TQString email = TQString::fromUtf8(icalproperty_get_organizer(organizer));
-  if ( email.tqstartsWith( "mailto:", false ) ) {
+  if ( email.startsWith( "mailto:", false ) ) {
     email = email.mid( 7 );
   }
   TQString cn;
@@ -1420,7 +1420,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
         break;
 
       case ICAL_STATUS_PROPERTY: {  // status
-        Incidence::tqStatus stat;
+        Incidence::Status stat;
         switch (icalproperty_get_status(p)) {
           case ICAL_STATUS_TENTATIVE:   stat = Incidence::StatusTentative; break;
           case ICAL_STATUS_CONFIRMED:   stat = Incidence::StatusConfirmed; break;
@@ -1431,14 +1431,14 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
           case ICAL_STATUS_DRAFT:       stat = Incidence::StatusDraft; break;
           case ICAL_STATUS_FINAL:       stat = Incidence::StatusFinal; break;
           case ICAL_STATUS_X:
-            incidence->setCustomtqStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p))));
+            incidence->setCustomStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p))));
             stat = Incidence::StatusX;
             break;
           case ICAL_STATUS_NONE:
           default:                      stat = Incidence::StatusNone; break;
         }
         if (stat != Incidence::StatusX)
-          incidence->setqStatus(stat);
+          incidence->seStatus(stat);
         break;
       }
 
@@ -1618,7 +1618,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci
       incidenceBase->setPilotId(value.toInt());
       icalcomponent_remove_property(parent,p);
     } else if (name == "X-PILOTSTAT" && !value.isEmpty()) {
-      incidenceBase->setSynctqStatus(value.toInt());
+      incidenceBase->setSyncStatus(value.toInt());
       icalcomponent_remove_property(parent,p);
     }
   }
@@ -1855,7 +1855,7 @@ void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence)
       // Only in EMAIL alarm
       case ICAL_ATTENDEE_PROPERTY: {
         TQString email = TQString::fromUtf8(icalproperty_get_attendee(p));
-        if ( email.tqstartsWith("mailto:", false ) ) {
+        if ( email.startsWith("mailto:", false ) ) {
           email = email.mid( 7 );
         }
         TQString name;