From 01b6380242e4deeee832ba2115b4c83d20fe8cc3 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:38:17 +0200
Subject: [PATCH] Remove global definition of badCheatHandle

---
 include/cheats.hpp               |  3 +--
 include/panda_qt/main_window.hpp |  3 +--
 src/panda_qt/cheats_window.cpp   | 33 ++++++++++++++++----------------
 src/panda_qt/main_window.cpp     |  3 +--
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index ca8abe1d..b90c080b 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -9,8 +9,6 @@
 // Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time
 class Memory;
 
-constexpr u32 badCheatHandle = 0xFFFFFFFF;
-
 class Cheats {
   public:
 	enum class CheatType {
@@ -35,6 +33,7 @@ class Cheats {
 
 	void clear();
 	bool haveCheats() const { return cheatsLoaded; }
+	static constexpr u32 badCheatHandle = 0xFFFFFFFF;
 
   private:
 	ActionReplay ar;  // An ActionReplay cheat machine for executing CTRPF codes
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 9be065cf..c03cffbb 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -18,8 +18,7 @@
 #include "panda_qt/text_editor.hpp"
 #include "services/hid.hpp"
 
-struct CheatMessage
-{
+struct CheatMessage {
 	u32 handle;
 	std::vector<uint8_t> cheat;
 	std::function<void(u32)> callback;
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 6636cae7..dbd251cc 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -19,14 +19,13 @@
 MainWindow* mainWindow = nullptr;
 
 struct CheatMetadata {
-	u32 handle = badCheatHandle;
+	u32 handle = Cheats::badCheatHandle;
 	std::string name = "New cheat";
 	std::string code;
 	bool enabled = true;
 };
 
-void dispatchToMainThread(std::function<void()> callback)
-{
+void dispatchToMainThread(std::function<void()> callback) {
     QTimer* timer = new QTimer();
     timer->moveToThread(qApp->thread());
     timer->setSingleShot(true);
@@ -110,7 +109,7 @@ CheatEntryWidget::CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListW
 
 void CheatEntryWidget::checkboxChanged(int state) {
 	bool enabled = state == Qt::Checked;
-	if (metadata.handle == badCheatHandle) {
+	if (metadata.handle == Cheats::badCheatHandle) {
 		printf("Cheat handle is bad, this shouldn't happen\n");
 		return;
 	}
@@ -196,22 +195,22 @@ void CheatEditDialog::accepted() {
 	}
 
 	mainWindow->editCheat(cheatEntry.getMetadata().handle, bytes, [this](u32 handle) {
-        dispatchToMainThread([this, handle]() {
-            if (handle == badCheatHandle) {
-                cheatEntry.Remove();
-                return;
-            } else {
-                CheatMetadata metadata = cheatEntry.getMetadata();
-                metadata.handle = handle;
-                cheatEntry.setMetadata(metadata);
-                cheatEntry.Update();
-            }
-        });
+		dispatchToMainThread([this, handle]() {
+			if (handle == Cheats::badCheatHandle) {
+				cheatEntry.Remove();
+				return;
+			} else {
+				CheatMetadata metadata = cheatEntry.getMetadata();
+				metadata.handle = handle;
+				cheatEntry.setMetadata(metadata);
+				cheatEntry.Update();
+			}
+		});
 	});
 }
 
 void CheatEditDialog::rejected() {
-	bool isEditing = cheatEntry.getMetadata().handle != badCheatHandle;
+	bool isEditing = cheatEntry.getMetadata().handle != Cheats::badCheatHandle;
 	if (!isEditing) {
 		// Was adding a cheat but user pressed cancel
 		cheatEntry.Remove();
@@ -253,7 +252,7 @@ CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath
 
 void CheatsWindow::addEntry() {
 	// CheatEntryWidget is added to the list when it's created
-	CheatEntryWidget* entry = new CheatEntryWidget(emu, {badCheatHandle, "New cheat", "", true}, cheatList);
+	CheatEntryWidget* entry = new CheatEntryWidget(emu, {Cheats::badCheatHandle, "New cheat", "", true}, cheatList);
 	CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
 	dialog->show();
 }
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index e603b780..1d7118bc 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -239,7 +239,6 @@ void MainWindow::showAboutMenu() {
 }
 
 void MainWindow::openLuaEditor() { luaEditor->show(); }
-
 void MainWindow::openCheatsEditor() { cheatsEditor->show(); }
 
 void MainWindow::dispatchMessage(const EmulatorMessage& message) {
@@ -259,7 +258,7 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 			u32 handle = message.cheat.c->handle;
 			const std::vector<uint8_t>& cheat = message.cheat.c->cheat;
 			const std::function<void(u32)>& callback = message.cheat.c->callback;
-			bool isEditing = handle != badCheatHandle;
+			bool isEditing = handle != Cheats::badCheatHandle;
 			if (isEditing) {
 				emu->getCheats().removeCheat(handle);
 				u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size());