I now have a post-build step which formats all the code using
astyle -n -z2 -Z -A14 *.hpp *.cpp
The options are to preserve the dates of each file, force the
Linux line endings, and format the files directly omitting the
creation of the .orig file. The -A14 is "Google" style which
happens to be the style I've always personally used, which is
handy.
