DiffEditor: Merge the two construction paths

Change-Id: I3c0c750517c9000dffe13de724b063008fd426b7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>