Trinity Qt initial conversion

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

1 files changed, 207 insertions, 207 deletions

diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 512839c3..f2fcf7c9 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -20,25 +20,25 @@
 
 #include"im.h"
 #include "protocol.h"
-#include<qmap.h>
-#include<qapplication.h>
+#include<tqmap.h>
+#include<tqapplication.h>
 
 #define NS_XML     "http://www.w3.org/XML/1998/namespace"
 
-static QDomElement textTag(QDomDocument *doc, const QString &name, const QString &content)
+static TQDomElement textTag(TQDomDocument *doc, const TQString &name, const TQString &content)
 {
-	QDomElement tag = doc->createElement(name);
-	QDomText text = doc->createTextNode(content);
+	TQDomElement tag = doc->createElement(name);
+	TQDomText text = doc->createTextNode(content);
 	tag.appendChild(text);
 
 	return tag;
 }
 
-static QString tagContent(const QDomElement &e)
+static TQString tagContent(const TQDomElement &e)
 {
 	// look for some tag content
-	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
-		QDomText i = n.toText();
+	for(TQDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+		TQDomText i = n.toText();
 		if(i.isNull())
 			continue;
 		return i.data();
@@ -47,10 +47,10 @@ static QString tagContent(const QDomElement &e)
 	return "";
 }
 
-static QDateTime stamp2TS(const QString &ts)
+static TQDateTime stamp2TS(const TQString &ts)
 {
 	if(ts.length() != 17)
-		return QDateTime();
+		return TQDateTime();
 
 	int year  = ts.mid(0,4).toInt();
 	int month = ts.mid(4,2).toInt();
@@ -60,22 +60,22 @@ static QDateTime stamp2TS(const QString &ts)
 	int min   = ts.mid(12,2).toInt();
 	int sec   = ts.mid(15,2).toInt();
 
-	QDate xd;
+	TQDate xd;
 	xd.setYMD(year, month, day);
 	if(!xd.isValid())
-		return QDateTime();
+		return TQDateTime();
 
-	QTime xt;
+	TQTime xt;
 	xt.setHMS(hour, min, sec);
 	if(!xt.isValid())
-		return QDateTime();
+		return TQDateTime();
 
-	return QDateTime(xd, xt);
+	return TQDateTime(xd, xt);
 }
 
-/*static QString TS2stamp(const QDateTime &d)
+/*static TQString TS2stamp(const TQDateTime &d)
 {
-	QString str;
+	TQString str;
 
 	str.sprintf("%04d%02d%02dT%02d:%02d:%02d",
 		d.date().year(),
@@ -97,17 +97,17 @@ namespace XMPP
 class Url::Private
 {
 public:
-	QString url;
-	QString desc;
+	TQString url;
+	TQString desc;
 };
 
 //! \brief Construct Url object with a given URL and Description.
 //!
 //! This function will construct a Url object.
-//! \param QString - url (default: empty string)
-//! \param QString - description of url (default: empty string)
+//! \param TQString - url (default: empty string)
+//! \param TQString - description of url (default: empty string)
 //! \sa setUrl() setDesc()
-Url::Url(const QString &url, const QString &desc)
+Url::Url(const TQString &url, const TQString &desc)
 {
 	d = new Private;
 	d->url = url;
@@ -140,7 +140,7 @@ Url::~Url()
 //! \brief Get url information.
 //!
 //! Returns url information.
-QString Url::url() const
+TQString Url::url() const
 {
 	return d->url;
 }
@@ -148,7 +148,7 @@ QString Url::url() const
 //! \brief Get Description information.
 //!
 //! Returns desction of the URL.
-QString Url::desc() const
+TQString Url::desc() const
 {
 	return d->desc;
 }
@@ -157,7 +157,7 @@ QString Url::desc() const
 //!
 //! Set url information.
 //! \param url - url string (eg: http://psi.affinix.com/)
-void Url::setUrl(const QString &url)
+void Url::setUrl(const TQString &url)
 {
 	d->url = url;
 }
@@ -166,7 +166,7 @@ void Url::setUrl(const QString &url)
 //!
 //! Set description of the url.
 //! \param desc - description of url
-void Url::setDesc(const QString &desc)
+void Url::setDesc(const TQString &desc)
 {
 	d->desc = desc;
 }
@@ -178,19 +178,19 @@ class Message::Private
 {
 public:
 	Jid to, from;
-	QString id, type, lang;
+	TQString id, type, lang;
 
 	StringMap subject, body, xHTMLBody;
 
-	QString thread;
+	TQString thread;
 	Stanza::Error error;
 
 	// extensions
-	QDateTime timeStamp;
+	TQDateTime timeStamp;
 	UrlList urlList;
-	QValueList<MsgEvent> eventList;
-	QString eventId;
-	QString xencrypted, invite;
+	TQValueList<MsgEvent> eventList;
+	TQString eventId;
+	TQString xencrypted, invite;
 
 	bool spooled, wasEncrypted;
 };
@@ -247,24 +247,24 @@ Jid Message::from() const
 	return d->from;
 }
 
-QString Message::id() const
+TQString Message::id() const
 {
 	return d->id;
 }
 
 //! \brief Return type information
-QString Message::type() const
+TQString Message::type() const
 {
 	return d->type;
 }
 
-QString Message::lang() const
+TQString Message::lang() const
 {
 	return d->lang;
 }
 
 //! \brief Return subject information.
-QString Message::subject(const QString &lang) const
+TQString Message::subject(const TQString &lang) const
 {
 	return d->subject[lang];
 }
@@ -275,17 +275,17 @@ QString Message::subject(const QString &lang) const
 //! it exists.
 //! \param rich - Returns richtext if true and plain text if false. (default: false)
 //! \note Richtext is in Qt's richtext format and not in xhtml.
-QString Message::body(const QString &lang) const
+TQString Message::body(const TQString &lang) const
 {
 	return d->body[lang];
 }
 
-QString Message::xHTMLBody(const QString &lang) const
+TQString Message::xHTMLBody(const TQString &lang) const
 {
 	return d->xHTMLBody[lang];
 }
 
-QString Message::thread() const
+TQString Message::thread() const
 {
 	return d->thread;
 }
@@ -310,7 +310,7 @@ void Message::setFrom(const Jid &j)
 	//d->flag = false;
 }
 
-void Message::setId(const QString &s)
+void Message::setId(const TQString &s)
 {
 	d->id = s;
 }
@@ -318,13 +318,13 @@ void Message::setId(const QString &s)
 //! \brief Set Type of message
 //!
 //! \param type - type of message your going to send
-void Message::setType(const QString &s)
+void Message::setType(const TQString &s)
 {
 	d->type = s;
 	//d->flag = false;
 }
 
-void Message::setLang(const QString &s)
+void Message::setLang(const TQString &s)
 {
 	d->lang = s;
 }
@@ -332,7 +332,7 @@ void Message::setLang(const QString &s)
 //! \brief Set subject
 //!
 //! \param subject - Subject information
-void Message::setSubject(const QString &s, const QString &lang)
+void Message::setSubject(const TQString &s, const TQString &lang)
 {
 	d->subject[lang] = s;
 	//d->flag = false;
@@ -343,20 +343,20 @@ void Message::setSubject(const QString &s, const QString &lang)
 //! \param body - body information
 //! \param rich - set richtext if true and set plaintext if false.
 //! \note Richtext support will be implemented in the future... Sorry.
-void Message::setBody(const QString &s, const QString &lang)
+void Message::setBody(const TQString &s, const TQString &lang)
 {
 	d->body[lang] = s;
 }
 
-void Message::setXHTMLBody(const QString &s, const QString &lang, const QString &attr)
+void Message::setXHTMLBody(const TQString &s, const TQString &lang, const TQString &attr)
 {
 	//ugly but needed if s is not a node but a list of leaf
 
-	QString content = "<body xmlns='" + QString(NS_XHTML) + "' "+attr+" >\n" + s +"\n</body>";
+	TQString content = "<body xmlns='" + TQString(NS_XHTML) + "' "+attr+" >\n" + s +"\n</body>";
 	d->xHTMLBody[lang] = content;
 }
 
-void Message::setThread(const QString &s)
+void Message::setThread(const TQString &s)
 {
 	d->thread = s;
 }
@@ -366,12 +366,12 @@ void Message::setError(const Stanza::Error &err)
 	d->error = err;
 }
 
-QDateTime Message::timeStamp() const
+TQDateTime Message::timeStamp() const
 {
 	return d->timeStamp;
 }
 
-void Message::setTimeStamp(const QDateTime &ts)
+void Message::setTimeStamp(const TQDateTime &ts)
 {
 	d->timeStamp = ts;
 }
@@ -404,12 +404,12 @@ void Message::setUrlList(const UrlList &list)
 	d->urlList = list;
 }
 
-QString Message::eventId() const
+TQString Message::eventId() const
 {
 	return d->eventId;
 }
 
-void Message::setEventId(const QString& id)
+void Message::setEventId(const TQString& id)
 {
 	d->eventId = id;
 }
@@ -433,22 +433,22 @@ void Message::addEvent(MsgEvent e)
 	}
 }
 
-QString Message::xencrypted() const
+TQString Message::xencrypted() const
 {
 	return d->xencrypted;
 }
 
-void Message::setXEncrypted(const QString &s)
+void Message::setXEncrypted(const TQString &s)
 {
 	d->xencrypted = s;
 }
 
-QString Message::invite() const
+TQString Message::invite() const
 {
 	return d->invite;
 }
 
-void Message::setInvite(const QString &s)
+void Message::setInvite(const TQString &s)
 {
 	d->invite = s;
 }
@@ -485,29 +485,29 @@ Stanza Message::toStanza(Stream *stream) const
 
 	StringMap::ConstIterator it;
 	for(it = d->subject.begin(); it != d->subject.end(); ++it) {
-		const QString &str = it.data();
+		const TQString &str = it.data();
 		if(!str.isEmpty()) {
-			QDomElement e = s.createTextElement(s.baseNS(), "subject", str);
+			TQDomElement e = s.createTextElement(s.baseNS(), "subject", str);
 			if(!it.key().isEmpty())
 				e.setAttributeNS(NS_XML, "xml:lang", it.key());
 			s.appendChild(e);
 		}
 	}
 	for(it = d->body.begin(); it != d->body.end(); ++it) {
-		const QString &str = it.data();
+		const TQString &str = it.data();
 		if(!str.isEmpty()) {
-			QDomElement e = s.createTextElement(s.baseNS(), "body", str);
+			TQDomElement e = s.createTextElement(s.baseNS(), "body", str);
 			if(!it.key().isEmpty())
 				e.setAttributeNS(NS_XML, "xml:lang", it.key());
 			s.appendChild(e);
 		}
 	}
 	if ( !d->xHTMLBody.isEmpty()) {
-		QDomElement parent = s.createElement(s.xhtmlImNS(), "html");
+		TQDomElement parent = s.createElement(s.xhtmlImNS(), "html");
 		for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) {
-			const QString &str = it.data();
+			const TQString &str = it.data();
 			if(!str.isEmpty()) {
-				QDomElement child = s.createXHTMLElement(str);
+				TQDomElement child = s.createXHTMLElement(str);
 				if(!it.key().isEmpty())
 					child.setAttributeNS(NS_XML, "xml:lang", it.key());
 				parent.appendChild(child);
@@ -520,14 +520,14 @@ Stanza Message::toStanza(Stream *stream) const
 
 	// timestamp
 	/*if(!d->timeStamp.isNull()) {
-		QDomElement e = s.createElement("jabber:x:delay", "x");
+		TQDomElement e = s.createElement("jabber:x:delay", "x");
 		e.setAttribute("stamp", TS2stamp(d->timeStamp));
 		s.appendChild(e);
 	}*/
 
 	// urls
-	for(QValueList<Url>::ConstIterator uit = d->urlList.begin(); uit != d->urlList.end(); ++uit) {
-		QDomElement x = s.createElement("jabber:x:oob", "x");
+	for(TQValueList<Url>::ConstIterator uit = d->urlList.begin(); uit != d->urlList.end(); ++uit) {
+		TQDomElement x = s.createElement("jabber:x:oob", "x");
 		x.appendChild(s.createTextElement("jabber:x:oob", "url", (*uit).url()));
 		if(!(*uit).desc().isEmpty())
 			x.appendChild(s.createTextElement("jabber:x:oob", "desc", (*uit).desc()));
@@ -536,7 +536,7 @@ Stanza Message::toStanza(Stream *stream) const
 
 	// events
 	if (!d->eventList.isEmpty()) {
-		QDomElement x = s.createElement("jabber:x:event", "x");
+		TQDomElement x = s.createElement("jabber:x:event", "x");
 
 		if (d->body.isEmpty()) {
 			if (d->eventId.isEmpty())
@@ -548,7 +548,7 @@ Stanza Message::toStanza(Stream *stream) const
 			s.appendChild(  s.createElement(NS_CHATSTATES , "active" ) );
 
 		bool need_x_event=false;
-		for(QValueList<MsgEvent>::ConstIterator ev = d->eventList.begin(); ev != d->eventList.end(); ++ev) {
+		for(TQValueList<MsgEvent>::ConstIterator ev = d->eventList.begin(); ev != d->eventList.end(); ++ev) {
 			switch (*ev) {
 				case OfflineEvent:
 					x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -594,7 +594,7 @@ Stanza Message::toStanza(Stream *stream) const
 
 	// invite
 	if(!d->invite.isEmpty()) {
-		QDomElement e = s.createElement("jabber:x:conference", "x");
+		TQDomElement e = s.createElement("jabber:x:conference", "x");
 		e.setAttribute("jid", d->invite);
 		s.appendChild(e);
 	}
@@ -615,24 +615,24 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 
 	d->subject.clear();
 	d->body.clear();
-	d->thread = QString();
+	d->thread = TQString();
 	d->eventList.clear();
 
-	QDomElement root = s.element();
+	TQDomElement root = s.element();
 
-	QDomNodeList nl = root.childNodes();
+	TQDomNodeList nl = root.childNodes();
 	uint n;
 	for(n = 0; n < nl.count(); ++n) {
-		QDomNode i = nl.item(n);
+		TQDomNode i = nl.item(n);
 		if(i.isElement()) {
-			QDomElement e = i.toElement();
+			TQDomElement e = i.toElement();
 			if(e.namespaceURI() == s.baseNS()) {
 				if(e.tagName() == "subject") {
-					QString lang = e.attributeNS(NS_XML, "lang", "");
+					TQString lang = e.attributeNS(NS_XML, "lang", "");
 					d->subject[lang] = e.text();
 				}
 				else if(e.tagName() == "body") {
-					QString lang = e.attributeNS(NS_XML, "lang", "");
+					TQString lang = e.attributeNS(NS_XML, "lang", "");
 					d->body[lang] = e.text();
 				}
 				else if(e.tagName() == "thread")
@@ -640,13 +640,13 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 			}
 			else if (e.namespaceURI() == s.xhtmlImNS()) {
 				 if (e.tagName() == "html") {
-					QDomNodeList htmlNL= e.childNodes();
+					TQDomNodeList htmlNL= e.childNodes();
 					for (unsigned int x = 0; x < htmlNL.count(); x++) {
-						QDomElement i = htmlNL.item(x).toElement();
+						TQDomElement i = htmlNL.item(x).toElement();
 
 						if (i.tagName() == "body") {
-							QDomDocument RichText;
-							QString lang = i.attributeNS(NS_XML, "lang", "");
+							TQDomDocument RichText;
+							TQString lang = i.attributeNS(NS_XML, "lang", "");
 							RichText.appendChild(i);
 							d-> xHTMLBody[lang] = RichText.toString();
 						}
@@ -690,14 +690,14 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 		d->error = s.error();
 
 	// timestamp
-	QDomElement t = root.elementsByTagNameNS("jabber:x:delay", "x").item(0).toElement();
+	TQDomElement t = root.elementsByTagNameNS("jabber:x:delay", "x").item(0).toElement();
 	if(!t.isNull()) {
 		d->timeStamp = stamp2TS(t.attribute("stamp"));
 		d->timeStamp = d->timeStamp.addSecs(timeZoneOffset * 3600);
 		d->spooled = true;
 	}
 	else {
-		d->timeStamp = QDateTime::currentDateTime();
+		d->timeStamp = TQDateTime::currentDateTime();
 		d->spooled = false;
 	}
 
@@ -705,7 +705,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 	d->urlList.clear();
 	nl = root.elementsByTagNameNS("jabber:x:oob", "x");
 	for(n = 0; n < nl.count(); ++n) {
-		QDomElement t = nl.item(n).toElement();
+		TQDomElement t = nl.item(n).toElement();
 		Url u;
 		u.setUrl(t.elementsByTagName("url").item(0).toElement().text());
 		u.setDesc(t.elementsByTagName("desc").item(0).toElement().text());
@@ -717,7 +717,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 	if (nl.count()) {
 		nl = nl.item(0).childNodes();
 		for(n = 0; n < nl.count(); ++n) {
-			QString evtag = nl.item(n).toElement().tagName();
+			TQString evtag = nl.item(n).toElement().tagName();
 			if (evtag == "id") {
 				d->eventId =  nl.item(n).toElement().text();
 			}
@@ -739,14 +739,14 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 	if(!t.isNull())
 		d->xencrypted = t.text();
 	else
-		d->xencrypted = QString();
+		d->xencrypted = TQString();
 
 	// invite
 	t = root.elementsByTagNameNS("jabber:x:conference", "x").item(0).toElement();
 	if(!t.isNull())
 		d->invite = t.attribute("jid");
 	else
-		d->invite = QString();
+		d->invite = TQString();
 
 	return true;
 }
@@ -764,7 +764,7 @@ int Subscription::type() const
 	return value;
 }
 
-QString Subscription::toString() const
+TQString Subscription::toString() const
 {
 	switch(value) {
 		case Remove:
@@ -781,7 +781,7 @@ QString Subscription::toString() const
 	}
 }
 
-bool Subscription::fromString(const QString &s)
+bool Subscription::fromString(const TQString &s)
 {
 	if(s == "remove")
 		value = Remove;
@@ -803,13 +803,13 @@ bool Subscription::fromString(const QString &s)
 //---------------------------------------------------------------------------
 // Status
 //---------------------------------------------------------------------------
-Status::Status(const QString &show, const QString &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 = QDateTime::currentDateTime();
+	v_timeStamp = TQDateTime::currentDateTime();
 	v_isInvisible = false;
 	ecode = -1;
 }
@@ -823,7 +823,7 @@ bool Status::hasError() const
 	return (ecode != -1);
 }
 
-void Status::setError(int code, const QString &str)
+void Status::setError(int code, const TQString &str)
 {
 	ecode = code;
 	estr = str;
@@ -844,47 +844,47 @@ void Status::setPriority(int x)
 	v_priority = x;
 }
 
-void Status::setShow(const QString & _show)
+void Status::setShow(const TQString & _show)
 {
 	v_show = _show;
 }
 
-void Status::setStatus(const QString & _status)
+void Status::setStatus(const TQString & _status)
 {
 	v_status = _status;
 }
 
-void Status::setTimeStamp(const QDateTime & _timestamp)
+void Status::setTimeStamp(const TQDateTime & _timestamp)
 {
 	v_timeStamp = _timestamp;
 }
 
-void Status::setKeyID(const QString &key)
+void Status::setKeyID(const TQString &key)
 {
 	v_key = key;
 }
 
-void Status::setXSigned(const QString &s)
+void Status::setXSigned(const TQString &s)
 {
 	v_xsigned = s;
 }
 
-void Status::setSongTitle(const QString & _songtitle)
+void Status::setSongTitle(const TQString & _songtitle)
 {
 	v_songTitle = _songtitle;
 }
 
-void Status::setCapsNode(const QString & _capsNode)
+void Status::setCapsNode(const TQString & _capsNode)
 {
 	v_capsNode = _capsNode;
 }
 
-void Status::setCapsVersion(const QString & _capsVersion)
+void Status::setCapsVersion(const TQString & _capsVersion)
 {
 	v_capsVersion = _capsVersion;
 }
 
-void Status::setCapsExt(const QString & _capsExt)
+void Status::setCapsExt(const TQString & _capsExt)
 {
 	v_capsExt = _capsExt;
 }
@@ -912,46 +912,46 @@ int Status::priority() const
 	return v_priority;
 }
 
-const QString & Status::show() const
+const TQString & Status::show() const
 {
 	return v_show;
 }
-const QString & Status::status() const
+const TQString & Status::status() const
 {
 	return v_status;
 }
 
-QDateTime Status::timeStamp() const
+TQDateTime Status::timeStamp() const
 {
 	return v_timeStamp;
 }
 
-const QString & Status::keyID() const
+const TQString & Status::keyID() const
 {
 	return v_key;
 }
 
-const QString & Status::xsigned() const
+const TQString & Status::xsigned() const
 {
 	return v_xsigned;
 }
 
-const QString & Status::songTitle() const
+const TQString & Status::songTitle() const
 {
 	return v_songTitle;
 }
 
-const QString & Status::capsNode() const
+const TQString & Status::capsNode() const
 {
 	return v_capsNode;
 }
 
-const QString & Status::capsVersion() const
+const TQString & Status::capsVersion() const
 {
 	return v_capsVersion;
 }
 
-const QString & Status::capsExt() const
+const TQString & Status::capsExt() const
 {
 	return v_capsExt;
 }
@@ -961,7 +961,7 @@ int Status::errorCode() const
 	return ecode;
 }
 
-const QString & Status::errorString() const
+const TQString & Status::errorString() const
 {
 	return estr;
 }
@@ -970,7 +970,7 @@ const QString & Status::errorString() const
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const QString &name, const Status &stat)
+Resource::Resource(const TQString &name, const Status &stat)
 {
 	v_name = name;
 	v_status = stat;
@@ -980,7 +980,7 @@ Resource::~Resource()
 {
 }
 
-const QString & Resource::name() const
+const TQString & Resource::name() const
 {
 	return v_name;
 }
@@ -995,7 +995,7 @@ const Status & Resource::status() const
 	return v_status;
 }
 
-void Resource::setName(const QString & _name)
+void Resource::setName(const TQString & _name)
 {
 	v_name = _name;
 }
@@ -1010,7 +1010,7 @@ void Resource::setStatus(const Status & _status)
 // ResourceList
 //---------------------------------------------------------------------------
 ResourceList::ResourceList()
-:QValueList<Resource>()
+:TQValueList<Resource>()
 {
 }
 
@@ -1018,7 +1018,7 @@ ResourceList::~ResourceList()
 {
 }
 
-ResourceList::Iterator ResourceList::find(const QString & _find)
+ResourceList::Iterator ResourceList::find(const TQString & _find)
 {
 	for(ResourceList::Iterator it = begin(); it != end(); ++it) {
 		if((*it).name() == _find)
@@ -1040,7 +1040,7 @@ ResourceList::Iterator ResourceList::priority()
 	return highest;
 }
 
-ResourceList::ConstIterator ResourceList::find(const QString & _find) const
+ResourceList::ConstIterator ResourceList::find(const TQString & _find) const
 {
 	for(ResourceList::ConstIterator it = begin(); it != end(); ++it) {
 		if((*it).name() == _find)
@@ -1080,12 +1080,12 @@ const Jid & RosterItem::jid() const
 	return v_jid;
 }
 
-const QString & RosterItem::name() const
+const TQString & RosterItem::name() const
 {
 	return v_name;
 }
 
-const QStringList & RosterItem::groups() const
+const TQStringList & RosterItem::groups() const
 {
 	return v_groups;
 }
@@ -1095,7 +1095,7 @@ const Subscription & RosterItem::subscription() const
 	return v_subscription;
 }
 
-const QString & RosterItem::ask() const
+const TQString & RosterItem::ask() const
 {
 	return v_ask;
 }
@@ -1105,9 +1105,9 @@ bool RosterItem::isPush() const
 	return v_push;
 }
 
-bool RosterItem::inGroup(const QString &g) const
+bool RosterItem::inGroup(const TQString &g) const
 {
-	for(QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it) {
+	for(TQStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it) {
 		if(*it == g)
 			return true;
 	}
@@ -1119,12 +1119,12 @@ void RosterItem::setJid(const Jid &_jid)
 	v_jid = _jid;
 }
 
-void RosterItem::setName(const QString &_name)
+void RosterItem::setName(const TQString &_name)
 {
 	v_name = _name;
 }
 
-void RosterItem::setGroups(const QStringList &_groups)
+void RosterItem::setGroups(const TQStringList &_groups)
 {
 	v_groups = _groups;
 }
@@ -1134,7 +1134,7 @@ void RosterItem::setSubscription(const Subscription &type)
 	v_subscription = type;
 }
 
-void RosterItem::setAsk(const QString &_ask)
+void RosterItem::setAsk(const TQString &_ask)
 {
 	v_ask = _ask;
 }
@@ -1144,7 +1144,7 @@ void RosterItem::setIsPush(bool b)
 	v_push = b;
 }
 
-bool RosterItem::addGroup(const QString &g)
+bool RosterItem::addGroup(const TQString &g)
 {
 	if(inGroup(g))
 		return false;
@@ -1153,9 +1153,9 @@ bool RosterItem::addGroup(const QString &g)
 	return true;
 }
 
-bool RosterItem::removeGroup(const QString &g)
+bool RosterItem::removeGroup(const TQString &g)
 {
-	for(QStringList::Iterator it = v_groups.begin(); it != v_groups.end(); ++it) {
+	for(TQStringList::Iterator it = v_groups.begin(); it != v_groups.end(); ++it) {
 		if(*it == g) {
 			v_groups.remove(it);
 			return true;
@@ -1165,40 +1165,40 @@ bool RosterItem::removeGroup(const QString &g)
 	return false;
 }
 
-QDomElement RosterItem::toXml(QDomDocument *doc) const
+TQDomElement RosterItem::toXml(TQDomDocument *doc) const
 {
-	QDomElement item = doc->createElement("item");
+	TQDomElement item = doc->createElement("item");
 	item.setAttribute("jid", v_jid.full());
 	item.setAttribute("name", v_name);
 	item.setAttribute("subscription", v_subscription.toString());
 	if(!v_ask.isEmpty())
 		item.setAttribute("ask", v_ask);
-	for(QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it)
+	for(TQStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it)
 		item.appendChild(textTag(doc, "group", *it));
 
 	return item;
 }
 
-bool RosterItem::fromXml(const QDomElement &item)
+bool RosterItem::fromXml(const TQDomElement &item)
 {
 	if(item.tagName() != "item")
 		return false;
 	Jid j(item.attribute("jid"));
 	if(!j.isValid())
 		return false;
-	QString na = item.attribute("name");
+	TQString na = item.attribute("name");
 	Subscription s;
 	if(!s.fromString(item.attribute("subscription")) )
 		return false;
-	QStringList g;
-	for(QDomNode n = item.firstChild(); !n.isNull(); n = n.nextSibling()) {
-		QDomElement i = n.toElement();
+	TQStringList g;
+	for(TQDomNode n = item.firstChild(); !n.isNull(); n = n.nextSibling()) {
+		TQDomElement i = n.toElement();
 		if(i.isNull())
 			continue;
 		if(i.tagName() == "group")
 			g += tagContent(i);
 	}
-	QString a = item.attribute("ask");
+	TQString a = item.attribute("ask");
 
 	v_jid = j;
 	v_name = na;
@@ -1214,7 +1214,7 @@ bool RosterItem::fromXml(const QDomElement &item)
 // Roster
 //---------------------------------------------------------------------------
 Roster::Roster()
-:QValueList<RosterItem>()
+:TQValueList<RosterItem>()
 {
 }
 
@@ -1246,7 +1246,7 @@ Roster::ConstIterator Roster::find(const Jid &j) const
 //---------------------------------------------------------------------------
 // FormField
 //---------------------------------------------------------------------------
-FormField::FormField(const QString &type, const QString &value)
+FormField::FormField(const TQString &type, const TQString &value)
 {
 	v_type = misc;
 	if(!type.isEmpty()) {
@@ -1266,29 +1266,29 @@ int FormField::type() const
 	return v_type;
 }
 
-QString FormField::realName() const
+TQString FormField::realName() const
 {
 	return typeToTagName(v_type);
 }
 
-QString FormField::fieldName() const
+TQString FormField::fieldName() const
 {
 	switch(v_type) {
-		case username:  return QObject::tr("Username");
-		case nick:      return QObject::tr("Nickname");
-		case password:  return QObject::tr("Password");
-		case name:      return QObject::tr("Name");
-		case first:     return QObject::tr("First Name");
-		case last:      return QObject::tr("Last Name");
-		case email:     return QObject::tr("E-mail");
-		case address:   return QObject::tr("Address");
-		case city:      return QObject::tr("City");
-		case state:     return QObject::tr("State");
-		case zip:       return QObject::tr("Zipcode");
-		case phone:     return QObject::tr("Phone");
-		case url:       return QObject::tr("URL");
-		case date:      return QObject::tr("Date");
-		case misc:      return QObject::tr("Misc");
+		case username:  return TQObject::tr("Username");
+		case nick:      return TQObject::tr("Nickname");
+		case password:  return TQObject::tr("Password");
+		case name:      return TQObject::tr("Name");
+		case first:     return TQObject::tr("First Name");
+		case last:      return TQObject::tr("Last Name");
+		case email:     return TQObject::tr("E-mail");
+		case address:   return TQObject::tr("Address");
+		case city:      return TQObject::tr("City");
+		case state:     return TQObject::tr("State");
+		case zip:       return TQObject::tr("Zipcode");
+		case phone:     return TQObject::tr("Phone");
+		case url:       return TQObject::tr("URL");
+		case date:      return TQObject::tr("Date");
+		case misc:      return TQObject::tr("Misc");
 		default:        return "";
 	};
 }
@@ -1298,7 +1298,7 @@ bool FormField::isSecret() const
 	return (type() == password);
 }
 
-const QString & FormField::value() const
+const TQString & FormField::value() const
 {
 	return v_value;
 }
@@ -1308,7 +1308,7 @@ void FormField::setType(int x)
 	v_type = x;
 }
 
-bool FormField::setType(const QString &in)
+bool FormField::setType(const TQString &in)
 {
 	int x = tagNameToType(in);
 	if(x == -1)
@@ -1318,12 +1318,12 @@ bool FormField::setType(const QString &in)
 	return true;
 }
 
-void FormField::setValue(const QString &in)
+void FormField::setValue(const TQString &in)
 {
 	v_value = in;
 }
 
-int FormField::tagNameToType(const QString &in) const
+int FormField::tagNameToType(const TQString &in) const
 {
 	if(!in.compare("username")) return username;
 	if(!in.compare("nick"))     return nick;
@@ -1344,7 +1344,7 @@ int FormField::tagNameToType(const QString &in) const
 	return -1;
 }
 
-QString FormField::typeToTagName(int type) const
+TQString FormField::typeToTagName(int type) const
 {
 	switch(type) {
 		case username:  return "username";
@@ -1371,7 +1371,7 @@ QString FormField::typeToTagName(int type) const
 // Form
 //---------------------------------------------------------------------------
 Form::Form(const Jid &j)
-:QValueList<FormField>()
+:TQValueList<FormField>()
 {
 	setJid(j);
 }
@@ -1385,12 +1385,12 @@ Jid Form::jid() const
 	return v_jid;
 }
 
-QString Form::instructions() const
+TQString Form::instructions() const
 {
 	return v_instructions;
 }
 
-QString Form::key() const
+TQString Form::key() const
 {
 	return v_key;
 }
@@ -1400,12 +1400,12 @@ void Form::setJid(const Jid &j)
 	v_jid = j;
 }
 
-void Form::setInstructions(const QString &s)
+void Form::setInstructions(const TQString &s)
 {
 	v_instructions = s;
 }
 
-void Form::setKey(const QString &s)
+void Form::setKey(const TQString &s)
 {
 	v_key = s;
 }
@@ -1428,22 +1428,22 @@ const Jid & SearchResult::jid() const
 	return v_jid;
 }
 
-const QString & SearchResult::nick() const
+const TQString & SearchResult::nick() const
 {
 	return v_nick;
 }
 
-const QString & SearchResult::first() const
+const TQString & SearchResult::first() const
 {
 	return v_first;
 }
 
-const QString & SearchResult::last() const
+const TQString & SearchResult::last() const
 {
 	return v_last;
 }
 
-const QString & SearchResult::email() const
+const TQString & SearchResult::email() const
 {
 	return v_email;
 }
@@ -1453,22 +1453,22 @@ void SearchResult::setJid(const Jid &jid)
 	v_jid = jid;
 }
 
-void SearchResult::setNick(const QString &nick)
+void SearchResult::setNick(const TQString &nick)
 {
 	v_nick = nick;
 }
 
-void SearchResult::setFirst(const QString &first)
+void SearchResult::setFirst(const TQString &first)
 {
 	v_first = first;
 }
 
-void SearchResult::setLast(const QString &last)
+void SearchResult::setLast(const TQString &last)
 {
 	v_last = last;
 }
 
-void SearchResult::setEmail(const QString &email)
+void SearchResult::setEmail(const TQString &email)
 {
 	v_email = email;
 }
@@ -1481,14 +1481,14 @@ Features::Features()
 {
 }
 
-Features::Features(const QStringList &l)
+Features::Features(const TQStringList &l)
 {
 	setList(l);
 }
 
-Features::Features(const QString &str)
+Features::Features(const TQString &str)
 {
-	QStringList l;
+	TQStringList l;
 	l << str;
 
 	setList(l);
@@ -1498,19 +1498,19 @@ Features::~Features()
 {
 }
 
-QStringList Features::list() const
+TQStringList Features::list() const
 {
 	return _list;
 }
 
-void Features::setList(const QStringList &l)
+void Features::setList(const TQStringList &l)
 {
 	_list = l;
 }
 
-bool Features::test(const QStringList &ns) const
+bool Features::test(const TQStringList &ns) const
 {
-	QStringList::ConstIterator it = ns.begin();
+	TQStringList::ConstIterator it = ns.begin();
 	for ( ; it != ns.end(); ++it)
 		if ( _list.find( *it ) != _list.end() )
 			return true;
@@ -1521,7 +1521,7 @@ bool Features::test(const QStringList &ns) const
 #define FID_REGISTER "jabber:iq:register"
 bool Features::canRegister() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_REGISTER;
 
 	return test(ns);
@@ -1530,7 +1530,7 @@ bool Features::canRegister() const
 #define FID_SEARCH "jabber:iq:search"
 bool Features::canSearch() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_SEARCH;
 
 	return test(ns);
@@ -1539,7 +1539,7 @@ bool Features::canSearch() const
 #define FID_XHTML  "http://jabber.org/protocol/xhtml-im"
 bool Features::canXHTML() const
 {
-	QStringList ns;
+	TQStringList ns;
 
 	ns << FID_XHTML;
 
@@ -1549,7 +1549,7 @@ bool Features::canXHTML() const
 #define FID_GROUPCHAT "jabber:iq:conference"
 bool Features::canGroupchat() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << "http://jabber.org/protocol/muc";
 	ns << FID_GROUPCHAT;
 
@@ -1559,7 +1559,7 @@ bool Features::canGroupchat() const
 #define FID_VOICE "http://www.google.com/xmpp/protocol/voice/v1"
 bool Features::canVoice() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_VOICE;
 
 	return test(ns);
@@ -1568,7 +1568,7 @@ bool Features::canVoice() const
 #define FID_GATEWAY "jabber:iq:gateway"
 bool Features::isGateway() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_GATEWAY;
 
 	return test(ns);
@@ -1577,7 +1577,7 @@ bool Features::isGateway() const
 #define FID_DISCO "http://jabber.org/protocol/disco"
 bool Features::canDisco() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_DISCO;
 	ns << "http://jabber.org/protocol/disco#info";
 	ns << "http://jabber.org/protocol/disco#items";
@@ -1588,7 +1588,7 @@ bool Features::canDisco() const
 #define FID_VCARD "vcard-temp"
 bool Features::haveVCard() const
 {
-	QStringList ns;
+	TQStringList ns;
 	ns << FID_VCARD;
 
 	return test(ns);
@@ -1602,7 +1602,7 @@ class Features::FeatureName : public QObject
 	Q_OBJECT
 public:
 	FeatureName()
-	: QObject(qApp)
+	: TQObject(qApp)
 	{
 		id2s[FID_Invalid]	= tr("ERROR: Incorrect usage of Features class");
 		id2s[FID_None]		= tr("None");
@@ -1617,7 +1617,7 @@ public:
 		id2s[FID_Add]		= tr("Add to roster");
 
 		// compute reverse map
-		//QMap<QString, long>::Iterator it = id2s.begin();
+		//TQMap<TQString, long>::Iterator it = id2s.begin();
 		//for ( ; it != id2s.end(); ++it)
 		//	s2id[it.data()] = it.key();
 
@@ -1632,9 +1632,9 @@ public:
 		id2f[FID_Add]		= FID_ADD;
 	}
 
-	//QMap<QString, long> s2id;
-	QMap<long, QString> id2s;
-	QMap<long, QString> id2f;
+	//TQMap<TQString, long> s2id;
+	TQMap<long, TQString> id2s;
+	TQMap<long, TQString> id2f;
 };
 
 static Features::FeatureName *featureName = 0;
@@ -1661,13 +1661,13 @@ long Features::id() const
 	return FID_None;
 }
 
-long Features::id(const QString &feature)
+long Features::id(const TQString &feature)
 {
 	Features f(feature);
 	return f.id();
 }
 
-QString Features::feature(long id)
+TQString Features::feature(long id)
 {
 	if ( !featureName )
 		featureName = new FeatureName();
@@ -1675,7 +1675,7 @@ QString Features::feature(long id)
 	return featureName->id2f[id];
 }
 
-QString Features::name(long id)
+TQString Features::name(long id)
 {
 	if ( !featureName )
 		featureName = new FeatureName();
@@ -1683,12 +1683,12 @@ QString Features::name(long id)
 	return featureName->id2s[id];
 }
 
-QString Features::name() const
+TQString Features::name() const
 {
 	return name(id());
 }
 
-QString Features::name(const QString &feature)
+TQString Features::name(const TQString &feature)
 {
 	Features f(feature);
 	return f.name(f.id());
@@ -1706,8 +1706,8 @@ public:
 	}
 
 	Jid jid;
-	QString name;
-	QString node;
+	TQString name;
+	TQString node;
 	Action action;
 
 	Features features;
@@ -1789,22 +1789,22 @@ void DiscoItem::setJid(const Jid &j)
 	d->jid = j;
 }
 
-const QString &DiscoItem::name() const
+const TQString &DiscoItem::name() const
 {
 	return d->name;
 }
 
-void DiscoItem::setName(const QString &n)
+void DiscoItem::setName(const TQString &n)
 {
 	d->name = n;
 }
 
-const QString &DiscoItem::node() const
+const TQString &DiscoItem::node() const
 {
 	return d->node;
 }
 
-void DiscoItem::setNode(const QString &n)
+void DiscoItem::setNode(const TQString &n)
 {
 	d->node = n;
 }
@@ -1843,7 +1843,7 @@ void DiscoItem::setIdentities(const Identities &i)
 }
 
 
-DiscoItem::Action DiscoItem::string2action(QString s)
+DiscoItem::Action DiscoItem::string2action(TQString s)
 {
 	Action a;
 
@@ -1857,16 +1857,16 @@ DiscoItem::Action DiscoItem::string2action(QString s)
 	return a;
 }
 
-QString DiscoItem::action2string(Action a)
+TQString DiscoItem::action2string(Action a)
 {
-	QString s;
+	TQString s;
 
 	if ( a == Update )
 		s = "update";
 	else if ( a == Remove )
 		s = "remove";
 	else
-		s = QString::null;
+		s = TQString::null;
 
 	return s;
 }