Fix coding style issues along the way.

Change-Id: I73b3774264614d2fd3b5e32dc9921f921a1d818f
Reviewed-on: http://codereview.qt-project.org/6336


Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>