Fix Wshadow warnings

Christoph Grüningerrequested to merge
feature/fix-shadow-warnings into master

next is geometry, this time even with a range-based for.

Merge request reports