Fix Qt5 build / warnings

include/mainwindow.h

@@ -2,15 +2,6 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QString>
-#include <QModelIndex>
-#include <QMainWindow>
-#include <QStandardItemModel>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsItemGroup>
-#include <QGraphicsSceneMouseEvent>
-#include <QCloseEvent>
-#include <QAbstractItemModel>
 #include "project.h"
 #include "orderedjson.h"
 #include "config.h"
@@ -36,6 +27,18 @@
 #include "resizelayoutpopup.h"
 #include "unlockableicon.h"
 
+#include <QAbstractItemModel>
+#include <QCloseEvent>
+#include <QGraphicsItemGroup>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsSceneMouseEvent>
+#include <QModelIndex>
+#include <QMainWindow>
+#include <QStandardItemModel>
+#include <QStack>
+#include <QString>
+#include <QUndoView>
+
 #if __has_include(<QJSValue>)
 #include <QJSValue>
 #endif

include/scripting.h

@@ -152,7 +152,7 @@ public:
     static void cb_MainTabChanged(int, int) {};
     static void cb_MapViewTabChanged(int, int) {};
     static void cb_BorderVisibilityToggled(bool) {};
-    static QImage cb_EventSpriteLoading(const QString &, const QString &) {};
+    static QImage cb_EventSpriteLoading(const QString &, const QString &) {return QImage();}
 };
 
 #endif // QT_QML_LIB

src/core/maplayout.cpp

@@ -8,6 +8,7 @@
 
 #include <QDir>
 #include <QRegularExpression>
+#include <QtMath>
 
 QList<int> Layout::s_globalMetatileLayerOrder;
 QList<float> Layout::s_globalMetatileLayerOpacity;

src/editor.cpp

@@ -14,11 +14,15 @@
 #include "validator.h"
 #include "message.h"
 #include "eventframes.h"
+
 #include <QCheckBox>
-#include <QPainter>
-#include <QMouseEvent>
+#include <QDesktopServices>
 #include <QDir>
+#include <QMouseEvent>
+#include <QPainter>
 #include <QProcess>
+#include <QTimer>
+
 #include <math.h>
 
 static bool selectNewEvents = false;

src/mainwindow.cpp

@@ -32,23 +32,28 @@
 #include "version.h"
 
 #include <QClipboard>
-#include <QDirIterator>
-#include <QStandardItemModel>
-#include <QSpinBox>
-#include <QTextEdit>
-#include <QSpacerItem>
-#include <QFont>
-#include <QScrollBar>
-#include <QPushButton>
-#include <QDialogButtonBox>
-#include <QScroller>
-#include <math.h>
-#include <QSysInfo>
 #include <QDesktopServices>
-#include <QTransform>
-#include <QSignalBlocker>
-#include <QSet>
+#include <QDialogButtonBox>
+#include <QDirIterator>
+#include <QFont>
+#include <QJsonDocument>
 #include <QLoggingCategory>
+#include <QPushButton>
+#include <QRandomGenerator>
+#include <QScreen>
+#include <QScrollBar>
+#include <QScroller>
+#include <QSet>
+#include <QSignalBlocker>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QSysInfo>
+#include <QStandardItemModel>
+#include <QTextEdit>
+#include <QTransform>
+#include <QWindow>
+
+#include <math.h>
 
 // We only publish release binaries for Windows and macOS.
 // This is relevant for the update promoter, which alerts users of a new release.

src/project.cpp

@@ -26,6 +26,7 @@
 #include <QRegularExpression>
 #include <QStandardItem>
 #include <QTextStream>
+#include <QtMath>
 
 #include <algorithm>
 

src/scriptapi/scripting.cpp

@@ -183,7 +183,11 @@ QAction* Scripting::registerAction(const QString &functionName, const QString &a
 
     auto menu = instance->mainWindow->ui->menuTools;
     if (instance->actionScripts.isEmpty()) {
-        instance->actionScripts.append({.action = menu->addSection("Custom Actions")});
+        instance->actionScripts.append({
+            .script = nullptr,
+            .action = menu->addSection("Custom Actions"),
+            .functionName = "",
+        });
     }
 
     const int actionIndex = instance->actionScripts.size();

src/ui/eventframes.cpp

@@ -3,6 +3,9 @@
 #include "editcommands.h"
 #include "eventpixmapitem.h"
 
+#include <QCompleter>
+#include <QFileIconProvider>
+
 #include <limits>
 using std::numeric_limits;
 

src/ui/mapview.cpp

@@ -46,22 +46,22 @@ void MapView::drawForeground(QPainter *painter, const QRectF&) {
         editor->cursorMapTileRect->paint(painter, &option, this);
 }
 
-void MapView::renderOverlay(QPainter *painter) {
 #ifdef QT_QML_LIB
+void MapView::renderOverlay(QPainter *painter) {
     for (auto outerIt = this->overlayMap.constBegin(); outerIt != this->overlayMap.constEnd(); outerIt++)
     for (auto innerIt = outerIt.value().constBegin(); innerIt != outerIt.value().constEnd(); innerIt++) {
         innerIt.value()->renderItems(painter);
     }
-#endif
 }
-
 void MapView::clearOverlay() {
-#ifdef QT_QML_LIB
     for (auto outerIt = this->overlayMap.constBegin(); outerIt != this->overlayMap.constEnd(); outerIt++)
     for (auto innerIt = outerIt.value().constBegin(); innerIt != outerIt.value().constEnd(); innerIt++) {
         delete innerIt.value();
     }
     this->overlayMap.clear();
     this->hashToPriority.clear();
-#endif
 }
+#else
+void MapView::renderOverlay(QPainter*) {}
+void MapView::clearOverlay() {}
+#endif

src/ui/shortcutseditor.cpp

@@ -201,7 +201,7 @@ QList<MultiKeyEdit *> ShortcutsEditor::siblings(MultiKeyEdit *multiKeyEdit) cons
 }
 
 void ShortcutsEditor::promptUserOnDuplicateFound(MultiKeyEdit *sender, MultiKeyEdit *sibling) {
-    const auto duplicateKeySequence = sender->keySequences().last();
+    const auto duplicateKeySequence = sender->keySequences().constLast();
     const auto siblingLabel = this->labels_objects.key(multiKeyEdits_objects.value(sibling));
     if (siblingLabel.isEmpty())
         return;

src/ui/tileseteditor.cpp

@@ -383,11 +383,9 @@ void TilesetEditor::applyUserShortcuts() {
 
 void TilesetEditor::onWindowActivated() {
     // User may have made layout edits since window was last focused, so update counts
-    if (this->metatileSelector) {
-        if (this->metatileSelector->selectorShowUnused || this->metatileSelector->selectorShowCounts) {
-            countMetatileUsage();
-            this->metatileSelector->draw();
-        }
+    if (this->metatileSelector->selectorShowUnused || this->metatileSelector->selectorShowCounts) {
+        countMetatileUsage();
+        this->metatileSelector->draw();
     }
 }
 
@@ -404,18 +402,14 @@ void TilesetEditor::refresh() {
     this->metatileSelector->setTilesets(this->primaryTileset, this->secondaryTileset);
     this->metatileSelector->select(this->getSelectedMetatileId());
 
-    if (metatileSelector) {
-        if (metatileSelector->selectorShowUnused || metatileSelector->selectorShowCounts) {
-            countMetatileUsage();
-            this->metatileSelector->draw();
-        }
+    if (this->metatileSelector->selectorShowUnused || this->metatileSelector->selectorShowCounts) {
+        countMetatileUsage();
+        this->metatileSelector->draw();
     }
 
-    if (tileSelector) {
-        if (tileSelector->showUnused) {
-            countTileUsage();
-            this->tileSelector->draw();
-        }
+    if (this->tileSelector->showUnused) {
+        countTileUsage();
+        this->tileSelector->draw();
     }
 
     this->redrawTileSelector();

src/ui/tileseteditortileselector.cpp

@@ -1,7 +1,9 @@
 #include "tileseteditortileselector.h"
 #include "imageproviders.h"
 #include "project.h"
+
 #include <QPainter>
+#include <QtMath>
 #include <QVector>
 
 QSize TilesetEditorTileSelector::getSelectionDimensions() const {

src/ui/uintspinbox.cpp

@@ -58,10 +58,12 @@ void UIntSpinBox::setRange(uint32_t min, uint32_t max) {
     m_minimum = min;
     m_maximum = max;
 
+    // Clamping to % is a little cleaner than std::clamp when dealing with masks,
+    // which is the main use case for uintspinbox.
     if (m_value < min)
-        m_value %= min;
+        m_value %= min; // min can't be 0 here
     else if (m_value > max)
-        m_value %= max;
+        m_value = max ? (m_value % max) : 0;
     this->updateEdit();
 }