Dont use std::pair/QPair, use named structs

Waqar Ahmedrequested to merge
work/dontusepair into master

Merge request reports