summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-06-24 14:44:28 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-06-29 10:34:41 +0000
commit7364a32ba6d27d64562d7423675b4fe7b6d9e000 (patch)
tree8cc611cbc2b343db69ed1456e2ffd432910789fa
parentb454833001810e77a2f20a8d46ca8b4c51f789b2 (diff)
Remove QPlatformScreen::screenGeometry()
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>
-rw-r--r--src/gui/kernel/qplatformscreen.cpp13
-rw-r--r--src/gui/kernel/qplatformscreen.h4
2 files changed, 0 insertions, 17 deletions
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index 3a4adbc436..fc9e184a5b 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 0bd0b77751..29e0080ed9 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();