From e8c70fb07f01b492b721451c00496f860eb40be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 23 Aug 2019 15:19:52 +0200
Subject: widgets: Rename QWidgetPrivate::repaint_sys to paintOnScreen

Change-Id: Ic853e42cbed9b770bef0e1d7c7376c861bceb891
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/widgets/graphicsview/qgraphicsview_p.h   |  2 +-
 src/widgets/kernel/qwidget.cpp               | 14 +++++++-------
 src/widgets/kernel/qwidget_p.h               |  4 ++--
 src/widgets/kernel/qwidgetrepaintmanager.cpp |  4 ++--
 src/widgets/kernel/qwidgetwindow.cpp         |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h
index b534004587..01af61d6ba 100644
--- a/src/widgets/graphicsview/qgraphicsview_p.h
+++ b/src/widgets/graphicsview/qgraphicsview_p.h
@@ -184,7 +184,7 @@ public:
 
     inline void dispatchPendingUpdateRequests()
     {
-        if (qt_widget_private(viewport)->paintOnScreen())
+        if (qt_widget_private(viewport)->shouldPaintOnScreen())
             QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest);
         else
             QCoreApplication::sendPostedEvents(viewport->window(), QEvent::UpdateRequest);
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index c0f5954885..c0c7f5cf3d 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -1758,8 +1758,8 @@ QRegion QWidgetPrivate::overlappedRegion(const QRect &rect, bool breakAfterFirst
 
 void QWidgetPrivate::syncBackingStore()
 {
-    if (paintOnScreen()) {
-        repaint_sys(dirty);
+    if (shouldPaintOnScreen()) {
+        paintOnScreen(dirty);
         dirty = QRegion();
     } else if (QWidgetRepaintManager *repaintManager = maybeRepaintManager()) {
         repaintManager->sync();
@@ -1768,14 +1768,14 @@ void QWidgetPrivate::syncBackingStore()
 
 void QWidgetPrivate::syncBackingStore(const QRegion &region)
 {
-    if (paintOnScreen())
-        repaint_sys(region);
+    if (shouldPaintOnScreen())
+        paintOnScreen(region);
     else if (QWidgetRepaintManager *repaintManager = maybeRepaintManager()) {
         repaintManager->sync(q_func(), region);
     }
 }
 
-void QWidgetPrivate::repaint_sys(const QRegion &rgn)
+void QWidgetPrivate::paintOnScreen(const QRegion &rgn)
 {
     if (data.in_destructor)
         return;
@@ -2138,7 +2138,7 @@ void QWidgetPrivate::clipToEffectiveMask(QRegion &region) const
     }
 }
 
-bool QWidgetPrivate::paintOnScreen() const
+bool QWidgetPrivate::shouldPaintOnScreen() const
 {
 #if defined(QT_NO_BACKINGSTORE)
     return true;
@@ -5276,7 +5276,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
         return;
 
     const bool asRoot = flags & DrawAsRoot;
-    bool onScreen = paintOnScreen();
+    bool onScreen = shouldPaintOnScreen();
 
     Q_Q(QWidget);
 #if QT_CONFIG(graphicseffect)
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 6fd9c2d273..cfb9a1ad8c 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -350,7 +350,8 @@ public:
 #if QT_CONFIG(graphicsview)
     static QGraphicsProxyWidget * nearestGraphicsProxyWidget(const QWidget *origin);
 #endif
-    void repaint_sys(const QRegion &rgn);
+    bool shouldPaintOnScreen() const;
+    void paintOnScreen(const QRegion &rgn);
 
     QRect clipRect() const;
     QRegion clipRegion() const;
@@ -362,7 +363,6 @@ public:
     void updateIsOpaque();
     void setOpaque(bool opaque);
     void updateIsTranslucent();
-    bool paintOnScreen() const;
 #if QT_CONFIG(graphicseffect)
     void invalidateGraphicsEffectsRecursively();
 #endif // QT_CONFIG(graphicseffect)
diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index 334b618afb..99373f758c 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -221,7 +221,7 @@ void QWidgetRepaintManager::markDirty(const T &r, QWidget *widget, UpdateTime up
 
     // ---------------------------------------------------------------------------
 
-    if (widget->d_func()->paintOnScreen()) {
+    if (widget->d_func()->shouldPaintOnScreen()) {
         if (widget->d_func()->dirty.isEmpty()) {
             widget->d_func()->dirty = r;
             sendUpdateRequest(widget, updateTime);
@@ -1019,7 +1019,7 @@ void QWidgetRepaintManager::paintAndFlush()
 */
 void QWidgetRepaintManager::markNeedsFlush(QWidget *widget, const QRegion &region, const QPoint &topLevelOffset)
 {
-    if (!widget || widget->d_func()->paintOnScreen() || region.isEmpty())
+    if (!widget || widget->d_func()->shouldPaintOnScreen() || region.isEmpty())
         return;
 
     if (widget == tlw) {
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 3a824371f3..b9a67edc6a 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -803,7 +803,7 @@ void QWidgetWindow::handleResizeEvent(QResizeEvent *event)
     if (updateSize()) {
         QGuiApplication::forwardEvent(m_widget, event);
 
-        if (m_widget->d_func()->paintOnScreen()) {
+        if (m_widget->d_func()->shouldPaintOnScreen()) {
             QRegion updateRegion(geometry());
             if (m_widget->testAttribute(Qt::WA_StaticContents))
                 updateRegion -= QRect(0, 0, oldSize.width(), oldSize.height());
-- 
cgit v1.2.3