diff options
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
| -rw-r--r-- | src/gui/text/qfontmetrics.h | 60 |
1 files changed, 15 insertions, 45 deletions
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 097d40bf8d..1942d1fa83 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -1,55 +1,21 @@ -/**************************************************************************** -** -** 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 QFONTMETRICS_H #define QFONTMETRICS_H #include <QtGui/qtguiglobal.h> #include <QtGui/qfont.h> -#include <QtCore/qsharedpointer.h> + #ifndef QT_INCLUDE_COMPAT #include <QtCore/qrect.h> #endif +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE class QRect; +class QTextOption; class Q_GUI_EXPORT QFontMetrics { @@ -60,11 +26,10 @@ public: ~QFontMetrics(); QFontMetrics &operator=(const QFontMetrics &); - inline QFontMetrics &operator=(QFontMetrics &&other) noexcept - { qSwap(d, other.d); return *this; } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QFontMetrics) void swap(QFontMetrics &other) noexcept - { qSwap(d, other.d); } + { d.swap(other.d); } int ascent() const; int capHeight() const; @@ -86,11 +51,13 @@ public: int rightBearing(QChar) const; int horizontalAdvance(const QString &, int len = -1) const; + int horizontalAdvance(const QString &, const QTextOption &textOption) const; int horizontalAdvance(QChar) const; QRect boundingRect(QChar) const; QRect boundingRect(const QString &text) const; + QRect boundingRect(const QString &text, const QTextOption &textOption) const; QRect boundingRect(const QRect &r, int flags, const QString &text, int tabstops = 0, int *tabarray = nullptr) const; inline QRect boundingRect(int x, int y, int w, int h, int flags, const QString &text, int tabstops = 0, int *tabarray = nullptr) const @@ -98,6 +65,7 @@ public: QSize size(int flags, const QString& str, int tabstops = 0, int *tabarray = nullptr) const; QRect tightBoundingRect(const QString &text) const; + QRect tightBoundingRect(const QString &text, const QTextOption &textOption) const; QString elidedText(const QString &text, Qt::TextElideMode mode, int width, int flags = 0) const; @@ -131,10 +99,9 @@ public: QFontMetricsF &operator=(const QFontMetricsF &); QFontMetricsF &operator=(const QFontMetrics &); - inline QFontMetricsF &operator=(QFontMetricsF &&other) noexcept - { qSwap(d, other.d); return *this; } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QFontMetricsF) - void swap(QFontMetricsF &other) noexcept { qSwap(d, other.d); } + void swap(QFontMetricsF &other) noexcept { d.swap(other.d); } qreal ascent() const; qreal capHeight() const; @@ -157,13 +124,16 @@ public: qreal horizontalAdvance(const QString &string, int length = -1) const; qreal horizontalAdvance(QChar) const; + qreal horizontalAdvance(const QString &string, const QTextOption &textOption) const; QRectF boundingRect(const QString &string) const; + QRectF boundingRect(const QString &text, const QTextOption &textOption) const; QRectF boundingRect(QChar) const; QRectF boundingRect(const QRectF &r, int flags, const QString& string, int tabstops = 0, int *tabarray = nullptr) const; QSizeF size(int flags, const QString& str, int tabstops = 0, int *tabarray = nullptr) const; QRectF tightBoundingRect(const QString &text) const; + QRectF tightBoundingRect(const QString &text, const QTextOption &textOption) const; QString elidedText(const QString &text, Qt::TextElideMode mode, qreal width, int flags = 0) const; |