Fix Qt5 build, misc warnings

This commit is contained in:
GriffinR
2025-02-05 16:17:06 -05:00
parent be02424f1c
commit 7173503f59
7 changed files with 10 additions and 8 deletions

View File

@@ -80,7 +80,7 @@ public:
Metatile* metatileAt(unsigned int i) const { return m_metatiles.at(i); }
void clearMetatiles();
void resizeMetatiles(unsigned int newNumMetatiles);
void resizeMetatiles(int newNumMetatiles);
int numMetatiles() const { return m_metatiles.length(); }
private:

View File

@@ -96,6 +96,7 @@ namespace fex
case Type::kValuePair:
return pair_.first + " = " + pair_.second->ToString() + "\n";
}
return "";
}
static ArrayValue Empty()

View File

@@ -30,7 +30,7 @@ public:
WildMonInfo encounterData() const { return m_monInfo; }
EncounterField encounterField() const { return m_encounterField; }
QList<double> percentages() const { return m_slotPercentages; }
QVector<double> percentages() const { return m_slotPercentages; }
private:
int m_numRows = 0;
@@ -38,7 +38,7 @@ private:
WildMonInfo m_monInfo;
EncounterField m_encounterField;
QMap<int,QString> m_groupNames;
QList<double> m_slotPercentages;
QVector<double> m_slotPercentages;
signals:
void edited();

View File

@@ -9,9 +9,9 @@
#include <QWidget>
#include <QPointer>
#include "mapheader.h"
class Project;
#include "mapheader.h"
#include "project.h"
namespace Ui {
class MapHeaderForm;

View File

@@ -5,7 +5,7 @@
#include <QAbstractButton>
#include <QPointer>
class Project;
#include "project.h"
namespace Ui {
class NewLocationDialog;

View File

@@ -83,7 +83,8 @@ void Tileset::addMetatile(Metatile* metatile) {
m_metatiles.append(metatile);
}
void Tileset::resizeMetatiles(unsigned int newNumMetatiles) {
void Tileset::resizeMetatiles(int newNumMetatiles) {
if (newNumMetatiles < 0) newNumMetatiles = 0;
while (m_metatiles.length() > newNumMetatiles) {
delete m_metatiles.takeLast();
}

View File

@@ -109,7 +109,7 @@ void WildMonChart::readTable() {
}
// Read data from the table, combining data for duplicate entries
const QList<double> tableFrequencies = this->table->percentages();
const QVector<double> tableFrequencies = this->table->percentages();
const QVector<WildPokemon> tablePokemon = this->table->encounterData().wildPokemon;
const int numRows = qMin(tableFrequencies.length(), tablePokemon.length());
const QString speciesPrefix = projectConfig.getIdentifier(ProjectIdentifier::define_species_prefix);