* Open the files in the cpp editor, so preprocessing will take place
* Remove duplicated code
* Fix coding styles issues

Change-Id: Ic8bffcbc5a4ac5aca76bc55880d33c3b55f0944c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>