rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 9 insertions, 9 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index f5b9d0b4..fa6a14a6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
@@ -245,7 +245,7 @@ XmppClient::Disconnect() {
   return XMPP_RETURN_OK;
 }
 
-XmppClient::XmppClient(Task * tqparent) : Task(tqparent), 
+XmppClient::XmppClient(Task * parent) : Task(parent), 
     delivering_signal_(false) {
   d_.reset(new Private(this));
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
index 540d774d..fd65c39c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
@@ -51,9 +51,9 @@ class CaptchaChallenge;
 //
 /////////////////////////////////////////////////////////////////////
 //
-// See Task first.  XmppClient is a tqparent task for XmppTasks.
+// See Task first.  XmppClient is a parent task for XmppTasks.
 //
-// XmppClient is a task which is designed to be the tqparent task for
+// XmppClient is a task which is designed to be the parent task for
 // all tasks that depend on a single Xmpp connection.  If you want to,
 // for example, listen for subscription requests forever, then your
 // listener should be a task that is a child of the XmppClient that owns
@@ -71,7 +71,7 @@ class CaptchaChallenge;
 class XmppClient : public Task, public sigslot::has_slots<>
 {
 public:
-  XmppClient(Task * tqparent);
+  XmppClient(Task * parent);
   ~XmppClient();
 
   XmppReturntqStatus Connect(const XmppClientSettings & settings,
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
index 38ed1994..e7ac0e04 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
@@ -32,9 +32,9 @@
 
 namespace buzz {
 
-XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level)
- : Task(tqparent), client_(NULL) {
-  XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE);
+XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level)
+ : Task(parent), client_(NULL) {
+  XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE);
   client_ = client;
   id_ = client->NextId();
   client->AddXmppTask(this, level);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
index d84019a2..a1ed3dd3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
@@ -45,7 +45,7 @@ namespace buzz {
 // See Task and XmppClient first.
 //
 // XmppTask is a task that is designed to go underneath XmppClient and be
-// useful there.  It has a way of finding its XmppClient tqparent so you
+// useful there.  It has a way of finding its XmppClient parent so you
 // can have it nested arbitrarily deep under an XmppClient and it can
 // still find the XMPP services.
 //
@@ -69,7 +69,7 @@ class XmppTask :
   public sigslot::has_slots<>
 {
 public:
-  XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE);
+  XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE);
   virtual ~XmppTask();
 
   virtual XmppClient * GetClient() const { return client_; }