Fix warnings (final part)

Avogadro builds ok with -Werror with gcc 4.7.3

Change-Id: I524764748b4acd83a48cdb6a3a611e0d51ccb389
Merge topic 'warnings2' into master

b27a72d8 Fix warnings (final part)