From d04405f745da587b2a3ccca8d2ca7bf49edf2d4d Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sat, 6 Jul 2013 11:01:59 -0400
Subject: Switch setWidth and setHeight to use Quantity and switch to forward
 declaration of Inkscape::Util::Quantity in document.h.

(bzr r12380.1.7)
---
 src/util/units.cpp | 2 +-
 src/util/units.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/util')

diff --git a/src/util/units.cpp b/src/util/units.cpp
index d0e4e7941..a51eb2570 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -386,7 +386,7 @@ void UnitsSAXHandler::_endElement(xmlChar const *xname)
 }
 
 /** Initialize a quantity. */
-Quantity::Quantity(Unit *u, double q) {
+Quantity::Quantity(double q, const Unit *u) {
     unit = u;
     quantity = q;
 }
diff --git a/src/util/units.h b/src/util/units.h
index 7ef7001bb..0ea84bfbb 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -93,10 +93,10 @@ class UnitTable {
 
 class Quantity {
 public:
-    Unit *unit;
+    const Unit *unit;
     double quantity;
     
-    Quantity(Unit *u, double q);   // constructor
+    Quantity(double q, const Unit *u);   // constructor
     bool compatibleWith(const Unit *u) const;
     double value(Unit *u) const;
     
-- 
cgit v1.2.3