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

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

View File

@ -75,15 +75,15 @@ namespace DriverDetails
break;
}
for(unsigned int a = 0; a < (sizeof(m_known_bugs) / sizeof(BugInfo)); ++a)
for(auto& bug : m_known_bugs)
{
if(
( m_known_bugs[a].m_vendor == m_vendor || m_known_bugs[a].m_vendor == VENDOR_ALL ) &&
( m_known_bugs[a].m_driver == m_driver || m_known_bugs[a].m_driver == DRIVER_ALL ) &&
( m_known_bugs[a].m_versionstart <= m_version || m_known_bugs[a].m_versionstart == -1 ) &&
( m_known_bugs[a].m_versionend > m_version || m_known_bugs[a].m_versionend == -1 )
( bug.m_vendor == m_vendor || bug.m_vendor == VENDOR_ALL ) &&
( bug.m_driver == m_driver || bug.m_driver == DRIVER_ALL ) &&
( bug.m_versionstart <= m_version || bug.m_versionstart == -1 ) &&
( bug.m_versionend > m_version || bug.m_versionend == -1 )
)
m_bugs.insert(std::make_pair(m_known_bugs[a].m_bug, m_known_bugs[a]));
m_bugs.insert(std::make_pair(bug.m_bug, bug));
}
}

View File

@ -33,21 +33,21 @@ void Init(const char *gameCode)
{
File::FSTEntry FST_Temp;
File::ScanDirectoryTree(Directories[i], FST_Temp);
for (u32 j = 0; j < FST_Temp.children.size(); j++)
for (auto& entry : FST_Temp.children)
{
if (FST_Temp.children.at(j).isDirectory)
if (entry.isDirectory)
{
bool duplicate = false;
for (u32 k = 0; k < Directories.size(); k++)
for (auto& Directory : Directories)
{
if (strcmp(Directories[k].c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0)
if (strcmp(Directory.c_str(), entry.physicalName.c_str()) == 0)
{
duplicate = true;
break;
}
}
if (!duplicate)
Directories.push_back(FST_Temp.children.at(j).physicalName.c_str());
Directories.push_back(entry.physicalName.c_str());
}
}
}
@ -66,13 +66,13 @@ void Init(const char *gameCode)
if (rFilenames.size() > 0)
{
for (u32 i = 0; i < rFilenames.size(); i++)
for (auto& rFilename : rFilenames)
{
std::string FileName;
SplitPath(rFilenames[i], NULL, &FileName, NULL);
SplitPath(rFilename, NULL, &FileName, NULL);
if (FileName.substr(0, strlen(code)).compare(code) == 0 && textureMap.find(FileName) == textureMap.end())
textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilenames[i]));
textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilename));
}
}
}

View File

@ -73,9 +73,9 @@ private:
{
size_t h = -1;
for (unsigned int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i)
for (auto word : vid)
{
h = h * 137 + vid[i];
h = h * 137 + word;
}
return h;

View File

@ -43,16 +43,16 @@ static VertexLoaderMap g_VertexLoaderMap;
void Init()
{
MarkAllDirty();
for (int i = 0; i < 8; i++)
g_VertexLoaders[i] = NULL;
for (auto& vertexLoader : g_VertexLoaders)
vertexLoader = NULL;
RecomputeCachedArraybases();
}
void Shutdown()
{
for (VertexLoaderMap::iterator iter = g_VertexLoaderMap.begin(); iter != g_VertexLoaderMap.end(); ++iter)
for (auto& p : g_VertexLoaderMap)
{
delete iter->second;
delete p.second;
}
g_VertexLoaderMap.clear();
}

View File

@ -50,11 +50,11 @@ void VideoBackend::PopulateList()
#endif
g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
for (int i = 0; i < 4; ++i)
for (auto& backend : backends)
{
if (backends[i])
if (backend)
{
s_default_backend = g_video_backend = backends[i];
s_default_backend = g_video_backend = backend;
break;
}
}