Apply readability-simplify-boolean-expr

This commit is contained in:
Flössie
2016-10-12 20:01:30 +02:00
parent 19de9d1efa
commit aeaff29ac0
18 changed files with 53 additions and 85 deletions

View File

@@ -1464,8 +1464,8 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) // true -> entry
}
// return false if basic filter settings are not satisfied
if ((filter.showRanked[entry->thumbnail->getRank()] == false ) ||
(filter.showCLabeled[entry->thumbnail->getColorLabel()] == false ) ||
if ((!filter.showRanked[entry->thumbnail->getRank()] ) ||
(!filter.showCLabeled[entry->thumbnail->getColorLabel()] ) ||
((entry->thumbnail->hasProcParams() && filter.showEdited[0]) && !filter.showEdited[1]) ||
((!entry->thumbnail->hasProcParams() && filter.showEdited[1]) && !filter.showEdited[0]) ||
@@ -1515,7 +1515,7 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) // true -> entry
}
}
if (MatchEqual == true) {
if (MatchEqual) {
if (iFilenameMatch == 0) { //none of the vFilterStrings found in FileName
return false;
}