Various miscelaneous changes (#6496)

src/citra_qt/applets/mii_selector.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <unordered_map>
 #include <QDialog>
 #include "core/frontend/applets/mii_selector.h"
 

src/citra_qt/applets/swkbd.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <unordered_map>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QLineEdit>

src/citra_qt/configuration/config.cpp

@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <array>
-#include <unordered_map>
 #include <QKeySequence>
 #include <QSettings>
 #include "citra_qt/configuration/config.h"

src/citra_qt/configuration/configure_input.h

@@ -9,7 +9,6 @@
 #include <memory>
 #include <optional>
 #include <string>
-#include <unordered_map>
 #include <QKeySequence>
 #include <QWidget>
 #include "common/param_package.h"

src/citra_qt/debugger/ipc/recorder.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include <map>
 #include <memory>
-#include <unordered_map>
 #include <QDockWidget>
 #include "core/hle/kernel/ipc_debugger/recorder.h"
 

src/citra_qt/debugger/profiler.cpp

@@ -214,6 +214,7 @@ void MicroProfileDrawLine2D(u32 vertices_length, float* vertices, u32 hex_color)
     // the allocation across calls.
     static std::vector<QPointF> point_buf;
 
+    point_buf.reserve(vertices_length);
     for (u32 i = 0; i < vertices_length; ++i) {
         point_buf.emplace_back(vertices[i * 2 + 0], vertices[i * 2 + 1]);
     }

src/citra_qt/debugger/wait_tree.cpp

@@ -77,8 +77,9 @@ std::size_t WaitTreeItem::Row() const {
 }
 
 std::vector<std::unique_ptr<WaitTreeThread>> WaitTreeItem::MakeThreadItemList() {
-    u32 num_cores = Core::GetNumCores();
+    const u32 num_cores = Core::GetNumCores();
     std::vector<std::unique_ptr<WaitTreeThread>> item_list;
+    item_list.reserve(num_cores);
     for (u32 i = 0; i < num_cores; ++i) {
         const auto& threads =
             Core::System::GetInstance().Kernel().GetThreadManager(i).GetThreadList();

src/citra_qt/game_list.cpp

@@ -32,6 +32,7 @@
 #include "common/settings.h"
 #include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/archive_source_sd_savedata.h"
+#include "core/hle/service/am/am.h"
 #include "core/hle/service/fs/archive.h"
 #include "qcursor.h"
 

src/citra_qt/game_list_worker.h

@@ -5,10 +5,8 @@
 #pragma once
 
 #include <atomic>
-#include <map>
 #include <memory>
 #include <string>
-#include <unordered_map>
 #include <QList>
 #include <QObject>
 #include <QRunnable>

src/citra_qt/main.cpp

@@ -3,8 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <clocale>
-#include <filesystem>
-#include <fstream>
 #include <memory>
 #include <thread>
 #include <QDesktopWidget>
@@ -87,6 +85,7 @@
 #include "core/file_sys/archive_source_sd_savedata.h"
 #include "core/frontend/applets/default_applets.h"
 #include "core/gdbstub/gdbstub.h"
+#include "core/hle/service/am/am.h"
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/nfc/nfc.h"

src/citra_qt/main.h

@@ -13,7 +13,6 @@
 #include "citra_qt/hotkeys.h"
 #include "common/announce_multiplayer_room.h"
 #include "core/core.h"
-#include "core/hle/service/am/am.h"
 #include "core/savestate.h"
 
 #ifdef __unix__
@@ -58,6 +57,10 @@ namespace Ui {
 class MainWindow;
 }
 
+namespace Service::AM {
+enum class InstallStatus : u32;
+}
+
 class GMainWindow : public QMainWindow {
     Q_OBJECT