diff options
Diffstat (limited to 'src/gui/painting/qpainterpath.h')
| -rw-r--r-- | src/gui/painting/qpainterpath.h | 62 |
1 files changed, 12 insertions, 50 deletions
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 51a2874ed5..4caf1aa5c0 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.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 QPAINTERPATH_H #define QPAINTERPATH_H @@ -46,7 +10,7 @@ #include <QtCore/qline.h> #include <QtCore/qlist.h> #include <QtCore/qrect.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE @@ -92,8 +56,7 @@ public: explicit QPainterPath(const QPointF &startPoint); QPainterPath(const QPainterPath &other); QPainterPath &operator=(const QPainterPath &other); - inline QPainterPath &operator=(QPainterPath &&other) noexcept - { qSwap(d_ptr, other.d_ptr); return *this; } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QPainterPath) ~QPainterPath(); inline void swap(QPainterPath &other) noexcept { d_ptr.swap(other.d_ptr); } @@ -150,8 +113,8 @@ public: void translate(qreal dx, qreal dy); inline void translate(const QPointF &offset); - Q_REQUIRED_RESULT QPainterPath translated(qreal dx, qreal dy) const; - Q_REQUIRED_RESULT inline QPainterPath translated(const QPointF &offset) const; + [[nodiscard]] QPainterPath translated(qreal dx, qreal dy) const; + [[nodiscard]] inline QPainterPath translated(const QPointF &offset) const; QRectF boundingRect() const; QRectF controlPointRect() const; @@ -161,7 +124,7 @@ public: bool isEmpty() const; - Q_REQUIRED_RESULT QPainterPath toReversed() const; + [[nodiscard]] QPainterPath toReversed() const; QList<QPolygonF> toSubpathPolygons(const QTransform &matrix = QTransform()) const; QList<QPolygonF> toFillPolygons(const QTransform &matrix = QTransform()) const; @@ -179,11 +142,11 @@ public: bool intersects(const QPainterPath &p) const; bool contains(const QPainterPath &p) const; - Q_REQUIRED_RESULT QPainterPath united(const QPainterPath &r) const; - Q_REQUIRED_RESULT QPainterPath intersected(const QPainterPath &r) const; - Q_REQUIRED_RESULT QPainterPath subtracted(const QPainterPath &r) const; + [[nodiscard]] QPainterPath united(const QPainterPath &r) const; + [[nodiscard]] QPainterPath intersected(const QPainterPath &r) const; + [[nodiscard]] QPainterPath subtracted(const QPainterPath &r) const; - Q_REQUIRED_RESULT QPainterPath simplified() const; + [[nodiscard]] QPainterPath simplified() const; bool operator==(const QPainterPath &other) const; bool operator!=(const QPainterPath &other) const; @@ -198,12 +161,11 @@ public: QPainterPath &operator-=(const QPainterPath &other); private: - QScopedPointer<QPainterPathPrivate, QPainterPathPrivateDeleter> d_ptr; + QExplicitlySharedDataPointer<QPainterPathPrivate> d_ptr; inline void ensureData() { if (!d_ptr) ensureData_helper(); } void ensureData_helper(); void detach(); - void detach_helper(); void setDirty(bool); void computeBoundingRect() const; void computeControlPointRect() const; |