From a0484b8277f142e8a8c06fd1e6c840694f88f7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 21 Aug 2019 15:22:52 +0200 Subject: widgets: Rename QWidgetRepaintManager::doSync to paintAndFlush Change-Id: Ie41bb76d33d59f70eb418f845defc212396d3915 Reviewed-by: Paul Olav Tvete --- src/widgets/kernel/qwidgetrepaintmanager.cpp | 6 +++--- src/widgets/kernel/qwidgetrepaintmanager_p.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/widgets/kernel') diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp index 65c07c7648..183337b693 100644 --- a/src/widgets/kernel/qwidgetrepaintmanager.cpp +++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp @@ -846,7 +846,7 @@ void QWidgetRepaintManager::sync(QWidget *exposedWidget, const QRegion &exposedR markDirtyOnScreen(exposedRegion, exposedWidget, QPoint()); if (syncAllowed()) - doSync(); + paintAndFlush(); } /*! @@ -871,10 +871,10 @@ void QWidgetRepaintManager::sync() } if (syncAllowed()) - doSync(); + paintAndFlush(); } -void QWidgetRepaintManager::doSync() +void QWidgetRepaintManager::paintAndFlush() { const bool updatesDisabled = !tlw->updatesEnabled(); bool repaintAllWidgets = false; diff --git a/src/widgets/kernel/qwidgetrepaintmanager_p.h b/src/widgets/kernel/qwidgetrepaintmanager_p.h index ac671c18c0..50f45afcd4 100644 --- a/src/widgets/kernel/qwidgetrepaintmanager_p.h +++ b/src/widgets/kernel/qwidgetrepaintmanager_p.h @@ -175,7 +175,8 @@ private: return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && dirtyRenderToTextureWidgets.isEmpty()); } - void doSync(); + void paintAndFlush(); + void flush(QWidget *widget = nullptr); void flush(QWidget *widget, const QRegion ®ion, QPlatformTextureList *widgetTextures); -- cgit v1.2.3