diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
| commit | 633dc75e857d649ffab7c4398e92536bccc9e1de (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DolphinWX/ISOFile.cpp | |
| parent | f4012638672472afdbd9956229f273a18a77fd77 (diff) | |
| parent | d802d392811be44d34ae9cd23f616db93e54c50f (diff) | |
Merge pull request #142 from Tilka/clang-modernize
Run clang-modernize and manually fix the result
Diffstat (limited to 'Source/Core/DolphinWX/ISOFile.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ISOFile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index a8b20a4719..81a2f49593 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -57,7 +57,7 @@ GameListItem::GameListItem(const std::string& _rFileName) { DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_rFileName); - if (pVolume != NULL) + if (pVolume != nullptr) { if (!DiscIO::IsVolumeWadFile(pVolume)) m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC; @@ -80,11 +80,11 @@ GameListItem::GameListItem(const std::string& _rFileName) // check if we can get some info from the banner file too DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); - if (pFileSystem != NULL || m_Platform == WII_WAD) + if (pFileSystem != nullptr || m_Platform == WII_WAD) { DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume); - if (pBannerLoader != NULL) + if (pBannerLoader != nullptr) { if (pBannerLoader->IsValid()) { @@ -270,7 +270,7 @@ std::string GameListItem::GetName(int _index) const if (name.empty()) { // No usable name, return filename (better than nothing) - SplitPath(GetFileName(), NULL, &name, NULL); + SplitPath(GetFileName(), nullptr, &name, nullptr); } return name; @@ -281,7 +281,7 @@ const std::string GameListItem::GetWiiFSPath() const DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(m_FileName); std::string ret; - if (Iso == NULL) + if (Iso == nullptr) return ret; if (DiscIO::IsVolumeWiiDisc(Iso) || DiscIO::IsVolumeWadFile(Iso)) |