diff options
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris/xmpp-im')
4 files changed, 69 insertions, 69 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 7b425696..9d5ee471 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -34,7 +34,7 @@ //! Client, you will need to manually invoke Tasks. Fortunately, the //! process is very simple. //! -//! The entire Task system is heavily founded on TQt. All Tasks have a tqparent, +//! The entire Task system is heavily founded on TQt. All Tasks have a parent, //! except for the root Task, and are considered TQObjects. By using TQt's RTTI //! facilities (TQObject::sender(), TQObject::isA(), etc), you can use a //! "fire and forget" approach with Tasks. @@ -469,7 +469,7 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -1155,22 +1155,22 @@ public: bool done; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); - d->client = tqparent->client(); + d->client = parent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *tqparent, bool) +Task::Task(Client *parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -1189,9 +1189,9 @@ void Task::init() d->done = false; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Client *Task::client() const diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 522e52f9..9e742d10 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const } } if ( !d->xHTMLBody.isEmpty()) { - TQDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); + TQDomElement parent = s.createElement(s.xhtmlImNS(), "html"); for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { const TQString &str = it.data(); if(!str.isEmpty()) { TQDomElement child = s.createXHTMLElement(str); if(!it.key().isEmpty()) child.setAttributeNS(NS_XML, "xml:lang", it.key()); - tqparent.appendChild(child); + parent.appendChild(child); } } - s.appendChild(tqparent); + s.appendChild(parent); } if(d->type == "error") s.setError(d->error); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index 45ef7a04..4e4c96d1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -103,8 +103,8 @@ public: int type; }; -JT_Register::JT_Register(Task *tqparent) -:Task(tqparent) +JT_Register::JT_Register(Task *parent) +:Task(parent) { d = new Private; d->type = -1; @@ -246,8 +246,8 @@ public: JT_Register *jt_reg; }; -JT_UnRegister::JT_UnRegister(Task *tqparent) -: Task(tqparent) +JT_UnRegister::JT_UnRegister(Task *parent) +: Task(parent) { d = new Private; d->jt_reg = 0; @@ -306,8 +306,8 @@ public: TQValueList<TQDomElement> itemList; }; -JT_Roster::JT_Roster(Task *tqparent) -:Task(tqparent) +JT_Roster::JT_Roster(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushRoster //---------------------------------------------------------------------------- -JT_PushRoster::JT_PushRoster(Task *tqparent) -:Task(tqparent) +JT_PushRoster::JT_PushRoster(Task *parent) +:Task(parent) { } @@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Presence //---------------------------------------------------------------------------- -JT_Presence::JT_Presence(Task *tqparent) -:Task(tqparent) +JT_Presence::JT_Presence(Task *parent) +:Task(parent) { type = -1; } @@ -554,8 +554,8 @@ void JT_Presence::onGo() //---------------------------------------------------------------------------- // JT_PushPresence //---------------------------------------------------------------------------- -JT_PushPresence::JT_PushPresence(Task *tqparent) -:Task(tqparent) +JT_PushPresence::JT_PushPresence(Task *parent) +:Task(parent) { } @@ -653,7 +653,7 @@ bool JT_PushPresence::take(const TQDomElement &e) //---------------------------------------------------------------------------- static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e) return i; } -JT_Message::JT_Message(Task *tqparent, const Message &msg) -:Task(tqparent) +JT_Message::JT_Message(Task *parent, const Message &msg) +:Task(parent) { m = msg; m.setId(id()); @@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e) return i; } -JT_PushMessage::JT_PushMessage(Task *tqparent) -:Task(tqparent) +JT_PushMessage::JT_PushMessage(Task *parent) +:Task(parent) { } @@ -799,8 +799,8 @@ public: TQString message; }; -JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) -:Task(tqparent) +JT_GetLastActivity::JT_GetLastActivity(Task *parent) +:Task(parent) { d = new Private; } @@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- -JT_GetServices::JT_GetServices(Task *tqparent) -:Task(tqparent) +JT_GetServices::JT_GetServices(Task *parent) +:Task(parent) { } @@ -955,8 +955,8 @@ public: VCard vcard; }; -JT_VCard::JT_VCard(Task *tqparent) -:Task(tqparent) +JT_VCard::JT_VCard(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -1055,8 +1055,8 @@ public: TQValueList<SearchResult> resultList; }; -JT_Search::JT_Search(Task *tqparent) -:Task(tqparent) +JT_Search::JT_Search(Task *parent) +:Task(parent) { d = new Private; type = -1; @@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ClientVersion //---------------------------------------------------------------------------- -JT_ClientVersion::JT_ClientVersion(Task *tqparent) -:Task(tqparent) +JT_ClientVersion::JT_ClientVersion(Task *parent) +:Task(parent) { } @@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const //---------------------------------------------------------------------------- // JT_ClientTime //---------------------------------------------------------------------------- -/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j) -:Task(tqparent) +/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j) +:Task(parent) { j = _j; iq = createIQ("get", j.full(), id()); @@ -1307,8 +1307,8 @@ bool JT_ClientTime::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ServInfo //---------------------------------------------------------------------------- -JT_ServInfo::JT_ServInfo(Task *tqparent) -:Task(tqparent) +JT_ServInfo::JT_ServInfo(Task *parent) +:Task(parent) { } @@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Gateway //---------------------------------------------------------------------------- -JT_Gateway::JT_Gateway(Task *tqparent) -:Task(tqparent) +JT_Gateway::JT_Gateway(Task *parent) +:Task(parent) { type = -1; } @@ -1539,8 +1539,8 @@ public: AgentItem root; }; -JT_Browse::JT_Browse (Task *tqparent) -:Task (tqparent) +JT_Browse::JT_Browse (Task *parent) +:Task (parent) { d = new Private; } @@ -1664,8 +1664,8 @@ public: DiscoList items; }; -JT_DiscoItems::JT_DiscoItems(Task *tqparent) -: Task(tqparent) +JT_DiscoItems::JT_DiscoItems(Task *parent) +: Task(parent) { d = new Private; } @@ -1753,8 +1753,8 @@ public: DiscoItem item; }; -JT_DiscoInfo::JT_DiscoInfo(Task *tqparent) -: Task(tqparent) +JT_DiscoInfo::JT_DiscoInfo(Task *parent) +: Task(parent) { d = new Private; } @@ -1895,8 +1895,8 @@ public: DiscoList list; }; -JT_DiscoPublish::JT_DiscoPublish(Task *tqparent) -: Task(tqparent) +JT_DiscoPublish::JT_DiscoPublish(Task *parent) +: Task(parent) { d = new Private; } @@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_MucPresence //---------------------------------------------------------------------------- -JT_MucPresence::JT_MucPresence(Task *tqparent) -:Task(tqparent) +JT_MucPresence::JT_MucPresence(Task *parent) +:Task(parent) { type = -1; } @@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private int type; }; -JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) - :Task(tqparent) +JT_PrivateStorage::JT_PrivateStorage(Task *parent) + :Task(parent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h index 9d5125d9..97d68964 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -37,7 +37,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Register(Task *tqparent); + JT_Register(Task *parent); ~JT_Register(); void reg(const TQString &user, const TQString &pass); @@ -64,7 +64,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_UnRegister(Task *tqparent); + JT_UnRegister(Task *parent); ~JT_UnRegister(); void unreg(const Jid &); @@ -85,7 +85,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Roster(Task *tqparent); + JT_Roster(Task *parent); ~JT_Roster(); void get(); @@ -114,7 +114,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushRoster(Task *tqparent); + JT_PushRoster(Task *parent); ~JT_PushRoster(); bool take(const TQDomElement &); @@ -132,7 +132,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Presence(Task *tqparent); + JT_Presence(Task *parent); ~JT_Presence(); void pres(const tqStatus &); @@ -154,7 +154,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushPresence(Task *tqparent); + JT_PushPresence(Task *parent); ~JT_PushPresence(); bool take(const TQDomElement &); @@ -173,7 +173,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Message(Task *tqparent, const Message &); + JT_Message(Task *parent, const Message &); ~JT_Message(); void onGo(); @@ -190,7 +190,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushMessage(Task *tqparent); + JT_PushMessage(Task *parent); ~JT_PushMessage(); bool take(const TQDomElement &); @@ -255,7 +255,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_VCard(Task *tqparent); + JT_VCard(Task *parent); ~JT_VCard(); void get(const Jid &); @@ -279,7 +279,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Search(Task *tqparent); + JT_Search(Task *parent); ~JT_Search(); const Form & form() const; @@ -465,7 +465,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_MucPresence(Task *tqparent); + JT_MucPresence(Task *parent); ~JT_MucPresence(); void pres(const tqStatus &); @@ -486,7 +486,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PrivateStorage(Task *tqparent); + JT_PrivateStorage(Task *parent); ~JT_PrivateStorage(); void set(const TQDomElement &); |