diff options
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/base')
-rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc | 6 | ||||
-rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/base/task.h | 8 |
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 09655472..6d85cb0d 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 * tqparent) : +Task::Task(Task * parent) : state_(STATE_INIT), - parent_(tqparent), + parent_(parent), blocked_(false), done_(false), aborted_(false), @@ -42,7 +42,7 @@ Task::Task(Task * tqparent) : error_(false), child_error_(false), start_time_(0) { - runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); + runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner()); if (parent_ != NULL) { parent_->AddChild(this); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index c583bda8..7140b691 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,12 +61,12 @@ // 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 tqparent tasks and tqchildren. If a tqparent +// (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 tqparent task that +// 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 tqparent task goes to STATE_DONE, the task engine will make +// When the parent 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 * tqparent); + Task(Task * parent); virtual ~Task() {} void Start(); |