From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 22 Jun 2021 20:06:47 +0000 (+0300)
Subject: remove redundant QRasterWindowSurfacePrivate::inSetGeometry member
X-Git-Tag: 4.12.0~2220
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=99923e80bc770b61a38b7b4aa5be60737611ec8b;p=kde%2FKatie.git

remove redundant QRasterWindowSurfacePrivate::inSetGeometry member

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index faa1d5b06..7d2463b88 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -47,7 +47,6 @@ public:
     bool translucentBackground;
 #endif
 #endif
-    bool inSetGeometry;
 };
 
 QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurface)
@@ -61,7 +60,6 @@ QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurfa
 #endif
 #endif
     d_ptr->image = 0;
-    d_ptr->inSetGeometry = false;
 }
 
 
@@ -153,7 +151,6 @@ void QRasterWindowSurface::setGeometry(const QRect &rect)
 {
     QWindowSurface::setGeometry(rect);
     Q_D(QRasterWindowSurface);
-    d->inSetGeometry = true;
     if (d->image == 0 || d->image->width() < rect.width() || d->image->height() < rect.height()) {
 #if defined(Q_WS_X11) && !defined(QT_NO_XRENDER)
         if (d_ptr->translucentBackground)
@@ -162,7 +159,6 @@ void QRasterWindowSurface::setGeometry(const QRect &rect)
 #endif
             prepareBuffer(QImage::systemFormat());
     }
-    d->inSetGeometry = false;
 }
 
 // from qwindowsurface.cpp
@@ -206,7 +202,7 @@ void QRasterWindowSurface::prepareBuffer(QImage::Format format)
 
     d->image = new QImage(width, height, format);
 
-    if (oldImage && d->inSetGeometry && hasStaticContents()) {
+    if (oldImage && hasStaticContents()) {
         const uchar *src = oldImage->constBits();
         uchar *dst = d->image->bits();