summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
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.h
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.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_;