clang-modernize-3.5 update of source for viewpoints;