# HG changeset patch
# User daveb
# Date 1281053316 -34200
# Node ID fbabd1957c895ddb86abfd202d5f63b039602a32
# Parent  4dadc3c03b7e82d681d21b7233c9a26e0a96ff8f# Parent  576b9fba46771e8a7f4a85c427abf062afbe2afa
Merge

diff -r 4dadc3c03b7e -r fbabd1957c89 doodle/core/undo.d
--- a/doodle/core/undo.d	Fri Aug 06 09:37:59 2010 +0930
+++ b/doodle/core/undo.d	Fri Aug 06 09:38:36 2010 +0930
@@ -34,6 +34,11 @@
         d_time _timeStamp;
     }
 
+    this(in string description) {
+        _description = description;
+        _timeStamp = getUTCtime;
+    }
+
     this(in string description, d_time timeStamp) {
         assert(description);
         _description = description;
@@ -57,7 +62,7 @@
 
     void undo();
     void redo();
-    protected bool mergeImpl(Edit other) { return false; }
+    protected bool mergeImpl(Edit subsequent) { return false; }
 }
 
 interface IUndoManagerObserver {
@@ -66,6 +71,7 @@
                         in bool canRedo, in string redoDescription);
 }
 
+// XXX This interface doesn't appear to add any value
 interface IUndoManager {
     void addEdit(Edit edit);
     void undo();
diff -r 4dadc3c03b7e -r fbabd1957c89 doodle/dia/icanvas.d
--- a/doodle/dia/icanvas.d	Fri Aug 06 09:37:59 2010 +0930
+++ b/doodle/dia/icanvas.d	Fri Aug 06 09:38:36 2010 +0930
@@ -62,7 +62,7 @@
 
 abstract class Layer {
     this(in string name) {
-        mName = name.idup;
+        mName = name;
     }
 
     string name() const { return mName; }