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/duckstation/gl/context.h       | 1 +
 src/frontend/duckstation/gl/context_agl.h   | 1 +
 src/frontend/duckstation/gl/context_wgl.cpp | 1 +
 src/frontend/duckstation/gl/x11_window.h    | 1 +
 src/frontend/duckstation/window_info.h      | 4 ++--
 5 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/frontend/duckstation')

diff --git a/src/frontend/duckstation/gl/context.h b/src/frontend/duckstation/gl/context.h
index 41d8a2c..06e0bc5 100644
--- a/src/frontend/duckstation/gl/context.h
+++ b/src/frontend/duckstation/gl/context.h
@@ -6,6 +6,7 @@
 #include <vector>
 
 namespace GL {
+using namespace melonDS;
 class Context
 {
 public:
diff --git a/src/frontend/duckstation/gl/context_agl.h b/src/frontend/duckstation/gl/context_agl.h
index 459bf2f..4ae5202 100644
--- a/src/frontend/duckstation/gl/context_agl.h
+++ b/src/frontend/duckstation/gl/context_agl.h
@@ -13,6 +13,7 @@ struct NSView;
 
 namespace GL {
 
+using namespace melonDS;
 class ContextAGL final : public Context
 {
 public:
diff --git a/src/frontend/duckstation/gl/context_wgl.cpp b/src/frontend/duckstation/gl/context_wgl.cpp
index 03c18e8..09f994c 100644
--- a/src/frontend/duckstation/gl/context_wgl.cpp
+++ b/src/frontend/duckstation/gl/context_wgl.cpp
@@ -3,6 +3,7 @@
 #include "../log.h"
 #include "../scoped_guard.h"
 #include "loader.h"
+using namespace melonDS;
 Log_SetChannel(GL::ContextWGL);
 
 // TODO: get rid of this
diff --git a/src/frontend/duckstation/gl/x11_window.h b/src/frontend/duckstation/gl/x11_window.h
index aff38b7..e216a05 100644
--- a/src/frontend/duckstation/gl/x11_window.h
+++ b/src/frontend/duckstation/gl/x11_window.h
@@ -4,6 +4,7 @@
 #include <X11/Xutil.h>
 
 namespace GL {
+using namespace melonDS;
 class X11Window
 {
 public:
diff --git a/src/frontend/duckstation/window_info.h b/src/frontend/duckstation/window_info.h
index 44912ca..4352617 100644
--- a/src/frontend/duckstation/window_info.h
+++ b/src/frontend/duckstation/window_info.h
@@ -28,8 +28,8 @@ struct WindowInfo
   Type type = Type::Surfaceless;
   void* display_connection = nullptr;
   void* window_handle = nullptr;
-  u32 surface_width = 0;
-  u32 surface_height = 0;
+  melonDS::u32 surface_width = 0;
+  melonDS::u32 surface_height = 0;
   float surface_refresh_rate = 0.0f;
   float surface_scale = 1.0f;
   SurfaceFormat surface_format = SurfaceFormat::RGB8;
-- 
cgit v1.2.3