From 6d53b9cec4a37a0232f945bb62175ae54d18f605 Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Fri, 28 Feb 2025 01:59:27 +0100 Subject: [PATCH] Fix/avoid some Clazy warnings --- src/framework/ui/api/themeapi.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/framework/ui/api/themeapi.cpp b/src/framework/ui/api/themeapi.cpp index 380c372a4ff2c..3a33485aeb70a 100644 --- a/src/framework/ui/api/themeapi.cpp +++ b/src/framework/ui/api/themeapi.cpp @@ -381,7 +381,7 @@ void ThemeApi::initMusicalFont() void ThemeApi::setupUiFonts() { - QMap fonts { + const std::vector > fonts { { &m_bodyFont, { QFont::Normal, FontSizeType::BODY } }, { &m_bodyBoldFont, { QFont::DemiBold, FontSizeType::BODY } }, { &m_largeBodyFont, { QFont::Normal, FontSizeType::BODY_LARGE } }, @@ -393,14 +393,13 @@ void ThemeApi::setupUiFonts() { &m_titleBoldFont, { QFont::DemiBold, FontSizeType::TITLE } }, }; - for (QFont* font : fonts.keys()) { + for (const auto& [font, fontConfig] : fonts) { std::string family = configuration()->fontFamily(); - int size = configuration()->fontSize(fonts[font].sizeType); - QFont::Weight weight = fonts[font].weight; + int size = configuration()->fontSize(fontConfig.sizeType); font->setPixelSize(size); font->setFamily(QString::fromStdString(family)); - font->setWeight(weight); + font->setWeight(fontConfig.weight); } m_defaultFont.setFamily(QString::fromStdString(configuration()->defaultFontFamily())); @@ -626,7 +625,7 @@ void ProxyStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOpt // GroupBox case QStyle::PE_FrameGroupBox: { - drawRoundedRect(painter, option->rect, DEFAULT_RADIUS, QBrush("#03000000"), + drawRoundedRect(painter, option->rect, DEFAULT_RADIUS, QBrush(0x03000000), QPen(m_theme->strokeColor(), fmax(m_theme->borderWidth(), 1.0))); } break;