diff options
Diffstat (limited to 'src/gui/text/qtextodfwriter_p.h')
| -rw-r--r-- | src/gui/text/qtextodfwriter_p.h | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h index 98a6fdfa96..e02297da98 100644 --- a/src/gui/text/qtextodfwriter_p.h +++ b/src/gui/text/qtextodfwriter_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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) 2016 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 QTEXTODFWRITER_H #define QTEXTODFWRITER_H @@ -55,11 +19,11 @@ // We mean it. // -#include <QtCore/QXmlStreamWriter> #include <QtCore/qhash.h> +#include <QtCore/qlist.h> #include <QtCore/qset.h> #include <QtCore/qstack.h> -#include <QtCore/qvector.h> +#include <QtCore/QXmlStreamWriter> #include "qtextdocument_p.h" #include "qtextdocumentwriter.h" @@ -86,7 +50,6 @@ public: QTextOdfWriter(const QTextDocument &document, QIODevice *device); bool writeAll(); - void setCodec(QTextCodec *codec) { m_codec = codec; } void setCreateArchive(bool on) { m_createArchive = on; } bool createArchive() const { return m_createArchive; } @@ -97,8 +60,8 @@ public: void writeListFormat(QXmlStreamWriter &writer, QTextListFormat format, int formatIndex) const; void writeFrameFormat(QXmlStreamWriter &writer, QTextFrameFormat format, int formatIndex) const; void writeTableFormat(QXmlStreamWriter &writer, QTextTableFormat format, int formatIndex) const; - void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format, int formatIndex, - QVector<QTextFormat> &styles) const; + void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format, + int formatIndex, QList<QTextFormat> &styles) const; void writeFrame(QXmlStreamWriter &writer, const QTextFrame *frame); void writeInlineCharacter(QXmlStreamWriter &writer, const QTextFragment &fragment) const; @@ -116,12 +79,11 @@ private: QIODevice *m_device; QOutputStrategy *m_strategy; - QTextCodec *m_codec; bool m_createArchive; QStack<QTextList *> m_listStack; - QHash<int, QVector<int>> m_cellFormatsInTablesWithBorders; + QHash<int, QList<int>> m_cellFormatsInTablesWithBorders; QSet<int> m_tableFormatsWithBorders; mutable QSet<int> m_tableFormatsWithColWidthConstraints; }; |