From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- kopete/protocols/jabber/libiris/iris/include/im.h | 36 +++++------ .../jabber/libiris/iris/xmpp-im/client.cpp | 48 +++++++------- .../jabber/libiris/iris/xmpp-im/types.cpp | 74 +++++++++++----------- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp | 14 ++-- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.h | 12 ++-- 5 files changed, 92 insertions(+), 92 deletions(-) (limited to 'kopete/protocols/jabber/libiris/iris') diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 8387d48a..835eed62 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -136,11 +136,11 @@ namespace XMPP SubType value; }; - class tqStatus + class Status { public: - tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true); - ~tqStatus(); + Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true); + ~Status(); int priority() const; const TQString & show() const; @@ -162,7 +162,7 @@ namespace XMPP void setPriority(int); void setShow(const TQString &); - void settqStatus(const TQString &); + void setStatus(const TQString &); void setTimeStamp(const TQDateTime &); void setKeyID(const TQString &); void setIsAvailable(bool); @@ -197,19 +197,19 @@ namespace XMPP class Resource { public: - Resource(const TQString &name="", const tqStatus &s=tqStatus()); + Resource(const TQString &name="", const Status &s=Status()); ~Resource(); const TQString & name() const; int priority() const; - const tqStatus & status() const; + const Status & status() const; void setName(const TQString &); - void settqStatus(const tqStatus &); + void setStatus(const Status &); private: TQString v_name; - tqStatus v_status; + Status v_status; class ResourcePrivate *d; }; @@ -570,7 +570,7 @@ namespace XMPP void rosterRequest(); void sendMessage(const Message &); void sendSubscription(const Jid &, const TQString &); - void setPresence(const tqStatus &); + void setPresence(const Status &); void debug(const TQString &); TQString genUniqueId(); @@ -610,8 +610,8 @@ namespace XMPP bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick); bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password); - void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &); - void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &); + void groupChatSetStatus(const TQString &host, const TQString &room, const Status &); + void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &); void groupChatLeave(const TQString &host, const TQString &room); signals: @@ -632,7 +632,7 @@ namespace XMPP void xmlOutgoing(const TQString &); void groupChatJoined(const Jid &); void groupChatLeft(const Jid &); - void groupChatPresence(const Jid &, const tqStatus &); + void groupChatPresence(const Jid &, const Status &); void groupChatError(const Jid &, int, const TQString &); void incomingJidLink(); @@ -652,7 +652,7 @@ namespace XMPP // basic daemons void ppSubscription(const Jid &, const TQString &); - void ppPresence(const Jid &, const tqStatus &); + void ppPresence(const Jid &, const Status &); void pmMessage(const Message &); void prRoster(const Roster &); @@ -666,8 +666,8 @@ namespace XMPP void distribute(const TQDomElement &); void importRoster(const Roster &); void importRosterItem(const RosterItem &); - void updateSelfPresence(const Jid &, const tqStatus &); - void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &); + void updateSelfPresence(const Jid &, const Status &); + void updatePresence(LiveRosterItem *, const Jid &, const Status &); class ClientPrivate; ClientPrivate *d; @@ -689,15 +689,15 @@ namespace XMPP ResourceList::ConstIterator priority() const; bool isAvailable() const; - const tqStatus & lastUnavailabletqStatus() const; + const Status & lastUnavailableStatus() const; bool flagForDelete() const; - void setLastUnavailabletqStatus(const tqStatus &); + void setLastUnavailableStatus(const Status &); void setFlagForDelete(bool); private: ResourceList v_resourceList; - tqStatus v_lastUnavailabletqStatus; + Status v_lastUnavailableStatus; bool v_flagForDelete; class LiveRosterItemPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 973b6c73..69737a24 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->pass = pass; d->resource = _resource; - tqStatus stat; + Status stat; stat.setIsAvailable(false); d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); - connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); @@ -267,7 +267,7 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) { Jid jid(room + "@" + host + "/" + nick); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con if(i.j.compare(jid, false)) { i.j = jid; - tqStatus s = _s; + Status s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -310,7 +310,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS d->groupChatList += i; JT_Presence *j = new JT_Presence(rootTask()); - j->pres(jid, tqStatus()); + j->pres(jid, Status()); j->go(true); return true; @@ -339,13 +339,13 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS d->groupChatList += i; JT_MucPresence *j = new JT_MucPresence(rootTask()); - j->pres(jid, tqStatus(), password); + j->pres(jid, Status(), password); j->go(true); return true; } -void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s) +void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) { Jid jid(room + "@" + host); bool found = false; @@ -360,7 +360,7 @@ void Client::groupChatSettqStatus(const TQString &host, const TQString &room, co if(!found) return; - tqStatus s = _s; + Status s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -381,7 +381,7 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); - tqStatus s; + Status s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -410,7 +410,7 @@ void Client::close(bool) i.status = GroupChat::Closing; JT_Presence *j = new JT_Presence(rootTask()); - tqStatus s; + Status s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -713,7 +713,7 @@ void Client::ppSubscription(const Jid &j, const TQString &s) subscription(j, s); } -void Client::ppPresence(const Jid &j, const tqStatus &s) +void Client::ppPresence(const Jid &j, const Status &s) { if(s.isAvailable()) debug(TQString("Client: %1 is available.\n").tqarg(j.full())); @@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s) } } -void Client::updateSelfPresence(const Jid &j, const tqStatus &s) +void Client::updateSelfPresence(const Jid &j, const Status &s) { ResourceList::Iterator rit = d->resourceList.find(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; @@ -798,7 +798,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) if(!s.isAvailable()) { if(found) { debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); - (*rit).settqStatus(s); + (*rit).setStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); } @@ -812,7 +812,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); } else { - (*rit).settqStatus(s); + (*rit).setStatus(s); r = *rit; debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); } @@ -821,7 +821,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) } } -void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) +void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) { ResourceList::Iterator rit = i->resourceList().find(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; @@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - (*rit).settqStatus(s); + (*rit).setStatus(s); debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); - i->setLastUnavailabletqStatus(s); + i->setLastUnavailableStatus(s); } } // available? add/update the resource @@ -845,7 +845,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } else { - (*rit).settqStatus(s); + (*rit).setStatus(s); r = *rit; debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } @@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type) j->go(true); } -void Client::setPresence(const tqStatus &s) +void Client::setPresence(const Status &s) { JT_Presence *j = new JT_Presence(rootTask()); j->pres(s); @@ -1004,7 +1004,7 @@ void Client::setPresence(const tqStatus &s) ppPresence(jid(), s); //ResourceList::Iterator rit = d->resourceList.find(resource()); //Resource &r = *rit; - //r.settqStatus(s); + //r.setStatus(s); } TQString Client::OSName() const @@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const return false; } -const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const +const Status & LiveRosterItem::lastUnavailableStatus() const { - return v_lastUnavailabletqStatus; + return v_lastUnavailableStatus; } bool LiveRosterItem::flagForDelete() const @@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const return v_flagForDelete; } -void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s) +void LiveRosterItem::setLastUnavailableStatus(const Status &s) { - v_lastUnavailabletqStatus = s; + v_lastUnavailableStatus = s; } void LiveRosterItem::setFlagForDelete(bool b) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 9e742d10..5700c343 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) d->spooled = true; } else { - d->timeStamp = TQDateTime::tqcurrentDateTime(); + d->timeStamp = TQDateTime::currentDateTime(); d->spooled = false; } @@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s) //--------------------------------------------------------------------------- -// tqStatus +// Status //--------------------------------------------------------------------------- -tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available) +Status::Status(const TQString &show, const TQString &status, int priority, bool available) { v_isAvailable = available; v_show = show; v_status = status; v_priority = priority; - v_timeStamp = TQDateTime::tqcurrentDateTime(); + v_timeStamp = TQDateTime::currentDateTime(); v_isInvisible = false; ecode = -1; } -tqStatus::~tqStatus() +Status::~Status() { } -bool tqStatus::hasError() const +bool Status::hasError() const { return (ecode != -1); } -void tqStatus::setError(int code, const TQString &str) +void Status::setError(int code, const TQString &str) { ecode = code; estr = str; } -void tqStatus::setIsAvailable(bool available) +void Status::setIsAvailable(bool available) { v_isAvailable = available; } -void tqStatus::setIsInvisible(bool invisible) +void Status::setIsInvisible(bool invisible) { v_isInvisible = invisible; } -void tqStatus::setPriority(int x) +void Status::setPriority(int x) { v_priority = x; } -void tqStatus::setShow(const TQString & _show) +void Status::setShow(const TQString & _show) { v_show = _show; } -void tqStatus::settqStatus(const TQString & _status) +void Status::setStatus(const TQString & _status) { v_status = _status; } -void tqStatus::setTimeStamp(const TQDateTime & _timestamp) +void Status::setTimeStamp(const TQDateTime & _timestamp) { v_timeStamp = _timestamp; } -void tqStatus::setKeyID(const TQString &key) +void Status::setKeyID(const TQString &key) { v_key = key; } -void tqStatus::setXSigned(const TQString &s) +void Status::setXSigned(const TQString &s) { v_xsigned = s; } -void tqStatus::setSongTitle(const TQString & _songtitle) +void Status::setSongTitle(const TQString & _songtitle) { v_songTitle = _songtitle; } -void tqStatus::setCapsNode(const TQString & _capsNode) +void Status::setCapsNode(const TQString & _capsNode) { v_capsNode = _capsNode; } -void tqStatus::setCapsVersion(const TQString & _capsVersion) +void Status::setCapsVersion(const TQString & _capsVersion) { v_capsVersion = _capsVersion; } -void tqStatus::setCapsExt(const TQString & _capsExt) +void Status::setCapsExt(const TQString & _capsExt) { v_capsExt = _capsExt; } -bool tqStatus::isAvailable() const +bool Status::isAvailable() const { return v_isAvailable; } -bool tqStatus::isAway() const +bool Status::isAway() const { if(v_show == "away" || v_show == "xa" || v_show == "dnd") return true; @@ -902,66 +902,66 @@ bool tqStatus::isAway() const return false; } -bool tqStatus::isInvisible() const +bool Status::isInvisible() const { return v_isInvisible; } -int tqStatus::priority() const +int Status::priority() const { return v_priority; } -const TQString & tqStatus::show() const +const TQString & Status::show() const { return v_show; } -const TQString & tqStatus::status() const +const TQString & Status::status() const { return v_status; } -TQDateTime tqStatus::timeStamp() const +TQDateTime Status::timeStamp() const { return v_timeStamp; } -const TQString & tqStatus::keyID() const +const TQString & Status::keyID() const { return v_key; } -const TQString & tqStatus::xsigned() const +const TQString & Status::xsigned() const { return v_xsigned; } -const TQString & tqStatus::songTitle() const +const TQString & Status::songTitle() const { return v_songTitle; } -const TQString & tqStatus::capsNode() const +const TQString & Status::capsNode() const { return v_capsNode; } -const TQString & tqStatus::capsVersion() const +const TQString & Status::capsVersion() const { return v_capsVersion; } -const TQString & tqStatus::capsExt() const +const TQString & Status::capsExt() const { return v_capsExt; } -int tqStatus::errorCode() const +int Status::errorCode() const { return ecode; } -const TQString & tqStatus::errorString() const +const TQString & Status::errorString() const { return estr; } @@ -970,7 +970,7 @@ const TQString & tqStatus::errorString() const //--------------------------------------------------------------------------- // Resource //--------------------------------------------------------------------------- -Resource::Resource(const TQString &name, const tqStatus &stat) +Resource::Resource(const TQString &name, const Status &stat) { v_name = name; v_status = stat; @@ -990,7 +990,7 @@ int Resource::priority() const return v_status.priority(); } -const tqStatus & Resource::status() const +const Status & Resource::status() const { return v_status; } @@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name) v_name = _name; } -void Resource::settqStatus(const tqStatus & _status) +void Resource::setStatus(const Status & _status) { v_status = _status; } 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 89d66796..c6e05909 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -485,7 +485,7 @@ JT_Presence::~JT_Presence() { } -void JT_Presence::pres(const tqStatus &s) +void JT_Presence::pres(const Status &s) { type = 0; @@ -529,7 +529,7 @@ void JT_Presence::pres(const tqStatus &s) } } -void JT_Presence::pres(const Jid &to, const tqStatus &s) +void JT_Presence::pres(const Jid &to, const Status &s) { pres(s); tag.setAttribute("to", to.full()); @@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e) return false; Jid j(e.attribute("from")); - tqStatus p; + Status p; if(e.hasAttribute("type")) { TQString type = e.attribute("type"); @@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e) tag = findSubTag(e, "status", &found); if(found) - p.settqStatus(tagContent(tag)); + p.setStatus(tagContent(tag)); tag = findSubTag(e, "show", &found); if(found) p.setShow(tagContent(tag)); @@ -1338,7 +1338,7 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQDomElement query = doc()->createElement("query"); // query.setAttribute("xmlns", "jabber:iq:time"); // iq.appendChild(query); - // TQDateTime local = TQDateTime::tqcurrentDateTime(); + // TQDateTime local = TQDateTime::currentDateTime(); // TQDateTime utc = local.addSecs(-getTZOffset() * 3600); // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); @@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence() { } -void JT_MucPresence::pres(const tqStatus &s) +void JT_MucPresence::pres(const Status &s) { type = 0; @@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const tqStatus &s) } } -void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password) +void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password) { pres(s); tag.setAttribute("to", to.full()); 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 9a8041e9..0a1fdac5 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -30,7 +30,7 @@ namespace XMPP { class Roster; - class tqStatus; + class Status; class JT_Register : public Task { @@ -135,8 +135,8 @@ namespace XMPP JT_Presence(Task *parent); ~JT_Presence(); - void pres(const tqStatus &); - void pres(const Jid &, const tqStatus &); + void pres(const Status &); + void pres(const Jid &, const Status &); void sub(const Jid &, const TQString &subType); void onGo(); @@ -160,7 +160,7 @@ namespace XMPP bool take(const TQDomElement &); signals: - void presence(const Jid &, const tqStatus &); + void presence(const Jid &, const Status &); void subscription(const Jid &, const TQString &); private: @@ -468,8 +468,8 @@ namespace XMPP JT_MucPresence(Task *parent); ~JT_MucPresence(); - void pres(const tqStatus &); - void pres(const Jid &, const tqStatus &, const TQString &password); + void pres(const Status &); + void pres(const Jid &, const Status &, const TQString &password); void onGo(); -- cgit v1.2.1