Fix more cppcheck findings

Christoph Grüningerrequested to merge
feature/fix-cppcheck-findings-2 into master

Mainly reduction of variable scopes and shadowing of variables.

Merge request reports