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>

src/corelib/kernel/qcore_foundation.mm

@@ -458,5 +458,43 @@ QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW
     return QRectF(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
 }
 
+// ----------------------------------------------------------------------------
+
+/*!
+    \since 5.8
+
+    Creates a CGPoint from a QPoint.
+
+    \sa fromCGPoint()
+*/
+CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW
+{
+    return CGPointMake(x(), y());
+}
+
+/*!
+    \since 5.8
+
+    Creates a CGPoint from a QPointF.
+
+    \sa fromCGPoint()
+*/
+CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW
+{
+    return CGPointMake(x(), y());
+}
+
+/*!
+    \since 5.8
+
+    Creates a QRectF from a CGPoint.
+
+    \sa toCGPoint()
+*/
+QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW
+{
+    return QPointF(point.x, point.y);
+}
+
 
 QT_END_NAMESPACE

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;

src/plugins/platforms/ios/qiosglobal.h

@@ -61,9 +61,6 @@ class QPlatformScreen;
 
 bool isQtApplication();
 
-CGPoint toCGPoint(const QPointF &point);
-QPointF fromCGPoint(const CGPoint &point);
-
 #ifndef Q_OS_TVOS
 Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation);
 UIDeviceOrientation fromQtScreenOrientation(Qt::ScreenOrientation qtOrientation);

src/plugins/platforms/ios/qiosglobal.mm

@@ -58,16 +58,6 @@ bool isQtApplication()
     return isQt;
 }
 
-CGPoint toCGPoint(const QPointF &point)
-{
-    return CGPointMake(point.x(), point.y());
-}
-
-QPointF fromCGPoint(const CGPoint &point)
-{
-    return QPointF(point.x, point.y);
-}
-
 #ifndef Q_OS_TVOS
 Qt::ScreenOrientation toQtScreenOrientation(UIDeviceOrientation uiDeviceOrientation)
 {

src/plugins/platforms/ios/qiostextinputoverlay.mm

@@ -496,12 +496,12 @@ static void executeBlockWithoutAnimation(Block block)
         QGuiApplication::styleHints()->setCursorFlashTime(0);
         if (!_loupeLayer)
             [self createLoupe];
-        [self updateFocalPoint:fromCGPoint(_lastTouchPoint)];
+        [self updateFocalPoint:QPointF::fromCGPoint(_lastTouchPoint)];
         _loupeLayer.visible = YES;
         break;
     case UIGestureRecognizerStateChanged:
         // Tell the sub class to move the loupe to the correct position
-        [self updateFocalPoint:fromCGPoint(_lastTouchPoint)];
+        [self updateFocalPoint:QPointF::fromCGPoint(_lastTouchPoint)];
         break;
     case UIGestureRecognizerStateEnded:
         // Restore cursor blinking, and hide the loupe
@@ -526,12 +526,12 @@ static void executeBlockWithoutAnimation(Block block)
 
 - (QPointF)focalPoint
 {
-    return fromCGPoint([_loupeLayer.targetView convertPoint:_loupeLayer.focalPoint toView:_focusView]);
+    return QPointF::fromCGPoint([_loupeLayer.targetView convertPoint:_loupeLayer.focalPoint toView:_focusView]);
 }
 
 - (void)setFocalPoint:(QPointF)point
 {
-    _loupeLayer.focalPoint = [_loupeLayer.targetView convertPoint:toCGPoint(point) fromView:_focusView];
+    _loupeLayer.focalPoint = [_loupeLayer.targetView convertPoint:point.toCGPoint() fromView:_focusView];
 }
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
@@ -548,7 +548,7 @@ static void executeBlockWithoutAnimation(Block block)
 
     // If the touch point is accepted by the sub class (e.g touch on cursor), we start a
     // press'n'hold timer that eventually will move the state to UIGestureRecognizerStateBegan.
-    if ([self acceptTouchesBegan:fromCGPoint(_firstTouchPoint)])
+    if ([self acceptTouchesBegan:QPointF::fromCGPoint(_firstTouchPoint)])
         _triggerStateBeganTimer.start();
     else
         self.state = UIGestureRecognizerStateFailed;
@@ -934,7 +934,7 @@ static void executeBlockWithoutAnimation(Block block)
     }
 
     QRectF inputRect = QGuiApplication::inputMethod()->inputItemClipRectangle();
-    QPointF touchPos = fromCGPoint([static_cast<UITouch *>([touches anyObject]) locationInView:_focusView]);
+    QPointF touchPos = QPointF::fromCGPoint([static_cast<UITouch *>([touches anyObject]) locationInView:_focusView]);
     if (!inputRect.contains(touchPos))
         self.state = UIGestureRecognizerStateFailed;
 
@@ -943,7 +943,7 @@ static void executeBlockWithoutAnimation(Block block)
 
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
 {
-    QPointF touchPos = fromCGPoint([static_cast<UITouch *>([touches anyObject]) locationInView:_focusView]);
+    QPointF touchPos = QPointF::fromCGPoint([static_cast<UITouch *>([touches anyObject]) locationInView:_focusView]);
     const QTransform mapToLocal = QGuiApplication::inputMethod()->inputItemTransform().inverted();
     int cursorPosOnRelease = QInputMethod::queryFocusObject(Qt::ImCursorPosition, touchPos * mapToLocal).toInt();
 

src/plugins/platforms/ios/quiview.mm

@@ -329,7 +329,7 @@
             // as we already have the QWindow positioned at the right place, we can
             // just map from the local view position to global coordinates.
             // tvOS: all touches start at the center of the screen and move from there.
-            QPoint localViewPosition = fromCGPoint([uiTouch locationInView:self]).toPoint();
+            QPoint localViewPosition = QPointF::fromCGPoint([uiTouch locationInView:self]).toPoint();
             QPoint globalScreenPosition = m_qioswindow->mapToGlobal(localViewPosition);
 
             touchPoint.area = QRectF(globalScreenPosition, QSize(0, 0));