diff options
Diffstat (limited to 'src/gui/text/qtextformat_p.h')
-rw-r--r-- | src/gui/text/qtextformat_p.h | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h index 001a243e84..1bd9120513 100644 --- a/src/gui/text/qtextformat_p.h +++ b/src/gui/text/qtextformat_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 QTEXTFORMAT_P_H #define QTEXTFORMAT_P_H @@ -53,7 +17,8 @@ #include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qtextformat.h" -#include "QtCore/qvector.h" +#include "QtCore/qlist.h" +#include <QtCore/qhash.h> // QMultiHash QT_BEGIN_NAMESPACE @@ -90,19 +55,26 @@ public: inline QTextImageFormat imageFormat(int index) const { return format(index).toImageFormat(); } - inline int numFormats() const { return formats.count(); } + inline int numFormats() const { return formats.size(); } - typedef QVector<QTextFormat> FormatVector; + typedef QList<QTextFormat> FormatVector; FormatVector formats; - QVector<qint32> objFormats; - QMultiHash<uint,int> hashes; + QList<qint32> objFormats; + QMultiHash<size_t,int> hashes; inline QFont defaultFont() const { return defaultFnt; } void setDefaultFont(const QFont &f); + inline void setSuperScriptBaseline(qreal baseline) { defaultFormat.setSuperScriptBaseline(baseline); } + inline void setSubScriptBaseline(qreal baseline) { defaultFormat.setSubScriptBaseline(baseline); } + inline void setBaselineOffset(qreal baseline) { defaultFormat.setBaselineOffset(baseline); } + + inline QTextCharFormat defaultTextFormat() const { return defaultFormat; } + private: QFont defaultFnt; + QTextCharFormat defaultFormat; Q_DISABLE_COPY_MOVE(QTextFormatCollection) }; |