Merge commit 'c432641245' into torzu-merging

src/core/hle/service/nvnflinger/hardware_composer.cpp

@@ -3,7 +3,9 @@
 
 #include <optional>
 #include <boost/container/small_vector.hpp>
+#include <optional>
 
+#include "common/common_types.h"
 #include "common/microprofile.h"
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvnflinger/buffer_item.h"

src/suyu/configuration/configure_debug.cpp

@@ -112,7 +112,7 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.extended_logging = ui->extended_logging->isChecked();
     Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
     UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
-    Debugger::ToggleConsole();
+    DebuggerYuzu::ToggleConsole();
     Common::Log::Filter filter;
     filter.ParseFilterString(Settings::values.log_filter.GetValue());
     Common::Log::SetGlobalFilter(filter);

src/suyu/debugger/console.cpp

@@ -11,7 +11,7 @@
 #include "suyu/debugger/console.h"
 #include "suyu/uisettings.h"
 
-namespace Debugger {
+namespace DebuggerYuzu {
 void ToggleConsole() {
     static bool console_shown = false;
     if (console_shown == UISettings::values.show_console.GetValue()) {
@@ -46,4 +46,4 @@ void ToggleConsole() {
     SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
 #endif
 }
-} // namespace Debugger
+} // namespace DebuggerYuzu

src/suyu/debugger/console.h

@@ -3,11 +3,11 @@
 
 #pragma once
 
-namespace Debugger {
+namespace DebuggerYuzu {
 
 /**
  * Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can
  * get a real qt logging window which would work for all platforms.
  */
 void ToggleConsole();
-} // namespace Debugger
+} // namespace DebuggerYuzu

src/suyu/main.cpp

@@ -1424,7 +1424,7 @@ void GMainWindow::RestoreUIState() {
     ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
     ui->action_Show_Folders_In_List->setChecked(UISettings::values.show_folders_in_list.GetValue());
     statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
-    Debugger::ToggleConsole();
+    DebuggerYuzu::ToggleConsole();
 }
 
 void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {