1 files changed, 16 insertions, 83 deletions

diff --git a/src/xml/dom/qdomhelpers_p.h b/src/xml/dom/qdomhelpers_p.h
index f7264daf4b..5a4b2207f9 100644
--- a/src/xml/dom/qdomhelpers_p.h
+++ b/src/xml/dom/qdomhelpers_p.h
@@ -1,46 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtXml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 #ifndef QDOMHELPERS_P_H
 #define QDOMHELPERS_P_H
 
 #include <qcoreapplication.h>
-#include <qglobal.h>
+#include <qdom.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,38 +27,6 @@ class QXmlStreamAttributes;
 
 /**************************************************************
  *
- * QXmlDocumentLocators
- *
- **************************************************************/
-
-/* TODO: QXmlDocumentLocator can be removed when the SAX-based
- * implementation is removed. Right now it is needed for QDomBuilder
- * to work with both QXmlStreamReader and QXmlInputSource (SAX)
- * based implementations.
- */
-class QXmlDocumentLocator
-{
-public:
-    virtual ~QXmlDocumentLocator() = default;
-    virtual int column() const = 0;
-    virtual int line() const = 0;
-};
-
-class QDomDocumentLocator : public QXmlDocumentLocator
-{
-public:
-    QDomDocumentLocator(QXmlStreamReader *r) : reader(r) {}
-    ~QDomDocumentLocator() override = default;
-
-    int column() const override;
-    int line() const override;
-
-private:
-    QXmlStreamReader *reader;
-};
-
-/**************************************************************
- *
  * QDomBuilder
  *
  **************************************************************/
@@ -101,7 +34,7 @@ private:
 class QDomBuilder
 {
 public:
-    QDomBuilder(QDomDocumentPrivate *d, QXmlDocumentLocator *l, bool namespaceProcessing);
+    QDomBuilder(QDomDocumentPrivate *d, QXmlStreamReader *r, QDomDocument::ParseOptions options);
     ~QDomBuilder();
 
     bool endDocument();
@@ -113,6 +46,7 @@ public:
     bool startEntity(const QString &name);
     bool endEntity();
     bool startDTD(const QString &name, const QString &publicId, const QString &systemId);
+    bool parseDTD(const QString &dtd);
     bool comment(const QString &characters);
     bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId);
     bool notationDecl(const QString &name, const QString &publicId, const QString &systemId);
@@ -120,20 +54,20 @@ public:
                             const QString &notationName);
 
     void fatalError(const QString &message);
+    QDomDocument::ParseResult result() const { return parseResult; }
 
-    using ErrorInfo = std::tuple<QString, int, int>;
-    ErrorInfo error() const;
-
-    QString errorMsg;
-    int errorLine;
-    int errorColumn;
+    bool preserveSpacingOnlyNodes() const
+    { return parseOptions & QDomDocument::ParseOption::PreserveSpacingOnlyNodes; }
 
 private:
+    QString dtdInternalSubset(const QString &dtd);
+
+    QDomDocument::ParseResult parseResult;
     QDomDocumentPrivate *doc;
     QDomNodePrivate *node;
-    QXmlDocumentLocator *locator;
+    QXmlStreamReader *reader;
     QString entityName;
-    bool nsProcessing;
+    QDomDocument::ParseOptions parseOptions;
 };
 
 /**************************************************************
@@ -146,10 +80,10 @@ class QDomParser
 {
     Q_DECLARE_TR_FUNCTIONS(QDomParser)
 public:
-    QDomParser(QDomDocumentPrivate *d, QXmlStreamReader *r, bool namespaceProcessing);
+    QDomParser(QDomDocumentPrivate *d, QXmlStreamReader *r, QDomDocument::ParseOptions options);
 
     bool parse();
-    QDomBuilder::ErrorInfo errorInfo() const;
+    QDomDocument::ParseResult result() const { return domBuilder.result(); }
 
 private:
     bool parseProlog();
@@ -157,7 +91,6 @@ private:
     bool parseMarkupDecl();
 
     QXmlStreamReader *reader;
-    QDomDocumentLocator locator;
     QDomBuilder domBuilder;
 };