From f22212369f2a098caa0248d9fab5cfd6c54abff1 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sun, 31 Aug 2014 03:19:19 -0400 Subject: [PATCH] Remove a few unneeded parentheses, and use nullptr instead of NULL. --- Core/Config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index e65ab53c41..15f8352baa 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -694,10 +694,10 @@ std::map> GetLangValuesMapping() { } void Config::Load(const char *iniFileName, const char *controllerIniFilename) { - const bool useIniFilename = (iniFileName != NULL) && (strlen(iniFileName) > 0); + const bool useIniFilename = iniFileName != nullptr && strlen(iniFileName) > 0; iniFilename_ = FindConfigFile(useIniFilename ? iniFileName : "ppsspp.ini"); - const bool useControllerIniFilename = (controllerIniFilename != NULL) && (strlen(controllerIniFilename) > 0); + const bool useControllerIniFilename = controllerIniFilename != nullptr && strlen(controllerIniFilename) > 0; controllerIniFilename_ = FindConfigFile(useControllerIniFilename ? controllerIniFilename : "controls.ini"); INFO_LOG(LOADER, "Loading config: %s", iniFilename_.c_str());