minor changes in Cmakefiles
Minor refactoring (cppcheck issues)
Use new Sonar C++ plugin (no CppNcss dependency)