mirror of
https://github.com/huderlem/porymap.git
synced 2026-06-13 19:31:09 -05:00
Fix Qt5 build
This commit is contained in:
parent
8f16822f07
commit
d9be7d594e
|
|
@ -29,6 +29,7 @@
|
|||
#include <QGridLayout>
|
||||
#include <QParallelAnimationGroup>
|
||||
#include <QPropertyAnimation>
|
||||
#include <QSet>
|
||||
#include <QScrollArea>
|
||||
#include <QToolButton>
|
||||
#include <QWidget>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user