diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /lib/util/domutil.cpp | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/util/domutil.cpp')
-rw-r--r-- | lib/util/domutil.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index 9f5d40c9..a8f036e6 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -57,7 +57,7 @@ TQString DomUtil::readEntryAux(const TQDomDocument &doc, const TQString &path) { TQDomElement el = elementByPath(doc, path); if (el.isNull()) - return TQString::null; + return TQString(); else return el.firstChild().toText().data(); } @@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths { DomPath dompath = resolvPathStringExt(pathstring); TQDomElement elem = doc.documentElement(); - TQDomNodeList children; + TQDomNodeList tqchildren; TQDomElement nextElem = elem; for (unsigned int j=0; j<dompath.count(); j++) { - children = nextElem.childNodes(); + tqchildren = nextElem.childNodes(); DomPathElement dompathelement= dompath[j]; bool wrongchild = false; int matchCount = 0; - for (unsigned int i=0; i<children.count(); i++) + for (unsigned int i=0; i<tqchildren.count(); i++) { wrongchild = false; - TQDomElement child = children.item(i).toElement(); + TQDomElement child = tqchildren.item(i).toElement(); TQString tag = child.tagName(); tag = dompathelement.tagName; if (child.tagName() == dompathelement.tagName) @@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt) TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; - TQDomNodeList children = elem.childNodes(); - for (unsigned int i=0;i<children.count();i++) - if (children.item(i).isText()) - elem.removeChild(children.item(i)); + TQDomNodeList tqchildren = elem.childNodes(); + for (unsigned int i=0;i<tqchildren.count();i++) + if (tqchildren.item(i).isText()) + elem.removeChild(tqchildren.item(i)); return true; } |