Rename QScreenPrivate::updateHighDpi()

The function updates the cached QScreen geometry; rename
it to updateGeometry().

Change-Id: I56077807baa6c515769017dbb842eed10b1d1357
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

4 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 8d6bb62594..00f2092ead 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -532,7 +532,7 @@ void QHighDpiScaling::setGlobalFactor(qreal factor)
     m_active = m_globalScalingActive || m_screenFactorSet || m_platformPluginDpiScalingActive ;
     const auto screens = QGuiApplication::screens();
     for (QScreen *screen : screens)
-         screen->d_func()->updateHighDpi();
+         screen->d_func()->updateGeometry();
 }
 
 static const char scaleFactorProperty[] = "_q_scaleFactor";
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index c8e5c98f45..32990de3d9 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -48,7 +48,7 @@ void QScreenPrivate::updateGeometriesWithSignals()
 {
     const QRect oldGeometry = geometry;
     const QRect oldAvailableGeometry = availableGeometry;
-    updateHighDpi();
+    updateGeometry();
     emitGeometryChangeSignals(oldGeometry != geometry, oldAvailableGeometry != availableGeometry);
 }
 
@@ -85,11 +85,11 @@ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
     if (refreshRate < 1.0)
         refreshRate = 60.0;
 
-    updateHighDpi();
+    updateGeometry();
     updatePrimaryOrientation(); // derived from the geometry
 }
 
-void QScreenPrivate::updateHighDpi()
+void QScreenPrivate::updateGeometry()
 {
     qreal scaleFactor = QHighDpiScaling::factor(platformScreen);
     QRect nativeGeometry = platformScreen->geometry();
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index 67b42bda6f..fa7e1ec06a 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -29,7 +29,7 @@ class QScreenPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QScreen)
 public:
     void setPlatformScreen(QPlatformScreen *screen);
-    void updateHighDpi();
+    void updateGeometry();
 
     void updatePrimaryOrientation();
     void updateGeometriesWithSignals();
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 0177b105d6..15cdafa84c 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -752,7 +752,7 @@ void QWindowSystemInterface::handleScreenAdded(QPlatformScreen *ps, bool isPrima
 
     QGuiApplicationPrivate::resetCachedDevicePixelRatio();
     QHighDpiScaling::updateHighDpiScaling();
-    screen->d_func()->updateHighDpi();
+    screen->d_func()->updateGeometry();
 
     emit qGuiApp->screenAdded(screen);