Updated all cpp files to new format

No match.