From c560836263b06d2ab958e531c51e08f96fbbaef2 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 12 Dec 2011 14:48:21 +0100 Subject: 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 --- src/gui/painting/qpaintengine_blitter.cpp | 8 ++++---- src/gui/painting/qpaintengine_blitter_p.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui') diff --git a/src/gui/painting/qpaintengine_blitter.cpp b/src/gui/painting/qpaintengine_blitter.cpp index 1ed6dea161..4f9861da44 100644 --- a/src/gui/painting/qpaintengine_blitter.cpp +++ b/src/gui/painting/qpaintengine_blitter.cpp @@ -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); diff --git a/src/gui/painting/qpaintengine_blitter_p.h b/src/gui/painting/qpaintengine_blitter_p.h index 1acc647fbe..13a059705c 100644 --- a/src/gui/painting/qpaintengine_blitter_p.h +++ b/src/gui/painting/qpaintengine_blitter_p.h @@ -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; -- cgit v1.2.3