again manual corrections in response to clang-tidy

Joachim Wuttkerequested to merge
sj7 into develop

now clang-tidy passes without warnings

Merge request reports