merge from trunk (r12487)

(bzr r11668.1.75)

1 files changed, 6 insertions, 5 deletions

diff --git a/src/document.h b/src/document.h
index 606a83be8..6782c6206 100644
--- a/src/document.h
+++ b/src/document.h
@@ -35,7 +35,6 @@ class  SPItem;
 class  SPObject;
 struct SPGroup;
 struct SPRoot;
-struct SPUnit;
 
 namespace Inkscape {
     struct Application;
@@ -47,6 +46,9 @@ namespace Inkscape {
         struct Document;
         class Node;
     }
+    namespace Util {
+        class Quantity;
+    }
 }
 
 class SPDefs;
@@ -228,8 +230,9 @@ public:
     gdouble getWidth() const;
     gdouble getHeight() const;
     Geom::Point getDimensions() const;
-    void setWidth(gdouble width, const SPUnit *unit);
-    void setHeight(gdouble height, const SPUnit *unit);
+    Geom::OptRect preferredBounds() const;
+    void setWidth(const Inkscape::Util::Quantity &width);
+    void setHeight(const Inkscape::Util::Quantity &height);
     void requestModified();
     gint ensureUpToDate();
     bool addResource(const gchar *key, SPObject *object);
@@ -253,8 +256,6 @@ private:
     void setupViewport(SPItemCtx *ctx);
 };
 
-struct SPUnit;
-
 /*
  * Ideas: How to overcome style invalidation nightmare
  *