Fix Qt5 build

huderlem · Dec 16, 2024 · d9be7d5 · d9be7d5
1 parent 8f16822
commit d9be7d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/include/lib/collapsiblesection.h b/include/lib/collapsiblesection.h
@@ -29,6 +29,7 @@
 #include <QGridLayout>
 #include <QParallelAnimationGroup>
 #include <QPropertyAnimation>
+#include <QSet>
 #include <QScrollArea>
 #include <QToolButton>
 #include <QWidget>

diff --git a/src/core/advancemapparser.cpp b/src/core/advancemapparser.cpp
@@ -206,9 +206,9 @@ QList<QRgb> AdvanceMapParser::parsePalette(const QString &filepath, bool *error)
     QList<QRgb> palette;
     int i = 0;
     while (i < in.length()) {
-        unsigned char red   = qMin(qMax(static_cast<unsigned char>(in.at(i + 0)), 0u), 255u);
-        unsigned char green = qMin(qMax(static_cast<unsigned char>(in.at(i + 1)), 0u), 255u);
-        unsigned char blue  = qMin(qMax(static_cast<unsigned char>(in.at(i + 2)), 0u), 255u);
+        unsigned char red   = static_cast<unsigned char>(in.at(i + 0));
+        unsigned char green = static_cast<unsigned char>(in.at(i + 1));
+        unsigned char blue  = static_cast<unsigned char>(in.at(i + 2));
         palette.append(qRgb(red, green, blue));
         i += 4;
     }

diff --git 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<int>::of(&QSpinBox::valueChanged), this, &MapHeaderForm::onFloorNumberChanged);
 }
 
 MapHeaderForm::~MapHeaderForm()