summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/base/task.h')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.h6
1 files changed, 3 insertions, 3 deletions
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_;