piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve iterator usage.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5528 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-05-28 23:14:16 +00:00
parent 0d75190af9
commit ceabf90bda
21 changed files with 1132 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_DSP_LLE/Src/DSPSymbols.cpp
View File

@ -75,7 +75,7 @@ Symbol *DSPSymbolDB::GetSymbolFromAddr(u32 addr)
return &it->second;
else
{
for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
{
if (addr >= iter->second.address && addr < iter->second.address + iter->second.size)
return &iter->second;

2
Source/Plugins/Plugin_DSP_LLE/Src/Debugger/DSPDebugWindow.cpp
View File

@ -207,7 +207,7 @@ void DSPDebuggerLLE::UpdateSymbolMap()
m_SymbolList->Freeze(); // HyperIris: wx style fast filling
m_SymbolList->Clear();
for (SymbolDB::XFuncMap::iterator iter = DSPSymbols::g_dsp_symbol_db.GetIterator();
iter != DSPSymbols::g_dsp_symbol_db.End(); iter++)
iter != DSPSymbols::g_dsp_symbol_db.End(); ++iter)
{
int idx = m_SymbolList->Append(wxString::FromAscii(iter->second.name.c_str()));
m_SymbolList->SetClientData(idx, (void*)&iter->second);

1044
Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
View File

File diff suppressed because it is too large Load Diff

2
Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
View File

@ -314,7 +314,7 @@ void PixelShaderCache::Init()
void PixelShaderCache::Clear()
{
PSCache::iterator iter = PixelShaders.begin();
for (; iter != PixelShaders.end(); iter++)
for (; iter != PixelShaders.end(); ++iter)
iter->second.Destroy();
PixelShaders.clear();

6
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
View File

@ -72,7 +72,7 @@ void TextureCache::Init()
void TextureCache::Invalidate(bool shutdown)
{
for (TexCache::iterator iter = textures.begin(); iter != textures.end(); iter++)
for (TexCache::iterator iter = textures.begin(); iter != textures.end(); ++iter)
iter->second.Destroy(shutdown);
textures.clear();
HiresTextures::Shutdown();
@ -86,7 +86,7 @@ void TextureCache::InvalidateRange(u32 start_address, u32 size)
if (iter->second.IntersectsMemoryRange(start_address, size))
{
iter->second.Destroy(false);
ERASE_THROUGH_ITERATOR(textures, iter);
textures.erase(iter++);
}
else {
++iter;
@ -131,7 +131,7 @@ void TextureCache::Cleanup()
}
else
{
iter++;
++iter;
}
}
}

4
Source/Plugins/Plugin_VideoDX9/Src/W32Util/DialogManager.cpp
View File

@ -13,7 +13,7 @@ void DialogManager::AddDlg(HWND hDialog)
bool DialogManager::IsDialogMessage(LPMSG message)
{
WindowList::iterator iter;
for (iter=dialogs.begin(); iter!=dialogs.end(); iter++)
for (iter=dialogs.begin(); iter!=dialogs.end(); ++iter)
{
if (::IsDialogMessage(*iter,message))
return true;
@ -24,6 +24,6 @@ bool DialogManager::IsDialogMessage(LPMSG message)
void DialogManager::EnableAll(BOOL enable)
{
WindowList::iterator iter;
for (iter=dialogs.begin(); iter!=dialogs.end(); iter++)
for (iter=dialogs.begin(); iter!=dialogs.end(); ++iter)
EnableWindow(*iter,enable);
}

4
Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
View File

@ -70,7 +70,7 @@ namespace W32Util
page.hInstance = hInstance;
int i=0;
for (DlgList::iterator iter = list.begin(); iter != list.end(); iter++, i++)
for (DlgList::iterator iter = list.begin(); iter != list.end(); ++iter, ++i)
{
if (wizard)
{
@ -146,7 +146,7 @@ namespace W32Util
PropertySheet(&sheet);
if (!floating)
{
for (DlgList::iterator iter = list.begin(); iter != list.end(); iter++)
for (DlgList::iterator iter = list.begin(); iter != list.end(); ++iter)
{
delete iter->tab;
}

1124
Source/Plugins/Plugin_VideoOGL/Src/DLCache.cpp
View File

File diff suppressed because it is too large Load Diff

12
Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
View File

@ -302,7 +302,7 @@ void FramebufferManager::replaceVirtualXFB()
s32 srcUpper = it->xfbAddr + 2 * it->xfbWidth * it->xfbHeight;
s32 lineSize = 2 * it->xfbWidth;
it++;
++it;
while (it != m_virtualXFBList.end())
{
@ -332,7 +332,7 @@ void FramebufferManager::replaceVirtualXFB()
}
}
it++;
++it;
}
}
@ -357,7 +357,7 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
if (it == m_virtualXFBList.end() && (int)m_virtualXFBList.size() >= MAX_VIRTUAL_XFB)
{
// replace the last virtual XFB
it--;
--it;
}
if (it != m_virtualXFBList.end())
@ -524,11 +524,9 @@ const XFBSource** FramebufferManager::getVirtualXFBSource(u32 xfbAddr, u32 fbWid
u32 srcLower = xfbAddr;
u32 srcUpper = xfbAddr + 2 * fbWidth * fbHeight;
VirtualXFBListType::iterator it;
for (it = m_virtualXFBList.end(); it != m_virtualXFBList.begin();)
VirtualXFBListType::reverse_iterator it;
for (it = m_virtualXFBList.rbegin(); it != m_virtualXFBList.rend(); ++it)
{
--it;
u32 dstLower = it->xfbAddr;
u32 dstUpper = it->xfbAddr + 2 * it->xfbWidth * it->xfbHeight;

2
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View File

@ -160,7 +160,7 @@ void PixelShaderCache::Shutdown()
glDeleteProgramsARB(1, &s_DepthMatrixProgram);
s_DepthMatrixProgram = 0;
PSCache::iterator iter = pshaders.begin();
for (; iter != pshaders.end(); iter++)
for (; iter != pshaders.end(); ++iter)
iter->second.Destroy();
pshaders.clear();
}

10
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -199,15 +199,15 @@ void TextureMngr::ProgressiveCleanup()
{
if (!iter->second.isRenderTarget) {
iter->second.Destroy(false);
ERASE_THROUGH_ITERATOR(textures, iter);
textures.erase(iter++);
}
else {
iter->second.Destroy(false);
ERASE_THROUGH_ITERATOR(textures, iter);
textures.erase(iter++);
}
}
else
iter++;
++iter;
}
}
@ -219,7 +219,7 @@ void TextureMngr::InvalidateRange(u32 start_address, u32 size)
if (iter->second.IntersectsMemoryRange(start_address, size))
{
iter->second.Destroy(false);
ERASE_THROUGH_ITERATOR(textures, iter);
textures.erase(iter++);
}
else {
++iter;
@ -820,6 +820,6 @@ void TextureMngr::DisableStage(int stage)
void TextureMngr::ClearRenderTargets()
{
for (TexCache::iterator iter = textures.begin(); iter != textures.end(); iter++)
for (TexCache::iterator iter = textures.begin(); iter != textures.end(); ++iter)
iter->second.isRenderTarget = false;
}

2
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
View File

@ -116,7 +116,7 @@ void VertexShaderCache::Init()
void VertexShaderCache::Shutdown()
{
for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); iter++)
for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
iter->second.Destroy();
vshaders.clear();
}