From 64606aefcf2407513d3687a1f8d325653bde1f72 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 14 Apr 2021 20:19:52 -0400
Subject: common/log: Move Log namespace into the Common namespace

Forgot to move this over when I moved the rest of the source files with
lacking namespaces over.
---
 src/yuzu/configuration/configure_debug.cpp | 4 ++--
 src/yuzu/debugger/console.cpp              | 8 ++++----
 src/yuzu/main.cpp                          | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/yuzu')

diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index 2a5b3f5e7..3a09f74ff 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -53,9 +53,9 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked();
     Settings::values.extended_logging = ui->extended_logging->isChecked();
     Debugger::ToggleConsole();
-    Log::Filter filter;
+    Common::Log::Filter filter;
     filter.ParseFilterString(Settings::values.log_filter);
-    Log::SetGlobalFilter(filter);
+    Common::Log::SetGlobalFilter(filter);
 }
 
 void ConfigureDebug::changeEvent(QEvent* event) {
diff --git a/src/yuzu/debugger/console.cpp b/src/yuzu/debugger/console.cpp
index 207ff4d58..c11a326ac 100644
--- a/src/yuzu/debugger/console.cpp
+++ b/src/yuzu/debugger/console.cpp
@@ -29,13 +29,13 @@ void ToggleConsole() {
             freopen_s(&temp, "CONIN$", "r", stdin);
             freopen_s(&temp, "CONOUT$", "w", stdout);
             freopen_s(&temp, "CONOUT$", "w", stderr);
-            Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
+            Common::Log::AddBackend(std::make_unique<Common::Log::ColorConsoleBackend>());
         }
     } else {
         if (FreeConsole()) {
             // In order to close the console, we have to also detach the streams on it.
             // Just redirect them to NUL if there is no console window
-            Log::RemoveBackend(Log::ColorConsoleBackend::Name());
+            Common::Log::RemoveBackend(Common::Log::ColorConsoleBackend::Name());
             freopen_s(&temp, "NUL", "r", stdin);
             freopen_s(&temp, "NUL", "w", stdout);
             freopen_s(&temp, "NUL", "w", stderr);
@@ -43,9 +43,9 @@ void ToggleConsole() {
     }
 #else
     if (UISettings::values.show_console) {
-        Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
+        Common::Log::AddBackend(std::make_unique<Common::Log::ColorConsoleBackend>());
     } else {
-        Log::RemoveBackend(Log::ColorConsoleBackend::Name());
+        Common::Log::RemoveBackend(Common::Log::ColorConsoleBackend::Name());
     }
 #endif
 }
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 23ea4983d..1dfa111e2 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -171,12 +171,14 @@ void GMainWindow::ShowTelemetryCallout() {
 const int GMainWindow::max_recent_files_item;
 
 static void InitializeLogging() {
+    using namespace Common;
+
     Log::Filter log_filter;
     log_filter.ParseFilterString(Settings::values.log_filter);
     Log::SetGlobalFilter(log_filter);
 
-    const std::string& log_dir = Common::FS::GetUserPath(Common::FS::UserPath::LogDir);
-    Common::FS::CreateFullPath(log_dir);
+    const std::string& log_dir = FS::GetUserPath(FS::UserPath::LogDir);
+    FS::CreateFullPath(log_dir);
     Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE));
 #ifdef _WIN32
     Log::AddBackend(std::make_unique<Log::DebuggerBackend>());
-- 
cgit v1.2.3