diff options
Diffstat (limited to 'src/gui/painting/qregion.h')
| -rw-r--r-- | src/gui/painting/qregion.h | 65 |
1 files changed, 14 insertions, 51 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index c4c0164a5b..b0051b6067 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.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 QREGION_H #define QREGION_H @@ -70,13 +34,12 @@ public: QRegion(const QPolygon &pa, Qt::FillRule fillRule = Qt::OddEvenFill); QRegion(const QRegion ®ion); QRegion(QRegion &&other) noexcept - : d(other.d) { other.d = const_cast<QRegionData*>(&shared_empty); } + : d(std::exchange(other.d, const_cast<QRegionData*>(&shared_empty))) {} QRegion(const QBitmap &bitmap); ~QRegion(); QRegion &operator=(const QRegion &); - inline QRegion &operator=(QRegion &&other) noexcept - { qSwap(d, other.d); return *this; } - inline void swap(QRegion &other) noexcept { qSwap(d, other.d); } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QRegion) + void swap(QRegion &other) noexcept { qt_ptr_swap(d, other.d); } bool isEmpty() const; bool isNull() const; @@ -97,15 +60,15 @@ public: void translate(int dx, int dy); inline void translate(const QPoint &p) { translate(p.x(), p.y()); } - Q_REQUIRED_RESULT QRegion translated(int dx, int dy) const; - Q_REQUIRED_RESULT inline QRegion translated(const QPoint &p) const { return translated(p.x(), p.y()); } - - Q_REQUIRED_RESULT QRegion united(const QRegion &r) const; - Q_REQUIRED_RESULT QRegion united(const QRect &r) const; - Q_REQUIRED_RESULT QRegion intersected(const QRegion &r) const; - Q_REQUIRED_RESULT QRegion intersected(const QRect &r) const; - Q_REQUIRED_RESULT QRegion subtracted(const QRegion &r) const; - Q_REQUIRED_RESULT QRegion xored(const QRegion &r) const; + [[nodiscard]] QRegion translated(int dx, int dy) const; + [[nodiscard]] inline QRegion translated(const QPoint &p) const { return translated(p.x(), p.y()); } + + [[nodiscard]] QRegion united(const QRegion &r) const; + [[nodiscard]] QRegion united(const QRect &r) const; + [[nodiscard]] QRegion intersected(const QRegion &r) const; + [[nodiscard]] QRegion intersected(const QRect &r) const; + [[nodiscard]] QRegion subtracted(const QRegion &r) const; + [[nodiscard]] QRegion xored(const QRegion &r) const; bool intersects(const QRegion &r) const; bool intersects(const QRect &r) const; |