From 7bf82f19895f1f6b01d5b3971e1e9e4dae5dc154 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 5 Aug 2014 00:35:53 -0400 Subject: [PATCH] Core: Kill off Host_UpdateLogDisplay() This was actually never used as far as I can tell. There was no wx event handling done whatsoever for the global ID, So this is basically a dead function. --- Source/Core/Common/Logging/Log.h | 4 ---- Source/Core/Core/Boot/Boot.cpp | 2 -- Source/Core/Core/Host.h | 1 - Source/Core/Core/Tracer.cpp | 1 - Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 1 - Source/Core/DolphinWX/Globals.h | 1 - Source/Core/DolphinWX/Main.cpp | 14 -------------- Source/Core/DolphinWX/MainAndroid.cpp | 2 -- Source/Core/DolphinWX/MainNoGUI.cpp | 2 -- Source/UnitTests/TestUtils/StubHost.cpp | 1 - 10 files changed, 29 deletions(-) diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index fa67058b86..c7675a9a07 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -122,11 +122,7 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, ERROR_LOG(_t_, __VA_ARGS__); \ if (!PanicYesNo(__VA_ARGS__)) {Crash();} \ } -#define _dbg_update_() Host_UpdateLogDisplay(); - #else // not debug -#define _dbg_update_() ; - #ifndef _dbg_assert_ #define _dbg_assert_(_t_, _a_) {} #define _dbg_assert_msg_(_t_, _a_, _desc_, ...) {} diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index fd6a9ac5dd..d6cf708af3 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -429,7 +429,5 @@ bool CBoot::BootUp() // Not part of the binary itself, but either we or Gecko OS might insert // this, and it doesn't clear the icache properly. HLE::Patch(0x800018a8, "GeckoCodehandler"); - - Host_UpdateLogDisplay(); return true; } diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index 02448754bf..6cf54b6c95 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -37,7 +37,6 @@ void Host_SetWiiMoteConnectionState(int _State); void Host_ShowJitResults(unsigned int address); void Host_SysMessage(const char *fmt, ...); void Host_UpdateDisasmDialog(); -void Host_UpdateLogDisplay(); void Host_UpdateMainFrame(); void Host_UpdateStatusBar(const std::string& text, int Filed = 0); void Host_UpdateTitle(const std::string& title); diff --git a/Source/Core/Core/Tracer.cpp b/Source/Core/Core/Tracer.cpp index 5418a24994..36eb420d01 100644 --- a/Source/Core/Core/Tracer.cpp +++ b/Source/Core/Core/Tracer.cpp @@ -106,7 +106,6 @@ int SyncTrace() */ if (difference) { - Host_UpdateLogDisplay(); //Also show drec compare window here //CDynaViewDlg::Show(true); //CDynaViewDlg::ViewAddr(m_BlockStart); diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index dbc2e50608..a5717b2eb3 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -285,7 +285,6 @@ void CCodeWindow::SingleStep() // need a short wait here JumpToAddress(PC); Update(); - Host_UpdateLogDisplay(); } } diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 2a8fc02854..1ca1ecc911 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -245,7 +245,6 @@ enum IDM_COMPRESSGCM, IDM_MULTICOMPRESSGCM, IDM_MULTIDECOMPRESSGCM, - IDM_UPDATELOGDISPLAY, IDM_UPDATEDISASMDIALOG, IDM_UPDATEGUI, IDM_UPDATESTATUSBAR, diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 5a2fda3687..10dede9891 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -542,19 +542,6 @@ void Host_NotifyMapLoaded() } } - -void Host_UpdateLogDisplay() -{ - wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATELOGDISPLAY); - main_frame->GetEventHandler()->AddPendingEvent(event); - - if (main_frame->g_pCodeWindow) - { - main_frame->g_pCodeWindow->GetEventHandler()->AddPendingEvent(event); - } -} - - void Host_UpdateDisasmDialog() { wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEDISASMDIALOG); @@ -566,7 +553,6 @@ void Host_UpdateDisasmDialog() } } - void Host_ShowJitResults(unsigned int address) { if (main_frame->g_pCodeWindow && main_frame->g_pCodeWindow->m_JitWindow) diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 11e9c34aaa..3831c686d0 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -72,8 +72,6 @@ void Host_UpdateTitle(const std::string& title) __android_log_write(ANDROID_LOG_INFO, DOLPHIN_TAG, title.c_str()); } -void Host_UpdateLogDisplay(){} - void Host_UpdateDisasmDialog(){} void Host_UpdateMainFrame() diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 5710fc312f..2603727aaa 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -67,8 +67,6 @@ void* Host_GetRenderHandle() void Host_UpdateTitle(const std::string& title){}; -void Host_UpdateLogDisplay(){} - void Host_UpdateDisasmDialog(){} void Host_UpdateMainFrame() diff --git a/Source/UnitTests/TestUtils/StubHost.cpp b/Source/UnitTests/TestUtils/StubHost.cpp index cfb20d1dad..f7ec9e54a4 100644 --- a/Source/UnitTests/TestUtils/StubHost.cpp +++ b/Source/UnitTests/TestUtils/StubHost.cpp @@ -16,7 +16,6 @@ void Host_ShowJitResults(unsigned int) {} void Host_Message(int) {} void* Host_GetRenderHandle() { return nullptr; } void Host_UpdateTitle(const std::string&) {} -void Host_UpdateLogDisplay() {} void Host_UpdateDisasmDialog() {} void Host_UpdateMainFrame() {} void Host_GetRenderWindowSize(int&, int&, int&, int&) {}