get rid of qt_grayscale() argument

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index 76a6602..ba97893 100644 (file)
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -624,14 +624,13 @@ void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap
 // grayscales the image to dest (could be same). If rect isn't defined
 // destination image size is used to determine the dimension of grayscaling
 // process.
-Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest, const QRect& rect = QRect())
+Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest)
 {
-    QRect destRect = rect;
-    QRect srcRect = rect;
-    if (rect.isNull()) {
+    QRect srcRect =  image.rect();
+    if (srcRect.isNull()) {
         srcRect = dest.rect();
-        destRect = dest.rect();
     }
+    QRect destRect = srcRect;
     if (&image != &dest) {
         destRect.moveTo(QPoint(0, 0));
     }
@@ -787,7 +786,7 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q
 
     // do colorizing
     QPainter destPainter(&destImage);
-    qt_grayscale(srcImage, destImage, srcImage.rect());
+    qt_grayscale(srcImage, destImage);
     destPainter.setCompositionMode(QPainter::CompositionMode_Screen);
     destPainter.fillRect(srcImage.rect(), d->color);
     destPainter.end();

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 017700c..625b6a4 100644 (file)
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -5630,7 +5630,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardicon, const QStyleOption
 }
 
 // in qpixmapfilter.cpp
-extern Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest, const QRect& rect);
+extern Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest);
 
 /*! \reimp */
 QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
@@ -5639,7 +5639,7 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p
     switch (iconMode) {
         case QIcon::Disabled: {
             QImage im = pixmap.toImage();
-            qt_grayscale(im, im, im.rect());
+            qt_grayscale(im, im);
             return QPixmap::fromImage(im);
         }
         case QIcon::Selected: {