diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
commit | a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (patch) | |
tree | dd0742d8d8f1ac20b78a5142b81a78ad89158b5c /src/xml | |
parent | 58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff) | |
parent | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (diff) | |
download | Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.zip Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.gz Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.bz2 |
Merge remote-tracking branch 'qt-qa-review/master'
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/dom/qdom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 7c7cafc..ccc6e8b 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -3487,10 +3487,10 @@ QDomDocumentTypePrivate::QDomDocumentTypePrivate(QDomDocumentTypePrivate* n, boo QDomNodePrivate* p = first; while (p) { if (p->isEntity()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion entities->map.insertMulti(p->nodeName(), p); if (p->isNotation()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion notations->map.insertMulti(p->nodeName(), p); p = p->next; } @@ -5725,7 +5725,7 @@ static QByteArray encodeEntity(const QByteArray& str) len += 4; i += 5; } else if (d[i] == '&' && i + 1 < len && d[i+1] == '#') { - // Dont encode < or " or &custom;. + // Don't encode < or " or &custom;. // Only encode character references tmp.replace(i, 1, "&"); d = tmp; |