summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qregion.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting/qregion.h')
-rw-r--r--src/gui/painting/qregion.h101
1 files changed, 24 insertions, 77 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 54de916198..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
@@ -44,6 +8,7 @@
#include <QtCore/qatomic.h>
#include <QtCore/qrect.h>
#include <QtGui/qwindowdefs.h>
+#include <QtCore/qcontainerfwd.h>
#ifndef QT_NO_DATASTREAM
#include <QtCore/qdatastream.h>
@@ -52,7 +17,6 @@
QT_BEGIN_NAMESPACE
-template <class T> class QVector;
class QVariant;
struct QRegionPrivate;
@@ -70,13 +34,12 @@ public:
QRegion(const QPolygon &pa, Qt::FillRule fillRule = Qt::OddEvenFill);
QRegion(const QRegion &region);
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,45 +60,23 @@ 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;
-
-#if QT_DEPRECATED_SINCE(5, 0)
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRegion &r) const { return united(r); }
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRect &r) const { return united(r); }
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRegion &r) const { return intersected(r); }
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRect &r) const { return intersected(r); }
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion subtract(const QRegion &r) const { return subtracted(r); }
- Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion eor(const QRegion &r) const { return xored(r); }
-#endif
+ [[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;
QRect boundingRect() const noexcept;
-#if QT_DEPRECATED_SINCE(5, 11)
- QT_DEPRECATED_X("Use begin()/end() instead")
- QVector<QRect> rects() const;
-#endif
void setRects(const QRect *rect, int num);
int rectCount() const noexcept;
-#ifdef Q_COMPILER_MANGLES_RETURN_TYPE
- // ### Qt 6: remove these, they're kept for MSVC compat
- const QRegion operator|(const QRegion &r) const;
- const QRegion operator+(const QRegion &r) const;
- const QRegion operator+(const QRect &r) const;
- const QRegion operator&(const QRegion &r) const;
- const QRegion operator&(const QRect &r) const;
- const QRegion operator-(const QRegion &r) const;
- const QRegion operator^(const QRegion &r) const;
-#else
+
QRegion operator|(const QRegion &r) const;
QRegion operator+(const QRegion &r) const;
QRegion operator+(const QRect &r) const;
@@ -143,7 +84,7 @@ public:
QRegion operator&(const QRect &r) const;
QRegion operator-(const QRegion &r) const;
QRegion operator^(const QRegion &r) const;
-#endif // Q_COMPILER_MANGLES_RETURN_TYPE
+
QRegion& operator|=(const QRegion &r);
QRegion& operator+=(const QRegion &r);
QRegion& operator+=(const QRect &r);
@@ -156,6 +97,12 @@ public:
inline bool operator!=(const QRegion &r) const { return !(operator==(r)); }
operator QVariant() const;
+ // Platform specific conversion functions
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
+ HRGN toHRGN() const;
+ static QRegion fromHRGN(HRGN hrgn);
+#endif
+
#ifndef QT_NO_DATASTREAM
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QRegion &);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QRegion &);
@@ -179,7 +126,7 @@ Q_GUI_EXPORT
static const struct QRegionData shared_empty;
static void cleanUp(QRegionData *x);
};
-Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QRegion)
+Q_DECLARE_SHARED(QRegion)
/*****************************************************************************
QRegion stream functions
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 05:11:31 +0000