From d9be7d594e4abe755ad2d35ea1390d479c6ff2b3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 16 Dec 2024 15:21:41 -0500 Subject: [PATCH] Fix Qt5 build --- include/lib/collapsiblesection.h | 1 + src/core/advancemapparser.cpp | 6 +++--- src/ui/mapheaderform.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/lib/collapsiblesection.h b/include/lib/collapsiblesection.h index 73169303..b74835f4 100644 --- a/include/lib/collapsiblesection.h +++ b/include/lib/collapsiblesection.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/advancemapparser.cpp b/src/core/advancemapparser.cpp index 6af7476e..6a8428ec 100644 --- a/src/core/advancemapparser.cpp +++ b/src/core/advancemapparser.cpp @@ -206,9 +206,9 @@ QList AdvanceMapParser::parsePalette(const QString &filepath, bool *error) QList palette; int i = 0; while (i < in.length()) { - unsigned char red = qMin(qMax(static_cast(in.at(i + 0)), 0u), 255u); - unsigned char green = qMin(qMax(static_cast(in.at(i + 1)), 0u), 255u); - unsigned char blue = qMin(qMax(static_cast(in.at(i + 2)), 0u), 255u); + unsigned char red = static_cast(in.at(i + 0)); + unsigned char green = static_cast(in.at(i + 1)); + unsigned char blue = static_cast(in.at(i + 2)); palette.append(qRgb(red, green, blue)); i += 4; } diff --git a/src/ui/mapheaderform.cpp b/src/ui/mapheaderform.cpp index 7aa5a628..4bea0bef 100644 --- a/src/ui/mapheaderform.cpp +++ b/src/ui/mapheaderform.cpp @@ -23,7 +23,7 @@ MapHeaderForm::MapHeaderForm(QWidget *parent) connect(ui->checkBox_AllowRunning, &QCheckBox::stateChanged, this, &MapHeaderForm::onAllowRunningChanged); connect(ui->checkBox_AllowBiking, &QCheckBox::stateChanged, this, &MapHeaderForm::onAllowBikingChanged); connect(ui->checkBox_AllowEscaping, &QCheckBox::stateChanged, this, &MapHeaderForm::onAllowEscapingChanged); - connect(ui->spinBox_FloorNumber, &QSpinBox::valueChanged, this, &MapHeaderForm::onFloorNumberChanged); + connect(ui->spinBox_FloorNumber, QOverload::of(&QSpinBox::valueChanged), this, &MapHeaderForm::onFloorNumberChanged); } MapHeaderForm::~MapHeaderForm()