Do not shadow variables or functions

Christoph Grüningerrequested to merge
feature/do-not-shadow-variables into master

Found by cppcheck.

Merge request reports