Qt4: improve macro expansion safety
Qt4: refactor
Qt4: fix fullscreen and video-on-top toggle across input or video reset