[Author: dmaclach]
[Author: dmaclach]

Fixes up some warnings that were being generated when compiling with the 4.2 compiler.
Also cleans up code to look prettier.

DELTA=111 (0 added, 0 deleted, 111 changed)
R=thomasvl
qokelate/google-toolbox-for-mac,qokelate/google-toolbox-for-mac,qokelate/google-toolbox-for-mac