Revert "Miscellaneous cppcheck fixes"
Merge pull request #269 from tomahawk-player/revert-268-misc-fixes

Revert "Miscellaneous cppcheck fixes"