Changeset 561 for trunk/src/xml/dom/qdom.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xml/dom/qdom.cpp (modified) (30 diffs)

trunk/src/xml/dom/qdom.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtXml module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -57 +57 @@
 #include <qvariant.h>
 #include <qmap.h>
+#include <qshareddata.h>
 #include <qdebug.h>
 #include <stdio.h>
@@ -125 +126 @@
 {
 public:
-    QDomImplementationPrivate() { ref = 1; }
+    inline QDomImplementationPrivate() {}
+
     QDomImplementationPrivate* clone();
     QAtomicInt ref;
@@ -513 +515 @@
 
     // Attributes
-    QDomDocumentTypePrivate* doctype() { return type; };
-    QDomImplementationPrivate* implementation() { return impl; };
+    QDomDocumentTypePrivate* doctype() { return type.data(); }
+    QDomImplementationPrivate* implementation() { return impl.data(); }
     QDomElementPrivate* documentElement();
 
@@ -538 +540 @@
 
     // Variables
-    QDomImplementationPrivate* impl;
-    QDomDocumentTypePrivate* type;
+    QExplicitlySharedDataPointer<QDomImplementationPrivate> impl;
+    QExplicitlySharedDataPointer<QDomDocumentTypePrivate> type;
 
     void saveDocument(QTextStream& stream, const int indent, QDomNode::EncodingPolicy encUsed) const;
@@ -865 +867 @@
 QDomImplementationPrivate* QDomImplementationPrivate::clone()
 {
-    QDomImplementationPrivate* p = new QDomImplementationPrivate;
-    // We are not interested in this node
-    p->ref.deref();
-    return p;
+    return new QDomImplementationPrivate;
 }
 
@@ -1846 +1845 @@
 
     // We are no longer interested in the old node
-    if (oldChild)
-        oldChild->ref.deref();
+    oldChild->ref.deref();
 
     return oldChild;
@@ -1940 +1938 @@
     \inmodule QtXml
     \ingroup xml-tools
-    \mainclass
+
 
     Many functions in the DOM return a QDomNode.
@@ -2695 +2693 @@
     encoded in the given encoding, the result and behavior is undefined.
 
- \since 4.2
+    \since 4.2
  */
 void QDomNode::save(QTextStream& str, int indent, EncodingPolicy encodingPolicy) const
@@ -3061 +3059 @@
 QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p)
 {
-    QDomNamedNodeMapPrivate* m = new QDomNamedNodeMapPrivate(p);
+    QScopedPointer<QDomNamedNodeMapPrivate> m(new QDomNamedNodeMapPrivate(p));
     m->readonly = readonly;
     m->appendToParent = appendToParent;
@@ -3074 +3072 @@
     // we are no longer interested in ownership
     m->ref.deref();
-    return m;
+    return m.take();
 }
 
@@ -3500 +3498 @@
 {
     entities = new QDomNamedNodeMapPrivate(this);
-    notations = new QDomNamedNodeMapPrivate(this);
-    publicId.clear();
-    systemId.clear();
-    internalSubset.clear();
-
-    entities->setAppendToParent(true);
-    notations->setAppendToParent(true);
+    QT_TRY {
+        notations = new QDomNamedNodeMapPrivate(this);
+        publicId.clear();
+        systemId.clear();
+        internalSubset.clear();
+
+        entities->setAppendToParent(true);
+        notations->setAppendToParent(true);
+    } QT_CATCH(...) {
+        delete entities;
+        QT_RETHROW;
+    }
 }
 
@@ -4356 +4359 @@
 {
     Q_ASSERT(impl->parent());
-    if (!impl || !impl->parent()->isElement())
+    if (!impl->parent()->isElement())
         return QDomElement();
     return QDomElement((QDomElementPrivate*)(impl->parent()));
@@ -4590 +4593 @@
             nsDecl = QLatin1String(" xmlns:") + prefix;
         }
-        nsDecl += QLatin1String("=\"") + encodeText(namespaceURI, s) + QLatin1String("\"");
+        nsDecl += QLatin1String("=\"") + encodeText(namespaceURI, s) + QLatin1Char('\"');
     }
     s << '<' << qName << nsDecl;
@@ -4598 +4601 @@
     /* Write out attributes. */
     if (!m_attr->map.isEmpty()) {
-        s << ' ';
         QHash<QString, QDomNodePrivate *>::const_iterator it = m_attr->map.constBegin();
         for (; it != m_attr->map.constEnd(); ++it) {
+            s << ' ';
             if (it.value()->namespaceURI.isNull()) {
                 s << it.value()->name << "=\"" << encodeText(it.value()->value, s, true, true) << '\"';
@@ -4623 +4626 @@
                 }
             }
-            s << ' ';
         }
     }
@@ -6147 +6149 @@
 QDomDocumentPrivate::QDomDocumentPrivate()
     : QDomNodePrivate(0),
+      impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
     type = new QDomDocumentTypePrivate(this, this);
+    type->ref.deref();
 
     name = QLatin1String("#document");
@@ -6157 +6160 @@
 QDomDocumentPrivate::QDomDocumentPrivate(const QString& aname)
     : QDomNodePrivate(0),
+      impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
     type = new QDomDocumentTypePrivate(this, this);
+    type->ref.deref();
     type->name = aname;
 
@@ -6168 +6172 @@
 QDomDocumentPrivate::QDomDocumentPrivate(QDomDocumentTypePrivate* dt)
     : QDomNodePrivate(0),
+      impl(new QDomImplementationPrivate),
       nodeListTime(1)
 {
-    impl = new QDomImplementationPrivate;
     if (dt != 0) {
         type = dt;
-        type->ref.ref();
     } else {
         type = new QDomDocumentTypePrivate(this, this);
+        type->ref.deref();
     }
 
@@ -6183 +6187 @@
 QDomDocumentPrivate::QDomDocumentPrivate(QDomDocumentPrivate* n, bool deep)
     : QDomNodePrivate(n, deep),
+      impl(n->impl->clone()),
       nodeListTime(1)
 {
-    impl = n->impl->clone();
-    // Reference count is down to 0, so we set it to 1 here.
-    impl->ref.ref();
-    type = (QDomDocumentTypePrivate*)n->type->cloneNode();
+    type = static_cast<QDomDocumentTypePrivate*>(n->type->cloneNode());
     type->setParent(this);
-    // Reference count is down to 0, so we set it to 1 here.
-    type->ref.ref();
 }
 
 QDomDocumentPrivate::~QDomDocumentPrivate()
 {
-    if (!impl->ref.deref())
-        delete impl;
-    if (!type->ref.deref())
-        delete type;
 }
 
 void QDomDocumentPrivate::clear()
 {
-    if (!impl->ref.deref())
-        delete impl;
-    if (!type->ref.deref())
-        delete type;
-    impl = 0;
-    type = 0;
+    impl.reset();
+    type.reset();
     QDomNodePrivate::clear();
 }
@@ -6232 +6224 @@
     impl = new QDomImplementationPrivate;
     type = new QDomDocumentTypePrivate(this, this);
+    type->ref.deref();
 
     bool namespaceProcessing = reader->feature(QLatin1String("http://xml.org/sax/features/namespaces"))
@@ -6446 +6439 @@
         const QDomNodePrivate* n = first;
 
+        QTextCodec *codec = 0;
+
         if (n && n->isProcessingInstruction() && n->nodeName() == QLatin1String("xml")) {
             // we have an XML declaration
@@ -6452 +6447 @@
             encoding.indexIn(data);
             QString enc = encoding.cap(3);
-            if (enc.isEmpty()) {
+            if (enc.isEmpty())
                 enc = encoding.cap(5);
-            }
-            if (enc.isEmpty())
-                s.setCodec(QTextCodec::codecForName("UTF-8"));
-            else
-                s.setCodec(QTextCodec::codecForName(enc.toLatin1().data()));
-        } else {
-            s.setCodec(QTextCodec::codecForName("UTF-8"));
+            if (!enc.isEmpty())
+                codec = QTextCodec::codecForName(enc.toLatin1().data());
         }
+        if (!codec)
+            codec = QTextCodec::codecForName("UTF-8");
+        if (codec)
+            s.setCodec(codec);
 #endif
         bool doc = false;
@@ -6525 +6519 @@
 
     \inmodule QtXml
-    \mainclass
+
     \ingroup xml-tools
 
@@ -7380 +7374 @@
 
 QDomHandler::QDomHandler(QDomDocumentPrivate* adoc, bool namespaceProcessing)
-{
-    doc = adoc;
-    node = doc;
-    cdata = false;
-    nsProcessing = namespaceProcessing;
+    : errorLine(0), errorColumn(0), doc(adoc), node(adoc), cdata(false),
+        nsProcessing(namespaceProcessing), locator(0)
+{
 }
 
@@ -7416 +7408 @@
         n = doc->createElement(qName);
     }
-    n->setLocation(locator->lineNumber(), locator->columnNumber());
+
+    if (n)
+        n->setLocation(locator->lineNumber(), locator->columnNumber());
 
     node->appendChild(n);
@@ -7436 +7430 @@
 bool QDomHandler::endElement(const QString&, const QString&, const QString&)
 {
-    if (node == doc)
+    if (!node || node == doc)
         return false;
     node = node->parent();
@@ -7449 +7443 @@
         return false;
 
-    QDomNodePrivate *n;
+    QScopedPointer<QDomNodePrivate> n;
     if (cdata) {
-        n = doc->createCDATASection(ch);
+        n.reset(doc->createCDATASection(ch));
     } else if (!entityName.isEmpty()) {
-        QDomEntityPrivate* e = new QDomEntityPrivate(doc, 0, entityName,
-                QString(), QString(), QString());
+        QScopedPointer<QDomEntityPrivate> e(new QDomEntityPrivate(doc, 0, entityName,
+                QString(), QString(), QString()));
         e->value = ch;
-        doc->doctype()->appendChild(e);
-        n = doc->createEntityReference(entityName);
+        doc->doctype()->appendChild(e.data());
+        e.take();
+        n.reset(doc->createEntityReference(entityName));
     } else {
-        n = doc->createTextNode(ch);
+        n.reset(doc->createTextNode(ch));
     }
     n->setLocation(locator->lineNumber(), locator->columnNumber());
-    node->appendChild(n);
+    node->appendChild(n.data());
+    n.take();
 
     return true;