From 10e8faa72c2a58306f596ec4ee7d56fb7ce28bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 23 Aug 2019 14:51:11 +0200 Subject: widgets: Merge QWidgetRepaintManager::topLevelRect into callsite Change-Id: Ia9bb0c396b8175f644e337ca73086208c637ed2d Reviewed-by: Paul Olav Tvete --- src/widgets/kernel/qwidgetrepaintmanager.cpp | 2 +- src/widgets/kernel/qwidgetrepaintmanager_p.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp index 10feb4a918..da1754004d 100644 --- a/src/widgets/kernel/qwidgetrepaintmanager.cpp +++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp @@ -799,7 +799,7 @@ void QWidgetRepaintManager::paintAndFlush() bool repaintAllWidgets = false; const bool inTopLevelResize = tlw->d_func()->maybeTopData()->inTopLevelResize; - const QRect tlwRect(topLevelRect()); + const QRect tlwRect = tlw->data->crect; const QRect surfaceGeometry(tlwRect.topLeft(), store->size()); if ((inTopLevelResize || surfaceGeometry.size() != tlwRect.size()) && !updatesDisabled) { if (hasStaticContents() && !store->size().isEmpty() ) { diff --git a/src/widgets/kernel/qwidgetrepaintmanager_p.h b/src/widgets/kernel/qwidgetrepaintmanager_p.h index 4ca5e95f24..e81eee0816 100644 --- a/src/widgets/kernel/qwidgetrepaintmanager_p.h +++ b/src/widgets/kernel/qwidgetrepaintmanager_p.h @@ -123,8 +123,6 @@ private: bool hasStaticContents() const; void updateStaticContentsSize(); - QRect topLevelRect() const { return tlw->data->crect; } - QWidget *tlw = nullptr; QBackingStore *store = nullptr; -- cgit v1.2.3