Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

3 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index a5a94941..6d85cb0d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -194,12 +194,12 @@ int Task::Process(int state) {
 
 void
 Task::AddChild(Task * child) {
-  children_.insert(child);
+  tqchildren_.insert(child);
 }
 
 bool
 Task::AllChildrenDone() {
-  for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) {
+  for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) {
     if (!(*it)->IsDone())
       return false;
   }
@@ -213,8 +213,8 @@ Task::AnyChildError() {
 
 void
 Task::AbortAllChildren() {
-  if (children_.size() > 0) {
-    ChildSet copy = children_;
+  if (tqchildren_.size() > 0) {
+    ChildSet copy = tqchildren_;
     for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) {
       (*it)->Abort(true); // Note we do not wake
     }
@@ -231,7 +231,7 @@ void
 Task::OnChildStopped(Task * child) {
   if (child->HasError())
     child_error_ = true;
-  children_.erase(child);
+  tqchildren_.erase(child);
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 5a486198..7140b691 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
+// (3) Finally it helps manage parent tasks and tqchildren.  If a parent
+// task gets aborted, all the tqchildren tasks are too.  The nice thing
 // about this, for example, is if you have one parent 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.
+// sure all those tqchildren are aborted and get deleted.
 // 
 // Notice that Task has a few built-in states, e.g.,
 // 
@@ -122,7 +122,7 @@ public:
   // 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();
 
@@ -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_;
   
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
index b5ecc55e..43728eb7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
@@ -33,7 +33,7 @@
 namespace buzz {
 
 TaskRunner::~TaskRunner() {
-  // this kills and deletes children silently!
+  // this kills and deletes tqchildren silently!
   AbortAllChildren();
   RunTasks();
 }