1 files changed, 10 insertions, 10 deletions
diff --git a/karm/task.cpp b/karm/task.cpp
index 03eb1d3b..7d84bcd2 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
 
   _removing = false;
   _name = taskName.stripWhiteSpace();
-  _lastStart = TQDateTime::tqcurrentDateTime();
+  _lastStart = TQDateTime::currentDateTime();
   _totalTime = _time = minutes;
   _totalSessionTime = _sessionTime = sessionTime;
   _timer = new TQTimer(this);
   _desktops = desktops;
   connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
-  setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
+  setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
   _currentPic = 0;
   _percentcomplete = percent_complete;
 
@@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ
       if ( ! _removing ) 
       {
         storage->stopTimer(this, whenStopped);
-        setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
+        setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
       }
     }
   }
@@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage)
 
   setPixmapProgress();
 
-  // When parent marked as complete, mark all tqchildren as complete as well.
+  // When parent marked as complete, mark all children as complete as well.
   // Complete tasks are not displayed in the task view, so if a parent is
-  // marked as complete and some of the tqchildren are not, then we get an error
+  // marked as complete and some of the children are not, then we get an error
   // message.  KArm actually keep chugging along in this case and displays the
   // child tasks just fine, so an alternative solution is to remove that error
   // message (from KarmStorage::load).  But I think it makes more sense that
-  // if you mark a parent task as complete, then all tqchildren should be
+  // if you mark a parent task as complete, then all children should be
   // complete as well.
   //
   // This behavior is consistent with KOrganizer (as of 2003-09-24).
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
+    return parent()->fullName() + TQString::fromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
 
   TQString desktopList = incident->customProperty( kapp->instanceName(),
       TQCString( "desktopList" ) );
-  TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","),
+  TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
       desktopList );
   desktops.clear();
 
@@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const
   for ( DesktopList::const_iterator iter = _desktops.begin();
         iter != _desktops.end();
         ++iter ) {
-    desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," );
+    desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," );
   }
   desktopstr.remove( desktopstr.length() - 1, 1 );
   return desktopstr;
@@ -419,7 +419,7 @@ void Task::update()
 
 void Task::addComment( TQString comment, KarmStorage* storage )
 {
-  _comment = _comment + TQString::tqfromLatin1("\n") + comment;
+  _comment = _comment + TQString::fromLatin1("\n") + comment;
   storage->addComment(this, comment);
 }