archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3264 from JosJuice/simplify-iselfordol

Browse source 
ISOFile/GameFile: Simplify IsElfOrDol
This commit is contained in:
Scott Mansell 2015-11-27 23:10:45 +13:00
commit df4c1d680e
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/DolphinQt/GameList/GameFile.cpp
View file

@ -243,17 +243,8 @@ void GameFile::SaveToCache()
bool GameFile::IsElfOrDol() const bool GameFile::IsElfOrDol() const
{ {
const std::string name = m_file_name.toStdString(); return m_file_name.endsWith(QStringLiteral(".elf"), Qt::CaseInsensitive) ||
const size_t pos = name.rfind('.'); m_file_name.endsWith(QStringLiteral(".dol"), Qt::CaseInsensitive);
if (pos != std::string::npos)
{
std::string ext = name.substr(pos);
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
return ext == ".elf" || ext == ".dol";
}
return false;
} }
QString GameFile::CreateCacheFilename() const QString GameFile::CreateCacheFilename() const

13
Source/Core/DolphinWX/ISOFile.cpp
View file

@ -216,15 +216,12 @@ void GameListItem::DoState(PointerWrap &p)
bool GameListItem::IsElfOrDol() const bool GameListItem::IsElfOrDol() const
{ {
const size_t pos = m_FileName.rfind('.'); if (m_FileName.size() < 4)
if (pos != std::string::npos) return false;
{
std::string ext = m_FileName.substr(pos);
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
return ext == ".elf" || ext == ".dol"; std::string name_end = m_FileName.substr(m_FileName.size() - 4);
} std::transform(name_end.begin(), name_end.end(), name_end.begin(), ::tolower);
return false; return name_end == ".elf" || name_end == ".dol";
} }
std::string GameListItem::CreateCacheFilename() const std::string GameListItem::CreateCacheFilename() const