diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DiscIO/FileMonitor.cpp | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (diff) | |
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/DiscIO/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileMonitor.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index cc0a345838..e04bc2211e 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -24,8 +24,8 @@ namespace FileMon { -DiscIO::IVolume *OpenISO = NULL; -DiscIO::IFileSystem *pFileSystem = NULL; +DiscIO::IVolume *OpenISO = nullptr; +DiscIO::IFileSystem *pFileSystem = nullptr; std::vector<const DiscIO::SFileInfo *> GCFiles; std::string ISOFile = "", CurrentFile = ""; bool FileAccess = true; @@ -34,7 +34,7 @@ bool FileAccess = true; bool IsSoundFile(const std::string& filename) { std::string extension; - SplitPath(filename, NULL, NULL, &extension); + SplitPath(filename, nullptr, nullptr, &extension); std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower); std::unordered_set<std::string> extensions = { @@ -57,15 +57,15 @@ bool IsSoundFile(const std::string& filename) void ReadGC(const std::string& filename) { // Should have an actual Shutdown procedure or something - if (OpenISO != NULL) + if (OpenISO != nullptr) { delete OpenISO; - OpenISO = NULL; + OpenISO = nullptr; } - if (pFileSystem != NULL) + if (pFileSystem != nullptr) { delete pFileSystem; - pFileSystem = NULL; + pFileSystem = nullptr; } // GCFiles' pointers are no longer valid after pFileSystem is cleared @@ -149,16 +149,16 @@ void FindFilename(u64 offset) void Close() { - if (OpenISO != NULL) + if (OpenISO != nullptr) { delete OpenISO; - OpenISO = NULL; + OpenISO = nullptr; } - if (pFileSystem != NULL) + if (pFileSystem != nullptr) { delete pFileSystem; - pFileSystem = NULL; + pFileSystem = nullptr; } // GCFiles' pointers are no longer valid after pFileSystem is cleared |