From 48827d29d521d183b5788c09410004df1f1f15f0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 30 Oct 2022 21:23:10 +0100 Subject: [PATCH] Avoid warning about shadowing variable --- qtforkawesome/renderer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qtforkawesome/renderer.cpp b/qtforkawesome/renderer.cpp index 34743f9..a8a83ab 100644 --- a/qtforkawesome/renderer.cpp +++ b/qtforkawesome/renderer.cpp @@ -128,8 +128,8 @@ static void renderInternally(QChar character, QPainter *painter, QFont &&font, c void QtForkAwesome::Renderer::render(QChar character, QPainter *painter, const QRect &rect, const QColor &color) const { if (auto override = m_d->overrides.find(character); override != m_d->overrides.end()) { - if (const auto &icon = override->locateIcon(); !icon.isNull()) { - painter->drawPixmap(rect, icon.pixmap(rect.size(), QIcon::Normal, QIcon::On)); + if (const auto &overrideIcon = override->locateIcon(); !overrideIcon.isNull()) { + painter->drawPixmap(rect, overrideIcon.pixmap(rect.size(), QIcon::Normal, QIcon::On)); return; } } @@ -144,8 +144,8 @@ void QtForkAwesome::Renderer::render(QChar character, QPainter *painter, const Q QPixmap QtForkAwesome::Renderer::pixmap(QChar icon, const QSize &size, const QColor &color) const { if (auto override = m_d->overrides.find(icon); override != m_d->overrides.end()) { - if (const auto &icon = override->locateIcon(); !icon.isNull()) { - return icon.pixmap(size, QIcon::Normal, QIcon::On); + if (const auto &overrideIcon = override->locateIcon(); !overrideIcon.isNull()) { + return overrideIcon.pixmap(size, QIcon::Normal, QIcon::On); } }