diff options
Diffstat (limited to 'src/gui/painting/qpolygon.h')
| -rw-r--r-- | src/gui/painting/qpolygon.h | 89 |
1 files changed, 28 insertions, 61 deletions
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index 80edd8d387..f2f5d48395 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.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 QPOLYGON_H #define QPOLYGON_H @@ -51,16 +15,18 @@ class QTransform; class QRect; class QVariant; -// We export each out-of-line method invidually to prevent MSVC from +class QPolygonF; + +// We export each out-of-line method individually to prevent MSVC from // exporting the whole QList class. class QPolygon : public QList<QPoint> { public: using QList<QPoint>::QList; QPolygon() = default; - /* implicit */ QPolygon(const QList<QPoint> &v) : QList<QPoint>(v) { } - /* implicit */ QPolygon(QList<QPoint> &&v) noexcept : QList<QPoint>(std::move(v)) { } - /* implicit */ Q_GUI_EXPORT QPolygon(const QRect &r, bool closed=false); + Q_IMPLICIT QPolygon(const QList<QPoint> &v) : QList<QPoint>(v) { } + Q_IMPLICIT QPolygon(QList<QPoint> &&v) noexcept : QList<QPoint>(std::move(v)) { } + Q_IMPLICIT Q_GUI_EXPORT QPolygon(const QRect &r, bool closed=false); Q_GUI_EXPORT QPolygon(int nPoints, const int *points); void swap(QPolygon &other) noexcept { QList<QPoint>::swap(other); } // prevent QList<QPoint><->QPolygon swaps @@ -69,15 +35,15 @@ public: Q_GUI_EXPORT void translate(int dx, int dy); void translate(const QPoint &offset); - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygon translated(int dx, int dy) const; - Q_REQUIRED_RESULT inline QPolygon translated(const QPoint &offset) const; + [[nodiscard]] Q_GUI_EXPORT QPolygon translated(int dx, int dy) const; + [[nodiscard]] inline QPolygon translated(const QPoint &offset) const; Q_GUI_EXPORT QRect boundingRect() const; Q_GUI_EXPORT void point(int i, int *x, int *y) const; QPoint point(int i) const; - void setPoint(int index, int x, int y); - void setPoint(int index, const QPoint &p); + Q_GUI_EXPORT void setPoint(int index, int x, int y); + inline void setPoint(int index, const QPoint &p); Q_GUI_EXPORT void setPoints(int nPoints, const int *points); Q_GUI_EXPORT void setPoints(int nPoints, int firstx, int firsty, ...); Q_GUI_EXPORT void putPoints(int index, int nPoints, const int *points); @@ -86,11 +52,13 @@ public: Q_GUI_EXPORT bool containsPoint(const QPoint &pt, Qt::FillRule fillRule) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygon united(const QPolygon &r) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygon intersected(const QPolygon &r) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygon subtracted(const QPolygon &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygon united(const QPolygon &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygon intersected(const QPolygon &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygon subtracted(const QPolygon &r) const; Q_GUI_EXPORT bool intersects(const QPolygon &r) const; + + [[nodiscard]] inline QPolygonF toPolygonF() const; }; Q_DECLARE_SHARED(QPolygon) @@ -111,10 +79,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QPolygon &polygon); *****************************************************************************/ inline void QPolygon::setPoint(int index, const QPoint &pt) -{ (*this)[index] = pt; } - -inline void QPolygon::setPoint(int index, int x, int y) -{ (*this)[index] = QPoint(x, y); } +{ setPoint(index, pt.x(), pt.y()); } inline QPoint QPolygon::point(int index) const { return at(index); } @@ -132,10 +97,10 @@ class QPolygonF : public QList<QPointF> public: using QList<QPointF>::QList; QPolygonF() = default; - /* implicit */ QPolygonF(const QList<QPointF> &v) : QList<QPointF>(v) { } - /* implicit */ QPolygonF(QList<QPointF> &&v) noexcept : QList<QPointF>(std::move(v)) { } - /* implicit */ Q_GUI_EXPORT QPolygonF(const QRectF &r); - /* implicit */ Q_GUI_EXPORT QPolygonF(const QPolygon &a); + Q_IMPLICIT QPolygonF(const QList<QPointF> &v) : QList<QPointF>(v) { } + Q_IMPLICIT QPolygonF(QList<QPointF> &&v) noexcept : QList<QPointF>(std::move(v)) { } + Q_IMPLICIT Q_GUI_EXPORT QPolygonF(const QRectF &r); + Q_IMPLICIT Q_GUI_EXPORT QPolygonF(const QPolygon &a); inline void swap(QPolygonF &other) { QList<QPointF>::swap(other); } // prevent QList<QPointF><->QPolygonF swaps Q_GUI_EXPORT operator QVariant() const; @@ -144,7 +109,7 @@ public: void Q_GUI_EXPORT translate(const QPointF &offset); inline QPolygonF translated(qreal dx, qreal dy) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygonF translated(const QPointF &offset) const; + [[nodiscard]] Q_GUI_EXPORT QPolygonF translated(const QPointF &offset) const; QPolygon Q_GUI_EXPORT toPolygon() const; @@ -154,14 +119,16 @@ public: Q_GUI_EXPORT bool containsPoint(const QPointF &pt, Qt::FillRule fillRule) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygonF united(const QPolygonF &r) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygonF intersected(const QPolygonF &r) const; - Q_REQUIRED_RESULT Q_GUI_EXPORT QPolygonF subtracted(const QPolygonF &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygonF united(const QPolygonF &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygonF intersected(const QPolygonF &r) const; + [[nodiscard]] Q_GUI_EXPORT QPolygonF subtracted(const QPolygonF &r) const; Q_GUI_EXPORT bool intersects(const QPolygonF &r) const; }; Q_DECLARE_SHARED(QPolygonF) +QPolygonF QPolygon::toPolygonF() const { return QPolygonF(*this); } + #ifndef QT_NO_DEBUG_STREAM Q_GUI_EXPORT QDebug operator<<(QDebug, const QPolygonF &); #endif |