Revert some temporary changes for Stage 1 refactor of Qt.
Merge pull request #33 from xsacha/master

Qt code refactor [Stage 1]