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

Silence -Woverloaded-virtual warnings in QBlitterPaintEngine 

QPaintEngineEx declares several virtual clip() overloads, but clip()
with no argument does not reimplement any of these. Rename it to
clipData() (to make the name of the return value more closely).

../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/painting/qpaintengine_blitter_p.h:104:29:
warning: 'QBlitterPaintEngine::clip' hides overloaded virtual function
[-Woverloaded-virtual]
    inline const QClipData *clip(){return raster()->d_func()->clip();}
                            ^
../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/painting/qpaintengineex_p.h:157:18:
note: hidden overloaded virtual function 'QPaintEngineEx::clip' declared
here
    virtual void clip(const QPainterPath &path, Qt::ClipOperation op);
                 ^

Change-Id: Ifd7c494e2c999d743216cfb4c27a9c3ccf66f2a9
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
bb10
Bradley T. Hughes 2011-12-12 14:48:21 +01:00 committed by Qt by Nokia
parent f74ff46c7a
commit c560836263
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/painting/qpaintengine_blitter.cpp
View File

@ -222,7 +222,7 @@ public:
if (hasXForm) {
targetRect = q->state()->matrix.mapRect(rect);
}
const QClipData *clipData = q->clip();
const QClipData *clipData = q->clipData();;
if (clipData) {
if (clipData->hasRectClip) {
unlock();
@ -269,7 +269,7 @@ public:
void updateClip() {
Q_Q(QBlitterPaintEngine);
const QClipData *clip = q->clip();
const QClipData *clip = q->clipData();
bool complex = clip && !(clip->hasRectClip || clip->hasRegionClip);
capabillities->updateState(STATE_CLIP_COMPLEX, complex);
}
@ -388,7 +388,7 @@ void QBlitterPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
blitWidth = transformedRect.right() -x;
if (y + blitHeight > transformedRect.bottom())
blitHeight = transformedRect.bottom() - y;
const QClipData *clipData = clip();
const QClipData *clipData = this->clipData();
if (clipData->hasRectClip) {
QRect targetRect = QRect(x,y,blitWidth,blitHeight).intersected(clipData->clipRect);
if (targetRect.isValid()) {
@ -573,7 +573,7 @@ void QBlitterPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const Q
if (d->hasXForm) {
targetRect = state()->matrix.mapRect(r);
}
const QClipData *clipData = clip();
const QClipData *clipData = this->clipData();
if (clipData) {
if (clipData->hasRectClip) {
d->clipAndDrawPixmap(clipData->clipRect,targetRect,pm,sr);

2
src/gui/painting/qpaintengine_blitter_p.h
View File

@ -101,7 +101,7 @@ public:
inline QPainterState *state() { return raster()->state(); }
inline const QPainterState *state() const { const QPainterState *state = raster()->state(); return state;}
inline const QClipData *clip(){return raster()->d_func()->clip();}
inline const QClipData *clipData(){return raster()->d_func()->clip();}
private:
QRasterPaintEngine *raster() const;