Revert "Miscellaneous cppcheck fixes"

Reverts tomahawk-player/tomahawk#268