actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace SAFE_DELETE / SAFE_DELETE_ARRAY macros

Browse Source 
SAFE_DELETE -> RageUtil::SafeDelete
SAFE_DELETE_ARRAY -> RageUtil::SafeDeleteArray

Update JsonUtil.h to include RageUtil.h - MSVC doesn't need it included for some reason, but GCC and XCode does.
This commit is contained in:
sukibaby
2024-09-30 15:13:32 -07:00
committed by teejusb
parent cff063cd21
commit abf89ec2b1
62 changed files with 193 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenManager.cpp
+8 -8
View File
@@ -220,7 +220,7 @@ namespace ScreenManagerUtil
BeforeDeleteScreen();
for (Actor *a : apActorsToDelete)
{
SAFE_DELETE( a );
RageUtil::SafeDelete( a );
}
AfterDeleteScreen();
}
@@ -265,17 +265,17 @@ ScreenManager::~ScreenManager()
LOG->Trace("ScreenManager::~ScreenManager()");
LOG->UnmapLog("ScreenManager::TopScreen");
SAFE_DELETE(g_pSharedBGA);
RageUtil::SafeDelete(g_pSharedBGA);
for (LoadedScreen& screen : g_ScreenStack)
{
if (screen.m_bDeleteWhenDone)
SAFE_DELETE(screen.m_pScreen);
RageUtil::SafeDelete(screen.m_pScreen);
}
g_ScreenStack.clear();
DeletePreparedScreens();
for (Screen* overlayScreen : g_OverlayScreens)
{
SAFE_DELETE(overlayScreen);
RageUtil::SafeDelete(overlayScreen);
}
g_OverlayScreens.clear();
@@ -301,7 +301,7 @@ void ScreenManager::ThemeChanged()
ReloadOverlayScreens();
// force recreate of new BGA
SAFE_DELETE( g_pSharedBGA );
RageUtil::SafeDelete( g_pSharedBGA );
g_pSharedBGA = new Actor;
}
@@ -309,7 +309,7 @@ void ScreenManager::ReloadOverlayScreens()
{
// unload overlay screens
for (Screen* screen : g_OverlayScreens)
SAFE_DELETE(screen);
RageUtil::SafeDelete(screen);
g_OverlayScreens.clear();
// reload overlay screens
@@ -412,7 +412,7 @@ ScreenMessage ScreenManager::PopTopScreenInternal( bool bSendLoseFocus )
if( ls.m_bDeleteWhenDone )
{
BeforeDeleteScreen();
SAFE_DELETE( ls.m_pScreen );
RageUtil::SafeDelete( ls.m_pScreen );
AfterDeleteScreen();
}
}
@@ -778,7 +778,7 @@ void ScreenManager::LoadDelayedScreen()
BeforeDeleteScreen();
for (Actor *a : apActorsToDelete)
{
SAFE_DELETE( a );
RageUtil::SafeDelete( a );
}
AfterDeleteScreen();
}