diff --git a/src/citron/configuration/configure_debug.cpp b/src/citron/configuration/configure_debug.cpp index 0a3ed298c..58955756a 100644 --- a/src/citron/configuration/configure_debug.cpp +++ b/src/citron/configuration/configure_debug.cpp @@ -4,15 +4,15 @@ #include #include #include +#include "citron/configuration/configure_debug.h" +#include "citron/debugger/console.h" +#include "citron/uisettings.h" #include "common/fs/path_util.h" #include "common/logging/backend.h" #include "common/logging/filter.h" #include "common/settings.h" #include "core/core.h" #include "ui_configure_debug.h" -#include "citron/configuration/configure_debug.h" -#include "citron/debugger/console.h" -#include "citron/uisettings.h" ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) : QScrollArea(parent), ui{std::make_unique()}, system{system_} { @@ -111,7 +111,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(); + CitronDebugger::ToggleConsole(); Common::Log::Filter filter; filter.ParseFilterString(Settings::values.log_filter.GetValue()); Common::Log::SetGlobalFilter(filter); diff --git a/src/citron/debugger/console.cpp b/src/citron/debugger/console.cpp index d422ce5a8..7900e2604 100644 --- a/src/citron/debugger/console.cpp +++ b/src/citron/debugger/console.cpp @@ -7,11 +7,11 @@ #include #endif -#include "common/logging/backend.h" #include "citron/debugger/console.h" #include "citron/uisettings.h" +#include "common/logging/backend.h" -namespace Debugger { +namespace CitronDebugger { 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 CitronDebugger diff --git a/src/citron/debugger/console.h b/src/citron/debugger/console.h index 2491d1ec1..0066f05dd 100644 --- a/src/citron/debugger/console.h +++ b/src/citron/debugger/console.h @@ -3,11 +3,11 @@ #pragma once -namespace Debugger { +namespace CitronDebugger { /** * 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 CitronDebugger diff --git a/src/citron/main.cpp b/src/citron/main.cpp index c374f0630..5594f4a67 100644 --- a/src/citron/main.cpp +++ b/src/citron/main.cpp @@ -1599,7 +1599,7 @@ void GMainWindow::RestoreUIState() { vram_overlay->SetVisible(false); } - Debugger::ToggleConsole(); + CitronDebugger::ToggleConsole(); } void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {