From 346dd4006ea1283136095d5c43f602324a095092 Mon Sep 17 00:00:00 2001
From: Jesse Talavera-Greenberg <jesse@jesse.tg>
Date: Sat, 25 Nov 2023 12:32:09 -0500
Subject: Move all core types into namespaces (#1886)

* Reorganize namespaces

- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next

* Fix the build
---
 src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp | 1 +
 src/frontend/qt_sdl/InputConfig/MapButton.h           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/frontend/qt_sdl/InputConfig')

diff --git a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
index 6d651c9..02a76bb 100644
--- a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
+++ b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
@@ -32,6 +32,7 @@
 #include "ui_InputConfigDialog.h"
 
 
+using namespace melonDS;
 InputConfigDialog* InputConfigDialog::currentDlg = nullptr;
 
 const int dskeyorder[12] = {0, 1, 10, 11, 5, 4, 6, 7, 9, 8, 2, 3};
diff --git a/src/frontend/qt_sdl/InputConfig/MapButton.h b/src/frontend/qt_sdl/InputConfig/MapButton.h
index b35cc1f..5d4fb3e 100644
--- a/src/frontend/qt_sdl/InputConfig/MapButton.h
+++ b/src/frontend/qt_sdl/InputConfig/MapButton.h
@@ -52,7 +52,7 @@ protected:
     {
         if (!isChecked()) return QPushButton::keyPressEvent(event);
 
-        Platform::Log(Platform::Debug, "KEY PRESSED = %08X %08X | %08X %08X %08X\n", event->key(), (int)event->modifiers(), event->nativeVirtualKey(), event->nativeModifiers(), event->nativeScanCode());
+        Log(melonDS::Platform::Debug, "KEY PRESSED = %08X %08X | %08X %08X %08X\n", event->key(), (int)event->modifiers(), event->nativeVirtualKey(), event->nativeModifiers(), event->nativeScanCode());
 
         int key = event->key();
         int mod = event->modifiers();
-- 
cgit v1.2.3