From ff0599686d9bc564e0913a444d4ef83060969fe3 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 16 Nov 2022 14:33:10 +0100 Subject: [PATCH] unused parameters removed --- src/nodes/QskBoxRenderer.h | 13 ++++++------- src/nodes/QskBoxRendererEllipse.cpp | 3 +-- src/nodes/QskBoxRendererRect.cpp | 15 +++------------ 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/nodes/QskBoxRenderer.h b/src/nodes/QskBoxRenderer.h index 194f18a2..b597fbde 100644 --- a/src/nodes/QskBoxRenderer.h +++ b/src/nodes/QskBoxRenderer.h @@ -108,13 +108,12 @@ class QSK_EXPORT QskBoxRenderer private: void renderRectFill( const QRectF&, - const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); + const QskBoxBorderMetrics&, QSGGeometry& ); void renderRectBorder( const QRectF&, - const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); + const QskBoxBorderMetrics&, QSGGeometry& ); - void renderRect( const QRectF&, - const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, + void renderRect( const QRectF&, const QskBoxBorderMetrics&, const QskBoxBorderColors&, const QskGradient&, QSGGeometry& ); void renderRectellipseFill( const QRectF&, @@ -138,7 +137,7 @@ inline void QskBoxRenderer::renderBorder( const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { if ( shape.isRectangle() ) - renderRectBorder( rect, shape, border, geometry ); + renderRectBorder( rect, border, geometry ); else renderRectellipseBorder( rect, shape, border, geometry ); } @@ -148,7 +147,7 @@ inline void QskBoxRenderer::renderFill( const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { if ( shape.isRectangle() ) - renderRectFill( rect, shape, border, geometry ); + renderRectFill( rect, border, geometry ); else renderRectellipseFill( rect, shape, border, geometry ); } @@ -159,7 +158,7 @@ inline void QskBoxRenderer::renderBox( const QRectF& rect, QSGGeometry& geometry ) { if ( shape.isRectangle() ) - renderRect( rect, shape, border, borderColors, gradient, geometry ); + renderRect( rect, border, borderColors, gradient, geometry ); else renderRectellipse( rect, shape, border, borderColors, gradient, geometry ); } diff --git a/src/nodes/QskBoxRendererEllipse.cpp b/src/nodes/QskBoxRendererEllipse.cpp index 6c641326..aadef4a4 100644 --- a/src/nodes/QskBoxRendererEllipse.cpp +++ b/src/nodes/QskBoxRendererEllipse.cpp @@ -1312,8 +1312,7 @@ void QskBoxRenderer::renderRectellipseFill( const QRectF r( metrics.innerQuad.left, metrics.innerQuad.top, metrics.innerQuad.width, metrics.innerQuad.height ); - renderRectFill( r, QskBoxShapeMetrics(), - QskBoxBorderMetrics(), geometry ); + renderRectFill( r, QskBoxBorderMetrics(), geometry ); return; } diff --git a/src/nodes/QskBoxRendererRect.cpp b/src/nodes/QskBoxRendererRect.cpp index 98c1384c..d43238c7 100644 --- a/src/nodes/QskBoxRendererRect.cpp +++ b/src/nodes/QskBoxRendererRect.cpp @@ -516,12 +516,9 @@ static inline void qskCreateBorder( } } -void QskBoxRenderer::renderRectBorder( - const QRectF& rect, const QskBoxShapeMetrics& shape, +void QskBoxRenderer::renderRectBorder( const QRectF& rect, const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { - Q_UNUSED( shape ) - const Quad out = rect; const Quad in = qskValidOrEmptyInnerRect( rect, border.widths() ); @@ -535,12 +532,9 @@ void QskBoxRenderer::renderRectBorder( qskCreateBorderMonochrome( out, in, Color(), line ); } -void QskBoxRenderer::renderRectFill( - const QRectF& rect, const QskBoxShapeMetrics& shape, +void QskBoxRenderer::renderRectFill( const QRectF& rect, const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { - Q_UNUSED( shape ) - const Quad in = qskValidOrEmptyInnerRect( rect, border.widths() ); if ( in.isEmpty() ) @@ -553,13 +547,10 @@ void QskBoxRenderer::renderRectFill( qskCreateFillRandom( Qt::Vertical, in, ColorMapSolid(), line ); } -void QskBoxRenderer::renderRect( - const QRectF& rect, const QskBoxShapeMetrics& shape, +void QskBoxRenderer::renderRect( const QRectF& rect, const QskBoxBorderMetrics& border, const QskBoxBorderColors& borderColors, const QskGradient& gradient, QSGGeometry& geometry ) { - Q_UNUSED( shape ) - const Quad out = rect; const Quad in = qskValidOrEmptyInnerRect( rect, border.widths() );