diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2012-01-10 21:15:46 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2012-01-10 21:15:46 (GMT) |
| commit | 9066ec6131e1f77bbc745b50664db3cbcb2577ee (patch) | |
| tree | ab92980b31825ec310269f7799b1076422132a3e /qtools | |
| parent | 4d121f89106d6c73fcb82dfc57b51fd9eb6a13d7 (diff) | |
| download | Doxygen-9066ec6131e1f77bbc745b50664db3cbcb2577ee.zip Doxygen-9066ec6131e1f77bbc745b50664db3cbcb2577ee.tar.gz Doxygen-9066ec6131e1f77bbc745b50664db3cbcb2577ee.tar.bz2 | |
Release-1.7.6.1-20120110
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qxml.cpp | 35 | ||||
| -rw-r--r-- | qtools/qxml.h | 2 |
2 files changed, 26 insertions, 11 deletions
diff --git a/qtools/qxml.cpp b/qtools/qxml.cpp index 9a24c1b..83ab89d 100644 --- a/qtools/qxml.cpp +++ b/qtools/qxml.cpp @@ -2449,7 +2449,7 @@ bool QXmlSimpleReader::parseElement() d->error = XMLERR_ERRORPARSINGNAME; goto parseError; } - if ( !parseElementETagBegin2() ) + if ( !parseElementETagBegin2( uri, lname ) ) goto parseError; break; case Attribute: @@ -2495,10 +2495,17 @@ bool QXmlSimpleReader::parseElementEmptyTag( bool &t, QString &uri, QString &lna return FALSE; } // ... followed by endElement - // ### missing namespace support! - if ( !contentHnd->endElement( "","",tags.pop() ) ) { - d->error = contentHnd->errorString(); - return FALSE; + if ( d->useNamespaces ) { + if ( !contentHnd->endElement( uri, lname,tags.pop() ) ) { + d->error = contentHnd->errorString(); + return FALSE; + } + } + else { + if ( !contentHnd->endElement( "","",tags.pop() ) ) { + d->error = contentHnd->errorString(); + return FALSE; + } } // namespace support? if ( d->useNamespaces ) { @@ -2529,7 +2536,7 @@ bool QXmlSimpleReader::parseElementEmptyTag( bool &t, QString &uri, QString &lna Helper to break down the size of the code in the case statement. Return FALSE on error, otherwise TRUE. */ -bool QXmlSimpleReader::parseElementETagBegin2() +bool QXmlSimpleReader::parseElementETagBegin2( QString &uri, QString &lname ) { // pop the stack and compare it with the name @@ -2538,11 +2545,19 @@ bool QXmlSimpleReader::parseElementETagBegin2() return FALSE; } // call the handler - // ### missing namespace support! if ( contentHnd ) { - if ( !contentHnd->endElement("","",name()) ) { - d->error = contentHnd->errorString(); - return FALSE; + if ( d->useNamespaces ) { + d->namespaceSupport.processName( name(), FALSE, uri, lname ); + if ( !contentHnd->endElement(uri,lname,name()) ) { + d->error = contentHnd->errorString(); + return FALSE; + } + } + else { + if ( !contentHnd->endElement("","",name()) ) { + d->error = contentHnd->errorString(); + return FALSE; + } } } // namespace support? diff --git a/qtools/qxml.h b/qtools/qxml.h index 2f7567d..36164ff 100644 --- a/qtools/qxml.h +++ b/qtools/qxml.h @@ -337,7 +337,7 @@ private: bool parseProlog(); bool parseElement(); bool parseElementEmptyTag( bool &t, QString &uri, QString &lname ); - bool parseElementETagBegin2(); + bool parseElementETagBegin2( QString &uri, QString &lname ); bool parseElementAttribute( QString &prefix, QString &uri, QString &lname ); bool parseMisc(); bool parseContent(); |