Fix Qt5 build, misc warnings

GriffinRichards · Feb 6, 2025 · 98a592a · 98a592a
1 parent be02424
commit 98a592a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/include/core/tileset.h b/include/core/tileset.h
@@ -80,7 +80,7 @@ class Tileset
     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:

diff --git a/include/lib/fex/array_value.h b/include/lib/fex/array_value.h
@@ -96,6 +96,7 @@ namespace fex
             case Type::kValuePair:
                 return pair_.first + " = " + pair_.second->ToString() + "\n";
             }
+            return "";
         }
 
         static ArrayValue Empty()

diff --git a/include/ui/encountertablemodel.h b/include/ui/encountertablemodel.h
@@ -30,15 +30,15 @@ class EncounterTableModel : public QAbstractTableModel {
 
     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;
     int m_numCols = 0;
     WildMonInfo m_monInfo;
     EncounterField m_encounterField;
     QMap<int,QString> m_groupNames;
-    QList<double> m_slotPercentages;
+    QVector<double> m_slotPercentages;
 
 signals:
     void edited();

diff --git a/include/ui/mapheaderform.h b/include/ui/mapheaderform.h
@@ -9,10 +9,9 @@
 
 #include <QWidget>
 #include <QPointer>
+#include "project.h"
 #include "mapheader.h"
 
-class Project;
-
 namespace Ui {
 class MapHeaderForm;
 }

diff --git a/src/core/tileset.cpp b/src/core/tileset.cpp
@@ -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();
     }

diff --git a/src/ui/wildmonchart.cpp b/src/ui/wildmonchart.cpp
@@ -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);