diff options
Diffstat (limited to 'src/xml/dom/qdom_p.h')
| -rw-r--r-- | src/xml/dom/qdom_p.h | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/src/xml/dom/qdom_p.h b/src/xml/dom/qdom_p.h index 82c533b141..b2ecd534c8 100644 --- a/src/xml/dom/qdom_p.h +++ b/src/xml/dom/qdom_p.h @@ -1,47 +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) 2019 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 QDOM_P_H #define QDOM_P_H #include "qdom.h" -#include <qglobal.h> +#include <private/qglobal_p.h> #include <qhash.h> #include <qstring.h> #include <qlist.h> @@ -62,7 +26,7 @@ QT_BEGIN_NAMESPACE /************************************************************** * - * Private class declerations + * Private class declarations * **************************************************************/ @@ -178,7 +142,8 @@ public: bool operator==(const QDomNodeListPrivate &) const; bool operator!=(const QDomNodeListPrivate &) const; - void createList(); + void createList() const; + bool maybeCreateList() const; QDomNodePrivate *item(int index); int length() const; @@ -189,8 +154,8 @@ public: QDomNodePrivate *node_impl; QString tagname; QString nsURI; - QList<QDomNodePrivate *> list; - long timestamp; + mutable QList<QDomNodePrivate *> list; + mutable long timestamp; }; class QDomNamedNodeMapPrivate @@ -461,8 +426,8 @@ public: QDomDocumentPrivate(QDomDocumentPrivate *n, bool deep); ~QDomDocumentPrivate(); - bool setContent(QXmlStreamReader *reader, bool namespaceProcessing, QString *errorMsg, - int *errorLine, int *errorColumn); + QDomDocument::ParseResult setContent(QXmlStreamReader *reader, + QDomDocument::ParseOptions options); // Attributes QDomDocumentTypePrivate *doctype() { return type.data(); } |