Fix Qt5 build, misc warnings

GriffinRichards · Feb 5, 2025 · 0f22165 · 0f22165
1 parent be02424
commit 0f22165
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 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/core/wildmoninfo.h b/include/core/wildmoninfo.h
@@ -35,7 +35,7 @@ typedef QVector<EncounterField> EncounterFields;
 
 void setDefaultEncounterRate(QString fieldName, int rate);
 WildMonInfo getDefaultMonInfo(const EncounterField &field);
-QVector<double> getWildEncounterPercentages(const EncounterField &field);
+QList<double> getWildEncounterPercentages(const EncounterField &field);
 void combineEncounters(WildMonInfo &to, WildMonInfo from);
 
 #endif // GUARD_WILDMONINFO_H
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/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/core/wildmoninfo.cpp b/src/core/wildmoninfo.cpp
@@ -28,8 +28,8 @@ WildMonInfo getDefaultMonInfo(const EncounterField &field) {
     return newInfo;
 }
 
-QVector<double> getWildEncounterPercentages(const EncounterField &field) {
-    QVector<double> percentages(field.encounterRates.size(), 0);
+QList<double> getWildEncounterPercentages(const EncounterField &field) {
+    QList<double> percentages(field.encounterRates.size(), 0);
 
     if (!field.groups.empty()) {
         // This encounter field is broken up into groups (e.g. for fishing rod types).