From 71545f8df838b82c07fd650cd41692da74fa740e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Thu, 30 Apr 2015 14:54:53 +0200
Subject: Revert "Add devicePixelRatio support to the Windows QPA plugin."

This change reverts c47b04696a9d1dab04c4a59ed9ce4c28aa00fe98 .

Task-number: QTBUG-38993
Task-number: QTBUG-46615
Change-Id: I180dcac3a65a33498b90a71bbcad5e45a12af77c
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
---
 src/plugins/platforms/windows/qwindowswindow.h | 30 ++++++++------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'src/plugins/platforms/windows/qwindowswindow.h')

diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index fff90b4b11..d96022e3a5 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -38,7 +38,6 @@
 #ifdef Q_OS_WINCE
 #  include "qplatformfunctions_wince.h"
 #endif
-#include "qwindowsscaling.h"
 #include "qwindowscursor.h"
 
 #include <qpa/qplatformwindow.h>
@@ -145,28 +144,18 @@ public:
     ~QWindowsWindow();
 
     QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
-    void setGeometryDp(const QRect &rectIn);
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE
-        { setGeometryDp(QWindowsScaling::mapToNative(rect)); }
-    QRect geometryDp() const { return m_data.geometry; }
-    QRect geometry() const Q_DECL_OVERRIDE
-        { return QWindowsScaling::mapFromNative(geometryDp()); }
-    QRect normalGeometryDp() const;
-    QRect normalGeometry() const Q_DECL_OVERRIDE
-        { return QWindowsScaling::mapFromNative(normalGeometryDp()); }
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE
-        { return qreal(QWindowsScaling::factor()); }
+    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    QRect geometry() const Q_DECL_OVERRIDE { return m_data.geometry; }
+    QRect normalGeometry() const Q_DECL_OVERRIDE;
+
     void setVisible(bool visible) Q_DECL_OVERRIDE;
     bool isVisible() const;
     bool isExposed() const Q_DECL_OVERRIDE { return testFlag(Exposed); }
     bool isActive() const Q_DECL_OVERRIDE;
     bool isEmbedded(const QPlatformWindow *parentWindow) const Q_DECL_OVERRIDE;
-    QPoint mapToGlobalDp(const QPoint &pos) const;
-    QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE
-        { return mapToGlobalDp(pos * QWindowsScaling::factor()) / QWindowsScaling::factor(); }
-    QPoint mapFromGlobalDp(const QPoint &pos) const;
-    QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE
-        { return mapFromGlobalDp(pos * QWindowsScaling::factor()) / QWindowsScaling::factor(); }
+    QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
+    QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
+
     void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
     void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
 
@@ -184,8 +173,7 @@ public:
     void propagateSizeHints() Q_DECL_OVERRIDE;
     static bool handleGeometryChangingMessage(MSG *message, const QWindow *qWindow, const QMargins &marginsDp);
     bool handleGeometryChanging(MSG *message) const;
-    QMargins frameMarginsDp() const;
-    QMargins frameMargins() const Q_DECL_OVERRIDE { return frameMarginsDp() / QWindowsScaling::factor(); }
+    QMargins frameMargins() const Q_DECL_OVERRIDE;
 
     void setOpacity(qreal level) Q_DECL_OVERRIDE;
     void setMask(const QRegion &region) Q_DECL_OVERRIDE;
@@ -196,7 +184,7 @@ public:
     bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
     inline bool hasMouseCapture() const { return GetCapture() == m_data.hwnd; }
 
-    bool startSystemResize(const QPoint &, Qt::Corner corner) Q_DECL_OVERRIDE;
+    bool startSystemResize(const QPoint &pos, Qt::Corner corner) Q_DECL_OVERRIDE;
 
     void setFrameStrutEventsEnabled(bool enabled);
     bool frameStrutEventsEnabled() const { return testFlag(FrameStrutEventsEnabled); }
-- 
cgit v1.2.3