diff options
Diffstat (limited to 'src/gui/text/qglyphrun.h')
| -rw-r--r-- | src/gui/text/qglyphrun.h | 50 |
1 files changed, 10 insertions, 40 deletions
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index 0e9f0ce468..88f9957dd8 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.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 QGLYPHRUN_H #define QGLYPHRUN_H @@ -43,8 +7,8 @@ #include <QtGui/qtguiglobal.h> #include <QtCore/qlist.h> #include <QtCore/qpoint.h> -#include <QtCore/qsharedpointer.h> #include <QtGui/qrawfont.h> +#include <QtCore/qshareddata.h> #if !defined(QT_NO_RAWFONT) @@ -70,7 +34,7 @@ public: QGlyphRun &operator=(const QGlyphRun &other); ~QGlyphRun(); - void swap(QGlyphRun &other) noexcept { qSwap(d, other.d); } + void swap(QGlyphRun &other) noexcept { d.swap(other.d); } QRawFont rawFont() const; void setRawFont(const QRawFont &rawFont); @@ -110,6 +74,12 @@ public: void setBoundingRect(const QRectF &boundingRect); QRectF boundingRect() const; + QList<qsizetype> stringIndexes() const; + void setStringIndexes(const QList<qsizetype> &stringIndexes); + + void setSourceString(const QString &sourceString); + QString sourceString() const; + bool isEmpty() const; private: |