summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-21 15:15:06 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-28 21:23:20 +0200
commita144820ae775c630bc9aed40c35af3f93518187c (patch)
treedf47ffca90fb285cefe32f9425e941698f517439 /src/corelib/tools
parent26547c296ba89d20872eeda9d334fc1e07ddb43e (diff)
QLine: swap IntersectType and IntersectionType
Make IntersectionType the enum and the obsolete IntersectType an alias, with at least a comment to say it's deprecated. Adjust the docs to match. Task-number: QTBUG-85700 Change-Id: I0de9166b0d936f5b9a15fdd4f90cf7b01198e8d7 Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qline.cpp11
-rw-r--r--src/corelib/tools/qline.h7
2 files changed, 6 insertions, 12 deletions
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index e652f84772..1b029a0b8e 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -363,19 +363,12 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
*/
/*!
- \enum QLineF::IntersectType
+ \typealias QLineF::IntersectType
\obsolete Use QLineF::IntersectionType instead.
-
- \value NoIntersection
- Lines do not intersect.
- \value UnboundedIntersection
- Lines intersect, but not within the range defined by their lengths.
- \value BoundedIntersection
- Lnes intersect within the range defined by their lengths.
*/
/*!
- \typealias QLineF::IntersectionType
+ \enum QLineF::IntersectionType
Describes the intersection between two lines.
diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h
index 8889c4afb9..b11c23e05a 100644
--- a/src/corelib/tools/qline.h
+++ b/src/corelib/tools/qline.h
@@ -213,11 +213,12 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QLine &);
/*******************************************************************************
* class QLineF
*******************************************************************************/
-class Q_CORE_EXPORT QLineF {
+class Q_CORE_EXPORT QLineF
+{
public:
- enum IntersectType { NoIntersection, BoundedIntersection, UnboundedIntersection };
- using IntersectionType = IntersectType;
+ enum IntersectionType { NoIntersection, BoundedIntersection, UnboundedIntersection };
+ using IntersectType = IntersectionType; // deprecated name
constexpr inline QLineF();
constexpr inline QLineF(const QPointF &pt1, const QPointF &pt2);