From 5ba34eb11c15f8320b4e067191adec0957060c84 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 10 Jan 2023 15:36:43 +0100 Subject: [PATCH] method names cleaned up --- src/nodes/QskBoxRenderer.cpp | 6 +++--- src/nodes/QskRoundedRectRenderer.cpp | 6 +++--- src/nodes/QskRoundedRectRenderer.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/nodes/QskBoxRenderer.cpp b/src/nodes/QskBoxRenderer.cpp index 23670380..0f1a1e52 100644 --- a/src/nodes/QskBoxRenderer.cpp +++ b/src/nodes/QskBoxRenderer.cpp @@ -42,7 +42,7 @@ void QskBoxRenderer::renderBorder( if ( shape.isRectangle() ) QskRectRenderer::renderBorder( rect, border, geometry ); else - QskRoundedRectRenderer::renderRectellipseBorder( rect, shape, border, geometry ); + QskRoundedRectRenderer::renderBorder( rect, shape, border, geometry ); } void QskBoxRenderer::renderFill( @@ -52,7 +52,7 @@ void QskBoxRenderer::renderFill( if ( shape.isRectangle() ) QskRectRenderer::renderFill( rect, border, geometry ); else - QskRoundedRectRenderer::renderRectellipseFill( rect, shape, border, geometry ); + QskRoundedRectRenderer::renderFill( rect, shape, border, geometry ); } void QskBoxRenderer::renderBox( const QRectF& rect, @@ -69,7 +69,7 @@ void QskBoxRenderer::renderBox( const QRectF& rect, } else { - QskRoundedRectRenderer::renderRectellipse( + QskRoundedRectRenderer::renderRect( rect, shape, border, borderColors, gradientN, geometry ); } } diff --git a/src/nodes/QskRoundedRectRenderer.cpp b/src/nodes/QskRoundedRectRenderer.cpp index 6385c4b4..bba4f4ca 100644 --- a/src/nodes/QskRoundedRectRenderer.cpp +++ b/src/nodes/QskRoundedRectRenderer.cpp @@ -1157,7 +1157,7 @@ QskRoundedRectRenderer::Metrics::Metrics( const QRectF& rect, ( borderRight == borderBottom ); } -void QskRoundedRectRenderer::renderRectellipseBorder( +void QskRoundedRectRenderer::renderBorder( const QRectF& rect, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { @@ -1176,7 +1176,7 @@ void QskRoundedRectRenderer::renderRectellipseBorder( qskRenderBorderLines( metrics, Qt::Vertical, line, BorderMapNone() ); } -void QskRoundedRectRenderer::renderRectellipseFill( +void QskRoundedRectRenderer::renderFill( const QRectF& rect, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border, QSGGeometry& geometry ) { @@ -1307,7 +1307,7 @@ void QskRoundedRectRenderer::renderRectellipseFill( #endif } -void QskRoundedRectRenderer::renderRectellipse( const QRectF& rect, +void QskRoundedRectRenderer::renderRect( const QRectF& rect, const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border, const QskBoxBorderColors& borderColors, const QskGradient& gradient, QSGGeometry& geometry ) diff --git a/src/nodes/QskRoundedRectRenderer.h b/src/nodes/QskRoundedRectRenderer.h index dbfa662f..872691b1 100644 --- a/src/nodes/QskRoundedRectRenderer.h +++ b/src/nodes/QskRoundedRectRenderer.h @@ -25,9 +25,7 @@ namespace QskRoundedRectRenderer QskVertex::Quad outerQuad; QskVertex::Quad innerQuad; -#if 1 - QskVertex::Quad centerQuad; // to be removed -#endif + QskVertex::Quad centerQuad; struct Corner { @@ -45,16 +43,17 @@ namespace QskRoundedRectRenderer bool isTotallyCropped; }; - void renderRectellipseFill( const QRectF&, + void renderFill( const QRectF&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); - void renderRectellipseBorder( const QRectF&, + void renderBorder( const QRectF&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, QSGGeometry& ); - void renderRectellipse( const QRectF&, + void renderRect( const QRectF&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, const QskBoxBorderColors&, const QskGradient&, QSGGeometry& ); + // QskBoxRendererDEllipse.cpp void renderDiagonalFill( const Metrics&, const QskGradient&, int lineCount, QskVertex::ColoredLine* ); }