summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commitd0be1721b4656109c9e21cc0ecb6f23b343b7c26 (patch)
tree211c399f4274325783e6f9995153aac359876116 /kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
parent1fff1cf07591b1226eb568e95283091eedbeff1d (diff)
downloadtdenetwork-d0be1721b4656109c9e21cc0ecb6f23b343b7c26.tar.gz
tdenetwork-d0be1721b4656109c9e21cc0ecb6f23b343b7c26.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc8
1 files changed, 4 insertions, 4 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