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/ConfigMain.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/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index c4afb6ba87..dcac884697 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -616,7 +616,7 @@ void CConfigMain::CreateGUIControls() std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename) { std::string name, ext; - SplitPath(filename, NULL, &name, &ext); + SplitPath(filename, nullptr, &name, &ext); name += ext; auto const wxname = StrToWxStr(name); |