minimal fixes
type fixes
replaced std::map by QMap
renamed String typedef
removed MessageId typedef
removed obsolete includes
removed obsolete includes