1 files changed, 30 insertions, 30 deletions

diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 33cc50eef..872e9b4a4 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -21,11 +21,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -86,7 +86,7 @@ KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::Reso
 
 TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
 {
-  Task task( 0, TQString::null, 0, tz, todo );
+  Task task( 0, TQString(), 0, tz, todo );
   return task.saveXML();
 }
 
@@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
-    mStatus( KCal::Incidence::StatusNone ),
+    mtqStatus( KCal::Incidence::StatusNone ),
     mHasStartDate( false ), mHasDueDate( false ),
     mHasCompletedDate( false )
 {
@@ -126,22 +126,22 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setqStatus( KCal::Incidence::tqStatus status )
 {
-  mStatus = status;
+  mtqStatus = status;
 }
 
-KCal::Incidence::Status Task::status() const
+KCal::Incidence::tqStatus Task::status() const
 {
-  return mStatus;
+  return mtqStatus;
 }
 
-void Task::setParent( const TQString& parentUid )
+void Task::setParent( const TQString& tqparentUid )
 {
-  mParent = parentUid;
+  mParent = tqparentUid;
 }
 
-TQString Task::parent() const
+TQString Task::tqparent() const
 {
   return mParent;
 }
@@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = HasTime;
+  mFloatingtqStatus = HasTime;
 }
 
 void Task::setDueDate( const TQDate &date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingStatus = AllDay;
+  mFloatingtqStatus = AllDay;
 }
 
 
@@ -234,20 +234,20 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      seStatus( KCal::Incidence::StatusInProcess );
+      setqStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      seStatus( KCal::Incidence::StatusCompleted );
+      setqStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      seStatus( KCal::Incidence::StatusNeedsAction );
+      setqStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      seStatus( KCal::Incidence::StatusCanceled );
+      setqStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      seStatus( KCal::Incidence::StatusNone );
+      setqStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
-  } else if ( tagName == "parent" ) {
+  } else if ( tagName == "tqparent" ) {
     setParent( element.text() );
   } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
@@ -300,15 +300,15 @@ bool Task::saveAttributes( TQDomElement& element ) const
   }
 
   if ( hasDueDate() ) {
-    if ( mFloatingStatus == HasTime ) {
+    if ( mFloatingtqStatus == HasTime ) {
       writeString( element, "due-date", dateTimeToString( dueDate() ) );
     } else {
       writeString( element, "due-date", dateToString( dueDate().date() ) );
     }
   }
 
-  if ( !parent().isNull() ) {
-    writeString( element, "parent", parent() );
+  if ( !tqparent().isNull() ) {
+    writeString( element, "tqparent", tqparent() );
   }
 
   if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  seStatus( task->status() );
+  setqStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
     setDueDate( localToUTC( task->dtDue() ) );
     if ( task->doesFloat() ) {
       // This is a floating task. Don't timezone move this one
-      mFloatingStatus = AllDay;
+      mFloatingtqStatus = AllDay;
       setDueDate( task->dtDue().date() );
     } else {
-      mFloatingStatus = HasTime;
+      mFloatingtqStatus = HasTime;
       setDueDate( localToUTC( task->dtDue() ) );
     }
   } else {
@@ -396,7 +396,7 @@ void Task::setFields( const KCal::Todo* task )
   } else if ( !task->relatedToUid().isEmpty() ) {
     setParent( task->relatedToUid( ) );
   } else {
-    setParent( TQString::null );
+    setParent( TQString() );
   }
 
   if ( task->hasCompletedDate() && task->percentComplete() == 100 ) {
@@ -447,14 +447,14 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->seStatus( status() );
+  task->setqStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
     task->setDtDue( utcToLocal( dueDate() ) );
 
-  if ( !parent().isNull() )
-    task->setRelatedToUid( parent() );
+  if ( !tqparent().isNull() )
+    task->setRelatedToUid( tqparent() );
 
   if ( hasCompletedDate() && task->percentComplete() == 100 )
     task->setCompleted( utcToLocal( mCompletedDate ) );