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

Run code through clang-modernize -loop-convert to create range-based for loops, and manually fix some stuff up.

Browse Source
This commit is contained in:
comex
2013-10-29 01:09:01 -04:00
parent 00fe5057f1
commit 965b32be9c
90 changed files with 688 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DiscIO/Src/DiscScrubber.cpp
View File

@ -234,10 +234,9 @@ bool ParseDisc()
PartitionGroup[x].PartitionsVec.push_back(Partition);
}
for (size_t i = 0; i < PartitionGroup[x].PartitionsVec.size(); i++)
for (auto& rPartition : PartitionGroup[x].PartitionsVec)
{
SPartition& rPartition = PartitionGroup[x].PartitionsVec.at(i);
const SPartitionHeader& rHeader = PartitionGroup[x].PartitionsVec.at(i).Header;
const SPartitionHeader& rHeader = rPartition.Header;
MarkAsUsed(rPartition.Offset, 0x2c0);

6
Source/Core/DiscIO/Src/FileHandlerARC.cpp
View File

@ -232,11 +232,11 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
const SFileInfo*
CARCFile::FindFileInfo(std::string _rFullPath) const
{
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
for (auto& fileInfo : m_FileInfoVector)
{
if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath.c_str()))
if (!strcasecmp(fileInfo.m_FullPath, _rFullPath.c_str()))
{
return(&m_FileInfoVector[i]);
return(&fileInfo);
}
}

18
Source/Core/DiscIO/Src/FileSystemGCWii.cpp
View File

@ -46,12 +46,12 @@ const char* CFileSystemGCWii::GetFileName(u64 _Address)
if (!m_Initialized)
InitFileSystem();
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
for (auto& fileInfo : m_FileInfoVector)
{
if ((m_FileInfoVector[i].m_Offset <= _Address) &&
((m_FileInfoVector[i].m_Offset + m_FileInfoVector[i].m_FileSize) > _Address))
if ((fileInfo.m_Offset <= _Address) &&
((fileInfo.m_Offset + fileInfo.m_FileSize) > _Address))
{
return m_FileInfoVector[i].m_FullPath;
return fileInfo.m_FullPath;
}
}
@ -222,8 +222,8 @@ size_t CFileSystemGCWii::GetFileList(std::vector<const SFileInfo *> &_rFilenames
PanicAlert("GetFileList : input list has contents?");
_rFilenames.clear();
_rFilenames.reserve(m_FileInfoVector.size());
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
_rFilenames.push_back(&m_FileInfoVector[i]);
for (auto& fileInfo : m_FileInfoVector)
_rFilenames.push_back(&fileInfo);
return m_FileInfoVector.size();
}
@ -232,10 +232,10 @@ const SFileInfo* CFileSystemGCWii::FindFileInfo(const char* _rFullPath)
if (!m_Initialized)
InitFileSystem();
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
for (auto& fileInfo : m_FileInfoVector)
{
if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath))
return &m_FileInfoVector[i];
if (!strcasecmp(fileInfo.m_FullPath, _rFullPath))
return &fileInfo;
}
return NULL;

33
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -44,14 +44,14 @@ CSharedContent::~CSharedContent()
std::string CSharedContent::GetFilenameFromSHA1(const u8* _pHash)
{
for (size_t i=0; i<m_Elements.size(); i++)
for (auto& Element : m_Elements)
{
if (memcmp(_pHash, m_Elements[i].SHA1Hash, 20) == 0)
if (memcmp(_pHash, Element.SHA1Hash, 20) == 0)
{
char szFilename[1024];
sprintf(szFilename, "%sshared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIUSER_IDX).c_str(),
m_Elements[i].FileName[0], m_Elements[i].FileName[1], m_Elements[i].FileName[2], m_Elements[i].FileName[3],
m_Elements[i].FileName[4], m_Elements[i].FileName[5], m_Elements[i].FileName[6], m_Elements[i].FileName[7]);
Element.FileName[0], Element.FileName[1], Element.FileName[2], Element.FileName[3],
Element.FileName[4], Element.FileName[5], Element.FileName[6], Element.FileName[7]);
return szFilename;
}
}
@ -154,9 +154,9 @@ CNANDContentLoader::CNANDContentLoader(const std::string& _rName)
CNANDContentLoader::~CNANDContentLoader()
{
for (size_t i=0; i<m_Content.size(); i++)
for (auto& content : m_Content)
{
delete [] m_Content[i].m_pData;
delete [] content.m_pData;
}
m_Content.clear();
if (m_TIK)
@ -168,12 +168,11 @@ CNANDContentLoader::~CNANDContentLoader()
const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
{
for (size_t i=0; i<m_Content.size(); i++)
for (auto& Content : m_Content)
{
const SNANDContent* pContent = &m_Content[i];
if (pContent->m_Index == _Index)
if (Content.m_Index == _Index)
{
return pContent;
return &Content;
}
}
return NULL;
@ -413,11 +412,11 @@ cUIDsys::~cUIDsys()
u32 cUIDsys::GetUIDFromTitle(u64 _Title)
{
for (size_t i=0; i<m_Elements.size(); i++)
for (auto& Element : m_Elements)
{
if (Common::swap64(_Title) == *(u64*)&(m_Elements[i].titleID))
if (Common::swap64(_Title) == *(u64*)&(Element.titleID))
{
return Common::swap32(m_Elements[i].UID);
return Common::swap32(Element.UID);
}
}
return 0;
@ -445,11 +444,11 @@ void cUIDsys::AddTitle(u64 _TitleID)
void cUIDsys::GetTitleIDs(std::vector<u64>& _TitleIDs, bool _owned)
{
for (size_t i = 0; i < m_Elements.size(); i++)
for (auto& Element : m_Elements)
{
if ((_owned && Common::CheckTitleTIK(Common::swap64(m_Elements[i].titleID))) ||
(!_owned && Common::CheckTitleTMD(Common::swap64(m_Elements[i].titleID))))
_TitleIDs.push_back(Common::swap64(m_Elements[i].titleID));
if ((_owned && Common::CheckTitleTIK(Common::swap64(Element.titleID))) ||
(!_owned && Common::CheckTitleTMD(Common::swap64(Element.titleID))))
_TitleIDs.push_back(Common::swap64(Element.titleID));
}
}

8
Source/Core/DiscIO/Src/VolumeDirectory.cpp
View File

@ -363,9 +363,9 @@ void CVolumeDirectory::BuildFST()
// write root entry
WriteEntryData(fstOffset, DIRECTORY_ENTRY, 0, 0, totalEntries);
for(std::vector<File::FSTEntry>::iterator iter = rootEntry.children.begin(); iter != rootEntry.children.end(); ++iter)
for(auto& entry : rootEntry.children)
{
WriteEntry(*iter, fstOffset, nameOffset, curDataAddress, rootOffset);
WriteEntry(entry, fstOffset, nameOffset, curDataAddress, rootOffset);
}
// overflow check
@ -459,9 +459,9 @@ void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u
WriteEntryData(fstOffset, DIRECTORY_ENTRY, nameOffset, parentEntryNum, (u32)(myEntryNum + entry.size + 1));
WriteEntryName(nameOffset, entry.virtualName);
for(std::vector<File::FSTEntry>::const_iterator iter = entry.children.begin(); iter != entry.children.end(); ++iter)
for(const auto& child : entry.children)
{
WriteEntry(*iter, fstOffset, nameOffset, dataOffset, myEntryNum);
WriteEntry(child, fstOffset, nameOffset, dataOffset, myEntryNum);
}
}
else