From 7364a32ba6d27d64562d7423675b4fe7b6d9e000 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Date: Wed, 24 Jun 2015 14:44:28 +0200
Subject: [PATCH] Remove QPlatformScreen::screenGeometry()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
QScreen's geometry is always determined by the platform screen,
since there is no Qt API to resize or move a screen. Therefore,
it makes no sense for the platform screen to ask QScreen for the
geometry.
Change-Id: Iedaa40e06e3a878f4e4e13fddd13a67a62d1f0f9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
---
src/gui/kernel/qplatformscreen.cpp | 13 -------------
src/gui/kernel/qplatformscreen.h | 4 ----
2 files changed, 17 deletions(-)
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index 3a4adbc436a..fc9e184a5b4 100644
--- a/src/gui/kernel/qplatformscreen.cpp
+++ b/src/gui/kernel/qplatformscreen.cpp
@@ -449,19 +449,6 @@ QRect QPlatformScreen::deviceIndependentGeometry() const
return QRect(nativeGeometry.topLeft(), QHighDpi::fromNative(nativeGeometry.size(), scaleFactor));
}
-
-QRect QPlatformScreen::screenGeometry() const
-{
- qreal scaleFactor = QHighDpiScaling::factor(this);
- QRect geometry = screen()->geometry();
- return QRect(geometry.topLeft(), QHighDpi::toNative(geometry.size(), scaleFactor));
-}
-
-QRect QPlatformScreen::screenAvailableGeometry() const
-{
- return QHighDpi::toNativePixels(screen()->availableGeometry(), this);
-}
-
/*!
Returns a hint about this screen's subpixel layout structure.
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h
index 0bd0b777516..29e0080ed9c 100644
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -127,10 +127,6 @@ public:
// The platform screen's geometry in device independent coordinates
QRect deviceIndependentGeometry() const;
- // Accessors for QScreen geometry in native coordinates. Platform plugins should use these
- // instead of accessing QScreen directly.
- QRect screenGeometry() const;
- QRect screenAvailableGeometry() const;
protected:
void resizeMaximizedWindows();
--
GitLab