whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence -Woverloaded-virtual warnings in QRasterPaintEngine 

The QRasterPaintEngine::updateState() is not a reimplementation of
QPaintEngineEx::updateState(const QPaintEngineState &state). Rename the
updateState() function to updateRasterState(), and ensureState() to
ensureRasterState(). These names were chosen to match the class name
QRasterPaintEngineState on which these functions operate.

../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/painting/qpaintengine_raster_p.h:271:10:
warning: 'QRasterPaintEngine::updateState' hides overloaded virtual
function [-Woverloaded-virtual]
    void updateState();
         ^
../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/painting/qpaintengineex_p.h:202:18:
note: hidden overloaded virtual function 'QPaintEngineEx::updateState'
declared here
    virtual void updateState(const QPaintEngineState &state);
                 ^

Change-Id: Ie9ff0230019b383d53757029c6b2194dfc6a2664
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
bb10
Bradley T. Hughes 2011-12-12 15:00:30 +01:00 committed by Qt by Nokia
parent c560836263
commit 7ac4bf8a40
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/painting/qpaintengine_raster.cpp
View File

@ -733,7 +733,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen)
s->stroker = 0;
}
ensureState(); // needed because of tx_noshear...
ensureRasterState(); // needed because of tx_noshear...
s->flags.fast_pen = pen_style > Qt::NoPen
&& s->penData.blend
&& ((pen.isCosmetic() && penWidth <= 1)
@ -801,7 +801,7 @@ void QRasterPaintEngine::updateOutlineMapper()
d->outlineMapper->setMatrix(state()->matrix);
}
void QRasterPaintEngine::updateState()
void QRasterPaintEngine::updateRasterState()
{
QRasterPaintEngineState *s = state();
@ -1434,7 +1434,7 @@ void QRasterPaintEngine::drawRects(const QRect *rects, int rectCount)
qDebug(" - QRasterPaintEngine::drawRect(), rectCount=%d", rectCount);
#endif
Q_D(QRasterPaintEngine);
ensureState();
ensureRasterState();
QRasterPaintEngineState *s = state();
// Fill
@ -1489,7 +1489,7 @@ void QRasterPaintEngine::drawRects(const QRectF *rects, int rectCount)
#endif
#ifdef QT_FAST_SPANS
Q_D(QRasterPaintEngine);
ensureState();
ensureRasterState();
QRasterPaintEngineState *s = state();
@ -1645,7 +1645,7 @@ void QRasterPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
fillRect_normalized(toNormalizedFillRect(QRectF(tl, br)), &s->brushData, d);
return;
}
ensureState();
ensureRasterState();
if (s->flags.tx_noshear) {
d->initializeRasterizer(&s->brushData);
// ### Is normalizing really necessary here?
@ -1702,7 +1702,7 @@ void QRasterPaintEngine::fillRect(const QRectF &r, QSpanData *data)
return;
}
}
ensureState();
ensureRasterState();
if (s->flags.tx_noshear) {
d->initializeRasterizer(data);
QRectF nr = r.normalized();
@ -2330,7 +2330,7 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
}
#ifdef QT_FAST_SPANS
ensureState();
ensureRasterState();
if (s->flags.tx_noshear || s->matrix.type() == QTransform::TxScale) {
d->initializeRasterizer(&d->image_filler_xform);
d->rasterizer->setAntialiased(s->flags.antialiased);
@ -2425,7 +2425,7 @@ void QRasterPaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap,
d->image_filler_xform.setupMatrix(copy, s->flags.bilinear);
#ifdef QT_FAST_SPANS
ensureState();
ensureRasterState();
if (s->flags.tx_noshear || s->matrix.type() == QTransform::TxScale) {
d->initializeRasterizer(&d->image_filler_xform);
d->rasterizer->setAntialiased(s->flags.antialiased);
@ -2884,7 +2884,7 @@ QRasterPaintEnginePrivate::getPenFunc(const QRectF &rect,
void QRasterPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
{
ensurePen();
ensureState();
ensureRasterState();
QFontEngine *fontEngine = textItem->fontEngine();
if (shouldDrawCachedGlyphs(fontEngine->fontDef.pixelSize, state()->matrix)) {
@ -2911,7 +2911,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
#endif
ensurePen();
ensureState();
ensureRasterState();
if (!supportsTransformations(ti.fontEngine)) {

6
src/gui/painting/qpaintengine_raster_p.h
View File

@ -268,10 +268,10 @@ private:
void updateOutlineMapper();
inline void ensureOutlineMapper();
void updateState();
inline void ensureState() {
void updateRasterState();
inline void ensureRasterState() {
if (state()->dirty)
updateState();
updateRasterState();
}
};