rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

21 files changed, 108 insertions, 108 deletions

diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp
index 7cb7774f..f1e0fce6 100644
--- a/karm/csvexportdialog.cpp
+++ b/karm/csvexportdialog.cpp
@@ -33,10 +33,10 @@
 #include "reportcriteria.h"
 
 CSVExportDialog::CSVExportDialog( ReportCriteria::REPORTTYPE rt,
-                                  TQWidget *tqparent, 
+                                  TQWidget *parent, 
                                   const char *name
                                   ) 
-  : CSVExportDialogBase( tqparent, name )
+  : CSVExportDialogBase( parent, name )
 {
   switch ( rt ) {
     case ReportCriteria::CSVTotalsExport:
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index 51aaf3bd..8e4966b5 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -31,7 +31,7 @@ class CSVExportDialog : public CSVExportDialogBase
 
   public:
     CSVExportDialog( ReportCriteria::REPORTTYPE rt,
-                     TQWidget *tqparent = 0, 
+                     TQWidget *parent = 0, 
                      const char *name = 0
                      );
     
diff --git a/karm/doc/design b/karm/doc/design
index fe37a300..b647f282 100644
--- a/karm/doc/design
+++ b/karm/doc/design
@@ -35,24 +35,24 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
 > > Id  Description
 > > ---------------------------------------------------------------------
 > > 1   Karm shall provide a hierarchical structure of tasks. If a task
-> >     has at least one subtask it will be referred to as a tqparent task.
+> >     has at least one subtask it will be referred to as a parent task.
 > >     If a task has no tqchildren it will be referred to as a leaf task.
-> >     If a task has no tqparent tasks it will be referred to as a root
+> >     If a task has no parent tasks it will be referred to as a root
 > >     task.
 > > 2   A new task can be created as a child of any existing task.
-> > 2.1   If the tqparent had a timer active, it will continue to be active
+> > 2.1   If the parent had a timer active, it will continue to be active
 >
 > It depends on how you start it. If you double click it. Any other timer
 > will be stopped and the new task started. If you start it through the
 > start button, both tasks will be active. This a bug IMO. See at the bottom
 > for my proposal.
 >
-> > 2.2   The session time for the tqparent will not be changed by adding
+> > 2.2   The session time for the parent will not be changed by adding
 > >       the new child task.
-> > 2.3   The total time for the tqparent will not be changed by adding a
+> > 2.3   The total time for the parent will not be changed by adding a
 > >       the new child task.
-> > 3     Any task (tqparent, leaf, or root) may have an independent timer.
-> > 4     The time (both session and total) for a tqparent will be the sum
+> > 3     Any task (parent, leaf, or root) may have an independent timer.
+> > 4     The time (both session and total) for a parent will be the sum
 > >       of its independent timer and the sum of all of its child timers.
 > >
 > > Unstable Development
@@ -62,21 +62,21 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote:
 > > Id  Description
 > > ---------------------------------------------------------------------
 > > 1   Karm shall provide a hierarchical structure of tasks. If a task
-> >     has at least one subtask it will be referred to as a tqparent task.
+> >     has at least one subtask it will be referred to as a parent task.
 > >     If a task has no tqchildren it will be referred to as a leaf task.
-> >     If a task has no tqparent tasks it will be referred to as a root
+> >     If a task has no parent tasks it will be referred to as a root
 > >     task.
 > > 2   A new task can be created as a child of any existing task.
-> > 2.1 If the tqparent had a timer active, it will be deactivated
-> > 2.2 The session time for the tqparent will set to zero
+> > 2.1 If the parent had a timer active, it will be deactivated
+> > 2.2 The session time for the parent will set to zero
 > > 2.2.1       The session time for the child will be initialized to the last
-> >     session time of the tqparent.
-> > 2.3 The total time for the tqparent will be set to zero.
-> > 2.3.1       The total time for the tqparent will be initialized to the last
-> >     total time of the tqparent.
-> > 3   Only a leaf task may have a timer. A tqparent may not have its own
+> >     session time of the parent.
+> > 2.3 The total time for the parent will be set to zero.
+> > 2.3.1       The total time for the parent will be initialized to the last
+> >     total time of the parent.
+> > 3   Only a leaf task may have a timer. A parent may not have its own
 > >     timer.
-> > 4   The time (both session and total) for a tqparent will be the sum
+> > 4   The time (both session and total) for a parent will be the sum
 > >     only of its child timers.
 >
 > I see where you want to go, but I think it's not the right direction for
@@ -134,7 +134,7 @@ idea but can't quite see how the interface should work.
 
 Ok. So, I'll undo the changes related to:
 * summing only leaf tasks
-* disallowing edits on tqparent tasks
+* disallowing edits on parent tasks
 _______________________________________________
 kde-pim mailing list
 kde-pim@mail.kde.org
diff --git a/karm/doc/updating_parents.html b/karm/doc/updating_parents.html
index 63587952..3b55ce30 100644
--- a/karm/doc/updating_parents.html
+++ b/karm/doc/updating_parents.html
@@ -34,6 +34,6 @@ You should get something like this.</p>
 	<tr><td>&nbsp;</td> <td>Session: 3</td> <td>Total: 18</td></tr>
 </table>
 
-<p>Since a tqparent task can have a timer active on it, it needs to be included in the summary 
+<p>Since a parent task can have a timer active on it, it needs to be included in the summary 
 Session and Total times. So, in this example, the Session time will jump three minutes for every
 minute the timer is active.</p>
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 8c165154..c91f13ea 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -201,7 +201,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
     }
     enableDesktops = true;
   }
-  // if some desktops were specified, then enable the tqparent box
+  // if some desktops were specified, then enable the parent box
   _desktopCB->setChecked(enableDesktops);
 
   for (int i=0; i<desktopCount; i++)
diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp
index 75e4854e..ddabb1d8 100644
--- a/karm/kaccelmenuwatch.cpp
+++ b/karm/kaccelmenuwatch.cpp
@@ -9,8 +9,8 @@
 
 #include "kaccelmenuwatch.h"
 
-KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *tqparent )
-  : TQObject( tqparent ),
+KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent )
+  : TQObject( parent ),
   _accel( accel ),
   _menu ( 0 )
 {
diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h
index 4b9c3058..a9956d08 100644
--- a/karm/kaccelmenuwatch.h
+++ b/karm/kaccelmenuwatch.h
@@ -64,7 +64,7 @@ class KAccelMenuWatch : public TQObject
     /**
      * KAccelMenuWatch Constructor
      */
-    KAccelMenuWatch( KAccel *accel, TQObject *tqparent = 0 );
+    KAccelMenuWatch( KAccel *accel, TQObject *parent = 0 );
 
     /**
      * KAccelMenuWatch Destructor
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index dca3cf94..db620449 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -22,8 +22,8 @@
 #include "mainwindow.h"
 
 karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
-                                  TQObject *tqparent, const char *name )
-    : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name), 
+                                  TQObject *parent, const char *name )
+    : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), 
     _accel     ( new KAccel( parentWidget ) ),
     _watcher   ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) )
 {
@@ -312,7 +312,7 @@ void karmPart::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our tqparent to do it's thing
+    // in any event, we want our parent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
@@ -388,11 +388,11 @@ karmPartFactory::~karmPartFactory()
 }
 
 KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *tqparent, const char *name,
+                                                        TQObject *parent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name );
+    karmPart* obj = new karmPart( parentWidget, widgetName, parent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 8550cc9b..7c679ee6 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -60,7 +60,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
 
 public:
     karmPart(TQWidget *parentWidget, const char *widgetName,
-             TQObject *tqparent, const char *name);
+             TQObject *parent, const char *name);
     // DCOP
     void quit();
     virtual bool save();
@@ -127,7 +127,7 @@ public:
     karmPartFactory();
     virtual ~karmPartFactory();
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *tqparent, const char *name,
+                                            TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/karm/karmdcopiface.h b/karm/karmdcopiface.h
index 67e59938..7233ff25 100644
--- a/karm/karmdcopiface.h
+++ b/karm/karmdcopiface.h
@@ -38,7 +38,7 @@ class KarmDCOPIface : virtual public DCOPObject
   /** 
    * Add a new top-level task.
    *
-   * A top-level task is one that has no tqparent tasks.
+   * A top-level task is one that has no parent tasks.
    * 
    * @param taskName Name of new task.
    *
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1231113b..1e4f92a1 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -156,7 +156,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
     TQDict< Task > map;
 
     // Build dictionary to look up Task object from Todo uid.  Each task is a
-    // TQListViewItem, and is initially added with the view as the tqparent.
+    // TQListViewItem, and is initially added with the view as the parent.
     todoList = _calendar->rawTodos();
     kdDebug(5970) << "KarmStorage::load "
       << "rawTodo count (includes completed todos) ="
@@ -186,7 +186,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
       task->setPixmapProgress();
     }
 
-    // Load each task under it's tqparent task.
+    // Load each task under it's parent task.
     for( todo = todoList.begin(); todo != todoList.end(); ++todo )
     {
       Task* task = map.find( (*todo)->uid() );
@@ -198,7 +198,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
 
         // Complete the loading but return a message
         if ( !newParent )
-          err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
+          err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
             .tqarg(task->name())
             .tqarg((*todo)->relatedToUid());
 
@@ -245,7 +245,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
 
   // 1. insert tasks form rc into taskview
   // 1.1. Build dictionary to look up Task object from Todo uid.  Each task is a
-  // TQListViewItem, and is initially added with the view as the tqparent.
+  // TQListViewItem, and is initially added with the view as the parent.
   todoList = rc->rawTodos();
   for( todo = todoList.begin(); todo != todoList.end(); ++todo )
   {
@@ -255,7 +255,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
     task->setPixmapProgress();
   }
 
-  // 1.1. Load each task under it's tqparent task.
+  // 1.1. Load each task under it's parent task.
   for( todo = todoList.begin(); todo != todoList.end(); ++todo )
   {
     Task* task = map.find( (*todo)->uid() );
@@ -267,7 +267,7 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
 
       // Complete the loading but return a message
       if ( !newParent )
-        err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
+        err = i18n("Error loading \"%1\": could not find parent (uid=%2)")
           .tqarg(task->name())
           .tqarg((*todo)->relatedToUid());
 
@@ -439,17 +439,17 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview,
         task->setUid(addTask(task, 0));
       }
       else {
-        Task *tqparent = stack.top();
+        Task *parent = stack.top();
         kdDebug(5970) << "KarmStorage::loadFromFlatFile - task: " << name
-            << " min: " << minutes << " tqparent" << tqparent->name() << "\n";
-        task = new Task(name, minutes, 0, desktopList, tqparent);
+            << " min: " << minutes << " parent" << parent->name() << "\n";
+        task = new Task(name, minutes, 0, desktopList, parent);
 
-        task->setUid(addTask(task, tqparent));
+        task->setUid(addTask(task, parent));
 
         // Legacy File Format (!):
-        tqparent->changeTimes(0, -minutes);
+        parent->changeTimes(0, -minutes);
         taskview->setRootIsDecorated(true);
-        tqparent->setOpen(true);
+        parent->setOpen(true);
       }
       if (!task->uid().isNull())
         stack.push(task);
@@ -556,12 +556,12 @@ bool KarmStorage::parseLine(TQString line, long *time, TQString *name,
 
 void KarmStorage::adjustFromLegacyFileFormat(Task* task)
 {
-  // unless the tqparent is the listView
-  if ( task->tqparent() )
-    task->tqparent()->changeTimes(-task->sessionTime(), -task->time());
+  // unless the parent is the listView
+  if ( task->parent() )
+    task->parent()->changeTimes(-task->sessionTime(), -task->time());
 
   // traverse depth first -
-  // as soon as we're in a leaf, we'll substract it's time from the tqparent
+  // as soon as we're in a leaf, we'll substract it's time from the parent
   // then, while descending back we'll do the same for each node untill
   // we reach the root
   for ( Task* subtask = task->firstChild(); subtask;
@@ -701,7 +701,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
 // public routines:
 //
 
-TQString KarmStorage::addTask(const Task* task, const Task* tqparent)
+TQString KarmStorage::addTask(const Task* task, const Task* parent)
 {
   KCal::Todo* todo;
   TQString uid;
@@ -710,8 +710,8 @@ TQString KarmStorage::addTask(const Task* task, const Task* tqparent)
   if ( _calendar->addTodo( todo ) )
   {
     task->asTodo( todo  );
-    if (tqparent)
-      todo->setRelatedTo(_calendar->todo(tqparent->uid()));
+    if (parent)
+      todo->setRelatedTo(_calendar->todo(parent->uid()));
     uid = todo->uid();
   }
   else
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 40c574d7..65caafd7 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -132,7 +132,7 @@ class KarmStorage
      * Read tasks and their total times from a text file (legacy storage).
      *
      * This reads from one of the two legacy file formats.  In this version,
-     * the tqparent task times do not include the sum of all their tqchildren's
+     * the parent task times do not include the sum of all their tqchildren's
      * times.
      *
      * The format of the file is zero or more lines of:
@@ -266,15 +266,15 @@ class KarmStorage
      * Add this task from iCalendar file.
      *
      * Create a new KCal::Todo object and load with task information.  If
-     * tqparent is not zero, then set the RELATED-TO attribute for this Todo.
+     * parent is not zero, then set the RELATED-TO attribute for this Todo.
      *
      * @param task   The task to be removed.
-     * @param tqparent The tqparent of this task.  Must have a uid() that is in
+     * @param parent The parent of this task.  Must have a uid() that is in
      * the existing calendar.  If zero, this task is considered a root task.
      * @return The unique ID for the new VTODO.  Return an null TQString if
      * there was an error creating the new calendar object.
      */
-    TQString addTask(const Task* task, const Task* tqparent);
+    TQString addTask(const Task* task, const Task* parent);
 
     /**
      *  Check if the iCalendar file currently loaded has any Todos in it.
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index e480dea4..2eaf32b2 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -16,8 +16,8 @@ enum ValidatorType { HOUR, MINUTE };
 class TimeValidator : public TQValidator
 {
   public:
-    TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0)
-      : TQValidator(TQT_TQOBJECT(tqparent), name)
+    TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
+      : TQValidator(TQT_TQOBJECT(parent), name)
     {
       _tp = tp;
     }
@@ -46,8 +46,8 @@ class KarmLineEdit : public TQLineEdit
 {
 
   public:
-    KarmLineEdit( TQWidget* tqparent, const char* name = 0 )
-      : TQLineEdit( tqparent, name ) {}
+    KarmLineEdit( TQWidget* parent, const char* name = 0 )
+      : TQLineEdit( parent, name ) {}
 
 protected:
 
@@ -60,8 +60,8 @@ protected:
 };
 
 
-KArmTimeWidget::KArmTimeWidget( TQWidget* tqparent, const char* name )
-  : TQWidget(tqparent, name)
+KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
+  : TQWidget(parent, name)
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
diff --git a/karm/ktimewidget.h b/karm/ktimewidget.h
index 62f81f77..88f298b2 100644
--- a/karm/ktimewidget.h
+++ b/karm/ktimewidget.h
@@ -13,7 +13,7 @@ class KarmLineEdit;
 class KArmTimeWidget : public TQWidget 
 {
   public:
-    KArmTimeWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    KArmTimeWidget( TQWidget* parent = 0, const char* name = 0 );
     void setTime( long minutes );
     long time() const;
 
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index b205fd7a..7ac13a5e 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -35,9 +35,9 @@ test cases:
     kdDebug() << "entering constructor to import planner tasks" << endl;
     _taskView=tv;
     level=0;
-    if (_taskView->current_item()) if (_taskView->current_item()->tqparent()) 
+    if (_taskView->current_item()) if (_taskView->current_item()->parent()) 
     {
-      task = _taskView->current_item()->tqparent(); 
+      task = _taskView->current_item()->parent(); 
       level=1;
     }
   }
@@ -92,7 +92,7 @@ test cases:
     // only <task>s within <tasks> increased level, so only decrease for <task>s within <tasks>
     if (withInTasks)
     {
-      if (qName=="task")  if (level-->=0) task=task->tqparent();
+      if (qName=="task")  if (level-->=0) task=task->parent();
       if (qName=="tasks") withInTasks=false;
     }
     return true;
diff --git a/karm/task.cpp b/karm/task.cpp
index cf37ee43..03eb1d3b 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -22,21 +22,21 @@ const int gSecondsPerMinute = 60;
 TQPtrVector<TQPixmap> *Task::icons = 0;
 
 Task::Task( const TQString& taskName, long minutes, long sessionTime,
-            DesktopList desktops, TaskView *tqparent)
-  : TQObject(), TQListViewItem(tqparent)
+            DesktopList desktops, TaskView *parent)
+  : TQObject(), TQListViewItem(parent)
 { 
   init(taskName, minutes, sessionTime, desktops, 0);
 }
 
 Task::Task( const TQString& taskName, long minutes, long sessionTime,
-            DesktopList desktops, Task *tqparent)
-  : TQObject(), TQListViewItem(tqparent)
+            DesktopList desktops, Task *parent)
+  : TQObject(), TQListViewItem(parent)
 {
   init(taskName, minutes, sessionTime, desktops, 0);
 }
 
-Task::Task( KCal::Todo* todo, TaskView* tqparent )
-  : TQObject(), TQListViewItem( tqparent )
+Task::Task( KCal::Todo* todo, TaskView* parent )
+  : TQObject(), TQListViewItem( parent )
 {
   long minutes = 0;
   TQString name;
@@ -51,9 +51,9 @@ Task::Task( KCal::Todo* todo, TaskView* tqparent )
 void Task::init( const TQString& taskName, long minutes, long sessionTime,
                  DesktopList desktops, int percent_complete)
 {
-  // If our tqparent is the taskview then connect our totalTimesChanged
+  // If our parent is the taskview then connect our totalTimesChanged
   // signal to its receiver
-  if ( ! tqparent() )
+  if ( ! parent() )
     connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
              listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
 
@@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage)
 
   setPixmapProgress();
 
-  // When tqparent marked as complete, mark all tqchildren as complete as well.
-  // Complete tasks are not displayed in the task view, so if a tqparent is
+  // When parent marked as complete, mark all tqchildren 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
   // 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 tqparent task as complete, then all tqchildren should be
+  // if you mark a parent task as complete, then all tqchildren should be
   // complete as well.
   //
   // This behavior is consistent with KOrganizer (as of 2003-09-24).
@@ -252,7 +252,7 @@ void Task::changeParentTotalTimes( long minutesSession, long minutes )
   if ( isRoot() )
     emit totalTimesChanged( minutesSession, minutes );
   else
-    tqparent()->changeTotalTimes( minutesSession, minutes );
+    parent()->changeTotalTimes( minutesSession, minutes );
 }
 
 bool Task::remove( TQPtrList<Task>& activeTasks, KarmStorage* storage)
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return tqparent()->fullName() + TQString::tqfromLatin1("/") + name();
+    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -390,10 +390,10 @@ void Task::cut()
 {
   //kdDebug(5970) << "Task::cut - " << name() << endl;
   changeParentTotalTimes( -_totalSessionTime, -_totalTime);
-  if ( ! tqparent())
+  if ( ! parent())
     listView()->takeItem(this);
   else
-    tqparent()->takeItem(this);
+    parent()->takeItem(this);
 }
 
 void Task::move(Task* destination)
diff --git a/karm/task.h b/karm/task.h
index acf2cd99..53c7abcc 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -46,20 +46,20 @@ class Task : public TQObject, public TQListViewItem
   public:
     //@{ constructors
     Task( const TQString& taskame, long minutes, long sessionTime,
-          DesktopList desktops, TaskView* tqparent = 0);
+          DesktopList desktops, TaskView* parent = 0);
     Task( const TQString& taskame, long minutes, long sessionTime,
-          DesktopList desktops, Task* tqparent = 0);
-    Task( KCal::Todo* incident, TaskView* tqparent );
+          DesktopList desktops, Task* parent = 0);
+    Task( KCal::Todo* incident, TaskView* parent );
     //@}
     /* destructor */
     ~Task();
 
-    /** return tqparent Task or null in case of TaskView.
-     *  same as TQListViewItem::tqparent()
+    /** return parent Task or null in case of TaskView.
+     *  same as TQListViewItem::parent()
      */
     Task* firstChild() const  { return (Task*)TQListViewItem::firstChild(); }
     Task* nextSibling() const { return (Task*)TQListViewItem::nextSibling(); }
-    Task* tqparent() const      { return (Task*)TQListViewItem::tqparent(); }
+    Task* parent() const      { return (Task*)TQListViewItem::parent(); }
 
     /** Return task view for this task */
     TaskView* taskView() const {
@@ -78,9 +78,9 @@ class Task : public TQObject, public TQListViewItem
      */
     void setUid(const TQString uid);
 
-    /** cut Task out of tqparent Task or the TaskView */
+    /** cut Task out of parent Task or the TaskView */
     void cut();
-    /** cut Task out of tqparent Task or the TaskView and into the
+    /** cut Task out of parent Task or the TaskView and into the
      *  destination Task */
     void move(Task* destination);
     /** insert Task into the destination Task */
@@ -162,7 +162,7 @@ class Task : public TQObject, public TQListViewItem
       TQString name() const  { return _name; };
 
       /**
-       * Returns that task name, prefixed by tqparent tree up to root.
+       * Returns that task name, prefixed by parent tree up to root.
        *
        * Task names are seperated by a forward slash:  /
        */
@@ -206,7 +206,7 @@ class Task : public TQObject, public TQListViewItem
     TQString comment() const;
 
     /** tells you whether this task is the root of the task tree */
-    bool isRoot() const                 { return tqparent() == 0; }
+    bool isRoot() const                 { return parent() == 0; }
 
     /** remove Task with all it's tqchildren
      * @param   activeTasks - list of aktive tasks
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 95dfc856..b4f655ff 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -37,7 +37,7 @@
 
 class DesktopTracker;
 
-TaskView::TaskView(TQWidget *tqparent, const char *name, const TQString &icsfile ):KListView(tqparent,name)
+TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):KListView(parent,name)
 {
   _preferences = Preferences::instance( icsfile );
   _storage = KarmStorage::instance();
@@ -495,7 +495,7 @@ void TaskView::newTask()
   newTask(i18n("New Task"), 0);
 }
 
-void TaskView::newTask(TQString caption, Task *tqparent)
+void TaskView::newTask(TQString caption, Task *parent)
 {
   EditTaskDialog *dialog = new EditTaskDialog(caption, false);
   long total, totalDiff, session, sessionDiff;
@@ -514,7 +514,7 @@ void TaskView::newTask(TQString caption, Task *tqparent)
     if ( desktopList.size() == ( unsigned int ) _desktopTracker->desktopCount() )
       desktopList.clear();
 
-    TQString uid = addTask( taskName, total, session, desktopList, tqparent );
+    TQString uid = addTask( taskName, total, session, desktopList, parent );
     if ( uid.isNull() )
     {
       KMessageBox::error( 0, i18n(
@@ -527,15 +527,15 @@ void TaskView::newTask(TQString caption, Task *tqparent)
 
 TQString TaskView::addTask
 ( const TQString& taskname, long total, long session, 
-  const DesktopList& desktops, Task* tqparent )
+  const DesktopList& desktops, Task* parent )
 {
   Task *task;
   kdDebug(5970) << "TaskView::addTask: taskname = " << taskname << endl;
 
-  if ( tqparent ) task = new Task( taskname, total, session, desktops, tqparent );
+  if ( parent ) task = new Task( taskname, total, session, desktops, parent );
   else          task = new Task( taskname, total, session, desktops, this );
 
-  task->setUid( _storage->addTask( task, tqparent ) );
+  task->setUid( _storage->addTask( task, parent ) );
   TQString taskuid=task->uid();
   if ( ! taskuid.isNull() )
   {
diff --git a/karm/taskview.h b/karm/taskview.h
index 7b9bc441..f1b22048 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -45,7 +45,7 @@ class TaskView : public KListView
   TQ_OBJECT
 
   public:
-    TaskView( TQWidget *tqparent = 0, const char *name = 0, const TQString &icsfile = "" );
+    TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" );
     virtual ~TaskView();
 
     /**  Return the first item in the view, cast to a Task pointer.  */
@@ -83,7 +83,7 @@ class TaskView : public KListView
 
     /** Add a task to view and storage. */
     TQString addTask( const TQString& taskame, long total, long session, const DesktopList& desktops, 
-                     Task* tqparent = 0 );
+                     Task* parent = 0 );
 
   public slots:
     /** Save to persistent storage. */
@@ -105,7 +105,7 @@ class TaskView : public KListView
     void newTask();
 
     /** Display edit task dialog and create a new task with results.  */
-    void newTask( TQString caption, Task* tqparent );
+    void newTask( TQString caption, Task* parent );
 
      /** Used to refresh (e.g. after import) */
     void refresh();
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 20486b4b..20c2f51e 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -30,8 +30,8 @@
 
 TQPtrVector<TQPixmap> *KarmTray::icons = 0;
 
-KarmTray::KarmTray(MainWindow* tqparent)
-  : KSystemTray(tqparent, "Karm Tray")
+KarmTray::KarmTray(MainWindow* parent)
+  : KSystemTray(parent, "Karm Tray")
 {
   // the timer that updates the "running" icon in the tray
   _taskActiveTimer = new TQTimer(this);
@@ -49,8 +49,8 @@ KarmTray::KarmTray(MainWindow* tqparent)
     }
   }
 
-  tqparent->actionPreferences->plug( contextMenu() ); 
-  tqparent->actionStopAll->plug( contextMenu() );
+  parent->actionPreferences->plug( contextMenu() ); 
+  parent->actionStopAll->plug( contextMenu() );
 
   resetClock();
   initToolTip();
@@ -71,7 +71,7 @@ KarmTray::KarmTray(MainWindow* tqparent)
   */
 }
 
-KarmTray::KarmTray(karmPart * tqparent)
+KarmTray::KarmTray(karmPart * parent)
   : KSystemTray( 0 , "Karm Tray")
 {
 // it is not convenient if every kpart gets an icon in the systray.
diff --git a/karm/tray.h b/karm/tray.h
index b299a6ed..d0fbd8ca 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -27,8 +27,8 @@ class KarmTray : public KSystemTray
   TQ_OBJECT
 
   public:
-    KarmTray(MainWindow * tqparent);
-    KarmTray(karmPart * tqparent);
+    KarmTray(MainWindow * parent);
+    KarmTray(karmPart * parent);
     ~KarmTray();
 
   private: