mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-26 17:04:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues reported by CppCheck

Browse Source 
Many shadowFunction, some useStlAlgorithm, and others.

cppcheck --enable=all --inline-suppr \
  --suppress=noExplicitConstructor --suppress=unusedFunction \
  --suppress=missingIncludeSystem --project=compile_commands.json
This commit is contained in:
Urs Fleisch
2023-12-03 11:59:24 +01:00
parent 131918333b
commit 8b3f1a459e
38 changed files with 349 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
taglib/dsdiff/dsdiffdiintag.cpp
View File

@ -128,18 +128,18 @@ PropertyMap DSDIFF::DIIN::Tag::properties() const
PropertyMap DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps)
{
PropertyMap properties(origProps);
properties.removeEmpty();
PropertyMap props(origProps);
props.removeEmpty();
StringList oneValueSet;
if(properties.contains("TITLE")) {
d->title = properties["TITLE"].front();
if(props.contains("TITLE")) {
d->title = props["TITLE"].front();
oneValueSet.append("TITLE");
} else
d->title.clear();
if(properties.contains("ARTIST")) {
d->artist = properties["ARTIST"].front();
if(props.contains("ARTIST")) {
d->artist = props["ARTIST"].front();
oneValueSet.append("ARTIST");
} else
d->artist.clear();
@ -147,10 +147,10 @@ PropertyMap DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps)
// for each tag that has been set above, remove the first entry in the corresponding
// value list. The others will be returned as unsupported by this format.
for(const auto &entry : std::as_const(oneValueSet)) {
if(properties[entry].size() == 1)
properties.erase(entry);
if(props[entry].size() == 1)
props.erase(entry);
else
properties[entry].erase(properties[entry].begin());
props[entry].erase(props[entry].begin());
}
return properties;
return props;
}