Switch unit functions from using pointer arguements to reference arguements.

(bzr r12380.1.28)

4 files changed, 17 insertions, 30 deletions

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index d270afc3f..abb2512f7 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -1108,8 +1108,7 @@ CloneTiler::CloneTiler (void) :
                     double value = prefs->getDouble(prefs_path + "fillwidth", 50.0);
                     Inkscape::Util::Unit const unit = unit_menu->getUnit();
                     Inkscape::Util::UnitTable unit_table;
-                    Inkscape::Util::Unit const px = unit_table.getUnit("px");
-                    gdouble const units = Inkscape::Util::Quantity::convert(value, &px, &unit);
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
                     fill_width->set_value (units);
 
 #if WITH_GTKMM_3_0
@@ -1143,8 +1142,7 @@ CloneTiler::CloneTiler (void) :
                     double value = prefs->getDouble(prefs_path + "fillheight", 50.0);
                     Inkscape::Util::Unit const unit = unit_menu->getUnit();
                     Inkscape::Util::UnitTable unit_table;
-                    Inkscape::Util::Unit const px = unit_table.getUnit("px");
-                    gdouble const units = Inkscape::Util::Quantity::convert(value, &px, &unit);
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
                     fill_height->set_value (units);
 
 #if WITH_GTKMM_3_0
@@ -2953,8 +2951,7 @@ void CloneTiler::clonetiler_fill_width_changed(GtkAdjustment *adj, Inkscape::UI:
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
     Inkscape::Util::Unit const unit = u->getUnit();
     Inkscape::Util::UnitTable unit_table;
-    Inkscape::Util::Unit const px = unit_table.getUnit("px");
-    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, &unit, &px);
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillwidth", pixels);
@@ -2965,8 +2962,7 @@ void CloneTiler::clonetiler_fill_height_changed(GtkAdjustment *adj, Inkscape::UI
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
     Inkscape::Util::Unit const unit = u->getUnit();
     Inkscape::Util::UnitTable unit_table;
-    Inkscape::Util::Unit const px = unit_table.getUnit("px");
-    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, &unit, &px);
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillheight", pixels);
@@ -2980,10 +2976,9 @@ void CloneTiler::clonetiler_unit_changed()
     
     Inkscape::Util::Unit unit = unit_menu->getUnit();
     Inkscape::Util::UnitTable unit_table;
-    Inkscape::Util::Unit px = unit_table.getUnit("px");
     
-    gdouble width_value = Inkscape::Util::Quantity::convert(width_pixels, &px, &unit);
-    gdouble height_value = Inkscape::Util::Quantity::convert(height_pixels, &px, &unit);
+    gdouble width_value = Inkscape::Util::Quantity::convert(width_pixels, "px", unit);
+    gdouble height_value = Inkscape::Util::Quantity::convert(height_pixels, "px", unit);
     gtk_adjustment_set_value(fill_width->gobj(), width_value);
     gtk_adjustment_set_value(fill_height->gobj(), height_value);
 }
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 61fb6e4ee..5cb9357c3 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -1885,9 +1885,8 @@ void Export::setValuePx( Gtk::Adjustment *adj, double val)
 {
     const Unit unit = unit_selector->getUnit();
     Inkscape::Util::UnitTable unit_table;
-    Inkscape::Util::Unit px = unit_table.getUnit("px");
 
-    setValue(adj, Inkscape::Util::Quantity::convert(val, &px, &unit));
+    setValue(adj, Inkscape::Util::Quantity::convert(val, "px", unit));
 
     return;
 }
@@ -1937,9 +1936,8 @@ float Export::getValuePx(  Gtk::Adjustment *adj )
     float value = getValue( adj);
     const Unit unit = unit_selector->getUnit();
     Inkscape::Util::UnitTable unit_table;
-    Inkscape::Util::Unit px = unit_table.getUnit("px");
 
-    return Inkscape::Util::Quantity::convert(value, &unit, &px);
+    return Inkscape::Util::Quantity::convert(value, unit, "px");
 } // end of sp_export_value_get_px()
 
 /**
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 73b75090b..f6392cfd8 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -228,10 +228,6 @@ static PaperSizeRec const inkscape_papers[] = {
 //# P A G E    S I Z E R
 //########################################################################
 
-//The default unit for this widget and its calculations
-static Inkscape::Util::Unit _px_unit = unit_table.getUnit("px");
-
-
 /**
  * Constructor
  */
@@ -481,8 +477,8 @@ PageSizer::setDim (double w, double h, bool changeList)
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (Inkscape::Util::Quantity(w, &_px_unit));
-        doc->setHeight (Inkscape::Util::Quantity(h, &_px_unit));
+        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
+        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
         Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
@@ -567,8 +563,8 @@ PageSizer::find_paper_size (double w, double h) const
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, &i_unit, &_px_unit);
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, &i_unit, &_px_unit);
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, "px");
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, "px");
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -659,9 +655,8 @@ PageSizer::on_paper_size_list_changed()
         _landscape = _landscapeButton.get_active();
     }
 
-    Inkscape::Util::Unit const &src_unit = paper.unit;
-    w = Inkscape::Util::Quantity::convert(w, &src_unit, &_px_unit);
-    h = Inkscape::Util::Quantity::convert(h, &src_unit, &_px_unit);
+    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
+    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
 
     if (_landscape)
         setDim (h, w, false);
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index df78e21dd..372419c3b 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -224,7 +224,6 @@ void UnitTracker::_setActive(gint active)
 void UnitTracker::_fixupAdjustments(Inkscape::Util::Unit const oldUnit, Inkscape::Util::Unit const newUnit)
 {
     _isUpdating = true;
-    Inkscape::Util::Unit px = _unit_table.getUnit("px");
     for ( GSList *cur = _adjList ; cur ; cur = g_slist_next(cur) ) {
         GtkAdjustment *adj = GTK_ADJUSTMENT(cur->data);
         gdouble oldVal = gtk_adjustment_get_value(adj);
@@ -234,15 +233,15 @@ void UnitTracker::_fixupAdjustments(Inkscape::Util::Unit const oldUnit, Inkscape
             && (newUnit.type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) )
         {
             val = newUnit.factor;
-            _priorValues[adj] = Inkscape::Util::Quantity::convert(oldVal, &oldUnit, &px);
+            _priorValues[adj] = Inkscape::Util::Quantity::convert(oldVal, oldUnit, "px");
         } else if ( (oldUnit.type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS)
             && (newUnit.type != Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) )
         {
             if (_priorValues.find(adj) != _priorValues.end()) {
-                val = Inkscape::Util::Quantity::convert(_priorValues[adj], &newUnit, &px);
+                val = Inkscape::Util::Quantity::convert(_priorValues[adj], newUnit, "px");
             }
         } else {
-            val = Inkscape::Util::Quantity::convert(oldVal, &oldUnit, &newUnit);
+            val = Inkscape::Util::Quantity::convert(oldVal, oldUnit, newUnit);
         }
 
         gtk_adjustment_set_value(adj, val);