diff options
Diffstat (limited to 'src/gui/math3d/qvector2d.h')
| -rw-r--r-- | src/gui/math3d/qvector2d.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 2cacd8ade0..20264fa84f 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -50,6 +50,7 @@ class Q_GUI_EXPORT QVector2D { public: Q_DECL_CONSTEXPR QVector2D(); + explicit QVector2D(Qt::Initialization) {} Q_DECL_CONSTEXPR QVector2D(float xpos, float ypos); Q_DECL_CONSTEXPR explicit QVector2D(const QPoint& point); Q_DECL_CONSTEXPR explicit QVector2D(const QPointF& point); @@ -85,6 +86,7 @@ public: QVector2D &operator*=(float factor); QVector2D &operator*=(const QVector2D &vector); QVector2D &operator/=(float divisor); + inline QVector2D &operator/=(const QVector2D &vector); static float dotProduct(const QVector2D& v1, const QVector2D& v2); //In Qt 6 convert to inline and constexpr @@ -97,6 +99,7 @@ public: Q_DECL_CONSTEXPR friend inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2); Q_DECL_CONSTEXPR friend inline const QVector2D operator-(const QVector2D &vector); Q_DECL_CONSTEXPR friend inline const QVector2D operator/(const QVector2D &vector, float divisor); + Q_DECL_CONSTEXPR friend inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor); Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2); @@ -187,6 +190,13 @@ inline QVector2D &QVector2D::operator/=(float divisor) return *this; } +inline QVector2D &QVector2D::operator/=(const QVector2D &vector) +{ + xp /= vector.xp; + yp /= vector.yp; + return *this; +} + Q_DECL_CONSTEXPR inline bool operator==(const QVector2D &v1, const QVector2D &v2) { return v1.xp == v2.xp && v1.yp == v2.yp; @@ -232,6 +242,11 @@ Q_DECL_CONSTEXPR inline const QVector2D operator/(const QVector2D &vector, float return QVector2D(vector.xp / divisor, vector.yp / divisor); } +Q_DECL_CONSTEXPR inline const QVector2D operator/(const QVector2D &vector, const QVector2D &divisor) +{ + return QVector2D(vector.xp / divisor.xp, vector.yp / divisor.yp); +} + Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2) { return qFuzzyCompare(v1.xp, v2.xp) && qFuzzyCompare(v1.yp, v2.yp); |