games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fixes for various minor issues detected by Sonar Cloud

Browse Source
This commit is contained in:
Ivan Savenko
2024-06-01 11:48:30 +00:00
parent df83fa33a1
commit b8beb4fb13
29 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CGeneralTextHandler.cpp
View File

@@ -253,7 +253,7 @@ bool CLegacyConfigParser::endLine()
void TextLocalizationContainer::registerStringOverride(const std::string & modContext, const std::string & language, const TextIdentifier & UID, const std::string & localized)
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
assert(!modContext.empty());
assert(!language.empty());
@@ -269,7 +269,7 @@ void TextLocalizationContainer::registerStringOverride(const std::string & modCo
void TextLocalizationContainer::addSubContainer(const TextLocalizationContainer & container)
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
assert(!vstd::contains(subContainers, &container));
subContainers.push_back(&container);
@@ -277,7 +277,7 @@ void TextLocalizationContainer::addSubContainer(const TextLocalizationContainer
void TextLocalizationContainer::removeSubContainer(const TextLocalizationContainer & container)
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
assert(vstd::contains(subContainers, &container));
@@ -286,7 +286,7 @@ void TextLocalizationContainer::removeSubContainer(const TextLocalizationContain
const std::string & TextLocalizationContainer::deserialize(const TextIdentifier & identifier) const
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
if(stringsLocalizations.count(identifier.get()) == 0)
{
@@ -307,7 +307,7 @@ const std::string & TextLocalizationContainer::deserialize(const TextIdentifier
void TextLocalizationContainer::registerString(const std::string & modContext, const TextIdentifier & UID, const std::string & localized, const std::string & language)
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
assert(!modContext.empty());
assert(!Languages::getLanguageOptions(language).identifier.empty());
@@ -339,7 +339,7 @@ void TextLocalizationContainer::registerString(const std::string & modContext, c
bool TextLocalizationContainer::validateTranslation(const std::string & language, const std::string & modContext, const JsonNode & config) const
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
bool allPresent = true;
@@ -398,14 +398,14 @@ void TextLocalizationContainer::loadTranslationOverrides(const std::string & lan
bool TextLocalizationContainer::identifierExists(const TextIdentifier & UID) const
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
return stringsLocalizations.count(UID.get());
}
void TextLocalizationContainer::exportAllTexts(std::map<std::string, std::map<std::string, std::string>> & storage) const
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
for (auto const & subContainer : subContainers)
subContainer->exportAllTexts(storage);
@@ -436,7 +436,7 @@ std::string TextLocalizationContainer::getModLanguage(const std::string & modCon
void TextLocalizationContainer::jsonSerialize(JsonNode & dest) const
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
for(auto & s : stringsLocalizations)
{
@@ -712,7 +712,7 @@ std::string CGeneralTextHandler::getInstalledEncoding()
std::vector<std::string> CGeneralTextHandler::findStringsWithPrefix(const std::string & prefix)
{
std::lock_guard<std::recursive_mutex> globalLock(globalTextMutex);
std::lock_guard globalLock(globalTextMutex);
std::vector<std::string> result;
for(const auto & entry : stringsLocalizations)