From f10c3608c52d2e4cfdba43569e006044979e9114 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Wed, 31 Dec 2025 05:24:47 -0800 Subject: [PATCH] Fix build failure on macOS 15 --- .../general/display/charts/bars/segmented_bar_widget.cpp | 2 +- .../widgets/general/display/charts/bars/segmented_bar_widget.h | 2 +- libcockatrice_utility/libcockatrice/utility/qt_utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp index d9bf85196..e027aabdd 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp @@ -14,7 +14,7 @@ SegmentedBarWidget::SegmentedBarWidget(QString label, QVector segments, setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); } -QSize SegmentedBarWidget::sizeHint() +QSize SegmentedBarWidget::sizeHint() const { return QSize(50, 150); } diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h index 884f0e964..4df54e42e 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h @@ -23,7 +23,7 @@ public: float total = 1.0; explicit SegmentedBarWidget(QString label, QVector segments, int total, QWidget *parent = nullptr); - QSize sizeHint(); + QSize sizeHint() const override; protected: void paintEvent(QPaintEvent *event) override; diff --git a/libcockatrice_utility/libcockatrice/utility/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h index 794c7e3ce..606947143 100644 --- a/libcockatrice_utility/libcockatrice/utility/qt_utils.h +++ b/libcockatrice_utility/libcockatrice/utility/qt_utils.h @@ -16,7 +16,7 @@ template T *findParentOfType(const QObject *obj) return nullptr; } -static void clearLayoutRec(QLayout *l) +static inline void clearLayoutRec(QLayout *l) { if (!l) return;