diff options
Diffstat (limited to 'src/corelib/tools/qpoint.h')
| -rw-r--r-- | src/corelib/tools/qpoint.h | 364 |
1 files changed, 184 insertions, 180 deletions
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index e854e77198..7df4d49005 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -1,53 +1,23 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore 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) 2022 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 QPOINT_H #define QPOINT_H #include <QtCore/qnamespace.h> +#include <QtCore/q20type_traits.h> +#include <QtCore/q23utility.h> + #if defined(Q_OS_DARWIN) || defined(Q_QDOC) struct CGPoint; #endif QT_BEGIN_NAMESPACE +QT_ENABLE_P0846_SEMANTICS_FOR(get) + +class QPointF; class QPoint { @@ -67,7 +37,7 @@ public: constexpr QPoint transposed() const noexcept { return {yp, xp}; } constexpr inline int &rx() noexcept; - constexpr inline int &ry()noexcept; + constexpr inline int &ry() noexcept; constexpr inline QPoint &operator+=(const QPoint &p); constexpr inline QPoint &operator-=(const QPoint &p); @@ -81,31 +51,57 @@ public: constexpr static inline int dotProduct(const QPoint &p1, const QPoint &p2) { return p1.xp * p2.xp + p1.yp * p2.yp; } - friend constexpr inline bool operator==(const QPoint &, const QPoint &) noexcept; - friend constexpr inline bool operator!=(const QPoint &, const QPoint &) noexcept; - friend constexpr inline const QPoint operator+(const QPoint &, const QPoint &); - friend constexpr inline const QPoint operator-(const QPoint &, const QPoint &); - friend constexpr inline const QPoint operator*(const QPoint &, float); - friend constexpr inline const QPoint operator*(float, const QPoint &); - friend constexpr inline const QPoint operator*(const QPoint &, double); - friend constexpr inline const QPoint operator*(double, const QPoint &); - friend constexpr inline const QPoint operator*(const QPoint &, int); - friend constexpr inline const QPoint operator*(int, const QPoint &); - friend constexpr inline const QPoint operator+(const QPoint &); - friend constexpr inline const QPoint operator-(const QPoint &); - friend constexpr inline const QPoint operator/(const QPoint &, qreal); + friend constexpr inline bool operator==(const QPoint &p1, const QPoint &p2) noexcept + { return p1.xp == p2.xp && p1.yp == p2.yp; } + friend constexpr inline bool operator!=(const QPoint &p1, const QPoint &p2) noexcept + { return p1.xp != p2.xp || p1.yp != p2.yp; } + friend constexpr inline QPoint operator+(const QPoint &p1, const QPoint &p2) noexcept + { return QPoint(p1.xp + p2.xp, p1.yp + p2.yp); } + friend constexpr inline QPoint operator-(const QPoint &p1, const QPoint &p2) noexcept + { return QPoint(p1.xp - p2.xp, p1.yp - p2.yp); } + friend constexpr inline QPoint operator*(const QPoint &p, float factor) + { return QPoint(qRound(p.xp * factor), qRound(p.yp * factor)); } + friend constexpr inline QPoint operator*(const QPoint &p, double factor) + { return QPoint(qRound(p.xp * factor), qRound(p.yp * factor)); } + friend constexpr inline QPoint operator*(const QPoint &p, int factor) noexcept + { return QPoint(p.xp * factor, p.yp * factor); } + friend constexpr inline QPoint operator*(float factor, const QPoint &p) + { return QPoint(qRound(p.xp * factor), qRound(p.yp * factor)); } + friend constexpr inline QPoint operator*(double factor, const QPoint &p) + { return QPoint(qRound(p.xp * factor), qRound(p.yp * factor)); } + friend constexpr inline QPoint operator*(int factor, const QPoint &p) noexcept + { return QPoint(p.xp * factor, p.yp * factor); } + friend constexpr inline QPoint operator+(const QPoint &p) noexcept + { return p; } + friend constexpr inline QPoint operator-(const QPoint &p) noexcept + { return QPoint(-p.xp, -p.yp); } + friend constexpr inline QPoint operator/(const QPoint &p, qreal c) + { return QPoint(qRound(p.xp / c), qRound(p.yp / c)); } #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT Q_CORE_EXPORT CGPoint toCGPoint() const noexcept; + [[nodiscard]] Q_CORE_EXPORT CGPoint toCGPoint() const noexcept; #endif + [[nodiscard]] constexpr inline QPointF toPointF() const noexcept; private: friend class QTransform; int xp; int yp; + + template <std::size_t I, + typename P, + std::enable_if_t<(I < 2), bool> = true, + std::enable_if_t<std::is_same_v<q20::remove_cvref_t<P>, QPoint>, bool> = true> + friend constexpr decltype(auto) get(P &&p) noexcept + { + if constexpr (I == 0) + return q23::forward_like<P>(p.xp); + else if constexpr (I == 1) + return q23::forward_like<P>(p.yp); + } }; -Q_DECLARE_TYPEINFO(QPoint, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPoint, Q_PRIMITIVE_TYPE); /***************************************************************************** QPoint stream functions @@ -124,90 +120,85 @@ constexpr inline QPoint::QPoint() noexcept : xp(0), yp(0) {} constexpr inline QPoint::QPoint(int xpos, int ypos) noexcept : xp(xpos), yp(ypos) {} constexpr inline bool QPoint::isNull() const noexcept -{ return xp == 0 && yp == 0; } +{ + return xp == 0 && yp == 0; +} constexpr inline int QPoint::x() const noexcept -{ return xp; } +{ + return xp; +} constexpr inline int QPoint::y() const noexcept -{ return yp; } +{ + return yp; +} constexpr inline void QPoint::setX(int xpos) noexcept -{ xp = xpos; } +{ + xp = xpos; +} constexpr inline void QPoint::setY(int ypos) noexcept -{ yp = ypos; } +{ + yp = ypos; +} inline int constexpr QPoint::manhattanLength() const -{ return qAbs(x())+qAbs(y()); } +{ + return qAbs(x()) + qAbs(y()); +} constexpr inline int &QPoint::rx() noexcept -{ return xp; } +{ + return xp; +} constexpr inline int &QPoint::ry() noexcept -{ return yp; } +{ + return yp; +} constexpr inline QPoint &QPoint::operator+=(const QPoint &p) -{ xp+=p.xp; yp+=p.yp; return *this; } +{ + xp += p.xp; + yp += p.yp; + return *this; +} constexpr inline QPoint &QPoint::operator-=(const QPoint &p) -{ xp-=p.xp; yp-=p.yp; return *this; } +{ + xp -= p.xp; + yp -= p.yp; + return *this; +} constexpr inline QPoint &QPoint::operator*=(float factor) -{ xp = qRound(xp*factor); yp = qRound(yp*factor); return *this; } +{ + xp = qRound(xp * factor); + yp = qRound(yp * factor); + return *this; +} constexpr inline QPoint &QPoint::operator*=(double factor) -{ xp = qRound(xp*factor); yp = qRound(yp*factor); return *this; } +{ + xp = qRound(xp * factor); + yp = qRound(yp * factor); + return *this; +} constexpr inline QPoint &QPoint::operator*=(int factor) -{ xp = xp*factor; yp = yp*factor; return *this; } - -constexpr inline bool operator==(const QPoint &p1, const QPoint &p2) noexcept -{ return p1.xp == p2.xp && p1.yp == p2.yp; } - -constexpr inline bool operator!=(const QPoint &p1, const QPoint &p2) noexcept -{ return p1.xp != p2.xp || p1.yp != p2.yp; } - -constexpr inline const QPoint operator+(const QPoint &p1, const QPoint &p2) -{ return QPoint(p1.xp+p2.xp, p1.yp+p2.yp); } - -constexpr inline const QPoint operator-(const QPoint &p1, const QPoint &p2) -{ return QPoint(p1.xp-p2.xp, p1.yp-p2.yp); } - -constexpr inline const QPoint operator*(const QPoint &p, float factor) -{ return QPoint(qRound(p.xp*factor), qRound(p.yp*factor)); } - -constexpr inline const QPoint operator*(const QPoint &p, double factor) -{ return QPoint(qRound(p.xp*factor), qRound(p.yp*factor)); } - -constexpr inline const QPoint operator*(const QPoint &p, int factor) -{ return QPoint(p.xp*factor, p.yp*factor); } - -constexpr inline const QPoint operator*(float factor, const QPoint &p) -{ return QPoint(qRound(p.xp*factor), qRound(p.yp*factor)); } - -constexpr inline const QPoint operator*(double factor, const QPoint &p) -{ return QPoint(qRound(p.xp*factor), qRound(p.yp*factor)); } - -constexpr inline const QPoint operator*(int factor, const QPoint &p) -{ return QPoint(p.xp*factor, p.yp*factor); } - -constexpr inline const QPoint operator+(const QPoint &p) -{ return p; } - -constexpr inline const QPoint operator-(const QPoint &p) -{ return QPoint(-p.xp, -p.yp); } - -constexpr inline QPoint &QPoint::operator/=(qreal c) { - xp = qRound(xp/c); - yp = qRound(yp/c); + xp = xp * factor; + yp = yp * factor; return *this; } -constexpr inline const QPoint operator/(const QPoint &p, qreal c) +constexpr inline QPoint &QPoint::operator/=(qreal c) { - return QPoint(qRound(p.xp/c), qRound(p.yp/c)); + xp = qRound(xp / c); + yp = qRound(yp / c); + return *this; } #ifndef QT_NO_DEBUG_STREAM @@ -246,23 +237,46 @@ public: constexpr inline QPointF &operator/=(qreal c); constexpr static inline qreal dotProduct(const QPointF &p1, const QPointF &p2) - { return p1.xp * p2.xp + p1.yp * p2.yp; } - - friend constexpr inline bool operator==(const QPointF &, const QPointF &); - friend constexpr inline bool operator!=(const QPointF &, const QPointF &); - friend constexpr inline const QPointF operator+(const QPointF &, const QPointF &); - friend constexpr inline const QPointF operator-(const QPointF &, const QPointF &); - friend constexpr inline const QPointF operator*(qreal, const QPointF &); - friend constexpr inline const QPointF operator*(const QPointF &, qreal); - friend constexpr inline const QPointF operator+(const QPointF &); - friend constexpr inline const QPointF operator-(const QPointF &); - friend constexpr inline const QPointF operator/(const QPointF &, qreal); + { + return p1.xp * p2.xp + p1.yp * p2.yp; + } + + QT_WARNING_PUSH + QT_WARNING_DISABLE_FLOAT_COMPARE + friend constexpr inline bool operator==(const QPointF &p1, const QPointF &p2) + { + return ((!p1.xp || !p2.xp) ? qFuzzyIsNull(p1.xp - p2.xp) : qFuzzyCompare(p1.xp, p2.xp)) + && ((!p1.yp || !p2.yp) ? qFuzzyIsNull(p1.yp - p2.yp) : qFuzzyCompare(p1.yp, p2.yp)); + } + friend constexpr inline bool operator!=(const QPointF &p1, const QPointF &p2) + { + return !(p1 == p2); + } + QT_WARNING_POP + + friend constexpr inline QPointF operator+(const QPointF &p1, const QPointF &p2) + { return QPointF(p1.xp + p2.xp, p1.yp + p2.yp); } + friend constexpr inline QPointF operator-(const QPointF &p1, const QPointF &p2) + { return QPointF(p1.xp - p2.xp, p1.yp - p2.yp); } + friend constexpr inline QPointF operator*(const QPointF &p, qreal c) + { return QPointF(p.xp * c, p.yp * c); } + friend constexpr inline QPointF operator*(qreal c, const QPointF &p) + { return QPointF(p.xp * c, p.yp * c); } + friend constexpr inline QPointF operator+(const QPointF &p) + { return p; } + friend constexpr inline QPointF operator-(const QPointF &p) + { return QPointF(-p.xp, -p.yp); } + friend constexpr inline QPointF operator/(const QPointF &p, qreal divisor) + { + Q_ASSERT(divisor < 0 || divisor > 0); + return QPointF(p.xp / divisor, p.yp / divisor); + } constexpr QPoint toPoint() const; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT Q_CORE_EXPORT static QPointF fromCGPoint(CGPoint point) noexcept; - Q_REQUIRED_RESULT Q_CORE_EXPORT CGPoint toCGPoint() const noexcept; + [[nodiscard]] Q_CORE_EXPORT static QPointF fromCGPoint(CGPoint point) noexcept; + [[nodiscard]] Q_CORE_EXPORT CGPoint toCGPoint() const noexcept; #endif private: @@ -270,9 +284,23 @@ private: qreal xp; qreal yp; + + template <std::size_t I, + typename P, + std::enable_if_t<(I < 2), bool> = true, + std::enable_if_t<std::is_same_v<q20::remove_cvref_t<P>, QPointF>, bool> = true> + friend constexpr decltype(auto) get(P &&p) noexcept + { + if constexpr (I == 0) + return q23::forward_like<P>(p.xp); + else if constexpr (I == 1) + return q23::forward_like<P>(p.yp); + } }; -Q_DECLARE_TYPEINFO(QPointF, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPointF, Q_PRIMITIVE_TYPE); + +size_t qHash(QPointF, size_t seed = 0) = delete; /***************************************************************************** QPointF stream functions @@ -294,7 +322,7 @@ constexpr inline QPointF::QPointF(const QPoint &p) noexcept : xp(p.x()), yp(p.y( constexpr inline qreal QPointF::manhattanLength() const { - return qAbs(x())+qAbs(y()); + return qAbs(x()) + qAbs(y()); } inline bool QPointF::isNull() const noexcept @@ -334,78 +362,34 @@ constexpr inline qreal &QPointF::ry() noexcept constexpr inline QPointF &QPointF::operator+=(const QPointF &p) { - xp+=p.xp; - yp+=p.yp; + xp += p.xp; + yp += p.yp; return *this; } constexpr inline QPointF &QPointF::operator-=(const QPointF &p) { - xp-=p.xp; yp-=p.yp; return *this; + xp -= p.xp; + yp -= p.yp; + return *this; } constexpr inline QPointF &QPointF::operator*=(qreal c) { - xp*=c; yp*=c; return *this; -} - -QT_WARNING_PUSH -QT_WARNING_DISABLE_FLOAT_COMPARE - -constexpr inline bool operator==(const QPointF &p1, const QPointF &p2) -{ - return ((!p1.xp || !p2.xp) ? qFuzzyIsNull(p1.xp - p2.xp) : qFuzzyCompare(p1.xp, p2.xp)) - && ((!p1.yp || !p2.yp) ? qFuzzyIsNull(p1.yp - p2.yp) : qFuzzyCompare(p1.yp, p2.yp)); -} - -constexpr inline bool operator!=(const QPointF &p1, const QPointF &p2) -{ - return !(p1 == p2); -} - -QT_WARNING_POP - -constexpr inline const QPointF operator+(const QPointF &p1, const QPointF &p2) -{ - return QPointF(p1.xp+p2.xp, p1.yp+p2.yp); -} - -constexpr inline const QPointF operator-(const QPointF &p1, const QPointF &p2) -{ - return QPointF(p1.xp-p2.xp, p1.yp-p2.yp); -} - -constexpr inline const QPointF operator*(const QPointF &p, qreal c) -{ - return QPointF(p.xp*c, p.yp*c); -} - -constexpr inline const QPointF operator*(qreal c, const QPointF &p) -{ - return QPointF(p.xp*c, p.yp*c); -} - -constexpr inline const QPointF operator+(const QPointF &p) -{ - return p; -} - -constexpr inline const QPointF operator-(const QPointF &p) -{ - return QPointF(-p.xp, -p.yp); + xp *= c; + yp *= c; + return *this; } constexpr inline QPointF &QPointF::operator/=(qreal divisor) { - xp/=divisor; - yp/=divisor; + Q_ASSERT(divisor > 0 || divisor < 0); + xp /= divisor; + yp /= divisor; return *this; } -constexpr inline const QPointF operator/(const QPointF &p, qreal divisor) -{ - return QPointF(p.xp/divisor, p.yp/divisor); -} +constexpr QPointF QPoint::toPointF() const noexcept { return *this; } constexpr inline QPoint QPointF::toPoint() const { @@ -418,4 +402,24 @@ Q_CORE_EXPORT QDebug operator<<(QDebug d, const QPointF &p); QT_END_NAMESPACE +/***************************************************************************** + QPoint/QPointF tuple protocol + *****************************************************************************/ + +namespace std { + template <> + class tuple_size<QT_PREPEND_NAMESPACE(QPoint)> : public integral_constant<size_t, 2> {}; + template <> + class tuple_element<0, QT_PREPEND_NAMESPACE(QPoint)> { public: using type = int; }; + template <> + class tuple_element<1, QT_PREPEND_NAMESPACE(QPoint)> { public: using type = int; }; + + template <> + class tuple_size<QT_PREPEND_NAMESPACE(QPointF)> : public integral_constant<size_t, 2> {}; + template <> + class tuple_element<0, QT_PREPEND_NAMESPACE(QPointF)> { public: using type = QT_PREPEND_NAMESPACE(qreal); }; + template <> + class tuple_element<1, QT_PREPEND_NAMESPACE(QPointF)> { public: using type = QT_PREPEND_NAMESPACE(qreal); }; +} + #endif // QPOINT_H |