real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Use prefix increment operator for iterators (for consistency), refs #1852, #1064

Browse Source 
This was SVN commit r13418.
This commit is contained in:
historic_bruno 2013-05-22 18:41:13 +00:00
parent 3ce14e3f4b
commit d7dcd3b26c
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/renderer/OverlayRenderer.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games. /* Copyright (C) 2013 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -233,7 +233,7 @@ void OverlayRenderer::EndFrame()
// won't be very large or very variable // won't be very large or very variable
// Empty the batch rendering data structures, but keep their key mappings around for the next frames // Empty the batch rendering data structures, but keep their key mappings around for the next frames
for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); it++) for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); ++it)
{ {
QuadBatchData& quadBatchData = (it->second); QuadBatchData& quadBatchData = (it->second);
quadBatchData.m_Quads.clear(); quadBatchData.m_Quads.clear();
@ -505,7 +505,7 @@ void OverlayRenderer::RenderQuadOverlays()
GLsizei indexStride = m->quadIndices.GetStride(); GLsizei indexStride = m->quadIndices.GetStride();
GLsizei vertexStride = m->quadVertices.GetStride(); GLsizei vertexStride = m->quadVertices.GetStride();
for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); it++) for (OverlayRendererInternals::QuadBatchMap::iterator it = m->quadBatchMap.begin(); it != m->quadBatchMap.end(); ++it)
{ {
QuadBatchData& batchRenderData = it->second; QuadBatchData& batchRenderData = it->second;
const size_t batchNumQuads = batchRenderData.m_NumRenderQuads; const size_t batchNumQuads = batchRenderData.m_NumRenderQuads;

16
source/scriptinterface/DebuggingServer.cpp
View File

@ -40,7 +40,7 @@ void CDebuggingServer::GetAllCallstacks(std::stringstream& response)
if (!m_ThreadDebuggers.empty()) if (!m_ThreadDebuggers.empty())
{ {
response << "["; response << "[";
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if ((*itr)->GetIsInBreak()) if ((*itr)->GetIsInBreak())
{ {
@ -68,7 +68,7 @@ void CDebuggingServer::GetStackFrameData(std::stringstream& response, uint nesti
response.str(""); response.str("");
std::stringstream stream; std::stringstream stream;
std::list<CThreadDebugger*>::iterator itr; std::list<CThreadDebugger*>::iterator itr;
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if ( (*itr)->GetID() == threadDebuggerID && (*itr)->GetIsInBreak()) if ( (*itr)->GetID() == threadDebuggerID && (*itr)->GetIsInBreak())
{ {
@ -112,7 +112,7 @@ bool CDebuggingServer::SetNextDbgCmd(uint threadDebuggerID, DBGCMD dbgCmd)
{ {
CScopeLock lock(m_Mutex); CScopeLock lock(m_Mutex);
std::list<CThreadDebugger*>::iterator itr; std::list<CThreadDebugger*>::iterator itr;
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if ( (*itr)->GetID() == threadDebuggerID || threadDebuggerID == 0) if ( (*itr)->GetID() == threadDebuggerID || threadDebuggerID == 0)
{ {
@ -195,7 +195,7 @@ void CDebuggingServer::EnumVfsJSFiles(std::stringstream& response)
std::vector<std::string>::iterator itr; std::vector<std::string>::iterator itr;
response << "["; response << "[";
for (itr = templates.begin(); itr != templates.end(); itr++) for (itr = templates.begin(); itr != templates.end(); ++itr)
{ {
if (itr != templates.begin()) if (itr != templates.begin())
response << ","; response << ",";
@ -477,7 +477,7 @@ void CDebuggingServer::UnRegisterScriptinterface(ScriptInterface* pScriptInterfa
{ {
CScopeLock lock(m_Mutex); CScopeLock lock(m_Mutex);
std::list<CThreadDebugger*>::iterator itr; std::list<CThreadDebugger*>::iterator itr;
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if ((*itr)->CompareScriptInterfacePtr(pScriptInterface)) if ((*itr)->CompareScriptInterfacePtr(pScriptInterface))
{ {
@ -496,7 +496,7 @@ void CDebuggingServer::GetThreadDebuggerStatus(std::stringstream& response)
std::list<CThreadDebugger*>::iterator itr; std::list<CThreadDebugger*>::iterator itr;
response << "["; response << "[";
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if (itr == m_ThreadDebuggers.begin()) if (itr == m_ThreadDebuggers.begin())
response << "{ "; response << "{ ";
@ -519,7 +519,7 @@ void CDebuggingServer::ToggleBreakPoint(std::string filename, uint line)
{ {
CScopeLock lock(m_Mutex); CScopeLock lock(m_Mutex);
std::list<CThreadDebugger*>::iterator itr; std::list<CThreadDebugger*>::iterator itr;
for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++) for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); ++itr)
{ {
if ((*itr)->ToggleBreakPoint(filename, line)) if ((*itr)->ToggleBreakPoint(filename, line))
return; return;
@ -533,7 +533,7 @@ void CDebuggingServer::ToggleBreakPoint(std::string filename, uint line)
// If set, delete // If set, delete
bool deleted = false; bool deleted = false;
for (itr = pBreakPoints->begin(); itr != pBreakPoints->end(); itr++) for (itr = pBreakPoints->begin(); itr != pBreakPoints->end(); ++itr)
{ {
if ((*itr).m_Filename == filename && (*itr).m_UserLine == line) if ((*itr).m_Filename == filename && (*itr).m_UserLine == line)
{ {

10
source/scriptinterface/ThreadDebugger.cpp
View File

@ -192,7 +192,7 @@ void CThreadDebugger::ClearTrapsToRemove()
} }
else else
itr++; ++itr;
} }
} }
@ -224,7 +224,7 @@ void CThreadDebugger::SetAllNewTraps()
{ {
CScopeLock lock(m->m_Mutex); CScopeLock lock(m->m_Mutex);
std::list<CActiveBreakPoint*>::iterator itr1; std::list<CActiveBreakPoint*>::iterator itr1;
for (itr1 = m->m_ActiveBreakPoints.begin(); itr1 != m->m_ActiveBreakPoints.end(); itr1++) for (itr1 = m->m_ActiveBreakPoints.begin(); itr1 != m->m_ActiveBreakPoints.end(); ++itr1)
{ {
if ((*itr1)->m_ActualLine == (*itr).m_UserLine) if ((*itr1)->m_ActualLine == (*itr).m_UserLine)
trapAlreadySet = true; trapAlreadySet = true;
@ -243,7 +243,7 @@ void CThreadDebugger::SetAllNewTraps()
continue; continue;
} }
} }
itr++; ++itr;
} }
m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID); m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID);
} }
@ -313,7 +313,7 @@ void CThreadDebugger::ReturnActiveBreakPoints(jsbytecode* pBytecode)
m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID); m->m_pDebuggingServer->ReleaseBreakPointAccess(breakPointsLockID);
} }
else else
itr++; ++itr;
} }
} }
@ -620,7 +620,7 @@ bool CThreadDebugger::ToggleBreakPoint(std::string filename, uint userLine)
{ {
CScopeLock lock(m->m_Mutex); CScopeLock lock(m->m_Mutex);
std::list<CActiveBreakPoint*>::iterator itr; std::list<CActiveBreakPoint*>::iterator itr;
for (itr = m->m_ActiveBreakPoints.begin(); itr != m->m_ActiveBreakPoints.end(); itr++) for (itr = m->m_ActiveBreakPoints.begin(); itr != m->m_ActiveBreakPoints.end(); ++itr)
{ {
if ((*itr)->m_UserLine == userLine && (*itr)->m_Filename == filename) if ((*itr)->m_UserLine == userLine && (*itr)->m_Filename == filename)
{ {

4
source/soundmanager/SoundManager.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games. /* Copyright (C) 2013 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -588,7 +588,7 @@ void CSoundManager::IdleTask()
{ {
m_PlaylistGap = 0; m_PlaylistGap = 0;
PlayList::iterator it = find (m_PlayListItems->begin(), m_PlayListItems->end(), *(m_CurrentTune->GetName()) ); PlayList::iterator it = find (m_PlayListItems->begin(), m_PlayListItems->end(), *(m_CurrentTune->GetName()) );
it++; ++it;
Path nextPath; Path nextPath;
if ( it == m_PlayListItems->end() ) if ( it == m_PlayListItems->end() )