From 89ebf98dd13c365ce7ffaaece6fdd3329cf62c9f Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Mon, 21 Apr 2025 04:34:17 -0400 Subject: [PATCH] Fix build with Qt 6.9 Implicit conversions were disabled for the QChar() constructor in Qt 6.9. --- src/ui/small_widgets/MusicTreeView.cpp | 4 ++-- src/ui/small_widgets/TvShowTreeView.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui/small_widgets/MusicTreeView.cpp b/src/ui/small_widgets/MusicTreeView.cpp index a41a89a9bb..244a70ec7e 100644 --- a/src/ui/small_widgets/MusicTreeView.cpp +++ b/src/ui/small_widgets/MusicTreeView.cpp @@ -36,7 +36,7 @@ void MusicTreeView::drawBranches(QPainter* painter, QColor textColor = option.palette.color(textColorRole); const int drawSize = qRound(rect.height() * 0.85); - QString text = isExpanded(index) ? QChar(icon_angle_down) : QChar(icon_angle_right); + QString text = isExpanded(index) ? QChar(static_cast(icon_angle_down)) : QChar(static_cast(icon_angle_right)); painter->save(); painter->setPen(textColor); @@ -198,7 +198,7 @@ int MusicTreeView::drawNewIcon(QPainter* painter, int drawSize = qRound(iconRect.width() * 1.0); painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(58, 135, 173)); painter->setFont(Manager::instance()->iconFont()->font(drawSize)); - painter->drawText(iconRect, QString(QChar(icon_star)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); + painter->drawText(iconRect, QString(QChar(static_cast(icon_star))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); #endif return 20; diff --git a/src/ui/small_widgets/TvShowTreeView.cpp b/src/ui/small_widgets/TvShowTreeView.cpp index a0f6f05395..5f6a9a5c87 100644 --- a/src/ui/small_widgets/TvShowTreeView.cpp +++ b/src/ui/small_widgets/TvShowTreeView.cpp @@ -36,7 +36,7 @@ void TvShowTreeView::drawBranches(QPainter* painter, QColor textColor = option.palette.color(textColorRole); const int drawSize = qRound(rect.height() * 0.85); - QString text = isExpanded(index) ? QChar(icon_angle_down) : QChar(icon_angle_right); + QString text = isExpanded(index) ? QChar(static_cast(icon_angle_down)): QChar(static_cast(icon_angle_right)); painter->save(); painter->setPen(textColor); @@ -195,7 +195,7 @@ void TvShowTreeView::drawEpisodeRow(QPainter* painter, painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(248, 148, 6)); painter->setFont(Manager::instance()->iconFont()->font(drawSize)); painter->drawText( - iconRect, QString(QChar(icon_refresh_cloud)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); + iconRect, QString(QChar(static_cast(icon_refresh_cloud))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); #endif itemIndent += 20; } @@ -212,7 +212,7 @@ void TvShowTreeView::drawEpisodeRow(QPainter* painter, int drawSize = qRound(iconRect.width() * 1.0); painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(241, 96, 106)); painter->setFont(Manager::instance()->iconFont()->font(drawSize)); - painter->drawText(iconRect, QString(QChar(icon_attention)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); + painter->drawText(iconRect, QString(QChar(static_cast(icon_attention))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); #endif itemIndent += 20; } @@ -263,7 +263,7 @@ int TvShowTreeView::drawNewIcon(QPainter* painter, int drawSize = qRound(iconRect.width() * 1.0); painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(58, 135, 173)); painter->setFont(Manager::instance()->iconFont()->font(drawSize)); - painter->drawText(iconRect, QString(QChar(icon_star)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); + painter->drawText(iconRect, QString(QChar(static_cast(icon_star))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter)); #endif return 20;