TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 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..41ae9068 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -32,9 +32,9 @@
 
 namespace buzz {
 
-Task::Task(Task * parent) :
+Task::Task(Task * tqparent) :
     state_(STATE_INIT),
-    parent_(parent),
+    tqparent_(tqparent),
     blocked_(false),
     done_(false),
     aborted_(false),
@@ -42,9 +42,9 @@ Task::Task(Task * parent) :
     error_(false),
     child_error_(false),
     start_time_(0) {
-  runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner());
-  if (parent_ != NULL) {
-    parent_->AddChild(this);
+  runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
+  if (tqparent_ != NULL) {
+    tqparent_->AddChild(this);
   }
 }
 
@@ -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
     }
@@ -224,14 +224,14 @@ Task::AbortAllChildren() {
 void
 Task::Stop() {
   AbortAllChildren(); // No need to wake because we're either awake or in abort
-  parent_->OnChildStopped(this);
+  tqparent_->OnChildStopped(this);
 }
 
 void
 Task::OnChildStopped(Task * child) {
   if (child->HasError())
     child_error_ = true;
-  children_.erase(child);
+  tqchildren_.erase(child);
 }