Switch setWidth and setHeight to use Quantity and switch to forward declaration of Inkscape::Util::Quantity in document.h.

(bzr r12380.1.7)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/document.h b/src/document.h
index c2334bbc3..c584c3beb 100644
--- a/src/document.h
+++ b/src/document.h
@@ -26,7 +26,6 @@
 #include "gc-anchored.h"
 #include <glibmm/ustring.h>
 #include <vector>
-#include "util/units.h"
 
 namespace Avoid {
 class Router;
@@ -47,6 +46,9 @@ namespace Inkscape {
         struct Document;
         class Node;
     }
+    namespace Util {
+        class Quantity;
+    }
 }
 
 class SPDefs;
@@ -228,8 +230,8 @@ public:
     gdouble getWidth() const;
     gdouble getHeight() const;
     Geom::Point getDimensions() const;
-    void setWidth(gdouble width, const Inkscape::Util::Unit *unit);
-    void setHeight(gdouble height, const Inkscape::Util::Unit *unit);
+    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);