1 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 5a486198..553d04fb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -61,13 +61,13 @@
 // might be working on something as you send it infomration, you may want
 // to have a queue in the task.
 // 
-// (3) Finally it helps manage parent tasks and children.  If a parent
-// task gets aborted, all the children tasks are too.  The nice thing
-// about this, for example, is if you have one parent task that
+// (3) Finally it helps manage tqparent tasks and tqchildren.  If a tqparent
+// task gets aborted, all the tqchildren tasks are too.  The nice thing
+// about this, for example, is if you have one tqparent task that
 // represents, say, and Xmpp connection, then you can spawn a whole bunch
 // of infinite lifetime child tasks and now worry about cleaning them up.
-//  When the parent task goes to STATE_DONE, the task engine will make
-// sure all those children are aborted and get deleted.
+//  When the tqparent task goes to STATE_DONE, the task engine will make
+// sure all those tqchildren are aborted and get deleted.
 // 
 // Notice that Task has a few built-in states, e.g.,
 // 
@@ -103,7 +103,7 @@ class RootTask;
 
 class Task {
 public:
-  Task(Task * parent);
+  Task(Task * tqparent);
   virtual ~Task() {}
   
   void Start();
@@ -115,14 +115,14 @@ public:
   unsigned long long ElapsedTime();
   virtual void Poll() {}
 
-  Task * GetParent() { return parent_; }
+  Task * GetParent() { return tqparent_; }
   TaskRunner * GetRunner() { return runner_; }
-  virtual Task * GetParent(int code) { return parent_->GetParent(code); }
+  virtual Task * GetParent(int code) { return tqparent_->GetParent(code); }
 
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
   
-  // For managing children
+  // For managing tqchildren
   bool AllChildrenDone();
   bool AnyChildError();
 
@@ -153,7 +153,7 @@ protected:
   virtual int ProcessStart() = 0;
   virtual int ProcessResponse() { return STATE_DONE; }
 
-  // for managing children (if any)
+  // for managing tqchildren (if any)
   void AddChild(Task * child);
   void AbortAllChildren();
 
@@ -162,7 +162,7 @@ private:
   void OnChildStopped(Task * child);
   
   int state_;
-  Task * parent_;
+  Task * tqparent_;
   TaskRunner * runner_;
   bool blocked_;
   bool done_;
@@ -172,9 +172,9 @@ private:
   bool child_error_;
   unsigned long long start_time_;
 
-  // for managing children
+  // for managing tqchildren
   typedef std::set<Task *> ChildSet;
-  ChildSet children_;
+  ChildSet tqchildren_;
   
 };