From 14d9a2b06c58f544f0db13267091cf94ed0d2e97 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 13 Dec 2011 10:12:44 +0100 Subject: Remove QAlphaPaintEngine::drawImage() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was not a proper reimplementation of QPaintEngine::drawImage(), which takes 4 arguments, not 3 as declared in QAlphaPaintEngine. Remove the code, since it is not being called. Change-Id: Ia125a9c7e8a2e05ec2ca11b859c01ccbf4d55af5 Reviewed-by: Samuel Rødal --- src/printsupport/kernel/qpaintengine_alpha.cpp | 19 ------------------- src/printsupport/kernel/qpaintengine_alpha_p.h | 1 - 2 files changed, 20 deletions(-) (limited to 'src') diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp index beda2c7144..dc40bd95fb 100644 --- a/src/printsupport/kernel/qpaintengine_alpha.cpp +++ b/src/printsupport/kernel/qpaintengine_alpha.cpp @@ -223,25 +223,6 @@ void QAlphaPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRe } } -void QAlphaPaintEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr) -{ - Q_D(QAlphaPaintEngine); - - QRectF tr = d->m_transform.mapRect(r); - if (d->m_pass == 0) { - d->m_continueCall = false; - if (image.hasAlphaChannel() || d->m_alphaOpacity || d->m_complexTransform) { - d->addAlphaRect(tr); - } - - if (d->m_picengine) - d->m_picengine->drawImage(r, image, sr); - - } else { - d->m_continueCall = !d->fullyContained(tr); - } -} - void QAlphaPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) { Q_D(QAlphaPaintEngine); diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h index b662c166e8..407cf96cbc 100644 --- a/src/printsupport/kernel/qpaintengine_alpha_p.h +++ b/src/printsupport/kernel/qpaintengine_alpha_p.h @@ -76,7 +76,6 @@ public: virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - virtual void drawImage(const QRectF &r, const QImage &image, const QRectF &sr); virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); -- cgit v1.2.3