Fix build w/ Qt 4.6
Fix cppcheck 1.67 issues
Merge pull request #386 from tribal-tec/master

Fix build w/ Qt 4.6, fix cppcheck issues