From 5b5d30cb69e034c64e788647315aff099e5689bf Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 15 Apr 2016 08:07:34 +1000 Subject: [PATCH] [Project64] Rename RefreshRomBrowser to RefreshRomList --- Source/Project64/UserInterface/GuiClass.cpp | 4 ++-- Source/Project64/UserInterface/MainMenuClass.cpp | 4 ++-- Source/Project64/UserInterface/RomBrowserClass.cpp | 2 +- Source/Project64/UserInterface/RomList.cpp | 12 ++++++------ Source/Project64/UserInterface/RomList.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/GuiClass.cpp index 7621a7a15..c1bc72a48 100644 --- a/Source/Project64/UserInterface/GuiClass.cpp +++ b/Source/Project64/UserInterface/GuiClass.cpp @@ -245,7 +245,7 @@ void RomBowserColoumnsChanged(CMainGui * Gui) void RomBrowserRecursiveChanged(CMainGui * Gui) { - Gui->RefreshRomBrowser(); + Gui->RefreshRomList(); Gui->HighLightLastRom(); } @@ -1041,7 +1041,7 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO } break; case ID_POPUPMENU_ROMDIRECTORY: _this->SelectRomDir(); break; - case ID_POPUPMENU_REFRESHROMLIST: _this->RefreshRomBrowser(); break; + case ID_POPUPMENU_REFRESHROMLIST: _this->RefreshRomList(); break; case ID_POPUPMENU_ROMINFORMATION: { RomInformation Info(_this->CurrentedSelectedRom()); diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp index 5ac828a2c..126b61dea 100644 --- a/Source/Project64/UserInterface/MainMenuClass.cpp +++ b/Source/Project64/UserInterface/MainMenuClass.cpp @@ -200,7 +200,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI m_Gui->RefreshMenu(); WriteTrace(TraceUserInterface, TraceDebug, "ID_FILE_ROMDIRECTORY 3"); break; - case ID_FILE_REFRESHROMLIST: m_Gui->RefreshRomBrowser(); break; + case ID_FILE_REFRESHROMLIST: m_Gui->RefreshRomList(); break; case ID_FILE_EXIT: DestroyWindow((HWND)hWnd); break; case ID_SYSTEM_RESET_SOFT: WriteTrace(TraceUserInterface, TraceDebug, "ID_SYSTEM_RESET_SOFT"); @@ -542,7 +542,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI m_Gui->RefreshMenu(); if (m_Gui->RomBrowserVisible()) { - m_Gui->RefreshRomBrowser(); + m_Gui->RefreshRomList(); } } } diff --git a/Source/Project64/UserInterface/RomBrowserClass.cpp b/Source/Project64/UserInterface/RomBrowserClass.cpp index ebb4c217b..870a2e309 100644 --- a/Source/Project64/UserInterface/RomBrowserClass.cpp +++ b/Source/Project64/UserInterface/RomBrowserClass.cpp @@ -985,7 +985,7 @@ void CRomBrowser::SelectRomDir(void) WriteTrace(TraceUserInterface, TraceDebug, "7"); Notify().AddRecentDir(Directory); WriteTrace(TraceUserInterface, TraceDebug, "8"); - RefreshRomBrowser(); + RefreshRomList(); WriteTrace(TraceUserInterface, TraceDebug, "9"); } } diff --git a/Source/Project64/UserInterface/RomList.cpp b/Source/Project64/UserInterface/RomList.cpp index 62e871499..24ee993d0 100644 --- a/Source/Project64/UserInterface/RomList.cpp +++ b/Source/Project64/UserInterface/RomList.cpp @@ -72,7 +72,7 @@ CRomList::~CRomList() } } -void CRomList::RefreshRomBrowser(void) +void CRomList::RefreshRomList(void) { DWORD ThreadID; @@ -82,7 +82,7 @@ void CRomList::RefreshRomBrowser(void) } WriteTrace(TraceUserInterface, TraceDebug, "1"); m_StopRefresh = false; - m_RefreshThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RefreshRomBrowserStatic, (LPVOID)this, 0, &ThreadID); + m_RefreshThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RefreshRomListStatic, (LPVOID)this, 0, &ThreadID); WriteTrace(TraceUserInterface, TraceDebug, "2"); } @@ -348,7 +348,7 @@ void CRomList::NotificationCB(const char * Status, CRomList * /*_this*/) g_Notify->DisplayMessage(5, Status); } -void CRomList::RefreshRomBrowserStatic(CRomList * _this) +void CRomList::RefreshRomListStatic(CRomList * _this) { _this->RefreshRomListThread(); } @@ -586,14 +586,14 @@ void CRomList::LoadRomList(void) if (!file.IsOpen()) { //if file does not exist then refresh the data - RefreshRomBrowser(); + RefreshRomList(); return; } unsigned char md5[16]; if (!file.Read(md5, sizeof(md5))) { file.Close(); - RefreshRomBrowser(); + RefreshRomList(); return; } @@ -602,7 +602,7 @@ void CRomList::LoadRomList(void) if (!file.Read(&RomInfoSize, sizeof(RomInfoSize)) || RomInfoSize != sizeof(ROM_INFO)) { file.Close(); - RefreshRomBrowser(); + RefreshRomList(); return; } diff --git a/Source/Project64/UserInterface/RomList.h b/Source/Project64/UserInterface/RomList.h index 0d49ce523..d0108340c 100644 --- a/Source/Project64/UserInterface/RomList.h +++ b/Source/Project64/UserInterface/RomList.h @@ -52,7 +52,7 @@ public: CRomList(); virtual ~CRomList(); - void RefreshRomBrowser(void); + void RefreshRomList(void); void LoadRomList(void); protected: @@ -87,7 +87,7 @@ private: static void NotificationCB(const char * Status, CRomList * _this); static void WatchRomDirChanged(CRomList * _this); - static void RefreshRomBrowserStatic(CRomList * _this); + static void RefreshRomListStatic(CRomList * _this); static void ByteSwapRomData(uint8_t * Data, int DataLen); static int32_t GetCicChipID(uint8_t * RomData);