From 42b1f681a64a02c281d475a811e2ac0b2095b083 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 6 May 2020 02:32:17 +0000 Subject: [PATCH] remove unused QWindowSurface::grabWidget() argument Signed-off-by: Ivailo Monev --- src/gui/painting/qwindowsurface.cpp | 9 +++------ src/gui/painting/qwindowsurface_p.h | 2 +- src/gui/painting/qwindowsurface_x11.cpp | 11 ++--------- src/gui/painting/qwindowsurface_x11_p.h | 3 +-- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp index 93ce56c56..c8a87920a 100644 --- a/src/gui/painting/qwindowsurface.cpp +++ b/src/gui/painting/qwindowsurface.cpp @@ -211,16 +211,13 @@ QImage* QWindowSurface::buffer(const QWidget *widget) corresponding to \a widget. Returns a null QPixmap if an error occurs. The contents of the pixmap are only defined for the regions of \a widget that have received paint events since the last resize - of the backing store. - - If \a rectangle is a null rectangle (the default), the entire widget - is grabbed. Otherwise, the grabbed area is limited to \a rectangle. + of the backing store. The entire widget is grabbed. The default implementation uses QWindowSurface::buffer(). \sa QPixmap::grabWidget() */ -QPixmap QWindowSurface::grabWidget(const QWidget *widget, const QRect &rectangle) const +QPixmap QWindowSurface::grabWidget(const QWidget *widget) const { if (widget->window() != window()) return QPixmap(); @@ -230,7 +227,7 @@ QPixmap QWindowSurface::grabWidget(const QWidget *widget, const QRect &rectangle if (!img || img->isNull()) return QPixmap(); - QRect rect = rectangle.isEmpty() ? widget->rect() : (widget->rect() & rectangle); + QRect rect = widget->rect(); rect.translate(offset(widget) - offset(widget->window())); rect &= QRect(QPoint(), img->size()); diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h index 1909fe7cf..012b2ce3d 100644 --- a/src/gui/painting/qwindowsurface_p.h +++ b/src/gui/painting/qwindowsurface_p.h @@ -88,7 +88,7 @@ public: virtual void endPaint(const QRegion &); virtual QImage* buffer(const QWidget *widget); - virtual QPixmap grabWidget(const QWidget *widget, const QRect& rectangle = QRect()) const; + virtual QPixmap grabWidget(const QWidget *widget) const; virtual QPoint offset(const QWidget *widget) const; inline QRect rect(const QWidget *widget) const; diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp index 1e83a22df..0a8824925 100644 --- a/src/gui/painting/qwindowsurface_x11.cpp +++ b/src/gui/painting/qwindowsurface_x11.cpp @@ -206,19 +206,12 @@ bool QX11WindowSurface::scroll(const QRegion &area, int dx, int dy) return true; } -QPixmap QX11WindowSurface::grabWidget(const QWidget *widget, - const QRect& rect) const +QPixmap QX11WindowSurface::grabWidget(const QWidget *widget) const { if (!widget || d_ptr->device.isNull()) return QPixmap(); - QRect srcRect; - - // make sure the rect is inside the widget & clip to widget's rect - if (!rect.isEmpty()) - srcRect = rect & widget->rect(); - else - srcRect = widget->rect(); + QRect srcRect = widget->rect(); if (srcRect.isEmpty()) return QPixmap(); diff --git a/src/gui/painting/qwindowsurface_x11_p.h b/src/gui/painting/qwindowsurface_x11_p.h index e8b0708a2..34b689c43 100644 --- a/src/gui/painting/qwindowsurface_x11_p.h +++ b/src/gui/painting/qwindowsurface_x11_p.h @@ -69,8 +69,7 @@ public: void beginPaint(const QRegion &rgn); void setGeometry(const QRect &rect); bool scroll(const QRegion &area, int dx, int dy); - QPixmap grabWidget(const QWidget *widget, - const QRect& rectangle = QRect()) const; + QPixmap grabWidget(const QWidget *widget) const; WindowSurfaceFeatures features() const; private: