diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 15:30:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-27 11:26:08 +0200 |
| commit | f4323889f117a1b474a3c7613858aa8e959ccb4c (patch) | |
| tree | 5d686bd522580c4e95b3f35c4cd9dd82eb4f94ec /src/corelib/tools/qline.h | |
| parent | d3c8757731d0b0d9e7a6448f1d1c21997136a19d (diff) | |
QLine: purge deprecated API
Since 5.14: intersect(), angle(). Also removed definition of M_2PI
from test, since its last use was in the tests being removed.
Change-Id: Ie3a12247e3760e8bfdd3a659cd06245c86b198c2
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/corelib/tools/qline.h')
| -rw-r--r-- | src/corelib/tools/qline.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index d4f62024d1..8d0e10b669 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -251,13 +251,6 @@ public: IntersectionType intersects(const QLineF &l, QPointF *intersectionPoint) const; -#if QT_DEPRECATED_SINCE(5, 14) - QT_DEPRECATED_VERSION_X(5, 14, "Use intersects() instead") - IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const; - QT_DEPRECATED_X("Use qMin(l1.angleTo(l2), l2.angleTo(l1)) instead") - qreal angle(const QLineF &l) const; -#endif - Q_DECL_CONSTEXPR inline QPointF pointAt(qreal t) const; inline void translate(const QPointF &p); inline void translate(qreal dx, qreal dy); |