summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
index f2b56778..41cadb84 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
@@ -212,29 +212,29 @@ XmlParser::ParseContext::EndElement() {
xmlnsstack_.PopFrame();
}
-QName
-XmlParser::ParseContext::ResolveQName(const char *qname, bool isAttr) {
+TQName
+XmlParser::ParseContext::ResolveTQName(const char *qname, bool isAttr) {
const char *c;
for (c = qname; *c; ++c) {
if (*c == ':') {
const std::string * result;
result = xmlnsstack_.NsForPrefix(std::string(qname, c - qname));
if (result == NULL)
- return QN_EMPTY;
+ return TQN_EMPTY;
const char * localname = c + 1;
- return QName(*result, localname);
+ return TQName(*result, localname);
}
}
if (isAttr) {
- return QName(STR_EMPTY, qname);
+ return TQName(STR_EMPTY, qname);
}
const std::string * result;
result = xmlnsstack_.NsForPrefix(STR_EMPTY);
if (result == NULL)
- return QN_EMPTY;
+ return TQN_EMPTY;
- return QName(*result, qname);
+ return TQName(*result, qname);
}
void