QString conversions, assigned/unused variables,
braces around ambiguous else.
Also fixed coding style in the affected lines to make
the sanity bot happy.

Change-Id: I85e440861ec9e8177a6cf9a017dc981a25212f54
Reviewed-by: Mark Brand <mabrand@mabrand.nl>