diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-05-18 15:28:26 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-14 17:22:55 +0000 |
| commit | 197471beacf5589802cb91f1ceba59ed99cbb511 (patch) | |
| tree | 7e0e3d8f6e436de99c5024de5566f42a2504e606 /src/corelib/tools/qpoint.h | |
| parent | f862946c228f111e9572c6103faf526260fed04d (diff) | |
darwin: Add Foundation conversion functions for QPoint/QPointF
The fromCGPoint function was left out for QPoint, as the foundation type is
using CGFloats internally. Clients should use an explicit QPointF::toPoint()
when potentially throwing away precision.
Change-Id: I12a37e8f81c86b7ada56066cc18ee29709cc21e3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/tools/qpoint.h')
| -rw-r--r-- | src/corelib/tools/qpoint.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index 4e2e6b91a6..e2d7f4372a 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -42,6 +42,10 @@ #include <QtCore/qnamespace.h> +#if defined(Q_OS_DARWIN) +struct CGPoint; +#endif + QT_BEGIN_NAMESPACE @@ -89,6 +93,10 @@ public: friend Q_DECL_CONSTEXPR inline const QPoint operator-(const QPoint &); friend Q_DECL_CONSTEXPR inline const QPoint operator/(const QPoint &, qreal); +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) + CGPoint toCGPoint() const Q_DECL_NOTHROW Q_REQUIRED_RESULT; +#endif + private: friend class QTransform; int xp; @@ -247,6 +255,11 @@ public: Q_DECL_CONSTEXPR QPoint toPoint() const; +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) + static QPointF fromCGPoint(CGPoint point) Q_DECL_NOTHROW Q_REQUIRED_RESULT; + CGPoint toCGPoint() const Q_DECL_NOTHROW Q_REQUIRED_RESULT; +#endif + private: friend class QMatrix; friend class QTransform; |