MacOS: Fix Debugger namespace naming confilct
This commit is contained in:
@@ -111,7 +111,7 @@ void ConfigureDebug::ApplyConfiguration() {
|
|||||||
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
Settings::values.extended_logging = ui->extended_logging->isChecked();
|
||||||
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
|
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
|
||||||
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
|
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
|
||||||
Debugger::ToggleConsole();
|
DebuggerYuzu::ToggleConsole();
|
||||||
Common::Log::Filter filter;
|
Common::Log::Filter filter;
|
||||||
filter.ParseFilterString(Settings::values.log_filter.GetValue());
|
filter.ParseFilterString(Settings::values.log_filter.GetValue());
|
||||||
Common::Log::SetGlobalFilter(filter);
|
Common::Log::SetGlobalFilter(filter);
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include "yuzu/debugger/console.h"
|
#include "yuzu/debugger/console.h"
|
||||||
#include "yuzu/uisettings.h"
|
#include "yuzu/uisettings.h"
|
||||||
|
|
||||||
namespace Debugger {
|
namespace DebuggerYuzu {
|
||||||
void ToggleConsole() {
|
void ToggleConsole() {
|
||||||
static bool console_shown = false;
|
static bool console_shown = false;
|
||||||
if (console_shown == UISettings::values.show_console.GetValue()) {
|
if (console_shown == UISettings::values.show_console.GetValue()) {
|
||||||
@@ -46,4 +46,4 @@ void ToggleConsole() {
|
|||||||
SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
|
SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} // namespace Debugger
|
} // namespace DebuggerYuzu
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
namespace Debugger {
|
namespace DebuggerYuzu {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can
|
* 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.
|
* get a real qt logging window which would work for all platforms.
|
||||||
*/
|
*/
|
||||||
void ToggleConsole();
|
void ToggleConsole();
|
||||||
} // namespace Debugger
|
} // namespace DebuggerYuzu
|
||||||
|
|||||||
@@ -1420,7 +1420,7 @@ void GMainWindow::RestoreUIState() {
|
|||||||
|
|
||||||
ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
|
ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
|
||||||
statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
|
statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
|
||||||
Debugger::ToggleConsole();
|
DebuggerYuzu::ToggleConsole();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
|
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
|
||||||
|
|||||||
Reference in New Issue
Block a user