Merge pull request #2985 from JosJuice/iselfordol

DolphinWX: Don't use IsElfOrDol outside of ISOFile
This commit is contained in:
Lioncash
2015-09-11 12:28:57 -04:00
3 changed files with 29 additions and 32 deletions

View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <algorithm>
#include <cinttypes>
#include <cstdio>
#include <cstring>
@ -197,7 +198,22 @@ void GameListItem::DoState(PointerWrap &p)
p.Do(m_Revision);
}
std::string GameListItem::CreateCacheFilename()
bool GameListItem::IsElfOrDol() const
{
const std::string name = GetName();
const size_t pos = name.rfind('.');
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;
}
std::string GameListItem::CreateCacheFilename() const
{
std::string Filename, LegalPathname, extension;
SplitPath(m_FileName, &LegalPathname, &Filename, &extension);
@ -325,19 +341,3 @@ const std::string GameListItem::GetWiiFSPath() const
return ret;
}
bool GameListItem::IsElfOrDol() const
{
const std::string name = GetName();
const size_t pos = name.rfind('.');
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;
}