Fix warnings about struct/class mismatch in CVS.

Change-Id: Idabfc88b12ee24cf456b78a098206ee143c1341a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>