Some minor cleaning up (replaced char* with QString).