AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QAlphaPaintEngine::drawImage()

Browse Source 
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 <samuel.rodal@nokia.com>
This commit is contained in:
Bradley T. Hughes 2011-12-13 10:12:44 +01:00 committed by Qt by Nokia
parent 2395a3c897
commit 14d9a2b06c
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/printsupport/kernel/qpaintengine_alpha.cpp
View File

@ -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) void QAlphaPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem)
{ {
Q_D(QAlphaPaintEngine); Q_D(QAlphaPaintEngine);

1
src/printsupport/kernel/qpaintengine_alpha_p.h
View File

@ -76,7 +76,6 @@ public:
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); 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 drawTextItem(const QPointF &p, const QTextItem &textItem);
virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);