Fix cppcheck 1.90 warnings

Merged Matthijs Mekking requested to merge cppcheck-1.90-warnings into master
Edited by Ondřej Surý

Merge request reports