xpcfix -bpc `find | grep -P "cpp$|h$" | perl -pe 's/\n/ /'`
This is a huge, repetitive patch, and I confess having only skimmed a lot of it. I'm reasonably confident in the tool here though.
Updated to fix 'else' as well.
xpcfix -puc `find | grep -P "cpp$|h$" | perl -pe 's/\n/ /'`
Some of these changes aren't quite ideal, but it's the best my tooling can do and I think it's very much a step in the right direction. This is necessary to do first, because doing if(foo) -> if (foo) changes the location of parentheses, which affects how other things should be aligned. So this has to be built into the tooling, and we might as well take care of the pre-existing issues first.