From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../jabber/libiris/iris/xmpp-core/xmlprotocol.cpp | 108 ++++++++++----------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp') diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 0ae15585..de321e7c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -30,10 +30,10 @@ using namespace XMPP; // display purposes only (the element is pretty much useless for processing // after this). We do this because QXml is a bit overzealous about outputting // redundant namespaces. -static QDomElement stripExtraNS(const QDomElement &e) +static TQDomElement stripExtraNS(const TQDomElement &e) { // find closest parent with a namespace - QDomNode par = e.parentNode(); + TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); bool noShowNS = false; @@ -41,13 +41,13 @@ static QDomElement stripExtraNS(const QDomElement &e) noShowNS = true; // build qName (prefix:localName) - QString qName; + TQString qName; if(!e.prefix().isEmpty()) qName = e.prefix() + ':' + e.localName(); else qName = e.tagName(); - QDomElement i; + TQDomElement i; uint x; if(noShowNS) i = e.ownerDocument().createElement(qName); @@ -55,21 +55,21 @@ static QDomElement stripExtraNS(const QDomElement &e) i = e.ownerDocument().createElementNS(e.namespaceURI(), qName); // copy attributes - QDomNamedNodeMap al = e.attributes(); + TQDomNamedNodeMap al = e.attributes(); for(x = 0; x < al.count(); ++x) { - QDomAttr a = al.item(x).cloneNode().toAttr(); + TQDomAttr a = al.item(x).cloneNode().toAttr(); // don't show xml namespace if(a.namespaceURI() == NS_XML) - i.setAttribute(QString("xml:") + a.name(), a.value()); + i.setAttribute(TQString("xml:") + a.name(), a.value()); else i.setAttributeNodeNS(a); } // copy children - QDomNodeList nl = e.childNodes(); + TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { - QDomNode n = nl.item(x); + TQDomNode n = nl.item(x); if(n.isElement()) i.appendChild(stripExtraNS(n.toElement())); else @@ -80,20 +80,20 @@ static QDomElement stripExtraNS(const QDomElement &e) // xmlToString // -// This function converts a QDomElement into a QString, using stripExtraNS +// This function converts a TQDomElement into a TQString, using stripExtraNS // to make it pretty. -static QString xmlToString(const QDomElement &e, const QString &fakeNS, const QString &fakeQName, bool clip) +static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const TQString &fakeQName, bool clip) { - QDomElement i = e.cloneNode().toElement(); + TQDomElement i = e.cloneNode().toElement(); // It seems QDom can only have one namespace attribute at a time (see docElement 'HACK'). // Fortunately we only need one kind depending on the input, so it is specified here. - QDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeQName); + TQDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeQName); fake.appendChild(i); fake = stripExtraNS(fake); - QString out; + TQString out; { - QTextStream ts(&out, IO_WriteOnly); + TQTextStream ts(&out, IO_WriteOnly); fake.firstChild().save(ts, 0); } // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline @@ -112,18 +112,18 @@ static QString xmlToString(const QDomElement &e, const QString &fakeNS, const QS // text needed to open/close an XML stream, without resorting to generating // the XML ourselves. This function uses QDom to do the generation, which // ensures proper encoding and entity output. -static void createRootXmlTags(const QDomElement &root, QString *xmlHeader, QString *tagOpen, QString *tagClose) +static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQString *tagOpen, TQString *tagClose) { - QDomElement e = root.cloneNode(false).toElement(); + TQDomElement e = root.cloneNode(false).toElement(); // insert a dummy element to ensure open and closing tags are generated - QDomElement dummy = e.ownerDocument().createElement("dummy"); + TQDomElement dummy = e.ownerDocument().createElement("dummy"); e.appendChild(dummy); // convert to xml->text - QString str; + TQString str; { - QTextStream ts(&str, IO_WriteOnly); + TQTextStream ts(&str, IO_WriteOnly); e.save(ts, 0); } @@ -148,7 +148,7 @@ XmlProtocol::TransferItem::TransferItem() { } -XmlProtocol::TransferItem::TransferItem(const QString &_str, bool sent, bool external) +XmlProtocol::TransferItem::TransferItem(const TQString &_str, bool sent, bool external) { isString = true; isSent = sent; @@ -156,7 +156,7 @@ XmlProtocol::TransferItem::TransferItem(const QString &_str, bool sent, bool ext str = _str; } -XmlProtocol::TransferItem::TransferItem(const QDomElement &_elem, bool sent, bool external) +XmlProtocol::TransferItem::TransferItem(const TQDomElement &_elem, bool sent, bool external) { isString = false; isSent = sent; @@ -184,30 +184,30 @@ void XmlProtocol::reset() { init(); - elem = QDomElement(); - tagOpen = QString(); - tagClose = QString(); + elem = TQDomElement(); + tagOpen = TQString(); + tagClose = TQString(); xml.reset(); outData.resize(0); trackQueue.clear(); transferItemList.clear(); } -void XmlProtocol::addIncomingData(const QByteArray &a) +void XmlProtocol::addIncomingData(const TQByteArray &a) { xml.appendData(a); } -QByteArray XmlProtocol::takeOutgoingData() +TQByteArray XmlProtocol::takeOutgoingData() { - QByteArray a = outData.copy(); + TQByteArray a = outData.copy(); outData.resize(0); return a; } void XmlProtocol::outgoingDataWritten(int bytes) { - for(QValueList::Iterator it = trackQueue.begin(); it != trackQueue.end();) { + for(TQValueList::Iterator it = trackQueue.begin(); it != trackQueue.end();) { TrackItem &i = *it; // enough bytes? @@ -302,21 +302,21 @@ bool XmlProtocol::processStep() return baseStep(pe); } -QString XmlProtocol::xmlEncoding() const +TQString XmlProtocol::xmlEncoding() const { return xml.encoding(); } -QString XmlProtocol::elementToString(const QDomElement &e, bool clip) +TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip) { if(elem.isNull()) elem = elemDoc.importNode(docElement(), true).toElement(); // Determine the appropriate 'fakeNS' to use - QString ns; + TQString ns; // first, check root namespace - QString pre = e.prefix(); + TQString pre = e.prefix(); if(pre.isNull()) pre = ""; if(pre == elem.prefix()) { @@ -324,11 +324,11 @@ QString XmlProtocol::elementToString(const QDomElement &e, bool clip) } else { // scan the root attributes for 'xmlns' (oh joyous hacks) - QDomNamedNodeMap al = elem.attributes(); + TQDomNamedNodeMap al = elem.attributes(); uint n; for(n = 0; n < al.count(); ++n) { - QDomAttr a = al.item(n).toAttr(); - QString s = a.name(); + TQDomAttr a = al.item(n).toAttr(); + TQString s = a.name(); int x = s.find(':'); if(x != -1) s = s.mid(x+1); @@ -346,7 +346,7 @@ QString XmlProtocol::elementToString(const QDomElement &e, bool clip) } // build qName - QString qn; + TQString qn; if(!elem.prefix().isEmpty()) qn = elem.prefix() + ':'; qn += elem.localName(); @@ -366,22 +366,22 @@ void XmlProtocol::itemWritten(int, int) // default does nothing } -void XmlProtocol::stringSend(const QString &) +void XmlProtocol::stringSend(const TQString &) { // default does nothing } -void XmlProtocol::stringRecv(const QString &) +void XmlProtocol::stringRecv(const TQString &) { // default does nothing } -void XmlProtocol::elementSend(const QDomElement &) +void XmlProtocol::elementSend(const TQDomElement &) { // default does nothing } -void XmlProtocol::elementRecv(const QDomElement &) +void XmlProtocol::elementRecv(const TQDomElement &) { // default does nothing } @@ -406,24 +406,24 @@ bool XmlProtocol::close() return true; } -int XmlProtocol::writeString(const QString &s, int id, bool external) +int XmlProtocol::writeString(const TQString &s, int id, bool external) { transferItemList += TransferItem(s, true, external); return internalWriteString(s, TrackItem::Custom, id); } -int XmlProtocol::writeElement(const QDomElement &e, int id, bool external, bool clip) +int XmlProtocol::writeElement(const TQDomElement &e, int id, bool external, bool clip) { if(e.isNull()) return 0; transferItemList += TransferItem(e, true, external); //elementSend(e); - QString out = elementToString(e, clip); + TQString out = elementToString(e, clip); return internalWriteString(out, TrackItem::Custom, id); } -QByteArray XmlProtocol::resetStream() +TQByteArray XmlProtocol::resetStream() { // reset the state if(incoming) @@ -432,12 +432,12 @@ QByteArray XmlProtocol::resetStream() state = SendOpen; // grab unprocessed data before resetting - QByteArray spare = xml.unprocessed(); + TQByteArray spare = xml.unprocessed(); xml.reset(); return spare; } -int XmlProtocol::internalWriteData(const QByteArray &a, TrackItem::Type t, int id) +int XmlProtocol::internalWriteData(const TQByteArray &a, TrackItem::Type t, int id) { TrackItem i; i.type = t; @@ -449,10 +449,10 @@ int XmlProtocol::internalWriteData(const QByteArray &a, TrackItem::Type t, int i return a.size(); } -int XmlProtocol::internalWriteString(const QString &s, TrackItem::Type t, int id) +int XmlProtocol::internalWriteString(const TQString &s, TrackItem::Type t, int id) { - QCString cs = s.utf8(); - QByteArray a(cs.length()); + TQCString cs = s.utf8(); + TQByteArray a(cs.length()); memcpy(a.data(), cs.data(), a.size()); return internalWriteData(a, t, id); } @@ -462,10 +462,10 @@ void XmlProtocol::sendTagOpen() if(elem.isNull()) elem = elemDoc.importNode(docElement(), true).toElement(); - QString xmlHeader; + TQString xmlHeader; createRootXmlTags(elem, &xmlHeader, &tagOpen, &tagClose); - QString s; + TQString s; s += xmlHeader + '\n'; s += tagOpen + '\n'; @@ -509,7 +509,7 @@ bool XmlProtocol::baseStep(const Parser::Event &pe) return true; } else if(state == Open) { - QDomElement e; + TQDomElement e; if(pe.type() == Parser::Event::Element) e = pe.element(); return doStep(e); @@ -533,7 +533,7 @@ bool XmlProtocol::baseStep(const Parser::Event &pe) void XmlProtocol::setIncomingAsExternal() { - for(QValueList::Iterator it = transferItemList.begin(); it != transferItemList.end(); ++it) { + for(TQValueList::Iterator it = transferItemList.begin(); it != transferItemList.end(); ++it) { TransferItem &i = *it; // look for elements received if(!i.isString && !i.isSent) -- cgit v1.2.1