summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontmetrics.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
-rw-r--r--src/gui/text/qfontmetrics.h106
1 files changed, 15 insertions, 91 deletions
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index e92a1514a1..1942d1fa83 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -1,86 +1,35 @@
-/****************************************************************************
-**
-** 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 QTextCodec;
class QRect;
-
+class QTextOption;
class Q_GUI_EXPORT QFontMetrics
{
public:
explicit QFontMetrics(const QFont &);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- QFontMetrics(const QFont &font, QPaintDevice *pd);
-#ifndef Q_QDOC
- // the template is necessary to make QFontMetrics(font,nullptr) and QFontMetrics(font,NULL)
- // not ambiguous. Implementation detail that should not be documented.
- template<char = 0>
-#endif
- QFontMetrics(const QFont &font, const QPaintDevice *pd)
- : QFontMetrics(font, const_cast<QPaintDevice*>(pd))
- {}
-#else
QFontMetrics(const QFont &font, const QPaintDevice *pd);
-#endif
QFontMetrics(const QFontMetrics &);
~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;
@@ -101,25 +50,14 @@ public:
int leftBearing(QChar) const;
int rightBearing(QChar) const;
-#if QT_DEPRECATED_SINCE(5, 11)
- QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance")
- int width(const QString &, int len = -1) const;
- QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance")
- int width(const QString &, int len, int flags) const;
- QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance")
- int width(QChar) const;
-#endif
-
int horizontalAdvance(const QString &, int len = -1) const;
+ int horizontalAdvance(const QString &, const QTextOption &textOption) const;
int horizontalAdvance(QChar) const;
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
- QT_DEPRECATED int charWidth(const QString &str, int pos) const;
-#endif
-
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
@@ -127,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;
@@ -153,29 +92,16 @@ class Q_GUI_EXPORT QFontMetricsF
{
public:
explicit QFontMetricsF(const QFont &font);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- QFontMetricsF(const QFont &font, QPaintDevice *pd);
-#ifndef Q_QDOC
- // the template is necessary to make QFontMetrics(font,nullptr) and QFontMetrics(font,NULL)
- // not ambiguous. Implementation detail that should not be documented.
- template<char = 0>
-#endif
- QFontMetricsF(const QFont &font, const QPaintDevice *pd)
- : QFontMetricsF(font, const_cast<QPaintDevice*>(pd))
- {}
-#else
QFontMetricsF(const QFont &font, const QPaintDevice *pd);
-#endif
QFontMetricsF(const QFontMetrics &);
QFontMetricsF(const QFontMetricsF &);
~QFontMetricsF();
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;
@@ -196,20 +122,18 @@ public:
qreal leftBearing(QChar) const;
qreal rightBearing(QChar) const;
-#if QT_DEPRECATED_SINCE(5, 11)
- qreal width(const QString &string) const;
- qreal width(QChar) const;
-#endif
-
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 20:34:15 +0000