1 files changed, 18 insertions, 22 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoascreen.h b/src/plugins/platforms/cocoa/qcocoascreen.h
index 937002f493..3d59c3de79 100644
--- a/src/plugins/platforms/cocoa/qcocoascreen.h
+++ b/src/plugins/platforms/cocoa/qcocoascreen.h
@@ -56,20 +56,20 @@ public:
 
     // ----------------------------------------------------
     // Virtual methods overridden from QPlatformScreen
-    QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
-    QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; }
-    QRect availableGeometry() const Q_DECL_OVERRIDE { return m_availableGeometry; }
-    int depth() const Q_DECL_OVERRIDE { return m_depth; }
-    QImage::Format format() const Q_DECL_OVERRIDE { return m_format; }
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
-    QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_physicalSize; }
-    QDpi logicalDpi() const Q_DECL_OVERRIDE { return m_logicalDpi; }
-    qreal refreshRate() const Q_DECL_OVERRIDE { return m_refreshRate; }
-    QString name() const Q_DECL_OVERRIDE { return m_name; }
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor; }
-    QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE;
-    QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; }
-    QPlatformScreen::SubpixelAntialiasingType subpixelAntialiasingTypeHint() const Q_DECL_OVERRIDE;
+    QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
+    QRect geometry() const override { return m_geometry; }
+    QRect availableGeometry() const override { return m_availableGeometry; }
+    int depth() const override { return m_depth; }
+    QImage::Format format() const override { return m_format; }
+    qreal devicePixelRatio() const override;
+    QSizeF physicalSize() const override { return m_physicalSize; }
+    QDpi logicalDpi() const override { return m_logicalDpi; }
+    qreal refreshRate() const override { return m_refreshRate; }
+    QString name() const override { return m_name; }
+    QPlatformCursor *cursor() const override { return m_cursor; }
+    QWindow *topLevelAt(const QPoint &point) const override;
+    QList<QPlatformScreen *> virtualSiblings() const override { return m_siblings; }
+    QPlatformScreen::SubpixelAntialiasingType subpixelAntialiasingTypeHint() const override;
 
     // ----------------------------------------------------
     // Additional methods
@@ -77,16 +77,12 @@ public:
     NSScreen *nativeScreen() const;
     void updateGeometry();
 
-    QPointF mapToNative(const QPointF &pos) const { return flipCoordinate(pos); }
-    QRectF mapToNative(const QRectF &rect) const { return flipCoordinate(rect); }
-    QPointF mapFromNative(const QPointF &pos) const { return flipCoordinate(pos); }
-    QRectF mapFromNative(const QRectF &rect) const { return flipCoordinate(rect); }
-
     static QCocoaScreen *primaryScreen();
 
-private:
-    QPointF flipCoordinate(const QPointF &pos) const;
-    QRectF flipCoordinate(const QRectF &rect) const;
+    static CGPoint mapToNative(const QPointF &pos, QCocoaScreen *screen = QCocoaScreen::primaryScreen());
+    static CGRect mapToNative(const QRectF &rect, QCocoaScreen *screen = QCocoaScreen::primaryScreen());
+    static QPointF mapFromNative(CGPoint pos, QCocoaScreen *screen = QCocoaScreen::primaryScreen());
+    static QRectF mapFromNative(CGRect rect, QCocoaScreen *screen = QCocoaScreen::primaryScreen());
 
 public:
     int m_screenIndex;