Patch from David Benjamin to fix loading only working if you have the same size you had when saving (*ouch*)

Along with it comes some code refactoring that has the nice side effect of not needing the Qt4.4 ifdef anymore