From 71a31bd8c8e3ef9689b31dc78556b885380ea6a6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 24 Nov 2014 13:32:38 +0100 Subject: [PATCH] Remove unnecessary indirect access Read the screen directly from window, instead of through platformScreen which is derived from the same direct methods anyway/ Change-Id: If72a1d12f6ba7fc349d4639ad0c944996504c0ce Reviewed-by: Laszlo Agocs --- src/widgets/kernel/qwidget.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 7f2e5a5e17..ed59e40bb6 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -12575,13 +12575,10 @@ int QWidget::metric(PaintDeviceMetric m) const QWindow *topLevelWindow = 0; QScreen *screen = 0; - if (QWidget *topLevel = window()) + if (QWidget *topLevel = window()) { topLevelWindow = topLevel->windowHandle(); - - if (topLevelWindow) { - QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(topLevelWindow); - if (platformScreen) - screen = platformScreen->screen(); + if (topLevelWindow) + screen = topLevelWindow->screen(); } if (!screen && QGuiApplication::primaryScreen()) screen = QGuiApplication::primaryScreen();