diff --git a/Common/UI/PopupScreens.cpp b/Common/UI/PopupScreens.cpp index bb8b97d033..c3d401bc3e 100644 --- a/Common/UI/PopupScreens.cpp +++ b/Common/UI/PopupScreens.cpp @@ -397,7 +397,7 @@ void PopupMultiChoice::UpdateText() { } valueText_ = std::move(text); } else { - valueText_ = ""; + valueText_.clear(); } } } diff --git a/Core/Config.cpp b/Core/Config.cpp index 64e1feff47..75438afec1 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1596,7 +1596,7 @@ void Config::PostLoadCleanup() { // Remove a legacy value. if (g_Config.sCustomDriver == "Default") { - g_Config.sCustomDriver = ""; + g_Config.sCustomDriver.clear(); } // Squash unsupported screen rotations. diff --git a/Core/ConfigSettings.cpp b/Core/ConfigSettings.cpp index d0062dc447..97776658d2 100644 --- a/Core/ConfigSettings.cpp +++ b/Core/ConfigSettings.cpp @@ -322,7 +322,7 @@ bool ConfigSetting::RestoreToDefault(ConfigBlock *configBlock, bool log) const { } else if (default_.s != nullptr) { *ptr_s = default_.s; } else { - *ptr_s = ""; + ptr_s->clear(); } if (*ptr_s != origValue) { if (log) { diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index 3bc7d05063..82603e91dd 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -225,7 +225,7 @@ IdentifiedFileType Identify_File(FileLoader *fileLoader, std::string *errorStrin Path filename = fileLoader->GetPath(); // There are a few elfs misnamed as pbp (like Trig Wars), accept that. Also accept extension-less paths. if (extension == ".plf" || strstr(filename.GetFilename().c_str(), "BOOT.BIN") || - extension == ".elf" || extension == ".prx" || extension == ".pbp" || extension == "") { + extension == ".elf" || extension == ".prx" || extension == ".pbp" || extension.empty()) { return IdentifiedFileType::PSP_ELF; } return IdentifiedFileType::UNKNOWN_ELF; diff --git a/UI/ImDebugger/ImStructViewer.cpp b/UI/ImDebugger/ImStructViewer.cpp index 1d605dd87f..9cb88e92fb 100644 --- a/UI/ImDebugger/ImStructViewer.cpp +++ b/UI/ImDebugger/ImStructViewer.cpp @@ -194,7 +194,7 @@ void ImStructViewer::WatchForm::Clear() { memset(name, 0, sizeof(name)); memset(expression, 0, sizeof(expression)); dynamic = false; - error = ""; + error.clear(); typeFilter.Clear(); // Not clearing the actual selected type on purpose here, user will have to reselect one anyway and // maybe there is a chance they will reuse the current one @@ -213,7 +213,7 @@ void ImStructViewer::WatchForm::SetFrom(const std::unordered_map