From 1fff5b5e32dfa2149a069e109cec9c26f06bac3a Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Thu, 8 Feb 2024 18:24:19 +0100
Subject: [PATCH] Fix compilation problems and code issues

---
 src/citra_qt/main.cpp      | 1 +
 src/citra_qt/main.h        | 4 +++-
 src/citra_qt/util/util.cpp | 4 ++--
 src/citra_qt/util/util.h   | 4 ++--
 src/common/file_util.h     | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index c23360711..84929df1a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -79,6 +79,7 @@
 #include "common/memory_detect.h"
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
+#include "common/string_util.h"
 #if CITRA_ARCH(x86_64)
 #include "common/x64/cpu_detect.h"
 #endif
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 55ee98381..cbd724cb2 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <array>
-#include <filesystem>
 #include <memory>
 #include <vector>
 #include <QMainWindow>
@@ -22,6 +21,9 @@
 #include <QDBusObjectPath>
 #endif
 
+// Needs to be included at the end due to https://bugreports.qt.io/browse/QTBUG-73263
+#include <filesystem>
+
 class AboutDialog;
 class Config;
 class ClickableLabel;
diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp
index f2412b941..abf209aed 100644
--- a/src/citra_qt/util/util.cpp
+++ b/src/citra_qt/util/util.cpp
@@ -43,7 +43,7 @@ QPixmap CreateCirclePixmapFromColor(const QColor& color) {
     return circle_pixmap;
 }
 
-QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data) {
+QPixmap GetQPixmapFromSMDH(const std::vector<u8>& smdh_data) {
     Loader::SMDH smdh;
     std::memcpy(&smdh, smdh_data.data(), sizeof(Loader::SMDH));
 
@@ -158,4 +158,4 @@ bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image)
 #else
     return false;
 #endif
-}
\ No newline at end of file
+}
diff --git a/src/citra_qt/util/util.h b/src/citra_qt/util/util.h
index c50640217..0e725a346 100644
--- a/src/citra_qt/util/util.h
+++ b/src/citra_qt/util/util.h
@@ -26,7 +26,7 @@ QPixmap CreateCirclePixmapFromColor(const QColor& color);
  * @param smdh_data SMDH data
  * @return QPixmap game icon
  */
-QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data);
+QPixmap GetQPixmapFromSMDH(const std::vector<u8>& smdh_data);
 
 /**
  * Saves a windows icon to a file
@@ -34,4 +34,4 @@ QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data);
  * @param image The image to save
  * @return bool If the operation succeeded
  */
-[[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);
\ No newline at end of file
+[[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 418a7cedd..27e751bb6 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -10,6 +10,7 @@
 #include <ios>
 #include <limits>
 #include <optional>
+#include <span>
 #include <string>
 #include <string_view>
 #include <type_traits>