2 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 41ae9068..09655472 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -34,7 +34,7 @@ namespace buzz {
 
 Task::Task(Task * tqparent) :
     state_(STATE_INIT),
-    tqparent_(tqparent),
+    parent_(tqparent),
     blocked_(false),
     done_(false),
     aborted_(false),
@@ -43,8 +43,8 @@ Task::Task(Task * tqparent) :
     child_error_(false),
     start_time_(0) {
   runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
-  if (tqparent_ != NULL) {
-    tqparent_->AddChild(this);
+  if (parent_ != NULL) {
+    parent_->AddChild(this);
   }
 }
 
@@ -224,7 +224,7 @@ Task::AbortAllChildren() {
 void
 Task::Stop() {
   AbortAllChildren(); // No need to wake because we're either awake or in abort
-  tqparent_->OnChildStopped(this);
+  parent_->OnChildStopped(this);
 }
 
 void
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 553d04fb..c583bda8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -115,9 +115,9 @@ public:
   unsigned long long ElapsedTime();
   virtual void Poll() {}
 
-  Task * GetParent() { return tqparent_; }
+  Task * GetParent() { return parent_; }
   TaskRunner * GetRunner() { return runner_; }
-  virtual Task * GetParent(int code) { return tqparent_->GetParent(code); }
+  virtual Task * GetParent(int code) { return parent_->GetParent(code); }
 
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
@@ -162,7 +162,7 @@ private:
   void OnChildStopped(Task * child);
   
   int state_;
-  Task * tqparent_;
+  Task * parent_;
   TaskRunner * runner_;
   bool blocked_;
   bool done_;